*** empty log message ***

compiler/errore.msg

@@ -535,8 +535,8 @@ parser_w_overloaded_are_not_both_virtual=03064_W_overloaded method of virtual me
 parser_w_overloaded_are_not_both_non_virtual=03065_W_overloaded method of non-virtual method should be non-virtual: "$1"
 % If you declare overloaded methods in a class, then they should either all be
 % virtual, or none. You shouldn't mix them.
-parser_e_overloaded_methodes_not_same_ret=03066_E_overloaded methods which are virtual must have the same return type: "$1"
-% If you declare virtual overloaded methods in a class definition, they must
+parser_e_overridden_methods_not_same_ret=03066_E_overridden methods must have the same return type: "$2" is overriden by "$1" which has another return type
+% If you declare oerridden methods in a class definition, they must
 % have the same return type.
 parser_e_dont_nest_export=03067_E_EXPORT declared functions can't be nested
 % You cannot declare a function or procedure within a function or procedure

compiler/hcgdata.pas

@@ -601,7 +601,8 @@ implementation
                                            is_class(hp^.rettype.def) and
                                            (pobjectdef(hp^.rettype.def)^.is_related(
                                                pobjectdef(procdefcoll^.data^.rettype.def)))) then
-                                         Message1(parser_e_overloaded_methodes_not_same_ret,hp^.fullprocname);
+                                         Message2(parser_e_overridden_methods_not_same_ret,hp^.fullprocnamewithret,
+                                           procdefcoll^.data^.fullprocnamewithret);
 
 
                                        { now set the number }
@@ -1070,7 +1071,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.14  2000-11-12 23:24:10  florian
+  Revision 1.15  2000-11-19 16:23:35  florian
+  *** empty log message ***
+
+  Revision 1.14  2000/11/12 23:24:10  florian
     * interfaces are basically running
 
   Revision 1.13  2000/11/08 00:07:40  florian

compiler/msgidx.inc

@@ -141,7 +141,7 @@ const
   parser_e_cant_access_private_member=03063;
   parser_w_overloaded_are_not_both_virtual=03064;
   parser_w_overloaded_are_not_both_non_virtual=03065;
-  parser_e_overloaded_methodes_not_same_ret=03066;
+  parser_e_overridden_methods_not_same_ret=03066;
   parser_e_dont_nest_export=03067;
   parser_e_methods_dont_be_export=03068;
   parser_e_call_by_ref_without_typeconv=03069;
