瀏覽代碼

* detect arithmetic overflows for constants at compile time
* use try..except instead of setjmp

peter 20 年之前
父節點
當前提交
d3b559cfcc
共有 8 個文件被更改,包括 613 次插入887 次删除
  1. 13 32
      compiler/catch.pas
  2. 59 78
      compiler/compiler.pas
  3. 4 1
      compiler/msg/errore.msg
  4. 4 2
      compiler/msgidx.inc
  5. 313 309
      compiler/msgtxt.inc
  6. 80 17
      compiler/nadd.pas
  7. 140 177
      compiler/parser.pas
  8. 0 271
      compiler/tpexcept.pas

+ 13 - 32
compiler/catch.pas

@@ -25,14 +25,6 @@ Unit catch;
 
 {$i fpcdefs.inc}
 
-{$ifdef go32v2}
-  { go32v2 stack check goes nuts if ss is not the data selector (PM) }
-  {$S-}
-{$endif}
-{$ifdef watcom} // wiktor: pewnei nie potrzeba
-  {$S-}
-{$endif}
-
 {$ifdef DEBUG}
   {$define NOCATCH}
 {$endif DEBUG}
@@ -61,14 +53,17 @@ uses
 
 {$ifdef has_signal}
 Var
-  NewSignal,OldSigSegm,
-  OldSigInt,OldSigFPE : SignalHandler;
+  NewSignal,
+  OldSigInt : SignalHandler;
 {$endif}
 
 Const in_const_evaluation : boolean = false;
 
 Implementation
 
+uses
+  sysutils;
+
 {$ifdef has_signal}
 {$ifdef unix}
 Procedure CatchSignal(Sig : Longint);cdecl;
@@ -77,22 +72,8 @@ Function CatchSignal(Sig : longint):longint;
 {$endif}
 begin
   case Sig of
-   SIGSEGV : begin
-             { Temporary message - until we get an error number... }
-               writeln ('Panic : Internal compiler error, exiting.');
-               internalerror(9999);
-             end;
-    SIGFPE : begin
-               If in_const_evaluation then
-                 Writeln('FPE error computing constant expression')
-               else
-                 Writeln('FPE error inside compiler');
-               Stop(1);
-             end;
-    SIGINT : begin
-               WriteLn('Ctrl-C Signaled!');
-               Stop(1);
-             end;
+    SIGINT :
+      raise Exception.Create('Ctrl-C Signaled!');
   end;
 {$ifndef unix}
   CatchSignal:=0;
@@ -104,18 +85,18 @@ begin
 {$ifndef nocatch}
   {$ifdef has_signal}
     NewSignal:=SignalHandler(@CatchSignal);
