Kaynağa Gözat

*** empty log message ***

peter 26 yıl önce
ebeveyn
işleme
9631bab859
2 değiştirilmiş dosya ile 117 ekleme ve 117 silme
  1. 11 7
      compiler/cg386inl.pas
  2. 106 110
      compiler/msgtxt.inc

+ 11 - 7
compiler/cg386inl.pas

@@ -73,7 +73,7 @@ implementation
                              SecondInLine
 *****************************************************************************}
 
-    procedure StoreDirectFuncResult(dest:ptree);
+    procedure StoreDirectFuncResult(var dest:ptree);
       var
         hp : ptree;
         hdef : porddef;
@@ -194,7 +194,6 @@ implementation
         const
            rdwrprefix:array[boolean] of string[15]=('FPC_WRITE_TEXT_','FPC_READ_TEXT_');
         var
-           destpara,
            node,hp    : ptree;
            typedtyp,
            pararesult : pdef;
@@ -308,7 +307,8 @@ implementation
                      if doread and
                         (ft<>ft_typed) and
                         (hp^.resulttype^.deftype in [orddef,floatdef]) then
-                      destpara:=hp^.left
+                      begin
+                      end
                      else
                       begin
                         if ft=ft_typed then
@@ -415,7 +415,7 @@ implementation
                               begin
                                 emitcall(rdwrprefix[doread]+'FLOAT');
                                 if doread then
-                                  StoreDirectFuncResult(destpara);
+                                  StoreDirectFuncResult(hp^.left);
                               end;
                             orddef :
                               begin
@@ -434,8 +434,9 @@ implementation
                                   bool16bit,
                                   bool32bit :
                                     emitcall(rdwrprefix[doread]+'BOOLEAN');
-                                end;                                                                 if doread then
-                                 StoreDirectFuncResult(destpara);
+                                end;
+                                if doread then
+                                  StoreDirectFuncResult(hp^.left);
                               end;
                           end;
                        end;
@@ -1250,7 +1251,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.57  1999-06-02 10:11:43  florian
+  Revision 1.58  1999-06-11 11:44:56  peter
+  *** empty log message ***
+
+  Revision 1.57  1999/06/02 10:11:43  florian
     * make cycle fixed i.e. compilation with 0.99.10
     * some fixes for qword
     * start of register calling conventions

+ 106 - 110
compiler/msgtxt.inc

