* fixed 161,165,166,167,168

compiler/cg386inl.pas

@@ -312,8 +312,7 @@ implementation
                                        end;
                                    end;
                         arraydef : begin
-                                     if (parraydef(pararesult)^.lowrange=0) and
-                                        is_equal(parraydef(pararesult)^.definition,cchardef) then
+                                     if is_chararray(pararesult) then
                                        begin
                                          if doread then
                                            emitcall('FPC_READ_TEXT_PCHAR_AS_ARRAY',true)
@@ -674,13 +673,6 @@ implementation
                    exprasmlist^.concat(new(pai386,op_const_reg(A_SHR,S_L,16,p^.location.register)));
                  p^.location.register:=reg32toreg16(p^.location.register);
               end;
-{***CHARBUG}
-{We can now comment them out, as they are handled as typecast.
- Saves an incredible amount of 8 bytes code.
- I'am not lucky about this, because it's _not_ a type cast (FK) }
-{              in_ord_char,
-               in_chr_byte,}
-{***}
             in_length_string :
               begin
                  secondpass(p^.left);
@@ -730,13 +722,9 @@ implementation
                    end
                  else p^.location.register:=p^.left^.location.register;
                  exprasmlist^.concat(new(pai386,op_reg(asmop,opsize,
-                   p^.location.register)))
-                 { here we should insert bounds check ? }
-                 { and direct call to bounds will crash the program }
-                 { if we are at the limit }
-                 { we could also simply say that pred(first)=first and succ(last)=last }
-                 { could this be usefull I don't think so (PM)
-                 emitoverflowcheck;}
+                   p^.location.register)));
+                 emitoverflowcheck(p);
+                 emitrangecheck(p);
               end;
             in_dec_x,
             in_inc_x :
@@ -827,6 +815,7 @@ implementation
                    ungetregister32(hregister);
                  end;
                 emitoverflowcheck(p^.left^.left);
+                emitrangecheck(p^.left^.left);
               end;
             in_assigned_x :
               begin
@@ -944,7 +933,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.10  1998-10-05 12:32:44  peter
+  Revision 1.11  1998-10-05 21:33:15  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.10  1998/10/05 12:32:44  peter
     + assert() support
 
   Revision 1.8  1998/10/02 10:35:09  peter

compiler/msgtxt.inc

@@ -73,105 +73,105 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'E_Illegal parameter ','list'#000+
   'E_Wrong parameter type specified'#000+
   'E_Wrong amount of parameters specified'#000+
-  'E_overloaded identifier isn'#039't a function identifier'#000+
+  'E_overloaded identifier $1 isn'#039't a function'#000+
   'E_overloaded functions have the same parameter list'#000+
-  'E_function header doesn'#039't match the forward declaration $1'#000,+
-  'N_only values can be jumped over in enumeration types'#000+
+  'E_function header doesn'#039't match the forward declaration $1'#000+
+  'N_only v','alues can be jumped over in enumeration types'#000+
   'N_Interface and implementation names are different !'#000+
   'E_function nesting > 31'#000+
   'E_range check error while evaluating constants'#000+
   'E_duplicate case label'#000+
-  'E_typed constants of classes are not al','lowed'#000+
-  'E_functions variables of overloaded functions are not allowed'#000+
+  'E_typed constants of classes are not allowed'#000+
+  'E_','functions variables of overloaded functions are not allowed'#000+
   'E_string length must be a value from 1 to 255'#000+
   'W_use extended syntax of DISPOSE and NEW to generate instances of obje'+
   'cts'#000+
   'E_class identifier expected'#000+
-  'E_method identifier expe','cted'#000+
-  'E_function header doesn'#039't match any method of this class'#000+
+  'E_method identifier expected'#000+
+  'E_f','unction header doesn'#039't match any method of this class'#000+
   'P_procedure/function $1'#000+
   'E_Illegal floating point constant'#000+
   'E_FAIL can be used in constructors only'#000+
   'E_Destructors can'#039't have parameters'#000+
-  'E_Only class methods can be referred with cl','ass references'#000+
+  'E_Only class methods can be referred with class refe','rences'#000+
   'E_Only class methods can be accessed in class methods'#000+
   'E_Constant and CASE types do not match'#000+
   'E_The symbol can'#039't be exported from a library'#000+
   'W_A inherited method is hidden by $1'#000+
-  'E_There is no method in an ancestor class to be o','verridden: $1'#000+
+  'E_There is no method in an ancestor class to be overridde','n: $1'#000+
   'E_No member is provided to access property'#000+
   'E_Illegal symbol for property access'#000+
   'E_Cannot access a protected field of an object here'#000+
   'E_Cannot access a private field of an object here'#000+
-  'W_overloaded of virtual method must be virtu','al: $1'#000+
-  'E_overloaded methods which are virtual must have the same return type:'+
-  ' $1'#000+
+  'W_overloaded of virtual method must be virtual: $1'#000+
+  'E','_overloaded methods which are virtual must have the same return typ'+
+  'e: $1'#000+
   'E_EXPORT declared functions can'#039't be nested'#000+
   'E_methods can'#039't be EXPORTed'#000+
   'E_call by var parameters have to match exactly'#000+
-  'E_Class isn'#039't a parent class of the curr','ent class'#000+
+  'E_Class isn'#039't a parent class of the current clas','s'#000+
   'E_SELF is only allowed in methods'#000+
   'E_methods can be only in other methods called direct with type identif'+
   'ier of the class'#000+
   'E_Illegal use of '#039':'#039#000+
   'E_range check error in set constructor or duplicate set element'#000+
-  'E_Pointer to object expe','cted'#000+
-  'E_Expression must be constructor call'#000+
+  'E_Pointer to object expected'#000+
+  'E_E','xpression must be constructor call'#000+
   'E_Expression must be destructor call'#000+
   'E_Illegal order of record elements'#000+
   'E_Expression type must be class or record type'#000+
   'E_Functions with void return value can'#039't return any value'#000+
