* fixed initialization/finalization in fpc mode

  * allow $TARGET also in search paths

compiler/globals.pas

@@ -60,13 +60,13 @@ unit globals;
 
        delphimodeswitches : tmodeswitches=
          [m_delphi,m_tp,m_all,m_class,m_objpas,m_result,m_string_pchar,
-          m_pointer_2_procedure,m_autoderef,m_tp_procvar];
+          m_pointer_2_procedure,m_autoderef,m_tp_procvar,m_initfinal];
        fpcmodeswitches    : tmodeswitches=
          [m_fpc,m_all,m_string_pchar,m_nested_comment,m_repeat_forward,
-          m_cvar_support];
+          m_cvar_support,m_initfinal];
        objfpcmodeswitches : tmodeswitches=
-         [m_fpc,m_all,m_objpas,m_class,m_result,m_string_pchar,m_nested_comment,
-          m_repeat_forward,m_cvar_support];
+         [m_fpc,m_all,m_class,m_objpas,m_result,m_string_pchar,m_nested_comment,
+          m_repeat_forward,m_cvar_support,m_initfinal];
        tpmodeswitches     : tmodeswitches=
          [m_tp,m_all,m_tp_procvar];
        gpcmodeswitches    : tmodeswitches=
@@ -184,7 +184,8 @@ unit globals;
     function min(a,b : longint) : longint;
     function max(a,b : longint) : longint;
     function align(i,a:longint):longint;
-    procedure Replace(var s:string;const s1,s2:string);
+    procedure Replace(var s:string;s1:string;const s2:string);
+    procedure ReplaceCase(var s:string;const s1,s2:string);
     function upper(const s : string) : string;
     function lower(const s : string) : string;
     function trimspace(const s:string):string;
@@ -204,6 +205,8 @@ unit globals;
     function gettimestr:string;
     function filetimestring( t : longint) : string;
 
+    procedure DefaultReplacements(var s:string);
+
     function path_absolute(const s : string) : boolean;
     Function FileExists ( Const F : String) : Boolean;
     Function RemoveFile(const f:string):boolean;
@@ -363,21 +366,44 @@ unit globals;
       end;
 
 
-    procedure Replace(var s:string;const s1,s2:string);
-    {
-      replace all s1 with s2 in string s
-    }
+    procedure Replace(var s:string;s1:string;const s2:string);
       var
+         last,
          i  : longint;
       begin
+        s1:=upper(s1);
+        last:=0;
+        repeat
+          i:=pos(s1,upper(s));
+          if i=last then
+           i:=0;
+          if (i>0) then
+           begin
+             Delete(s,i,length(s1));
+             Insert(s2,s,i);
+             last:=i;
+           end;
+        until (i=0);
+      end;
+
+
+    procedure ReplaceCase(var s:string;const s1,s2:string);
+      var
+         last,
+         i  : longint;
+      begin
+        last:=0;
         repeat
           i:=pos(s1,s);
-          if i>0 then
+          if i=last then
+           i:=0;
+          if (i>0) then
            begin
              Delete(s,i,length(s1));
              Insert(s2,s,i);
+             last:=i;
            end;
-        until i=0;
+        until (i=0);
       end;
 
 
@@ -680,6 +706,19 @@ unit globals;
        filetimestring:=L0(Year)+'/'+L0(Month)+'/'+L0(Day)+' '+L0(Hour)+':'+L0(min)+':'+L0(sec);
      end;
 
