Forráskód Böngészése

* message updates merges

peter 25 éve
szülő
commit
24fc983597

+ 20 - 15
compiler/comphook.pas

@@ -53,6 +53,14 @@ Const
   V_All          = $ffffffff;
   V_Default      = V_Fatal + V_Error + V_Normal;
 
+const
+  { RHIDE expect gcc like error output }
+  fatalstr      : string[20] = 'Fatal:';
+  errorstr      : string[20] = 'Error:';
+  warningstr    : string[20] = 'Warning:';
+  notestr       : string[20] = 'Note:';
+  hintstr       : string[20] = 'Hint:';
+
 type
   PCompilerStatus = ^TCompilerStatus;
   TCompilerStatus = record
@@ -220,14 +228,8 @@ end;
 
 Function def_comment(Level:Longint;const s:string):boolean;
 const
-  { RHIDE expect gcc like error output }
-  rh_errorstr='error: ';
-  rh_warningstr='warning: ';
-  fatalstr='Fatal: ';
-  errorstr='Error: ';
-  warningstr='Warning: ';
-  notestr='Note: ';
-  hintstr='Hint: ';
+  rh_errorstr   = 'error:';
+  rh_warningstr = 'warning:';
 var
   hs : string;
 begin
@@ -269,18 +271,18 @@ begin
         if status.currentcolumn>0 then
          begin
            if status.use_gccoutput then
-             hs:=gccfilename(status.currentsource)+':'+tostr(status.currentline)+': '+hs
-                 +tostr(status.currentcolumn)+': '
+             hs:=gccfilename(status.currentsource)+':'+tostr(status.currentline)+': '+hs+' '+
+                 tostr(status.currentcolumn)+': '
            else
-             hs:=status.currentsource+'('+tostr(status.currentline)
-                 +','+tostr(status.currentcolumn)+') '+hs;
+             hs:=status.currentsource+'('+tostr(status.currentline)+
+                 ','+tostr(status.currentcolumn)+') '+hs+' ';
          end
         else
          begin
            if status.use_gccoutput then
-             hs:=gccfilename(status.currentsource)+': '+hs+tostr(status.currentline)+': '
+             hs:=gccfilename(status.currentsource)+': '+hs+' '+tostr(status.currentline)+': '
            else
-             hs:=status.currentsource+'('+tostr(status.currentline)+') '+hs;
+             hs:=status.currentsource+'('+tostr(status.currentline)+') '+hs+' ';
          end;
       end;
    { add the message to the text }
@@ -359,7 +361,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.6  2000-09-24 15:06:13  peter
+  Revision 1.7  2000-09-24 21:33:46  peter
+    * message updates merges
+
+  Revision 1.6  2000/09/24 15:06:13  peter
     * use defines.inc
 
   Revision 1.5  2000/08/27 16:11:50  peter

+ 41 - 5
compiler/errore.msg

@@ -101,6 +101,16 @@ general_i_writingresourcefile=01010_I_Writing Resource String Table file: $1
 general_e_errorwritingresourcefile=01011_E_Writing Resource String Table file: $1
 % This message is shown when the compiler encountered an error when writing
 % the Resource String Table file
+general_i_fatal=01012_I_Fatal:
+% Prefix for Fatal Errors
+general_i_error=01013_I_Error:
+% Prefix for Errors
+general_i_warning=01014_I_Warning:
+% Prefix for Warnings
+general_i_note=01015_I_Note:
+% Prefix for Notes
+general_i_hint=01016_I_Hint:
+% Prefix for Hints
 % \end{description}
 #
 # Scanner
@@ -277,6 +287,10 @@ scan_w_only_one_resourcefile_supported=02056_W_Only one resource file is support
 % The target you are compiling for supports only one resource file. This is the
 % case of OS/2 (EMX) currently. The first resource file found is used, the
 % others are discarded.
+scan_w_macro_support_turned_off=02057_W_Macro support has been turned off
+% A macro declaration has been found, but macro support is currently off,
+% so the declaration will be ignored. To turn macro support on compile with
+% -Sm on the commandline or add {$MACRO ON} in the source
 % \end{description}
 #
 # Parser
@@ -705,7 +719,6 @@ parser_e_no_local_operator=03116_E_Local operators not supported
 % definitions.
 parser_e_proc_dir_not_allowed_in_interface=03117_E_Procedure directive $1 not allowed in interface section
 % This procedure directive is not allowed in the \var{interface} section of
-
 % a unit. You can only use it in the \var{implementation} section.
 parser_e_proc_dir_not_allowed_in_implementation=03118_E_Procedure directive $1 not allowed in implementation section
 % This procedure directive is not defined in the \var{implementation} section of