-  'E_constructors and d','estructors must be methods'#000+
+  'E_constructors and destructo','rs must be methods'#000+
   'E_Operator is not overloaded'#000+
   'E_Re-raise isn'#039't possible there'#000+
   'E_The extended syntax of new or dispose isn'#039't allowed for a class'#000+
   'E_Assembler incompatible with function return value'#000+
-  'E_Procedure overloading is switche','d off'#000+
-  'E_It is not possible to overload this operator (overload = instead)'#000+
+  'E_Procedure overloading is switched off'#000+
+  'E_','It is not possible to overload this operator (overload = instead)'#000+
   'E_Comparative operator must return a boolean value'#000+
   'E_Only virtual methods can be abstract'#000+
   'F_Use of unsupported feature!'#000+
-  'E_The mix of CLASSES and OBJECTS isn'#039't allowed',#000+
-  'W_Unknown procedure directive had to be ignored: $1'#000+
+  'E_The mix of CLASSES and OBJECTS isn'#039't allowed'#000+
+  'W_Unkno','wn procedure directive had to be ignored: $1'#000+
   'E_absolute can only be associated to ONE variable'#000+
   'E_absolute can only be associated a var or const'#000+
   'E_Abtract methods shouldn'#039't have any definition (with function bod'+
   'y)'#000+
-  'E_This overloaded f','unction can'#039't be local (must be exported)'#000+
+  'E_This overloaded function ','can'#039't be local (must be exported)'#000+
   'W_Virtual methods are used without a constructor in $1'#000+
   'M_Macro defined: $1'#000+
   'M_Macro undefined: $1'#000+
   'M_Macro $1 set to $2'#000+
   'I_Compiling $1'#000+
   'D_Compiling $1 for the second time'#000+
-  'E_Array properties aren'#039't allo','wed at this point'#000+
+  'E_Array properties aren'#039't allowed at t','his point'#000+
   'E_No property found to override'#000+
   'E_Only one default property is allowed, found inherited default proper'+
   'ty in class $1'#000+
   'E_The default property must be an array property'#000+
-  'E_Virtual constructors are only supported in class objec','t model'#000+
+  'E_Virtual constructors are only supported in class object model'#000,+
   'E_No default property available'#000+
   'E_The class can'#039't have a published section, use the {$M+} switch'#000+
   'E_Forward declaration of class $1 must be resolved here to use the cla'+
   'ss as ancestor'#000+
   'E_Local operators not supported'#000+
-  'E_Procedure direct','ive $1 not allowed in interface section'#000+
+  'E_Procedure directive $1 n','ot allowed in interface section'#000+
   'E_Procedure directive $1 not allowed in implementation section'#000+
   'E_Procedure directive $1 not allowed in procvar declaration'#000+
   'E_Function is already declared Public/Forward $1'#000+
-  'E_Can'#039't use both EXPORT and ','EXTERNAL'#000+
+  'E_Can'#039't use both EXPORT and EXTERNAL',#000+
   'E_NAME keyword expected'#000+
   'W_$1 not yet supported inside inline procedure/function'#000+
   'W_Inlining disabled'#000+
   'I_Writing Browser log $1'#000+
   'H_may be pointer dereference is missing'#000+
   'F_Selected assembler reader not supported'#000+
-  'E_Procedure directive $1',' has conflicts with other directives'#000+
+  'E_Procedure directive $1 has con','flicts with other directives'#000+
   'E_Calling convention doesn'#039't match forward'#000+
   'E_Register calling (fastcall) not supported'#000+
   'E_Property can'#039't have a default value'#000+
   'E_The default value of a property must be constant'#000+
-  'E_Symbol can'#039't be published',', can be only a class'#000+
+  'E_Symbol can'#039't be published, can be',' only a class'#000+
   'E_That kind of property can'#039't be published'#000+
   'E_Type mismatch'#000+
   'E_Integer expression expected'#000+
@@ -179,48 +179,48 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'E_Type identifier expected'#000+
   'E_Variable identifier expected'#000+
   'E_pointer type expected'#000+
-  'E_class type expe','cted'#000+
-  'E_Variable or type indentifier expected'#000+
+  'E_class type expected'#000+
+  'E_V','ariable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'W_Automatic type conversion from floating type to COMP which is an int'+
   'eger type'#000+
-  'W_Using / will give a floating point result'#000,+
-  'H_use DIV instead to get an integer result'#000+
+  'W_Using / will give a floating point result'#000+
+  'H_use DI','V instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
   'E_Can'#039't read or write variables of this type'#000+
   'E_Type conflict between set elements'#000+
-  'E_Integer o','r real expression expected'#000+
+  'E_Integer or real e','xpression expected'#000+
   'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
   'E_Unknown identifier $1'#000+
   'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
-  'E_Error in type definit','ion'#000+
-  'E_Forward type not resolved $1'#000+
+  'E_Error in type definition'#000+
+  'E_Fo','rward type not resolved $1'#000+
   'E_Only static variables can be used in static methods or outside metho'+
   'ds'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
-  'E_Instances of classes or objects with an abtsract method ar','e not al'+
-  'lowed'#000+
+  'E_Instances of classes or objects with an abtsract method are not al','l'+
+  'owed'#000+
   'E_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
   'E_GOTO und LABEL are not supported (use command line switch -Sg)'#000+
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illegal type declaration of set element','s'#000+
-  'E_Forward class definition not resolved $1'#000+
+  'E_illegal type declaration of set elements'#000+
+  'E_Forw','ard class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown field identifier'#000+
   'W_Local variable $1 does not seem to be initialized'#000+
-  'E','_identifier idents no member $1'#000+
+  'E_identif','ier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
   'E_CONTINUE not allowed'#000+
