Jonas Maebe 23 years ago
parent
commit
6b01278234
4 changed files with 137 additions and 128 deletions
  1. 1 1
      compiler/msg/errore.msg
  2. 1 1
      compiler/msgidx.inc
  3. 118 118
      compiler/msgtxt.inc
  4. 17 8
      compiler/pdecvar.pas

+ 1 - 1
compiler/msg/errore.msg

@@ -655,7 +655,7 @@ parser_e_absolute_only_one_var=03095_E_absolute can only be associated to ONE va
 %  var p : longint absolute x;
 % \end{verbatim}
 %
-parser_e_absolute_only_to_var_or_const=03096_E_absolute can only be associated a var or const
+parser_e_absolute_only_to_var_or_const=03096_E_absolute can only be associated with a var or const
 % The address of a \var{absolute} directive can only point to a variable or
 % constant. Therefore, the following code will produce this error:
 % \begin{verbatim}

+ 1 - 1
compiler/msgidx.inc

@@ -607,7 +607,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 34086;
+  MsgTxtSize = 34091;
 
   MsgIdxMax : array[1..20] of longint=(
     17,62,184,42,41,41,98,17,35,42,

+ 118 - 118
compiler/msgtxt.inc

@@ -113,7 +113,7 @@ const msgtxt : array[0..000142,1..240] of char=(
   '03023_E','_The object "$1" has no VMT'#000+
   '03024_E_Illegal parameter list'#000+
   '03025_E_Wrong parameter type specified for arg no. "$1"'#000+
-  '03026_E_Wrong amount of parameters specified'#000+
+  '03026_E_Wrong number of parameters specified'#000+
   '03027_E_overloaded identifier "$1" isn'#039't a function'#000+
   '03028_E_overloaded functions',' have the same parameter list'#000+
   '03029_E_function header doesn'#039't match the forward declaration "$1"'+
@@ -196,298 +196,298 @@ const msgtxt : array[0..000142,1..240] of char=(
   ', raw interface etc) isn'#039't allowed'#000+
   '03094_W_Unknown p','rocedure directive had to be ignored: "$1"'#000+
   '03095_E_absolute can only be associated to ONE variable'#000+
-  '03096_E_absolute can only be associated a var or const'#000+
+  '03096_E_absolute can only be associated with a var or const'#000+
   '03097_E_Only ONE variable can be initialized'#000+
-  '03098_E_Abstract methods shouldn'#039't have a','ny definition (with fun'+
+  '03098_E_Abstract methods shouldn'#039't h','ave any definition (with fun'+
   'ction body)'#000+
   '03099_E_This overloaded function can'#039't be local (must be exported)'+
   #000+
   '03100_W_Virtual methods are used without a constructor in "$1"'#000+
   '03101_M_Macro defined: $1'#000+
   '03102_M_Macro undefined: $1'#000+
-  '03103_M_Macro $1 set ','to $2'#000+
+  '03103_M_Macro $1',' set to $2'#000+
   '03104_I_Compiling $1'#000+
   '03105_U_Parsing interface of unit $1'#000+
   '03106_U_Parsing implementation of $1'#000+
   '03107_D_Compiling $1 for the second time'#000+
   '03108_E_Array properties aren'#039't allowed here'#000+
   '03109_E_No property found to override'#000+
-  '03110_E_Only on','e default property is allowed, found inherited defaul'+
+  '03110_E_On','ly one default property is allowed, found inherited defaul'+
   't property in class "$1"'#000+
   '03111_E_The default property must be an array property'#000+
   '03112_E_Virtual constructors are only supported in class object model'#000+
-  '03113_E_No default property available',#000+
+  '03113_E_No default property avai','lable'#000+
   '03114_E_The class can'#039't have a published section, use the {$M+} sw'+
   'itch'#000+
   '03115_E_Forward declaration of class "$1" must be resolved here to use'+
   ' the class as ancestor'#000+
   '03116_E_Local operators not supported'#000+
-  '03117_E_Procedure directive "$1" not ','allowed in interface section'#000+
+  '03117_E_Procedure directive "$1"',' not allowed in interface section'#000+
   '03118_E_Procedure directive "$1" not allowed in implementation section'+
   #000+
   '03119_E_Procedure directive "$1" not allowed in procvar declaration'#000+
   '03120_E_Function is already declared Public/Forward "$1"'#000+
-  '03121_E_Can'#039't u','se both EXPORT and EXTERNAL'#000+
+  '03121_E_Ca','n'#039't use both EXPORT and EXTERNAL'#000+
   '03122_E_NAME keyword expected'#000+
   '03123_W_"$1" not yet supported inside inline procedure/function'#000+
   '03124_W_Inlining disabled'#000+
   '03125_I_Writing Browser log $1'#000+
   '03126_H_may be pointer dereference is missing'#000+
-  '03127_F_Selecte','d assembler reader not supported'#000+
+  '03127_F_Se','lected assembler reader not supported'#000+
   '03128_E_Procedure directive "$1" has conflicts with other directives'#000+
   '03129_E_Calling convention doesn'#039't match forward'#000+
   '03130_E_Register calling (fastcall) not supported'#000+
-  '03131_E_Property can'#039't have a default v','alue'#000+
+  '03131_E_Property can'#039't have a defa','ult value'#000+
   '03132_E_The default value of a property must be constant'#000+
   '03133_E_Symbol can'#039't be published, can be only a class'#000+
   '03134_E_That kind of property can'#039't be published'#000+
   '03135_W_Empty import name specified'#000+
-  '03136_W_An import name is required'#000+
-  '031','37_E_Function internal name changed after use of function'#000+
+  '03136_W_An import name is require','d'#000+
+  '03137_E_Function internal name changed after use of function'#000+
   '03138_E_Division by zero'#000+
   '03139_E_Invalid floating point operation'#000+
   '03140_E_Upper bound of range is less than lower bound'#000+
   '03141_W_string "$1" is longer than "$2"'#000+
-  '03142_E_string length ','is larger than array of char length'#000+
+  '03142_E_string le','ngth is larger than array of char length'#000+
   '03143_E_Illegal expression after message directive'#000+
   '03144_E_Message handlers can take only one call by ref. parameter'#000+
   '03145_E_Duplicate message label: "$1"'#000+
-  '03146_E_Self can only be an explicit parameter in',' methods which are '+
+  '03146_E_Self can only be an explicit paramet','er in methods which are '+
   'message handlers'#000+
   '03147_E_Threadvars can be only static or global'#000+
   '03148_F_Direct assembler not supported for binary output format'#000+
   '03149_W_Don'#039't load OBJPAS unit manual, use {$mode objfpc} or {$mod'+
   'e delphi} instead'#000+
-  '03150_E_','OVERRIDE can'#039't be used in objects'#000+
+  '031','50_E_OVERRIDE can'#039't be used in objects'#000+
   '03151_E_Data types which require initialization/finalization can'#039't'+
   ' be used in variant records'#000+
   '03152_E_Resourcestrings can be only static or global'#000+
   '03153_E_Exit with argument can'#039't be used here'#000+
-  '03154_E_The t','ype of the storage symbol must be boolean'#000+
+  '03154_E_','The type of the storage symbol must be boolean'#000+
   '03155_E_This symbol isn'#039't allowed as storage symbol'#000+
   '03156_E_Only class which are compiled in $M+ mode can be published'#000+
   '03157_E_Procedure directive expected'#000+
-  '03158_E_The value for a property index mus','t be of an ordinal type'#000+
+  '03158_E_The value for a property inde','x must be of an ordinal type'#000+
   '03159_E_Procedure name to short to be exported'#000+
   '03160_E_No DEFFILE entry can be generated for unit global vars'#000+
   '03161_E_Compile without -WD option'#000+
-  '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this mod'+
-  'u','le'#000+
+  '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this',' m'+
+  'odule'#000+
   '03163_E_Can'#039't export with index under $1'#000+
   '03164_E_Exporting of variables is not supported under $1'#000+
   '03165_E_Improper GUID syntax'#000+
   '03166_F_An interface can'#039't have variables'#000+
   '03167_F_An interface can'#039't have constructor or destructor'#000+
-  '03168_W_Pr','ocedure named "$1" not found that is suitable for implemen'+
+  '03168','_W_Procedure named "$1" not found that is suitable for implemen'+
   'ting the $2.$3'#000+
   '03169_E_interface identifier expected'#000+
   '03170_E_Type "$1" can'#039't be used as array index type'#000+
   '03171_E_Con- and destructors aren'#039't allowed in interfaces'#000+
-  '03172_E_Access spec','ifiers can'#039't be used in INTERFACES'#000+
+  '03172_E_Access',' specifiers can'#039't be used in INTERFACES'#000+
   '03173_E_An interface can'#039't contain fields'#000+
   '03174_E_Can'#039't declare local procedure as EXTERNAL'#000+
   '03175_W_Some fields coming before "$1" weren'#039't initialized'#000+
-  '03176_E_Some fields coming before "$1" weren'#039't initial','ized'#000+
+  '03176_E_Some fields coming before "$1" weren'#039't in','itialized'#000+
   '03177_H_Some fields coming after "$1" weren'#039't initialized'#000+
   '03178_E_VarArgs directive without CDecl and External'#000+
   '03179_E_Self must be a normal (call-by-value) parameter'#000+
   '03180_E_Interface "$1" has no interface identification'#000+
-  '03181_E_Unkno','wn class field or method identifier "$1"'#000+
+  '03181_E_','Unknown class field or method identifier "$1"'#000+
   '03182_W_Overriding calling convention "$1" with "$2"'#000+
   '03183_E_Typed constants of the type "procedure of object" can only be '+
   'initialized with NIL'#000+
   '04000_E_Type mismatch'#000+
-  '04001_E_Incompatible types: got "','$1" expected "$2"'#000+
+  '04001_E_Incompatible types: ','got "$1" expected "$2"'#000+
   '04002_E_Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
   '04004_E_Variable identifier expected'#000+
   '04005_E_Integer expression expected, but got "$1"'#000+
   '04006_E_Boolean expression expected, but got "$1"'#000+
-  '04007_E_','Ordinal expression expected'#000+
+  '040','07_E_Ordinal expression expected'#000+
   '04008_E_pointer type expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
   '04010_E_Variable or type indentifier expected'#000+
   '04011_E_Can'#039't evaluate constant expression'#000+
-  '04012_E_Set elements are not compatib','le'#000+
+  '04012_E_Set elements are not com','patible'#000+
   '04013_E_Operation not implemented for sets'#000+
   '04014_W_Automatic type conversion from floating type to COMP which is '+
   'an integer type'#000+
   '04015_H_use DIV instead to get an integer result'#000+
-  '04016_E_string types doesn'#039't match, because of $V+ mode'#000+
-  '040','17_E_succ or pred on enums with assignments not possible'#000+
+  '04016_E_string types doesn'#039't match, because of $V+ mod','e'#000+
+  '04017_E_succ or pred on enums with assignments not possible'#000+
   '04018_E_Can'#039't read or write variables of this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
   '04020_E_Can'#039't use read or write on untyped file.'#000+
-  '04021_E_Type conflict between set',' elements'#000+
+  '04021_E_Type conflict betwee','n set elements'#000+
   '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
   '04023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
   '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
-  '04026_E_Metho','d (variable) and Procedure (variable) are not compatibl'+
+  '04026_E_','Method (variable) and Procedure (variable) are not compatibl'+
   'e'#000+
   '04027_E_Illegal constant passed to internal math function'#000+
   '04028_E_Can'#039't get the address of constants'#000+
   '04029_E_Argument can'#039't be assigned to'#000+
-  '04030_E_Can'#039't assign local procedure/functio','n to procedure varia'+
+  '04030_E_Can'#039't assign local procedure/fu','nction to procedure varia'+
   'ble'#000+
   '04031_E_Can'#039't assign values to an address'#000+
   '04032_E_Can'#039't assign values to const variable'#000+
   '04033_E_Array type required'#000+
   '04034_E_interface type expected, but got "$1"'#000+
-  '04035_W_Mixing signed expressions and cardinals gives ','a 64bit result'+
+  '04035_W_Mixing signed expressions and cardinals g','ives a 64bit result'+
   #000+
   '04036_W_Mixing signed expressions and cardinals here may cause a range'+
   ' check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
   '04038_E_enums with assignments can'#039't be used as array index'#000+
-  '04039_E_Class types "','$1" and "$2" are not related'#000+
+  '04039_E_Class ty','pes "$1" and "$2" are not related'#000+
   '04040_W_Class types "$1" and "$2" are not related'#000+
   '04041_E_class or interface type expected, but got "$1"'#000+
   '05000_E_Identifier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
-  '05002_E_Duplicate identifier "','$1"'#000+
+  '05002_E_Duplicate identif','ier "$1"'#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+
   '05006_F_Identifier type already defined as type'#000+
   '05007_E_Error in type definition'#000+
-  '05008_E_Type identifier not',' defined'#000+
+  '05008_E_Type identifie','r not defined'#000+
   '05009_E_Forward type not resolved "$1"'#000+
   '05010_E_Only static variables can be used in static methods or outside'+
   ' methods'#000+
   '05011_E_Invalid call to tvarsym.mangledname()'#000+
   '05012_F_record or class type expected'#000+
-  '05013_E_Instances of classes ','or objects with an abstract method are '+
+  '05013_E_Instances of cla','sses or objects with an abstract method are '+
   'not allowed'#000+
   '05014_W_Label not defined "$1"'#000+
   '05015_E_Label used but not defined "$1"'#000+
   '05016_E_Illegal label declaration'#000+
   '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
-  '05018_E_Label not found'#000+
-  '05','019_E_identifier isn'#039't a label'#000+
+  '05018_E_Label not fou','nd'#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+
   '05022_E_Forward class definition not resolved "$1"'#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+
+  '05025_N_L','ocal 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 used'#000+
   '05029_N_Private field "$1.$2" is never used'#000+
-  '05030_N_Private field "$1.$2','" is assigned but 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+
   '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+
-  '05035_E_Unknown record field',' identifier "$1"'#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 member "$1"'#000+
   '05039_B_Found declaration: $1'#000+
-  '05040_E_Data segment too large (max. 2','GB)'#000+
+  '05040_E_Data segment too large (m','ax. 2GB)'#000+
   '06000_E_BREAK not allowed'#000+
   '06001_E_CONTINUE not allowed'#000+
   '06002_E_Expression too complicated - FPU stack overflow'#000+
   '06003_E_Illegal expression'#000+
   '06004_E_Invalid integer expression'#000+
   '06005_E_Illegal qualifier'#000+
-  '06006_E_High range limit < low range ','limit'#000+
+  '06006_E_High range limit < low r','ange limit'#000+
   '06007_E_Illegal counter variable'#000+
   '06008_E_Can'#039't determine which overloaded function to call'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
   '06010_E_Illegal type conversion'#000+
-  '06011_D_Conversion between ordinals and pointers is not portabl','e acr'+
+  '06011_D_Conversion between ordinals and pointers is not po','rtable acr'+
   'oss platforms'#000+
   '06012_E_File types must be var parameters'#000+
   '06013_E_The use of a far pointer isn'#039't allowed there'#000+
   '06014_E_illegal call by reference parameters'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possible illegal call o','f constructor or destructor (doesn'#039+
+  '06016_W_Possible illegal c','all of constructor or destructor (doesn'#039+
   't match to this context)'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
   '06019_E_procedure call with stackframe ESP/SP'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06021_F_Internal Error in getfloat','reg(), allocation failure'#000+
+  '06021_F_Internal Error in get','floatreg(), allocation failure'#000+
   '06022_F_Unknown float type'#000+
   '06023_F_SecondVecn() base defined twice'#000+
   '06024_F_Extended cg68k not supported'#000+
   '06025_F_32-bit unsigned not supported in MC68000 mode'#000+
   '06026_F_Internal Error in secondinline()'#000+
-  '06027_D_Registe','r $1 weight $2 $3'#000+
+  '06027_D_Re','gister $1 weight $2 $3'#000+
   '06028_E_Stack limit excedeed in local routine'#000+
   '06029_D_Stack frame is omitted'#000+
   '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls can'#039't be inline.'#000+
   '06033_E_No code for inline procedure stored'#000+
-  '06034_E_Direc','t call of interrupt procedure "$1" is not possible'#000+
+  '06034_E_','Direct call of interrupt procedure "$1" is not possible'#000+
   '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
   'sed, use (set)length instead'#000+
   '06036_E_Include and exclude not implemented in this case'#000+
-  '06037_E_Constructors or destructors c','an not be called inside a '#039'w'+
+  '06037_E_Constructors or destruct','ors can not be called inside a '#039'w'+
   'ith'#039' clause'#000+
   '06038_E_Cannot call message handler method 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+
-  '07000_D_Starting $1 styled assemb','ler parsing'#000+
+  '07000_D_Starting $1 styled a','ssembler parsing'#000+
   '07001_D_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07003_W_Override operator not supported'#000+
   '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
-  '07006_E_TYPE used without iden','tifier'#000+
+  '07006_E_TYPE used without',' identifier'#000+
   '07007_E_Cannot use local variable or parameters 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 exp','ression'#000+
+  '07012_E_Invalid constan','t expression'#000+
   '07013_E_Relocatable symbol is not allowed'#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+
-  '07018_W_P','ossible error in object field handling'#000+
+  '0701','8_W_Possible error in object field handling'#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+
-  '07024_E_Null l','abel references are not allowed'#000+
+  '07024_E_N','ull label references are not allowed'#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 withou','t operand translated into $1P'#000+
+  '07030_W_$1 w','ithout 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 conver','ting decimal $1'#000+
+  '07035_E_Error c','onverting decimal $1'#000+
   '07036_E_Error converting octal $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 me','thod'#000+
+  '07041_E_Cannot use SELF 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+
   '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 and destinati','on or source size do not match'#000+
   '07047_E_Assembler syntax error'#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+
-  '07052_W_const','ant with symbol $1 for not 32bit address'#000+
+  '07052_W_','constant with symbol $1 for not 32bit address'#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+
-  '07057_E_Too many operands ','on line'#000+
+  '07057_E_Too many oper','ands on line'#000+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
   '07060_E_Duplicate local symbol $1'#000+
@@ -495,96 +495,96 @@ const msgtxt : array[0..000142,1..240] of char=(
   '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
-  '07065_E_NOR ','not supported'#000+
+  '07065_E','_NOR not supported'#000+
   '07066_W_Modulo not supported'#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 seg','ment override expression'#000+
   '07072_W_Identifier $1 supposed external'#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+
+  '070','77_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 paramete','rs'#000+
+  '07081_E_Can'#039't access fields directly for par','ameters'#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 oper'+
   'ands'#000+
   '07084_E_Cannot use RESULT in this function'#000+
   '07085_H_RESULT is register $1'#000+
-  '07086_W_"$1" without operand tran','slated 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)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
   '07090_E_Char > not allowed here'#000+
   '07091_W_XDEF not supported'#000+
-  '07092_E_Invalid X','DEF syntax'#000+
+  '07092_E_Inva','lid XDEF syntax'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
   '07095_E_Invalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
   '07097_E_68020 mode required'#000+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Selected assembler outpu','t not supported'#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 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+
+  '08007_E_Asm: $1 in','valid combination of opcode and operands'#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+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '08012_E_Asm: Short jump is out of r','ange $1'#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 supported for this target'#000+
   '08016_E_Asm: Duplicate label $1'#000+
   '09000_W_Source operating system redefined'#000+
-  '09001_I_Assembli','ng (pipe) $1'#000+
+  '09001_I_Ass','embling (pipe) $1'#000+
   '09002_E_Can'#039't create assember 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 external assembling'#000+
   '09006_T_Using assembler: $1'#000+
-  '09007_E_Error while ','assembling exitcode $1'#000+
+  '09007_E_Error w','hile assembling exitcode $1'#000+
   '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
   'ssembling'#000+
   '09009_I_Assembling $1'#000+
   '09010_I_Assembling smartlink $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
-  '09012_W_Library $1 not found, Linking m','ay fail !'#000+
+  '09012_W_Library $1 not found, Link','ing may fail !'#000+
   '09013_E_Error while linking'#000+
   '09014_E_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
   '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
-  '09018_E_Creation of Executables not support','ed'#000+
+  '09018_E_Creation of Executables not su','pported'#000+
   '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_E_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
-  '09023_T_unit $1 can'#039't be static linked, switching to smart',' linki'+
+  '09023_T_unit $1 can'#039't be static linked, switching to ','smart linki'+
   'ng'#000+
   '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+
-  '09027_E_unit $1 can'#039't be shared or static linked',#000+
+  '09027_E_unit $1 can'#039't be shared or static l','inked'#000+
   '09028_F_Can'#039't post process executable $1'#000+
   '09029_F_Can'#039't open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
   '09031_X_Size of initialized data: $1 bytes'#000+
   '09032_X_Size of uninitialized data: $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
-  '09034_X','_Stack space commited: $1 bytes'#000+
+  '09','034_X_Stack space commited: $1 bytes'#000+
   '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
@@ -592,72 +592,72 @@ const msgtxt : array[0..000142,1..240] of char=(
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
-  '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
-  '10','008_U_PPU Invalid Version $1'#000+
+  '10007_U_PPU Invalid Header (no PPU at the begi','n)'#000+
+  '10008_U_PPU Invalid Version $1'#000+
   '10009_U_PPU is compiled for an other 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+
   '10014_F_Error reading PPU-File'#000+
-  '10015_F_unexpected',' end of PPU-File'#000+
+  '10015_F_unexp','ected 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+
-  '10021_F_Can'#039't compile unit $1, no sources available'#000+
-  '100','22_F_Can'#039't find unit $1'#000+
+  '10021_F_Can'#039't compile unit $1, no sources availabl','e'#000+
+  '10022_F_Can'#039't find unit $1'#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+
   '10026_F_There were $1 errors compiling module, stopping'#000+
-  '10027_U_Load from $1',' ($2) unit $3'#000+
+  '10027_U_Load fr','om $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+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompilin','g unit, obj and asm are older than ppufile'#000+
+  '10032_U_Recom','piling 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+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10038_H_Condit','ional $1 was not set at startup in last compilation of'+
+  '10038_H_C','onditional $1 was not set at startup in last compilation of'+
   ' $2'#000+
   '10039_H_Conditional $1 was set at startup in last compilation of $2'#000+
   '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
-  '10041_H_File $1 is newer than Release PPU file $2',#000+
+  '10041_H_File $1 is newer than Release PPU fi','le $2'#000+
   '11000_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#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 ins','ide $1 config file'#000+
+  '11005_N_No optio','n 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+
   '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 li','bs not supported on DOS platform, reverting to stat'+
+  '11012_W_Shar','ed libs not supported on DOS platform, reverting to stat'+
   'ic'#000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
   '11016_W_Debug information generation is not supported by this executab'+
   'le'#000+
-  '11017_H_Try re','compiling with -dGDB'#000+
+  '11017_H_T','ry recompiling with -dGDB'#000+
   '11018_E_You are using the obsolete switch $1'#000+
   '11019_E_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 comp','atible with "$2"'#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+
   '11029__*** press enter ***'#000+
-  '11023_Free Pascal Compiler version $FPCVER [$FPCDATE','] for $FPCTARGET'+
+  '11023_Free Pascal Compiler version $FPCVER [$FP','CDATE] for $FPCTARGET'+
   #010+
   'Copyright (c) 1993-2002 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
@@ -668,26 +668,26 @@ const msgtxt : array[0..000142,1..240] of char=(
   'Supported targets:'#010+
   '  $OSTARGETS'#010+
   #010+
-  'This program comes under the GNU General Public',' Licence'#010+
+  'This program comes under the GNU General P','ublic Licence'#010+
   'For more information read COPYING.FPC'#010+
   #010+
   'Report bugs,suggestions etc to:'#010+
   '                 [email protected]'#000+
   '11025_**0*_put + after a boolean switch option to enable it, - to disa'+
   'ble it'#010+
-  '**1a_the compiler doesn'#039't delete the generat','ed assembler file'#010+
+  '**1a_the compiler doesn'#039't delete the ge','nerated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
   '**2ar_list register allocation/release info in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1b_generate browser info'#010+
-  '**2bl_generate local symbol i','nfo'#010+
+  '**2bl_generate local sym','bol info'#010+
   '**1B_build all modules'#010+
   '**1C<x>_code generation options:'#010+
   '**2CD_create also dynamic library (not supported)'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
-  '**2Co_check overflow of integer ope','rations'#010+
+  '**2Co_check overflow of intege','r operations'#010+
   '**2Cr_range checking'#010+
   '**2CR_verify object method call validity'#010+
   '**2Cs<n>_set stack size to <n>'#010+
@@ -695,27 +695,27 @@ const msgtxt : array[0..000142,1..240] of char=(
   '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
   '*O1D_generate a DEF file'#010+
-  '*O2Dd<x>_set description',' to <x>'#010+
+  '*O2Dd<x>_set descri','ption to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
   '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
   '**2FD<x>_sets the directory where to search for compiler utilities'#010+
   '**2Fe<x>_redirect error output to <x>'#010+
-  '**2FE<x>_set exe/unit ou','tput path to <x>'#010+
+  '**2FE<x>_set exe/un','it output path to <x>'#010+
   '**2Fi<x>_adds <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '*L2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
   '**2Fu<x>_adds <x> to unit path'#010+
-  '**2FU<x>_set unit ','output path to <x>, overrides -FE'#010+
+  '**2FU<x>_set ','unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gg_use gsym'#010+
   '*g2gd_use dbx'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
   '*g2gl_use line info unit to show more info for backtraces'#010+
-  '*g2gc_generate checks for poi','nters'#010+
+  '*g2gc_generate checks fo','r pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
@@ -724,80 +724,80 @@ const msgtxt : array[0..000142,1..240] of char=(
   '**2iTO_return target OS'#010+
   '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
-  '**1k<x>_Pass ','<x> to the linker'#010+
+  '**1k<x>_','Pass <x> to the linker'#010+
   '**1l_write logo'#010+
   '**1n_don'#039't read the default config file'#010+
   '**1o<x>_change the name of the executable produced to <x>'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
-  '*L1P_use pipes instead of creating temporary ass','embler files'#010+
+  '*L1P_use pipes instead of creating temporar','y assembler files'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_switch some Delphi 2 extensions on'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_tries to be Delphi compatible'#010+
-  '**2Se<x>_compiler stops after the <x> errors (','default is 1)'#010+
+  '**2Se<x>_compiler stops after the <x> err','ors (default is 1)'#010+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
   '**2Sm_support macros like C (global)'#010+
   '**2So_tries to be TP/BP 7.0 compatible'#010+
   '**2Sp_tries to be gpc compatible'#010+
-  '**2Ss_constructor name must be init ','(destructor must be done)'#010+
+  '**2Ss_constructor name must be ','init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
   '**1s_don'#039't call assembler and linker (only with -a)'#010+
   '**2st_Generate script to link on target'#010+
   '**2sh_Generate script to link on host'#010+
   '**1u<x>_undefines the symbol <x>'#010+
-  '**1U_unit opt','ions:'#010+
+  '**1U_uni','t options:'#010+
   '**2Un_don'#039't check the unit name'#010+
   '**2Ur_generate release unit files'#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)       d : Show debug info'#010+
-  '**2*_w : Show wa','rnings               u : Show unit info'#010+
+  '**2*_w : Sh','ow warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
   '**2*_h : Show hints                  m : Show defined macros'#010+
   '**2*_i : Show general info           p : Show compiled procedures'#010+
-  '**2*_l : S','how linenumbers            c : Show conditionals'#010+
+  '**2*_','l : Show linenumbers            c : Show conditionals'#010+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#010+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
-  '**2*_    declarations if an error    x : Executable',' info (Win32 only'+
+  '**2*_    declarations if an error    x : Execu','table info (Win32 only'+
   ')'#010+
   '**2*_    occurs'#010+
   '**1X_executable options:'#010+
   '*L2Xc_link with the c library'#010+
   '**2Xs_strip all symbols from executable'#010+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#010+
-  '**2XS_try to link static (default) (defines FPC_','LINK_STATIC)'#010+
+  '**2XS_try to link static (default) (defines',' FPC_LINK_STATIC)'#010+
   '**2XX_try to link smart            (defines FPC_LINK_SMART)'#010+
   '**0*_Processor specific options:'#010+
   '3*1A<x>_output format:'#010+
   '3*2Aas_assemble using GNU AS'#010+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#010+
-  '3*2Anasmcoff_coff (Go32v2) file',' using Nasm'#010+
+  '3*2Anasmcoff_coff (Go32v2)',' file using Nasm'#010+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
   '3*2Amasm_obj file using Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
-  '3*2Apecoff_pecoff (Win32) usi','ng internal writer'#010+
+  '3*2Apecoff_pecoff (Win32',') using internal writer'#010+
   '3*1R<x>_assembler reading style:'#010+
   '3*2Ratt_read AT&T style assembler'#010+
   '3*2Rintel_read Intel style assembler'#010+
   '3*2Rdirect_copy assembler text directly to assembler file'#010+
   '3*1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
-  '3*2OG_ge','nerate faster code (default)'#010+
+  '3*2','OG_generate faster code (default)'#010+
   '3*2Or_keep certain variables in registers'#010+
   '3*2Ou_enable uncertain optimizations (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
-  '3*2O3_level 3 ','optimizations (-O2 repeatedly, max 5 times)'#010+
+  '3*2O3_lev','el 3 optimizations (-O2 repeatedly, max 5 times)'#010+
   '3*2Op<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
-  '3*1T<x>_Target operat','ing system:'#010+
+  '3*1T<x>_Target o','perating system:'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
   '3*2TWDOSX DOS 32 Bit Extender'#010+
   '3*2TLINUX_Linux'#010+
@@ -805,27 +805,27 @@ const msgtxt : array[0..000142,1..240] of char=(
   '3*2TOS2_OS/2 2.x'#010+
   '3*2TSUNOS_SunOS/Solaris'#010+
   '3*2TWin32_Windows 32 Bit'#010+
-  '3*1W<x>_Win32 targe','t options'#010+
+  '3*1W<x>_Win32 ','target options'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
   '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
   '3*2WF_Specify full-screen type application (OS/2 only)'#010+
-  '3*2WG_Specify graphic type applicat','ion'#010+
+  '3*2WG_Specify graphic type app','lication'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
   '6*1A<x>_output format'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
   '6*2Amit_MIT Syntax (old GAS)'#010+
-  '6*2Amot_Standard Motorola a','ssembler'#010+
+  '6*2Amot_Standard Motor','ola assembler'#010+
   '6*1O_optimizations:'#010+
   '6*2Oa_turn on the optimizer'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
   '6*2O2_set target processor to a MC68020+'#010+
-  '6*1R<x>_assembler reading style:'#010+
-  '6*2R','MOT_read motorola style assembler'#010+
+  '6*1R<x>_assembler reading style:',#010+
+  '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
   '6*2TATARI_Atari ST/STe/TT'#010+
@@ -834,5 +834,5 @@ const msgtxt : array[0..000142,1..240] of char=(
   '6*2TPALMOS_PalmOS'#010+
   '**1*_'#010+
   '**1?_shows this help'#010+
-  '**1h_shows this help without wa','iting'#000
+  '**1h_shows this help witho','ut waiting'#000
 );

+ 17 - 8
compiler/pdecvar.pas

@@ -255,12 +255,12 @@ implementation
                       symdone:=true;
                     end;
                    { address }
-                   if (not symdone) and
-                      ((target_info.target=target_i386_go32v2) or
-                       (m_objfpc in aktmodeswitches) or
-                       (m_delphi in aktmodeswitches)) then
+                   if (not symdone) then
                     begin
-                      if is_constintnode(pt) then
+                      if is_constintnode(pt) and
+                         ((target_info.target=target_i386_go32v2) or
+                          (m_objfpc in aktmodeswitches) or
+                          (m_delphi in aktmodeswitches)) then
                        begin
                          storetokenpos:=akttokenpos;
                          akttokenpos:=declarepos;
@@ -284,15 +284,21 @@ implementation
                           end;
                          symtablestack.insert(abssym);
                          akttokenpos:=storetokenpos;
+                         symdone := true;
                        end
                       else
                        Message(parser_e_absolute_only_to_var_or_const);
-                    end;
+                    end
                  end
                 else
                   Message(parser_e_absolute_only_to_var_or_const);
+                if not symdone then
+                  begin
+                    tt := generrortype;
+                    symtablestack.insert(tvarsym.create(s,tt));
+                    symdone:=true;
+                  end;
                 pt.free;
-                symdone:=true;
               end;
              { Handling of Delphi typed const = initialized vars ! }
              { When should this be rejected ?
@@ -577,7 +583,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.26  2002-05-18 13:34:12  peter
+  Revision 1.27  2002-06-10 13:41:26  jonas
+    * fixed bug 1985
+
+  Revision 1.26  2002/05/18 13:34:12  peter
     * readded missing revisions
 
   Revision 1.25  2002/05/16 19:46:43  carl