o patch by Michael V. Denisenko to handle case <string> of (see also #13700)

  + compiler implementation
  + tests

git-svn-id: trunk@13642 -

.gitattributes

@@ -8079,7 +8079,57 @@ tests/test/tasout.pp svneol=native#text/plain
 tests/test/tbopr.pp svneol=native#text/plain
 tests/test/tbrtlevt.pp svneol=native#text/plain
 tests/test/tcase1.pp svneol=native#text/plain
+tests/test/tcase10.pp svneol=native#text/pascal
+tests/test/tcase11.pp svneol=native#text/pascal
+tests/test/tcase12.pp svneol=native#text/pascal
+tests/test/tcase13.pp svneol=native#text/pascal
+tests/test/tcase14.pp svneol=native#text/pascal
+tests/test/tcase15.pp svneol=native#text/pascal
+tests/test/tcase16.pp svneol=native#text/pascal
+tests/test/tcase17.pp svneol=native#text/pascal
+tests/test/tcase18.pp svneol=native#text/pascal
+tests/test/tcase19.pp svneol=native#text/pascal
 tests/test/tcase2.pp svneol=native#text/plain
+tests/test/tcase20.pp svneol=native#text/pascal
+tests/test/tcase21.pp svneol=native#text/pascal
+tests/test/tcase22.pp svneol=native#text/pascal
+tests/test/tcase23.pp svneol=native#text/pascal
+tests/test/tcase24.pp svneol=native#text/pascal
+tests/test/tcase25.pp svneol=native#text/pascal
+tests/test/tcase26.pp svneol=native#text/pascal
+tests/test/tcase27.pp svneol=native#text/pascal
+tests/test/tcase28.pp svneol=native#text/pascal
+tests/test/tcase29.pp svneol=native#text/pascal
+tests/test/tcase3.pp svneol=native#text/pascal
+tests/test/tcase30.pp svneol=native#text/pascal
+tests/test/tcase31.pp svneol=native#text/pascal
+tests/test/tcase32.pp svneol=native#text/pascal
+tests/test/tcase33.pp svneol=native#text/pascal
+tests/test/tcase34.pp svneol=native#text/pascal
+tests/test/tcase35.pp svneol=native#text/pascal
+tests/test/tcase36.pp svneol=native#text/pascal
+tests/test/tcase37.pp svneol=native#text/pascal
+tests/test/tcase38.pp svneol=native#text/pascal
+tests/test/tcase39.pp svneol=native#text/pascal
+tests/test/tcase4.pp svneol=native#text/pascal
+tests/test/tcase40.pp svneol=native#text/pascal
+tests/test/tcase41.pp svneol=native#text/pascal
+tests/test/tcase42.pp svneol=native#text/pascal
+tests/test/tcase43.pp svneol=native#text/pascal
+tests/test/tcase44.pp svneol=native#text/pascal
+tests/test/tcase45.pp svneol=native#text/pascal
+tests/test/tcase45_2.pp svneol=native#text/pascal
+tests/test/tcase46.pp svneol=native#text/pascal
+tests/test/tcase46_2.pp svneol=native#text/pascal
+tests/test/tcase47.pp svneol=native#text/pascal
+tests/test/tcase47_2.pp svneol=native#text/pascal
+tests/test/tcase48.pp svneol=native#text/pascal
+tests/test/tcase48_2.pp svneol=native#text/pascal
+tests/test/tcase5.pp svneol=native#text/pascal
+tests/test/tcase6.pp svneol=native#text/pascal
+tests/test/tcase7.pp svneol=native#text/pascal
+tests/test/tcase8.pp svneol=native#text/pascal
+tests/test/tcase9.pp svneol=native#text/pascal
 tests/test/tcg1.pp svneol=native#text/plain
 tests/test/tcint64.pp svneol=native#text/plain
 tests/test/tclass1.pp svneol=native#text/plain

compiler/constexp.pas

@@ -45,6 +45,8 @@ type  Tconstexprint=record
             (svalue:int64);
       end;
 
+      Tconststring = type pchar;
+
       errorproc=procedure (i:longint);
 
 {"Uses verbose" gives a dependency on cpuinfo through globals. This leads

compiler/defutil.pas

@@ -27,7 +27,7 @@ interface
 
     uses
        cclasses,
-       globtype,globals,constexp,
+       globtype,globals,constexp,node,
        symconst,symbase,symtype,symdef,
        cgbase,cpubase;
 
@@ -43,6 +43,9 @@ interface
     {# Returns true, if definition defines an ordinal type }
     function is_ordinal(def : tdef) : boolean;
 
+    {# Returns true, if definition defines a string type }
+    function is_string(def : tdef): boolean;
+
     {# Returns the minimal integer value of the type }
     function get_min_value(def : tdef) : TConstExprInt;
 
@@ -374,6 +377,12 @@ implementation
          end;
       end;
 
+    { true if p is a string }
+    function is_string(def : tdef) : boolean;
+      begin
+        is_string := (assigned(def) and (def.typ = stringdef));
+      end;
+
 
     { returns the min. value of the type }
     function get_min_value(def : tdef) : TConstExprInt;

compiler/msg/errore.msg

@@ -1492,6 +1492,10 @@ type_e_no_type_info=04087_E_No type info available for this type
 % in their value range (this includes enumerations whose lower bound is different
 % from zero).
 % \end{description}
+type_e_ordinal_or_string_expr_expected=04088_E_Ordinal or string expression expected
+% The expression must be an ordinal or string type.
+type_e_string_expr_expected=04089_E_String expression expected
+% The expression must be a string type.
 #
 # Symtable
 #

compiler/msgidx.inc

@@ -418,6 +418,8 @@ const
   type_e_expected_objc_method_but_got=04085;
   type_e_expected_objc_method=04086;
   type_e_no_type_info=04087;
+  type_e_ordinal_or_string_expr_expected=04088;
+  type_e_string_expr_expected=04089;
   sym_e_id_not_found=05000;
   sym_f_internal_error_in_symtablestack=05001;
   sym_e_duplicate_id=05002;
@@ -789,9 +791,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 51588;
+  MsgTxtSize = 51669;
 
   MsgIdxMax : array[1..20] of longint=(
-    24,87,253,88,65,50,108,22,202,62,
+    24,87,253,90,65,50,108,22,202,62,
     47,20,1,1,1,1,1,1,1,1
   );

compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000214] of string[240]=(
+const msgtxt : array[0..000215] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000214,1..240] of char=(
+const msgtxt : array[0..000215,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -484,429 +484,431 @@ const msgtxt : array[0..000214,1..240] of char=(
   '04085_E_Expected Objective-C method, but got $1'#000+
   '04086_','E_Expected Objective-C method or constant method name'#000+
   '04087_E_No type info available for this type'#000+
+  '04088_E_Ordinal or string expression expected'#000+
+  '04089_E_String expression expected'#000+
   '05000_E_Identifier not found "$1"'#000+
-  '05001_F_Internal Error in SymTableStack()'#000+
+  '05001_F_Internal Error in ','SymTableStack()'#000+
   '05002_E_Duplicate identifier "$1"'#000+
-  '05003_H_Identifier already defi','ned in $1 at line $2'#000+
+  '05003_H_Identifier already defined in $1 at line $2'#000+
   '05004_E_Unknown identifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
   '05007_E_Error in type definition'#000+
-  '05009_E_Forward type not resolved "$1"'#000+
+  '05009_E_Forward type not reso','lved "$1"'#000+
   '05010_E_Only static variables can be used in static methods or outside'+
-  ' ','methods'#000+
+  ' methods'#000+
   '05012_F_record or class type expected'#000+
   '05013_E_Instances of classes or objects with an abstract method are no'+
   't allowed'#000+
   '05014_W_Label not defined "$1"'#000+
-  '05015_E_Label used but not defined "$1"'#000+
+  '05','015_E_Label used but not defined "$1"'#000+
   '05016_E_Illegal label declaration'#000+
-  '05017_E_G','OTO and LABEL are not supported (use switch -Sg)'#000+
+  '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
-  '05021_E_illegal type declaration of set elements'#000+
+  '05021_E_illegal type de','claration of set elements'#000+
   '05022_E_Forward class definition not resolved "$1"'#000+
-  '0502','3_H_Unit "$1" not used in $2'#000+
+  '05023_H_Unit "$1" not used in $2'#000+
   '05024_H_Parameter "$1" not used'#000+
   '05025_N_Local variable "$1" not used'#000+
   '05026_H_Value parameter "$1" is assigned but never used'#000+
-  '05027_N_Local variable "$1" is assigned but never used'#000+
-  '05028_H_Local $1 "$2" is not us','ed'#000+
+  '05027','_N_Local variable "$1" is assigned but never used'#000+
+  '05028_H_Local $1 "$2" is not used'#000+
   '05029_N_Private field "$1.$2" is never used'#000+
   '05030_N_Private field "$1.$2" is assigned but never used'#000+
   '05031_N_Private method "$1.$2" never used'#000+
-  '05032_E_Set type expected'#000+
+  '05032_E_Set t','ype expected'#000+
   '05033_W_Function result does not seem to be set'#000+
-  '05034_W_Type "$1" is',' not aligned correctly in current record for C'#000+
+  '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
   '05035_E_Unknown record field identifier "$1"'#000+
   '05036_W_Local variable "$1" does not seem to be initialized'#000+
-  '05037_W_Variable "$1" does not seem to be initialized'#000+
-  '05038_E_identifier idents no membe','r "$1"'#000+
+  '05037_W','_Variable "$1" does not seem to be initialized'#000+
+  '05038_E_identifier idents no member "$1"'#000+
   '05039_H_Found declaration: $1'#000+
   '05040_E_Data element too large'#000+
   '05042_E_No matching implementation for interface method "$1" found'#000+
-  '05043_W_Symbol "$1" is deprecated'#000+
+  '05043_W_Symbol "$1" is d','eprecated'#000+
   '05044_W_Symbol "$1" is not portable'#000+
-  '05055_W_Symbol "$1" is not implemen','ted'#000+
+  '05055_W_Symbol "$1" is not implemented'#000+
   '05056_E_Can'#039't create unique type from this type'#000+
   '05057_H_Local variable "$1" does not seem to be initialized'#000+
-  '05058_H_Variable "$1" does not seem to be initialized'#000+
+  '05058_H_Variable "$1" does not seem to be initi','alized'#000+
   '05059_W_Function result variable does not seem to initialized'#000+
-  '05060_H_Func','tion result variable does not seem to be initialized'#000+
+  '05060_H_Function result variable does not seem to be initialized'#000+
   '05061_W_Variable "$1" read but nowhere assigned'#000+
   '05062_H_Found abstract method: $1'#000+
-  '05063_W_Symbol "$1" is experimental'#000+
+  '05063_W_Symbol "$1" is e','xperimental'#000+
   '05064_W_Forward declaration "$1" not resolved, assumed external'#000+
-  '06009','_E_Parameter list size exceeds 65535 bytes'#000+
+  '06009_E_Parameter list size exceeds 65535 bytes'#000+
   '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
-  '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possible illegal call of constructor or dest','ructor'#000+
+  '06015_E_EXPORT declar','ed functions can'#039't be called'#000+
+  '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
   '06027_DL_Register $1 weight $2 $3'#000+
-  '06029_DL_Stack frame is omitted'#000+
+  '06029_DL_Stack fra','me is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
-  '06032_E_Procvar ca','lls cannot be inline.'#000+
+  '06032_E_Procvar calls cannot be inline.'#000+
   '06033_E_No code for inline procedure stored'#000+
   '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
-  'sed, use (set)length instead'#000+
+  'sed, use (set)length instea','d'#000+
   '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
   'th'#039' clause'#000+
-  '06','038_E_Cannot call message handler methods directly'#000+
+  '06038_E_Cannot call message handler methods directly'#000+
   '06039_E_Jump in or outside of an exception block'#000+
-  '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
+  '06040_E_Control flow statements aren'#039't allowed in a finally',' bloc'+
+  'k'#000+
   '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
-  '06042_W_Local vari','able size exceed limit for certain cpu'#039's'#000+
+  '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
   '06043_E_Local variables size exceeds supported limit'#000+
   '06044_E_BREAK not allowed'#000+
   '06045_E_CONTINUE not allowed'#000+
-  '06046_F_Unknown compilerproc "$1". Check if you use the correct run ti'+
-  'me library.'#000+
-  '06047_F_C','annot find system type "$1". Check if you use the correct r'+
-  'un time library.'#000+
+  '06046_F_Un','known compilerproc "$1". Check if you use the correct run '+
+  'time library.'#000+
+  '06047_F_Cannot find system type "$1". Check if you use the correct run'+
+  ' time library.'#000+
   '06048_H_Inherited call to abstract method ignored'#000+
-  '06049_E_Goto label "$1" not defined or optimized away'#000+
+  '06049_E_Goto label "$1" not defin','ed or optimized away'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
-  '07001_DL_Finis','hed $1 styled assembler parsing'#000+
+  '07001_DL_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
-  '07006_E_TYPE used without identifier'#000+
+  '07006_E_TYPE u','sed without identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
-  '07008','_E_need to use OFFSET here'#000+
+  '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
   '07010_E_Cannot use multiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
-  '07012_E_Invalid constant expression'#000+
+  '07012_E_Inva','lid constant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
-  '07014_E_Invalid',' reference syntax'#000+
+  '07014_E_Invalid reference syntax'#000+
   '07015_E_You can not reach $1 from that code'#000+
   '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
-  '07017_E_Invalid base and index register usage'#000+
+  '07017_E_Invalid base and index register',' usage'#000+
   '07018_W_Possible error in object field handling'#000+
-  '07019_E_Wrong scale factor',' specified'#000+
+  '07019_E_Wrong scale factor specified'#000+
   '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
-  '07023_W_@CODE and @DATA not supported'#000+
+  '07023_W_@CODE and @DATA not supporte','d'#000+
   '07024_E_Null label references are not allowed'#000+
-  '07025_E_Divide by zero in asm eva','luator'#000+
+  '07025_E_Divide by zero in asm evaluator'#000+
   '07026_E_Illegal expression'#000+
   '07027_E_escape sequence ignored: $1'#000+
   '07028_E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
-  '07030_W_$1 without operand translated into $1P'#000+
-  '07031_W_ENTER instruction is not su','pported by Linux kernel'#000+
+  '0','7030_W_$1 without operand translated into $1P'#000+
+  '07031_W_ENTER instruction is not supported by Linux kernel'#000+
   '07032_W_Calling an overload function in assembler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
-  '07035_E_Error converting decimal $1'#000+
+  '0703','5_E_Error converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
-  '07037_E_Error c','onverting binary $1'#000+
+  '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
   '07039_H_$1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
-  '07041_E_Cannot use SELF outside a method'#000+
+  '07041_E_Cannot use S','ELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
-  '07043_W','_Procedures can'#039't return any value in asm code'#000+
+  '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
-  '07046_W_Size suffix and destination or source size do not match'#000+
+  '07046_W_Size suffix an','d destination or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
-  '07048_E_','Invalid combination of opcode and operands'#000+
+  '07048_E_Invalid combination of opcode and operands'#000+
   '07049_E_Assembler syntax error in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
-  '07051_E_Invalid String expression'#000+
+  '07051_E_Invalid String expressi','on'#000+
   '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
-  '07053_E_','Unrecognized opcode $1'#000+
+  '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
-  '07056_E_Invalid combination of override and opcode: $1'#000+
+  '07056_E_Invalid combination of override and opcod','e: $1'#000+
   '07057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
-  '07059_W_FAR ignored'#000,
+  '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
   '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
-  '07064_E_Invalid floating point register name'#000+
+  '07064_E_Invalid floating ','point register name'#000+
   '07066_W_Modulo not supported'#000+
-  '07067_E_Invalid floating point c','onstant $1'#000+
+  '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
   '07069_E_Wrong symbol type'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
-  '07071_E_Invalid segment override expression'#000+
+  '07071_E_Invalid se','gment override expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
-  '07073_E_Strings',' not allowed as constants'#000+
+  '07073_E_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
   '07075_E_assembler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
-  '07077_E_Using a defined name as a local label'#000+
-  '07078_E_Dollar token is used without ','an identifier'#000+
+  '07','077_E_Using a defined name as a local label'#000+
+  '07078_E_Dollar token is used without an identifier'#000+
   '07079_W_32bit constant created for address'#000+
   '07080_N_.align is target specific, use .balign or .p2align'#000+
-  '07081_E_Can'#039't access fields directly for parameters'#000+
+  '07081_E_Can'#039't access fields directly for pa','rameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size ','specified and unable to determine the size of the op'+
-  'erands'#000+
+  '07083_E_No size specified and unable to determine the size of the oper'+
+  'ands'#000+
   '07084_E_Cannot use RESULT in this function'#000+
-  '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
+  '07086_W_"$1" without operand translated into "$1 %st,%st(','1)"'#000+
   '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
-  '07088_W_"$1 %st(n)" trans','lated into "$1 %st(n),%st"'#000+
+  '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
   '07090_E_Char > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
-  '07095_E_Invalid reglist for movem'#000+
+  '0','7095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
-  '07097_E_Highe','r cpu mode required ($1)'#000+
+  '07097_E_Higher cpu mode required ($1)'#000+
   '07098_W_No size specified and unable to determine the size of the oper'+
   'ands, using DWORD as default'#000+
-  '07099_E_Syntax error while trying to parse a shifter operand'#000+
-  '07100_E_Address of packed component is not at a byte bo','undary'#000+
+  '07099_E_Syntax error while trying t','o parse a shifter operand'#000+
+  '07100_E_Address of packed component is not at a byte boundary'#000+
   '07101_W_No size specified and unable to determine the size of the oper'+
   'ands, using BYTE as default'#000+
-  '07102_W_Use of +offset(%ebp) for parameters invalid here'#000+
+  '07102_W_Use of +offset(%ebp) for parameters invalid he','re'#000+
   '07103_W_Use of +offset(%ebp) is not compatible with regcall convention'+
   #000+
-  '07104_W','_Use of -offset(%ebp) is not recommended for local variable a'+
-  'ccess'#000+
+  '07104_W_Use of -offset(%ebp) is not recommended for local variable acc'+
+  'ess'#000+
   '07105_W_Use of -offset(%esp), access may cause a crash or value may be'+
   ' lost'#000+
-  '07106_E_VMTOffset must be used in combination with a virtual method, a'+
-  'nd "$1" is not virtual'#000+
-  '0710','7_E_Generating PIC, but reference is not PIC-safe'#000+
+  '07106_E_VMTOffse','t must be used in combination with a virtual method,'+
+  ' and "$1" is not virtual'#000+
+  '07107_E_Generating PIC, but reference is not PIC-safe'#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
-  '08003_F_Direct not support for binary writers'#000+
-  '08004_E_Allocating of data is only a','llowed in bss section'#000+
+  '0','8003_F_Direct not support for binary writers'#000+
+  '08004_E_Allocating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
-  '08008_E_Asm: 16 Bit references not supported'#000+
+  '08008_E_','Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
-  '08010','_E_Asm: Immediate or reference expected'#000+
+  '08010_E_Asm: Immediate or reference expected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
   '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
-  '08014_E_Asm: Comp type not supported for this target'#000+
-  '08015_E_Asm: Extended type not s','upported for this target'#000+
+  '0801','4_E_Asm: Comp type not supported for this target'#000+
+  '08015_E_Asm: Extended type not supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
   '08018_E_Asm: First defined here'#000+
   '08019_E_Asm: Invalid register $1'#000+
-  '08020_E_Asm: 16 or 32 Bit references not supported'#000+
-  '08021_E_Asm: 64 Bit operands not su','pported'#000+
+  '08020','_E_Asm: 16 or 32 Bit references not supported'#000+
+  '08021_E_Asm: 64 Bit operands not supported'#000+
   '09000_W_Source operating system redefined'#000+
   '09001_I_Assembling (pipe) $1'#000+
   '09002_E_Can'#039't create assembler file: $1'#000+
   '09003_E_Can'#039't create object file: $1'#000+
-  '09004_E_Can'#039't create archive file: $1'#000+
-  '09005_E_Assembler $1 not found, switching to e','xternal assembling'#000+
+  '090','04_E_Can'#039't create archive file: $1'#000+
+  '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
-  'ssembling'#000+
+  'sse','mbling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling with smartlinking $1'#000+
-  '09011_W_Obje','ct $1 not found, Linking may fail !'#000+
+  '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't call the linker, switching to external linking'#000+
+  '09014_E_Can'#039't call the linker, switching to ex','ternal linking'#000+
   '09015_I_Linking $1'#000+
-  '09016_E_Util $1 not found, switching to externa','l linking'#000+
+  '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
-  '09020_I_Closing script $1'#000+
+  '09020_I_Closing script',' $1'#000+
   '09021_E_resource compiler "$1" not found, switching to external mode'#000+
-  '09022_I_','Compiling resource $1'#000+
+  '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
   'king'#000+
-  '09024_T_unit $1 can'#039't be smart linked, switching to static linking'+
+  '09024_T_unit $1 can'#039't be smart linked, switching to static linking',
   #000+
   '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
   'g'#000+
-  '09026_E_unit',' $1 can'#039't be smart or static linked'#000+
+  '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_D_Calling resource compiler "$1" with "$2" as command line'#000+
-  '09029_E_Error while compiling resources'#000+
-  '09030_E_Can'#039't call the resource compiler "$1", swi','tching to exte'+
-  'rnal mode'#000+
+  '09029_E_E','rror while compiling resources'#000+
+  '09030_E_Can'#039't call the resource compiler "$1", switching to extern'+
+  'al mode'#000+
   '09031_E_Can'#039't open resource file "$1"'#000+
   '09032_E_Can'#039't write resource file "$1"'#000+
   '09128_F_Can'#039't post process executable $1'#000+
-  '09129_F_Can'#039't open executable $1'#000+
+  '09129_F_Can'#039't ope','n executable $1'#000+
   '09130_X_Size of Code: $1 bytes'#000+
-  '09131_X_Size of initialized data: ','$1 bytes'#000+
+  '09131_X_Size of initialized data: $1 bytes'#000+
   '09132_X_Size of uninitialized data: $1 bytes'#000+
   '09133_X_Stack space reserved: $1 bytes'#000+
   '09134_X_Stack space committed: $1 bytes'#000+
-  '09200_F_Executable image size is too big for $1 target.'#000+
-  '09201_W_Object file "$1" contains 32-bit absolute r','elocation to symb'+
-  'ol "$2".'#000+
+  '09200_F_Executable image s','ize is too big for $1 target.'#000+
+  '09201_W_Object file "$1" contains 32-bit absolute relocation to symbol'+
+  ' "$2".'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
-  '10006_U_PPU File too short'#000+
+  '100','06_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
-  '10008_U_','PPU Invalid Version $1'#000+
+  '10008_U_PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for another processor'#000+
   '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
-  '10013_F_Can'#039't Write PPU-File'#000+
+  '1001','3_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
-  '10015_F_unexpected end of',' PPU-File'#000+
+  '10015_F_unexpected end of PPU-File'#000+
   '10016_F_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between $1 and $2'#000+
+  '10020_F_Circular unit reference',' between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
-  '10022_F_Ca','n'#039't find unit $1 used by $2'#000+
+  '10022_F_Can'#039't find unit $1 used by $2'#000+
   '10023_W_Unit $1 was not found but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
-  '10025_W_Compiling the system unit requires the -Us switch'#000+
+  '10025_W_Compiling the system unit requires the -U','s switch'#000+
   '10026_F_There were $1 errors compiling module, stopping'#000+
-  '10027_U_Load fro','m $1 ($2) unit $3'#000+
+  '10027_U_Load from $1 ($2) unit $3'#000+
   '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
-  '10030_U_Recompiling unit, static lib is older than ppufile'#000+
+  '10030_U_Recompiling unit, static lib is older than ','ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recomp','iling unit, obj and asm are older than ppufile'#000+
+  '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
-  '10035_U_Parsing implementation of $1'#000+
+  '10035_U_Parsing implementation o','f $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10040_W_Ca','n'#039't recompile unit $1, but found modifed include files'+
-  #000+
+  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
   '10041_U_File $1 is newer than PPU file $2'#000+
-  '10042_U_Trying to use a unit which was compiled with a different FPU m'+
-  'ode'#000+
+  '10042_U_Trying to use a unit which was compiled with a differe','nt FPU'+
+  ' mode'#000+
   '10043_U_Loading interface units from $1'#000+
-  '10044_U_Loading implementatio','n units from $1'#000+
+  '10044_U_Loading implementation units from $1'#000+
   '10045_U_Interface CRC changed for unit $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
   '10047_U_Finished compiling unit $1'#000+
-  '10048_U_Add dependency of $1 to $2'#000+
+  '10048_U_Add depende','ncy of $1 to $2'#000+
   '10049_U_No reload, is caller: $1'#000+
-  '10050_U_No reload, already in se','cond compile: $1'#000+
+  '10050_U_No reload, already in second compile: $1'#000+
   '10051_U_Flag for reload: $1'#000+
   '10052_U_Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
   '10054_U_Already compiling $1, setting second compile'#000+
-  '10055_U_Loading unit $1'#000+
+  '100','55_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
-  '10057_U_Registering new uni','t $1'#000+
+  '10057_U_Registering new unit $1'#000+
   '10058_U_Re-resolving unit $1'#000+
   '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
   '10060_U_Unloading resource unit $1 (not needed)'#000+
-  '10061_E_Unit $1 was compiled using a different whole program optimizat'+
-  'ion feedback input ($2, ','$3); recompile it without wpo or use the sam'+
+  '10061_E_Unit ','$1 was compiled using a different whole program optimiz'+
+  'ation feedback input ($2, $3); recompile it without wpo or use the sam'+
   'e wpo feedback input file for this compilation invocation'#000+
   '11000_O_$1 [options] <inputfile> [options]'#000+
-  '11001_W_Only one source file supported, changing source file to compil'+
-  'e from "$1" into "$2"'#000+
-  '110','02_W_DEF file can be created only for OS/2'#000+
+  '11001_W_Only o','ne source file supported, changing source file to comp'+
+  'ile from "$1" into "$2"'#000+
+  '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
-  '11005_N_No option inside $1 config file'#000+
+  '11005_N_No option inside',' $1 config file'#000+
   '11006_E_Illegal parameter: $1'#000+
   '11007_H_-? writes help pages'#000+
-  '11008_','F_Too many config files nested'#000+
+  '11008_F_Too many config files nested'#000+
   '11009_F_Unable to open file $1'#000+
   '11010_D_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
-  '11012_W_Shared libs not supported on DOS platform, reverting to static'+
-  #000+
-  '11013_F_In options file $1 at ','line $2 too many \var{\#IF(N)DEFs} enc'+
-  'ountered'#000+
+  '11012_W_Shared libs ','not supported on DOS platform, reverting to stat'+
+  'ic'#000+
+  '11013_F_In options file $1 at line $2 too many \var{\#IF(N)DEFs} encou'+
+  'ntered'#000+
   '11014_F_In options file $1 at line $2 unexpected \var{\#ENDIFs} encoun'+
   'tered'#000+
-  '11015_F_Open conditional at the end of the options file'#000+
-  '11016_W_Debug information generation is not supported by this',' execut'+
-  'able'#000+
+  '11015_F_Open conditional at the end ','of the options file'#000+
+  '11016_W_Debug information generation is not supported by this executab'+
+  'le'#000+
   '11017_H_Try recompiling with -dGDB'#000+
   '11018_W_You are using the obsolete switch $1'#000+
   '11019_W_You are using the obsolete switch $1, please use $2'#000+
-  '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler output',' selected "$1" is not compatible with "$2"'#000+
+  '11020_N','_Switching assembler to default source writing assembler'#000+
+  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
-  '11028_D_Handling option "$1"'#000+
+  '1','1028_D_Handling option "$1"'#000+
   '11029_O_*** press enter ***'#000+
-  '11030_H_Start of reading ','config file $1'#000+
+  '11030_H_Start of reading config file $1'#000+
   '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
-  '11033_D_interpreting file option "$1"'#000+
+  '11033_D_interpreting file opti','on "$1"'#000+
   '11034_D_Reading config file "$1"'#000+
   '11035_D_found source file name "$1"'#000+
-  '1103','9_E_Unknown code page'#000+
+  '11039_E_Unknown code page'#000+
   '11040_F_Config file $1 is a directory'#000+
   '11041_W_Assembler output selected "$1" cannot generate debug info, deb'+
   'ugging disabled'#000+
-  '11042_W_Use of ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
-  '11043_F_In options file $1',' at line $2 \var{\#ELSE} directive without'+
-  ' \var{\#IF(N)DEF} found'#000+
+  '11042_W_Use o','f ppc386.cfg is deprecated, please use fpc.cfg instead'#000+
+  '11043_F_In options file $1 at line $2 \var{\#ELSE} directive without \'+
+  'var{\#IF(N)DEF} found'#000+
   '11044_F_Option "$1" is not, or not yet, supported on the current targe'+
   't platform'#000+
-  '11045_F_The feature "$1" is not, or not yet, supported on the selected'+
-  ' target platform'#000+
-  '11046_','N_DWARF debug information cannot be used with smart linking on'+
-  ' this target, switching to static linking'#000+
-  '12000_F_Cannot open whole program optimization feedback file "$1"'#000+
-  '12001_D_Processing whole program optimization information in wpo feedb',
+  '11045_F_The ','feature "$1" is not, or not yet, supported on the select'+
+  'ed target platform'#000+
+  '11046_N_DWARF debug information cannot be used with smart linking on t'+
+  'his target, switching to static linking'#000+
+  '12000_F_Cannot open whole program optimization feedback',' file "$1"'#000+
+  '12001_D_Processing whole program optimization information in wpo feedb'+
   'ack file "$1"'#000+
   '12002_D_Finished processing the whole program optimization information'+
   ' in wpo feedback file "$1"'#000+
-  '12003_E_Expected section header, but got "$2" at line $1 of wpo feedba'+
-  'ck file'#000+
-  '12004_W_No handler registered for whole program opt','imization section'+
-  ' "$2" at line $1 of wpo feedback file, ignoring'#000+
+  '12003_E_Expected section header, but got "$2" at',' line $1 of wpo feed'+
+  'back file'#000+
+  '12004_W_No handler registered for whole program optimization section "'+
+  '$2" at line $1 of wpo feedback file, ignoring'#000+
   '12005_D_Found whole program optimization section "$1" with information'+
   ' about "$2"'#000+
-  '12006_F_The selected whole program optimizations require a previously '+
-  'generated feedback file',' (use -Fw to specify)'#000+
+  '12006_F_The ','selected whole program optimizations require a previousl'+
+  'y generated feedback file (use -Fw to specify)'#000+
   '12007_E_No collected information necessary to perform "$1" whole progr'+
   'am optimization found'#000+
-  '12008_F_Specify a whole program optimization feedback file to store th'+
-  'e generated info in (using -FW)'#000+
-  '12009_E_Not generating a','ny whole program optimization information, y'+
-  'et a feedback file was specified (using -FW)'#000+
-  '12010_E_Not performing any whole program optimizations, yet an input f'+
+  '12008_F_Specify a whole program optimization ','feedback file to store '+
+  'the generated info in (using -FW)'#000+
+  '12009_E_Not generating any whole program optimization information, yet'+
+  ' a feedback file was specified (using -FW)'#000+
+  '12010_E_Not performing any whole program optimizations, yet an input f',
   'eedback file was specified (using -Fw)'#000+
-  '12011_D_Skipping whole program optimizatio','n section "$1", because no'+
-  't needed by the requested optimizations'#000+
+  '12011_D_Skipping whole program optimization section "$1", because not '+
+  'needed by the requested optimizations'#000+
   '12012_W_Overriding previously read information for "$1" from feedback '+
-  'input file using information in section "$2"'#000+
-  '12013_E_Cannot extract symbol liveness information from pro','gram when'+
-  ' stripping symbols, use -Xs-'#000+
+  'input file using inform','ation in section "$2"'#000+
+  '12013_E_Cannot extract symbol liveness information from program when s'+
+  'tripping symbols, use -Xs-'#000+
   '12014_E_Cannot extract symbol liveness information from program when w'+
   'hen not linking'#000+
-  '12015_F_Cannot find "$1" or "$2" to extract symbol liveness informatio'+
-  'n from linked program'#000+
-  '12016_E_Error during rea','ding symbol liveness information produced by'+
-  ' "$1"'#000+
+  '12015_F_Cannot find "$1" or "$2" to',' extract symbol liveness informat'+
+  'ion from linked program'#000+
+  '12016_E_Error during reading symbol liveness information produced by "'+
+  '$1"'#000+
   '12017_F_Error executing "$1" (exitcode: $2) to extract symbol informat'+
   'ion from linked program'#000+
-  '12018_E_Collection of symbol liveness information can only help when u'+
-  'sing smart linking, use -C','X -XX'#000+
+  '12018_E_Collect','ion of symbol liveness information can only help when'+
+  ' using smart linking, use -CX -XX'#000+
   '12019_E_Cannot create specified whole program optimisation feedback fi'+
   'le "$1"'#000+
   '11023_Free Pascal Compiler version $FPCFULLVERSION [$FPCDATE] for $FPC'+
   'CPU'#010+
-  'Copyright (c) 1993-2009 by Florian Klaempfl'#000+
-  '11024_Free Pascal Compiler version $FP','CVERSION'#010+
+  'C','opyright (c) 1993-2009 by Florian Klaempfl'#000+
+  '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
   'Compiler CPU Target: $FPCCPU'#010+
@@ -917,11 +919,11 @@ const msgtxt : array[0..000214,1..240] of char=(
   'Supported CPU instruction sets:'#010+
   '  $INSTRUCTIONSETS'#010+
   #010+
-  'Supported FPU instruction sets:'#010+
+  'Supp','orted FPU instruction sets:'#010+
   '  $FPUINSTRUCTIONSETS'#010+
   #010+
   'Supported ABI targets:'#010+
-  '  $ABIT','ARGETS'#010+
+  '  $ABITARGETS'#010+
   #010+
   'Supported Optimizations:'#010+
   '  $OPTIMIZATIONS'#010+
@@ -931,294 +933,291 @@ const msgtxt : array[0..000214,1..240] of char=(
   '  $WPOPTIMIZATIONS'#010+
   #010+
   'Supported Microcontroller types:'#010+
-  '  $CONTROLLERTYPES'#010+
+  '  $CONTROL','LERTYPES'#010+
   #010+
   'This program comes under the GNU General Public Licence'#010+
-  'For more inform','ation read COPYING.FPC'#010+
+  'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs, suggestions, etc. to:'#010+
   '                 http://bugs.freepascal.org'#010+
   'or'#010+
   '                 [email protected]'#000+
-  '11025_**0*_Put + after a boolean switch option to enable it, - to disa'+
-  'ble it'#010+
-  '**1a_The compiler do','esn'#039't delete the generated assembler file'#010+
+  '11025_**0*_Put +',' after a boolean switch option to enable it, - to di'+
+  'sable it'#010+
+  '**1a_The compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_List sourcecode lines in assembler file'#010+
   '**2an_List node info in assembler file'#010+
-  '*L2ap_Use pipes instead of creating temporary assembler files'#010+
-  '**2ar_List register allocation/release info in asse','mbler file'#010+
+  '*L2ap_Use pipes instead of creat','ing temporary assembler files'#010+
+  '**2ar_List register allocation/release info in assembler file'#010+
   '**2at_List temp allocation/release info in assembler file'#010+
   '**1A<x>_Output format:'#010+
   '**2Adefault_Use default assembler'#010+
   '3*2Aas_Assemble using GNU AS'#010+
-  '3*2Anasmcoff_COFF (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010,
+  '3*2A','nasmcoff_COFF (Go32v2) file using Nasm'#010+
+  '3*2Anasmelf_ELF32 (Linux) file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
   '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Awasm_Obj file using Wasm (Watcom)'#010+
-  '3*2Anasmobj_Obj file using Nasm'#010+
+  '3*2Anasmobj_Obj file using Na','sm'#010+
   '3*2Amasm_Obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_Obj file using Tasm (Borland',')'#010+
+  '3*2Atasm_Obj file using Tasm (Borland)'#010+
   '3*2Aelf_ELF (Linux) using internal writer'#010+
   '3*2Acoff_COFF (Go32v2) using internal writer'#010+
   '3*2Apecoff_PE-COFF (Win32) using internal writer'#010+
-  '4*2Aas_Assemble using GNU AS'#010+
+  '4*2Aas_Assemble using',' GNU AS'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
-  '6*2Amit_MI','T Syntax (old GAS)'#010+
+  '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   'A*2Aas_Assemble using GNU AS'#010+
   'P*2Aas_Assemble using GNU AS'#010+
   'S*2Aas_Assemble using GNU AS'#010+
-  '**1b_Generate browser info'#010+
+  '**1b_Generate bro','wser info'#010+
   '**2bl_Generate local symbol info'#010+
   '**1B_Build all modules'#010+
-  '**1C<x>_Code ge','neration options:'#010+
+  '**1C<x>_Code generation options:'#010+
   '**2Ca<x>_Select ABI, see fpc -i for possible values'#010+
   '**2Cb_Generate big-endian code'#010+
   '**2Cc<x>_Set default calling convention to <x>'#010+
-  '**2CD_Create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation with emulated floating p','oint opcodes'#010+
+  '**2CD_Creat','e also dynamic library (not supported)'#010+
+  '**2Ce_Compilation with emulated floating point opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use, see fpc -i for possible va'+
   'lues'#010+
   '**2CF<x>_Minimal floating point constant precision (default, 32, 64)'#010+
-  '**2Cg_Generate PIC code'#010+
+  '**','2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
-  '**2Ci_I','O-checking'#010+
+  '**2Ci_IO-checking'#010+
   '**2Cn_Omit linking stage'#010+
   '**2Co_Check overflow of integer operations'#010+
   '**2CO_Check for possible overflow of integer operations'#010+
-  '**2Cp<x>_Select instruction set, see fpc -i for possible values'#010+
+  '**2Cp<x>_Select instruct','ion set, see fpc -i for possible values'#010+
   '**2CP<x>=<y>_ packing settings'#010+
-  '**3CPPACKS','ET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, '+
-  '4 and 8'#010+
+  '**3CPPACKSET=<y>_ <y> set allocation: 0, 1 or DEFAULT or NORMAL, 2, 4 '+
+  'and 8'#010+
   '**2Cr_Range checking'#010+
   '**2CR_Verify object method call validity'#010+
-  '**2Cs<n>_Set stack checking size to <n>'#010+
+  '**2Cs<n>_Set stack checking siz','e to <n>'#010+
   '**2Ct_Stack checking (for testing only, see manual)'#010+
-  '**2CX_Create also sm','artlinked library'#010+
+  '**2CX_Create also smartlinked library'#010+
   '**1d<x>_Defines the symbol <x>'#010+
   '**1D_Generate a DEF file'#010+
   '**2Dd<x>_Set description to <x>'#010+
   '**2Dv<x>_Set DLL version to <x>'#010+
-  '*O2Dw_PM application'#010+
+  '*O2Dw_PM application'#010,
   '**1e<x>_Set path to executable'#010+
   '**1E_Same as -Cn'#010+
   '**1fPIC_Same as -Cg'#010+
-  '**1F<x>_Set f','ile names and paths:'#010+
+  '**1F<x>_Set file names and paths:'#010+
   '**2Fa<x>[,y]_(for a program) load units <x> and [y] before uses is par'+
   'sed'#010+
   '**2Fc<x>_Set input codepage to <x>'#010+
-  '**2FC<x>_Set RC compiler binary name to <x>'#010+
+  '**2FC<x>_Set RC compiler bina','ry name to <x>'#010+
   '**2Fd_Disable the compiler'#039's internal directory cache'#010+
-  '**2FD<x>_Set',' the directory where to search for compiler utilities'#010+
+  '**2FD<x>_Set the directory where to search for compiler utilities'#010+
   '**2Fe<x>_Redirect error output to <x>'#010+
   '**2Ff<x>_Add <x> to framework path (Darwin only)'#010+
-  '**2FE<x>_Set exe/unit output path to <x>'#010+
+  '**2FE<x>_Set exe/u','nit output path to <x>'#010+
   '**2Fi<x>_Add <x> to include path'#010+
-  '**2Fl<x>_Add <x> to libra','ry path'#010+
+  '**2Fl<x>_Add <x> to library path'#010+
   '**2FL<x>_Use <x> as dynamic linker'#010+
   '**2Fm<x>_Load unicode conversion table from <x>.txt in the compiler di'+
   'r'#010+
   '**2Fo<x>_Add <x> to object path'#010+
-  '**2Fr<x>_Load error message file <x>'#010+
+  '**2Fr<x>_Loa','d error message file <x>'#010+
   '**2FR<x>_Set resource (.res) linker to <x>'#010+
-  '**2Fu<x>_Add ','<x> to unit path'#010+
+  '**2Fu<x>_Add <x> to unit path'#010+
   '**2FU<x>_Set unit output path to <x>, overrides -FE'#010+
   '**2FW<x>_Store generated whole-program optimization feedback in <x>'#010+
-  '**2Fw<x>_Load previously stored whole-program optimization feedback fr'+
-  'om <x>'#010+
-  '*g1g_Generate debug inform','ation (default format for target)'#010+
+  '**2Fw<x>_Load previous','ly stored whole-program optimization feedback '+
+  'from <x>'#010+
+  '*g1g_Generate debug information (default format for target)'#010+
   '*g2gc_Generate checks for pointers'#010+
   '*g2gh_Use heaptrace unit (for memory leak/corruption debugging)'#010+
-  '*g2gl_Use line info unit (show more info with backtraces)'#010+
+  '*g2gl_Use line info unit (','show more info with backtraces)'#010+
   '*g2go<x>_Set debug information options'#010+
-  '*g3godwarf','sets_ Enable DWARF set debug information (breaks gdb < 6.5'+
-  ')'#010+
+  '*g3godwarfsets_ Enable DWARF set debug information (breaks gdb < 6.5)'#010+
   '*g3gostabsabsincludes_ Store absolute/full include file paths in Stabs'+
   #010+
-  '*g2gp_Preserve case in stabs symbol names'#010+
+  '*g2gp_Preserve case in stabs',' symbol names'#010+
   '*g2gs_Generate Stabs debug information'#010+
-  '*g2gt_Trash local variables ','(to detect uninitialized uses)'#010+
+  '*g2gt_Trash local variables (to detect uninitialized uses)'#010+
   '*g2gv_Generates programs traceable with Valgrind'#010+
   '*g2gw_Generate DWARFv2 debug information (same as -gw2)'#010+
-  '*g2gw2_Generate DWARFv2 debug information'#010+
+  '*g2gw2_Generate DWARFv2',' debug information'#010+
   '*g2gw3_Generate DWARFv3 debug information'#010+
   '**1i_Information'#010+
-  '**2','iD_Return compiler date'#010+
+  '**2iD_Return compiler date'#010+
   '**2iV_Return short compiler version'#010+
   '**2iW_Return full compiler version'#010+
   '**2iSO_Return compiler OS'#010+
-  '**2iSP_Return compiler host processor'#010+
+  '**2iSP_Return compiler host processor'#010,
   '**2iTO_Return target OS'#010+
   '**2iTP_Return target processor'#010+
-  '**1I<x>_Add <x> to include',' path'#010+
+  '**1I<x>_Add <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_Write logo'#010+
   '**1M<x>_Set language mode to <x>'#010+
   '**2Mfpc_Free Pascal dialect (default)'#010+
-  '**2Mobjfpc_FPC mode with Object Pascal support'#010+
+  '**2Mobjfpc_FPC mode with Object Pas','cal support'#010+
   '**2Mdelphi_Delphi 7 compatibility mode'#010+
-  '**2Mtp_TP/BP 7.0 compatibility',' mode'#010+
+  '**2Mtp_TP/BP 7.0 compatibility mode'#010+
   '**2Mmacpas_Macintosh Pascal dialects compatibility mode'#010+
   '**1n_Do not read the default config files'#010+
   '**1N<x>_Node tree optimizations'#010+
   '**2Nu_Unroll loops'#010+
-  '**1o<x>_Change the name of the executable produced to <x>'#010+
+  '**1o','<x>_Change the name of the executable produced to <x>'#010+
   '**1O<x>_Optimizations:'#010+
-  '**2O','-_Disable optimizations'#010+
+  '**2O-_Disable optimizations'#010+
   '**2O1_Level 1 optimizations (quick and debugger friendly)'#010+
   '**2O2_Level 2 optimizations (-O1 + quick optimizations)'#010+
-  '**2O3_Level 3 optimizations (-O2 + slow optimizations)'#010+
+  '**2O3_Level 3 optimiz','ations (-O2 + slow optimizations)'#010+
   '**2Oa<x>=<y>_Set alignment'#010+
-  '**2Oo[NO]<x>_Enable ','or disable optimizations, see fpc -i for possibl'+
-  'e values'#010+
+  '**2Oo[NO]<x>_Enable or disable optimizations, see fpc -i for possible '+
+  'values'#010+
   '**2Op<x>_Set target cpu for optimizing, see fpc -i for possible values'+
   #010+
-  '**2OW<x>_Generate whole-program optimization feedback for optimization'+
-  ' <x>, see fpc -i for possible values'#010+
-  '**2Ow','<x>_Perform whole-program optimization <x>, see fpc -i for poss'+
-  'ible values'#010+
+  '**2OW<x>_Generate whole-program',' optimization feedback for optimizati'+
+  'on <x>, see fpc -i for possible values'#010+
+  '**2Ow<x>_Perform whole-program optimization <x>, see fpc -i for possib'+
+  'le values'#010+
   '**2Os_Optimize for size rather than speed'#010+
-  '**1pg_Generate profile code for gprof (defines FPC_PROFILE)'#010+
+  '**1pg_Generate profile code for gprof (def','ines FPC_PROFILE)'#010+
   '**1R<x>_Assembler reading style:'#010+
-  '**2Rdefault_Use default assemb','ler for target'#010+
+  '**2Rdefault_Use default assembler for target'#010+
   '3*2Ratt_Read AT&T style assembler'#010+
   '3*2Rintel_Read Intel style assembler'#010+
   '6*2RMOT_Read motorola style assembler'#010+
   '**1S<x>_Syntax options:'#010+
-  '**2S2_Same as -Mobjfpc'#010+
+  '**2S2_Same ','as -Mobjfpc'#010+
   '**2Sc_Support operators like C (*=,+=,/= and -=)'#010+
-  '**2Sa_Turn on assert','ions'#010+
+  '**2Sa_Turn on assertions'#010+
   '**2Sd_Same as -Mdelphi'#010+
   '**2Se<x>_Error options. <x> is a combination of the following:'#010+
   '**3*_<n> : Compiler halts after the <n> errors (default is 1)'#010+
-  '**3*_w : Compiler also halts after warnings'#010+
+  '**3*_w',' : Compiler also halts after warnings'#010+
   '**3*_n : Compiler also halts after notes'#010+
-  '**','3*_h : Compiler also halts after hints'#010+
+  '**3*_h : Compiler also halts after hints'#010+
   '**2Sg_Enable LABEL and GOTO (default in -Mtp and -Mdelphi)'#010+
   '**2Sh_Use ansistrings by default instead of shortstrings'#010+
-  '**2Si_Turn on inlining of procedures/functions declared as "inline"'#010+
-  '**2Sk_Load fpcyli','x unit'#010+
+  '**2S','i_Turn on inlining of procedures/functions declared as "inline"'#010+
+  '**2Sk_Load fpcylix unit'#010+
   '**2SI<x>_Set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
-  '**2Sm_Support macros like C (global)'#010+
+  '**2Sm_Support macros like C (globa','l)'#010+
   '**2So_Same as -Mtp'#010+
-  '**2Ss_Constructor name must be init (destructor must be don','e)'#010+
+  '**2Ss_Constructor name must be init (destructor must be done)'#010+
   '**2St_Allow static keyword in objects'#010+
   '**2Sx_Enable exception keywords (default in Delphi/ObjFPC modes)'#010+
   '**1s_Do not call assembler and linker'#010+
-  '**2sh_Generate script to link on host'#010+
+  '**2sh_Generate ','script to link on host'#010+
   '**2st_Generate script to link on target'#010+
-  '**2sr_Skip registe','r allocation phase (use with -alr)'#010+
+  '**2sr_Skip register allocation phase (use with -alr)'#010+
   '**1T<x>_Target operating system:'#010+
   '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
-  '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
+  '3*2Tgo32v2_Version 2 ','of DJ Delorie DOS extender'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
-  '3*2Tnetware_Novell N','etware Module (clib)'#010+
+  '3*2Tnetware_Novell Netware Module (clib)'#010+
   '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Tsymbian_Symbian OS'#010+
-  '3*2Twatcom_Watcom compatible DOS extender'#010+
+  '3*','2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
-  '3*2Twin32_Wi','ndows 32 Bit'#010+
+  '3*2Twin32_Windows 32 Bit'#010+
   '3*2Twince_Windows CE'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
   '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux/m68k'#010+
-  '6*2Tmacos_Macintosh m68k (not supported)'#010+
+  '6*2Tmacos_Macintosh m68k (not suppor','ted)'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tlinux_Linux'#010+
   'A*2Twince_Windows CE'#010+
-  'P*2Tamiga_AmigaOS on ','PowerPC'#010+
+  'P*2Tamiga_AmigaOS on PowerPC'#010+
   'P*2Tdarwin_Darwin and Mac OS X on PowerPC'#010+
   'P*2Tlinux_Linux on PowerPC'#010+
   'P*2Tmacos_Mac OS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
   'S*2Tlinux_Linux'#010+
-  '**1u<x>_Undefines the symbol <x>'#010+
+  '**1u<x>_','Undefines the symbol <x>'#010+
   '**1U_Unit options:'#010+
-  '**2Un_Do not check where the unit nam','e matches the file name'#010+
+  '**2Un_Do not check where the unit name matches the file name'#010+
   '**2Ur_Generate release unit files (never automatically recompiled)'#010+
   '**2Us_Compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
-  '**2*_e : Show errors (default)       0 : Show nothing ','(except errors'+
-  ')'#010+
+  '**1v<x>_Be verbose. <x> is a combination',' of the following letters:'#010+
+  '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  c : Show conditionals'#010+
-  '**2*_i : Show general info           d : Show ','debug info'#010+
+  '**2*_h : Show hints     ','             c : Show conditionals'#010+
+  '**2*_i : Show general info           d : Show debug info'#010+
   '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
   '**2*_s : Show time stamps            q : Show message numbers'#010+
-  '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
-  '**2*_b : Write file names m','essages   p : Write tree.log with parse t'+
-  'ree'#010+
+  '**2*_a : Show ev','erything             x : Executable info (Win32 only'+
+  ')'#010+
+  '**2*_b : Write file names messages   p : Write tree.log with parse tre'+
+  'e'#010+
   '**2*_    with full path              v : Write fpcdebug.txt with'#010+
-  '**2*_                                    lots of debugging info'#010+
+  '**2*_                                    lots of ','debugging info'#010+
   '**2*_m<x>,<y> : Don'#039't show messages numbered <x> and <y>'#010+
-  '3*1W<x>_T','arget-specific options (targets)'#010+
+  '3*1W<x>_Target-specific options (targets)'#010+
   'A*1W<x>_Target-specific options (targets)'#010+
   'P*1W<x>_Target-specific options (targets)'#010+
-  'p*1W<x>_Target-specific options (targets)'#010+
+  'p*1W<x>_Target-specific options (targets)'#010,
   '3*2Wb_Create a bundle instead of a library (Darwin)'#010+
-  'P*2Wb_Create a bundle instead',' of a library (Darwin)'#010+
+  'P*2Wb_Create a bundle instead of a library (Darwin)'#010+
   'p*2Wb_Create a bundle instead of a library (Darwin)'#010+
   '3*2WB_Create a relocatable image (Windows)'#010+
-  'A*2WB_Create a relocatable image (Windows, Symbian)'#010+
+  'A*2WB_Create a relocatable image (Windows',', Symbian)'#010+
   '3*2WC_Specify console type application (EMX, OS/2, Windows)'#010+
-  'A*2WC_Spec','ify console type application (Windows)'#010+
+  'A*2WC_Specify console type application (Windows)'#010+
   'P*2WC_Specify console type application (Classic Mac OS)'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
-  'A*2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
-  '3*2We_Use external re','sources (Darwin)'#010+
+  'A*','2WD_Use DEFFILE to export functions of DLL or EXE (Windows)'#010+
+  '3*2We_Use external resources (Darwin)'#010+
   'P*2We_Use external resources (Darwin)'#010+
   'p*2We_Use external resources (Darwin)'#010+
   '3*2WF_Specify full-screen type application (EMX, OS/2)'#010+
-  '3*2WG_Specify graphic type application (EMX, OS/2, Windows)'#010+
-  'A*2WG_Specify graphic type appli','cation (Windows)'#010+
+  '3*2WG_Speci','fy graphic type application (EMX, OS/2, Windows)'#010+
+  'A*2WG_Specify graphic type application (Windows)'#010+
   'P*2WG_Specify graphic type application (Classic Mac OS)'#010+
   '3*2Wi_Use internal resources (Darwin)'#010+
   'P*2Wi_Use internal resources (Darwin)'#010+
-  'p*2Wi_Use internal resources (Darwin)'#010+
-  '3*2WN_Do not generate relocation code, needed for deb','ugging (Windows'+
-  ')'#010+
+  'p*2Wi_Use ','internal resources (Darwin)'#010+
+  '3*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   'A*2WN_Do not generate relocation code, needed for debugging (Windows)'#010+
   '3*2WR_Generate relocation code (Windows)'#010+
-  'A*2WR_Generate relocation code (Windows)'#010+
+  'A*2WR_Generate relocation code ','(Windows)'#010+
   'P*2WT_Specify MPW tool type application (Classic Mac OS)'#010+
-  '3*2WX_Enable e','xecutable stack (Linux)'#010+
+  '3*2WX_Enable executable stack (Linux)'#010+
   'A*2WX_Enable executable stack (Linux)'#010+
   'p*2WX_Enable executable stack (Linux)'#010+
   'P*2WX_Enable executable stack (Linux)'#010+
-  '**1X_Executable options:'#010+
+  '**1X_Executable optio','ns:'#010+
   '**2Xc_Pass --shared/-dynamic to the linker (BeOS, Darwin, FreeBSD, Lin'+
   'ux)'#010+
-  '**2','Xd_Do not use standard library search path (needed for cross comp'+
-  'ile)'#010+
+  '**2Xd_Do not use standard library search path (needed for cross compil'+
+  'e)'#010+
   '**2Xe_Use external linker'#010+
-  '**2Xg_Create debuginfo in a separate file and add a debuglink section '+
-  'to executable'#010+
-  '**2XD_Try to link units dynamically      (defines FPC_LINK_D','YNAMIC)'#010+
+  '**2Xg_Create debuginfo in a separate file and add a debuglink s','ectio'+
+  'n to executable'#010+
+  '**2XD_Try to link units dynamically      (defines FPC_LINK_DYNAMIC)'#010+
   '**2Xi_Use internal linker'#010+
   '**2Xm_Generate link map'#010+
   '**2XM<x>_Set the name of the '#039'main'#039' program routine (default i'+
   's '#039'main'#039')'#010+
-  '**2XP<x>_Prepend the binutils names with the prefix <x>'#010+
-  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed fo','r cross co'+
-  'mpile, see the ld manual for more information) (BeOS, Linux)'#010+
+  '**2XP<x>_Prepend the binutils',' names with the prefix <x>'#010+
+  '**2Xr<x>_Set the linker'#039's rlink-path to <x> (needed for cross comp'+
+  'ile, see the ld manual for more information) (BeOS, Linux)'#010+
   '**2XR<x>_Prepend <x> to all linker search paths (BeOS, Darwin, FreeBSD'+
-  ', Linux, Mac OS, Solaris)'#010+
+  ', Linux, Mac OS, S','olaris)'#010+
   '**2Xs_Strip all symbols from executable'#010+
-  '**2XS_Try to link units staticall','y (default, defines FPC_LINK_STATIC'+
-  ')'#010+
+  '**2XS_Try to link units statically (default, defines FPC_LINK_STATIC)'#010+
   '**2Xt_Link with static libraries (-static is passed to linker)'#010+
-  '**2XX_Try to smartlink units             (defines FPC_LINK_SMART)'#010+
+  '**2XX_Try to smartlink units             (defines FPC_LINK_','SMART)'#010+
   '**1*_'#010+
   '**1?_Show this help'#010+
   '**1h_Shows this help without waiting'

compiler/ncon.pas

@@ -191,6 +191,7 @@ interface
 
     { some helper routines }
     function get_ordinal_value(p : tnode) : TConstExprInt;
+    function get_string_value(p : tnode; is_wide : boolean = false) : TConstString;
     function is_constresourcestringnode(p : tnode) : boolean;
     function is_emptyset(p : tnode):boolean;
     function genconstsymtree(p : tconstsym) : tnode;
@@ -199,7 +200,7 @@ implementation
 
     uses
       cutils,
-      verbose,systems,
+      verbose,systems,sysutils,
       defutil,
       cpubase,cgbase,
       nld;
@@ -236,6 +237,73 @@ implementation
           Message(type_e_constant_expr_expected);
       end;
 
+    function get_string_value(p : tnode; is_wide : boolean) : TConstString;
+      var
+        pCharVal: pchar;
+        stringVal: string;
+        pWideStringVal: pcompilerwidestring;
+        ordValRecord: TConstExprInt;
+      begin
+        get_string_value := '';
+        if is_conststring_or_constcharnode(p) then
+          begin
+            if is_constcharnode(p) or is_constwidecharnode(p) then
+              begin
+                { if we have case like 'aa'..'b' the right part will never be ordinal }
+                { but in case 'a' it will go here }
+                ordValRecord := tordconstnode(p).value;
+                if (not is_wide) then
+                  begin
+                    if ordValRecord.signed then
+                      stringVal := char(ordValRecord.svalue) + ''#0
+                    else
+                      stringVal := char(ordValRecord.uvalue) + ''#0;
+                    getmem(pCharVal, length(stringVal));
+                    strpcopy(pCharVal, stringVal);
+                    get_string_value := pCharVal;
+                  end
+                else
+                  begin
+                    initwidestring(pWideStringVal);
+                    if ordValRecord.signed then
+                      concatwidestringchar(pWideStringVal, tcompilerwidechar(ordValRecord.svalue))
+                    else
+                      concatwidestringchar(pWideStringVal, tcompilerwidechar(ordValRecord.uvalue));
+                    get_string_value := TConstString(pWideStringVal);
+                  end;
+              end
+            else
+              begin
+                if is_wide then
+                  begin
+                    if (tstringconstnode(p).cst_type in [cst_widestring, cst_unicodestring]) then
+                      get_string_value := tstringconstnode(p).value_str
+                    else
+                      { if string must be wide, but actually was parsed as usual }
+                      begin
+                        initwidestring(pWideStringVal);
+                        ascii2unicode(tstringconstnode(p).value_str, tstringconstnode(p).len, pWideStringVal);
+                        get_string_value := TConstString(pWideStringVal);
+                      end;
+                  end
+                else
+                  begin
+                    if (tstringconstnode(p).cst_type in [cst_widestring, cst_unicodestring]) then
+                      { string is wide but it must be usual }
+                      begin
+                        getmem(pCharVal, pcompilerwidestring(tstringconstnode(p).value_str)^.len + 1);
+                        unicode2ascii(pcompilerwidestring(tstringconstnode(p).value_str), pCharVal);
+                        pCharVal[pcompilerwidestring(tstringconstnode(p).value_str)^.len] := #0;
+                        get_string_value := pCharVal;
+                      end
+                    else
+                      get_string_value := tstringconstnode(p).value_str;
+                  end;
+              end;
+          end
+        else
+          Message(type_e_string_expr_expected);
+      end;
 
     function is_constresourcestringnode(p : tnode) : boolean;
       begin

compiler/node.pas

@@ -473,6 +473,9 @@ interface
     function is_constenumnode(p : tnode) : boolean;
     function is_constwidecharnode(p : tnode) : boolean;
     function is_constpointernode(p : tnode) : boolean;
+    function is_conststringnode(p : tnode) : boolean;
+    function is_constwidestringnode(p : tnode) : boolean;
+    function is_conststring_or_constcharnode(p : tnode) : boolean;
 
 
 implementation
@@ -689,6 +692,25 @@ implementation
          is_constpointernode:=(p.nodetype=pointerconstn);
       end;
 
+    function is_conststringnode(p : tnode) : boolean;
+      begin
+         is_conststringnode :=
+           (p.nodetype = stringconstn) and is_chararray(p.resultdef);
+      end;
+
+    function is_constwidestringnode(p : tnode) : boolean;
+      begin
+         is_constwidestringnode :=
+           (p.nodetype = stringconstn) and is_widechararray(p.resultdef);
+      end;
+
+    function is_conststring_or_constcharnode(p : tnode) : boolean;
+      begin
+        is_conststring_or_constcharnode :=
+          is_conststringnode(p) or is_constcharnode(p) or
+          is_constwidestringnode(p) or is_constwidecharnode(p);
+      end;
+
 
 {****************************************************************************
                                  TNODE

compiler/nset.pas

@@ -28,19 +28,32 @@ interface
     uses
        cclasses,constexp,
        node,globtype,globals,
-       aasmbase,aasmtai,aasmdata,symtype;
+       aasmbase,aasmtai,aasmdata,ncon,symtype,strings;
 
     type
+       TLabelType = (ltOrdinal, ltConstString);
+
        pcaselabel = ^tcaselabel;
        tcaselabel = record
-          { range }
-          _low,
-          _high   : TConstExprInt;
           { unique blockid }
           blockid : longint;
           { left and right tree node }
           less,
           greater : pcaselabel;
+
+          { range type }
+          case label_type : TLabelType of
+            ltOrdinal:
+            (
+              _low,
+              _high       : TConstExprInt;
+            );
+            ltConstString:
+            (
+              _low_str,
+              _high_str   : TConstString;
+              _str_type   : TConstStringType;
+            );
        end;
 
        pcaseblock = ^tcaseblock;
@@ -88,7 +101,8 @@ interface
           function pass_typecheck:tnode;override;
           function pass_1 : tnode;override;
           function docompare(p: tnode): boolean; override;
-          procedure addlabel(blockid:longint;l,h : TConstExprInt);
+          procedure addlabel(blockid:longint;l,h : TConstExprInt); overload;
+          procedure addlabel(blockid:longint;l,h : TConstString; str_type : TConstStringType); overload;
           procedure addblock(blockid:longint;instr:tnode);
           procedure addelseblock(instr:tnode);
        end;
@@ -115,7 +129,8 @@ implementation
       verbose,
       symconst,symdef,symsym,symtable,defutil,defcmp,
       htypechk,pass_1,
-      nbas,ncnv,ncon,nld,nflw,cgobj,cgbase;
+      nadd,nbas,ncnv,nld,nflw,cgobj,cgbase,
+      widestr;
 
 
 {*****************************************************************************
@@ -353,8 +368,19 @@ implementation
 *****************************************************************************}
 
     constructor trangenode.create(l,r : tnode);
+      var
+        value: string;
 
       begin
+         { if right is char and left is string then }
+         { right should be treated as one-symbol string }
+         if is_conststringnode(l) and is_constcharnode(r) then
+           begin
+             value := char(tordconstnode(r).value.uvalue) + ''#0;
+             r.free;
+             r := cstringconstnode.createstr(value);
+             do_typecheckpass(r);
+           end;
          inherited create(rangen,l,r);
       end;
 
@@ -446,6 +472,19 @@ implementation
            deletecaselabels(p^.greater);
          if assigned(p^.less) then
            deletecaselabels(p^.less);
+         if (p^.label_type = ltConstString) then
+           begin
+             if (p^._str_type in [cst_widestring, cst_unicodestring]) then
+               begin
+                 donewidestring(pcompilerwidestring(p^._low_str));
+                 donewidestring(pcompilerwidestring(p^._high_str));
+               end
+             else
+               begin
+                 freemem(p^._low_str);
+                 freemem(p^._high_str);
+               end;
+           end;
          dispose(p);
       end;
 
@@ -457,6 +496,27 @@ implementation
       begin
          new(n);
          n^:=p^;
+         if (p^.label_type = ltConstString) then
+           begin
+             if (p^._str_type in [cst_widestring, cst_unicodestring]) then
+               begin
+                 initwidestring(pcompilerwidestring(n^._low_str));
+                 initwidestring(pcompilerwidestring(n^._high_str));
+                 copywidestring(
+                   pcompilerwidestring(p^._low_str), pcompilerwidestring(n^._low_str));
+                 copywidestring(
+                   pcompilerwidestring(p^._high_str), pcompilerwidestring(n^._high_str));
+               end
+             else
+               begin
+                 getmem(n^._low_str, strlen(p^._low_str) + 1);
+                 strcopy(n^._low_str, p^._low_str);
+                 n^._low_str[strlen(p^._low_str)] := #0;
+                 getmem(n^._high_str, strlen(p^._high_str) + 1);
+                 strcopy(n^._high_str, p^._high_str);
+                 n^._high_str[strlen(p^._high_str)] := #0;
+               end;
+           end;
          if assigned(p^.greater) then
            n^.greater:=copycaselabel(p^.greater);
          if assigned(p^.less) then
@@ -466,11 +526,42 @@ implementation
 
 
     procedure ppuwritecaselabel(ppufile:tcompilerppufile;p : pcaselabel);
+
+      procedure ppuwritestring(str_type : tconststringtype; value : pchar);
+
+        var
+          len : integer;
+        begin
+          if str_type in [cst_widestring, cst_unicodestring] then
+            begin
+              len := pcompilerwidestring(value)^.len;
+              ppufile.putlongint(len);
+              ppufile.putdata(pcompilerwidestring(value)^.data, len * sizeof(tcompilerwidechar));
+            end
+          else
+            begin
+              len := strlen(value);
+              ppufile.putlongint(len);
+              ppufile.putdata(value^, len);
+            end;
+        end;
+
       var
         b : byte;
       begin
-        ppufile.putexprint(p^._low);
-        ppufile.putexprint(p^._high);
+        ppufile.putbyte(byte(p^.label_type = ltConstString));
+        if (p^.label_type = ltConstString) then
+          begin
+            ppufile.putbyte(byte(p^._str_type));
+            ppuwritestring(p^._str_type, p^._low_str);
+            ppuwritestring(p^._str_type, p^._high_str);
+          end
+        else
+          begin
+            ppufile.putexprint(p^._low);
+            ppufile.putexprint(p^._high);
+          end;
+
         ppufile.putlongint(p^.blockid);
         b:=0;
         if assigned(p^.greater) then
@@ -486,13 +577,50 @@ implementation
 
 
     function ppuloadcaselabel(ppufile:tcompilerppufile):pcaselabel;
+
+      procedure ppuloadstring(str_type : tconststringtype; out value : pchar);
+
+        var
+          pw : pcompilerwidestring;
+          len : integer;
+        begin
+          len := ppufile.getlongint;
+          if str_type in [cst_widestring, cst_unicodestring] then
+            begin
+              initwidestring(pw);
+              setlengthwidestring(pw, len);
+              ppufile.getdata(pw^.data, pw^.len * sizeof(tcompilerwidechar));
+              pcompilerwidestring(value) := pw
+            end
+          else
+            begin
+              getmem(value, len + 1);
+              ppufile.getdata(value^, len);
+              value[len] := #0;
+            end;
+        end;
+
       var
         b : byte;
         p : pcaselabel;
       begin
         new(p);
-        p^._low:=ppufile.getexprint;
-        p^._high:=ppufile.getexprint;
+        if boolean(ppufile.getbyte) then
+          begin
+            p^.label_type := ltConstString;
+            p^._str_type := tconststringtype(ppufile.getbyte);
+
+            ppuloadstring(p^._str_type, p^._low_str);
+            ppuloadstring(p^._str_type, p^._high_str);
+          end
+        else
+          begin
+            p^.label_type := ltOrdinal;
+
+            p^._low:=ppufile.getexprint;
+            p^._high:=ppufile.getexprint;
+          end;
+
         p^.blockid:=ppufile.getlongint;
         b:=ppufile.getbyte;
         if (b and 1)=1 then
@@ -599,10 +727,90 @@ implementation
     function tcasenode.pass_1 : tnode;
       var
          i  : integer;
-         node_thenblock,node_elseblock : tnode;
+         node_thenblock,node_elseblock,if_node : tnode;
+         tempcaseexpr : ttempcreatenode;
+         if_block, init_block : tblocknode;
+         stmt : tstatementnode;
+
+      function makeifblock(const labtree : pcaselabel; prevconditblock : tnode): tnode;
+        var
+          condit : tnode;
+        begin
+          result := nil;
+          if assigned(labtree^.less) then
+            result := makeifblock(labtree^.less, prevconditblock)
+          else
+            result := prevconditblock;
+          prevconditblock := nil;
+
+          if (labtree^._str_type in [cst_widestring, cst_unicodestring]) then
+            begin
+              condit := caddnode.create(
+                equaln, left.getcopy,
+                cstringconstnode.createwstr(pcompilerwidestring(labtree^._low_str)));
+ 
+              if (
+                comparewidestrings(
+                  pcompilerwidestring(labtree^._low_str),
+                  pcompilerwidestring(labtree^._high_str)) <> 0) then
+                begin
+                  condit.nodetype := gten;
+                  condit := caddnode.create(
+                    andn, condit, caddnode.create(
+                      lten, left.getcopy, cstringconstnode.createwstr(
+                        pcompilerwidestring(labtree^._high_str))));
+                end;
+            end
+          else
+            begin
+              condit := caddnode.create(
+                equaln, left.getcopy, cstringconstnode.createstr(labtree^._low_str));
+
+              if (strcomp(labtree^._low_str, labtree^._high_str) <> 0) then
+                begin
+                  condit.nodetype := gten;
+                  condit := caddnode.create(
+                    andn, condit, caddnode.create(
+                      lten, left.getcopy, cstringconstnode.createstr(labtree^._high_str)));
+                end;
+            end;
+          
+          result :=
+            cifnode.create(
+              condit, pcaseblock(blocks[labtree^.blockid])^.statement, result);
+          pcaseblock(blocks[labtree^.blockid])^.statement := nil;
+
+          if assigned(labtree^.greater) then
+            result := makeifblock(labtree^.greater, result);
+
+          typecheckpass(result);
+        end;
+
       begin
          result:=nil;
+         init_block:=nil;
          expectloc:=LOC_VOID;
+
+         { Load caseexpr into temp var if complex. }
+         { No need to do this for ordinal, because }
+         { in that case caseexpr is generated once }
+         if (labels^.label_type = ltConstString) and (not valid_for_addr(left, false)) then
+           begin
+             init_block := internalstatements(stmt);
+             tempcaseexpr :=
+               ctempcreatenode.create(
+                 left.resultdef, left.resultdef.size, tt_persistent, true);
+             typecheckpass(tnode(tempcaseexpr));
+
+             addstatement(stmt, tempcaseexpr);
+             addstatement(
+               stmt, cassignmentnode.create(
+                 ctemprefnode.create(tempcaseexpr), left));
+
+             left := ctemprefnode.create(tempcaseexpr);
+             typecheckpass(left);
+           end;
+
          { evalutes the case expression }
          firstpass(left);
          set_varstate(left,vs_read,[vsf_must_be_valid]);
@@ -633,6 +841,24 @@ implementation
                exit;
              end;
 
+         if (labels^.label_type = ltConstString) then
+           begin
+             if_node := makeifblock(labels, elseblock);
+             if assigned(init_block) then
+               begin
+                 firstpass(tnode(init_block));
+                 if_block := internalstatements(stmt);
+                 addstatement(stmt, init_block);
+                 addstatement(stmt, if_node);
+                 result := if_block;
+               end
+             else
+               result := if_node;
+             init_block := nil;
+             elseblock := nil;
+             exit;
+           end;
+
          if is_boolean(left.resultdef) then
            begin
              case blocks.count of
@@ -712,7 +938,7 @@ implementation
                end;
            end
          else
-           n.labels:=nil;
+           n.blocks:=nil;
          dogetcopy:=n;
       end;
 
@@ -826,11 +1052,69 @@ implementation
         new(hcaselabel);
         fillchar(hcaselabel^,sizeof(tcaselabel),0);
         hcaselabel^.blockid:=blockid;
+        hcaselabel^.label_type:=ltOrdinal;
         hcaselabel^._low:=l;
         hcaselabel^._high:=h;
         insertlabel(labels);
       end;
 
+    procedure tcasenode.addlabel(blockid : longint; l, h : TConstString; str_type : TConstStringType);
+
+      function str_compare(l, h : TConstString) : longint;
+        begin
+          if (str_type in [cst_widestring, cst_unicodestring]) then
+            result := comparewidestrings(pcompilerwidestring(l), pcompilerwidestring(h))
+          else
+            result := strcomp(l, h);
+        end;
+
+      var
+        hcaselabel : pcaselabel;
+
+      function insertlabel(var p : pcaselabel) : pcaselabel;
+        begin
+          if not assigned(p) then
+            begin
+              p := hcaselabel;
+              result := p;
+            end
+          else
+            if (str_compare(p^._low_str, hcaselabel^._high_str) > 0) then
+              result := insertlabel(p^.less)
+          else
+            if (str_compare(p^._high_str, hcaselabel^._low_str) < 0) then
+              result := insertlabel(p^.greater)
+          else
+            Message(parser_e_double_caselabel);
+        end;
+
+      begin
+        new(hcaselabel);
+        fillchar(hcaselabel^, sizeof(tcaselabel), 0);
+        hcaselabel^.blockid := blockid;
+        hcaselabel^.label_type := ltConstString;
+
+        if (str_type in [cst_widestring, cst_unicodestring]) then
+          begin
+            initwidestring(pcompilerwidestring(hcaselabel^._low_str));
+            initwidestring(pcompilerwidestring(hcaselabel^._high_str));
+            copywidestring(pcompilerwidestring(l), pcompilerwidestring(hcaselabel^._low_str));
+            copywidestring(pcompilerwidestring(h), pcompilerwidestring(hcaselabel^._high_str));
+          end
+        else
+          begin
+            getmem(hcaselabel^._low_str, strlen(l) + 1);
+            getmem(hcaselabel^._high_str, strlen(h) + 1);
+            strcopy(hcaselabel^._low_str, l);
+            strcopy(hcaselabel^._high_str, h);
+            hcaselabel^._low_str[strlen(l)] := #0;
+            hcaselabel^._high_str[strlen(h)] := #0;
+          end;
+
+        hcaselabel^._str_type := str_type;
+        insertlabel(labels);
+      end;
+
 begin
    csetelementnode:=tsetelementnode;
    cinnode:=tinnode;

compiler/pstatmnt.pas

@@ -42,7 +42,7 @@ implementation
        cutils,cclasses,
        { global }
        globtype,globals,verbose,constexp,
-       systems,
+       strings,systems,
        { aasm }
        cpubase,aasmbase,aasmtai,aasmdata,
        { symtable }
@@ -57,7 +57,9 @@ implementation
        { codegen }
        procinfo,cgbase,
        { assembler reader }
-       rabase
+       rabase,
+       { wide- and unicodestrings}
+       widestr
        ;
 
 
@@ -113,12 +115,17 @@ implementation
 
 
     function case_statement : tnode;
+      const
+        st2cst : array[tstringtype] of tconststringtype = (
+          cst_shortstring,cst_longstring,cst_ansistring,
+          cst_widestring,cst_unicodestring);
       var
          casedef : tdef;
          caseexpr,p : tnode;
          blockid : longint;
          hl1,hl2 : TConstExprInt;
-         casedeferror : boolean;
+         sl1,sl2 : TConstString;
+         casedeferror, caseofstring : boolean;
          casenode : tcasenode;
       begin
          consume(_CASE);
@@ -134,10 +141,16 @@ implementation
          set_varstate(caseexpr,vs_read,[vsf_must_be_valid]);
          casedeferror:=false;
          casedef:=caseexpr.resultdef;
+         { case of string must be rejected in delphi-, }
+         { tp7/bp7-, mac-compatibility modes.          }
+         caseofstring :=
+           ([m_delphi, m_mac, m_tp7] * current_settings.modeswitches = []) and
+           is_string(casedef);
+
          if (not assigned(casedef)) or
-            not(is_ordinal(casedef)) then
+            ( not(is_ordinal(casedef)) and (not caseofstring) ) then
           begin
-            CGMessage(type_e_ordinal_expr_expected);
+            CGMessage(type_e_ordinal_or_string_expr_expected);
             { create a correct tree }
             caseexpr.free;
             caseexpr:=cordconstnode.create(0,u32inttype,false);
@@ -168,14 +181,29 @@ implementation
                        do_typecheckpass(p);
                     end;
                end;
-
              hl1:=0;
              hl2:=0;
+             sl1:='';
+             sl2:='';
              if (p.nodetype=rangen) then
                begin
-                  { type checking for case statements }
-                  if is_subequal(casedef, trangenode(p).left.resultdef) and
-                     is_subequal(casedef, trangenode(p).right.resultdef) then
+                  { type check for string case statements }
+                  if caseofstring and
+                    is_conststring_or_constcharnode(trangenode(p).left) and
+                    is_conststring_or_constcharnode(trangenode(p).right) then
+                  begin
+                    sl1 := get_string_value(trangenode(p).left, is_wide_or_unicode_string(casedef));
+                    sl2 := get_string_value(trangenode(p).right, is_wide_or_unicode_string(casedef));
+                    if (
+                      (is_wide_or_unicode_string(casedef) and (
+                        comparewidestrings(pcompilerwidestring(sl1), pcompilerwidestring(sl2)) > 0)) or
+                      ((not is_wide_or_unicode_string(casedef)) and (strcomp(sl1, sl2) > 0))) then
+                      CGMessage(parser_e_case_lower_less_than_upper_bound);
+                  end
+                  { type checking for ordinal case statements }
+                  else if (not caseofstring) and
+                    is_subequal(casedef, trangenode(p).left.resultdef) and
+                    is_subequal(casedef, trangenode(p).right.resultdef) then
                     begin
                       hl1:=get_ordinal_value(trangenode(p).left);
                       hl2:=get_ordinal_value(trangenode(p).right);
@@ -189,17 +217,30 @@ implementation
                     end
                   else
                     CGMessage(parser_e_case_mismatch);
-                  casenode.addlabel(blockid,hl1,hl2);
+
+                  if caseofstring then
+                    casenode.addlabel(blockid,sl1,sl2,st2cst[tstringdef(casedef).stringtype])
+                  else
+                    casenode.addlabel(blockid,hl1,hl2);
                end
              else
-               begin
-                  { type checking for case statements }
-                  if not is_subequal(casedef, p.resultdef) then
+               begin                
+                  { type check for string case statements }
+                  if (caseofstring and (not is_conststring_or_constcharnode(p))) or
+                  { type checking for ordinal case statements }
+                    ((not caseofstring) and (not is_subequal(casedef, p.resultdef))) then
                     CGMessage(parser_e_case_mismatch);
-                  hl1:=get_ordinal_value(p);
-                  if not casedeferror then
-                    testrange(casedef,hl1,false);
-                  casenode.addlabel(blockid,hl1,hl1);
+                  
+                  if caseofstring then begin
+                    sl1:=get_string_value(p, is_wide_or_unicode_string(casedef));
+                    casenode.addlabel(blockid,sl1,sl1,st2cst[tstringdef(casedef).stringtype]);
+                  end
+                  else begin
+                    hl1:=get_ordinal_value(p);
+                    if not casedeferror then
+                      testrange(casedef,hl1,false);
+                    casenode.addlabel(blockid,hl1,hl1);
+                  end;
                end;
              p.free;
              if token=_COMMA then

tests/test/tcase10.pp

@@ -0,0 +1,25 @@
+{%FAIL}
+
+{ duplicate labels in different cases }
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase11.pp

@@ -0,0 +1,25 @@
+{%FAIL}
+
+{ duplicate labels in different cases, one of them is range }
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase12.pp

@@ -0,0 +1,89 @@
+{ test for simple comparsion }
+
+{$H+}
+
+var
+  my_str: string;
+  my_str_wide: widestring;
+  my_str_ansi: ansistring;
+  my_str_uni: unicodestring;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  my_str_wide := 'ababaca';
+  my_str_ansi := 'ababaca';
+  my_str_uni := 'ababaca';
+  i := -1;
+
+  case my_str of
+    'abba': i := 1;
+    'ababac': i := 2;
+    'ababacaa': i := 3;
+    'ababaca ': i := 4;
+    ' ababaca': i := 5;
+    ' ababac': i := 6;
+    'ababaca': i := 7;
+    else i := 0;
+  end;
+
+  writeln(i);
+  if (i <> 7) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'abba': i := 1;
+    'ababac': i := 2;
+    'ababacaa': i := 3;
+    'ababaca ': i := 4;
+    ' ababaca': i := 5;
+    ' ababac': i := 6;
+    'ababaca': i := 7;
+    else i := 0;
+  end;
+
+  writeln(i);
+  if (i <> 7) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'abba': i := 1;
+    'ababac': i := 2;
+    'ababacaa': i := 3;
+    'ababaca ': i := 4;
+    ' ababaca': i := 5;
+    ' ababac': i := 6;
+    'ababaca': i := 7;
+    else i := 0;
+  end;
+
+  writeln(i);
+  if (i <> 7) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'abba': i := 1;
+    'ababac': i := 2;
+    'ababacaa': i := 3;
+    'ababaca ': i := 4;
+    ' ababaca': i := 5;
+    ' ababac': i := 6;
+    'ababaca': i := 7;
+    else i := 0;
+  end;
+
+  writeln(i);
+  if (i <> 7) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase13.pp

@@ -0,0 +1,68 @@
+{ the last range should be converted to single case and give 'expected' value }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: widestring;
+  my_str_ansi: ansistring;
+  my_str_uni: unicodestring;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+  
+  case my_str of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'cab'..'cab': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+  
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'cab'..'cab': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error_wide ', i);
+    Halt(1);
+  end;
+  
+  
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'cab'..'cab': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error_ansi');
+    Halt(1);
+  end;
+  
+
+  case my_str_uni of
+    'aa': i := 1;
+    'ca'..'caa': i := 2;
+    'cab': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase14.pp

@@ -0,0 +1,60 @@
+{ comparsion with empty string as bound of 'needed' range }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: widestring;
+  my_str_ansi: ansistring;
+  my_str_uni: unicodestring;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  my_str_wide := 'ababaca';
+  my_str_ansi := 'ababaca';
+  my_str_uni := 'ababaca';
+  i := -1;
+
+  case my_str of
+    ''..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    ''..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    ''..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    ''..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase15.pp

@@ -0,0 +1,68 @@
+{ comparsion of one-symbol strings as ranges and single cases }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'c';
+  my_str_wide := 'c';
+  my_str_ansi := 'c';
+  my_str_uni := 'c';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase16.pp

@@ -0,0 +1,68 @@
+{ comparsion of one-symbol strings as ranges and single cases }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'b';
+  my_str_wide := 'b';
+  my_str_ansi := 'b';
+  my_str_uni := 'b';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase17.pp

@@ -0,0 +1,72 @@
+{ comparsion of empty string }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := '';
+  my_str_wide := '';
+  my_str_ansi := '';
+  my_str_uni := '';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase18.pp

@@ -0,0 +1,69 @@
+{ comparsion of empty string }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: widestring;
+  my_str_ansi: ansistring;
+  my_str_uni: unicodestring;
+  i: integer;
+
+begin
+  my_str := '';
+  my_str_wide := '';
+  my_str_ansi := '';
+  my_str_uni := '';
+  i := -1;
+
+  case my_str of
+    'b'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'a': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+  case my_str_wide of
+    'b'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'a': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+  case my_str_ansi of
+    'b'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'a': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+  case my_str_uni of
+    'b'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'a': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase19.pp

@@ -0,0 +1,70 @@
+{%FAIL}
+
+{ duplicate labels in different cases, one of them is range }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase20.pp

@@ -0,0 +1,39 @@
+{%FAIL}
+
+{ left bound is greater; fails }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  my_str_wide := 'ababaca';
+  my_str_ansi := 'ababaca';
+  my_str_uni := 'ababaca';
+  i := -1;
+
+  case my_str of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_wide of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_ansi of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_uni of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+end.

tests/test/tcase21.pp

@@ -0,0 +1,39 @@
+{%FAIL}
+
+{ left bound is greater; comparsion with empty string. Fails }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  my_str_wide := 'ababaca';
+  my_str_ansi := 'ababaca';
+  my_str_uni := 'ababaca';
+  i := -1;
+
+  case my_str of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_wide of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_ansi of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_uni of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+end.

tests/test/tcase22.pp

@@ -0,0 +1,64 @@
+{ comparsion of one-symbol strings in ranges }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'c';
+  my_str_wide := 'c';
+  my_str_ansi := 'c';
+  my_str_uni := 'c';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase23.pp

@@ -0,0 +1,70 @@
+{%FAIL}
+
+{ duplicate labels in different case ranges }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase24.pp

@@ -0,0 +1,60 @@
+{ simple test for range }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase25.pp

@@ -0,0 +1,60 @@
+{ test for range with one-symbol string as left bound }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase26.pp

@@ -0,0 +1,62 @@
+{ test for range with one-symbol string as right bound, which is smaller than left. Fail }
+
+{%FAIL}
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase27.pp

@@ -0,0 +1,70 @@
+{%FAIL}
+
+{ duplicate labels in different cases }
+
+{$H+}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase28.pp

@@ -0,0 +1,89 @@
+{ test for simple comparsion }
+
+{$H-}
+
+var
+  my_str: string;
+  my_str_wide: widestring;
+  my_str_ansi: ansistring;
+  my_str_uni: unicodestring;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  my_str_wide := 'ababaca';
+  my_str_ansi := 'ababaca';
+  my_str_uni := 'ababaca';
+  i := -1;
+
+  case my_str of
+    'abba': i := 1;
+    'ababac': i := 2;
+    'ababacaa': i := 3;
+    'ababaca ': i := 4;
+    ' ababaca': i := 5;
+    ' ababac': i := 6;
+    'ababaca': i := 7;
+    else i := 0;
+  end;
+
+  writeln(i);
+  if (i <> 7) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'abba': i := 1;
+    'ababac': i := 2;
+    'ababacaa': i := 3;
+    'ababaca ': i := 4;
+    ' ababaca': i := 5;
+    ' ababac': i := 6;
+    'ababaca': i := 7;
+    else i := 0;
+  end;
+
+  writeln(i);
+  if (i <> 7) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'abba': i := 1;
+    'ababac': i := 2;
+    'ababacaa': i := 3;
+    'ababaca ': i := 4;
+    ' ababaca': i := 5;
+    ' ababac': i := 6;
+    'ababaca': i := 7;
+    else i := 0;
+  end;
+
+  writeln(i);
+  if (i <> 7) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'abba': i := 1;
+    'ababac': i := 2;
+    'ababacaa': i := 3;
+    'ababaca ': i := 4;
+    ' ababaca': i := 5;
+    ' ababac': i := 6;
+    'ababaca': i := 7;
+    else i := 0;
+  end;
+
+  writeln(i);
+  if (i <> 7) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase29.pp

@@ -0,0 +1,68 @@
+{ the last range should be converted to single case and give 'expected' value }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: widestring;
+  my_str_ansi: ansistring;
+  my_str_uni: unicodestring;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+  
+  case my_str of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'cab'..'cab': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+  
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'cab'..'cab': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error_wide ', i);
+    Halt(1);
+  end;
+  
+  
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'cab'..'cab': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error_ansi');
+    Halt(1);
+  end;
+  
+
+  case my_str_uni of
+    'aa': i := 1;
+    'ca'..'caa': i := 2;
+    'cab': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase3.pp

@@ -0,0 +1,18 @@
+{%FAIL}
+
+{ left bound is greater; fails }
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  i := -1;
+
+  case my_str of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+end.

tests/test/tcase30.pp

@@ -0,0 +1,60 @@
+{ comparsion with empty string as bound of 'needed' range }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: widestring;
+  my_str_ansi: ansistring;
+  my_str_uni: unicodestring;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  my_str_wide := 'ababaca';
+  my_str_ansi := 'ababaca';
+  my_str_uni := 'ababaca';
+  i := -1;
+
+  case my_str of
+    ''..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    ''..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    ''..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    ''..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase31.pp

@@ -0,0 +1,68 @@
+{ comparsion of one-symbol strings as ranges and single cases }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'c';
+  my_str_wide := 'c';
+  my_str_ansi := 'c';
+  my_str_uni := 'c';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase32.pp

@@ -0,0 +1,68 @@
+{ comparsion of one-symbol strings as ranges and single cases }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'b';
+  my_str_wide := 'b';
+  my_str_ansi := 'b';
+  my_str_uni := 'b';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase33.pp

@@ -0,0 +1,72 @@
+{ comparsion of empty string }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := '';
+  my_str_wide := '';
+  my_str_ansi := '';
+  my_str_uni := '';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase34.pp

@@ -0,0 +1,69 @@
+{ comparsion of empty string }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: widestring;
+  my_str_ansi: ansistring;
+  my_str_uni: unicodestring;
+  i: integer;
+
+begin
+  my_str := '';
+  my_str_wide := '';
+  my_str_ansi := '';
+  my_str_uni := '';
+  i := -1;
+
+  case my_str of
+    'b'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'a': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error1');
+    Halt(1);
+  end;
+
+  case my_str_wide of
+    'b'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'a': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+  case my_str_ansi of
+    'b'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'a': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+  case my_str_uni of
+    'b'..'b': i := 1;
+    'c': i := 2;
+    'd'..'eee': i := 3;
+    ''..'a': i := 4;
+    else i := 0;
+  end;
+
+  if (i <> 4) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase35.pp

@@ -0,0 +1,70 @@
+{%FAIL}
+
+{ duplicate labels in different cases, one of them is range }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c'..'d': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase36.pp

@@ -0,0 +1,39 @@
+{%FAIL}
+
+{ left bound is greater; fails }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  my_str_wide := 'ababaca';
+  my_str_ansi := 'ababaca';
+  my_str_uni := 'ababaca';
+  i := -1;
+
+  case my_str of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_wide of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_ansi of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_uni of
+    'abba'..'ababaca': i := 1;
+    else i := 0;
+  end;
+end.

tests/test/tcase37.pp

@@ -0,0 +1,39 @@
+{%FAIL}
+
+{ left bound is greater; comparsion with empty string. Fails }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  my_str_wide := 'ababaca';
+  my_str_ansi := 'ababaca';
+  my_str_uni := 'ababaca';
+  i := -1;
+
+  case my_str of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_wide of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_ansi of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+
+  case my_str_uni of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+end.

tests/test/tcase38.pp

@@ -0,0 +1,64 @@
+{ comparsion of one-symbol strings in ranges }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'c';
+  my_str_wide := 'c';
+  my_str_ansi := 'c';
+  my_str_uni := 'c';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase39.pp

@@ -0,0 +1,70 @@
+{%FAIL}
+
+{ duplicate labels in different case ranges }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase4.pp

@@ -0,0 +1,18 @@
+{%FAIL}
+
+{ left bound is greater; comparsion with empty string. Fails }
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'ababaca';
+  i := -1;
+
+  case my_str of
+    'aba'..'': i := 1;
+    else i := 0;
+  end;
+end.

tests/test/tcase40.pp

@@ -0,0 +1,60 @@
+{ simple test for range }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase41.pp

@@ -0,0 +1,60 @@
+{ test for range with one-symbol string as left bound }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase42.pp

@@ -0,0 +1,62 @@
+{ test for range with one-symbol string as right bound, which is smaller than left. Fail }
+
+{%FAIL}
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase43.pp

@@ -0,0 +1,70 @@
+{%FAIL}
+
+{ duplicate labels in different cases }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'b': i := 1;
+    'c': i := 2;
+    'c': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase44.pp

@@ -0,0 +1,131 @@
+{ test for range with one-symbol string as left bound }
+{ sequence of cases in cases                          }
+
+{$H-}
+var
+  my_str: string;
+  my_str_wide: string;
+  my_str_ansi: string;
+  my_str_uni: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  my_str_wide := 'cab';
+  my_str_ansi := 'cab';
+  my_str_uni := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'daa':
+      begin
+        case my_str[1] of
+          'a' : i := 0;
+          'b' : i := 0;
+          'c' : i := 1;
+        end;
+        case my_str[2] of
+          'a' : i := i * 1;
+          'b' : i := 0;
+          'c' : i := 0;
+        end;
+        case my_str[3] of
+          'a' : i := 0;
+          'b' : i := i * 1;
+          'c' : i := 0;
+        end;
+      end;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_wide of
+    'a'..'daa':
+      begin
+        case my_str_wide[1] of
+          'a' : i := 0;
+          'b' : i := 0;
+          'c' : i := 1;
+        end;
+        case my_str_wide[2] of
+          'a' : i := i * 1;
+          'b' : i := 0;
+          'c' : i := 0;
+        end;
+        case my_str_wide[3] of
+          'a' : i := 0;
+          'b' : i := i * 1;
+          'c' : i := 0;
+        end;
+      end;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_ansi of
+    'a'..'daa':
+      begin
+        case my_str_ansi[1] of
+          'a' : i := 0;
+          'b' : i := 0;
+          'c' : i := 1;
+        end;
+        case my_str_ansi[2] of
+          'a' : i := i * 1;
+          'b' : i := 0;
+          'c' : i := 0;
+        end;
+        case my_str_ansi[3] of
+          'a' : i := 0;
+          'b' : i := i * 1;
+          'c' : i := 0;
+        end;
+      end;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+
+  case my_str_uni of
+    'a'..'daa':
+      begin
+        case my_str_uni[1] of
+          'a' : i := 0;
+          'b' : i := 0;
+          'c' : i := 1;
+        end;
+        case my_str_uni[2] of
+          'a' : i := i * 1;
+          'b' : i := 0;
+          'c' : i := 0;
+        end;
+        case my_str_uni[3] of
+          'a' : i := 0;
+          'b' : i := i * 1;
+          'c' : i := 0;
+        end;
+      end;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+
+  writeln('OK!');
+end.

tests/test/tcase45.pp

@@ -0,0 +1,26 @@
+{ test for complex case-var with H+ dir }
+
+{$H+}
+
+unit tcase45;
+
+interface
+  procedure test_proc(var res : integer); inline;
+    
+implementation
+
+var
+  some_str: string;
+
+procedure test_proc(var res : integer);
+begin
+  some_str := 'b';
+  case some_str + 'ababaca' of
+    'a'..'ba' : res := 1;
+    'bab'..'bbb' : res := 2;
+    'bbc'..'bf' : res := 3;
+    else res := 4;
+  end;
+end;
+
+end.

tests/test/tcase45_2.pp

@@ -0,0 +1,18 @@
+program test_program;
+
+uses
+  tcase45;
+
+var
+  i: integer;
+
+begin
+  test_proc(i);
+  if (i <> 2) then
+    begin
+      writeln('FAIL');
+      halt(1);
+    end
+  else
+    writeln('OK');
+end.

tests/test/tcase46.pp

@@ -0,0 +1,26 @@
+{ test for complex case-var with H- dir }
+
+{$H-}
+
+unit tcase46;
+
+interface
+  procedure test_proc(var res : integer); inline;
+    
+implementation
+
+var
+  some_str: string;
+
+procedure test_proc(var res : integer);
+begin
+  some_str := 'b';
+  case some_str + 'ababaca' of
+    'a'..'ba' : res := 1;
+    'bab'..'bbb' : res := 2;
+    'bbc'..'bf' : res := 3;
+    else res := 4;
+  end;
+end;
+
+end.

tests/test/tcase46_2.pp

@@ -0,0 +1,18 @@
+program test_program;
+
+uses
+  tcase46;
+
+var
+  i : integer;
+
+begin
+  test_proc(i);
+  if (i <> 2) then
+    begin
+      writeln('FAIL');
+      halt(1);
+    end
+  else
+    writeln('OK');
+end.

tests/test/tcase47.pp

@@ -0,0 +1,26 @@
+{ test for simple case-var with H- dir }
+
+{$H-}
+
+unit tcase47;
+
+interface
+  procedure test_proc(var res : integer); inline;
+    
+implementation
+
+var
+  some_str: string;
+
+procedure test_proc(var res : integer);
+begin
+  some_str := 'b';
+  case some_str of
+    ''..'ba' : res := 1;
+    'bab'..'bbb' : res := 2;
+    'bbc'..'bf' : res := 3;
+    else res := 4;
+  end;
+end;
+
+end.

tests/test/tcase47_2.pp

@@ -0,0 +1,18 @@
+program test_program;
+
+uses
+  tcase47;
+
+var
+  i : integer;
+
+begin
+  test_proc(i);
+  if (i <> 1) then
+    begin
+      writeln('FAIL');
+      halt(1);
+    end
+  else
+    writeln('OK');
+end.

tests/test/tcase48.pp

@@ -0,0 +1,26 @@
+{ test for simple case-var with H+ dir }
+
+{$H+}
+
+unit tcase48;
+
+interface
+  procedure test_proc(var res : integer); inline;
+    
+implementation
+
+var
+  some_str: string;
+
+procedure test_proc(var res : integer);
+begin
+  some_str := 'b';
+  case some_str of
+    ''..'ba' : res := 1;
+    'bab'..'bbb' : res := 2;
+    'bbc'..'bf' : res := 3;
+    else res := 4;
+  end;
+end;
+
+end.

tests/test/tcase48_2.pp

@@ -0,0 +1,18 @@
+program test_program;
+
+uses
+  tcase48;
+
+var
+  i : integer;
+
+begin
+  test_proc(i);
+  if (i <> 1) then
+    begin
+      writeln('FAIL');
+      halt(1);
+    end
+  else
+    writeln('OK');
+end.

tests/test/tcase5.pp

@@ -0,0 +1,22 @@
+{ comparsion of one-symbol strings in ranges }
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'c';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c'..'d': i := 2;
+    else i := 0;
+  end;
+
+  if (i <> 2) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase6.pp

@@ -0,0 +1,25 @@
+{%FAIL}
+
+{ duplicate labels in different case ranges }
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'b': i := 1;
+    'c'..'caa': i := 2;
+    'caa'..'cabaa': i := 3;
+    else i := 0;
+  end;
+
+  if (i <> 3) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase7.pp

@@ -0,0 +1,21 @@
+{ simple test for range }
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  i := -1;
+
+  case my_str of
+    'aba'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase8.pp

@@ -0,0 +1,21 @@
+{ test for range with one-symbol string as left bound }
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  i := -1;
+
+  case my_str of
+    'a'..'daa': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.

tests/test/tcase9.pp

@@ -0,0 +1,23 @@
+{ test for range with one-symbol string as right bound, which is smaller than left. Fail }
+
+{%FAIL}
+
+{$H+}
+var
+  my_str: string;
+  i: integer;
+
+begin
+  my_str := 'cab';
+  i := -1;
+
+  case my_str of
+    'cab'..'a': i := 1;
+    else i := 0;
+  end;
+
+  if (i <> 1) then begin
+    writeln('Error');
+    Halt(1);
+  end;
+end.