@@ -228,34 +228,34 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'E_Illegal expression'#000+
   'E_Invalid integer'#000+
   'E_Illegal qualifier'#000+
-  'E_High range limit < low range l','imit'#000+
-  'E_Illegal counter variable'#000+
+  'E_High range limit < low range limit'#000+
+  'E_I','llegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
   'E_File types must be var parameters'#000+
   'E_The use of a far pointer isn'#039't allowed there'#000+
-  'E_ill','egal call by reference parameters'#000+
+  'E_illegal cal','l by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
   'h to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe ESP/SP',#000+
-  'E_Abstract methods can'#039't be called directly'#000+
+  'E_procedure call with stackframe ESP/SP'#000+
+  'E_Abstr','act methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
-  'F_Inter','nal Error in secondinline()'#000+
+  'F_Internal Erro','r in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
   'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omited'#000+
   'E_Unable to inline object methods'#000+
   'E_Unable to inline procvar calls'#000+
   'E_No code for inline procedure stored'#000+
-  'F_Divide by zero',' in asm evaluator'#000+
+  'F_Divide by zero in asm ','evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
   'F_Invalid numeric format in asm evaluator'#000+
@@ -263,13 +263,13 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'F_Unknown error in asm evaluator'#000+
   'W_Invalid numeric value'#000+
   'E_escape sequence ignored: $1'#000+
-  'E_','Asm syntax error - Prefix not found'#000+
+  'E_Asm synt','ax error - Prefix not found'#000+
   'E_Asm syntax error - Trying to add more than one prefix'#000+
   'E_Asm syntax error - Opcode not found'#000+
   'E_Invalid symbol reference'#000+
   'W_Calling an overload function in an asm'#000+
   'E_Constant value out of bounds'#000+
-  'E_Non-label',' pattern contains @'#000+
+  'E_Non-label pattern',' contains @'#000+
   'E_Invalid Operand: $1'#000+
   'W_Override operator not supported'#000+
   'E_Error in binary constant: $1'#000+
@@ -277,92 +277,92 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'E_Error in hexadecimal constant: $1'#000+
   'E_Error in integer constant: $1'#000+
   'E_Invalid labeled opcode'#000+
-  'F_Internal',' error in Findtype()'#000+
+  'F_Internal error i','n Findtype()'#000+
   'E_Invalid size for MOVSX/MOVZX'#000+
   'E_16-bit base in 32-bit segment'#000+
   'E_16-bit index in 32-bit segment'#000+
   'E_Invalid Opcode'#000+
   'E_Constant reference not allowed'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
-  'E_Invalid combination of',' opcode and operands'#000+
+  'E_Invalid combination of opcode ','and operands'#000+
   'W_Opcode $1 not in table, operands not checked'#000+
   'F_Internal Error in ConcatOpcode()'#000+
   'E_Invalid size in reference'#000+
   'E_Invalid middle sized operand'#000+
   'E_Invalid three operand opcode'#000+
   'E_Assembler syntax error'#000+
-  'E_Invalid operand type',#000+
-  'E_Segment overrides not supported'#000+
+  'E_Invalid operand type'#000+
+  'E_Segme','nt overrides not supported'#000+
   'E_Invalid constant symbol $1'#000+
   'F_Internal Errror converting binary'#000+
   'F_Internal Errror converting hexadecimal'#000+
   'F_Internal Errror converting octal'#000+
   'E_Invalid constant expression'#000+
   'E_Unknown identifier: $1'#000+
-  'E_Trying ','to define an index register more than once'#000+
+  'E_Trying to defin','e an index register more than once'#000+
   'E_Invalid field specifier'#000+
   'F_Internal Error in BuildScaling()'#000+
   'E_Invalid scaling factor'#000+
   'E_Invalid scaling value'#000+
   'E_Scaling value only allowed with index'#000+
-  'E_Invalid assembler syntax. No ref with bracket','s)'#000+
-  'E_Expressions of the form [sreg:reg...] are currently not supported'#000+
+  'E_Invalid assembler syntax. No ref with brackets)'#000+
+  'E_Exp','ressions of the form [sreg:reg...] are currently not supported'#000+
   'E_Trying to define a segment register twice'#000+
   'E_Trying to define a base register twice'#000+
   'E_Trying to use a negative index register'#000+
   'E_Asm syntax error - error in reference'#000+
-  'E_','Local symbols not allowed as references'#000+
+  'E_Local sy','mbols not allowed as references'#000+
   'E_Invalid operand in bracket expression'#000+
   'E_Invalid symbol name: $1'#000+
   'E_Invalid Reference syntax'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
-  'E_Null label references are not allo','wed'#000+
-  'W_Calling of an overloaded function in direct assembler'#000+
+  'E_Null label references are not allowed'#000+
+  'W_Ca','lling of an overloaded function in direct assembler'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Asm syntax error - Should start with bracket'#000+
   'E_Asm syntax error - register: $1'#000+
   'E_SEG and OFFSET not supported'#000+
-  'E_Asm syntax error - in opcode op','erand'#000+
-  'E_Invalid String expression'#000+
+  'E_Asm syntax error - in opcode operand'#000+
+  'E_','Invalid String expression'#000+
   'E_Constant expression out of bounds'#000+
   'F_Internal Error in BuildConstant()'#000+
   'W_A repeat prefix and a segment override on <= i386 may result in erro'+
   'rs if an interrupt occurs'#000+
   'E_Invalid or missing opcode'#000+
-  'E_Invalid ','combination of prefix and opcode: $1'#000+
+  'E_Invalid combinat','ion of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'E_Duplicate local symbol: $1'#000+
   'E_Unknown label identifer: $1'#000+
   'E_Assemble node syntax error'#000+
   'E_Undefined local symbol: $1'#000+