@@ -1,8 +1,4 @@
-{$ifdef Delphi}
-const msgtxt : array[0..000096] of string[240]=(
-{$else Delphi}
-const msgtxt : array[0..000096,1..240] of char=(
-{$endif Delphi}
+const msgtxt : array[0..00096,1..240] of char=(
   'T_Compiler: $1'#000+
   'D_Compiler OS: $1'#000+
   'I_Target OS: $1'#000+
@@ -58,163 +54,163 @@ const msgtxt : array[0..000096,1..240] of char=(
   'W_Illegal compiler directive $1'#000+
   'T_Back in $1'#000+
   'W_Unsupported application type: $1'#000+
-  'W_$APPTYPE isn'#039't support by the target OS'#000+
-  'W_Unsupported assembler',' style specified $1'#000+
+  'W_APPTYPE isn'#039't support by the target OS'#000+
+  'W_Unsupported assembler ','style specified $1'#000+
   'W_ASM reader switch is not possible inside asm statement, $1 will be e'+
   'ffective only for next'#000+
   'E_Wrong switch toggle, use ON/OFF or +/-'#000+
   'E_Resource files are not supported for this target'#000+
   'E_Parser - Syntax Error'#000+
-  'W_Procedure',' type FAR ignored'#000+
+  'W_Procedure ','type FAR ignored'#000+
   'W_Procedure type NEAR ignored'#000+
   'W_Procedure type REGISTER ignored'#000+
   'E_No DLL File specified'#000+
   'E_Duplicate exported function name $1'#000+
   'E_Duplicate exported function index $1'#000+
   'E_Invalid index for exported function'#000+
-  'E_Constructor name ','must be INIT'#000+
+  'E_Constructor name m','ust be INIT'#000+
   'E_Destructor name must be DONE'#000+
   'E_Illegal open parameter'#000+
   'E_Procedure type INLINE not supported'#000+
   'W_Private methods shouldn'#039't be VIRTUAL'#000+
   'W_Constructor should be public'#000+
   'W_Destructor should be public'#000+
-  'N_Class should have one destructo','r only'#000+
+  'N_Class should have one destructor',' only'#000+
   'E_Local class definitions are not allowed'#000+
   'F_Anonym class definitions are not allowed'#000+
   'E_The object $1 has no VMT'#000+
   'E_Illegal parameter list'#000+
-  'E_Wrong parameter type specified for arg #$1'#000+
+  'E_Wrong parameter type specified for arg no. $1'#000+
   'E_Wrong amount of parameters specified'#000+
-  'E_overloaded',' identifier $1 isn'#039't a function'#000+
+  'E_overload','ed identifier $1 isn'#039't a function'#000+
   'E_overloaded functions have the same parameter list'#000+
   'E_function header doesn'#039't match the forward declaration $1'#000+
   'E_function header $1 doesn'#039't match forward : var name changes $2 ='+
   '> $3'#000+
-  'N_Values in enumeration ty','pes have to be ascending'#000+
+  'N_Values in enumeration ','types have to be ascending'#000+
   'N_Interface and implementation names are different $1 => $2'#000+
   'E_With can not be used for variables in a different segment'#000+
   'E_function nesting > 31'#000+
   'E_range check error while evaluating constants'#000+
-  'W_range check error whil','e evaluating constants'#000+
+  'W_range check error wh','ile evaluating constants'#000+
   'E_duplicate case label'#000+
   'E_Upper bound of case range is less than lower bound'#000+
   'E_typed constants of classes are not allowed'#000+
   'E_functions variables of overloaded functions are not allowed'#000+
-  'E_string length must be a value fr','om 1 to 255'#000+
+  'E_string length must be a value ','from 1 to 255'#000+
   'W_use extended syntax of NEW and DISPOSE for instances of objects'#000+
   'W_use of NEW or DISPOSE for untyped pointers is meaningless'#000+
   'E_use of NEW or DISPOSE is not possible for untyped pointers'#000+
   'E_class identifier expected'#000+
-  'E_type identi','fier not allowed here'#000+
+  'E_type iden','tifier not allowed here'#000+
   'E_method identifier expected'#000+
   'E_function header doesn'#039't match any method of this class'#000+
   'P_procedure/function $1'#000+
   'E_Illegal floating point constant'#000+
   'E_FAIL can be used in constructors only'#000+
-  'E_Destructors can'#039't have parameter','s'#000+
+  'E_Destructors can'#039't have paramet','ers'#000+
   'E_Only class methods can be referred with class references'#000+
   'E_Only class methods can be accessed in class methods'#000+
   'E_Constant and CASE types do not match'#000+
   'E_The symbol can'#039't be exported from a library'#000+
-  'W_An inherited method is hidden by $1'#000+
-  'E_','There is no method in an ancestor class to be overridden: $1'#000+
+  'W_An inherited method is hidden by $1'#000,+
+  'E_There is no method in an ancestor class to be overridden: $1'#000+
   'E_No member is provided to access property'#000+
   'W_Stored prorperty directive is not yet implemented'#000+
   'E_Illegal symbol for property access'#000+
-  'E_Cannot access a protected field of an object ','here'#000+
+  'E_Cannot access a protected field of an objec','t here'#000+
   'E_Cannot access a private field of an object here'#000+
   'W_overloaded method of virtual method should be virtual: $1'#000+
   'W_overloaded method of non-virtual method should be non-virtual: $1'#000+
-  'E_overloaded methods which are virtual must have the same',' return typ'+
+  'E_overloaded methods which are virtual must have the sa','me return typ'+
   'e: $1'#000+
   'E_EXPORT declared functions can'#039't be nested'#000+
   'E_methods can'#039't be EXPORTed'#000+
   'E_call by var parameters have to match exactly'#000+
   'E_Class isn'#039't a parent class of the current class'#000+
   'E_SELF is only allowed in methods'#000+
-  'E_methods can be onl','y in other methods called direct with type ident'+
+  'E_methods can be o','nly in other methods called direct with type ident'+
   'ifier of the class'#000+
   'E_Illegal use of '#039':'#039#000+
   'E_range check error in set constructor or duplicate set element'#000+
   'E_Pointer to object expected'#000+
   'E_Expression must be constructor call'#000+
-  'E_Expression must be ','destructor call'#000+
+  'E_Expression must b','e destructor call'#000+
   'E_Illegal order of record elements'#000+
   'E_Expression type must be class or record type'#000+
   'E_Procedures can'#039't return a value'#000+
   'E_constructors and destructors must be methods'#000+
   'E_Operator is not overloaded'#000+
-  'E_Re-raise isn'#039't possible there'#000,
+  'E_Re-raise isn'#039't possible ther','e'#000+
   'E_The extended syntax of new or dispose isn'#039't allowed for a class'#000+
   'E_Assembler incompatible with function return type'#000+
   'E_Procedure overloading is switched off'#000+
   'E_It is not possible to overload this operator (overload = instead)'#000+
-  'E_Comparative o','perator must return a boolean value'#000+
+  'E_Comparative',' operator must return a boolean value'#000+
   'E_Only virtual methods can be abstract'#000+
   'F_Use of unsupported feature!'#000+
   'E_The mix of CLASSES and OBJECTS isn'#039't allowed'#000+
   'W_Unknown procedure directive had to be ignored: $1'#000+
-  'E_absolute can only be associated to',' ONE variable'#000+
+  'E_absolute can only be associated ','to ONE variable'#000+
   'E_absolute can only be associated a var or const'#000+
   'E_Only ONE variable can be initialized'#000+
   'E_Abstract methods shouldn'#039't have any definition (with function bo'+
   'dy)'#000+
   'E_This overloaded function can'#039't be local (must be exported)'#000+
-  'W_Virtu','al methods are used without a constructor in $1'#000+
+  'W_Vir','tual methods are used without a constructor in $1'#000+
   'M_Macro defined: $1'#000+
   'M_Macro undefined: $1'#000+
   'M_Macro $1 set to $2'#000+
   'I_Compiling $1'#000+
   'D_Compiling $1 for the second time'#000+
   'E_Array properties aren'#039't allowed at this point'#000+
-  'E_No property found to override',#000+
+  'E_No property found to overri','de'#000+
   'E_Only one default property is allowed, found inherited default proper'+
   'ty in class $1'#000+
   'E_The default property must be an array property'#000+
   'E_Virtual constructors are only supported in class object model'#000+
   'E_No default property available'#000+
-  'E_The cla','ss can'#039't have a published section, use the {$M+} switch'+
+  'E_The c','lass can'#039't have a published section, use the {$M+} switch'+
   #000+
   'E_Forward declaration of class $1 must be resolved here to use the cla'+
   'ss as ancestor'#000+
   'E_Local operators not supported'#000+
   'E_Procedure directive $1 not allowed in interface section'#000+
-  'E_Procedu','re directive $1 not allowed in implementation section'#000+
+  'E_Proce','dure directive $1 not allowed in implementation section'#000+
   'E_Procedure directive $1 not allowed in procvar declaration'#000+
   'E_Function is already declared Public/Forward $1'#000+
   'E_Can'#039't use both EXPORT and EXTERNAL'#000+
   'E_NAME keyword expected'#000+
-  'W_$1 not yet sup','ported inside inline procedure/function'#000+
+  'W_$1 not yet s','upported inside inline procedure/function'#000+
   'W_Inlining disabled'#000+
   'I_Writing Browser log $1'#000+
   'H_may be pointer dereference is missing'#000+
   'F_Selected assembler reader not supported'#000+
   'E_Procedure directive $1 has conflicts with other directives'#000+
-  'E_Calling co','nvention doesn'#039't match forward'#000+
+  'E_Calling ','convention doesn'#039't match forward'#000+
   'E_Register calling (fastcall) not supported'#000+
   'E_Property can'#039't have a default value'#000+
   'E_The default value of a property must be constant'#000+
   'E_Symbol can'#039't be published, can be only a class'#000+
-  'E_That kind of property can',#039't be published'#000+
+  'E_That kind of property c','an'#039't be published'#000+
   'W_Empty import name specified'#000+
   'W_Empty import name specified'#000+
   'E_Function internal name changed after use of function'#000+
   'E_Division by zero'#000+
   'E_Invalid floating point operation'#000+
   'E_Upper bound of range is less than lower bound'#000+
-  'E_strin','g length is larger than array of char length'#000+
+  'E_str','ing length is larger than array of char length'#000+
   'E_Illegal expression after message directive'#000+
   'E_Message handlers can take only one call by ref. parameter'#000+
-  'E_Duplicate message label: %1'#000+
-  'E_Self can be only an explicit parameter in message handlers',#000+
+  'E_Duplicate message label: $1'#000+
+  'E_Self can be only an explicit parameter in message handle','rs'#000+
   'E_Threadvars can be only static or global'#000+
   'F_Direct assembler not supported for binary output format'#000+
   'W_Don'#039't load OBJPAS unit manual, use {$mode objfpc} or {$mode delp'+
   'hi} instead'#000+
   'E_OVERRIDE can'#039't be used in objects'#000+
   'E_Type mismatch'#000+
-  'E_Incompa','tible types: got "$1" expected "$2"'#000+
+  'E_Incom','patible types: got "$1" expected "$2"'#000+
   'E_Type mismatch between $1 and $2'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
@@ -222,37 +218,37 @@ const msgtxt : array[0..000096,1..240] of char=(
   'E_Variable identifier expected'#000+
   'E_pointer type expected'#000+
   'E_class type expected'#000+
-  'E_Vari','able or type indentifier expected'#000+
+  'E_Va','riable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Operation not implemented for sets'#000+
   'W_Automatic type conversion from floating type to COMP which is an int'+
   'eger type'#000+
-  'H_use DIV instead ','to get an integer result'#000+
+  'H_use DIV instea','d to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
   'E_Can'#039't read or write variables of this type'#000+
   'E_Type conflict between set elements'#000+
-  'W_lo/hi(longint/dword) return','s the upper/lower word'#000+
+  'W_lo/hi(longint/dword) retu','rns the upper/lower word'#000+
   'E_Integer or real expression expected'#000+
   'E_Wrong type in array constructor'#000+
-  'E_Incompatible type for arg #$1: Got $2, expected $3'#000+
+  'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+
   'E_Method (variable) and Procedure (variable) are not compatible'#000+
-  'E_Identifier not found $1'#000+
-  'F_','Internal Error in SymTableStack()'#000+
+  'E_Identifier not found ','$1'#000+
+  'F_Internal Error in SymTableStack()'#000+
   'E_Duplicate identifier $1'#000+
   'H_Identifier already defined in $1 at line $2'#000+
   'E_Unknown identifier $1'#000+
   'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
-  'E_Error in type definition'#000+
-  'E_Typ','e identifier not defined'#000+
+  'E_Error in type definition'#000,+
+  'E_Type identifier not defined'#000+
   'E_Forward type not resolved $1'#000+
   'E_Only static variables can be used in static methods or outside metho'+
   'ds'#000+
   'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
-  'E_Instances of classes or objects with ','an abstract method are not al'+
+  'E_Instances of classes or objects ','with an abstract method are not al'+
   'lowed'#000+
   'W_Label not defined $1'#000+
   'E_Illegal label declaration'#000+
@@ -260,14 +256,14 @@ const msgtxt : array[0..000096,1..240] of char=(
   'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
-  'E_illegal type declaration of set',' elements'#000+
+  'E_illegal type declaration o','f set elements'#000+
   'E_Forward class definition not resolved $1'#000+
   'H_Parameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
   'W_Function result does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
-  'W_Local variable $1 does not seem t','o be initialized'#000+
+  'W_Local variable $1 does not s','eem to be initialized'#000+
   'W_Variable $1 does not seem to be initialized'#000+
   'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
@@ -275,99 +271,99 @@ const msgtxt : array[0..000096,1..240] of char=(
   'E_CONTINUE not allowed'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
   'E_Illegal expression'#000+
-  'E_Inva','lid integer expression'#000+
+  'E','_Invalid integer expression'#000+
   'E_Illegal qualifier'#000+
   'E_High range limit < low range limit'#000+
   'E_Illegal counter variable'#000+
   'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
-  'D_Conversion ','between ordinals and pointers is not portable across pl'+
+  'D_Conver','sion between ordinals and pointers is not portable across pl'+
   'atforms'#000+
   'E_File types must be var parameters'#000+
   'E_The use of a far pointer isn'#039't allowed there'#000+
   'E_illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
-  'W_Possible ','illegal call of constructor or destructor (doesn'#039't ma'+
+  'W_Poss','ible illegal call of constructor or destructor (doesn'#039't ma'+
   'tch to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
   'E_procedure call with stackframe ESP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
-  'F_Internal Error in getfloatreg(), allocatio','n failure'#000+
+  'F_Internal Error in getfloatreg(), allo','cation failure'#000+
   'F_Unknown float type'#000+
   'F_SecondVecn() base defined twice'#000+
   'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
   'F_Internal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
-  'E_Stack limit excedeed in local ro','utine'#000+
+  'E_Stack limit excedeed in loc','al routine'#000+
   'D_Stack frame is omitted'#000+
   'E_Object or class methods can'#039't be inline.'#000+
   'E_Procvar calls can'#039't be inline.'#000+
   'E_No code for inline procedure stored'#000+
   'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
   'se (set)length instead'#000+
-  'E_Incl','ude and exclude not implemented in this case'#000+
+  'E','_Include and exclude not implemented in this case'#000+
   'W_Probably illegal constant passed to internal math function'#000+
   'E_Constructors or destructors can not be called inside a '#039'with'#039+
   ' clause'#000+
   'E_Cannot call message handler method directly'#000+
-  'D_Starting $1 sty','led assembler parsing'#000+
+  'D_Starting $','1 styled assembler parsing'#000+
   'D_Finished $1 styled assembler parsing'#000+
   'E_Non-label pattern contains @'#000+
   'W_Override operator not supported'#000+
   'E_Error building record offset'#000+
   'E_OFFSET used without identifier'#000+
-  'E_Cannot use local variable or parameters here'#000+
-  'E_n','eed to use OFFSET here'#000+
+  'E_Cannot use local variable or parameters her','e'#000+
+  'E_need to use OFFSET here'#000+
   'E_Cannot use multiple relocatable symbols'#000+
   'E_Relocatable symbol can only be added'#000+
   'E_Invalid constant expression'#000+
   'E_Relocatable symbol is not allowed'#000+
   'E_Invalid reference syntax'#000+
-  'E_Local symbols not allowed as references'#000+
-  'E','_Invalid base and index register usage'#000+
+  'E_Local symbols not allowed as referen','ces'#000+
+  'E_Invalid base and index register usage'#000+
   'E_Wrong scale factor specified'#000+
   'E_Multiple index register usage'#000+
   'E_Invalid operand type'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
-  'E_Null label references are not allowed'#000+
-  'F_Di','vide by zero in asm evaluator'#000+
+  'E_Null label references are not allowed',#000+
+  'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
   'F_Invalid numeric format in asm evaluator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'E_escape sequence ignored: $1'#000+
   'E_Invalid symbol reference'#000+
-  'W_Fwait can cause em','ulation problems with emu387'#000+
+  'W_Fwait can cau','se emulation problems with emu387'#000+
   'W_Calling an overload function in assembler'#000+
   'E_Unsupported symbol type for operand'#000+
   'E_Constant value out of bounds'#000+
   'E_Error converting decimal $1'#000+
   'E_Error converting octal $1'#000+
   'E_Error converting binary $1'#000+
-  'E_Error con','verting hexadecimal $1'#000+
+  'E_Erro','r converting hexadecimal $1'#000+
   'H_$1 translated to $2'#000+
   'W_$1 is associated to an overloaded function'#000+
   'E_Cannot use SELF outside a method'#000+
   'E_Cannot use OLDEBP outside a nested procedure'#000+
-  'W_Functions with void return value can'#039't return any value in asm c'+
-  'od','e'#000+
+  'W_Functions with void return value can'#039't return any value in as','m'+
+  ' code'#000+
   'E_SEG not supported'#000+
   'E_Size suffix and destination or source size do not match'#000+
   'W_Size suffix and destination or source size do not match'#000+
   'E_Assembler syntax error'#000+
   'E_Invalid combination of opcode and operands'#000+
-  'E_Assemler syntax error in opera','nd'#000+
+  'E_Assemler syntax error in ','operand'#000+
   'E_Assemler syntax error in constant'#000+
   'E_Invalid String expression'#000+
   '32bit constant created for address'#000+
   'E_Invalid or missing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
   'E_Invalid combination of override and opcode: $1'#000+
-  'E_Too many ope','rands on line'#000+
+  'E_Too man','y operands on line'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'E_Duplicate local symbol $1'#000+
@@ -376,54 +372,54 @@ const msgtxt : array[0..000096,1..240] of char=(
   'E_Invalid floating point register name'#000+
   'E_NOR not supported'#000+
   'W_Modulo not supported'#000+
-  'E_Invalid floating point cons','tant $1'#000+
+  'E_Invalid floating point',' constant $1'#000+
   'E_Invalid floating point expression'#000+
   'E_Wrong symbol type'#000+
   'E_Cannot index a local var or parameter with a register'#000+
   'E_Invalid segment override expression'#000+
   'W_Identifier $1 supposed external'#000+
   'E_Strings not allowed as constants'#000+
-  'No type of va','riable specified'#000+
+  'No type ','of variable specified'#000+
   'E_assembler code not returned to text section'#000+
   'E_Not a directive or local symbol $1'#000+
   'E_Using a defined name as a local label'#000+
   'F_Too many assembler files'#000+
   'F_Selected assembler output not supported'#000+
   'F_Comp not supported'#000+
-  'F_Direct n','ot support for binary writers'#000+
+  'F_Dir','ect not support for binary writers'#000+
   'E_Allocating of data is only allowed in bss section'#000+
   'F_No binary writer selected'#000+
   'E_Asm: Opcode $1 not in table'#000+
   'E_Asm: $1 invalid combination of opcode and operands'#000+
   'E_Asm: 16 Bit references not supported'#000+
-  'E_Asm: I','nvalid effective address'#000+
+  'E_A','sm: Invalid effective address'#000+
   'E_Asm: Immediate or reference expected'#000+
   'E_Asm: $1 value exceeds bounds $2'#000+
   'E_Asm: Short jump is out of range $1'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
   'E_Can'#039't create assember file $1'#000+
-  'W_Assembler $1',' not found, switching to external assembling'#000+
+  'W_Assembl','er $1 not found, switching to external assembling'#000+
   'T_Using assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
   'W_Can'#039't call the assembler, error $1 switching to external assembl'+
   'ing'#000+
   'I_Assembling $1'#000+
-  'W_Linker $1 not found, switching to external linki','ng'#000+
+  'W_Linker $1 not found, switching to external ','linking'#000+
   'T_Using linker: $1'#000+
   'W_Object $1 not found, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
   'W_Error while linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
-  'W_binder not found, switching to external b','inding'#000+
+  'W_binder not found, switching to exter','nal binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
   'W_resource compiler not found, switching to external mode'#000+
   'I_Compiling resource $1'#000+
   'F_Can'#039't post process executable $1'#000+
-  'F_Can'#039't open executab','le $1'#000+
+  'F_Can'#039't open exe','cutable $1'#000+
   'X_Size of Code: $1 bytes'#000+
   'X_Size of initialized data: $1 bytes'#000+
   'X_Size of uninitialized data: $1 bytes'#000+
@@ -432,8 +428,8 @@ const msgtxt : array[0..000096,1..240] of char=(
   'T_Unitsearch: $1'#000+
   'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
-  'U_PPU Flags: $1'#000+
-  'U_','PPU Crc: $1'#000+
+  'U_PPU Flags: ','$1'#000+
+  'U_PPU Crc: $1'#000+
   'U_PPU Time: $1'#000+
   'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
@@ -442,7 +438,7 @@ const msgtxt : array[0..000096,1..240] of char=(
   'U_PPU is compiled for an other target'#000+
   'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
-  'F_Can'#039't Write P','PU-File'#000+
+  'F_Can'#039't Wr','ite PPU-File'#000+
   'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
@@ -450,45 +446,45 @@ const msgtxt : array[0..000096,1..240] of char=(
   'E_Illegal unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
-  'F_Can'#039't compile unit $1, no sources available'#000,
+  'F_Can'#039't compile unit $1, no sources avail','able'#000+
   'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
   'U_Load from $1 ($2) unit $3'#000+
   'U_Recompiling $1, checksum changed for $2'#000+
   'U_Recompiling $1, source found only'#000+
-  'U_Recompiling unit, static lib i','s older than ppufile'#000+
+  'U_Recompiling unit, static ','lib is older than ppufile'#000+
   'U_Recompiling unit, shared lib is older than ppufile'#000+
   'U_Recompiling unit, obj and asm are older than ppufile'#000+
   'U_Recompiling unit, obj is older than asm'#000+
   'U_Parsing interface of $1'#000+
   'U_Parsing implementation of $1'#000+
-  'U_Second loa','d for unit $1'#000+
+  'U_Secon','d load for unit $1'#000+
   'U_PPU Check file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
   'W_DEF file can be created only for OS/2'#000+
   'E_nested response files are not supported'#000+
   'F_No source file name in command line'#000+
-  'E_Illegal ','parameter: $1'#000+
+  'E_Ill','egal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
   'N_Reading further options from $1'#000+
   'W_Target is already set to: $1'#000+
   'W_Shared libs not supported on DOS platform, reverting to static'#000+
-  'F_too many IF(N)D','EFs'#000+
+  'F_too many I','F(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
   'W_Debug information generation is not supported by this executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'E_You are using the obsolete switch $1'#000+
-  'E_You are using the obsolete switch $1, p','lease use $2'#000+
+  'E_You are using the obsolete switch ','$1, please use $2'#000+
   'N_Switching assembler to default source writing assembler'#000+
   'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
   'Copyright (c) 1993-98 by Florian Klaempfl'#000+
   'Free Pascal Compiler version $FPCVER'#000+
   #000+
-  'Compiler Date  : $FPCDATE'#000,
+  'Compiler Date  : $FPC','DATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
   'This program comes under the GNU General Public Licence'#000+
@@ -496,19 +492,19 @@ const msgtxt : array[0..000096,1..240] of char=(
   #000+
   'Report bugs,suggestions etc to:'#000+
   '                 [email protected]'#000+
-  '**0*_put + after a boolean switch',' option to enable it, - to disable '+
+  '**0*_put + after a boolean s','witch option to enable it, - to disable '+
   'it'#000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
   '**2al_list sourcecode lines in assembler file'#000+
   '**2ar_list register allocation/release info in assembler file'#000+
-  '**2at_list temp allocation/relea','se info in assembler file'#000+
+  '**2at_list temp allocation/','release info in assembler file'#000+
   '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
   '**1C<x>_code generation options:'#000+
   '3*2CD_create dynamic library'#000+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
-  '**2Ci_IO-checking',#000+
+  '**2Ci_IO-che','cking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
@@ -517,21 +513,21 @@ const msgtxt : array[0..000096,1..240] of char=(
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
   '**1d<x>_defines the symbol <x>'#000+
-  '*O1D_generate a ','DEF file'#000+
+  '*O1D_genera','te a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
   '**1F<x>_set file names and paths:'#000+
   '**2FD<x>_sets the directory where to search for compiler utilities'#000+
-  '**2Fe<x>_redirect error outpu','t to <x>'#000+
+  '**2Fe<x>_redirect error ','output to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '**2Fi<x>_adds <x> to include path'#000+
   '**2Fl<x>_adds <x> to library path'#000+
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
   '**2Fr<x>_load error message file <x>'#000+
-  '**2Fu<x>_adds <x','> to unit path'#000+
+  '**2Fu<x>_ad','ds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g<x>_generate debugger information:'#000+
   '*g2gg_use gsym'#000+
@@ -539,8 +535,8 @@ const msgtxt : array[0..000096,1..240] of char=(
   '*g2gh_use heap trace unit'#000+
   '**1i_information'#000+
   '**2iD_return compiler date'#000+
-  '**2iV_return compiler version'#000+
-  '**2iS','O_return compiler OS'#000+
+  '**2iV_return compiler version'#000,+
+  '**2iSO_return compiler OS'#000+
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
   '**2iTP_return target processor'#000+
@@ -548,68 +544,68 @@ const msgtxt : array[0..000096,1..240] of char=(
   '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
-  '**1o<x>_cha','nge the name of the executable produced to <x>'#000+
+  '**1o<x','>_change the name of the executable produced to <x>'#000+
   '**1pg_generate profile code for gprof'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S<x>_syntax options:'#000+
   '**2S2_switch some Delphi 2 extensions on'#000+
-  '**2Sc_supports operators like',' C (*=,+=,/= and -=)'#000+
+  '**2Sc_supports operators',' like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
   '**2Se_compiler stops after the first error'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
   '**2Si_support C++ styled INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
-  '**2So_tries to be TP/B','P 7.0 compatible'#000+
+  '**2So_tries to be',' TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
   '**2Ss_constructor name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
   '**1s_don'#039't call assembler and linker (only with -a)'#000+
-  '**1u<x>_undefines the symbol <x>'#000+
-  '**1U_','unit options:'#000+
+  '**1u<x>_undefines the symbol <x>'#000,+
+  '**1U_unit options:'#000+
   '**2Un_don'#039't check the unit name'#000+
   '**2Us_compile a system unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#000+
   '**2*_e : Show errors (default)       d : Show debug info'#000+
-  '**2*_w : Show warnings               u : S','how unit info'#000+
+  '**2*_w : Show warnings               ','u : Show unit info'#000+
   '**2*_n : Show notes                  t : Show tried/used files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
   '**2*_i : Show general info           p : Show compiled procedures'#000+
-  '**2*_l : Show linenumbers           ',' c : Show conditionals'#000+
+  '**2*_l : Show linenumbers      ','      c : Show conditionals'#000+
   '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
-  '**2*_  ','  occurs'#000+
+  '**','2*_    occurs'#000+
   '**1X_executable options:'#000+
   '*L2Xc_link with the c library'#000+
   '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
   '**2Xs_strip all symbols from executable'#000+
   '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
-  '**0*_Processor s','pecific options:'#000+
+  '**0*_Proces','sor specific options:'#000+
   '3*1A<x>_output format:'#000+
   '3*2Ao_coff file using GNU AS'#000+
   '3*2Anasmcoff_coff file using Nasm'#000+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj file using Masm (Microsoft)'#000+
-  '3*2Atasm_obj file usin','g Tasm (Borland)'#000+
+  '3*2Atasm_obj file',' using Tasm (Borland)'#000+
   '3*1R<x>_assembler reading style:'#000+
   '3*2Ratt_read AT&T style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
   '3*2Rdirect_copy assembler text directly to assembler file'#000+
   '3*1O<x>_optimizations:'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_gene','rate faster code (default)'#000+
+  '3*2OG','_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
   '3*2O1_level 1 optimizations (quick optimizations)'#000+
-  '3*2O2_level 2 optimizations (-O1 + slower optimizations)',#000+
+  '3*2O2_level 2 optimizations (-O1 + slower optimizat','ions)'#000+
   '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op<x>_target processor:'#000+
   '3*3Op1_set target processor to 386/486'#000+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
-  '3*1T<x>_Target operat','ing system:'#000+
+  '3*1T<x>_Target o','perating system:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
@@ -617,7 +613,7 @@ const msgtxt : array[0..000096,1..240] of char=(
   '3*2TWin32_Windows 32 Bit'#000+
   '6*1A<x>_output format'#000+
   '6*2Ao_Unix o-file using GNU AS'#000+
-  '6*2Agas_GNU Motorola ','assembler'#000+
+  '6*2Agas_GNU Moto','rola assembler'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations:'#000+
@@ -625,7 +621,7 @@ const msgtxt : array[0..000096,1..240] of char=(
   '6*2Og_generate smaller code'#000+
   '6*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
-  '6*2O2_set ta','rget processor to a MC68020+'#000+
+  '6*2O2_s','et target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style:'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
@@ -633,7 +629,7 @@ const msgtxt : array[0..000096,1..240] of char=(
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
-  '**1*_'#000+
-  '**1?','_shows this help'#000+
+  '**1*_',#000+
+  '**1?_shows this help'#000+
   '**1h_shows this help without waiting'#000
 );