@@ -568,7 +568,7 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 31853;
+  MsgTxtSize = 31886;
 
   MsgIdxMax : array[1..20] of longint=(
     17,59,174,35,41,41,86,14,35,40,

compiler/msgtxt.inc

@@ -157,401 +157,398 @@ const msgtxt : array[0..000132,1..240] of char=(
   '03064_W_overloaded method of virtual method should be virtual: "$1"'#000+
   '03065_W_overloaded method of non-virtual method should be non','-virtua'+
   'l: "$1"'#000+
-  '03066_E_overloaded methods which are virtual must have the same return'+
-  ' type: "$1"'#000+
+  '03066_E_overridden methods must have the same return type: "$2" is ove'+
+  'rriden by "$1" which has another return type'#000+
   '03067_E_EXPORT declared functions can'#039't be nested'#000+
   '03068_E_methods can'#039't be EXPORTed'#000+
-  '03069_E_call by var parameters have to match exactly: Got "','$1" expec'+
+  '03069_E_call by var parame','ters have to match exactly: Got "$1" expec'+
   'ted "$2"'#000+
   '03070_E_Class isn'#039't a parent class of the current class'#000+
   '03071_E_SELF is only allowed in methods'#000+
   '03072_E_methods can be only in other methods called direct with type i'+
-  'dentifier of the class'#000+
+  'dentifier of the class'#000,
   '03073_E_Illegal use of '#039':'#039#000+
-  '03074_','E_range check error in set constructor or duplicate set elemen'+
-  't'#000+
+  '03074_E_range check error in set constructor or duplicate set element'#000+
   '03075_E_Pointer to object expected'#000+
   '03076_E_Expression must be constructor call'#000+
   '03077_E_Expression must be destructor call'#000+
-  '03078_E_Illegal order of record elements'#000+
-  '03079_E_Expre','ssion type must be class or record type'#000+
+  '03078_E_Illegal order',' of record elements'#000+
+  '03079_E_Expression type must be class or record type'#000+
   '03080_E_Procedures can'#039't return a value'#000+
   '03081_E_constructors and destructors must be methods'#000+
   '03082_E_Operator is not overloaded'#000+
-  '03083_E_Impossible to overload assignment for equal types'#000+
-  '03084_E_Imposs','ible operator overload'#000+
+  '03083_E_Impossible to overload assignme','nt for equal types'#000+
+  '03084_E_Impossible operator overload'#000+
   '03085_E_Re-raise isn'#039't possible there'#000+
   '03086_E_The extended syntax of new or dispose isn'#039't allowed for a '+
   'class'#000+
   '03087_E_Assembler incompatible with function return type'#000+
-  '03088_E_Procedure overloading is switched off'#000+
-  '0308','9_E_It is not possible to overload this operator (overload = ins'+
-  'tead)'#000+
+  '03088_E_Procedure',' overloading is switched off'#000+
+  '03089_E_It is not possible to overload this operator (overload = inste'+
+  'ad)'#000+
   '03090_E_Comparative operator must return a boolean value'#000+
   '03091_E_Only virtual methods can be abstract'#000+
-  '03092_F_Use of unsupported feature!'#000+
-  '03093_E_The mix of different kin','d of objects (class, object, interfa'+
-  'ce, raw interface etc) isn'#039't allowed'#000+
+  '03092_F_Use of unsupported feature!',#000+
+  '03093_E_The mix of different kind of objects (class, object, interface'+
+  ', raw interface etc) isn'#039't allowed'#000+
   '03094_W_Unknown procedure 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 co','nst'#000+
+  '03096_E_absolute c','an only be associated a var or const'#000+
   '03097_E_Only ONE variable can be initialized'#000+
   '03098_E_Abstract methods shouldn'#039't have any definition (with funct'+
   'ion body)'#000+
   '03099_E_This overloaded function can'#039't be local (must be exported)'+
   #000+
-  '03100_W_Virtual methods are used without a const','ructor in "$1"'#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+
   '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+
+  '03107_D_Compilin','g $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 one default property is allowed, found inherited default '+
   'property in class "$1"'#000+
-  '03111_E_The default property must be an array property'#000+
-  '03112_E_Virtual c','onstructors are only supported in class object mode'+
-  'l'#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+
   '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 cla','ss as ancestor'#000+
+  '03115_E_Forward declaration of class "$1" mus','t be resolved here to u'+
+  'se the class as ancestor'#000+
   '03116_E_Local operators not supported'#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 pr','ocvar declaration'#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 use both EXPORT and EXTERNAL'#000+
   '03122_E_NAME keyword expected'#000+
-  '03123_W_"$1" not yet supported inside inline procedure/function'#000+
+  '03123_W_"$1" not yet supported inside inline procedure/func','tion'#000+
   '03124_W_Inlining disabled'#000+
-  '03','125_I_Writing Browser log $1'#000+
+  '03125_I_Writing Browser log $1'#000+
   '03126_H_may be pointer dereference is missing'#000+
   '03127_F_Selected 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+
+  '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 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+
+  '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+
   '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 ran','ge is less than lower bound'#000+
+  '03139_E_Invalid floating point ope','ration'#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+
   '03143_E_Illegal expression after message directive'#000+
-  '03144_E_Message handlers can take only one call by ref. paramet','er'#000+
+  '03144_E_Message handlers can t','ake only one call by ref. parameter'#000+
   '03145_E_Duplicate message label: "$1"'#000+
   '03146_E_Self can be only an explicit parameter in 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 O','BJPAS unit manual, use {$mode objfpc} or {$m'+
-  'ode delphi} instead'#000+
+  '03148_F_Direct assembler not supported for binary o','utput 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+
   '03151_E_Data types which requires initialization/finalization can'#039't'+
   ' be used in variant records'#000+
-  '03152_E_Resourcestrings can be only sta','tic or global'#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 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+
+  '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 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 optio','n'#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'+
   'ule'#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 varia','bles'#000+
+  '0316','6_F_An interface can'#039't have variables'#000+
   '03167_F_An interface can'#039't have constructor or destructor'#000+
   '03168_W_Procedure named $1 not found that is suitable for implementing'+
   ' 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+
+  '03170_E_Type "$1" can'#039't b','e used as array index type'#000+
+  '03171_E_Con- and destructors aren'#039't allowed 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+
   '04000_E_Type mismatch'#000+
-  '04001_E_Incompatible types: got "$1" expected "$2"'#000+
-  '04002_E_Type mismat','ch between "$1" and "$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+
-  '04008_E_p','ointer type expected, but got "$1"'#000+
+  '04007_E_Ordi','nal 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 compatible'#000+
-  '04013_E_Operation not implemented ','for sets'#000+
+  '0','4013_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+
-  '04017_E_succ or pred on enums with assig','nments not possible'#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+
-  '04022_W_lo/hi(dword/qword) ','returns the upper/lower word/dword'#000+
+  '04021_E_Type conflict between set ele','ments'#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_Method (variable) and Procedure (variable)',' are not compatibl'+
+  '04026_E_Method (v','ariable) 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/function to procedure variabl'+
-  'e'#000+
-  '04031_E_Can'#039't',' assign values to an address'#000+
+  '04030_E_Can'#039't assign local procedure/function 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+
   '05000_E_Identifier not found "$1"'#000+
-  '05001_F_Internal Error in SymTableStack()'#000+
-  '05002_E_Duplica','te identifier "$1"'#000+
+  '05001_F_Internal Error i','n SymTableStack()'#000+
+  '05002_E_Duplicate identifier "$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+
+  '05007_E_Erro','r in type definition'#000+
+  '05008_E_Type identifier 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_Instan','ces of classes or objects with an abstract method are '+
-  'not allowed'#000+
+  '05012_F_record or c','lass type expected'#000+
+  '05013_E_Instances of classes or objects with an abstract method are no'+
+  't allowed'#000+
   '05014_W_Label not defined "$1"'#000+
   '05015_E_Label used but not defined "$1"'#000+
   '05016_E_Illegal label declaration'#000+
-  '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
-  '05018_E_Lab','el not found'#000+
+  '05017_E_GOTO and LABEL are not suppo','rted (use switch -Sg)'#000+
+  '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
   '05021_E_illegal type declaration of set elements'#000+
   '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+
+  '05023_H_Unit "$1" not used in $','2'#000+
+  '05024_H_Parameter "$1" not used'#000+
   '05025_N_Local variable "$1" not used'#000+
   '05026_H_Value parameter "$1" is assigned but never used'#000+
   '05027_N_Local variable "$1" is assigned but never used'#000+
   '05028_H_Local $1 "$2" is not used'#000+
-  '05029_N_Private field "$1.$2" is never used'#000+
-  '05030_N_Priva','te field "$1.$2" is assigned but never used'#000+
+  '05029_N_Private field "$','1.$2" is never used'#000+
+  '05030_N_Private field "$1.$2" is assigned but never used'#000+
   '05031_N_Private method "$1.$2" never used'#000+
   '05032_E_Set type expected'#000+
   '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_Unkno','wn record field identifier "$1"'#000+
+  '05034_W_Type "$1" is not aligned correctly in c','urrent record for C'#000+
+  '05035_E_Unknown record field identifier "$1"'#000+
   '05036_W_Local variable "$1" does not seem to be initialized'#000+
   '05037_W_Variable "$1" does not seem to be initialized'#000+
   '05038_E_identifier idents no member "$1"'#000+
-  '05039_B_Found declaration: $1'#000+
-  '05040_E_Data segment to','o large (max. 2GB)'#000+
+  '05039_B_Found declar','ation: $1'#000+
+  '05040_E_Data segment too large (max. 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 lim','it < low range limit'#000+
+  '06005_E_Illegal',' qualifier'#000+
+  '06006_E_High range limit < low range 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 portable acr'+
+  '06011_D_Convers','ion between ordinals and pointers is not portable 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 of constructor or destructor (doesn'#039+
-  't match to this context)'#000+
+  '06015_E_EXPORT declared functions',' can'#039't be called'#000+
+  '06016_W_Possible illegal call 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 Er','ror in getfloatreg(), allocation failure'#000+
+  '06020_E_Abstract methods can'#039't be ca','lled directly'#000+
+  '06021_F_Internal Error in getfloatreg(), 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,
+  '06026_F_','Internal Error in secondinline()'#000+
   '06027_D_Register $1 weight $2 $3'#000+
   '06028_E_Stack limit excedeed in local routine'#000+
   '06029_D_Stack frame is omitted'#000+
   '06030_W_Range check for 64 bit integers is not supported on this targe'+
   't'#000+
-  '06031_E_Object or class methods can'#039't be inline.'#000+
-  '06032_E_P','rocvar calls can'#039't be inline.'#000+
+  '06031_E_Object or class m','ethods 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_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+
+  'sed',', use (set)length instead'#000+
+  '06036_E_Include and exclude not implemented in this case'#000+
   '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
   'th'#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_Cont','rol flow statements aren'#039't allowed in a finally bloc'+
-  'k'#000+
+  '06039_E_Jump in or outside o','f an exception block'#000+
+  '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
   '07000_D_Starting $1 styled assembler 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 build','ing record offset'#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 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 reloca','table symbols'#000+
+  '0','7010_E_Cannot use multiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
   '07012_E_Invalid constant 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/labe','ls aren'#039't allowed as references'#000+
+  '07015_E_You can not reach $1 from tha','t 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_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_In','valid string as opcode operand: $1'#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 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 sy','mbol reference'#000+
+  '07027_E_escape sequen','ce ignored: $1'#000+
+  '07028_E_Invalid symbol reference'#000+
   '07029_W_Fwait can cause emulation problems with emu387'#000+
   '07030_W_FADD without operand translated into FADDP'#000+
   '07031_W_ENTER instruction is not supported by Linux kernel'#000+
-  '07032_W_Calling an overload function in assembler'#000+
-  '07033_E_Un','supported symbol type for operand'#000+
+  '07032_W_Calling an overload',' function in assembler'#000+
+  '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
   '07035_E_Error converting decimal $1'#000+
   '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+
+  '07038_E_Error converting hexade','cimal $1'#000+
+  '07039_H_$1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
   '07041_E_Cannot use SELF outside a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
   '07084_E_Cannot use RESULT in this function'#000+
-  '07085_H_RESULT is register $1'#000+
-  '07043_W_Procedures',' can'#039't return any value in asm code'#000+
+  '07085_H_RESULT ','is register $1'#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+
-  '07047_E_Assembler syntax error'#000+
-  '07048_E_Invalid com','bination of opcode and operands'#000+
+  '07047_E_Assembler',' syntax error'#000+
+  '07048_E_Invalid combination of opcode and operands'#000+
   '07049_E_Assemler syntax error in operand'#000+
   '07050_E_Assemler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
   '07052_bit constant created for address'#000+
-  '07053_E_Unrecognized opcode $1'#000+
-  '07054_E_Invalid or mi','ssing opcode'#000+
+  '07053_E_Unrecognize','d 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+
   '07058_W_NEAR ignored'#000+
   '07059_W_FAR ignored'#000+
-  '07060_E_Duplicate local symbol $1'#000+
-  '07061_E_Un','defined local symbol $1'#000+
+  '07060_E_Dup','licate local symbol $1'#000+
+  '07061_E_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
   '07063_E_Invalid register name'#000+
   '07064_E_Invalid floating point register name'#000+
   '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+
+  '07067_E_Invalid f','loating 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+
-  '07072_W_Identifier $1 supposed external'#000+
-  '07073_E_Strings not allowed as co','nstants'#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+
-  '07078_E_Dollar token is used without an identifier'#000+
-  '0707','9_W_32bit constant created for address'#000+
+  '07078_E_Dollar token i','s used without an identifier'#000+
+  '07079_W_32bit constant created for address'#000+
   '07080_N_.align is target specific, use .balign or .p2align'#000+
   '07081_E_Can'#039't access fields directly for parameters'#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No size specified and unab','le to determine the size of the op'+
+  '0','7083_E_No size specified and unable to determine the size of the op'+
   'erands'#000+
   '08000_F_Too many assembler files'#000+
   '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
-  '08004_E_Allocating of data is only allowed in',' bss section'#000+
+  '08004_E_Allo','cating of data is only allowed in bss section'#000+
   '08005_F_No binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
   '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
-  '08009_E_Asm: Invalid effective address'#000+
-  '08010_E_Asm: I','mmediate or reference expected'#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 range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
   '09000_W_Source operating system redefined'#000+
-  '09001_I_Assembling (pipe) $1'#000+
-  '09002_E_Can'#039't create as','sember file: $1'#000+
+  '09001_I_Assembling ','(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_W_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
-  '09007_W_Error while assembling exitcode $1'#000+
-  '09008_W_Can'#039't',' call the assembler, error $1 switching to external'+
-  ' assembling'#000+
+  '09007_W_Error while ass','embling exitcode $1'#000+
+  '09008_W_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 may fail !'#000+
-  '09013_W_Error while linkin','g'#000+
+  '09012_W_Library $1 not found, Linking may ','fail !'#000+
+  '09013_W_Error while linking'#000+
   '09014_W_Can'#039't call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
   '09016_W_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
-  '09018_E_Creation of Executables not supported'#000+
-  '09019_E_Creation of Dynamic/Share','d Libraries not supported'#000+
+  '09018_E_Creation of Executables not supported'#000,
+  '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
   '09020_I_Closing script $1'#000+
   '09021_W_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 linking'+
-  #000+
-  '09024_T_unit $1 can'#039't be sm','art linked, switching to static linki'+
+  '09023_T_unit $1 can'#039't be static linked, switching to smart li','nki'+
   '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+
-  '09028_F_Can'#039't post process executab','le $1'#000+
+  '09','028_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+
-  '1000','0_T_Unitsearch: $1'#000+
+  '09034_X_St','ack space commited: $1 bytes'#000+
+  '10000_T_Unitsearch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
   '10003_U_PPU Flags: $1'#000+
@@ -559,66 +556,67 @@ const msgtxt : array[0..000132,1..240] of char=(
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
-  '10008_U_PPU Invalid Version $1'#000+
-  '10009_U','_PPU is compiled for an other processor'#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+
-  '10016_F_Invalid PPU','-File entry: $1'#000+
+  '10015_F_unexpected en','d 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+
-  '10022_F_Can'#039't find unit $1'#000+
-  '10023_W_Unit',' $1 was not found but $2 exists'#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+
-  '10028_U_Recompiling $1',', checksum changed for $2'#000+
+  '10027_U_Load from $1 ($','2) unit $3'#000+
+  '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
   '10030_U_Recompiling unit, static lib is older than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompiling unit, obj and asm are older than p','pufile'#000+
+  '10032_U_Recompiling u','nit, 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_Conditional $1 was not set at startup in l','ast compilation of'+
+  '10038_H_Condition','al $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+
   '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+
+  '11002_W_DEF file can be created only ','for OS/2'#000+
+  '11003_E_nested response files are not supported'#000+
   '11004_F_No source file name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
   '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','_N_Reading further options from $1'#000+
+  '110','09_F_Unable to open file $1'#000+
+  '11010_N_Reading further options from $1'#000+
   '11011_W_Target is already set to: $1'#000+
   '11012_W_Shared libs not supported on DOS platform, reverting to static'+
   #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
-  '11015_F_open conditional at the end of the fil','e'#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 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 assembl','er to default source writing assembler'#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 compatible with "$2"'#000+
   '11022_W_"$1" assembler use forced'#000+
-  '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
-  'Copyright (c) 1993-2000 by Flor','ian Klaempfl'#000+
+  '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGE','T'+
+  #010+
+  'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
   #010+
   'Compiler Date  : $FPCDATE'#010+
@@ -626,27 +624,27 @@ const msgtxt : array[0..000132,1..240] of char=(
   #010+
   'This program comes under the GNU General Public Licence'#010+
   'For more information read COPYING.FPC'#010+
-  #010+
+  #010,
   'Report bugs,suggestions etc to:'#010+
-  ' ','                [email protected]'#000+
+  '                 [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 generated assembler file'#010+
-  '**2al_list sourcecode lines in assembler file'#010+
-  '**2ar_list regist','er allocation/release info in 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 info'#010+
   '**1B_build all modules'#010+
-  '**1C<x>_code generation options:'#010+
-  '**2CD_create also dyn','amic library (not supported)'#010+
+  '**1C<x>_code generati','on 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 operations'#010+
   '**2Cr_range checking'#010+
-  '**2Cs<n>_set stack size to <n>'#010+
-  '**2Ct_stack checking'#010,
+  '**2Cs<n>_set stack ','size to <n>'#010+
+  '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
   '*O1D_generate a DEF file'#010+
@@ -654,129 +652,129 @@ const msgtxt : array[0..000132,1..240] of char=(
   '*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>_se','ts the directory where to search for compiler utilities'#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 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+
+  '*L2F','L<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+
   '*g1g_generate debugger information:'#010+
   '*g2gg_use gsym'#010+
-  '*g2gd_use dbx'#010+
-  '*g2gh_use heap trace un','it (for memory leak debugging)'#010+
+  '*g2g','d_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 pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
-  '**2iSO_return compiler OS'#010+
-  '**2iSP_return co','mpiler processor'#010+
+  '**2iSO_re','turn compiler OS'#010+
+  '**2iSP_return compiler processor'#010+
   '**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+
   '**1l_write logo'#010+
   '**1n_don'#039't read the default config file'#010+
-  '**1o<x>_change the name of the executable produc','ed to <x>'#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 assembler files'#010+
   '**1S<x>_syntax options:'#010+
   '**2S2_switch some Delphi 2 extensions on'#010+
-  '**2Sc_supports operators like C (*=,+=,/= an','d -=)'#010+
+  '**2Sc_suppo','rts 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+
   '**2Sg_allow LABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
-  '**2Si_support C++ styled INLINE'#010+
-  '**2Sm_support macros like C',' (global)'#010+
+  '**2Si_support C++ styled I','NLINE'#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+
   '**2St_allow static keyword in objects'#010+
-  '**1s_don'#039't call assembler and linker (only with -a)'#010+
-  '**1u<x','>_undefines the symbol <x>'#010+
+  '**1s_don'#039't call assembler',' and linker (only with -a)'#010+
+  '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#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 : S','how warnings               u : Show unit info'#010+
+  '**2*_e : Show errors (default)    ','   d : Show debug info'#010+
+  '**2*_w : Show 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 : Show linenumbers            c : Show conditionals'#010+
+  '**2*_i : Show general info           ','p : Show compiled procedures'#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 : Exec','utable info (Win32 only'+
+  '**2*_    dec','larations if an error    x : Executable 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) (define','s 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*2Aasaout_assemble using GNU AS for aout (','Go32v1)'#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 (Win3','2) using internal writer'#010+
+  '3*2Acoff_coff (Go32v2) using intern','al 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*1O<x>_optimization','s:'#010+
   '3*2Og_generate smaller code'#010+
-  '3*','2OG_generate faster code (default)'#010+
+  '3*2OG_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_le','vel 3 optimizations (-O2 repeatedly, max 5 times)'#010+
+  '3*2O2_level 2 optimizations (-O1',' + slower optimizations)'#010+
+  '3*2O3_level 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 ','operating system:'#010+
+  '3*3Op3_set target processor to PPro/','PII/c6x86/K6 (tm)'#010+
+  '3*1T<x>_Target operating system:'#010+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
   '3*2TLINUX_Linux'#010+
   '3*2Tnetware_Novell Netware Module (experimental)'#010+
   '3*2TOS2_OS/2 2.x'#010+
-  '3*2TWin32_Windows 32 Bit'#010+
-  '3*1W<x>_Win32 targe','t options'#010+
+  '3*2TWin32_W','indows 32 Bit'#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*2WG_Specify graphic type application'#010+
-  '3*2WN_Do not generate relocation code (necessary fo','r debugging)'#010+
+  '3*2WN_Do not gener','ate 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 assembler'#010+
-  '6*1O_optimizations:'#010+
-  '6*2Oa_turn on the optimize','r'#010+
+  '6*1O_optimiza','tions:'#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*2RMOT_read motorola style assembler'#010+
-  '6*1T<x>_Target operat','ing system:'#010+
+  '6*2RMOT_read motorola styl','e assembler'#010+
+  '6*1T<x>_Target operating system:'#010+
   '6*2TAMIGA_Commodore Amiga'#010+
   '6*2TATARI_Atari ST/STe/TT'#010+
   '6*2TMACOS_Macintosh m68k'#010+

compiler/symdef.pas

@@ -508,6 +508,7 @@ interface
           procedure load_references;
           function  write_references : boolean;
           function  fullprocname:string;
+          function fullprocnamewithret:string;
           function  cplusplusmangledname : string;
           { debug }
 {$ifdef GDB}
@@ -3212,8 +3213,13 @@ implementation
         hp : pparaitem;
         hpc : pconstsym;
       begin
-        s:='(';
         hp:=pparaitem(para^.last);
+        if not(assigned(hp)) then
+          begin
+             demangled_paras:='';
+             exit;
+          end;
+        s:='(';
         while assigned(hp) do
          begin
            if assigned(hp^.paratype.def^.typesym) then
@@ -3436,6 +3442,17 @@ implementation
         fullprocname:=s;
       end;
 
+    function tprocdef.fullprocnamewithret:string;
+      var
+        s : string;
+      begin
+        s:=fullprocname;
+        if assigned(rettype.def) and
+          not(is_equal(rettype.def,voiddef)) then
+               s:=s+' : '+rettype.def^.gettypename;
+        fullprocnamewithret:=s;
+      end;
+
 
     function tprocdef.getsymtable(t:tgetsymtable):psymtable;
       begin
@@ -5528,7 +5545,10 @@ Const local_symtable_index : longint = $8001;
 end.
 {
   $Log$
-  Revision 1.11  2000-11-12 23:24:12  florian
+  Revision 1.12  2000-11-19 16:23:35  florian
+  *** empty log message ***
+
+  Revision 1.11  2000/11/12 23:24:12  florian
     * interfaces are basically running
 
   Revision 1.10  2000/11/11 16:12:38  peter

tests/tbf/tbf0360.pp

@@ -0,0 +1,23 @@
+{$mode objfpc}
+type
+   to1 = class
+      procedure p;virtual;
+   end;
+
+   to2 = class(to1)
+     function p : longint;override;
+   end;
+
+  procedure to1.p;
+
+    begin
+    end;
+
+  function to2.p : longint;
+
+    begin
+    end;
+
+begin
+end.
+