-  'D_Startin','g intel styled assembler parsing...'#000+
+  'D_Starting intel ','styled assembler parsing...'#000+
   'D_Finished intel styled assembler parsing...'#000+
   'E_Not a directive or local symbol: $1'#000+
   'E_/ at beginning of line not allowed'#000+
   'E_NOR not supported'#000+
   'E_Invalid floating point register name'#000+
   'W_Modulo not supported'#000+
-  'E_','Invalid floating point constant: $1'#000+
+  'E_Invalid ','floating point constant: $1'#000+
   'E_Size suffix and destination register do not match'#000+
   'E_Internal error in ConcatLabeledInstr()'#000+
   'W_Floating point binary representation ignored'#000+
   'W_Floating point hexadecimal representation ignored'#000+
-  'W_Floating p','oint octal representation ignored'#000+
+  'W_Floating point oct','al representation ignored'#000+
   'E_Invalid real constant expression'#000+
   'E_Parenthesis are not allowed'#000+
   'E_Invalid Reference'#000+
   'E_Cannot use __SELF outside a method'#000+
   'E_Cannot use __OLDEBP outside a nested procedure'#000+
   'W_Identifier $1 supposed external'#000+
-  'E','_Invalid segment override expression'#000+
+  'E_Invalid',' segment override expression'#000+
   'E_Strings not allowed as constants'#000+
   'D_Starting AT&T styled assembler parsing...'#000+
   'D_Finished AT&T styled assembler parsing...'#000+
   'E_Switching sections is not allowed in an assembler block'#000+
-  'E_Invalid global defin','ition'#000+
-  'E_Line separator expected'#000+
+  'E_Invalid global definition'#000+
+  'E_','Line separator expected'#000+
   'W_globl not supported'#000+
   'W_align not supported'#000+
   'W_lcomm not supported'#000+
@@ -370,7 +370,7 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'E_Invalid local common definition'#000+
   'E_Invalid global common definition'#000+
   'E_local symbol: $1 not found inside asm statement'#000+
-  'E_','assembler code not returned to text'#000+
+  'E_assemble','r code not returned to text'#000+
   'F_internal error in BuildReference()'#000+
   'E_invalid opcode size'#000+
   'W_NEAR ignored'#000+
@@ -378,41 +378,41 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'D_Creating inline asm lookup tables'#000+
   'W_Using a defined name as a local label'#000+
   'F_internal error in HandleExtend()'#000+
-  'E_Inv','alid character: <'#000+
+  'E_Invalid cha','racter: <'#000+
   'E_Invalid character: >'#000+
   'E_Unsupported opcode'#000+
   'E_Increment and Decrement mode not allowed together'#000+
   'E_Invalid Register list in movem/fmovem'#000+
   'E_Invalid Register list for opcode'#000+
   'E_68020+ mode required to assemble'#000+
-  'D_Starting Motor','ola styled assembler parsing...'#000+
+  'D_Starting Motorola styl','ed assembler parsing...'#000+
   'D_Finished Motorola styled assembler parsing...'#000+
   'W_XDEF not supported'#000+
   'W_Functions with void return value can'#039't return any value in asm c'+
   'ode'#000+
   'E_Invalid suffix for intel assembler'#000+
-  'E_Extended not supported in this',' mode'#000+
-  'E_Comp not supported in this mode'#000+
+  'E_Extended not supported in this mode'#000+
+  'E_','Comp not supported in this mode'#000+
   'W_You need GNU as version >= 2.81 to compile this MMX code'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'E_Unsupported symbol type for operand'#000+
   'I_Assembling (pipe) $1'#000+
-  'E_Can'#039't cre','ate assember file $1'#000+
+  'E_Can'#039't create asse','mber file $1'#000+
   'W_Assembler $1 not found, switching to external assembling'#000+
   'U_Using assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'ing'#000+
   'I_Assembling $1'#000+
-  'W_Linker $1 not',' found, switching to external linking'#000+
+  'W_Linker $1 not found, ','switching to external linking'#000+
   'U_Using linker: $1'#000+
   'W_Object $1 not found, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
-  'W_binder',' not found, switching to external binding'#000+
+  'W_binder not fou','nd, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
@@ -420,7 +420,7 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'D_PPU Time: $1'#000+
   'D_PPU File too short'#000+
   'D_PPU Invalid Header (no PPU at the begin)'#000+
-  'D_PPU I','nvalid Version $1'#000+
+  'D_PPU Invalid V','ersion $1'#000+
   'D_PPU Flags: $1'#000+
   'D_PPU Crc: $1'#000+
   'T_PPU Source: $1'#000+
@@ -430,34 +430,34 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
-  'F_unexpe','cted end of PPU-File'#000+
+  'F_unexpected end',' of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
   'F_Can'#039't compile unit $1, no sources available'#000+
-  'W_Compiling the system unit require','s the -Us switch'#000+
+  'W_Compiling the system unit requires the -U','s switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
   'T_From $1 ($2) load unit $3'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
   'W_DEF file can be created only for OS/2'#000+