+{****************************************************************************
+                          Default Macro Handling
+****************************************************************************}
+
+     procedure DefaultReplacements(var s:string);
+       begin
+         { Replace some macro's }
+         Replace(s,'$FPCVER',full_version_string);
+         Replace(s,'$FPCDATE',date_string);
+         Replace(s,'$FPCTARGET',target_cpu_string);
+         Replace(s,'$TARGET',target_path);
+       end;
+
 
 {****************************************************************************
                                File Handling
@@ -832,14 +871,18 @@ unit globals;
       var
         i : longint;
       begin
+        { Fix separator }
         for i:=1 to length(s) do
          if s[i] in ['/','\'] then
           s[i]:=DirSep;
+        { Fix ending / }
         if (length(s)>0) and (s[length(s)]<>DirSep) and
            (s[length(s)]<>':') then
          s:=s+DirSep;
+        { Remove ./ }
         if (not allowdot) and (s='.'+DirSep) then
          s:='';
+        { return }
         FixPath:=s;
       end;
 
@@ -893,7 +936,9 @@ unit globals;
      begin
        if s='' then
         exit;
-     {Fix List}
+     { Support default macro's }
+       DefaultReplacements(s);
+     { Fix List }
        if (length(list)>0) and (list[length(list)]<>';') then
         list:=list+';';
        GetDir(0,CurrentDir);
@@ -1162,7 +1207,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.8.2.1  1999-07-07 07:53:21  michael
+  Revision 1.8.2.2  1999-07-10 10:03:04  peter
+    * fixed initialization/finalization in fpc mode
+    * allow $TARGET also in search paths
+
+  Revision 1.8.2.1  1999/07/07 07:53:21  michael
   + Merged patches from florian
 
   Revision 1.10  1999/07/06 21:48:16  florian

compiler/globtype.pas

@@ -98,11 +98,18 @@ interface
          { generic }
          m_fpc,m_delphi,m_tp,m_gpc,
          { more specific }
-         m_class,m_objpas,m_result,m_string_pchar,m_cvar_support,
-         m_nested_comment,m_tp_procvar,m_repeat_forward,
+         m_class,               { delphi class model }
+         m_objpas,              { load objpas unit }
+         m_result,              { result in functions }
+         m_string_pchar,        { pchar 2 string conversion }
+         m_cvar_support,        { cvar variable directive }
+         m_nested_comment,      { nested comments }
+         m_tp_procvar,          { tp style procvars (no @ needed) }
+         m_repeat_forward,      { repeating forward declarations is needed }
          m_pointer_2_procedure, { allows the assignement of pointers to
                                   procedure variables                     }
-         m_autoderef            { does auto dereferencing of struct. vars }
+         m_autoderef,           { does auto dereferencing of struct. vars }
+         m_initfinal            { initialization/finalization for units }
        );
        tmodeswitches = set of tmodeswitch;
 
@@ -129,7 +136,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.10  1999-05-17 14:30:39  pierre
+  Revision 1.10.2.1  1999-07-10 10:03:06  peter
+    * fixed initialization/finalization in fpc mode
+    * allow $TARGET also in search paths
+
+  Revision 1.10  1999/05/17 14:30:39  pierre
    + cs_checkpointer
 
   Revision 1.9  1999/05/12 00:19:49  peter

compiler/msgidx.inc

@@ -200,6 +200,7 @@ type tmsgconst=(
   parser_f_direct_assembler_not_allowed,
   parser_w_no_objpas_use_mode,
   parser_e_no_object_override,
+  parser_e_cant_use_inittable_here,
   type_e_mismatch,
   type_e_incompatible_types,
   type_e_not_equal_types,

compiler/msgtxt.inc

@@ -213,225 +213,227 @@ const msgtxt : array[0..000097,1..240] of char=(
   'W_Don'#039't load OBJPAS unit manual, use {$mode objfpc} or {$mode delp'+
   'hi} instead'#000+
   'E_OVERRIDE can'#039't be used in objects'#000+
+  'E_Data types which requ','ires initialization/finalization can'#039't be'+
+  ' used in variant records'#000+
   'E_Type mismatch'#000+
-  'E_Incom','patible types: got "$1" expected "$2"'#000+
+  'E_Incompatible types: got "$1" expected "$2"'#000+
   'E_Type mismatch between $1 and $2'#000+
   'E_Integer expression expected'#000+
   'E_Ordinal expression expected'#000+
-  'E_Type identifier expected'#000+
+  'E_Type identifier e','xpected'#000+
   'E_Variable identifier expected'#000+
   'E_pointer type expected'#000+
   'E_class type expected'#000+
-  'E_Va','riable or type indentifier expected'#000+
+  'E_Variable or type indentifier expected'#000+
   'E_Can'#039't evaluate constant expression'#000+
   'E_Set elements are not compatible'#000+
   'E_Operation not implemented for sets'#000+
-  'W_Automatic type conversion from floating type to COMP which is an int'+
-  'eger type'#000+
-  'H_use DIV instea','d to get an integer result'#000+
+  'W_Autom','atic type conversion from floating type to COMP which is an i'+
+  'nteger type'#000+
+  'H_use DIV instead to get an integer result'#000+
   'E_string types doesn'#039't match, because of $V+ mode'#000+
   'E_succ or pred on enums with assignments not possible'#000+
-  'E_Can'#039't read or write variables of this type'#000+
+  'E_Can'#039't read or writ','e variables of this type'#000+
   'E_Type conflict between set elements'#000+
-  'W_lo/hi(longint/dword) retu','rns the upper/lower word'#000+
+  'W_lo/hi(longint/dword) returns the upper/lower word'#000+
   'E_Integer or real expression expected'#000+
   'E_Wrong type in array constructor'#000+
-  'E_Incompatible type for arg no. $1: Got $2, expected $3'#000+
+  'E_Incompatible type for arg no. $1: Got $2, expected $','3'#000+
   'E_Method (variable) and Procedure (variable) are not compatible'#000+
-  'E_Illegal constant pass','ed to internal math function'#000+
+  'E_Illegal constant passed to internal math function'#000+
   'E_Can'#039't get the address of constants'#000+
   'E_Identifier not found $1'#000+
   'F_Internal Error in SymTableStack()'#000+
-  'E_Duplicate identifier $1'#000+
+  'E_Duplicate identifier ','$1'#000+
   'H_Identifier already defined in $1 at line $2'#000+
   'E_Unknown identifier $1'#000+
-  'E_Forward declar','ation not solved $1'#000+
+  'E_Forward declaration not solved $1'#000+
   'F_Identifier type already defined as type'#000+
   'E_Error in type definition'#000+
   'E_Type identifier not defined'#000+
   'E_Forward type not resolved $1'#000+
-  'E_Only static variables can be used in static methods or outside metho'+
-  'ds'#000+
-  'E_Invalid call to',' tvarsym.mangledname()'#000+
+  'E','_Only static variables can be used in static methods or outside met'+
+  'hods'#000+
+  'E_Invalid call to tvarsym.mangledname()'#000+
   'F_record or class type expected'#000+
   'E_Instances of classes or objects with an abstract method are not allo'+
   'wed'#000+
-  'W_Label not defined $1'#000+
+  'W_Label not defined $1',#000+
   'E_Illegal label declaration'#000+
   'E_GOTO and LABEL are not supported (use switch -Sg)'#000+
-  'E_Label ','not found'#000+
+  'E_Label not found'#000+
   'E_identifier isn'#039't a label'#000+
   'E_label already defined'#000+
   'E_illegal type declaration of set elements'#000+
   'E_Forward class definition not resolved $1'#000+
-  'H_Parameter not used $1'#000+
+  'H_Pa','rameter not used $1'#000+
   'N_Local variable not used $1'#000+
   'E_Set type expected'#000+
-  'W_Function result do','es not seem to be set'#000+
+  'W_Function result does not seem to be set'#000+
   'E_Unknown record field identifier $1'#000+
   'W_Local variable $1 does not seem to be initialized'#000+
-  'W_Variable $1 does not seem to be initialized'#000+
+  'W_Variable $1 does not seem to be initia','lized'#000+
   'E_identifier idents no member $1'#000+
   'B_Found declaration: $1'#000+
   'E_BREAK not allowed'#000+
-  'E_CONT','INUE not allowed'#000+
+  'E_CONTINUE not allowed'#000+
   'E_Expression too complicated - FPU stack overflow'#000+
   'E_Illegal expression'#000+
   'E_Invalid integer expression'#000+
   'E_Illegal qualifier'#000+
-  'E_High range limit < low range limit'#000+
+  'E_High range l','imit < low range limit'#000+
   'E_Illegal counter variable'#000+
-  'E_Can'#039't determine which overloaded func','tion to call'#000+
+  'E_Can'#039't determine which overloaded function to call'#000+
   'E_Parameter list size exceeds 65535 bytes'#000+
   'E_Illegal type conversion'#000+
-  'D_Conversion between ordinals and pointers is not portable across plat'+
+  'D_Conversion between ordinals and pointers is not portable across plat',
   'forms'#000+
   'E_File types must be var parameters'#000+
-  'E_The use of a far pointer isn'#039't allowed there'#000,
+  'E_The use of a far pointer isn'#039't allowed there'#000+
   'E_illegal call by reference parameters'#000+
   'E_EXPORT declared functions can'#039't be called'#000+
   'W_Possible illegal call of constructor or destructor (doesn'#039't matc'+
-  'h to this context)'#000+
+  'h ','to this context)'#000+
   'N_Inefficient code'#000+
   'W_unreachable code'#000+
-  'E_procedure call with stackframe E','SP/SP'#000+
+  'E_procedure call with stackframe ESP/SP'#000+
   'E_Abstract methods can'#039't be called directly'#000+
   'F_Internal Error in getfloatreg(), allocation failure'#000+
   'F_Unknown float type'#000+
-  'F_SecondVecn() base defined twice'#000+
+  'F_SecondVecn() base define','d twice'#000+
   'F_Extended cg68k not supported'#000+
   'F_32-bit unsigned not supported in MC68000 mode'#000+
-  'F_','Internal Error in secondinline()'#000+
+  'F_Internal Error in secondinline()'#000+
   'D_Register $1 weight $2 $3'#000+
   'E_Stack limit excedeed in local routine'#000+
   'D_Stack frame is omitted'#000+
-  'E_Object or class methods can'#039't be inline.'#000+
+  'E_Object or class methods ','can'#039't be inline.'#000+
   'E_Procvar calls can'#039't be inline.'#000+
   'E_No code for inline procedure stored'#000+
-  'E','_Element zero of an ansi/wide- or longstring can'#039't be accessed,'+
-  ' use (set)length instead'#000+
+  'E_Element zero of an ansi/wide- or longstring can'#039't be accessed, u'+
+  'se (set)length instead'#000+
   'E_Include and exclude not implemented in this case'#000+
-  'E_Constructors or destructors can not be called inside a '#039'with'#039+
+  'E_Constructo','rs or destructors can not be called inside a '#039'with'#039+
   ' clause'#000+
-  'E_Cannot call message handler ','method directly'#000+
+  'E_Cannot call message handler method directly'#000+
   'D_Starting $1 styled assembler parsing'#000+
   'D_Finished $1 styled assembler parsing'#000+
   'E_Non-label pattern contains @'#000+
-  'W_Override operator not supported'#000+
+  'W_Override operator not su','pported'#000+
   'E_Error building record offset'#000+
   'E_OFFSET used without identifier'#000+
-  'E_Cannot use loca','l variable or parameters here'#000+
+  'E_Cannot use local variable or parameters here'#000+
   'E_need to use OFFSET here'#000+
   'E_Cannot use multiple relocatable symbols'#000+
   'E_Relocatable symbol can only be added'#000+
-  'E_Invalid constant expression'#000+
+  'E_Invalid cons','tant expression'#000+
   'E_Relocatable symbol is not allowed'#000+
   'E_Invalid reference syntax'#000+
-  'E_Local sy','mbols not allowed as references'#000+
+  'E_Local symbols not allowed as references'#000+
   'E_Invalid base and index register usage'#000+
   'E_Wrong scale factor specified'#000+
   'E_Multiple index register usage'#000+
-  'E_Invalid operand type'#000+
+  'E_Invalid operan','d type'#000+
   'E_Invalid string as opcode operand: $1'#000+
   'W_@CODE and @DATA not supported'#000+
-  'E_Null labe','l references are not allowed'#000+
+  'E_Null label references are not allowed'#000+
   'F_Divide by zero in asm evaluator'#000+
   'F_Evaluator stack overflow'#000+
   'F_Evaluator stack underflow'#000+
-  'F_Invalid numeric format in asm evaluator'#000+
+  'F_Invalid numeric format in asm e','valuator'#000+
   'F_Invalid Operator in asm evaluator'#000+
   'E_escape sequence ignored: $1'#000+
-  'E_Invalid symb','ol reference'#000+
+  'E_Invalid symbol reference'#000+
   'W_Fwait can cause emulation problems with emu387'#000+
   'W_Calling an overload function in assembler'#000+
   'E_Unsupported symbol type for operand'#000+
-  'E_Constant value out of bounds'#000+
+  'E_Const','ant value out of bounds'#000+
   'E_Error converting decimal $1'#000+
   'E_Error converting octal $1'#000+
-  'E_Error',' converting binary $1'#000+
+  'E_Error converting binary $1'#000+
   'E_Error converting hexadecimal $1'#000+
   'H_$1 translated to $2'#000+
   'W_$1 is associated to an overloaded function'#000+
-  'E_Cannot use SELF outside a method'#000+
+  'E_Cannot use SELF outside a ','method'#000+
   'E_Cannot use OLDEBP outside a nested procedure'#000+
-  'W_Functions with void return value ','can'#039't return any value in asm'+
-  ' code'#000+
+  'W_Functions with void return value can'#039't return any value in asm c'+
+  'ode'#000+
   'E_SEG not supported'#000+
   'E_Size suffix and destination or source size do not match'#000+
-  'W_Size suffix and destination or source size do not match'#000+
+  'W_Size suffix and destination or sourc','e size do not match'#000+
   'E_Assembler syntax error'#000+
-  'E_Invalid combination of opcode and operands',#000+
+  'E_Invalid combination of opcode and operands'#000+
   'E_Assemler syntax error in operand'#000+
   'E_Assemler syntax error in constant'#000+
   'E_Invalid String expression'#000+
   '32bit constant created for address'#000+
-  'E_Invalid or missing opcode'#000+
+  'E_Invalid or mis','sing opcode'#000+
   'E_Invalid combination of prefix and opcode: $1'#000+
-  'E_Invalid combination of overr','ide and opcode: $1'#000+
+  'E_Invalid combination of override and opcode: $1'#000+
   'E_Too many operands on line'#000+
   'W_NEAR ignored'#000+
   'W_FAR ignored'#000+
   'E_Duplicate local symbol $1'#000+
   'E_Undefined local symbol $1'#000+
-  'E_Unknown label identifier $1'#000+
+  'E_Unknown label ide','ntifier $1'#000+
   'E_Invalid floating point register name'#000+
   'E_NOR not supported'#000+
-  'W_Modulo not suppor','ted'#000+
+  'W_Modulo not supported'#000+
   'E_Invalid floating point constant $1'#000+
   'E_Invalid floating point expression'#000+
   'E_Wrong symbol type'#000+
-  'E_Cannot index a local var or parameter with a register'#000+
+  'E_Cannot index a local var or parameter with a registe','r'#000+
   'E_Invalid segment override expression'#000+
   'W_Identifier $1 supposed external'#000+
-  'E_Strings not a','llowed as constants'#000+
+  'E_Strings not allowed as constants'#000+
   'No type of variable specified'#000+
   'E_assembler code not returned to text section'#000+
   'E_Not a directive or local symbol $1'#000+
-  'E_Using a defined name as a local label'#000+
+  'E_Using a defined ','name as a local label'#000+
   'F_Too many assembler files'#000+
-  'F_Selected assembler output not supporte','d'#000+
+  'F_Selected assembler output not supported'#000+
   'F_Comp not supported'#000+
   'F_Direct not support for binary writers'#000+
   'E_Allocating of data is only allowed in bss section'#000+
   'F_No binary writer selected'#000+
-  'E_Asm: Opcode $1 not in table'#000+
+  'E_Asm: O','pcode $1 not in table'#000+
   'E_Asm: $1 invalid combination of opcode and operands'#000+
-  'E_Asm: 16 Bit ','references not supported'#000+
+  'E_Asm: 16 Bit references not supported'#000+
   'E_Asm: Invalid effective address'#000+
   'E_Asm: Immediate or reference expected'#000+
   'E_Asm: $1 value exceeds bounds $2'#000+
-  'E_Asm: Short jump is out of range $1'#000+
+  'E_Asm: Short jump is',' out of range $1'#000+
   'W_Source operating system redefined'#000+
   'I_Assembling (pipe) $1'#000+
-  'E_Can'#039't creat','e assember file $1'#000+
+  'E_Can'#039't create assember file $1'#000+
   'W_Assembler $1 not found, switching to external assembling'#000+
   'T_Using assembler: $1'#000+
   'W_Error while assembling exitcode $1'#000+
-  'W_Can'#039't call the assembler, error $1 switching to external assembl'+
-  'ing'#000+
+  'W_Can'#039't call t','he assembler, error $1 switching to external assem'+
+  'bling'#000+
   'I_Assembling $1'#000+
-  'W_Linker $1 not f','ound, switching to external linking'#000+
+  'W_Linker $1 not found, switching to external linking'#000+
   'T_Using linker: $1'#000+
   'W_Object $1 not found, Linking may fail !'#000+
   'W_Library $1 not found, Linking may fail !'#000+
-  'W_Error while linking'#000+
+  'W_Error whi','le linking'#000+
   'W_Can'#039't call the linker, switching to external linking'#000+
   'I_Linking $1'#000+
-  'W_binder n','ot found, switching to external binding'#000+
+  'W_binder not found, switching to external binding'#000+
   'W_ar not found, switching to external ar'#000+
   'E_Dynamic Libraries not supported'#000+
   'I_Closing script $1'#000+
-  'W_resource compiler not found, switching to external mode'#000+
+  'W_resource compi','ler not found, switching to external mode'#000+
   'I_Compiling resource $1'#000+
-  'F_Can'#039't post process ex','ecutable $1'#000+
+  'F_Can'#039't post process executable $1'#000+
   'F_Can'#039't open executable $1'#000+
   'X_Size of Code: $1 bytes'#000+
   'X_Size of initialized data: $1 bytes'#000+
   'X_Size of uninitialized data: $1 bytes'#000+
-  'X_Stack space reserved: $1 bytes'#000+
+  'X_Stack spa','ce reserved: $1 bytes'#000+
   'X_Stack space commited: $1 bytes'#000+
   'T_Unitsearch: $1'#000+
-  'T_PPU Loading $1'#000,
+  'T_PPU Loading $1'#000+
   'U_PPU Name: $1'#000+
   'U_PPU Flags: $1'#000+
   'U_PPU Crc: $1'#000+
@@ -439,207 +441,207 @@ const msgtxt : array[0..000097,1..240] of char=(
   'U_PPU File too short'#000+
   'U_PPU Invalid Header (no PPU at the begin)'#000+
   'U_PPU Invalid Version $1'#000+
-  'U_PPU is compiled for an other processor'#000+
+  'U_','PPU is compiled for an other processor'#000+
   'U_PPU is compiled for an other target'#000+
-  'U_PPU Source',': $1'#000+
+  'U_PPU Source: $1'#000+
   'U_Writing $1'#000+
   'F_Can'#039't Write PPU-File'#000+
   'F_reading PPU-File'#000+
   'F_unexpected end of PPU-File'#000+
   'F_Invalid PPU-File entry: $1'#000+
   'F_PPU Dbx count problem'#000+
-  'E_Illegal unit name: $1'#000+
+  'E_Illegal',' unit name: $1'#000+
   'F_Too much units'#000+
   'F_Circular unit reference between $1 and $2'#000+
-  'F_Can'#039't compi','le unit $1, no sources available'#000+
+  'F_Can'#039't compile unit $1, no sources available'#000+
   'W_Compiling the system unit requires the -Us switch'#000+
   'F_There were $1 errors compiling module, stopping'#000+
-  'U_Load from $1 ($2) unit $3'#000+
+  'U_Load from $1 (','$2) unit $3'#000+
   'U_Recompiling $1, checksum changed for $2'#000+
-  'U_Recompiling $1, source found only',#000+
+  'U_Recompiling $1, source found only'#000+
   'U_Recompiling unit, static lib is older than ppufile'#000+
   'U_Recompiling unit, shared lib is older than ppufile'#000+
-  'U_Recompiling unit, obj and asm are older than ppufile'#000+
+  'U_Recompiling unit, obj and asm are older th','an ppufile'#000+
   'U_Recompiling unit, obj is older than asm'#000+
   'U_Parsing interface of $1'#000+
-  'U_Parsing ','implementation of $1'#000+
+  'U_Parsing implementation of $1'#000+
   'U_Second load for unit $1'#000+
   'U_PPU Check file $1 time $2'#000+
   '$1 [options] <inputfile> [options]'#000+
   'W_Only one source file supported'#000+
-  'W_DEF file can be created only for OS/2'#000+
+  'W_DEF fi','le can be created only for OS/2'#000+
   'E_nested response files are not supported'#000+
-  'F_No source fil','e name in command line'#000+
+  'F_No source file name in command line'#000+
   'E_Illegal parameter: $1'#000+
   'H_-? writes help pages'#000+
   'F_Too many config files nested'#000+
   'F_Unable to open file $1'#000+
-  'N_Reading further options from $1'#000+
+  'N_Reading further options',' from $1'#000+
   'W_Target is already set to: $1'#000+
-  'W_Shared libs not supported on DOS platform, reve','rting to static'#000+
+  'W_Shared libs not supported on DOS platform, reverting to static'#000+
   'F_too many IF(N)DEFs'#000+
   'F_too many ENDIFs'#000+
   'F_open conditional at the end of the file'#000+
-  'W_Debug information generation is not supported by this executable'#000+
+  'W_Debug information generation is not supported by thi','s executable'#000+
   'H_Try recompiling with -dGDB'#000+
   'E_You are using the obsolete switch $1'#000+
-  'E_You ar','e using the obsolete switch $1, please use $2'#000+
+  'E_You are using the obsolete switch $1, please use $2'#000+
   'N_Switching assembler to default source writing assembler'#000+
-  'Free Pascal Compiler version $FPCVER [$FPCDATE] for $FPCTARGET'#000+
+  'Free Pascal Compiler version $FPCVER [$FPCDATE]',' for $FPCTARGET'#000+
   'Copyright (c) 1993-98 by Florian Klaempfl'#000+
-  'Free Pascal Compiler version $F','PCVER'#000+
+  'Free Pascal Compiler version $FPCVER'#000+
   #000+
   'Compiler Date  : $FPCDATE'#000+
   'Compiler Target: $FPCTARGET'#000+
   #000+
   'This program comes under the GNU General Public Licence'#000+
-  'For more information read COPYING.FPC'#000+
+  'For more information read COPYING','.FPC'#000+
   #000+
   'Report bugs,suggestions etc to:'#000+
-  '                 [email protected]'#000,
+  '                 [email protected]'#000+
   '**0*_put + after a boolean switch option to enable it, - to disable it'+
   #000+
   '**1a_the compiler doesn'#039't delete the generated assembler file'#000+
-  '**2al_list sourcecode lines in assembler file'#000+
-  '**2ar_list register allocation/release info in assembler file',#000+
+  '**2al_list sourcec','ode lines in assembler file'#000+
+  '**2ar_list register allocation/release info in assembler file'#000+
   '**2at_list temp allocation/release info in assembler file'#000+
   '**1b_generate browser info'#000+
   '**2bl_generate local symbol info'#000+
   '**1B_build all modules'#000+
-  '**1C<x>_code generation options:'#000+
+  '**1C<x>_c','ode generation options:'#000+
   '3*2CD_create dynamic library'#000+
-  '**2Ch<n>_<n> bytes heap (between 102','3 and 67107840)'#000+
+  '**2Ch<n>_<n> bytes heap (between 1023 and 67107840)'#000+
   '**2Ci_IO-checking'#000+
   '**2Cn_omit linking stage'#000+
   '**2Co_check overflow of integer operations'#000+
   '**2Cr_range checking'#000+
-  '**2Cs<n>_set stack size to <n>'#000+
+  '**2Cs<n>_set stack size to <','n>'#000+
   '**2Ct_stack checking'#000+
   '3*2CS_create static library'#000+
   '3*2Cx_use smartlinking'#000+
-  '**1d<x>_define','s the symbol <x>'#000+
+  '**1d<x>_defines the symbol <x>'#000+
   '*O1D_generate a DEF file'#000+
   '*O2Dd<x>_set description to <x>'#000+
   '*O2Dw_PM application'#000+
   '**1e<x>_set path to executable'#000+
   '**1E_same as -Cn'#000+
-  '**1F<x>_set file names and paths:'#000+
-  '**2FD<x>_sets the directory where to search for compiler utilit','ies'#000+
+  '**1F<x>_','set file names and paths:'#000+
+  '**2FD<x>_sets the directory where to search for compiler utilities'#000+
   '**2Fe<x>_redirect error output to <x>'#000+
   '**2FE<x>_set exe/unit output path to <x>'#000+
   '**2Fi<x>_adds <x> to include path'#000+
-  '**2Fl<x>_adds <x> to library path'#000+
+  '**2Fl<x>_adds <x> to library path'#000,
   '*L2FL<x>_uses <x> as dynamic linker'#000+
   '**2Fo<x>_adds <x> to object path'#000+
-  '**2Fr<x>_load error ','message file <x>'#000+
+  '**2Fr<x>_load error message file <x>'#000+
   '**2Fu<x>_adds <x> to unit path'#000+
   '**2FU<x>_set unit output path to <x>, overrides -FE'#000+
   '*g1g<x>_generate debugger information:'#000+
-  '*g2gg_use gsym'#000+
+  '*g2gg_use gs','ym'#000+
   '*g2gd_use dbx'#000+
   '*g2gh_use heap trace unit'#000+
   '*g2gc_generate checks for pointers'#000+
-  '**1i_inform','ation'#000+
+  '**1i_information'#000+
   '**2iD_return compiler date'#000+
   '**2iV_return compiler version'#000+
   '**2iSO_return compiler OS'#000+
   '**2iSP_return compiler processor'#000+
   '**2iTO_return target OS'#000+
-  '**2iTP_return target processor'#000+
+  '**2iT','P_return target processor'#000+
   '**1I<x>_adds <x> to include path'#000+
-  '**1k<x>_Pass <x> to the linker',#000+
+  '**1k<x>_Pass <x> to the linker'#000+
   '**1l_write logo'#000+
   '**1n_don'#039't read the default config file'#000+
   '**1o<x>_change the name of the executable produced to <x>'#000+
-  '**1pg_generate profile code for gprof'#000+
+  '**1pg_generate profile code for gpro','f'#000+
   '*L1P_use pipes instead of creating temporary assembler files'#000+
   '**1S<x>_syntax options:'#000+
-  '**','2S2_switch some Delphi 2 extensions on'#000+
+  '**2S2_switch some Delphi 2 extensions on'#000+
   '**2Sc_supports operators like C (*=,+=,/= and -=)'#000+
   '**2Sd_tries to be Delphi compatible'#000+
-  '**2Se<x>_compiler stops after the <x> errors (default is 1)'#000+
+  '**2Se<x>_compiler stops af','ter the <x> errors (default is 1)'#000+
   '**2Sg_allow LABEL and GOTO'#000+
   '**2Sh_Use ansistrings'#000+
-  '**2Si_','support C++ styled INLINE'#000+
+  '**2Si_support C++ styled INLINE'#000+
   '**2Sm_support macros like C (global)'#000+
   '**2So_tries to be TP/BP 7.0 compatible'#000+
   '**2Sp_tries to be gpc compatible'#000+
-  '**2Ss_constructor name must be init (destructor must be done)'#000+
+  '**2Ss_constructo','r name must be init (destructor must be done)'#000+
   '**2St_allow static keyword in objects'#000+
-  '**1s_','don'#039't call assembler and linker (only with -a)'#000+
+  '**1s_don'#039't call assembler and linker (only with -a)'#000+
   '**1u<x>_undefines the symbol <x>'#000+
   '**1U_unit options:'#000+
   '**2Un_don'#039't check the unit name'#000+
-  '**2Us_compile a system unit'#000+
+  '**2Us_compile a syst','em unit'#000+
   '**1v<x>_Be verbose. <x> is a combination of the following letters:'#000+
-  '**2*_e : Show ','errors (default)       d : Show debug info'#000+
+  '**2*_e : Show errors (default)       d : Show debug info'#000+
   '**2*_w : Show warnings               u : Show unit info'#000+
-  '**2*_n : Show notes                  t : Show tried/used files'#000+
+  '**2*_n : Show notes                  t : Show tried/','used files'#000+
   '**2*_h : Show hints                  m : Show defined macros'#000+
-  '**2*_i : Show gen','eral info           p : Show compiled procedures'#000+
+  '**2*_i : Show general info           p : Show compiled procedures'#000+
   '**2*_l : Show linenumbers            c : Show conditionals'#000+
-  '**2*_a : Show everything             0 : Show nothing (except errors)'#000+
-  '**2*_b : Show all procedure          r : Rhide/GCC compatibili','ty mod'+
-  'e'#000+
+  '**2*_a : Show everything             0 : Sh','ow nothing (except errors'+
+  ')'#000+
+  '**2*_b : Show all procedure          r : Rhide/GCC compatibility mode'#000+
   '**2*_    declarations if an error    x : Executable info (Win32 only)'#000+
   '**2*_    occurs'#000+
   '**1X_executable options:'#000+
   '*L2Xc_link with the c library'#000+
-  '**2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
-  '**2Xs_strip all symbols from e','xecutable'#000+
+  '**','2XD_link with dynamic libraries (defines FPC_LINK_DYNAMIC)'#000+
+  '**2Xs_strip all symbols from executable'#000+
   '**2XS_link with static libraries (defines FPC_LINK_STATIC)'#000+
   '**0*_Processor specific options:'#000+
   '3*1A<x>_output format:'#000+
-  '3*2Aas_assemble using GNU AS'#000+
+  '3*2Aas_assemble using GNU ','AS'#000+
   '3*2Aasaout_assemble using GNU AS for aout (Go32v1)'#000+
-  '3*2Anasmcoff_coff (Go32v2) file usi','ng Nasm'#000+
+  '3*2Anasmcoff_coff (Go32v2) file using Nasm'#000+
   '3*2Anasmelf_elf32 (Linux) file using Nasm'#000+
   '3*2Anasmobj_obj file using Nasm'#000+
   '3*2Amasm_obj file using Masm (Microsoft)'#000+
-  '3*2Atasm_obj file using Tasm (Borland)'#000+
+  '3*2Atasm_obj file using Tasm',' (Borland)'#000+
   '3*2Acoff_coff (Go32v2) using internal writer'#000+
-  '3*2Apecoff_pecoff (Win32) using i','nternal writer'#000+
+  '3*2Apecoff_pecoff (Win32) using internal writer'#000+
   '3*1R<x>_assembler reading style:'#000+
   '3*2Ratt_read AT&T style assembler'#000+
   '3*2Rintel_read Intel style assembler'#000+
-  '3*2Rdirect_copy assembler text directly to assembler file'#000+
+  '3*2Rdirect_copy assembler text d','irectly to assembler file'#000+
   '3*1O<x>_optimizations:'#000+
   '3*2Og_generate smaller code'#000+
-  '3*2OG_genera','te faster code (default)'#000+
+  '3*2OG_generate faster code (default)'#000+
   '3*2Or_keep certain variables in registers (still BUGGY!!!)'#000+
   '3*2Ou_enable uncertain optimizations (see docs)'#000+
-  '3*2O1_level 1 optimizations (quick optimizations)'#000+
+  '3*2O1_level 1 optim','izations (quick optimizations)'#000+
   '3*2O2_level 2 optimizations (-O1 + slower optimizations)'#000+
-  '3','*2O3_level 3 optimizations (same as -O2u)'#000+
+  '3*2O3_level 3 optimizations (same as -O2u)'#000+
   '3*2Op<x>_target processor:'#000+
   '3*3Op1_set target processor to 386/486'#000+
-  '3*3Op2_set target processor to Pentium/PentiumMMX (tm)'#000+
+  '3*3Op2_set target processor to Pentium/Pent','iumMMX (tm)'#000+
   '3*3Op3_set target processor to PPro/PII/c6x86/K6 (tm)'#000+
-  '3*1T<x>_Target operatin','g system:'#000+
+  '3*1T<x>_Target operating system:'#000+
   '3*2TGO32V1_version 1 of DJ Delorie DOS extender'#000+
   '3*2TGO32V2_version 2 of DJ Delorie DOS extender'#000+
   '3*2TLINUX_Linux'#000+
   '3*2TOS2_OS/2 2.x'#000+
-  '3*2TWin32_Windows 32 Bit'#000+
+  '3*2TWin32_Wi','ndows 32 Bit'#000+
   '6*1A<x>_output format'#000+
   '6*2Aas_Unix o-file using GNU AS'#000+
-  '6*2Agas_GNU Motorola a','ssembler'#000+
+  '6*2Agas_GNU Motorola assembler'#000+
   '6*2Amit_MIT Syntax (old GAS)'#000+
   '6*2Amot_Standard Motorola assembler'#000+
   '6*1O_optimizations:'#000+
   '6*2Oa_turn on the optimizer'#000+
   '6*2Og_generate smaller code'#000+
-  '6*2OG_generate faster code (default)'#000+
+  '6','*2OG_generate faster code (default)'#000+
   '6*2Ox_optimize maximum (still BUGGY!!!)'#000+
-  '6*2O2_set tar','get processor to a MC68020+'#000+
+  '6*2O2_set target processor to a MC68020+'#000+
   '6*1R<x>_assembler reading style:'#000+
   '6*2RMOT_read motorola style assembler'#000+
   '6*1T<x>_Target operating system:'#000+
-  '6*2TAMIGA_Commodore Amiga'#000+
+  '6*2TAMIGA_Commodore',' Amiga'#000+
   '6*2TATARI_Atari ST/STe/TT'#000+
   '6*2TMACOS_Macintosh m68k'#000+
   '6*2TLINUX_Linux-68k'#000+
   '**1*_'#000+
-  '**1?_','shows this help'#000+
+  '**1?_shows this help'#000+
   '**1h_shows this help without waiting'#000
 );

compiler/systems.pas

@@ -234,6 +234,7 @@ unit systems;
        target_link : tlinkinfo;
        target_ar   : tarinfo;
        target_res  : tresinfo;
+       target_path : string[12]; { for rtl/<X>/,fcl/<X>/, etc. }
        source_os   : tosinfo;
 
     function set_target_os(t:tos):boolean;
@@ -1217,6 +1218,26 @@ begin
 {$endif}
 end;
 
+function lower(const s : string) : string;
+var
+  i : longint;
+begin
+  for i:=1 to length(s) do
+   if s[i] in ['A'..'Z'] then
+    lower[i]:=char(byte(s[i])+32)
+   else
+    lower[i]:=s[i];
+  {$ifndef TP}
+    {$ifopt H+}
+      setlength(lower,length(s));
+    {$else}
+      lower[0]:=s[0];
+    {$endif}
+  {$else}
+    lower[0]:=s[0];
+  {$endif}
+end;
+
 
 function set_target_os(t:tos):boolean;
 var
@@ -1308,6 +1329,7 @@ begin
       set_target_link(target_info.link);
       set_target_ar(target_info.ar);
       set_target_res(target_info.res);
+      target_path:=lower(target_info.short_name);
       target_cpu:=target_info.cpu;
       set_target_info:=true;
       exit;
@@ -1329,13 +1351,7 @@ begin
   for i:=1 to targetcnt do
    if target_infos[i].short_name=s then
     begin
-      target_info:=target_infos[i];
-      set_target_os(target_info.os);
-      set_target_asm(target_info.assem);
-      set_target_link(target_info.link);
-      set_target_ar(target_info.ar);
-      set_target_res(target_info.res);
-      target_cpu:=target_info.cpu;
+      set_target_info(target_infos[i].target);
       set_string_target:=true;
       exit;
     end;
@@ -1500,7 +1516,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.82.2.1  1999-07-02 12:52:58  pierre
+  Revision 1.82.2.2  1999-07-10 10:03:16  peter
+    * fixed initialization/finalization in fpc mode
+    * allow $TARGET also in search paths
+
+  Revision 1.82.2.1  1999/07/02 12:52:58  pierre
    * pecoff still buggy, as_I386_asw again default
 
   Revision 1.82  1999/06/08 11:50:28  peter

compiler/tokens.pas

@@ -265,7 +265,7 @@ const
       (str:'IN'            ;special:false;keyword:m_all),
       (str:'IS'            ;special:false;keyword:m_class),
       (str:'OF'            ;special:false;keyword:m_all),
-      (str:'ON'            ;special:false;keyword:m_objpas),
+      (str:'ON'            ;special:false;keyword:m_class),
       (str:'OR'            ;special:false;keyword:m_all),
       (str:'TO'            ;special:false;keyword:m_all),
       (str:'AND'           ;special:false;keyword:m_all),
@@ -281,7 +281,7 @@ const
       (str:'SET'           ;special:false;keyword:m_all),
       (str:'SHL'           ;special:false;keyword:m_all),
       (str:'SHR'           ;special:false;keyword:m_all),
-      (str:'TRY'           ;special:false;keyword:m_objpas),
+      (str:'TRY'           ;special:false;keyword:m_class),
       (str:'VAR'           ;special:false;keyword:m_all),
       (str:'XOR'           ;special:false;keyword:m_all),
       (str:'CASE'          ;special:false;keyword:m_all),
@@ -311,12 +311,12 @@ const
       (str:'FALSE'         ;special:false;keyword:m_all),
       (str:'INDEX'         ;special:false;keyword:m_none),
       (str:'LABEL'         ;special:false;keyword:m_all),
-      (str:'RAISE'         ;special:false;keyword:m_objpas),
+      (str:'RAISE'         ;special:false;keyword:m_class),
       (str:'UNTIL'         ;special:false;keyword:m_all),
       (str:'WHILE'         ;special:false;keyword:m_all),
       (str:'WRITE'         ;special:false;keyword:m_none),
       (str:'DOWNTO'        ;special:false;keyword:m_all),
-      (str:'EXCEPT'        ;special:false;keyword:m_objpas),
+      (str:'EXCEPT'        ;special:false;keyword:m_class),
       (str:'EXPORT'        ;special:false;keyword:m_none),
       (str:'INLINE'        ;special:false;keyword:m_none),
       (str:'OBJECT'        ;special:false;keyword:m_all),
@@ -335,7 +335,7 @@ const
       (str:'DISPOSE'       ;special:false;keyword:m_all),
       (str:'DYNAMIC'       ;special:false;keyword:m_none),
       (str:'EXPORTS'       ;special:false;keyword:m_all),
-      (str:'FINALLY'       ;special:false;keyword:m_objpas),
+      (str:'FINALLY'       ;special:false;keyword:m_class),
       (str:'FORWARD'       ;special:false;keyword:m_none),
       (str:'IOCHECK'       ;special:false;keyword:m_none),
       (str:'LIBRARY'       ;special:false;keyword:m_all),
@@ -366,16 +366,16 @@ const
       (str:'PROCEDURE'     ;special:false;keyword:m_all),
       (str:'PROTECTED'     ;special:false;keyword:m_none),
       (str:'PUBLISHED'     ;special:false;keyword:m_none),
-      (str:'THREADVAR'     ;special:false;keyword:m_objpas),
+      (str:'THREADVAR'     ;special:false;keyword:m_class),
       (str:'DESTRUCTOR'    ;special:false;keyword:m_all),
       (str:'INTERNPROC'    ;special:false;keyword:m_none),
       (str:'OPENSTRING'    ;special:false;keyword:m_none),
       (str:'CONSTRUCTOR'   ;special:false;keyword:m_all),
       (str:'INTERNCONST'   ;special:false;keyword:m_none),
       (str:'SHORTSTRING'   ;special:false;keyword:m_none),
-      (str:'FINALIZATION'  ;special:false;keyword:m_class),
+      (str:'FINALIZATION'  ;special:false;keyword:m_initfinal),
       (str:'IMPLEMENTATION';special:false;keyword:m_all),
-      (str:'INITIALIZATION';special:false;keyword:m_class)
+      (str:'INITIALIZATION';special:false;keyword:m_initfinal)
   );
 
 implementation
@@ -383,7 +383,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.7  1999-05-24 08:55:30  florian
+  Revision 1.7.2.1  1999-07-10 10:03:18  peter
+    * fixed initialization/finalization in fpc mode
+    * allow $TARGET also in search paths
+
+  Revision 1.7  1999/05/24 08:55:30  florian
     * non working safecall directiv implemented, I don't know if we
       need it
 

compiler/verbose.pas

@@ -67,7 +67,6 @@ procedure SetRedirectFile(const fn:string);
 function  SetVerbosity(const s:string):boolean;
 
 procedure LoadMsgFile(const fn:string);
-procedure UpdateReplacement(var s:string);
 
 procedure Stop;
 procedure ShowStatus;
@@ -247,14 +246,6 @@ begin
 end;
 
 
-procedure UpdateReplacement(var s:string);
-begin
-  Replace(s,'$FPCVER',full_version_string);
-  Replace(s,'$FPCDATE',date_string);
-  Replace(s,'$FPCTARGET',target_cpu_string);
-end;
-
-
 var
   lastfileidx,
   lastmoduleidx : longint;
@@ -341,7 +332,7 @@ begin
 { Create status info }
   UpdateStatus;
 { Fix replacements }
-  UpdateReplacement(s);
+  DefaultReplacements(s);
 { show comment }
   if do_comment(l,s) or dostop then
    stop;
@@ -408,7 +399,7 @@ begin
 { fix status }
   UpdateStatus;
 { Fix replacements }
-  UpdateReplacement(s);
+  DefaultReplacements(s);
 { show comment }
   if do_comment(v,s) or dostop then
    stop;
@@ -515,7 +506,11 @@ end.
 
 {
   $Log$
-  Revision 1.39.2.1  1999-06-18 10:55:32  peter
+  Revision 1.39.2.2  1999-07-10 10:03:19  peter
+    * fixed initialization/finalization in fpc mode
+    * allow $TARGET also in search paths
+
+  Revision 1.39.2.1  1999/06/18 10:55:32  peter
     * version fixes
     * EXTRAUNITS to set extra units that are build and needs to be cleaned