@@ -732,7 +745,6 @@ parser_h_maybe_deref_caret_missing=03126_H_may be pointer dereference is missing
 % The compiler thinks that a pointer may need a dereference.
 parser_f_assembler_reader_not_supported=03127_F_Selected assembler reader not supported
 % The selected assembler reader (with \var{\{\$ASMMODE xxx\}} is not
-
 % supported. The compiler can be compiled with or without support for a
 % particular assembler reader.
 parser_e_proc_dir_conflict=03128_E_Procedure directive $1 has conflicts with other directives
@@ -852,6 +864,13 @@ parser_e_dlltool_unit_var_problem2=03161_E_Compile without -WD option
 parser_f_need_objfpc_or_delphi_mode=03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this module
 % You need to use {$mode objfpc} or {$mode delphi} to compile this file.
 % Or use the equivalent commandline switches -S2 or -Sd.
+parser_e_no_export_with_index_for_target=03163_E_Can't export with index under $1
+% Exporting of functions or procedures with a specified index is not
+% support on all targets. The only platforms currently supporting
+% export with index are OS/2 and Win32.
+parser_e_no_export_of_variables_for_target=03164_E_Exporting of variables is not supported under $1
+% Exporting of variables is not support on all targets. The only platform
+% currently supporting export of variables is Win32.
 % \end{description}
 #
 # Type Checking
@@ -1085,8 +1104,6 @@ sym_h_local_symbol_not_used=05028_H_Local $1 $2 is not used
 sym_n_private_identifier_not_used=05029_N_Private field $1.$2 is never used
 sym_n_private_identifier_only_set=05030_N_Private field $1.$2 is assigned but never used
 sym_n_private_method_not_used=05031_N_Private method $1.$2 never used
-
-
 sym_e_set_expected=05032_E_Set type expected
 % The variable or expression isn't of type \var{set}. This happens in an
 % \var{in} statement.
@@ -1417,6 +1434,10 @@ asmr_e_cannot_access_object_field_directly=07082_E_Can't access fields of object
 % You should load the self pointer first into a register and then access the
 % fields using the register as base. By default the self pointer is available
 % in the esi register on i386.
+asmr_e_unable_to_determine_reference_size=07083_E_No size specified and unable to determine the size of the operands
+% You should specify explicitly a size for the reference, because
+% compiler is unable to determine what size (byte,word,dword,etc.) it
+% should use for the reference.
 #
 # Assembler/binary writers
 #
@@ -1474,6 +1495,11 @@ exec_e_dll_not_supported=09019_E_Creation of Dynamic/Shared Libraries not suppor
 exec_i_closing_script=09020_I_Closing script $1
 exec_w_res_not_found=09021_W_resource compiler not found, switching to external mode
 exec_i_compilingresource=09022_I_Compiling resource $1
+exec_t_unit_not_static_linkable_switch_to_smart=09023_T_unit $1 can't be static linked, switching to smart linking
+exec_t_unit_not_smart_linkable_switch_to_static=09024_T_unit $1 can't be smart linked, switching to static linking
+exec_t_unit_not_shared_linkable_switch_to_static=09025_T_unit $1 can't be shared linked, switching to static linking
+exec_e_unit_not_smart_or_static_linkable=09026_E_unit $1 can't be smart or static linked
+exec_e_unit_not_shared_or_static_linkable=09027_E_unit $1 can't be shared or static linked
 %\end{description}
 # EndOfTeX
 
@@ -1599,6 +1625,16 @@ unit_u_second_load_unit=10036_U_Second load for unit $1
 unit_u_check_time=10037_U_PPU Check file $1 time $2
 % When you use the \var{-vu} flag, the compiler show the filename and
 % date and time of the file which a recompile depends on
+unit_h_cond_not_set_in_last_compile=10038_H_Conditional $1 was not set at startup in last compilation of $2
+% when recompilation of an unit is required the compiler will check that
+% the same conditionals are set for the recompiliation. The compiler has
+% found a conditional that currently is defined, but was not used the last
+% time the unit was compiled.
+unit_h_cond_set_in_last_compile=10039_H_Conditional $1 was set at startup in last compilation of $2
+% when recompilation of an unit is required the compiler will check that
+% the same conditionals are set for the recompiliation. The compiler has
+% found a conditional that was used the last time the unit was compiled, but
+% the conditional is currently not defined.
 % \end{description}
 # EndOfTeX
 
@@ -1862,4 +1898,4 @@ option_help_pages=11025_[
 
 #
 # The End...
-#
+#

+ 44 - 1
compiler/globals.pas

@@ -245,6 +245,8 @@ interface
     function  GetEnvPChar(const envname:string):pchar;
     procedure FreeEnvPChar(p:pchar);
 
+    Function SetCompileMode(const s:string):boolean;
+
     procedure InitGlobals;
     procedure DoneGlobals;
 
@@ -993,6 +995,44 @@ implementation
       {$endif}
 
 
+    Function SetCompileMode(const s:string):boolean;
+      var
+        b : boolean;
+      begin
+        b:=true;
+        if s='DEFAULT' then
+          aktmodeswitches:=initmodeswitches
+        else
+         if s='DELPHI' then
+          aktmodeswitches:=delphimodeswitches
+        else
+         if s='TP' then
+          aktmodeswitches:=tpmodeswitches
+        else
+         if s='FPC' then
+          aktmodeswitches:=fpcmodeswitches
+        else
+         if s='OBJFPC' then
+          aktmodeswitches:=objfpcmodeswitches
+        else
+         if s='GPC' then
+          aktmodeswitches:=gpcmodeswitches
+        else
+         b:=false;
+
+        if b then
+         begin
+           { turn ansistrings on by default ? }
+           if (m_default_ansistring in aktmodeswitches) then
+            include(aktlocalswitches,cs_ansistrings)
+           else
+            exclude(aktlocalswitches,cs_ansistrings);
+         end;
+
+        SetCompileMode:=b;
+      end;
+
+
 {****************************************************************************
                                     Init
 ****************************************************************************}
@@ -1132,7 +1172,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.12  2000-09-24 21:19:50  peter
+  Revision 1.13  2000-09-24 21:33:46  peter
+    * message updates merges
+
+  Revision 1.12  2000/09/24 21:19:50  peter
     * delphi compile fixes
 
   Revision 1.11  2000/09/24 15:12:40  peter

+ 11 - 8
compiler/link.pas

@@ -181,13 +181,13 @@ begin
            if (flags and uf_static_linked)=0 then
             begin
               { if smart not avail then try static linking }
-              if (flags and uf_static_linked)<>0 then
+              if (flags and uf_smart_linked)<>0 then
                begin
-                 Comment(V_Tried,'unit '+modulename^+' can''t be static linked, switching to smart linking');
+                 Message1(exec_t_unit_not_static_linkable_switch_to_smart,modulename^);
                  mask:=mask or link_smart;
                end
               else
-               Comment(V_Error,'unit '+modulename^+' can''t be smart or static linked');
+               Message1(exec_e_unit_not_smart_or_static_linkable,modulename^);
             end
            else
              mask:=mask or link_static;
@@ -200,11 +200,11 @@ begin
               { if smart not avail then try static linking }
               if (flags and uf_static_linked)<>0 then
                begin
-                 Comment(V_Tried,'unit '+modulename^+' can''t be smart linked, switching to static linking');
+                 Message1(exec_t_unit_not_smart_linkable_switch_to_static,modulename^);
                  mask:=mask or link_static;
                end
               else
-               Comment(V_Error,'unit '+modulename^+' can''t be smart or static linked');
+               Message1(exec_e_unit_not_smart_or_static_linkable,modulename^);
             end
            else
             mask:=mask or link_smart;
@@ -217,11 +217,11 @@ begin
               { if shared not avail then try static linking }
               if (flags and uf_static_linked)<>0 then
                begin
-                 Comment(V_Tried,'unit '+modulename^+' can''t be shared linked, switching to static linking');
+                 Message1(exec_t_unit_not_shared_linkable_switch_to_static,modulename^);
                  mask:=mask or link_static;
                end
               else
-               Comment(V_Error,'unit '+modulename^+' can''t be shared or static linked');
+               Message1(exec_e_unit_not_shared_or_static_linkable,modulename^);
             end
            else
             mask:=mask or link_shared;
@@ -541,7 +541,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.8  2000-09-24 15:06:18  peter
+  Revision 1.9  2000-09-24 21:33:46  peter
+    * message updates merges
+
+  Revision 1.8  2000/09/24 15:06:18  peter
     * use defines.inc
 
   Revision 1.7  2000/09/16 12:22:52  peter

+ 24 - 5
compiler/messages.pas

@@ -38,6 +38,7 @@ type
   PMessage=^TMessage;
   TMessage=object
     msgfilename : string;
+    msgintern   : boolean;
     msgallocsize,
     msgsize,
     msgparts,
@@ -49,6 +50,7 @@ type
     destructor  Done;
     function  LoadIntern(p:pointer;n:longint):boolean;
     function  LoadExtern(const fn:string):boolean;
+    procedure ClearIdx;
     procedure CreateIdx;
     function  GetPChar(nr:longint):pchar;
     function  Get(nr:longint):string;
@@ -111,6 +113,8 @@ begin
   msgtxt:=pchar(p);
   msgsize:=n;
   msgallocsize:=0;
+  msgintern:=true;
+  ClearIdx;
   CreateIdx;
   LoadIntern:=true;
 end;
@@ -298,12 +302,27 @@ begin
    end;
   close(f);
   freemem(buf,bufsize);
-{ now we can create the index }
+{ now we can create the index, clear if the previous load was also
+  an external file, because those can't be reused }
+  if not msgintern then
+   ClearIdx;
   CreateIdx;
+{ set that we've loaded an external file }
+  msgintern:=false;
   LoadExtern:=true;
 end;
 
 
+procedure TMessage.ClearIdx;
+var
+  i : longint;
+begin
+  { clear }
+  for i:=1to msgparts do
+   fillchar(msgidx[i]^,msgidxmax[i]*4,0);
+end;
+
+
 procedure TMessage.CreateIdx;
 var
   hp1,
@@ -314,9 +333,6 @@ var
   i   : longint;
   numpart,numidx : longint;
 begin
-  { clear }
-  for i:=1to msgparts do
-   fillchar(msgidx[i]^,msgidxmax[i]*4,0);
   { process msgtxt buffer }
   number:='00000';
   hp:=msgtxt;
@@ -432,7 +448,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.3  2000-09-24 15:06:18  peter
+  Revision 1.4  2000-09-24 21:33:46  peter
+    * message updates merges
+
+  Revision 1.3  2000/09/24 15:06:18  peter
     * use defines.inc
 
   Revision 1.2  2000/07/13 11:32:43  michael

+ 18 - 2
compiler/msgidx.inc

@@ -11,6 +11,11 @@ const
   general_f_no_memory_left=01009;
   general_i_writingresourcefile=01010;
   general_e_errorwritingresourcefile=01011;
+  general_i_fatal=01012;
+  general_i_error=01013;
+  general_i_warning=01014;
+  general_i_note=01015;
+  general_i_hint=01016;
   scan_f_end_of_file=02000;
   scan_f_string_exceeds_line=02001;
   scan_f_illegal_char=02002;
@@ -68,6 +73,7 @@ const
   scan_w_include_env_not_found=02054;
   scan_e_invalid_maxfpureg_value=02055;
   scan_w_only_one_resourcefile_supported=02056;
+  scan_w_macro_support_turned_off=02057;
   parser_e_syntax_error=03000;
   parser_w_proc_far_ignored=03001;
   parser_w_proc_near_ignored=03002;
@@ -231,6 +237,8 @@ const
   parser_e_dlltool_unit_var_problem=03160;
   parser_e_dlltool_unit_var_problem2=03161;
   parser_f_need_objfpc_or_delphi_mode=03162;
+  parser_e_no_export_with_index_for_target=03163;
+  parser_e_no_export_of_variables_for_target=03164;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
   type_e_not_equal_types=04002;
@@ -430,6 +438,7 @@ const
   asmr_n_align_is_target_specific=07080;
   asmr_e_cannot_access_field_directly_for_parameters=07081;
   asmr_e_cannot_access_object_field_directly=07082;
+  asmr_e_unable_to_determine_reference_size=07083;
   asmw_f_too_many_asm_files=08000;
   asmw_f_assembler_output_not_supported=08001;
   asmw_f_comp_not_supported=08002;
@@ -467,6 +476,11 @@ const
   exec_i_closing_script=09020;
   exec_w_res_not_found=09021;
   exec_i_compilingresource=09022;
+  exec_t_unit_not_static_linkable_switch_to_smart=09023;
+  exec_t_unit_not_smart_linkable_switch_to_static=09024;
+  exec_t_unit_not_shared_linkable_switch_to_static=09025;
+  exec_e_unit_not_smart_or_static_linkable=09026;
+  exec_e_unit_not_shared_or_static_linkable=09027;
   execinfo_f_cant_process_executable=09023;
   execinfo_f_cant_open_executable=09024;
   execinfo_x_codesize=09025;
@@ -512,6 +526,8 @@ const
   unit_u_start_parse_implementation=10035;
   unit_u_second_load_unit=10036;
   unit_u_check_time=10037;
+  unit_h_cond_not_set_in_last_compile=10038;
+  unit_h_cond_set_in_last_compile=10039;
   option_usage=11000;
   option_only_one_source_support=11001;
   option_def_only_for_os2=11002;
@@ -539,9 +555,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 30276;
+  MsgTxtSize = 31005;
 
   MsgIdxMax : array[1..20] of longint=(
-    12,57,163,34,41,41,83,14,30,38,
+    17,58,165,34,41,41,84,14,30,40,
     26,1,1,1,1,1,1,1,1,1
   );

+ 247 - 227
compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000126] of string[240]=(
+const msgtxt : array[0..000129] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000126,1..240] of char=(
+const msgtxt : array[0..000129,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -15,553 +15,573 @@ const msgtxt : array[0..000126,1..240] of char=(
   '01009_F_No memory left'#000+
   '01010_I_Writing Resource String Table file: $1'#000+
   '01011_E_Writing Resource String Table file: $1'#000+
+  '01012_I_Fatal:'#000+
+  '01013_I_Error:'#000+
+  '01014_I_Warning:'#000+
+  '01015_I_Note:'#000+
+  '01016_I_Hint:'#000+
   '02000_F_Unexpected end of file'#000+
-  '02001_F_String exceeds line'#000+
+  '02','001_F_String exceeds line'#000+
   '02002_F_illegal character $1 ($2)'#000+
-  '02003_F_Syntax ','error, $1 expected but $2 found'#000+
+  '02003_F_Syntax error, $1 expected but $2 found'#000+
   '02004_T_Start reading includefile $1'#000+
   '02005_W_Comment level $1 found'#000+
   '02006_N_$F directive (FAR) ignored'#000+
-  '02007_N_Stack check is global under Linux'#000+
+  '02007_N_Stack check is global ','under Linux'#000+
   '02008_N_Ignored compiler switch $1'#000+
-  '02009_W_Illegal compiler swi','tch $1'#000+
+  '02009_W_Illegal compiler switch $1'#000+
   '02010_W_This compiler switch has a global effect'#000+
   '02011_E_Illegal char constant'#000+
   '02012_F_Can'#039't open file $1'#000+
   '02013_F_Can'#039't open include file $1'#000+
-  '02014_E_Too many $ENDIFs or $ELSEs'#000+
-  '02015_W_Records fields can be aligned to 1,2,4,8,16 or 32',' bytes only'+
-  #000+
+  '02014_E_Too many ','$ENDIFs or $ELSEs'#000+
+  '02015_W_Records fields can be aligned to 1,2,4,8,16 or 32 bytes only'#000+
   '02016_W_Enumerated can be saved in 1,2 or 4 bytes only'#000+
   '02017_E_$ENDIF expected for $1 $2 defined in line $3'#000+
-  '02018_E_Syntax error while parsing a conditional compiling expression'#000+
-  '02019_E_Evaluating a conditional compiling express','ion'#000+
+  '02018_E_Syntax error while parsing a conditio','nal compiling expressio'+
+  'n'#000+
+  '02019_E_Evaluating a conditional compiling expression'#000+
   '02020_W_Macro contents is cut after char 255 to evalute expression'#000+
   '02021_E_ENDIF without IF(N)DEF'#000+
   '02022_F_User defined: $1'#000+
   '02023_E_User defined: $1'#000+
-  '02024_W_User defined: $1'#000+
+  '02024_W_User ','defined: $1'#000+
   '02025_N_User defined: $1'#000+
   '02026_H_User defined: $1'#000+
-  '02027_I_User ','defined: $1'#000+
+  '02027_I_User defined: $1'#000+
   '02028_E_Keyword redefined as macro has no effect'#000+
   '02029_F_Macro buffer overflow while reading or expanding a macro'#000+
-  '02030_W_Extension of macros exceeds a deep of 16.'#000+
-  '02031_E_compiler switches aren'#039't allowed in (* ... *) styled com','m'+
-  'ents'#000+
+  '02030_W_Extension of macros exceeds a d','eep of 16.'#000+
+  '02031_E_compiler switches aren'#039't allowed in (* ... *) styled comme'+
+  'nts'#000+
   '02032_D_Handling switch "$1"'#000+
   '02033_C_ENDIF $1 found'#000+
   '02034_C_IFDEF $1 found, $2'#000+
   '02035_C_IFOPT $1 found, $2'#000+
   '02036_C_IF $1 found, $2'#000+
   '02037_C_IFNDEF $1 found, $2'#000+
-  '02038_C_ELSE $1 found, $2'#000+
+  '0','2038_C_ELSE $1 found, $2'#000+
   '02039_C_Skipping until...'#000+
-  '02040_I_Press <return> t','o continue'#000+
+  '02040_I_Press <return> to continue'#000+
   '02041_W_Unsupported switch $1'#000+
   '02042_W_Illegal compiler directive $1'#000+
   '02043_T_Back in $1'#000+
   '02044_W_Unsupported application type: $1'#000+
-  '02045_W_APPTYPE isn'#039't support by the target OS'#000+
-  '02046_W_DESCRIPTION is only supported for OS2 and Win3','2'#000+
+  '02045_W_APPTYPE isn'#039't supp','ort by the target OS'#000+
+  '02046_W_DESCRIPTION is only supported for OS2 and Win32'#000+
   '02047_N_VERSION is not supported by target OS.'#000+
   '02048_N_VERSION only for exes or DLLs'#000+
   '02049_W_Wrong format for VERSION directive $1'#000+
-  '02050_W_Unsupported assembler style specified $1'#000+
-  '02051_W_ASM reader switch is not possible inside asm state','ment, $1 w'+
-  'ill be effective only for next'#000+
+  '02050_W_Unsupported assembler st','yle specified $1'#000+
+  '02051_W_ASM reader switch is not possible inside asm statement, $1 wil'+
+  'l be effective only for next'#000+
   '02052_E_Wrong switch toggle, use ON/OFF or +/-'#000+
   '02053_E_Resource files are not supported for this target'#000+
-  '02054_W_Include environment $1 not found in environment'#000+
-  '02055_E_Illegal value for FPU register ','limit'#000+
+  '02054_W_Include envi','ronment $1 not found in environment'#000+
+  '02055_E_Illegal value for FPU register limit'#000+
   '02056_W_Only one resource file is supported for this target'#000+
+  '02057_W_Macro support has been turned off'#000+
   '03000_E_Parser - Syntax Error'#000+
-  '03001_W_Procedure type FAR ignored'#000+
+  '03001_W_Procedure type FAR ','ignored'#000+
   '03002_W_Procedure type NEAR ignored'#000+
   '03003_W_Procedure type INTERRUPT ignored for not i386'#000+
-  '03004_E_INTERRUPT p','rocedure can'#039't be nested'#000+
+  '03004_E_INTERRUPT procedure can'#039't be nested'#000+
   '03005_W_Procedure type $1 ignored'#000+
   '03006_E_Not all declarations of $1 are declared with OVERLOAD'#000+
-  '03007_E_No DLL File specified'#000+
+  '03','007_E_No DLL File specified'#000+
   '03008_E_Duplicate exported function name $1'#000+
-  '03009_E_Duplicate exported function index $1'#000,
+  '03009_E_Duplicate exported function index $1'#000+
   '03010_E_Invalid index for exported function'#000+
   '03011_W_Relocatable DLL or executable $1 debug info does not work, dis'+
   'abled.'#000+
-  '03012_W_To allow debugging for win32 code you need to disable relocati'+
-  'on with -WN option'#000+
-  '03013_E_Constructor name must ','be INIT'#000+
+  '03','012_W_To allow debugging for win32 code you need to disable reloca'+
+  'tion with -WN option'#000+
+  '03013_E_Constructor name must be INIT'#000+
   '03014_E_Destructor name must be DONE'#000+
   '03015_E_Illegal open parameter'#000+
   '03016_E_Procedure type INLINE not supported'#000+
-  '03017_W_Private methods shouldn'#039't be VIRTUAL'#000+
+  '030','17_W_Private methods shouldn'#039't be VIRTUAL'#000+
   '03018_W_Constructor should be public'#000+
   '03019_W_Destructor should be public'#000+
-  '03','020_N_Class should have one destructor only'#000+
+  '03020_N_Class should have one destructor only'#000+
   '03021_E_Local class definitions are not allowed'#000+
-  '03022_F_Anonym class definitions are not allowed'#000+
+  '03022_F_Anonym class definition','s are not allowed'#000+
   '03023_E_The object $1 has no VMT'#000+
   '03024_E_Illegal parameter list'#000+
-  '03025_E_Wrong parameter type specif','ied for arg no. $1'#000+
+  '03025_E_Wrong parameter type specified for arg no. $1'#000+
   '03026_E_Wrong amount 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+
+  '03028_E_o','verloaded functions have the same parameter list'#000+
   '03029_E_function header doesn'#039't match the forward declaration $1'#000+
-  '030','30_E_function header $1 doesn'#039't match forward : var name chan'+
-  'ges $2 => $3'#000+
-  '03031_N_Values in enumeration types have to be ascending'#000+
+  '03030_E_function header $1 doesn'#039't match forward : var name change'+
+  's $2 => $3'#000+
+  '03031_N_Values in enumeration types have to be as','cending'#000+
   '03032_N_Interface and implementation names are different $1 => $2'#000+
-  '03033_E_With can not be used for variables ','in a different segment'#000+
+  '03033_E_With can not be used for variables in a different segment'#000+
   '03034_E_function nesting > 31'#000+
   '03035_E_range check error while evaluating constants'#000+
-  '03036_W_range check error while evaluating constants'#000+
+  '03036_W_range che','ck error while evaluating constants'#000+
   '03037_E_duplicate case label'#000+
-  '03038_E_Upper bound of case range is less than lower',' bound'#000+
+  '03038_E_Upper bound of case range is less than lower bound'#000+
   '03039_E_typed constants of classes are not allowed'#000+
-  '03040_E_functions variables of overloaded functions are not allowed'#000+
+  '03040_E_functions variables of overloaded functions are not allow','ed'#000+
   '03041_E_string length must be a value from 1 to 255'#000+
-  '03042_W_use extended syntax of NEW and DISPOSE for instances o','f obje'+
-  'cts'#000+
+  '03042_W_use extended syntax of NEW and DISPOSE for instances of object'+
+  's'#000+
   '03043_W_use of NEW or DISPOSE for untyped pointers is meaningless'#000+
-  '03044_E_use of NEW or DISPOSE is not possible for untyped pointers'#000+
+  '03044_E_use of NEW or DISPOSE is not possible f','or untyped pointers'#000+
   '03045_E_class identifier expected'#000+
   '03046_E_type identifier not allowed here'#000+
-  '03047_E_method identif','ier expected'#000+
+  '03047_E_method identifier expected'#000+
   '03048_E_function header doesn'#039't match any method of this class $1'#000+
   '03049_P_procedure/function $1'#000+
-  '03050_E_Illegal floating point constant'#000+
+  '03050_E_Illega','l floating point constant'#000+
   '03051_E_FAIL can be used in constructors only'#000+
   '03052_E_Destructors can'#039't have parameters'#000+
-  '030','53_E_Only class methods can be referred with class references'#000+
+  '03053_E_Only class methods can be referred with class references'#000+
   '03054_E_Only class methods can be accessed in class methods'#000+
-  '03055_E_Constant and CASE types do not match'#000+
+  '0','3055_E_Constant and CASE types do not match'#000+
   '03056_E_The symbol can'#039't be exported from a library'#000+
-  '03057_W_An inherited ','method is hidden by $1'#000+
+  '03057_W_An inherited method is hidden by $1'#000+
   '03058_E_There is no method in an ancestor class to be overridden: $1'#000+
-  '03059_E_No member is provided to access property'#000+
+  '03059_E_No member is provided t','o access property'#000+
   '03060_W_Stored prorperty directive is not yet implemented'#000+
-  '03061_E_Illegal symbol for property acces','s'#000+
+  '03061_E_Illegal symbol for property access'#000+
   '03062_E_Cannot access a protected field of an object here'#000+
   '03063_E_Cannot access a private field of an object here'#000+
-  '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+
+  '03064_W','_overloaded method of virtual method should be virtual: $1'#000+
+  '03065_W_overloaded method of non-virtual method should be non-virtual:'+
+  ' $1'#000+
   '03066_E_overloaded methods which are virtual must have the same return'+
   ' type: $1'#000+
-  '03067_E_EXPORT declared functions can'#039't be nested'#000+
+  '03067_E_EXPORT declared fun','ctions 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',' expecte'+
-  'd $2'#000+
+  '03069_E_call by var parameters have to match exactly: Got $1 expected '+
+  '$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+
+  '03072_E_method','s can be only in other methods called direct with type'+
+  ' identifier of the class'#000+
   '03073_E_Illegal use of '#039':'#039#000+
-  '03074_E_ran','ge 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+
+  '03076_E_Expression must be co','nstructor call'#000+
   '03077_E_Expression must be destructor call'#000+
   '03078_E_Illegal order of record elements'#000+
-  '03079_E_Expression',' type must be class or record type'#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+
+  '03081_E_constructors and destructors must be met','hods'#000+
   '03082_E_Operator is not overloaded'#000+
   '03083_E_Impossible to overload assignment for equal types'#000+
-  '03084_E_Impossible ','operator overload'#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+
+  'c','lass'#000+
   '03087_E_Assembler incompatible with function return type'#000+
   '03088_E_Procedure overloading is switched off'#000+
-  '03089_E_I','t is not possible to overload this operator (overload = ins'+
-  'tead)'#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+
+  '0','3091_E_Only virtual methods can be abstract'#000+
   '03092_F_Use of unsupported feature!'#000+
-  '03093_E_The mix of CLASSES and OBJECT','S isn'#039't allowed'#000+
+  '03093_E_The mix of CLASSES and OBJECTS 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+
+  '03095_E_absolute can only be associated to ONE va','riable'#000+
   '03096_E_absolute can only be associated a var or const'#000+
   '03097_E_Only ONE variable can be initialized'#000+
-  '03098_E_Ab','stract methods shouldn'#039't have any definition (with fun'+
-  'ction body)'#000+
-  '03099_E_This overloaded function can'#039't be local (must be exported)'+
-  #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 ','exporte'+
+  'd)'#000+
   '03100_W_Virtual methods are used without a constructor in $1'#000+
   '03101_M_Macro defined: $1'#000+
-  '03102_M_Macro undefi','ned: $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+
+  '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 foun','d to override'#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+
+  '03111_E_The defaul','t 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 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 t'+
-  'he class as ancestor'#000+
+  '03115_E_Forward declarat','ion of class $1 must be resolved here to use'+
+  ' the class as ancestor'#000+
   '03116_E_Local operators not supported'#000+
-  '03117_E_Proc','edure 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+
+  '03','119_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 proce','dure/function'#000+
   '03124_W_Inlining disabled'#000+
   '03125_I_Writing Browser log $1'#000+
-  '03126_H_may be pointer dereference is missing'#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 hav','e a default value'#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+
+  '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+
+  '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+
+  '03139_E_Invalid floating po','int 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_str','ing length is larger than array of char length'#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. parameter'#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 be only an explicit par','ameter in message handlers'#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+
+  '03148_F_Direct assembler not supported for binar','y 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+
+  '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 static or global'#000+
+  '031','52_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 t','he 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+
+  '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+
+  '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+
+  '03160_E_No DEFFILE entry can be generated for unit global va','rs'#000+
   '03161_E_Compile without -WD option'#000+
   '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this mod'+
   'ule'#000+
-  '04000','_E_Type mismatch'#000+
-  '04001_E_Incompatible types: got "$1" expected "$2"'#000+
+  '03163_E_Can'#039't export with index under $1'#000+
+  '03164_E_Exporting of variables is not supported under $1'#000+
+  '04000_E_Type mismatch'#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_Bool','ean expression expected, but got "$1"'#000+
+  '04006_E_Boolean expression expected, ','but got "$1"'#000+
   '04007_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 ex','pression'#000+
-  '04012_E_Set elements are not compatible'#000+
+  '04011_E_Can'#039't evaluate constant expression'#000+
+  '04012_E_Set elem','ents are not compatible'#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_strin','g types doesn'#039't match, because of $V+ mode'#000+
+  '04016_E_string types doesn'#039't match, be','cause of $V+ mode'#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 u','ntyped file.'#000+
-  '04021_E_Type conflict between set elements'#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+
   '04023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type $1 in array constructor'#000+
-  '04025_E_Incompatible type for arg n','o. $1: Got $2, expected $3'#000+
+  '04025_E_Incompatible type for arg no. $1: Got $2, expected $','3'#000+
   '04026_E_Method (variable) and Procedure (variable) are not compatible'#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+
-  '0403','0_E_Can'#039't assign local procedure/function to procedure varia'+
+  '04030_E_Can'#039't assign local pr','ocedure/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+
   '05000_E_Identifier not found $1'#000+
-  '05001_F_Internal Error in Sy','mTableStack()'#000+
-  '05002_E_Duplicate identifier $1'#000+
+  '05001_F_Internal Error in SymTableStack()'#000+
+  '05002_E_Dup','licate 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_Error in type definition'#000+
+  '05008_E_Type i','dentifier 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 ex','pected'#000+
-  '05013_E_Instances of classes or objects with an abstract method are no'+
-  't allowed'#000+
+  '05012_F_record or class type expected'#000+
+  '05013_E_Instances ','of classes 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+
+  '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
+  '05018_E_Label not f','ound'#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+
+  '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_Priv','ate field $1.$2 is assigned but never used'#000+
+  '05030_N_Private field $1.$2 is assign','ed 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 re','cord 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.',' 2GB)'#000+
-  '06000_E_BREAK not allowed'#000+
+  '05040_E_Data segment too large (max. 2GB)'#000+
+  '06000_E_BREAK not a','llowed'#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 rang','e limit'#000+
-  '06007_E_Illegal counter variable'#000+
+  '06006_E_High range limit < low range limit'#000+
+  '06007_E_Illegal c','ounter 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 porta','ble acr'+
-  'oss platforms'#000+
-  '06012_E_File types must be var parameters'#000+
+  '06011_D_Conversion between ordinals and pointers is not portable acros'+
+  's platforms'#000+
+  '0601','2_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+
+  '06016_W_Possible illegal call of constructor or destru','ctor (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 getflo','atreg(), allocation failure'#000+
+  '06021_F_Internal Error in getfloatreg(), allocation failu','re'#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_Regis','ter $1 weight $2 $3'#000+
-  '06028_E_Stack limit excedeed in local routine'#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_Procvar calls ','can'#039't be inline.'#000+
-  '06033_E_No code for inline procedure stored'#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 ex','clude not implemented in this case'#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_Control flow statem','ents aren'#039't allowed in a finally bloc'+
+  '06040_E_Control flow statements aren'#039't allowed in a ','finally bloc'+
   'k'#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 building record offs','et'#000+
-  '07005_E_OFFSET used without identifier'#000+
+  '07004_E_Error building record offset'#000+
+  '07005_E_OFFSET used wi','thout 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 relocatable symbols'#000+
-  '0','7011_E_Relocatable symbol can only be added'#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/labels aren'#039't allow','ed as references'#000+
-  '07017_E_Invalid base and index register usage'#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_Invalid string as',' opcode operand: $1'#000+
-  '07023_W_@CODE and @DATA not supported'#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 symbol reference'#000,
-  '07029_W_Fwait can cause emulation problems with emu387'#000+
+  '07028_E_Invalid symbol reference'#000+
+  '07029_W_Fwait can cause e','mulation 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_Unsupported symbo','l type for operand'#000+
-  '07034_E_Constant value out of bounds'#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+
-  '07040_W_$1 ','is associated to an overloaded function'#000+
+  '07040_W_$1 is associated to an overl','oaded function'#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 de','stination or source size do not match'#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 combination of opcode and operands'#000+
   '07049_E_Assemler syntax error in operand'#000+
-  '07050_E_Assemle','r syntax error in constant'#000+
+  '07050_E_Assemler syntax error in constan','t'#000+
   '07051_E_Invalid String expression'#000+
   '07052_bit constant created for 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 combin','ation of override and opcode: $1'#000+
+  '07056_E_Invalid combination of override and opc','ode: $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_Undefined local symbol $1'#000+
   '07062_E_Unknown label identifier $1'#000+
-  '07063_E_Invalid register nam','e'#000+
-  '07064_E_Invalid floating point register name'#000+
+  '07063_E_Invalid register name'#000+
+  '07064_E_Invalid floatin','g 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+
   '07069_E_Wrong symbol type'#000+
-  '07070_E_Cannot index a loca','l var or parameter with a register'#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 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+
+  '07075_E_assembler code not returned to text section'#000+
+  '07076_E_Not a dir','ective 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+
   '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+
+  '07080_N_.align is target specific, use .balign or .p2align'#000+
+  '07081_E_Can'#039't a','ccess fields directly for parameters'#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+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Selected assembler output not supported'#000+
+  '08001_F_Selected assembler output not s','upported'#000+
   '08002_F_Comp not supported'#000+
-  '08003_F_Direct',' not support for binary writers'#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+
-  '08008_E_Asm: 16 Bit r','eferences not supported'#000+
+  '08007_E_Asm: $1 invalid combin','ation 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 range $1'#000+
+  '08012_E_Asm: Short jump is out of range $1',#000+
   '08013_E_Asm: Undefined label $1'#000+
-  '09000_W_Source op','erating system redefined'#000+
+  '09000_W_Source operating system redefined'#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+
+  '09005_W_Assembler $1 n','ot 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 a'+
   'ssembling'#000+
   '09009_I_Assembling $1'#000+
-  '09010_I_Assembling smartlink $1'#000+
-  '09011_W_Object $1 not found, Linking may fail ','!'#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 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+
+  '09016_W_Util $1 not found, swit','ching to external linking'#000+
   '09017_T_Using util $1'#000+
-  '09','018_E_Creation of Executables 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+
+  '09021_W_resource compiler not found, switching to external mo','de'#000+
   '09022_I_Compiling resource $1'#000+
-  '09023_F_Can'#039't pos','t process executable $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 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+
+  '09023_F_Can'#039't post process executable $1'#000+
   '09024_F_Can'#039't open executable $1'#000+
   '09025_X_Size of Code: $1 bytes'#000+
-  '09026_X_Size of initialized data: $1 bytes'#000+
+  '09026_X_Size of initialized data: $1 bytes'#000,
   '09027_X_Size of uninitialized data: $1 bytes'#000+
   '09028_X_Stack space reserved: $1 bytes'#000+
-  '09029_X_Stack space commi','ted: $1 bytes'#000+
+  '09029_X_Stack 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+
   '10004_U_PPU Crc: $1'#000+
-  '10005_U_PPU Time: $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+
-  '10008_U_PPU Invalid ','Version $1'#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+
+  '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+
-  '1','0016_F_Invalid PPU-File entry: $1'#000+
+  '10016_F_Invalid PPU-File entry: $1'#000+
   '10017_F_PPU Dbx count problem'#000+
   '10018_E_Illegal unit name: $1'#000+
   '10019_F_Too much units'#000+
-  '10020_F_Circular unit reference between $1 and $2'#000+
+  '10020_F_Circul','ar 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 un','it $1'#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+
+  '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+
-  '1002','8_U_Recompiling $1, checksum changed for $2'#000+
+  '10028_U_Recompiling $1, checksum changed for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
-  '10030_U_Recompiling unit, static lib is older than ppufile'#000+
+  '10030_U_Recompiling unit, static lib is older',' than ppufile'#000+
   '10031_U_Recompiling unit, shared lib is older than ppufile'#000+
-  '10032_U_Recompiling unit, obj and as','m are older than ppufile'#000+
+  '10032_U_Recompiling unit, obj and asm are older than ppufile'#000+
   '10033_U_Recompiling unit, obj is older than asm'#000+
   '10034_U_Parsing interface of $1'#000+
-  '10035_U_Parsing implementation of $1'#000+
+  '10035_U_Parsing implementa','tion of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '11000_$1 [options] <inputfile> [','options]'#000+
+  '10038_H_Conditional $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] <inp','utfile> [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 inside $1 config file'#000+
-  '11006_E_Illega','l parameter: $1'#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+
   '11011_W_Target is already set to: $1'#000+
-  '11012_W_Shared libs not supported on DOS platform,',' reverting to stat'+
+  '11012_W_Shared 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+
@@ -569,11 +589,11 @@ const msgtxt : array[0..000126,1..240] of char=(
   '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+
+  '110','18_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 compatible with "$2"'#000+
-  '11022_W_"$1" ass','embler use forced'#000+
+  '11022_W','_"$1" assembler use forced'#000+
   '11023_Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#010+
   'Copyright (c) 1993-2000 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVER'#010+
@@ -581,25 +601,25 @@ const msgtxt : array[0..000126,1..240] of char=(
   'Compiler Date  : $FPCDATE'#010+
   'Compiler Target: $FPCTARGET'#010+
   #010+
-  'This progr','am comes under the GNU General Public Licence'#010+
+  'T','his program comes under the GNU General Public 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_th','e compiler doesn'#039't delete the generated assembler file'#010+
+  'ble i','t'#010+
+  '**1a_the compiler doesn'#039't delete the generated 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 brows','er info'#010+
+  '**1b_gener','ate browser info'#010+
   '**2bl_generate local symbol 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 stag','e'#010+
+  '**2Cn_omit lin','king stage'#010+
   '**2Co_check overflow of integer operations'#010+
   '**2Cr_range checking'#010+
   '**2Cs<n>_set stack size to <n>'#010+
@@ -607,27 +627,27 @@ const msgtxt : array[0..000126,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 output',' 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 outp','ut 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 pointer','s'#010+
+  '*g2gc_generate checks fo','r pointers'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
@@ -636,101 +656,101 @@ const msgtxt : array[0..000126,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 assembl','er 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 (defa','ult 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 (des','tructor 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+
   '**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 verbo','se. <x> is a combination of the following letters:'#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 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*','_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*_a : Show everything             0 : Show nothing (except error','s'+
+  '**2*_a : Show everything             0 : Show nothing (exc','ept errors'+
   ')'#010+
   '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#010+
   '**2*_    declarations 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 fr','om executable'#010+
+  '**2Xs_strip all s','ymbols from executable'#010+
   '**2XD_try to link dynamic          (defines FPC_LINK_DYNAMIC)'#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>_ou','tput format:'#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*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
-  '3*2Amasm_obj file using Masm (','Microsoft)'#010+
+  '3*2Amasm_obj file usi','ng Masm (Microsoft)'#010+
   '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Acoff_coff (Go32v2) using 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 ass','embler'#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_generate faster code (default)'#010+
   '3*2Or_keep certain variables in registers'#010+
-  '3*2Ou_enable uncertain optimizations (see doc','s)'#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 (same as -O2u)'#010+
   '3*2Op<x>_target processor:'#010+
   '3*3Op1_set target processor to 386/486'#010+
-  '3*3Op2_set target pro','cessor to Pentium/PentiumMMX (tm)'#010+
+  '3*3Op2_set t','arget 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*2TGO32V1_version 1 of DJ Delorie DOS extender'#010+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#010+
-  '3*2TLINUX_Linux'#010+
-  '3*2Tnet','ware_Novell Netware Module (experimental)'#010+
+  '3*2TLINUX_Linu','x'#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 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 o','f DLL or EXE'#010+
+  '3*2WD_Use DEFFILE to export fu','nctions of DLL or EXE'#010+
   '3*2WG_Specify graphic type application'#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*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 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*2O2_set target proc','essor to a MC68020+'#010+
   '6*1R<x>_assembler reading style:'#010+
   '6*2RMOT_read motorola style assembler'#010+
   '6*1T<x>_Target operating system:'#010+
@@ -739,6 +759,6 @@ const msgtxt : array[0..000126,1..240] of char=(
   '6*2TMACOS_Macintosh m68k'#010+
   '6*2TLINUX_Linux-68k'#010+
   '**1*_'#010+
-  '**1?_shows this help'#010+
-  '*','*1h_shows this help without waiting'#000
+  '**1?_shows th','is help'#010+
+  '**1h_shows this help without waiting'#000
 );

+ 8 - 5
compiler/options.pas

@@ -705,10 +705,10 @@ begin
               'S' : begin
                       for j:=1 to length(more) do
                        case more[j] of
-                        '2' : initmodeswitches:=objfpcmodeswitches;
+                        '2' : SetCompileMode('OBJFPC');
                         'a' : initlocalswitches:=InitLocalswitches+[cs_do_assertion];
                         'c' : initmoduleswitches:=initmoduleswitches+[cs_support_c_operators];
-                        'd' : initmodeswitches:=delphimodeswitches;
+                        'd' : SetCompileMode('DELPHI');
                         'e' : begin
                                 SetErrorFlags(more);
                                 break;
@@ -717,8 +717,8 @@ begin
                         'h' : initlocalswitches:=initlocalswitches+[cs_ansistrings];
                         'i' : initmoduleswitches:=initmoduleswitches+[cs_support_inline];
                         'm' : initmoduleswitches:=initmoduleswitches+[cs_support_macro];
-                        'o':  initmodeswitches:=tpmodeswitches;
-                        'p' : initmodeswitches:=gpcmodeswitches;
+                        'o' : SetCompileMode('TP');
+                        'p' : SetCompileMode('GPC');
                         's' : initglobalswitches:=initglobalswitches+[cs_constructor_name];
                         't' : initmoduleswitches:=initmoduleswitches+[cs_static_keyword];
                         'v' : Message1(option_obsolete_switch,'-Sv');
@@ -1490,7 +1490,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.9  2000-09-24 15:06:20  peter
+  Revision 1.10  2000-09-24 21:33:47  peter
+    * message updates merges
+
+  Revision 1.9  2000/09/24 15:06:20  peter
     * use defines.inc
 
   Revision 1.8  2000/09/18 12:28:41  marco

+ 7 - 8
compiler/pmodules.pas

@@ -901,7 +901,7 @@ implementation
         { can't have local browser when no global browser }
         if (cs_local_browser in aktmoduleswitches) and
            not(cs_browser in aktmoduleswitches) then
-          aktmoduleswitches:=aktmoduleswitches-[cs_local_browser];
+          exclude(aktmoduleswitches,cs_local_browser);
 
         { define a symbol in delphi,objfpc,tp,gpc mode }
         if (m_delphi in aktmodeswitches) then
@@ -915,10 +915,6 @@ implementation
         else
          if (m_gpc in aktmodeswitches) then
           def_symbol('FPC_GPC');
-
-        { turn ansistrings on by default ? }
-        if (m_default_ansistring in aktmodeswitches) then
-          aktlocalswitches:=aktlocalswitches+[cs_ansistrings];
       end;
 
 
@@ -1384,12 +1380,12 @@ implementation
   {$ifndef Dont_use_double_checksum}
          if not(cs_compilesystem in aktmoduleswitches) then
            if store_interface_crc<>current_module^.interface_crc then
-             Do_comment(V_Warning,current_module^.ppufilename^+' Interface CRC changed '+
+             Comment(V_Warning,current_module^.ppufilename^+' Interface CRC changed '+
                tostr(store_crc)+'<>'+tostr(current_module^.interface_crc));
   {$ifdef EXTDEBUG}
          if not(cs_compilesystem in aktmoduleswitches) then
            if (store_crc<>current_module^.crc) and simplify_ppu then
-             Do_comment(V_Warning,current_module^.ppufilename^+' implementation CRC changed '+
+             Comment(V_Warning,current_module^.ppufilename^+' implementation CRC changed '+
                tostr(store_crc)+'<>'+tostr(current_module^.interface_crc));
   {$endif EXTDEBUG}
   {$endif ndef Dont_use_Double_checksum}
@@ -1714,7 +1710,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.10  2000-09-24 15:06:22  peter
+  Revision 1.11  2000-09-24 21:33:47  peter
+    * message updates merges
+
+  Revision 1.10  2000/09/24 15:06:22  peter
     * use defines.inc
 
   Revision 1.9  2000/08/31 07:53:02  michael

+ 16 - 3
compiler/psub.pas

@@ -1281,8 +1281,18 @@ begin
                    if (hd^.proccalloptions-[pocall_internconst,pocall_internproc]<>
                        aktprocsym^.definition^.proccalloptions-[pocall_internconst,pocall_internproc]) then
                     begin
-                      { only trigger an error, becuase it doesn't hurt }
-                      MessagePos(aktprocsym^.definition^.fileinfo,parser_e_call_convention_dont_match_forward);
+                      { only trigger an error, becuase it doesn't hurt, for delphi check
+                        if the current implementation has no proccalloptions, then
+                        take the options from the interface }
+                      if (m_delphi in aktmodeswitches) then
+                       begin
+                         if (aktprocsym^.definition^.proccalloptions=[]) then
+                          aktprocsym^.definition^.proccalloptions:=hd^.proccalloptions
+                         else
+                          MessagePos(aktprocsym^.definition^.fileinfo,parser_e_call_convention_dont_match_forward);
+                       end
+                      else
+                       MessagePos(aktprocsym^.definition^.fileinfo,parser_e_call_convention_dont_match_forward);
                       { set the mangledname to the interface name so it doesn't trigger
                         the Note about different manglednames (PFV) }
                       aktprocsym^.definition^.setmangledname(hd^.mangledname);
@@ -2077,7 +2087,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.14  2000-09-24 21:19:51  peter
+  Revision 1.15  2000-09-24 21:33:47  peter
+    * message updates merges
+
+  Revision 1.14  2000/09/24 21:19:51  peter
     * delphi compile fixes
 
   Revision 1.13  2000/09/24 15:06:24  peter

+ 5 - 2
compiler/ra386.pas

@@ -206,7 +206,7 @@ begin
                     operands[i]^.size:=opsize
                   else
                    begin
-                     Comment(V_Error,'No size specified and unable to determine the size of the operands');
+                     Message(asmr_e_unable_to_determine_reference_size);
                      { recovery }
                      operands[i]^.size:=S_L;
                    end;
@@ -456,7 +456,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.5  2000-09-24 15:06:25  peter
+  Revision 1.6  2000-09-24 21:33:47  peter
+    * message updates merges
+
+  Revision 1.5  2000/09/24 15:06:25  peter
     * use defines.inc
 
   Revision 1.4  2000/09/16 12:22:52  peter

+ 11 - 24
compiler/scandir.inc

@@ -366,7 +366,7 @@ const
                   current_scanner^.skipspace;
                   hs:=current_scanner^.readid;
                   if (length(hs)>1) then
-                   Message(scan_w_illegal_switch)
+                   Message1(scan_w_illegal_switch,hs)
                   else
                    begin
                      state:=current_scanner^.ReadState;
@@ -497,7 +497,7 @@ const
               begin
                 current_scanner^.readchar;
                 if c='=' then
-                  Comment(V_Warning,'Marco support has been turned off');
+                  Message(scan_w_macro_support_turned_off);
               end;
           end;
       end;
@@ -941,7 +941,7 @@ const
             if set_string_asm(current_scanner^.readid) then
              aktoutputformat:=target_asm.id
             else
-             Message(scan_w_illegal_switch);
+             Message1(scan_w_illegal_switch,pattern);
           end;
       end;
 
@@ -1002,26 +1002,10 @@ const
           begin
             current_scanner^.skipspace;
             current_scanner^.readstring;
-            if pattern='DEFAULT' then
-             aktmodeswitches:=initmodeswitches
-            else
-             if pattern='DELPHI' then
-              aktmodeswitches:=delphimodeswitches
-            else
-             if pattern='TP' then
-              aktmodeswitches:=tpmodeswitches
-            else
-             if pattern='FPC' then
-              aktmodeswitches:=fpcmodeswitches
-            else
-             if pattern='OBJFPC' then
-              aktmodeswitches:=objfpcmodeswitches
-            else
-             if pattern='GPC' then
-              aktmodeswitches:=gpcmodeswitches
-            else
-             Message(scan_w_illegal_switch);
+            if not SetCompileMode(pattern) then
+             Message1(scan_w_illegal_switch,pattern);
           end;
+
       end;
 
 
@@ -1452,7 +1436,10 @@ const
 
 {
   $Log$
-  Revision 1.7  2000-09-24 15:06:27  peter
+  Revision 1.8  2000-09-24 21:33:47  peter
+    * message updates merges
+
+  Revision 1.7  2000/09/24 15:06:27  peter
     * use defines.inc
 
   Revision 1.6  2000/09/11 17:00:23  florian
@@ -1472,4 +1459,4 @@ const
   Revision 1.2  2000/07/13 11:32:49  michael
   + removed logs
 
-}
+}

+ 11 - 8
compiler/symppu.inc

@@ -521,15 +521,15 @@
            { if we don't have the sources why tell }
               if current_module^.sources_avail then
 {$endif ndef EXTDEBUG}
-               if not was_defined_at_startup and was_used and
-                 mac^.defined_at_startup then
-                 Comment(V_Hint,'Conditional '+hs+' was not set at startup '+
-                 'in last compilation of '+current_module^.mainsource^);
+               if (not was_defined_at_startup) and
+                  was_used and
+                  mac^.defined_at_startup then
+                Message2(unit_h_cond_not_set_in_last_compile,hs,current_module^.mainsource^);
              end
            else { not assigned }
-             if was_defined_at_startup and was_used then
-               Comment(V_Hint,'Conditional '+hs+' was set at startup '+
-               'in last compilation of '+current_module^.mainsource^);
+             if was_defined_at_startup and
+                was_used then
+              Message2(unit_h_cond_not_set_in_last_compile,hs,current_module^.mainsource^);
          end;
       end;
 
@@ -736,7 +736,10 @@
 
 {
   $Log$
-  Revision 1.3  2000-09-21 20:56:19  pierre
+  Revision 1.4  2000-09-24 21:33:47  peter
+    * message updates merges
+
+  Revision 1.3  2000/09/21 20:56:19  pierre
    * fix for bugs 1084/1128 (merged)
 
   Revision 1.2  2000/07/13 11:32:49  michael

+ 6 - 3
compiler/t_fbsd.pas

@@ -121,7 +121,7 @@ begin
   { first test the index value }
   if (hp^.options and eo_index)<>0 then
    begin
-     Comment(V_Error,'can''t export with index under linux');
+     Message1(parser_e_no_export_with_index_for_target,'freebsd');
      exit;
    end;
   { use pascal name is none specified }
@@ -182,7 +182,7 @@ begin
 {$endif i386}
       end
      else
-      Comment(V_Error,'Exporting of variables is not supported under linux');
+      Message1(parser_e_no_export_of_variables_for_target,'freebsd');
      hp2:=pexported_item(hp2^.next);
    end;
 end;
@@ -457,7 +457,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.2  2000-09-24 15:12:12  peter
+  Revision 1.3  2000-09-24 21:33:47  peter
+    * message updates merges
+
+  Revision 1.2  2000/09/24 15:12:12  peter
     * renamed to be 8.3
 
   Revision 1.2  2000/09/16 12:24:00  peter

+ 7 - 4
compiler/t_linux.pas

@@ -120,7 +120,7 @@ begin
   { first test the index value }
   if (hp^.options and eo_index)<>0 then
    begin
-     Comment(V_Error,'can''t export with index under linux');
+     Message1(parser_e_no_export_with_index_for_target,'linux');
      exit;
    end;
   { use pascal name is none specified }
@@ -181,7 +181,7 @@ begin
 {$endif i386}
       end
      else
-      Comment(V_Error,'Exporting of variables is not supported under linux');
+      Message1(parser_e_no_export_of_variables_for_target,'linux');
      hp2:=pexported_item(hp2^.next);
    end;
 end;
@@ -455,7 +455,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.6  2000-09-24 15:06:31  peter
+  Revision 1.7  2000-09-24 21:33:47  peter
+    * message updates merges
+
+  Revision 1.6  2000/09/24 15:06:31  peter
     * use defines.inc
 
   Revision 1.5  2000/09/10 20:26:55  peter
@@ -471,4 +474,4 @@ end.
   Revision 1.2  2000/07/13 11:32:50  michael
   + removed logs
 
-}
+}

+ 37 - 1
compiler/verbose.pas

@@ -244,8 +244,38 @@ begin
 end;
 
 
+procedure LoadPrefixes;
+
+  function loadprefix(w:longint):string;
+  var
+    s : string;
+    idx : longint;
+  begin
+    s:=msg^.get(w);
+    idx:=pos('_',s);
+    if idx>0 then
+     LoadPrefix:=Copy(s,idx+1,255)
+    else
+     LoadPrefix:=s;
+  end;
+
+begin
+{ Load the prefixes }
+  fatalstr:=LoadPrefix(general_i_fatal);
+  errorstr:=LoadPrefix(general_i_error);
+  warningstr:=LoadPrefix(general_i_warning);
+  notestr:=LoadPrefix(general_i_note);
+  hintstr:=LoadPrefix(general_i_hint);
+end;
+
+
 procedure LoadMsgFile(const fn:string);
 begin
+  { reload the internal messages if not already loaded }
+{$ifndef EXTERN_MSG}
+  if not msg^.msgintern then
+   msg^.LoadIntern(@msgtxt,msgtxtsize);
+{$endif}
   if not msg^.LoadExtern(fn) then
    begin
 {$ifdef EXTERN_MSG}
@@ -255,6 +285,8 @@ begin
      msg^.LoadIntern(@msgtxt,msgtxtsize);
 {$endif}
    end;
+  { reload the prefixes using the new messages }
+  LoadPrefixes;
 end;
 
 
@@ -568,6 +600,7 @@ begin
   FillChar(Status,sizeof(TCompilerStatus),0);
   status.verbosity:=V_Default;
   Status.MaxErrorCount:=50;
+  LoadPrefixes;
 end;
 
 
@@ -583,7 +616,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.5  2000-09-24 15:06:33  peter
+  Revision 1.6  2000-09-24 21:33:48  peter
+    * message updates merges
+
+  Revision 1.5  2000/09/24 15:06:33  peter
     * use defines.inc
 
   Revision 1.4  2000/08/27 16:11:55  peter