-    {$ifndef sunos}
-      OldSigSegm:={$ifdef havelinuxrtl10}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif} (SIGSEGV,NewSignal);
-    {$endif} // lxrun on solaris hooks this for handling linux-calls!
-     OldSigInt:={$ifdef havelinuxrtl10}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif}  (SIGINT,NewSignal);
-     OldSigFPE:={$ifdef havelinuxrtl10}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif}  (SIGFPE,NewSignal);
+    OldSigInt:={$ifdef havelinuxrtl10}Signal{$else}{$ifdef Unix}fpSignal{$else}Signal{$endif}{$endif}  (SIGINT,NewSignal);
   {$endif}
 {$endif nocatch}
 end.
 
 {
   $Log$
-  Revision 1.20  2004-10-15 09:14:16  mazen
+  Revision 1.21  2005-01-26 16:23:28  peter
+    * detect arithmetic overflows for constants at compile time
+    * use try..except instead of setjmp
+
+  Revision 1.20  2004/10/15 09:14:16  mazen
   - remove $IFDEF DELPHI and related code
   - remove $IFDEF FPCPROCVAR and related code
 

+ 59 - 78
compiler/compiler.pas

@@ -122,9 +122,6 @@ uses
 {    dpmiexcp, }
   {$endif WATCOM}
 {$endif}
-{$ifdef USEEXCEPT}
-  tpexcept,
-{$endif USEEXCEPT}
 {$ifdef BrowserLog}
   browlog,
 {$endif BrowserLog}
@@ -132,6 +129,7 @@ uses
 {$ELSE USE_SYSUTILS}
   dos,
 {$ENDIF USE_SYSUTILS}
+  sysutils,
   verbose,comphook,systems,
   cutils,cclasses,globals,options,fmodule,parser,symtable,
   assemble,link,import,export,tokens,pass_1
@@ -245,16 +243,6 @@ var
   CompilerInited : boolean;
   olddo_stop : tstopprocedure;
 
-{$ifdef USEEXCEPT}
-procedure RecoverStop(err:longint);
-begin
-  if recoverpospointer<>nil then
-    LongJmp(recoverpospointer^,1)
-  else
-    Stop(err);
-end;
-{$endif USEEXCEPT}
-
 
 {****************************************************************************
                                 Compiler
@@ -286,10 +274,6 @@ begin
   DoneSymtable;
   DoneGlobals;
   donetokens;
-{$ifdef USEEXCEPT}
-  recoverpospointer:=nil;
-  longjump_used:=false;
-{$endif USEEXCEPT}
 end;
 
 
@@ -372,83 +356,80 @@ function Compile(const cmd:string):longint;
 
 var
   starttime  : real;
-{$ifdef USEEXCEPT}
-  recoverpos : jmp_buf;
-{$endif}
 {$ifdef HASGETHEAPSTATUS}
   hstatus : THeapStatus;
 {$endif HASGETHEAPSTATUS}
 begin
-  olddo_stop:=do_stop;
-  do_stop:=@minimal_stop;
-{ Initialize the compiler }
-  InitCompiler(cmd);
-
-{ show some info }
-  Message1(general_t_compilername,FixFileName(system.paramstr(0)));
-  Message1(general_d_sourceos,source_info.name);
-  Message1(general_i_targetos,target_info.name);
-  Message1(general_t_exepath,exepath);
-  WritePathList(general_t_unitpath,unitsearchpath);
-  WritePathList(general_t_includepath,includesearchpath);
-  WritePathList(general_t_librarypath,librarysearchpath);
-  WritePathList(general_t_objectpath,objectsearchpath);
-
-{$ifdef USEEXCEPT}
-  if setjmp(recoverpos)=0 then
-   begin
-     recoverpospointer:=@recoverpos;
-     do_stop:=@recoverstop;
-{$endif USEEXCEPT}
-     starttime:=getrealtime;
-{$ifdef PREPROCWRITE}
-     if parapreprocess then
-      parser.preprocess(inputdir+inputfile+inputextension)
-     else
-{$endif PREPROCWRITE}
-      parser.compile(inputdir+inputfile+inputextension);
-     if status.errorcount=0 then
-      begin
-        starttime:=getrealtime-starttime;
-        if starttime<0 then
-          starttime:=starttime+3600.0*24.0;
-        Message2(general_i_abslines_compiled,tostr(status.compiledlines),tostr(trunc(starttime))+
-          '.'+tostr(trunc(frac(starttime)*10)));
-      end;
-{$ifdef USEEXCEPT}
-    end;
-{$endif USEEXCEPT}
-
-{ Stop is always called, so we come here when a program is compiled or not }
-  do_stop:=olddo_stop;
-{ Stop the compiler, frees also memory }
-{ no message possible after this !!    }
-  DoneCompiler;
+  try
+    try
+       { Initialize the compiler }
+       InitCompiler(cmd);
+
+       { show some info }
+       Message1(general_t_compilername,FixFileName(system.paramstr(0)));
+       Message1(general_d_sourceos,source_info.name);
+       Message1(general_i_targetos,target_info.name);
+       Message1(general_t_exepath,exepath);
+       WritePathList(general_t_unitpath,unitsearchpath);
+       WritePathList(general_t_includepath,includesearchpath);
+       WritePathList(general_t_librarypath,librarysearchpath);
+       WritePathList(general_t_objectpath,objectsearchpath);
+
+       starttime:=getrealtime;
+
+       { Compile the program }
+  {$ifdef PREPROCWRITE}
+       if parapreprocess then
+        parser.preprocess(inputdir+inputfile+inputextension)
+       else
+  {$endif PREPROCWRITE}
+        parser.compile(inputdir+inputfile+inputextension);
+
+       { Show statistics }
+       if status.errorcount=0 then
+        begin
+          starttime:=getrealtime-starttime;
+          if starttime<0 then
+            starttime:=starttime+3600.0*24.0;
+          Message2(general_i_abslines_compiled,tostr(status.compiledlines),tostr(trunc(starttime))+
+            '.'+tostr(trunc(frac(starttime)*10)));
+        end;
+     finally
+       { no message possible after this !!    }
+       DoneCompiler;
+     end;
+  except
 
-{ Set the return value if an error has occurred }
-  if status.errorcount=0 then
-   Compile:=0
-  else
-   Compile:=1;
+    Message(general_e_compilation_aborted);
 
-  DoneVerbose;
+    DoneVerbose;
+
+    Raise;
+  end;
 {$ifdef SHOWUSEDMEM}
   {$ifdef HASGETHEAPSTATUS}
-    GetHeapStatus(hstatus);
-    Writeln('Max Memory used/heapsize: ',DStr(hstatus.MaxHeapUsed shr 10),'/',DStr(hstatus.MaxHeapSize shr 10),' Kb');
+      GetHeapStatus(hstatus);
+      Writeln('Max Memory used/heapsize: ',DStr(hstatus.MaxHeapUsed shr 10),'/',DStr(hstatus.MaxHeapSize shr 10),' Kb');
   {$else HASGETHEAPSTATUS}
-    Writeln('Memory used (heapsize): ',DStr(system.Heapsize shr 10),' Kb');
+      Writeln('Memory used (heapsize): ',DStr(system.Heapsize shr 10),' Kb');
   {$endif HASGETHEAPSTATUS}
 {$endif SHOWUSEDMEM}
-{$ifdef fixLeaksOnError}
-  do_stop;
-{$endif fixLeaksOnError}
+
+  { Set the return value if an error has occurred }
+  if status.errorcount=0 then
+    result:=0
+  else
+    result:=1;
 end;
 
 end.
 {
   $Log$
-  Revision 1.51  2005-01-09 20:24:43  olle
+  Revision 1.52  2005-01-26 16:23:28  peter
+    * detect arithmetic overflows for constants at compile time
+    * use try..except instead of setjmp
+
+  Revision 1.51  2005/01/09 20:24:43  olle
     * rework of macro subsystem
     + exportable macros for mode macpas
 

+ 4 - 1
compiler/msg/errore.msg

@@ -112,6 +112,7 @@ general_i_hint=01016_I_Hint:
 % Prefix for Hints
 general_e_path_does_not_exist=01017_E_Path "$1" does not exist
 % The specified path does not exist.
+general_e_compilation_aborted=01018_E_Compilation aborted
 % \end{description}
 #
 # Scanner
@@ -996,6 +997,8 @@ parser_w_implicit_uses_of_variants_unit=03211_W_Implicit uses of Variants unit
 parser_e_no_static_method_in_interfaces=03212_E_Class and static methods can't be used in INTERFACES
 % The specifier \var{class} and directive \var{static} can't be used in interfaces
 % because all methods of an interfaces must be public.
+parser_e_arithmetic_operation_overflow=03213_E_Overflow in arithmetic operation
+% An operation on two integers values produced an overflow
 % \end{description}
 #
 # Type Checking
@@ -2315,7 +2318,7 @@ S*2Tlinux_Linux
 **2*_l : Show linenumbers            r : Rhide/GCC compatibility mode
 **2*_a : Show everything             x : Executable info (Win32 only)
 **2*_v : write fpcdebug.txt with     p : Write tree.log with parse tree
-**2*_    lots of debugging info      
+**2*_    lots of debugging info
 3*1W<x>_Win32-like target options
 3*2WB<x>_Set Image base to Hexadecimal <x> value
 3*2WC_Specify console type application

+ 4 - 2
compiler/msgidx.inc

@@ -17,6 +17,7 @@ const
   general_i_note=01015;
   general_i_hint=01016;
   general_e_path_does_not_exist=01017;
+  general_e_compilation_aborted=01018;
   scan_f_end_of_file=02000;
   scan_f_string_exceeds_line=02001;
   scan_f_illegal_char=02002;
@@ -277,6 +278,7 @@ const
   parser_e_proc_already_external=03210;
   parser_w_implicit_uses_of_variants_unit=03211;
   parser_e_no_static_method_in_interfaces=03212;
+  parser_e_arithmetic_operation_overflow=03213;
   type_e_mismatch=04000;
   type_e_incompatible_types=04001;
   type_e_not_equal_types=04002;
@@ -648,9 +650,9 @@ const
   option_info=11024;
   option_help_pages=11025;
 
-  MsgTxtSize = 37912;
+  MsgTxtSize = 37975;
 
   MsgIdxMax : array[1..20] of longint=(
-    18,68,213,59,57,46,100,20,35,60,
+    19,68,214,59,57,46,100,20,35,60,
     40,1,1,1,1,1,1,1,1,1
   );

+ 313 - 309
compiler/msgtxt.inc

@@ -1,7 +1,7 @@
 {$ifdef Delphi}
-const msgtxt : array[0..000157] of string[240]=(
+const msgtxt : array[0..000158] of string[240]=(
 {$else Delphi}
-const msgtxt : array[0..000157,1..240] of char=(
+const msgtxt : array[0..000158,1..240] of char=(
 {$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
@@ -21,36 +21,37 @@ const msgtxt : array[0..000157,1..240] of char=(
   '01015_I_Note:'#000+
   '01016_I_Hint:'#000+
   '01017_E_Path "$1" does not exist'#000,
+  '01018_E_Compilation aborted'#000+
   '02000_F_Unexpected end of file'#000+
   '02001_F_String exceeds line'#000+
   '02002_F_illegal character "$1" ($2)'#000+
   '02003_F_Syntax error, "$1" expected but "$2" found'#000+
   '02004_TL_Start reading includefile $1'#000+
-  '02005_W_Comment level $1 found'#000+
-  '02008_N_Ignored compiler ','switch "$1"'#000+
+  '02005_W_Comment level $1 fou','nd'#000+
+  '02008_N_Ignored compiler switch "$1"'#000+
   '02009_W_Illegal compiler switch "$1"'#000+
   '02010_W_Misplaced global compiler switch'#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+
-  '02015_W_Records fields can be aligned to 1,2,4,8,16 or',' 32 bytes only'+
+  '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 $3 line $4'#000+
   '02018_E_Syntax error while parsing a conditional compiling expression'#000+
-  '02019_E_Evaluating a conditional compiling e','xpression'#000+
+  '02019_E_Evaluati','ng a conditional compiling expression'#000+
   '02020_W_Macro contents are limited to 255 characters in length'#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+
   '02025_N_User defined: $1'#000+
-  '02026_H_User defined: $1'#000+
-  '02027_I_Use','r defined: $1'#000+
+  '02026_H_','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_Expanding of macros exceeds a depth of 16.'#000+
-  '02031_W_compiler switches aren'#039't supported in // styled comme','nts'+
+  '02031_W_compiler switches aren'#039't ','supported in // styled comments'+
   #000+
   '02032_DL_Handling switch "$1"'#000+
   '02033_CL_ENDIF $1 found'#000+
@@ -59,866 +60,869 @@ const msgtxt : array[0..000157,1..240] of char=(
   '02036_CL_IF $1 found, $2'#000+
   '02037_CL_IFNDEF $1 found, $2'#000+
   '02038_CL_ELSE $1 found, $2'#000+
-  '02039_CL_Skipping until...'#000+
-  '02040_I_Press <ret','urn> to continue'#000+
+  '02039_CL_Skipping',' until...'#000+
+  '02040_I_Press <return> to continue'#000+
   '02041_W_Unsupported switch "$1"'#000+
   '02042_W_Illegal compiler directive "$1"'#000+
   '02043_TL_Back in $1'#000+
   '02044_W_Unsupported application type: "$1"'#000+
   '02045_W_APPTYPE is not supported by the target OS'#000+
-  '02046_W_DESCRIPTION is not supported b','y the target OS'#000+
+  '02046_W_DE','SCRIPTION is not supported by the target OS'#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_E_Illegal assembler style specified "$1"'#000+
-  '02051_W_ASM reader switch is not possible ins','ide asm statement, "$1"'+
+  '02051_W_ASM reade','r switch is not possible inside asm statement, "$1"'+
   ' will 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 environment "$1" not found in enviro','nment'#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+
   '02058_E_Illegal interface type specified. Valids are COM, CORBA or DEF'+
   'AULT.'#000+
-  '02059_W_APPID is only supported for Pal','mOS'#000+
+  '02059_W_APP','ID is only supported for PalmOS'#000+
   '02060_W_APPNAME is only supported for PalmOS'#000+
   '02061_E_Constant strings can'#039't be longer than 255 chars'#000+
   '02062_F_Including include files exceeds a depth of 16.'#000+
   '02063_F_Too many levels of PUSH'#000+
-  '02064_E_A POP without a preceding PUSH'#000+
-  '02065_E_M','acro "$1" does not have any value'#000+
+  '02064_E_A POP withou','t a preceding PUSH'#000+
+  '02065_E_Macro "$1" does not have any value'#000+
   '02066_E_Wrong switch toggle, use ON/OFF/DEFAULT or +/-/*'#000+
   '02067_E_Mode switch "$1" not allowed here'#000+
   '03000_E_Parser - Syntax Error'#000+
   '03004_E_INTERRUPT procedure can'#039't be nested'#000+
-  '03005_W_Procedure type "$1" ignor','ed'#000+
+  '03005','_W_Procedure type "$1" ignored'#000+
   '03006_E_Not all declarations of "$1" are declared with OVERLOAD'#000+
   '03008_E_Duplicate exported function name "$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, d'+
+  '03011_W_Re','locatable DLL or executable $1 debug info does not work, d'+
   'isabled.'#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+
   '03014_E_Destructor name must be DONE'#000+
-  '03016_E_Procedure type INLINE not sup','ported'#000+
+  '03016_E_P','rocedure type INLINE not supported'#000+
   '03018_W_Constructor should be public'#000+
   '03019_W_Destructor should be public'#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+
-  '03023_N_The objec','t "$1" has no VMT'#000+
+  '03022_F_Anonym class definitions are n','ot allowed'#000+
+  '03023_N_The object "$1" has no VMT'#000+
   '03024_E_Illegal parameter list'#000+
   '03026_E_Wrong number of parameters specified'#000+
   '03027_E_overloaded identifier "$1" isn'#039't a function'#000+
   '03028_E_overloaded functions have the same parameter list'#000+
-  '03029_E_function header doesn'#039't matc','h the forward declaration "$'+
+  '03029_E_','function header doesn'#039't match the forward declaration "$'+
   '1"'#000+
   '03030_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+
-  '03033_E_With can not be used for variables in a different segment'#000+
-  '03034_E','_function nesting > 31'#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+
   '03037_E_duplicate case label'#000+
-  '03038_E_Upper bound of case range is less than lower bound'#000+
-  '03039_E_typed constants',' of classes are not allowed'#000+
+  '03038_E_Upper bound of case range is less than lower b','ound'#000+
+  '03039_E_typed constants of classes are not allowed'#000+
   '03040_E_functions variables of overloaded functions are not allowed'#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 of object'+
-  's'#000+
-  '03043_W_use of NEW o','r DISPOSE for untyped pointers is meaningless'#000+
+  '03042_W_use extended syntax of NEW and DISPOSE for instances of ','obje'+
+  'cts'#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+
   '03045_E_class identifier expected'#000+
   '03046_E_type identifier not allowed here'#000+
-  '03047_E_method identifier expected'#000+
-  '03048_E_function ','header doesn'#039't match any method of this class "'+
-  '$1"'#000+
+  '03047_E_method identifie','r expected'#000+
+  '03048_E_function header doesn'#039't match any method of this class "$1'+
+  '"'#000+
   '03049_DL_procedure/function $1'#000+
   '03050_E_Illegal floating point constant'#000+
   '03051_E_FAIL can be used in constructors only'#000+
   '03052_E_Destructors can'#039't have parameters'#000+
-  '03053_E_Only class methods can',' be referred with class references'#000+
+  '03','053_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+
   '03056_E_The symbol can'#039't be exported from a library'#000+
-  '03057_W_An inherited method is hidden by "$1"'#000+
-  '03','058_E_There is no method in an ancestor class to be overridden: "$'+
-  '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+
   '03060_W_Stored prorperty directive is not yet implemented'#000+
-  '03061_E_Illegal symbol for property access'#000+
-  '03062_E_Cannot access',' a protected field of an object here'#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+
   '03066_E_overridden methods must have the same return type: "$2" is ove'+
   'rriden by "$1" which has another return type'#000+
-  '03067_E_EXPORT declared function','s can'#039't be nested'#000+
+  '0306','7_E_EXPORT declared functions can'#039't be nested'#000+
   '03068_E_methods can'#039't be EXPORTed'#000+
   '03069_E_call by var parameters have to match exactly: Got "$1" expecte'+
   'd "$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'+
-  ' identifier of the class'#000+
+  '03071_E_SELF is only allowe','d in methods'#000+
+  '03072_E_methods can be only in other methods called direct with type i'+
+  'dentifier of the class'#000+
   '03073_E_Illegal use of '#039':'#039#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 con','structor call'#000+
+  '03','076_E_Expression must be constructor call'#000+
   '03077_E_Expression must be destructor call'#000+
   '03078_E_Illegal order of record elements'#000+
   '03079_E_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 meth','ods'#000+
+  '03081_E_constructors ','and destructors must be methods'#000+
   '03082_E_Operator is not overloaded'#000+
   '03083_E_Impossible to overload assignment for equal types'#000+
   '03084_E_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 '+
-  'cl','ass'#000+
+  '03086_E_The extended syntax of new or di','spose isn'#039't allowed for '+
+  'a class'#000+
   '03088_E_Procedure overloading is switched off'#000+
   '03089_E_It is not possible to overload this operator (overload = inste'+
   'ad)'#000+
   '03090_E_Comparative operator must return a boolean value'#000+
-  '03091_E_Only virtual methods can be abstract'#000+
-  '03092_F_Use of',' unsupported feature!'#000+
+  '03091_E_Only virtual methods ca','n be abstract'#000+
+  '03092_F_Use of unsupported feature!'#000+
   '03093_E_The mix of different kind of objects (class, object, interface'+
   ', etc) isn'#039't allowed'#000+
   '03094_W_Unknown procedure directive had to be ignored: "$1"'#000+
-  '03095_E_absolute can only be associated to one variable'#000+
-  '03096_E_abs','olute can only be associated with a var or const'#000+
+  '03095_E_absolute can only be associated',' to one variable'#000+
+  '03096_E_absolute can only be associated with a var or const'#000+
   '03097_E_Only one variable can be initialized'#000+
   '03098_E_Abstract methods shouldn'#039't have any definition (with funct'+
   'ion body)'#000+
-  '03099_E_This overloaded function can'#039't be local (must be exported)'+
-  #000+
-  '031','00_W_Virtual methods are used without a constructor in "$1"'#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_CL_Macro defined: $1'#000+
   '03102_CL_Macro undefined: $1'#000+
   '03103_CL_Macro $1 set to $2'#000+
   '03104_I_Compiling $1'#000+
   '03105_UL_Parsing interface of unit $1'#000+
-  '03106_UL_Parsing implementation of $1',#000+
+  '03106_UL_','Parsing implementation of $1'#000+
   '03107_DL_Compiling $1 for the second time'#000+
   '03109_E_No property found to override'#000+
   '03110_E_Only one default property is allowed'#000+
   '03111_E_The default property must be an array property'#000+
-  '03112_E_Virtual constructors are only supported in class ob','ject mode'+
+  '03112_E_Virtual constructors ar','e only supported in class object mode'+
   'l'#000+
   '03113_E_No default property available'#000+
   '03114_E_The class can'#039't have a published section, use the {$M+} sw'+
   'itch'#000+
   '03115_E_Forward declaration of class "$1" must be resolved here to use'+
-  ' the class as ancestor'#000+
-  '03116_E_Local operators not',' supported'#000+
+  ' the class as ancestor',#000+
+  '03116_E_Local operators not supported'#000+
   '03117_E_Procedure directive "$1" not allowed in interface section'#000+
   '03118_E_Procedure directive "$1" not allowed in implementation section'+
   #000+
-  '03119_E_Procedure directive "$1" not allowed in procvar declaration'#000+
-  '03120_E_Function is alre','ady declared Public/Forward "$1"'#000+
+  '03119_E_Procedure directive "$1" not allowed in procvar declarat','ion'#000+
+  '03120_E_Function is already declared Public/Forward "$1"'#000+
   '03121_E_Can'#039't use both EXPORT and EXTERNAL'#000+
   '03123_W_"$1" not yet supported inside inline procedure/function'#000+
   '03124_W_Inlining disabled'#000+
   '03125_I_Writing Browser log $1'#000+
-  '03126_H_may be pointer dereference is missi','ng'#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+
-  '03131_E_Property can'#039't have a default value'#000+
-  '03132_E_The default value o','f a property must be constant'#000+
+  '03131_E_Property can'#039't have a default value',#000+
+  '03132_E_The default value of a property must be constant'#000+
   '03133_E_Symbol can'#039't be published, can be only a class'#000+
   '03134_E_That kind of property can'#039't be published'#000+
   '03136_E_An import name is required'#000+
   '03138_E_Division by zero'#000+
-  '03139_E_Invalid floating point operation'#000+
-  '03140','_E_Upper bound of range is less than lower bound'#000+
+  '03139_E_Invalid fl','oating point operation'#000+
+  '03140_E_Upper bound of range is less than lower bound'#000+
   '03141_W_string "$1" is longer than "$2"'#000+
   '03142_E_string length is larger than array of char length'#000+
   '03143_E_Illegal expression after message directive'#000+
-  '03144_E_Message handlers can take only one',' call by ref. parameter'#000+
+  '03144_E_Messag','e handlers can take only one call by ref. parameter'#000+
   '03145_E_Duplicate message label: "$1"'#000+
   '03146_E_Self can only be an explicit parameter in methods which are me'+
   'ssage handlers'#000+
   '03147_E_Threadvars can be only static or global'#000+
-  '03148_F_Direct assembler not supported for bi','nary output format'#000+
+  '03148_F_Direct as','sembler not supported for binary output format'#000+
   '03149_W_Don'#039't load OBJPAS unit manually, use \{\$mode objfpc\} or '+
   '\{\$mode delphi\} instead'#000+
   '03150_E_OVERRIDE can'#039't be used in objects'#000+
-  '03151_E_Data types which require initialization/finalization can'#039't'+
-  ' be used in variant r','ecords'#000+
+  '03151_E_Data types which require initialization/finalizatio','n can'#039+
+  't be used in variant records'#000+
   '03152_E_Resourcestrings can be only static or global'#000+
   '03153_E_Exit with argument can'#039't be used here'#000+
   '03154_E_The 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 ar','e compiled in $M+ mode can be published'#000+
+  '03155_E_This symbol isn'#039't allowed as storage symbol',#000+
+  '03156_E_Only class which are compiled in $M+ mode can be published'#000+
   '03157_E_Procedure directive expected'#000+
   '03158_E_The value for a property index 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 ent','ry can be generated for unit global vars'#000+
   '03161_E_Compile without -WD option'#000+
   '03162_F_You need ObjFpc (-S2) or Delphi (-Sd) mode to compile this mod'+
   'ule'#000+
   '03163_E_Can'#039't export with index under $1'#000+
-  '03164_E_Exporting of variables is not supported under $1'#000+
-  '03165_E_Improper GUI','D syntax'#000+
+  '03164_E_Exporting of variables is not supported u','nder $1'#000+
+  '03165_E_Improper GUID syntax'#000+
   '03168_W_Procedure named "$1" not found that is suitable for implementi'+
   'ng the $2.$3'#000+
   '03169_E_interface identifier expected'#000+
   '03170_E_Type "$1" can'#039't be used as array index type'#000+
-  '03171_E_Con- and destructors aren'#039't allowed in interfaces'#000,
+  '03171_E_Con- and destructors a','ren'#039't allowed in interfaces'#000+
   '03172_E_Access specifiers can'#039't be used in INTERFACES'#000+
   '03173_E_An interface can'#039't contain fields'#000+
   '03174_E_Can'#039't declare local procedure as EXTERNAL'#000+
   '03175_W_Some fields coming before "$1" weren'#039't initialized'#000+
-  '03176_E_Some fields coming before "','$1" weren'#039't initialized'#000+
+  '03176_E','_Some fields coming before "$1" weren'#039't initialized'#000+
   '03177_W_Some fields coming after "$1" weren'#039't initialized'#000+
   '03178_E_VarArgs directive without CDecl and External'#000+
   '03179_E_Self must be a normal (call-by-value) parameter'#000+
-  '03180_E_Interface "$1" has no interface identific','ation'#000+
+  '03180_E_Interface "$1','" has no interface identification'#000+
   '03181_E_Unknown class field or method identifier "$1"'#000+
   '03182_W_Overriding calling convention "$1" with "$2"'#000+
   '03183_E_Typed constants of the type "procedure of object" can only be '+
   'initialized with NIL'#000+
-  '03184_E_Default value can only be as','signed to one parameter'#000+
+  '03184_E_','Default value can only be assigned to one parameter'#000+
   '03185_E_Default parameter required for "$1"'#000+
   '03186_W_Use of unsupported feature!'#000+
   '03187_H_C arrays are passed by reference'#000+
   '03188_E_C array of const must be the last argument'#000+
-  '03189_H_Type "$1" redefinition'#000+
-  '03190_W_cdecl',#039'ared functions have no high parameter'#000+
+  '03189_H_Type "$1','" redefinition'#000+
+  '03190_W_cdecl'#039'ared functions have no high parameter'#000+
   '03191_W_cdecl'#039'ared functions do not support open strings'#000+
   '03192_E_Cannot initialize variables declared as threadvar'#000+
   '03193_E_Message directive is only allowed in Classes'#000+
-  '03194_E_Procedure or Function exp','ected'#000+
+  '03194','_E_Procedure or Function expected'#000+
   '03195_W_Calling convention directive ignored: "$1"'#000+
   '03196_E_REINTRODUCE can'#039't be used in objects'#000+
   '03197_E_Each argument must have it'#039's own location'#000+
   '03198_E_Each argument must have an explicit location'#000+
-  '03199_E_Unknown argument location'#000+
-  '0','3200_E_32 Bit-Integer or pointer variable expected'#000+
+  '03199_E','_Unknown argument location'#000+
+  '03200_E_32 Bit-Integer or pointer variable expected'#000+
   '03201_E_Goto statements aren'#039't allowed between different procedure'+
   's'#000+
   '03202_F_Procedure too complex, it requires too much registers'#000+
   '03203_E_Illegal expression'#000+
-  '03204_E_Invalid integer expressi','on'#000+
+  '0320','4_E_Invalid integer expression'#000+
   '03205_E_Illegal qualifier'#000+
   '03206_E_High range limit < low range limit'#000+
   '03207_E_Exit'#039's parameter must be the name of the procedure it is u'+
   'sed in'#000+
   '03208_E_Illegal assignment to for-loop variable "$1"'#000+
-  '03209_E_Can'#039't declare local variable as EX','TERNAL'#000+
+  '03209_E_Can'#039't ','declare local variable as EXTERNAL'#000+
   '03210_E_Procedure is already declared EXTERNAL'#000+
   '03211_W_Implicit uses of Variants unit'#000+
   '03212_E_Class and static methods can'#039't be used in INTERFACES'#000+
-  '04000_E_Type mismatch'#000+
+  '03213_E_Overflow in arithmetic operation'#000+
+  '04000_E_Type mism','atch'#000+
   '04001_E_Incompatible types: got "$1" expected "$2"'#000+
-  '04002_E_Type ','mismatch between "$1" and "$2"'#000+
+  '04002_E_Type mismatch between "$1" and "$2"'#000+
   '04003_E_Type identifier expected'#000+
   '04004_E_Variable identifier expected'#000+
   '04005_E_Integer expression expected, but got "$1"'#000+
-  '04006_E_Boolean expression expected, but got "$1"'#000+
+  '04006_E_Boolean expr','ession expected, but got "$1"'#000+
   '04007_E_Ordinal expression expected'#000+
-  '040','08_E_pointer type expected, but got "$1"'#000+
+  '04008_E_pointer type expected, but got "$1"'#000+
   '04009_E_class type expected, but got "$1"'#000+
   '04011_E_Can'#039't evaluate constant expression'#000+
   '04012_E_Set elements are not compatible'#000+
-  '04013_E_Operation not implemented for sets'#000+
-  '04014_W_Automatic type conversi','on from floating type to COMP which i'+
-  's an integer type'#000+
+  '04013','_E_Operation not implemented for sets'#000+
+  '04014_W_Automatic type conversion from floating type to COMP which is '+
+  'an integer type'#000+
   '04015_H_use DIV instead to get an integer result'#000+
   '04016_E_string types doesn'#039't match, because of $V+ mode'#000+
-  '04017_E_succ or pred on enums with assignments not possible'#000+
-  '04018_E_Can'#039't read o','r write variables of this type'#000+
+  '04017_E_suc','c or pred on enums with assignments not possible'#000+
+  '04018_E_Can'#039't read or write variables of this type'#000+
   '04019_E_Can'#039't use readln or writeln on typed file'#000+
   '04020_E_Can'#039't use read or write on untyped file.'#000+
-  '04021_E_Type conflict between set elements'#000+
+  '04021_E_Type conflict between set element','s'#000+
   '04022_W_lo/hi(dword/qword) returns the upper/lower word/dword'#000+
-  '04023','_E_Integer or real expression expected'#000+
+  '04023_E_Integer or real expression expected'#000+
   '04024_E_Wrong type "$1" in array constructor'#000+
   '04025_E_Incompatible type for arg no. $1: Got "$2", expected "$3"'#000+
-  '04026_E_Method (variable) and Procedure (variable) are not compatible'#000+
-  '04027_E_Illegal cons','tant passed to internal math function'#000+
+  '04026_E_Method (varia','ble) and Procedure (variable) are not compatibl'+
+  'e'#000+
+  '04027_E_Illegal constant passed to internal math function'#000+
   '04028_E_Can'#039't get the address of constants'#000+
   '04029_E_Argument can'#039't be assigned to'#000+
-  '04030_E_Can'#039't assign local procedure/function to procedure variabl'+
-  'e'#000+
+  '04030_E_Can'#039't assign local procedure/function to pro','cedure 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+
+  '04032_E_Can'#039't assign values to const variable'#000+
   '04033_E_Array type required'#000+
   '04034_E_interface type expected, but got "$1"'#000+
-  '04035_W_Mixing signed expressions and longwords gives a 64bit result'#000+
-  '04036_W_Mixing signed expressions and cardinals here may cause',' a ran'+
-  'ge check error'#000+
+  '04035_W_Mixing signed expressions and longwords gives a 64bit ','result'+
+  #000+
+  '04036_W_Mixing signed expressions and cardinals here may cause a range'+
+  ' check error'#000+
   '04037_E_Typecast has different size ($1 -> $2) in assignment'#000+
   '04038_E_enums with assignments can'#039't be used as array index'#000+
-  '04039_E_Class or Object types "$1" and "$2" are not related'#000+
-  '04040_W_Class types "$1" and "$2" are ','not related'#000+
+  '04039_E_Class or Object types',' "$1" and "$2" are not related'#000+
+  '04040_W_Class types "$1" and "$2" are not related'#000+
   '04041_E_Class or interface type expected, but got "$1"'#000+
   '04042_E_Type "$1" is not completely defined'#000+
-  '04043_W_String literal has more characters than short string length'#000+
+  '04043_W_String literal has more characters than short string',' length'#000+
   '04044_W_Comparison is always false due to range of values'#000+
-  '040','45_W_Comparison is always true due to range of values'#000+
+  '04045_W_Comparison is always true due to range of values'#000+
   '04046_W_Constructing a class "$1" with abstract methods'#000+
-  '04047_H_The left operand of the IN operator should be byte sized'#000+
-  '04048_W_Type size mismatch, possible loss of data / range check e','rro'+
-  'r'#000+
+  '04047_H_The left operand of the IN operator should be byte si','zed'#000+
+  '04048_W_Type size mismatch, possible loss of data / range check error'#000+
   '04049_H_Type size mismatch, possible loss of data / range check error'#000+
   '04050_E_The address of an abstract method can'#039't be taken'#000+
-  '04051_E_The operator is not applicable for the operand type'#000+
+  '04051_E_The operator is not applicable ','for the operand type'#000+
   '04052_E_Constant Expression expected'#000+
-  '04053_E_Ope','ration "$1" not supported for types "$2" and "$3"'#000+
+  '04053_E_Operation "$1" not supported for types "$2" and "$3"'#000+
   '04054_E_Illegal type conversion: "$1" to "$2"'#000+
   '04055_H_Conversion between ordinals and pointers is not portable'#000+
-  '04056_W_Conversion between ordinals and pointers is not portable'#000+
-  '04057_E_Can'#039't ','determine which overloaded function to call'#000+
+  '04056_W_Co','nversion between ordinals and pointers is not portable'#000+
+  '04057_E_Can'#039't determine which overloaded function to call'#000+
   '04058_E_Illegal counter variable'#000+
   '05000_E_Identifier not found "$1"'#000+
   '05001_F_Internal Error in SymTableStack()'#000+
-  '05002_E_Duplicate identifier "$1"'#000+
+  '05002_E_Duplicate ','identifier "$1"'#000+
   '05003_H_Identifier already defined in $1 at line $2'#000+
-  '0','5004_E_Unknown identifier "$1"'#000+
+  '05004_E_Unknown identifier "$1"'#000+
   '05005_E_Forward declaration not solved "$1"'#000+
   '05007_E_Error in type definition'#000+
   '05009_E_Forward type not resolved "$1"'#000+
-  '05010_E_Only static variables can be used in static methods or outside'+
-  ' methods'#000+
-  '05012_F_record',' or class type expected'#000+
+  '05010_E_Only static vari','ables can be used in static methods or outsi'+
+  'de methods'#000+
+  '05012_F_record or class type expected'#000+
   '05013_E_Instances of classes or objects with an abstract method are no'+
   't allowed'#000+
   '05014_W_Label not defined "$1"'#000+
-  '05015_E_Label used but not defined "$1"'#000+
+  '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+
+  '05017_E_GOTO and LABEL are not supported (use switch -Sg)'#000+
   '05018_E_Label not found'#000+
   '05019_E_identifier isn'#039't a label'#000+
   '05020_E_label already defined'#000+
   '05021_E_illegal type declaration of set elements'#000+
-  '05022_E_Forward class definition not resolved "$1"'#000+
-  '05023_H_Unit "$1" not used',' in $2'#000+
+  '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+
   '05026_H_Value parameter "$1" is assigned but never used'#000+
-  '05027_N_Local variable "$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 fie','ld "$1.$2" is never used'#000+
+  '05029_N_Private field "$1.$2" is never used'#000+
   '05030_N_Private field "$1.$2" is assigned but never used'#000+
   '05031_N_Private method "$1.$2" never used'#000+
   '05032_E_Set type expected'#000+
-  '05033_W_Function result does not seem to be set'#000+
-  '05034_W_Type "$1" is not aligned correctly',' in current record for C'#000+
+  '05033_W_Function resu','lt does not seem to be set'#000+
+  '05034_W_Type "$1" is not aligned correctly in current record for C'#000+
   '05035_E_Unknown record field identifier "$1"'#000+
   '05036_W_Local variable "$1" does not seem to be initialized'#000+
-  '05037_W_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_H_Found d','eclaration: $1'#000+
+  '05039_H_Found declaration: $1'#000+
   '05040_E_Data element too large'#000+
   '05042_E_No matching implementation for interface method "$1" found'#000+
   '05043_W_Symbol "$1" is deprecated'#000+
-  '05044_W_Symbol "$1" is not portable'#000+
+  '05044_W_Symbol "$1" is n','ot portable'#000+
   '05055_W_Symbol "$1" is not implemented'#000+
-  '05056_E_Can'#039't crea','te unique type from this type'#000+
+  '05056_E_Can'#039't create unique type from this type'#000+
   '06009_E_Parameter list size exceeds 65535 bytes'#000+
   '06012_E_File types must be var parameters'#000+
-  '06013_E_The use of a far pointer isn'#039't allowed there'#000+
+  '06013_E_The use of a far pointer isn'#039't allowed ther','e'#000+
   '06015_E_EXPORT declared functions can'#039't be called'#000+
-  '06016_W_Possible ','illegal call of constructor or destructor'#000+
+  '06016_W_Possible illegal call of constructor or destructor'#000+
   '06017_N_Inefficient code'#000+
   '06018_W_unreachable code'#000+
   '06020_E_Abstract methods can'#039't be called directly'#000+
-  '06027_DL_Register $1 weight $2 $3'#000+
+  '06027_DL_Register $1 weight $','2 $3'#000+
   '06029_DL_Stack frame is omitted'#000+
-  '06031_E_Object or class methods ','can'#039't be inline.'#000+
+  '06031_E_Object or class methods can'#039't be inline.'#000+
   '06032_E_Procvar calls cannot be inline.'#000+
   '06033_E_No code for inline procedure stored'#000+
   '06035_E_Element zero of an ansi/wide- or longstring can'#039't be acces'+
-  'sed, use (set)length instead'#000+
-  '06037_E_Constructors or destructors can not ','be called inside a '#039'w'+
-  'ith'#039' clause'#000+
+  'sed,',' use (set)length instead'#000+
+  '06037_E_Constructors or destructors can not be called inside a '#039'wi'+
+  'th'#039' clause'#000+
   '06038_E_Cannot call message handler methods directly'#000+
   '06039_E_Jump in or outside of an exception block'#000+
-  '06040_E_Control flow statements aren'#039't allowed in a finally block'#000+
-  '06041_W_Parameters size exceeds limit f','or certain cpu'#039's'#000+
+  '06040_E_Control flow statements aren',#039't allowed in a finally block'#000+
+  '06041_W_Parameters size exceeds limit for certain cpu'#039's'#000+
   '06042_W_Local variable size exceed limit for certain cpu'#039's'#000+
   '06043_E_Local variables size exceeds supported limit'#000+
   '06044_E_BREAK not allowed'#000+
-  '06045_E_CONTINUE not allowed'#000+
+  '06045_E_CONTINUE',' not allowed'#000+
   '07000_DL_Starting $1 styled assembler parsing'#000+
-  '07001_DL_F','inished $1 styled assembler parsing'#000+
+  '07001_DL_Finished $1 styled assembler parsing'#000+
   '07002_E_Non-label pattern contains @'#000+
   '07004_E_Error building record offset'#000+
   '07005_E_OFFSET used without identifier'#000+
-  '07006_E_TYPE used without identifier'#000+
+  '07006_E_TYPE used with','out identifier'#000+
   '07007_E_Cannot use local variable or parameters here'#000+
-  '0','7008_E_need to use OFFSET here'#000+
+  '07008_E_need to use OFFSET here'#000+
   '07009_E_need to use $ here'#000+
   '07010_E_Cannot use multiple relocatable symbols'#000+
   '07011_E_Relocatable symbol can only be added'#000+
-  '07012_E_Invalid constant expression'#000+
+  '07012_E_Invalid cons','tant expression'#000+
   '07013_E_Relocatable symbol is not allowed'#000+
-  '07014_E_Inv','alid reference syntax'#000+
+  '07014_E_Invalid reference syntax'#000+
   '07015_E_You can not reach $1 from that code'#000+
   '07016_E_Local symbols/labels aren'#039't allowed as references'#000+
   '07017_E_Invalid base and index register usage'#000+
-  '07018_W_Possible error in object field handling'#000+
-  '07019_E_Wrong scale fa','ctor specified'#000+
+  '0','7018_W_Possible error in object field handling'#000+
+  '07019_E_Wrong scale factor specified'#000+
   '07020_E_Multiple index register usage'#000+
   '07021_E_Invalid operand type'#000+
   '07022_E_Invalid string as opcode operand: $1'#000+
   '07023_W_@CODE and @DATA not supported'#000+
-  '07024_E_Null label references are not allowed'#000+
-  '07025_E_Divide by zero in asm',' evaluator'#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+
-  '07030_W_$1 without operand translated into $1P'#000+
-  '07031_W_ENTER instruction is no','t supported by Linux kernel'#000+
+  '07030_W_$','1 without operand translated into $1P'#000+
+  '07031_W_ENTER instruction is not supported by Linux kernel'#000+
   '07032_W_Calling an overload function in assembler'#000+
   '07033_E_Unsupported symbol type for operand'#000+
   '07034_E_Constant value out of bounds'#000+
-  '07035_E_Error converting decimal $1'#000+
+  '07035_E_Erro','r converting decimal $1'#000+
   '07036_E_Error converting octal $1'#000+
-  '07037_E_Err','or converting binary $1'#000+
+  '07037_E_Error converting binary $1'#000+
   '07038_E_Error converting hexadecimal $1'#000+
   '07039_H_$1 translated to $2'#000+
   '07040_W_$1 is associated to an overloaded function'#000+
-  '07041_E_Cannot use SELF outside a method'#000+
+  '07041_E_Cannot use SELF outs','ide a method'#000+
   '07042_E_Cannot use OLDEBP outside a nested procedure'#000+
-  '070','43_W_Procedures can'#039't return any value in asm code'#000+
+  '07043_W_Procedures can'#039't return any value in asm code'#000+
   '07044_E_SEG not supported'#000+
   '07045_E_Size suffix and destination or source size do not match'#000+
-  '07046_W_Size suffix and destination or source size do not match'#000+
+  '07046_W_Size suffix and destin','ation or source size do not match'#000+
   '07047_E_Assembler syntax error'#000+
-  '0704','8_E_Invalid combination of opcode and operands'#000+
+  '07048_E_Invalid combination of opcode and operands'#000+
   '07049_E_Assembler syntax error in operand'#000+
   '07050_E_Assembler syntax error in constant'#000+
   '07051_E_Invalid String expression'#000+
-  '07052_W_constant with symbol $1 for address which is not on a pointer'#000+
-  '0705','3_E_Unrecognized opcode $1'#000+
+  '07052','_W_constant with symbol $1 for address which is not on a pointe'+
+  'r'#000+
+  '07053_E_Unrecognized opcode $1'#000+
   '07054_E_Invalid or missing opcode'#000+
   '07055_E_Invalid combination of prefix and opcode: $1'#000+
   '07056_E_Invalid combination of override and opcode: $1'#000+
-  '07057_E_Too many operands on line'#000+
+  '07','057_E_Too many operands on line'#000+
   '07058_W_NEAR ignored'#000+
-  '07059_W_FAR igno','red'#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 name'#000+
-  '07064_E_Invalid floating point register name'#000+
+  '07064_E_Invalid floating point re','gister name'#000+
   '07066_W_Modulo not supported'#000+
-  '07067_E_Invalid floating poi','nt constant $1'#000+
+  '07067_E_Invalid floating point constant $1'#000+
   '07068_E_Invalid floating point expression'#000+
   '07069_E_Wrong symbol type'#000+
   '07070_E_Cannot index a local var or parameter with a register'#000+
-  '07071_E_Invalid segment override expression'#000+
+  '07071_E_Invalid segment ov','erride expression'#000+
   '07072_W_Identifier $1 supposed external'#000+
-  '07073_E_Str','ings not allowed as constants'#000+
+  '07073_E_Strings not allowed as constants'#000+
   '07074_No type of variable specified'#000+
   '07075_E_assembler code not returned to text section'#000+
   '07076_E_Not a directive or local symbol $1'#000+
-  '07077_E_Using a defined name as a local label'#000+
-  '07078_E_Dollar token is used with','out an identifier'#000+
+  '07077_E_Us','ing 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+
+  '07081_E_Can'#039't access fields directly for parameters',#000+
   '07082_E_Can'#039't access fields of objects/classes directly'#000+
-  '07083_E_No s','ize specified and unable to determine the size of the op'+
-  'erands'#000+
+  '07083_E_No size specified and unable to determine the size of the oper'+
+  'ands'#000+
   '07084_E_Cannot use RESULT in this function'#000+
   '07086_W_"$1" without operand translated into "$1 %st,%st(1)"'#000+
-  '07087_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
-  '07088_W_"$1 %st(n)" t','ranslated into "$1 %st(n),%st"'#000+
+  '0708','7_W_"$1 %st(n)" translated into "$1 %st,%st(n)"'#000+
+  '07088_W_"$1 %st(n)" translated into "$1 %st(n),%st"'#000+
   '07089_E_Char < not allowed here'#000+
   '07090_E_Char > not allowed here'#000+
   '07093_W_ALIGN not supported'#000+
   '07094_E_Inc and Dec cannot be together'#000+
-  '07095_E_Invalid reglist for movem'#000+
+  '07095_E_I','nvalid reglist for movem'#000+
   '07096_E_Reglist invalid for opcode'#000+
-  '07097_E_H','igher cpu mode required ($1)'#000+
+  '07097_E_Higher cpu mode required ($1)'#000+
   '07098_W_No size specified and unable to determine the size of the oper'+
   'ands, using DWORD as default'#000+
-  '07099_E_Syntax error while trying to parse a shifter operand'#000+
+  '07099_E_Syntax error while trying to parse ','a shifter operand'#000+
   '08000_F_Too many assembler files'#000+
-  '08001_F_Selected a','ssembler output not supported'#000+
+  '08001_F_Selected assembler output not supported'#000+
   '08002_F_Comp not supported'#000+
   '08003_F_Direct not support for binary writers'#000+
   '08004_E_Allocating of data is only allowed in bss section'#000+
-  '08005_F_No binary writer selected'#000+
+  '08005_F_No',' binary writer selected'#000+
   '08006_E_Asm: Opcode $1 not in table'#000+
-  '08007_E_A','sm: $1 invalid combination of opcode and operands'#000+
+  '08007_E_Asm: $1 invalid combination of opcode and operands'#000+
   '08008_E_Asm: 16 Bit references not supported'#000+
   '08009_E_Asm: Invalid effective address'#000+
-  '08010_E_Asm: Immediate or reference expected'#000+
+  '08010_E_Asm: Immediate or reference e','xpected'#000+
   '08011_E_Asm: $1 value exceeds bounds $2'#000+
-  '08012_E_Asm: Short ju','mp is out of range $1'#000+
+  '08012_E_Asm: Short jump is out of range $1'#000+
   '08013_E_Asm: Undefined label $1'#000+
   '08014_E_Asm: Comp type not supported for this target'#000+
   '08015_E_Asm: Extended type not supported for this target'#000+
-  '08016_E_Asm: Duplicate label $1'#000+
+  '08016_E','_Asm: Duplicate label $1'#000+
   '08017_E_Asm: Redefined label $1'#000+
-  '08018_E_Asm:',' First defined here'#000+
+  '08018_E_Asm: First defined here'#000+
   '08019_E_Asm: Invalid register $1'#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+
+  '09003_E_','Can'#039't create object file: $1'#000+
   '09004_E_Can'#039't create archive file: $1'#000+
-  '09','005_E_Assembler $1 not found, switching to external assembling'#000+
+  '09005_E_Assembler $1 not found, switching to external assembling'#000+
   '09006_T_Using assembler: $1'#000+
   '09007_E_Error while assembling exitcode $1'#000+
-  '09008_E_Can'#039't call the assembler, error $1 switching to external a'+
-  'ssembling'#000+
+  '09008_E_Can'#039't call the assembler, err','or $1 switching to external'+
+  ' assembling'#000+
   '09009_I_Assembling $1'#000+
-  '09010_I_','Assembling with smartlinking $1'#000+
+  '09010_I_Assembling with smartlinking $1'#000+
   '09011_W_Object $1 not found, Linking may fail !'#000+
   '09012_W_Library $1 not found, Linking may fail !'#000+
   '09013_E_Error while linking'#000+
-  '09014_E_Can'#039't call the linker, switching to external linking'#000+
+  '09014_E_Can'#039't ','call the linker, switching to external linking'#000+
   '09015_I_Linking $1'#000+
-  '090','16_E_Util $1 not found, switching to external linking'#000+
+  '09016_E_Util $1 not found, switching to external linking'#000+
   '09017_T_Using util $1'#000+
   '09018_E_Creation of Executables not supported'#000+
-  '09019_E_Creation of Dynamic/Shared Libraries not supported'#000+
+  '09019_E_Creation of Dynamic/Shared Libraries not ','supported'#000+
   '09020_I_Closing script $1'#000+
-  '09021_E_resource compiler not fou','nd, switching to external mode'#000+
+  '09021_E_resource compiler not found, switching to external mode'#000+
   '09022_I_Compiling resource $1'#000+
   '09023_T_unit $1 can'#039't be statically linked, switching to smart lin'+
   'king'#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, s','witching to static link'+
-  'ing'#000+
+  '09024_T_unit $1 can'#039't be smart linked, ','switching to static linki'+
+  'ng'#000+
+  '09025_T_unit $1 can'#039't be shared linked, switching to static linkin'+
+  'g'#000+
   '09026_E_unit $1 can'#039't be smart or static linked'#000+
   '09027_E_unit $1 can'#039't be shared or static linked'#000+
   '09028_F_Can'#039't post process executable $1'#000+
-  '09029_F_Can'#039't open executable $1'#000+
+  '09029_','F_Can'#039't open executable $1'#000+
   '09030_X_Size of Code: $1 bytes'#000+
-  '09031_X_Siz','e of initialized data: $1 bytes'#000+
+  '09031_X_Size of initialized data: $1 bytes'#000+
   '09032_X_Size of uninitialized data: $1 bytes'#000+
   '09033_X_Stack space reserved: $1 bytes'#000+
   '09034_X_Stack space commited: $1 bytes'#000+
-  '10000_T_Unitsearch: $1'#000+
+  '10000_T_Unitsear','ch: $1'#000+
   '10001_T_PPU Loading $1'#000+
   '10002_U_PPU Name: $1'#000+
-  '10003_U_PPU Flags:',' $1'#000+
+  '10003_U_PPU Flags: $1'#000+
   '10004_U_PPU Crc: $1'#000+
   '10005_U_PPU Time: $1'#000+
   '10006_U_PPU File too short'#000+
   '10007_U_PPU Invalid Header (no PPU at the begin)'#000+
   '10008_U_PPU Invalid Version $1'#000+
-  '10009_U_PPU is compiled for another processor'#000+
-  '10010_U_PPU is compiled for an other targe','t'#000+
+  '10009_U_PPU is comp','iled for another processor'#000+
+  '10010_U_PPU is compiled for an other target'#000+
   '10011_U_PPU Source: $1'#000+
   '10012_U_Writing $1'#000+
   '10013_F_Can'#039't Write PPU-File'#000+
   '10014_F_Error reading PPU-File'#000+
   '10015_F_unexpected end of PPU-File'#000+
-  '10016_F_Invalid PPU-File entry: $1'#000+
+  '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+
+  '10019_F_Too much units'#000+
   '10020_F_Circular unit reference between $1 and $2'#000+
   '10021_F_Can'#039't compile unit $1, no sources available'#000+
   '10022_F_Can'#039't find unit $1'#000+
-  '10023_W_Unit $1 was not found but $2 exists'#000+
+  '10023_W_Unit $1 was not f','ound but $2 exists'#000+
   '10024_F_Unit $1 searched but $2 found'#000+
-  '10025_W_Comp','iling 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+
-  '10028_U_Recompiling $1, checksum changed for $2'#000+
+  '10028_U_Recompiling $1, checksum ch','anged for $2'#000+
   '10029_U_Recompiling $1, source found only'#000+
-  '10030_U_Recomp','iling 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 asm are older than ppufile'#000+
-  '10033_U_Recompiling unit, obj is older than asm'#000+
-  '10034_U_Parsing interface o','f $1'#000+
+  '10033_','U_Recompiling unit, obj is older than asm'#000+
+  '10034_U_Parsing interface of $1'#000+
   '10035_U_Parsing implementation of $1'#000+
   '10036_U_Second load for unit $1'#000+
   '10037_U_PPU Check file $1 time $2'#000+
-  '10040_W_Can'#039't recompile unit $1, but found modifed include files'#000+
+  '10040_W_Can'#039't recompile unit $1, but found modifed include file','s'+
+  #000+
   '10041_H_File $1 is newer than Release PPU file $2'#000+
-  '10042_U_Using a u','nit which was not compiled with correct FPU mode'#000+
+  '10042_U_Using a unit which was not compiled with correct FPU mode'#000+
   '10043_U_Loading interface units from $1'#000+
   '10044_U_Loading implementation units from $1'#000+
-  '10045_U_Interface CRC changed for unit $1'#000+
+  '10045_U_Interface CRC changed for uni','t $1'#000+
   '10046_U_Implementation CRC changed for unit $1'#000+
-  '10047_U_Finished ','compiling unit $1'#000+
+  '10047_U_Finished compiling unit $1'#000+
   '10048_U_Add dependency of $1 to $2'#000+
   '10049_U_No reload, is caller: $1'#000+
   '10050_U_No reload, already in second compile: $1'#000+
   '10051_U_Flag for reload: $1'#000+
-  '10052_U_Forced reloading'#000+
+  '10052_U_','Forced reloading'#000+
   '10053_U_Previous state of $1: $2'#000+
-  '10054_U_Already com','piling $1, setting second compile'#000+
+  '10054_U_Already compiling $1, setting second compile'#000+
   '10055_U_Loading unit $1'#000+
   '10056_U_Finished loading unit $1'#000+
   '10057_U_Registering new unit $1'#000+
   '10058_U_Re-resolving unit $1'#000+
-  '10059_U_Skipping re-resolving unit $1, still loading used units'#000+
-  '11000_$1 [options] <inpu','tfile> [options]'#000+
+  '10059_U_Skipping re','-resolving unit $1, still loading used units'#000+
+  '11000_$1 [options] <inputfile> [options]'#000+
   '11001_W_Only one source file supported'#000+
   '11002_W_DEF file can be created only for OS/2'#000+
   '11003_E_nested response files are not supported'#000+
-  '11004_F_No source file name in command line'#000+
+  '11004_F_No source fil','e name in command line'#000+
   '11005_N_No option inside $1 config file'#000+
-  '11006_','E_Illegal 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_D_Reading further options from $1'#000+
-  '11011_W_Target is already set to: $1'#000+
-  '11012_W_Shared libs not supported on DOS p','latform, reverting to stat'+
-  'ic'#000+
+  '11011_W_Ta','rget is already set to: $1'#000+
+  '11012_W_Shared libs not supported on DOS platform, reverting to static'+
+  #000+
   '11013_F_too many IF(N)DEFs'#000+
   '11014_F_too many ENDIFs'#000+
   '11015_F_open conditional at the end of the file'#000+
-  '11016_W_Debug information generation is not supported by this executab'+
-  'le'#000+
+  '11016_W_Debug information generation is not',' supported by this execut'+
+  'able'#000+
   '11017_H_Try recompiling with -dGDB'#000+
-  '1101','8_E_You are using the obsolete switch $1'#000+
+  '11018_E_You are using the obsolete switch $1'#000+
   '11019_E_You are using the obsolete switch $1, please use $2'#000+
   '11020_N_Switching assembler to default source writing assembler'#000+
-  '11021_W_Assembler output selected "$1" is not compatible with "$2"'#000+
-  '11022_W_','"$1" assembler use forced'#000+
+  '11021_','W_Assembler output selected "$1" is not compatible with "$2"'#000+
+  '11022_W_"$1" assembler use forced'#000+
   '11026_T_Reading options from file $1'#000+
   '11027_T_Reading options from environment $1'#000+
   '11028_D_Handling option "$1"'#000+
   '11029__*** press enter ***'#000+
-  '11030_H_Start of reading config file $1'#000+
-  '11031_H_End of reading config file $1',#000+
+  '11030_H_','Start of reading config file $1'#000+
+  '11031_H_End of reading config file $1'#000+
   '11032_D_interpreting option "$1"'#000+
   '11036_D_interpreting firstpass option "$1"'#000+
   '11033_D_interpreting file option "$1"'#000+
   '11034_D_Reading config file "$1"'#000+
-  '11035_D_found source file name "$1"'#000+
+  '11035_D_found source fi','le name "$1"'#000+
   '11039_E_Unknown code page'#000+
-  '11023_Free Pascal Compiler ver','sion $FPCVERSION [$FPCDATE] for $FPCCP'+
-  'U'#010+
+  '11023_Free Pascal Compiler version $FPCVERSION [$FPCDATE] for $FPCCPU'#010+
   'Copyright (c) 1993-2005 by Florian Klaempfl'#000+
   '11024_Free Pascal Compiler version $FPCVERSION'#010+
   #010+
   'Compiler Date      : $FPCDATE'#010+
-  'Compiler CPU Target: $FPCCPU'#010+
+  'Compiler ','CPU Target: $FPCCPU'#010+
   #010+
   'Supported targets:'#010+
   '  $OSTARGETS'#010+
   #010+
-  'This program co','mes under the GNU General Public Licence'#010+
+  'This 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_the com','piler doesn'#039't delete the generated assembler file'#010+
+  '11025_**0*_put + aft','er a boolean switch option to enable it, - to di'+
+  'sable it'#010+
+  '**1a_the compiler doesn'#039't delete the generated assembler file'#010+
   '**2al_list sourcecode lines in assembler file'#010+
   '**2an_list node info in assembler file'#010+
-  '*L2ap_use pipes instead of creating temporary assembler files'#010+
-  '**2ar_list register allocation/release info',' in assembler file'#010+
+  '*L2ap_use pipes instead of creating ','temporary assembler files'#010+
+  '**2ar_list register allocation/release info in assembler file'#010+
   '**2at_list temp allocation/release info in assembler file'#010+
   '**1A<x>_output format:'#010+
   '**2Adefault_use default assembler'#010+
   '3*2Aas_assemble using GNU AS'#010+
-  '3*2Anasmcoff_coff (Go32v2) file using Nasm'#010+
-  '3*2Anasmelf_elf32 (Linux) file usi','ng Nasm'#010+
+  '3*2Anasm','coff_coff (Go32v2) file using Nasm'#010+
+  '3*2Anasmelf_elf32 (Linux) file using Nasm'#010+
   '3*2Anasmwin32_Win32 object file using Nasm'#010+
   '3*2Anasmwdosx_Win32/WDOSX object file using Nasm'#010+
   '3*2Awasm_obj file using Wasm (Watcom)'#010+
   '3*2Anasmobj_obj file using Nasm'#010+
-  '3*2Amasm_obj file using Masm (Microsoft)'#010+
-  '3*2Atasm_obj file using Tasm ','(Borland)'#010+
+  '3','*2Amasm_obj file using Masm (Microsoft)'#010+
+  '3*2Atasm_obj file using Tasm (Borland)'#010+
   '3*2Aelf_elf32 (Linux) using internal writer'#010+
   '3*2Acoff_coff (Go32v2) using internal writer'#010+
   '3*2Apecoff_pecoff (Win32) using internal writer'#010+
-  '4*2Aas_assemble using GNU AS'#010+
+  '4*2Aas_assemble using GN','U AS'#010+
   '6*2Aas_Unix o-file using GNU AS'#010+
   '6*2Agas_GNU Motorola assembler'#010+
-  '6','*2Amit_MIT Syntax (old GAS)'#010+
+  '6*2Amit_MIT Syntax (old GAS)'#010+
   '6*2Amot_Standard Motorola assembler'#010+
   'A*2Aas_assemble using GNU AS'#010+
   'P*2Aas_assemble using GNU AS'#010+
   'S*2Aas_assemble using GNU AS'#010+
-  '**1b_generate browser info'#010+
+  '**1b_generate browse','r info'#010+
   '**2bl_generate local symbol info'#010+
   '**1B_build all modules'#010+
-  '**1C<x','>_code generation options:'#010+
+  '**1C<x>_code generation options:'#010+
   '**2Cc<x>_set default calling convention to <x>'#010+
   '**2CD_create also dynamic library (not supported)'#010+
-  '**2Ce_Compilation with emulated floating point opcodes'#010+
+  '**2Ce_Compilation with emulated floating point ','opcodes'#010+
   '**2Cf<x>_Select fpu instruction set to use to <x>'#010+
-  '**2Cg_Gener','ate PIC code'#010+
+  '**2Cg_Generate PIC code'#010+
   '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#010+
   '**2Ci_IO-checking'#010+
   '**2Cn_omit linking stage'#010+
   '**2Co_check overflow of integer operations'#010+
-  '**2Cr_range checking'#010+
+  '**2Cr_range checking',#010+
   '**2CR_verify object method call validity'#010+
-  '**2Cs<n>_set stack size to ','<n>'#010+
+  '**2Cs<n>_set stack size to <n>'#010+
   '**2Ct_stack checking'#010+
   '**2CX_create also smartlinked library'#010+
   '**1d<x>_defines the symbol <x>'#010+
   '**1D_generate a DEF file'#010+
   '**2Dd<x>_set description to <x>'#010+
-  '**2Dv<x>_set DLL version to <x>'#010+
+  '**2Dv<x>_set DLL ver','sion to <x>'#010+
   '*O2Dw_PM application'#010+
   '**1e<x>_set path to executable'#010+
-  '**1E_','same as -Cn'#010+
+  '**1E_same as -Cn'#010+
   '**1F<x>_set file names and paths:'#010+
   '**2Fc<x>_sets input codepage to <x>'#010+
   '**2FD<x>_sets the directory where to search for compiler utilities'#010+
-  '**2Fe<x>_redirect error output to <x>'#010+
+  '**2Fe<x>_redirect erro','r output to <x>'#010+
   '**2FE<x>_set exe/unit output path to <x>'#010+
-  '**2Fi<x>_add','s <x> to include path'#010+
+  '**2Fi<x>_adds <x> to include path'#010+
   '**2Fl<x>_adds <x> to library path'#010+
   '**2FL<x>_uses <x> as dynamic linker'#010+
   '**2Fo<x>_adds <x> to object path'#010+
   '**2Fr<x>_load error message file <x>'#010+
-  '**2Fu<x>_adds <x> to unit path'#010+
-  '**2FU<x>_set unit output path to <x>, overrides',' -FE'#010+
+  '**2Fu<x>_','adds <x> to unit path'#010+
+  '**2FU<x>_set unit output path to <x>, overrides -FE'#010+
   '*g1g_generate debugger information:'#010+
   '*g2gc_generate checks for pointers'#010+
   '*g2gd_use dbx'#010+
   '*g2gg_use gsym'#010+
   '*g2gh_use heap trace unit (for memory leak debugging)'#010+
-  '*g2gl_use line info unit to show more info for backtraces'#010+
-  '*g2gv_generates program','s tracable with valgrind'#010+
+  '*g2gl_use li','ne info unit to show more info for backtraces'#010+
+  '*g2gv_generates programs tracable with valgrind'#010+
   '*g2gw_generate dwarf debugging info'#010+
   '**1i_information'#010+
   '**2iD_return compiler date'#010+
   '**2iV_return compiler version'#010+
   '**2iSO_return compiler OS'#010+
-  '**2iSP_return compiler processor'#010+
+  '**2iSP_ret','urn compiler processor'#010+
   '**2iTO_return target OS'#010+
-  '**2iTP_return target p','rocessor'#010+
+  '**2iTP_return target processor'#010+
   '**1I<x>_adds <x> to include path'#010+
   '**1k<x>_Pass <x> to the linker'#010+
   '**1l_write logo'#010+
   '**1M<x>_set language mode to <x>'#010+
   '**2Mfpc_free pascal dialect (default)'#010+
-  '**2Mobjfpc_switch some Delphi 2 extensions on'#010+
-  '**2Mdelphi_tries to be Delphi comp','atible'#010+
+  '**2Mobjfpc_','switch some Delphi 2 extensions on'#010+
+  '**2Mdelphi_tries to be Delphi compatible'#010+
   '**2Mtp_tries to be TP/BP 7.0 compatible'#010+
   '**2Mgpc_tries to be gpc compatible'#010+
   '**2Mmacpas_tries to be compatible to the macintosh pascal dialects'#010+
-  '**1n_don'#039't read the default config file'#010+
-  '**1o<x>_change the name of the executable produced ','to <x>'#010+
+  '**1n_don'#039't read the de','fault config file'#010+
+  '**1o<x>_change the name of the executable produced to <x>'#010+
   '**1O<x>_optimizations:'#010+
   '3*2Og_generate smaller code'#010+
   '3*2OG_generate faster code (default)'#010+
   '**2Or_keep certain variables in registers'#010+
-  '3*2Ou_enable uncertain optimizations (see docs)'#010+
+  '3*2Ou_enable uncertain optimizatio','ns (see docs)'#010+
   '3*2O1_level 1 optimizations (quick optimizations)'#010+
-  '3*2O2','_level 2 optimizations (-O1 + slower optimizations)'#010+
+  '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#010+
   '3*2O3_level 3 optimizations (-O2 repeatedly, max 5 times)'#010+
   '3*2Op<x>_target processor:'#010+
-  '3*3Op1_set target processor to 386/486'#010+
+  '3*3Op1_set target processor to 386','/486'#010+
   '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#010+
-  '3*3Op3_se','t target processor to PPro/PII/c6x86/K6 (tm)'#010+
+  '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#010+
   '6*2Og_generate smaller code'#010+
   '6*2OG_generate faster code (default)'#010+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#010+
-  '6*2O0_set target processor to a MC68000'#010+
-  '6*2O2_set target processor to a MC68020+ (default)',#010+
+  '6*2O0_set target proc','essor to a MC68000'#010+
+  '6*2O2_set target processor to a MC68020+ (default)'#010+
   '**1pg_generate profile code for gprof (defines FPC_PROFILE)'#010+
   '**1R<x>_assembler reading style:'#010+
   '**2Rdefault_use default assembler'#010+
   '3*2Ratt_read AT&T style assembler'#010+
-  '3*2Rintel_read Intel style assembler'#010+
+  '3*2Rintel','_read Intel style assembler'#010+
   '6*2RMOT_read motorola style assembler'#010+
-  '**1','S<x>_syntax options:'#010+
+  '**1S<x>_syntax options:'#010+
   '**2S2_same as -Mobjfpc'#010+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#010+
   '**2Sa_include assertion code.'#010+
   '**2Sd_same as -Mdelphi'#010+
-  '**2Se<x>_error options. <x> is a combination of the following:'#010+
-  '**3*_<n> : compiler stops afte','r the <n> errors (default is 1)'#010+
+  '**2Se<x>_error options. ','<x> is a combination of the following:'#010+
+  '**3*_<n> : compiler stops after the <n> errors (default is 1)'#010+
   '**3*_w : compiler stops also after warnings'#010+
   '**3*_n : compiler stops also after notes'#010+
   '**3*_h : compiler stops also after hints'#010+
-  '**2Sg_allow LABEL and GOTO'#010+
+  '**2Sg_allow L','ABEL and GOTO'#010+
   '**2Sh_Use ansistrings'#010+
   '**2Si_support C++ styled INLINE'#010+
-  '*','*2SI<x>_set interface style to <x>'#010+
+  '**2SI<x>_set interface style to <x>'#010+
   '**3SIcom_COM compatible interface (default)'#010+
   '**3SIcorba_CORBA compatible interface'#010+
   '**2Sm_support macros like C (global)'#010+
-  '**2So_same as -Mtp'#010+
+  '**2So_same as -Mt','p'#010+
   '**2Sp_same as -Mgpc'#010+
-  '**2Ss_constructor name must be init (destructor',' must be done)'#010+
+  '**2Ss_constructor name must be init (destructor must be done)'#010+
   '**2St_allow static keyword in objects'#010+
   '**1s_don'#039't call assembler and linker'#010+
   '**2sh_Generate script to link on host'#010+
   '**2st_Generate script to link on target'#010+
-  '**2sr_Skip register allocation phase (use with -alr)'#010+
-  '**1T<x>_Target oper','ating system:'#010+
+  '**2','sr_Skip register allocation phase (use with -alr)'#010+
+  '**1T<x>_Target operating system:'#010+
   '3*2Temx_OS/2 via EMX (including EMX/RSX extender)'#010+
   '3*2Tfreebsd_FreeBSD'#010+
   '3*2Tgo32v2_Version 2 of DJ Delorie DOS extender'#010+
   '3*2Tlinux_Linux'#010+
   '3*2Tnetbsd_NetBSD'#010+
-  '3*2Tnetware_Novell Netware Module (clib)'#010+
-  '3*2Tnetwlibc_Novell Netware Modul','e (libc)'#010+
+  '3*2Tn','etware_Novell Netware Module (clib)'#010+
+  '3*2Tnetwlibc_Novell Netware Module (libc)'#010+
   '3*2Topenbsd_OpenBSD'#010+
   '3*2Tos2_OS/2 / eComStation'#010+
   '3*2Tsunos_SunOS/Solaris'#010+
   '3*2Twatcom_Watcom compatible DOS extender'#010+
   '3*2Twdosx_WDOSX DOS extender'#010+
-  '3*2Twin32_Windows 32 Bit'#010+
+  '3*2Twin32_Windows 32',' Bit'#010+
   '4*2Tlinux_Linux'#010+
   '6*2Tamiga_Commodore Amiga'#010+
-  '6*2Tatari_Atari ST/STe','/TT'#010+
+  '6*2Tatari_Atari ST/STe/TT'#010+
   '6*2Tlinux_Linux-68k'#010+
   '6*2Tmacos_Macintosh m68k (not supported)'#010+
   '6*2Tpalmos_PalmOS'#010+
   'A*2Tlinux_Linux'#010+
   'P*2Tdarwin_Darwin and MacOS X on PowerPC'#010+
   'P*2Tlinux_Linux on PowerPC'#010+
-  'P*2Tmacos_MacOS (classic) on PowerPC'#010+
+  'P*2T','macos_MacOS (classic) on PowerPC'#010+
   'P*2Tmorphos_MorphOS'#010+
-  'S*2Tlinux_Linux'#010,
+  'S*2Tlinux_Linux'#010+
   '**1u<x>_undefines the symbol <x>'#010+
   '**1U_unit options:'#010+
   '**2Un_don'#039't check the unit name'#010+
   '**2Ur_generate release unit files'#010+
   '**2Us_compile a system unit'#010+
-  '**1v<x>_Be verbose. <x> is a combination of the following letters:'#010+
-  '**2*_e : Show errors (defau','lt)       0 : Show nothing (except errors'+
-  ')'#010+
+  '**1v<x>_Be verbose. <x> i','s a combination of the following letters:'#010+
+  '**2*_e : Show errors (default)       0 : Show nothing (except errors)'#010+
   '**2*_w : Show warnings               u : Show unit info'#010+
   '**2*_n : Show notes                  t : Show tried/used files'#010+
-  '**2*_h : Show hints                  c : Show conditionals'#010+
-  '**2*_i : Show gener','al info           d : Show debug info'#010+
+  '**2*_h : ','Show hints                  c : Show conditionals'#010+
+  '**2*_i : Show general info           d : Show debug info'#010+
   '**2*_l : Show linenumbers            r : Rhide/GCC compatibility mode'#010+
-  '**2*_a : Show everything             x : Executable info (Win32 only)'#010+
-  '**2*_v : write fpcdebug.txt with     p : Write tree.log with p','arse t'+
-  'ree'#010+
-  '**2*_    lots of debugging info      '#010+
+  '**2*_a : Show everything             x : Executable info (Win32',' only'+
+  ')'#010+
+  '**2*_v : write fpcdebug.txt with     p : Write tree.log with parse tre'+
+  'e'#010+
+  '**2*_    lots of debugging info'#010+
   '3*1W<x>_Win32-like target options'#010+
   '3*2WB<x>_Set Image base to Hexadecimal <x> value'#010+
   '3*2WC_Specify console type application'#010+
-  '3*2WD_Use DEFFILE to export functions of DLL or EXE'#010+
-  '3*2WF_Specify full','-screen type application (OS/2 only)'#010+
+  '3*2WD_U','se DEFFILE to export functions of DLL or EXE'#010+
+  '3*2WF_Specify full-screen type application (OS/2 only)'#010+
   '3*2WG_Specify graphic type application'#010+
   '3*2WN_Do not generate relocation code (necessary for debugging)'#010+
   '3*2WR_Generate relocation code'#010+
-  'P*2WC_Specify console type application (MacOS only)'#010+
-  'P*2WG_Specify gra','phic type application (MacOS only)'#010+
+  'P*2WC_','Specify console type application (MacOS only)'#010+
+  'P*2WG_Specify graphic type application (MacOS only)'#010+
   'P*2WT_Specify tool type application (MPW tool, MacOS only)'#010+
   '**1X_executable options:'#010+
   '**2Xc_link with the c library'#010+
-  '**2Xd_don'#039't use standard library search path (needed for cross com'+
-  'pile)'#010+
-  '**2XD_try to link u','nits dynamic          (defines FPC_LINK_DYNAMIC)'#010+
+  '**2Xd_don'#039't use standard lib','rary search path (needed for cross c'+
+  'ompile)'#010+
+  '**2XD_try to link units dynamic          (defines FPC_LINK_DYNAMIC)'#010+
   '**2XP<x>_prepend the binutils names with the prefix <x>'#010+
   '**2Xr<x>_set library search path to <x> (needed for cross compile)'#010+
-  '**2Xs_strip all symbols from executable'#010+
-  '**2XS_try to link units stat','ic (default) (defines FPC_LINK_STATIC)'#010+
+  '**2Xs','_strip all symbols from executable'#010+
+  '**2XS_try to link units static (default) (defines FPC_LINK_STATIC)'#010+
   '**2Xt_link with static libraries (-static is passed to linker)'#010+
   '**2XX_try to link units smart            (defines FPC_LINK_SMART)'#010+
   '**1*_'#010+
-  '**1?_shows this help'#010+
+  '**1','?_shows this help'#010+
   '**1h_shows this help without waiting'#000
 );

+ 80 - 17
compiler/nadd.pas

@@ -69,6 +69,7 @@ interface
 implementation
 
     uses
+      sysutils,
       globtype,systems,
       cutils,verbose,globals,widestr,
       symconst,symtype,symdef,symsym,symtable,defutil,defcmp,
@@ -265,6 +266,7 @@ implementation
              ((rt = pointerconstn) or (rt = niln)) and
              (nodetype in [ltn,lten,gtn,gten,equaln,unequaln,subn])) then
            begin
+              t:=nil;
               { when comparing/substracting  pointers, make sure they are }
               { of the same  type (JM)                                    }
               if (lt = pointerconstn) and (rt = pointerconstn) then
@@ -317,24 +319,81 @@ implementation
                 lv := lv * tpointerdef(right.resulttype.def).pointertype.def.size;
               case nodetype of
                 addn :
-                  if (lt <> pointerconstn) then
-                    t := genintconstnode(lv+rv)
-                  else
-                    t := cpointerconstnode.create(lv+rv,left.resulttype);
+                  begin
+                    {$ifopt Q-}
+                      {$define OVERFLOW_OFF}
+                      {$Q+}
+                    {$endif}
+                    try
+                      if (lt <> pointerconstn) then
+                        t := genintconstnode(lv+rv)
+                      else
+                        t := cpointerconstnode.create(lv+rv,left.resulttype);
+                    except
+                      on E:EIntOverflow do
+                        begin
+                          Message(parser_e_arithmetic_operation_overflow);
+                          { Recover }
+                          t:=genintconstnode(0)
+                        end;
+                    end;
+                    {$ifdef OVERFLOW_OFF}
+                      {$Q-}
+                      {$undef OVERFLOW_OFF}
+                    {$endif}
+                  end;
                 subn :
-                  if (lt=pointerconstn) and (rt=pointerconstn) and
-                    (tpointerdef(rd).pointertype.def.size>1) then
-                    t := genintconstnode((lv-rv) div tpointerdef(left.resulttype.def).pointertype.def.size)
-                  else if (lt <> pointerconstn) or (rt = pointerconstn) then
-                    t := genintconstnode(lv-rv)
-                  else
-                    t := cpointerconstnode.create(lv-rv,left.resulttype);
+                  begin
+                    {$ifopt Q-}
+                      {$define OVERFLOW_OFF}
+                      {$Q+}
+                    {$endif}
+                    try
+                      if (lt=pointerconstn) and (rt=pointerconstn) and
+                        (tpointerdef(rd).pointertype.def.size>1) then
+                        t := genintconstnode((lv-rv) div tpointerdef(left.resulttype.def).pointertype.def.size)
+                      else if (lt <> pointerconstn) or (rt = pointerconstn) then
+                        t := genintconstnode(lv-rv)
+                      else
+                        t := cpointerconstnode.create(lv-rv,left.resulttype);
+                    except
+                      on E:EIntOverflow do
+                        begin
+                          Message(parser_e_arithmetic_operation_overflow);
+                          { Recover }
+                          t:=genintconstnode(0)
+                        end;
+                    end;
+                    {$ifdef OVERFLOW_OFF}
+                      {$Q-}
+                      {$undef OVERFLOW_OFF}
+                    {$endif}
+                  end;
                 muln :
-                  if (torddef(ld).typ <> u64bit) or
-                     (torddef(rd).typ <> u64bit) then
-                    t:=genintconstnode(lv*rv)
-                  else
-                    t:=genintconstnode(int64(qword(lv)*qword(rv)));
+                  begin
+                    {$ifopt Q-}
+                      {$define OVERFLOW_OFF}
+                      {$Q+}
+                    {$endif}
+                    try
+                      if (torddef(ld).typ <> u64bit) or
+                         (torddef(rd).typ <> u64bit) then
+                        t:=genintconstnode(lv*rv)
+                      else
+                        t:=genintconstnode(int64(qword(lv)*qword(rv)));
+                    except
+                      on E:EIntOverflow do
+                        begin
+                          Message(parser_e_arithmetic_operation_overflow);
+                          { Recover }
+                          t:=genintconstnode(0)
+                        end;
+                    end;
+                    {$ifdef OVERFLOW_OFF}
+                      {$Q-}
+                      {$undef OVERFLOW_OFF}
+                    {$endif}
+                  end;
                 xorn :
                   if is_integer(ld) then
                     t:=genintconstnode(lv xor rv)
@@ -2071,7 +2130,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.136  2005-01-16 11:56:37  peter
+  Revision 1.137  2005-01-26 16:23:28  peter
+    * detect arithmetic overflows for constants at compile time
+    * use try..except instead of setjmp
+
+  Revision 1.136  2005/01/16 11:56:37  peter
     * fixed some tabs
 
   Revision 1.135  2005/01/16 11:13:40  peter

+ 140 - 177
compiler/parser.pas

@@ -46,9 +46,6 @@ implementation
 {$ifdef BrowserLog}
       browlog,
 {$endif BrowserLog}
-{$ifdef UseExcept}
-      tpexcept,
-{$endif UseExcept}
 {$ifdef GDB}
       gdb,
 {$endif GDB}
@@ -369,10 +366,6 @@ implementation
 
       var
          olddata : polddata;
-{$ifdef USEEXCEPT}
-         recoverpos    : jmp_buf;
-         oldrecoverpos : pjmp_buf;
-{$endif useexcept}
        begin
          inc(compile_level);
          parser_current_file:=filename;
@@ -516,191 +509,161 @@ implementation
 
          { If the compile level > 1 we get a nice "unit expected" error
            message if we are trying to use a program as unit.}
-{$ifdef USEEXCEPT}
-         if setjmp(recoverpos)=0 then
-          begin
-            oldrecoverpos:=recoverpospointer;
-            recoverpospointer:=@recoverpos;
-{$endif USEEXCEPT}
-
-            if (token=_UNIT) or (compile_level>1) then
-              begin
-                current_module.is_unit:=true;
-                proc_unit;
-              end
-            else
-              proc_program(token=_LIBRARY);
-{$ifdef USEEXCEPT}
-            recoverpospointer:=oldrecoverpos;
-          end
-         else
-          begin
-            recoverpospointer:=oldrecoverpos;
-            longjump_used:=true;
-          end;
-{$endif USEEXCEPT}
-
-         { restore old state }
-         done_module;
-
-         if assigned(current_module) then
-          begin
-            { module is now compiled }
-            tppumodule(current_module).state:=ms_compiled;
-
-            { free ppu }
-            if assigned(tppumodule(current_module).ppufile) then
-             begin
-               tppumodule(current_module).ppufile.free;
-               tppumodule(current_module).ppufile:=nil;
-             end;
-
-            { free scanner }
-            if assigned(current_module.scanner) then
+         try
+           if (token=_UNIT) or (compile_level>1) then
              begin
-               if current_scanner=tscannerfile(current_module.scanner) then
-                 current_scanner:=nil;
-               tscannerfile(current_module.scanner).free;
-               current_module.scanner:=nil;
-             end;
-          end;
+               current_module.is_unit:=true;
+               proc_unit;
+             end
+           else
+             proc_program(token=_LIBRARY);
+         finally
+           { restore old state }
+           done_module;
+
+           if assigned(current_module) then
+            begin
+              { module is now compiled }
+              tppumodule(current_module).state:=ms_compiled;
+
+              { free ppu }
+              if assigned(tppumodule(current_module).ppufile) then
+               begin
+                 tppumodule(current_module).ppufile.free;
+                 tppumodule(current_module).ppufile:=nil;
+               end;
 
-         if (compile_level>1) then
-           begin
-              with olddata^ do
+              { free scanner }
+              if assigned(current_module.scanner) then
                begin
-                 { restore scanner }
-                 c:=oldc;
-                 pattern:=oldpattern;
-                 orgpattern:=oldorgpattern;
-                 token:=oldtoken;
-                 idtoken:=oldidtoken;
-                 akttokenpos:=oldtokenpos;
-                 block_type:=old_block_type;
-                 { restore cg }
-                 parse_only:=oldparse_only;
-                 { restore asmlists }
-                 exprasmlist:=oldexprasmlist;
-                 datasegment:=olddatasegment;
-                 bsssegment:=oldbsssegment;
-                 codesegment:=oldcodesegment;
-                 consts:=oldconsts;
-                 debuglist:=olddebuglist;
-                 withdebuglist:=oldwithdebuglist;
-                 importssection:=oldimports;
-                 exportssection:=oldexports;
-                 resourcesection:=oldresource;
-                 rttilist:=oldrttilist;
-                 picdata:=oldpicdata;
-                 resourcestringlist:=oldresourcestringlist;
-                 { object data }
-                 ResourceStrings:=OldResourceStrings;
-                 objectlibrary:=oldobjectlibrary;
-                 { restore previous scanner }
-                 if assigned(old_compiled_module) then
-                   current_scanner:=tscannerfile(old_compiled_module.scanner)
-                 else
+                 if current_scanner=tscannerfile(current_module.scanner) then
                    current_scanner:=nil;
-                 if assigned(current_scanner) then
-                   parser_current_file:=current_scanner.inputfile.name^;
-                 { restore symtable state }
-                 refsymtable:=oldrefsymtable;
-                 symtablestack:=oldsymtablestack;
-                 macrosymtablestack:=oldmacrosymtablestack;
-                 defaultsymtablestack:=olddefaultsymtablestack;
-                 defaultmacrosymtablestack:=olddefaultmacrosymtablestack;
-                 aktdefproccall:=oldaktdefproccall;
-                 current_procinfo:=oldcurrent_procinfo;
-                 aktsourcecodepage:=oldsourcecodepage;
-                 aktlocalswitches:=oldaktlocalswitches;
-                 aktmoduleswitches:=oldaktmoduleswitches;
-                 aktalignment:=oldaktalignment;
-                 aktpackenum:=oldaktpackenum;
-                 aktpackrecords:=oldaktpackrecords;
-                 aktmaxfpuregisters:=oldaktmaxfpuregisters;
-                 aktoutputformat:=oldaktoutputformat;
-                 set_target_asm(aktoutputformat);
-                 aktoptprocessor:=oldaktoptprocessor;
-                 aktspecificoptprocessor:=oldaktspecificoptprocessor;
-                 aktfputype:=oldaktfputype;
-                 aktasmmode:=oldaktasmmode;
-                 aktinterfacetype:=oldaktinterfacetype;
-                 aktfilepos:=oldaktfilepos;
-                 aktmodeswitches:=oldaktmodeswitches;
-                 aktexceptblock:=0;
-                 exceptblockcounter:=0;
-{$ifdef GDB}
-                 dbx_counter:=store_dbx;
-{$endif GDB}
+                 tscannerfile(current_module.scanner).free;
+                 current_module.scanner:=nil;
                end;
-           end
-         else
-           begin
-             parser_current_file:='';
-             { Shut down things when the last file is compiled }
-             if (compile_level=1) then
-              begin
-                { Close script }
-                if (not AsmRes.Empty) then
-                 begin
-                   Message1(exec_i_closing_script,AsmRes.Fn);
-                   AsmRes.WriteToDisk;
-                 end;
+            end;
 
-{$ifdef USEEXCEPT}
-                if not longjump_used then
-{$endif USEEXCEPT}
+           if (compile_level>1) then
+             begin
+                with olddata^ do
                  begin
-                   { do not create browsers on errors !! }
-                   if status.errorcount=0 then
-                    begin
+                   { restore scanner }
+                   c:=oldc;
+                   pattern:=oldpattern;
+                   orgpattern:=oldorgpattern;
+                   token:=oldtoken;
+                   idtoken:=oldidtoken;
+                   akttokenpos:=oldtokenpos;
+                   block_type:=old_block_type;
+                   { restore cg }
+                   parse_only:=oldparse_only;
+                   { restore asmlists }
+                   exprasmlist:=oldexprasmlist;
+                   datasegment:=olddatasegment;
+                   bsssegment:=oldbsssegment;
+                   codesegment:=oldcodesegment;
+                   consts:=oldconsts;
+                   debuglist:=olddebuglist;
+                   withdebuglist:=oldwithdebuglist;
+                   importssection:=oldimports;
+                   exportssection:=oldexports;
+                   resourcesection:=oldresource;
+                   rttilist:=oldrttilist;
+                   picdata:=oldpicdata;
+                   resourcestringlist:=oldresourcestringlist;
+                   { object data }
+                   ResourceStrings:=OldResourceStrings;
+                   objectlibrary:=oldobjectlibrary;
+                   { restore previous scanner }
+                   if assigned(old_compiled_module) then
+                     current_scanner:=tscannerfile(old_compiled_module.scanner)
+                   else
+                     current_scanner:=nil;
+                   if assigned(current_scanner) then
+                     parser_current_file:=current_scanner.inputfile.name^;
+                   { restore symtable state }
+                   refsymtable:=oldrefsymtable;
+                   symtablestack:=oldsymtablestack;
+                   macrosymtablestack:=oldmacrosymtablestack;
+                   defaultsymtablestack:=olddefaultsymtablestack;
+                   defaultmacrosymtablestack:=olddefaultmacrosymtablestack;
+                   aktdefproccall:=oldaktdefproccall;
+                   current_procinfo:=oldcurrent_procinfo;
+                   aktsourcecodepage:=oldsourcecodepage;
+                   aktlocalswitches:=oldaktlocalswitches;
+                   aktmoduleswitches:=oldaktmoduleswitches;
+                   aktalignment:=oldaktalignment;
+                   aktpackenum:=oldaktpackenum;
+                   aktpackrecords:=oldaktpackrecords;
+                   aktmaxfpuregisters:=oldaktmaxfpuregisters;
+                   aktoutputformat:=oldaktoutputformat;
+                   set_target_asm(aktoutputformat);
+                   aktoptprocessor:=oldaktoptprocessor;
+                   aktspecificoptprocessor:=oldaktspecificoptprocessor;
+                   aktfputype:=oldaktfputype;
+                   aktasmmode:=oldaktasmmode;
+                   aktinterfacetype:=oldaktinterfacetype;
+                   aktfilepos:=oldaktfilepos;
+                   aktmodeswitches:=oldaktmodeswitches;
+                   aktexceptblock:=0;
+                   exceptblockcounter:=0;
+  {$ifdef GDB}
+                   dbx_counter:=store_dbx;
+  {$endif GDB}
+                 end;
+             end
+           else
+             begin
+               { Shut down things when the last file is compiled succesfull }
+               if (compile_level=1) and
+                  (status.errorcount=0) then
+                begin
+                  parser_current_file:='';
+                  { Close script }
+                  if (not AsmRes.Empty) then
+                   begin
+                     Message1(exec_i_closing_script,AsmRes.Fn);
+                     AsmRes.WriteToDisk;
+                   end;
+
+                  { do not create browsers on errors !! }
+                  if status.errorcount=0 then
+                   begin
 {$ifdef BrowserLog}
-                      { Write Browser Log }
-                      if (cs_browser_log in aktglobalswitches) and
-                         (cs_browser in aktmoduleswitches) then
-                       begin
-                         if browserlog.elements_to_list.empty then
-                          begin
-                            Message1(parser_i_writing_browser_log,browserlog.Fname);
-                            WriteBrowserLog;
-                          end
-                         else
-                          browserlog.list_elements;
-                       end;
+                     { Write Browser Log }
+                     if (cs_browser_log in aktglobalswitches) and
+                        (cs_browser in aktmoduleswitches) then
+                      begin
+                        if browserlog.elements_to_list.empty then
+                         begin
+                           Message1(parser_i_writing_browser_log,browserlog.Fname);
+                           WriteBrowserLog;
+                         end
+                        else
+                         browserlog.list_elements;
+                      end;
+                     { Write Browser Collections }
+                     do_extractsymbolinfo{$ifdef FPC}(){$endif};
 {$endif BrowserLog}
+                   end;
+                end;
+             end;
 
-                      { Write Browser Collections }
-                      do_extractsymbolinfo{$ifdef FPC}(){$endif};
-                    end;
-                 end;
-
-{$ifdef dummy}
-                if current_module.in_second_compile then
-                 begin
-                   current_module.in_second_compile:=false;
-                   current_module.in_compile:=true;
-                 end
-                else
-                 current_module.in_compile:=false;
-{$endif dummy}
-              end;
-           end;
-
-         dec(compile_level);
-         compiled_module:=olddata^.old_compiled_module;
-
-         dispose(olddata);
+           dec(compile_level);
+           compiled_module:=olddata^.old_compiled_module;
 
-{$ifdef USEEXCEPT}
-         if longjump_used then
-           longjmp(recoverpospointer^,1);
-{$endif USEEXCEPT}
-      end;
+           dispose(olddata);
+         end;
+    end;
 
 end.
 {
   $Log$
-  Revision 1.70  2005-01-19 22:19:41  peter
+  Revision 1.71  2005-01-26 16:23:28  peter
+    * detect arithmetic overflows for constants at compile time
+    * use try..except instead of setjmp
+
+  Revision 1.70  2005/01/19 22:19:41  peter
     * unit mapping rewrite
     * new derefmap added
 

+ 0 - 271
compiler/tpexcept.pas

@@ -1,271 +0,0 @@
-{
-    $Id$
-    Copyright (c) 1998-2002 by Florian Klaempfl
-
-    SetJmp and LongJmp implementation for recovery handling of the
-    compiler
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- ****************************************************************************}
-unit tpexcept;
-
-{$i fpcdefs.inc}
-
-interface
-
-{$ifdef VER1_0}
-  {$define HASNOLONGJMP}
-{$else}
-  {$ifdef DELPHI}
-    {$define HASNOLONGJMP}
-  {$endif}  
-{$endif}
-  
-{$ifndef UNIX}
-  {$S-}
-{$endif}
-
-{$ifdef HASNOLONGJMP}
-
-type
-   jmp_buf = record
-{$ifdef Delphi} { must preserve: ebx, esi, edi, ebp, esp, eip only }
-     _ebx,_esi,_edi,_ebp,_esp,_eip : longint;
-{$else}
-      eax,ebx,ecx,edx,esi,edi,ebp,esp,eip,flags : longint;
-      cs,ds,es,fs,gs,ss : word;
-{$endif Delphi}
-   end;
-
-   pjmp_buf = ^jmp_buf;
-
-  function setjmp(var rec : jmp_buf) : longint;{$ifndef ver1_0}oldfpccall;{$endif}
-  procedure longjmp(const rec : jmp_buf;return_value : longint);{$ifndef ver1_0}oldfpccall;{$endif}
-
-{$endif HASNOLONGJMP}
-
-  const
-     recoverpospointer : pjmp_buf = nil;
-     longjump_used : boolean = false;
-
-implementation
-
-{$ifdef HASNOLONGJMP}
-
-{*****************************************************************************
-                             Exception Helpers
-*****************************************************************************}
-
-{$ifdef DELPHI}
-
-    {$STACKFRAMES ON}
-    function setjmp(var rec : jmp_buf) : longint; assembler;
-    { [ebp+12]: [ebp+8]:@rec, [ebp+4]:eip', [ebp+0]:ebp' }
-    asm // free: eax, ecx, edx
-      { push ebp; mov ebp,esp }
-      mov  edx,rec
-      mov  [edx].jmp_buf._ebx,ebx  { ebx }
-      mov  [edx].jmp_buf._esi,esi  { esi }
-      mov  [edx].jmp_buf._edi,edi  { edi }
-      mov  eax,[ebp]               { ebp (caller stack frame) }
-      mov  [edx].jmp_buf._ebp,eax
-      lea  eax,[ebp+12] { esp [12]: [8]:@rec, [4]:eip, [0]:ebp }
-      mov  [edx].jmp_buf._esp,eax
-      mov  eax,[ebp+4]
-      mov  [edx].jmp_buf._eip,eax
-      xor  eax,eax
-      { leave }
-      { ret  4 }
-    end;
-
-    procedure longjmp(const rec : jmp_buf; return_value : longint);assembler;
-    { [ebp+12]: return_value [ebp+8]:@rec, [ebp+4]:eip', [ebp+0]:ebp' }
-    asm
-      { push ebp, mov ebp,esp }
-      mov  edx,rec
-      mov  ecx,return_value
-      mov  ebx,[edx].jmp_buf._ebx  { ebx }
-      mov  esi,[edx].jmp_buf._esi  { esi }
-      mov  edi,[edx].jmp_buf._edi  { edi }
-      mov  ebp,[edx].jmp_buf._ebp  { ebp }
-      mov  esp,[edx].jmp_buf._esp  { esp }
-      mov  eax,[edx].jmp_buf._eip  { eip }
-      push eax
-      mov  eax,ecx
-      ret  0
-    end;
-
-{$else not DELPHI}
-
-{$asmmode ATT}
-
-    function setjmp(var rec : jmp_buf) : longint; {$ifndef ver1_0}oldfpccall;{$endif}
-      begin
-         asm
-            pushl %edi
-            movl rec,%edi
-            movl %eax,(%edi)
-            movl %ebx,4(%edi)
-            movl %ecx,8(%edi)
-            movl %edx,12(%edi)
-            movl %esi,16(%edi)
-
-            { load edi }
-            movl -4(%ebp),%eax
-
-            { ... and store it }
-            movl %eax,20(%edi)
-
-            { ebp ... }
-            movl (%ebp),%eax
-            movl %eax,24(%edi)
-
-            { esp ... }
-            leal 12(%ebp),%eax
-            movl %eax,28(%edi)
-
-            { the return address }
-            movl 4(%ebp),%eax
-            movl %eax,32(%edi)
-
-            { flags ... }
-            pushfl
-            popl 36(%edi)
-
-            { !!!!! the segment registers, not yet needed }
-            { you need them if the exception comes from
-            an interrupt or a seg_move }
-            movw %cs,40(%edi)
-            movw %ds,42(%edi)
-            movw %es,44(%edi)
-            movw %fs,46(%edi)
-            movw %gs,48(%edi)
-            movw %ss,50(%edi)
-
-            { restore EDI }
-            pop %edi
-
-            { we come from the initial call }
-            xorl %eax,%eax
-
-            leave
-            ret $4
-         end;
-      end;
-
-
-    procedure longjmp(const rec : jmp_buf;return_value : longint); {$ifndef ver1_0}oldfpccall;{$endif}
-      begin
-         asm
-            { restore compiler shit }
-            popl %ebp
-            { this is the address of rec }
-            movl 4(%esp),%edi
-
-            { save return value }
-            movl 8(%esp),%eax
-            movl %eax,0(%edi)
-
-            { !!!!! load segment registers }
-            movw 46(%edi),%fs
-            movw 48(%edi),%gs
-
-            { ... and some other registers }
-            movl 4(%edi),%ebx
-            movl 8(%edi),%ecx
-            movl 12(%edi),%edx
-            movl 24(%edi),%ebp
-
-            { !!!!! movw 50(%edi),%es }
-            movl 28(%edi),%esi
-
-            { create a stack frame for the return }
-            subl $16,%esi
-
-            {
-            movzwl 42(%edi),%eax
-             !!!!! es
-            movl %eax,(%esi)
-            }
-
-            { edi }
-            movl 20(%edi),%eax
-            { !!!!! es }
-            movl %eax,(%esi)
-
-            { esi }
-            movl 16(%edi),%eax
-            { !!!!! es }
-            movl %eax,4(%esi)
-
-            { eip }
-            movl 32(%edi),%eax
-            { !!!!! es }
-            movl %eax,12(%esi)
-
-            { !!!!! cs
-            movl 40(%edi),%eax
-            es
-            movl %eax,16(%esi)
-            }
-
-            { load and store flags }
-            movl 36(%edi),%eax
-            { !!!!!
-            es
-            }
-            movl %eax,8(%esi)
-
-            { load return value }
-            movl 0(%edi),%eax
-
-            { load old ES
-            !!!!! movw 44(%edi),%es
-            }
-
-            { load stack
-            !!!!! movw 50(%edi),%ss }
-            movl %esi,%esp
-
-            { !!!!
-            popl %ds
-            }
-            popl %edi
-            popl %esi
-
-            popfl
-            ret
-         end;
-      end;
-
-{$endif DELPHI}
-
-{$endif HASNOLONGJMP}
-
-end.
-{
-  $Log$
-  Revision 1.12  2004-10-15 09:14:17  mazen
-  - remove $IFDEF DELPHI and related code
-  - remove $IFDEF FPCPROCVAR and related code
-
-  Revision 1.11  2004/06/20 08:55:30  florian
-    * logs truncated
-
-  Revision 1.10  2004/02/12 16:00:39  peter
-    * don't use the local longjmp for 1.9.x
-
-}