-  'E_nested response files are not suppo','rted'#000+
-  'F_No source file name in command line'#000+
+  'E_nested response files are not supported'#000+
+  'F_N','o source file name in command line'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
-  'W_Shared libs not supported o','n DOS platform, reverting to static'#000+
+  'W_Shared libs not supported on DOS pl','atform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
-  'Free Pascal Compiler versio','n $FPCVER [$FPCDATE] for $FPCTARGET'#000+
+  'Free Pascal Compiler version $FPCVE','R [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-98 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
@@ -465,14 +465,14 @@ const msgtxt : array[0..00088,1..240] of char=(+
   'Compiler Target: $FPCTARGET'#000+
   #000+
   'This program comes under the GNU General Public Licence'#000+
-  'For more info','rmation read COPYING.FPC'#000+
+  'For more information ','read COPYING.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
   '                [email protected]'#000+
   '**0*_+ switch option on, - off'#000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
-  '**2al_list sourcecode lines in assembler',' file'#000+
-  '*t1b_use EMS'#000+
+  '**2al_list sourcecode lines in assembler file'#000+
+  '*t','1b_use EMS'#000+
   '**1B_build all modules'#000+
   '**1C_code generation options'#000+
   '3*2CD_create dynamic library'#000+
@@ -480,7 +480,7 @@ const msgtxt : array[0..00088,1..240] of char=(+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
-  '**','2Cr_range checking'#000+
+  '**2Cr_rang','e checking'#000+
   '**2Cs<n>_set stack size to <n>'#000+
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
@@ -489,7 +489,7 @@ const msgtxt : array[0..00088,1..240] of char=(+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
-  '**1e<x>_s','et path to executable'#000+
+  '**1e<x>_set path ','to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F_set file names and paths'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
@@ -497,87 +497,87 @@ const msgtxt : array[0..00088,1..240] of char=(+
   '*L2Fg<x>_same as -Fl'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
-  '*L2','FL<x>_uses <x> as dynamic linker'#000+
+  '*L2FL<x>_us','es <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g_generate debugger information'#000+
   '*g2gg_use gsym'#000+
-  '*g2g','d_use dbx'#000+
+  '*g2gd_use db','x'#000+
   '**1i_information'#000+
   '**1I<x>_adds <x> to include path'#000+
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
   '**1o<x>_change the name of the executable produced to <x>'#000+
-  '**1pg_generate profile code for gpr','of'#000+
-  '*L1P_use pipes instead of creating temporary assembler files'#000+
+  '**1pg_generate profile code for gprof'#000+
+  '*L1P_','use pipes instead of creating temporary assembler files'#000+
   '**1S_syntax options'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se_compiler stops after th','e first error'#000+
+  '**2Se_compiler stops after the first ','error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Si_support C++ stlyed INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_constructor name must be init (destructor must be do','ne)'#000+
-  '**2St_allow static keyword in objects'#000+
+  '**2Ss_constructor name must be init (destructor must be done)'#000+
+  '**2S','t_allow static keyword in objects'#000+
   '**2Sv_allow variable directives (cvar,external,public,export)'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options'#000+
   '**2Un_don'#039't check the unit name'#000+
-  '*','*2Up<x>_same as -Fu<x>'#000+
+  '**2Up<x>_','same as -Fu<x>'#000+
   '**2Us_compile a system unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters :'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
   '**2*_w : Show warnings               u : Show used files'#000+
-  '**2*_n ',': Show notes                  t : Show tried files'#000+
+  '**2*_n : Show n','otes                  t : Show tried files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2','*_a : Show everything             0 : Show nothing (except errors'+
+  '**2*_a : Sh','ow everything             0 : Show nothing (except errors'+
   ')'#000+
   '**2*_b : Show all procedure'#000+
   '**2*_    declarations if an error'#000+
   '**2*_    occurs'#000+
   '**1X_executable options'#000+
   '*L2Xc_link with the c library'#000+
-  '**2XD_link with dynamic libraries (define','s FPC_LINK_DYNAMIC)'#000+
+  '**2XD_link with dynamic libraries (defines FPC_LI','NK_DYNAMIC)'#000+
   '**2Xs_strip all symbols from executable'#000+
   '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_output format'#000+
   '3*2Ao_coff file using GNU AS'#000+
   '3*2Anasmcoff_coff file using Nasm'#000+
-  '3*2','Anasmelf_elf32 (linux) file using Nasm'#000+
+  '3*2Anasmelf','_elf32 (linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj using Masm (Mircosoft)'#000+
   '3*2Atasm_obj using Tasm (Borland)'#000+
   '3*1R<x>_assembler reading style'#000+
   '3*2Ratt_read AT&T style assembler'#000+
-  '3*2Rintel_read Intel style assemb','ler'#000+
-  '3*2Rdirect_copy assembler text directly to assembler file'#000+
+  '3*2Rintel_read Intel style assembler'#000+
+  '3*2R','direct_copy assembler text directly to assembler file'#000+
   '3*1O<x>_optimizations'#000+
   '3*2Og_generate smaller code'#000+
   '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
-  '3*2Ou_enable uncertain optimizat','ions (see docs)'#000+
+  '3*2Ou_enable uncertain optimizations (se','e docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op_target processor'#000+
   '3*3Op1_set target processor to 386/486'#000+
-  '3*3Op2_set t','arget processor to Pentium/PentiumMMX (tm)'#000+
+  '3*3Op2_set target pr','ocessor to Pentium/PentiumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
   '3*1T<x>_Target operating system'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
-  '3*2TLINUX_Linux',#000+
-  '3*2TOS2_OS/2 2.x'#000+
+  '3*2TLINUX_Linux'#000+
+  '3*2TOS2','_OS/2 2.x'#000+
   '3*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
   '6*2Ao_Unix o-file using GNU AS'#000+
@@ -586,14 +586,14 @@ const msgtxt : array[0..00088,1..240] of char=(+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations'#000+
   '6*2Oa_turn on the optimizer'#000+
-  '6','*2Og_generate smaller code'#000+
+  '6*2Og_gen','erate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
   '6*2O2_set target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style'#000+
   '6*2RMOT_read motorola style assembler'#000+
-  '6*1T<x>_Target operating ','system'#000+
-  '6*2TAMIGA_Commodore Amiga'#000+
+  '6*1T<x>_Target operating system'#000+
+  '6','*2TAMIGA_Commodore Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+

compiler/parser.pas

@@ -253,9 +253,6 @@ unit parser;
          else
            proc_program(token=_LIBRARY);
 
-         if status.errorcount>0 then
-           Message1(unit_f_errors_in_unit,tostr(status.errorcount));
-
          { clear memory }
 {$ifdef Splitheap}
          if testsplit then
@@ -364,7 +361,10 @@ unit parser;
 end.
 {
   $Log$
-  Revision 1.53  1998-09-30 16:43:36  peter
+  Revision 1.54  1998-10-05 21:33:23  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.53  1998/09/30 16:43:36  peter
     * fixed unit interdependency with circular uses
 
   Revision 1.52  1998/09/28 16:57:22  pierre

compiler/pdecl.pas

@@ -73,6 +73,39 @@ unit pdecl;
 
     function read_type(const name : stringid) : pdef;forward;
 
+    { search in symtablestack used, but not defined type }
+    procedure testforward_type(p : psym);{$ifndef FPC}far;{$endif}
+      var
+        recsymtable : psymtable;
+        oldaktfilepos : tfileposinfo;
+      begin
+         if not(p^.typ=typesym) then
+          exit;
+         if ((p^.properties and sp_forwarddef)<>0) then
+           begin
+             oldaktfilepos:=aktfilepos;
+             aktfilepos:=p^.fileinfo;
+             Message1(sym_e_forward_type_not_resolved,p^.name);
+             aktfilepos:=oldaktfilepos;
+             { try to recover }
+             ptypesym(p)^.definition:=generrordef;
+             p^.properties:=p^.properties and (not sp_forwarddef);
+           end
+         else
+          if (ptypesym(p)^.definition^.deftype in [recorddef,objectdef]) then
+           begin
+             if (ptypesym(p)^.definition^.deftype=recorddef) then
+               recsymtable:=precdef(ptypesym(p)^.definition)^.symtable
+             else
+               recsymtable:=pobjectdef(ptypesym(p)^.definition)^.publicsyms;
+           {$ifdef tp}
+             recsymtable^.foreach(testforward_type);
+           {$else}
+             recsymtable^.foreach(@testforward_type);
+           {$endif}
+           end;
+      end;
+
 
     procedure const_dec;
       var
@@ -598,6 +631,7 @@ unit pdecl;
                    id_type:=generrordef;
                    exit;
                 end;
+              testforward_type(srsym);
            end;
          lasttypesym:=ptypesym(srsym);
          id_type:=ptypesym(srsym)^.definition;
@@ -1463,37 +1497,6 @@ unit pdecl;
       end;
 
 
-    { search in symtablestack used, but not defined type }
-    procedure testforward_types(p : psym);{$ifndef FPC}far;{$endif}
-      var
-        recsymtable : psymtable;
-        oldaktfilepos : tfileposinfo;
-      begin
-         if not(p^.typ=typesym) then
-          exit;
-         if ((p^.properties and sp_forwarddef)<>0) then
-           begin
-             oldaktfilepos:=aktfilepos;
-             aktfilepos:=p^.fileinfo;
-             Message1(sym_e_forward_type_not_resolved,p^.name);
-             aktfilepos:=oldaktfilepos;
-           end
-         else
-          if (ptypesym(p)^.definition^.deftype in [recorddef,objectdef]) then
-           begin
-             if (ptypesym(p)^.definition^.deftype=recorddef) then
-               recsymtable:=precdef(ptypesym(p)^.definition)^.symtable
-             else
-               recsymtable:=pobjectdef(ptypesym(p)^.definition)^.publicsyms;
-           {$ifdef tp}
-             recsymtable^.foreach(testforward_types);
-           {$else}
-             recsymtable^.foreach(@testforward_types);
-           {$endif}
-           end;
-      end;
-
-
     { reads a type definition and returns a pointer to it }
     function read_type(const name : stringid) : pdef;
 
@@ -1957,11 +1960,11 @@ unit pdecl;
              parse_var_proc_directives(newtype);
          until token<>ID;
          typecanbeforward:=false;
-{$ifdef tp}
-         symtablestack^.foreach(testforward_types);
-{$else}
-         symtablestack^.foreach(@testforward_types);
-{$endif}
+      {$ifdef tp}
+         symtablestack^.foreach(testforward_type);
+      {$else}
+         symtablestack^.foreach(@testforward_type);
+      {$endif}
          resolve_forwards;
          block_type:=bt_general;
       end;
@@ -2055,7 +2058,10 @@ unit pdecl;
 end.
 {
   $Log$
-  Revision 1.63  1998-10-05 13:57:13  peter
+  Revision 1.64  1998-10-05 21:33:24  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.63  1998/10/05 13:57:13  peter
     * crash preventions
 
   Revision 1.62  1998/10/02 17:06:02  peter

compiler/pmodules.pas

@@ -806,22 +806,28 @@ unit pmodules;
          punitsymtable(symtablestack)^.is_stab_written:=false;
 {$endif GDB}
 
+         { leave when we got an error }
+         if status.errorcount>0 then
+          begin
+            Message1(unit_f_errors_in_unit,tostr(status.errorcount));
+            exit;
+          end;
+
          { insert own objectfile }
          insertobjectfile;
 
-         {Write out the unit if the compile was succesfull.}
-         if status.errorcount=0 then
-          begin
-             writeunitas(current_module^.ppufilename^,punitsymtable(symtablestack));
+         { Write out the ppufile }
+         writeunitas(current_module^.ppufilename^,punitsymtable(symtablestack));
+
+         { write local browser }
 {$ifdef UseBrowser}
-            if cs_local_browser in aktmoduleswitches then
-              begin
-                 current_module^.implsymtable:=refsymtable;
-                 refsymtable^.write;
-                 refsymtable^.write_browser;
-              end;
-{$endif UseBrowser}
+         if cs_local_browser in aktmoduleswitches then
+          begin
+            current_module^.implsymtable:=refsymtable;
+            refsymtable^.write;
+            refsymtable^.write_browser;
           end;
+{$endif UseBrowser}
 
 {$ifdef GDB}
          pu:=pused_unit(usedunits.first);
@@ -831,11 +837,6 @@ unit pmodules;
               pu:=pused_unit(pu^.next);
            end;
 {$endif GDB}
-         inc(datasize,symtablestack^.datasize);
-
-         { leave when we got an error }
-         if status.errorcount>0 then
-          exit;
 
          { generate imports }
          if current_module^.uses_imports then
@@ -947,11 +948,9 @@ unit pmodules;
          names.insert('PASCALMAIN');
          names.insert(target_os.cprefix+'main');
 {$ifdef m68k}
-
          if target_info.target=target_PalmOS then
            names.insert('PilotMain');
 {$endif}
-
          compile_proc_body(names,true,false);
          names.done;
 
@@ -964,7 +963,10 @@ unit pmodules;
 
          { leave when we got an error }
          if status.errorcount>0 then
-          exit;
+          begin
+            Message1(unit_f_errors_in_unit,tostr(status.errorcount));
+            exit;
+          end;
 
          { insert heap }
          insertheap;
@@ -999,7 +1001,10 @@ unit pmodules;
 end.
 {
   $Log$
-  Revision 1.58  1998-09-30 16:43:37  peter
+  Revision 1.59  1998-10-05 21:33:26  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.58  1998/09/30 16:43:37  peter
     * fixed unit interdependency with circular uses
 
   Revision 1.57  1998/09/30 12:11:52  peter

compiler/symdef.inc

@@ -606,6 +606,7 @@
          calcsavesize;
          has_jumps:=false;
          basedef:=nil;
+         rangenr:=0;
          first:=nil;
       end;
 
@@ -619,6 +620,7 @@
          basedef:=_basedef;
          calcsavesize;
          has_jumps:=false;
+         rangenr:=0;
          first:=nil;
       end;
 
@@ -697,6 +699,31 @@
       end;
 
 
+    function tenumdef.getrangecheckstring : string;
+      begin
+         if (cs_smartlink in aktmoduleswitches) then
+           getrangecheckstring:='R_'+current_module^.modulename^+tostr(rangenr)
+         else
+           getrangecheckstring:='R_'+tostr(rangenr);
+      end;
+
+
+    procedure tenumdef.genrangecheck;
+      begin
+         if rangenr=0 then
+           begin
+              { generate two constant for bounds }
+              getlabelnr(rangenr);
+              if (cs_smartlink in aktmoduleswitches) then
+                datasegment^.concat(new(pai_symbol,init_global(getrangecheckstring)))
+              else
+                datasegment^.concat(new(pai_symbol,init(getrangecheckstring)));
+              datasegment^.concat(new(pai_const,init_32bit(min)));
+              datasegment^.concat(new(pai_const,init_32bit(max)));
+           end;
+      end;
+
+
 {$ifdef GDB}
     function tenumdef.stabstring : pchar;
       var st,st2 : pchar;
@@ -777,6 +804,7 @@
          low:=v;
          high:=b;
          typ:=t;
+         rangenr:=0;
          setsize;
       end;
 
@@ -3045,7 +3073,10 @@
 
 {
   $Log$
-  Revision 1.53  1998-10-05 12:48:39  pierre
+  Revision 1.54  1998-10-05 21:33:28  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.53  1998/10/05 12:48:39  pierre
     * wrong handling of range check for arrays fixed
 
   Revision 1.52  1998/10/02 07:20:38  florian

compiler/symdefh.inc

@@ -80,8 +80,7 @@
           procedure write_child_init_data;virtual;
 
           { rtti }
-          function get_rtti_label : plabel;
-
+          function  get_rtti_label : plabel;
           procedure generate_rtti;virtual;
           procedure write_rtti_data;virtual;
           procedure write_child_rtti_data;virtual;
@@ -432,6 +431,7 @@
 
        penumdef = ^tenumdef;
        tenumdef = object(tdef)
+          rangenr,
           minval,
           maxval    : longint;
           has_jumps : boolean;
@@ -448,6 +448,8 @@
           procedure setmin(_min:longint);
           function  min:longint;
           function  max:longint;
+          function  getrangecheckstring:string;
+          procedure genrangecheck;
 {$ifdef GDB}
           function stabstring : pchar;virtual;
 {$endif GDB}
@@ -477,7 +479,10 @@
 
 {
   $Log$
-  Revision 1.2  1998-10-02 07:20:40  florian
+  Revision 1.3  1998-10-05 21:33:30  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.2  1998/10/02 07:20:40  florian
     * range checking in units doesn't work if the units are smartlinked, fixed
 
   Revision 1.1  1998/09/23 12:03:57  peter

compiler/tcadd.pas

@@ -460,14 +460,25 @@ implementation
          { left side a setdef ? }
            if (ld^.deftype=setdef) then
              begin
-             { right site must also be a setdef, unless addn is used }
-                if not(p^.treetype in [subn,symdifn,addn,muln,equaln,unequaln]) or
-                   ((rd^.deftype<>setdef) and (p^.treetype<>addn)) then
-                  CGMessage(type_e_mismatch);
-
-                if ((rd^.deftype=setdef) and not(is_equal(rd,ld))) and
-                   not((rt=setelementn) and is_equal(psetdef(ld)^.setof,rd)) then
-                  CGMessage(type_e_set_element_are_not_comp);
+             { trying to add a set element? }
+                if (p^.treetype=addn) and (rd^.deftype<>setdef) then
+                 begin
+                   if (rt=setelementn) then
+                    begin
+                      if not(is_equal(psetdef(ld)^.setof,rd)) then
+                       CGMessage(type_e_set_element_are_not_comp);
+                    end
+                   else
+                    CGMessage(type_e_mismatch)
+                 end
+                else
+                 begin
+                   if not(p^.treetype in [addn,subn,symdifn,muln,equaln,unequaln]) then
+                    CGMessage(type_e_mismatch);
+                 { right def must be a also be set }
+                   if (rd^.deftype<>setdef) or not(is_equal(rd,ld)) then
+                    CGMessage(type_e_set_element_are_not_comp);
+                 end;
 
                 { ranges require normsets }
                 if (psetdef(ld)^.settype=smallset) and
@@ -883,7 +894,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.1  1998-09-23 20:42:24  peter
+  Revision 1.2  1998-10-05 21:33:31  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.1  1998/09/23 20:42:24  peter
     * splitted pass_1
 
 }

compiler/tccnv.pas

@@ -129,8 +129,7 @@ implementation
               case p2^.resulttype^.deftype of
             enumdef,
              orddef : begin
-                        if (p2^.resulttype^.deftype=orddef) and
-                           (porddef(p2^.resulttype)^.typ in [s8bit,s16bit,s32bit,u16bit,u32bit]) then
+                        if is_integer(p2^.resulttype) then
                          begin
                            p2:=gentypeconvnode(p2,u8bitdef);
                            firstpass(p2);
@@ -140,21 +139,20 @@ implementation
                           pd:=p2^.resulttype;
                         if not(is_equal(pd,p2^.resulttype)) then
                          begin
-                           Message(type_e_typeconflict_in_set);
+                           CGMessage(type_e_typeconflict_in_set);
                            disposetree(p2);
                          end
                         else
                          begin
                            if assigned(p3) then
                             begin
-                              if (p3^.resulttype^.deftype=orddef) and
-                                 (porddef(p3^.resulttype)^.typ in [s8bit,s16bit,s32bit,u16bit,u32bit]) then
+                              if is_integer(p3^.resulttype) then
                                begin
                                  p3:=gentypeconvnode(p3,u8bitdef);
                                  firstpass(p3);
                                end;
                               if not(is_equal(pd,p3^.resulttype)) then
-                                Message(type_e_typeconflict_in_set)
+                                CGMessage(type_e_typeconflict_in_set)
                               else
                                 begin
                                   if (p2^.treetype=ordconstn) and (p3^.treetype=ordconstn) then
@@ -191,14 +189,14 @@ implementation
                         if pd=nil then
                          pd:=cchardef;
                         if not(is_equal(pd,cchardef)) then
-                         Message(type_e_typeconflict_in_set)
+                         CGMessage(type_e_typeconflict_in_set)
                         else
                          for l:=1 to length(pstring(p2^.value_str)^) do
                           do_set(ord(pstring(p2^.value_str)^[l]));
                         disposetree(p2);
                       end;
               else
-               Internalerror(4234);
+               CGMessage(type_e_ordinal_expr_expected);
               end;
             { insert the set creation tree }
               if assigned(p4) then
@@ -903,7 +901,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.3  1998-09-27 10:16:26  florian
+  Revision 1.4  1998-10-05 21:33:32  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.3  1998/09/27 10:16:26  florian
     * type casts pchar<->ansistring fixed
     * ansistring[..] calls does now an unique call
 

compiler/tree.pas

@@ -307,10 +307,7 @@ unit tree;
   implementation
 
     uses
-{ $ifdef extdebug}
-       types,
-{ $endif extdebug}
-       verbose,files;
+       verbose,files,types;
 
 
     function getnode : ptree;
@@ -693,6 +690,7 @@ unit tree;
 {$endif SUPPORT_MMX}
          p^.resulttype:=def;
          p^.value:=v;
+         testrange(p^.resulttype,p^.value);
          genordinalconstnode:=p;
       end;
 
@@ -714,6 +712,7 @@ unit tree;
 {$endif SUPPORT_MMX}
          p^.resulttype:=v^.definition;
          p^.value:=v^.value;
+         testrange(p^.resulttype,p^.value);
          genenumnode:=p;
       end;
 
@@ -1593,12 +1592,15 @@ unit tree;
          str_length:=length(p^.value_str^);
 {$endif UseAnsiString}
       end;
-      
+
 
 end.
 {
   $Log$
-  Revision 1.44  1998-09-28 16:57:28  pierre
+  Revision 1.45  1998-10-05 21:33:33  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.44  1998/09/28 16:57:28  pierre
     * changed all length(p^.value_str^) into str_length(p)
       to get it work with and without ansistrings
     * changed sourcefiles field of tmodule to a pointer

compiler/types.pas

@@ -58,6 +58,9 @@ unit types;
     { true if o is a short string def }
     function is_shortstring(p : pdef) : boolean;
 
+    { true if p is a char array def }
+    function is_chararray(p : pdef) : boolean;
+
     { true if o is a pchar def }
     function is_pchar(p : pdef) : boolean;
 
@@ -115,6 +118,7 @@ unit types;
 
     uses verbose,aasm;
 
+
     function equal_paras(def1,def2 : pdefcoll;value_equal_const : boolean) : boolean;
       begin
          while (assigned(def1)) and (assigned(def2)) do
@@ -274,6 +278,15 @@ unit types;
                          (pstringdef(p)^.string_typ=st_shortstring);
       end;
 
+    { true if p is a char array def }
+    function is_chararray(p : pdef) : boolean;
+      begin
+        is_chararray:=(p^.deftype=arraydef) and
+                      (parraydef(p)^.lowrange=0) and
+                      is_equal(parraydef(p)^.definition,cchardef);
+      end;
+
+
     { true if p is a pchar def }
     function is_pchar(p : pdef) : boolean;
       begin
@@ -942,7 +955,10 @@ unit types;
 end.
 {
   $Log$
-  Revision 1.31  1998-09-23 09:58:56  peter
+  Revision 1.32  1998-10-05 21:33:35  peter
+    * fixed 161,165,166,167,168
+
+  Revision 1.31  1998/09/23 09:58:56  peter
     * first working array of const things
 
   Revision 1.30  1998/09/22 15:40:58  peter