- remove $IFDEF DELPHI and related code

- remove $IFDEF FPCPROCVAR and related code

compiler/aasmbase.pas

@@ -198,11 +198,7 @@ interface
        end;
        TAsmObjectDataClass = class of TAsmObjectData;
 
-{$ifndef delphi}
        tasmsymbolidxarr = array[0..($7fffffff div sizeof(pointer))] of tasmsymbol;
-{$else}
-       tasmsymbolidxarr = array[0..high(word)] of tasmsymbol;
-{$endif}
        pasmsymbolidxarr = ^tasmsymbolidxarr;
 
        TAsmLibraryData = class(TLinkedListItem)
@@ -253,11 +249,7 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-      sysutils,
-{$else}
       strings,
-{$endif}
       verbose;
 
     const
@@ -949,7 +941,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.21  2004-07-22 10:09:10  jonas
+  Revision 1.22  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.21  2004/07/22 10:09:10  jonas
     * fixed relabeling properly now :)
 
   Revision 1.20  2004/07/22 10:07:09  jonas

compiler/aasmtai.pas

@@ -615,11 +615,7 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-      sysutils,
-{$else}
       strings,
-{$endif}
       verbose;
 
     const
@@ -2230,7 +2226,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.90  2004-10-05 20:41:01  peter
+  Revision 1.91  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.90  2004/10/05 20:41:01  peter
     * more spilling rewrites
 
   Revision 1.89  2004/09/26 17:45:29  peter

compiler/arm/cpubase.pas

@@ -36,9 +36,6 @@ unit cpubase;
       cpuinfo,
       aasmbase,
       cgbase
-    {$ifdef delphi}
-      ,dmisc
-    {$endif}
       ;
 
 
@@ -592,7 +589,11 @@ unit cpubase;
 end.
 {
   $Log$
-  Revision 1.31  2004-06-20 08:55:31  florian
+  Revision 1.32  2004-10-15 09:15:34  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.31  2004/06/20 08:55:31  florian
     * logs truncated
 
   Revision 1.30  2004/06/16 20:07:10  florian

compiler/browlog.pas

@@ -465,7 +465,7 @@ implementation
                       writesymtable(tobjectdef(ttypesym(hp).restype.def).symtable);
                   end;
                 procsym :
-                    Tprocsym(hp).foreach_procdef_static({$IFDEF FPCPROCVAR}@{$ENDIF}writelocalsymtables,nil);
+                    Tprocsym(hp).foreach_procdef_static(@writelocalsymtables,nil);
               end;
               hp:=tstoredsym(hp.indexnext);
             end;
@@ -516,7 +516,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.18  2004-06-20 08:55:28  florian
+  Revision 1.19  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.18  2004/06/20 08:55:28  florian
     * logs truncated
 
   Revision 1.17  2004/02/11 22:00:10  peter

compiler/catch.pas

@@ -103,7 +103,7 @@ end;
 begin
 {$ifndef nocatch}
   {$ifdef has_signal}
-    NewSignal:=SignalHandler({$ifdef fpcprocvar}@{$endif}CatchSignal);
+    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!
@@ -115,7 +115,11 @@ end.
 
 {
   $Log$
-  Revision 1.19  2004-09-09 08:19:47  olle
+  Revision 1.20  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.19  2004/09/09 08:19:47  olle
     + Added argument to Stop
 
   Revision 1.18  2004/06/20 08:55:28  florian

compiler/cclasses.pas

@@ -370,11 +370,7 @@ implementation
 
     procedure tmemdebug.start;
       begin
-{$ifdef Delphi}
-        startmem:=0;
-{$else}
         startmem:=memavail;
-{$endif Delphi}
       end;
 
 
@@ -382,9 +378,7 @@ implementation
       begin
         if startmem<>0 then
          begin
-{$ifndef Delphi}
            inc(TotalMem,memavail-startmem);
-{$endif}
            startmem:=0;
          end;
       end;
@@ -399,13 +393,11 @@ implementation
 
     procedure tmemdebug.show;
       begin
-{$ifndef Delphi}
         write('memory [',infostr,'] ');
         if TotalMem>0 then
          writeln(DStr(TotalMem shr 10),' Kb released')
         else
          writeln(DStr((-TotalMem) shr 10),' Kb allocated');
-{$endif Delphi}
       end;
 
 
@@ -2356,7 +2348,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.37  2004-10-04 20:43:28  peter
+  Revision 1.38  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.37  2004/10/04 20:43:28  peter
     * insertlistbefore added
 
   Revision 1.36  2004/09/13 20:26:26  peter

compiler/cg64f32.pas

@@ -36,9 +36,6 @@ unit cg64f32;
        cpuinfo,cpubase,cpupara,
        cgbase,cgobj,parabase,
        node,symtype
-{$ifdef delphi}
-       ,dmisc
-{$endif}
        ;
 
     type
@@ -780,7 +777,11 @@ unit cg64f32;
 end.
 {
   $Log$
-  Revision 1.63  2004-09-25 14:23:54  peter
+  Revision 1.64  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.63  2004/09/25 14:23:54  peter
     * ungetregister is now only used for cpuregisters, renamed to
       ungetcpuregister
     * renamed (get|unget)explicitregister(s) to ..cpuregister

compiler/cgobj.pas

@@ -37,9 +37,6 @@ unit cgobj;
   interface
 
     uses
-{$ifdef delphi}
-       dmisc,
-{$endif}
        cclasses,globtype,
        cpubase,cpuinfo,cgbase,parabase,
        aasmbase,aasmtai,aasmcpu,
@@ -541,7 +538,7 @@ implementation
     procedure tcg.init_register_allocators;
       begin
         fillchar(rg,sizeof(rg),0);
-        add_reg_instruction_hook:={$ifdef FPCPROCVAR}@{$endif}add_reg_instruction;
+        add_reg_instruction_hook:=@add_reg_instruction;
       end;
 
 
@@ -2095,7 +2092,11 @@ finalization
 end.
 {
   $Log$
-  Revision 1.178  2004-10-13 21:12:51  peter
+  Revision 1.179  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.178  2004/10/13 21:12:51  peter
     * -Or fixes for open array
 
   Revision 1.177  2004/10/11 15:46:45  peter

compiler/charset.pas

@@ -148,13 +148,8 @@ unit charset;
                           end;
                         flag:=umf_noinfo;
                      end;
-{$ifdef delphi}
-                   data^.flag:=flag;
-                   data^.unicode:=unicodevalue;
-{$else}
                    data[charpos].flag:=flag;
                    data[charpos].unicode:=unicodevalue;
-{$endif delphi}
                    if charpos>lastchar then
                      lastchar:=charpos;
                 end;
@@ -216,11 +211,7 @@ unit charset;
 
       begin
          if ord(c)<=p^.lastchar then
-{$ifdef Delphi}
-           getunicode:=p^.map.unicode
-{$else}
            getunicode:=p^.map[ord(c)].unicode
-{$endif}
          else
            getunicode:=0;
       end;
@@ -234,11 +225,7 @@ unit charset;
          { at least map to space }
          getascii:=#32;
          for i:=0 to p^.lastchar do
-{$ifdef Delphi}
-           if p^.map.unicode=c then
-{$else}
            if p^.map[i].unicode=c then
-{$endif}
              begin
                 if i<256 then
                   getascii:=chr(i)
@@ -267,7 +254,11 @@ finalization
 end.
 {
   $Log$
-  Revision 1.5  2004-06-20 08:55:29  florian
+  Revision 1.6  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.5  2004/06/20 08:55:29  florian
     * logs truncated
 
 }

compiler/cmsgs.pas

@@ -64,11 +64,7 @@ implementation
 
 uses
   cutils,
-{$ifdef DELPHI}
-  sysutils;
-{$else DELPHI}
   strings;
-{$endif DELPHI}
 
 
 function MsgReplace(const s:string;const args:array of string):string;
@@ -418,7 +414,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.12  2004-06-20 08:55:29  florian
+  Revision 1.13  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.12  2004/06/20 08:55:29  florian
     * logs truncated
 
   Revision 1.11  2004/06/16 20:07:07  florian

compiler/comphook.pas

@@ -127,17 +127,17 @@ type
   tgetnamedfiletimefunc = function(const filename: string): longint;
 
 const
-  do_stop          : tstopprocedure   = {$ifdef FPCPROCVAR}@{$endif}def_stop;
-  do_status        : tstatusfunction  = {$ifdef FPCPROCVAR}@{$endif}def_status;
-  do_comment       : tcommentfunction = {$ifdef FPCPROCVAR}@{$endif}def_comment;
-  do_internalerror : tinternalerrorfunction = {$ifdef FPCPROCVAR}@{$endif}def_internalerror;
+  do_stop          : tstopprocedure   = @def_stop;
+  do_status        : tstatusfunction  = @def_status;
+  do_comment       : tcommentfunction = @def_comment;
+  do_internalerror : tinternalerrorfunction = @def_internalerror;
 
-  do_initsymbolinfo : tinitsymbolinfoproc = {$ifdef FPCPROCVAR}@{$endif}def_initsymbolinfo;
-  do_donesymbolinfo : tdonesymbolinfoproc = {$ifdef FPCPROCVAR}@{$endif}def_donesymbolinfo;
-  do_extractsymbolinfo : textractsymbolinfoproc = {$ifdef FPCPROCVAR}@{$endif}def_extractsymbolinfo;
+  do_initsymbolinfo : tinitsymbolinfoproc = @def_initsymbolinfo;
+  do_donesymbolinfo : tdonesymbolinfoproc = @def_donesymbolinfo;
+  do_extractsymbolinfo : textractsymbolinfoproc = @def_extractsymbolinfo;
 
-  do_openinputfile : topeninputfilefunc = {$ifdef FPCPROCVAR}@{$endif}def_openinputfile;
-  do_getnamedfiletime : tgetnamedfiletimefunc = {$ifdef FPCPROCVAR}@{$endif}def_getnamedfiletime;
+  do_openinputfile : topeninputfilefunc = @def_openinputfile;
+  do_getnamedfiletime : tgetnamedfiletimefunc = @def_getnamedfiletime;
 
 implementation
 
@@ -208,17 +208,13 @@ begin
 { Status info?, Called every line }
   if ((status.verbosity and V_Status)<>0) then
    begin
-{$ifndef Delphi}
      if (status.compiledlines=1) then
        WriteLn(memavail shr 10,' Kb Free');
-{$endif Delphi}
      if (status.currentline>0) and (status.currentline mod 100=0) then
 {$ifdef FPC}
        WriteLn(status.currentline,' ',DStr(memavail shr 10),'/',DStr(system.heapsize shr 10),' Kb Free');
 {$else}
-  {$ifndef Delphi}
        WriteLn(status.currentline,' ',DStr(memavail shr 10),' Kb Free');
-  {$endif Delphi}
 {$endif}
    end
 end;
@@ -360,30 +356,33 @@ end;
 
 Function def_GetNamedFileTime (Const F : String) : Longint;
 var
-  L : Longint;
 {$IFDEF USE_SYSUTILS}
-  info : TSearchRec;
+  fh : THandle;
 {$ELSE USE_SYSUTILS}
   info : SearchRec;
 {$ENDIF USE_SYSUTILS}
 begin
-  l:=-1;
+  Result := -1;
 {$IFDEF USE_SYSUTILS}
-  if FindFirst (F,faArchive+faReadOnly+faHidden,info) = 0
-  then
+  fh := FileOpen(f, faArchive+faReadOnly+faHidden);
+  Result := FileGetDate(fh);
+  FileClose(fh);
 {$ELSE USE_SYSUTILS}
-    FindFirst (F,archive+readonly+hidden,info);
+  FindFirst (F,archive+readonly+hidden,info);
   if DosError=0 then
-{$ENDIF USE_SYSUTILS}
-   l:=info.time;
+    Result := info.time;
   FindClose(info);
-  def_GetNamedFileTime:=l;
+{$ENDIF USE_SYSUTILS}
 end;
 
 end.
 {
   $Log$
-  Revision 1.30  2004-10-14 18:16:17  mazen
+  Revision 1.31  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.30  2004/10/14 18:16:17  mazen
   * USE_SYSUTILS merged successfully : cycles with and without defines
   * Need to be optimized in performance
 

compiler/compiler.pas

@@ -331,7 +331,7 @@ end;
 procedure minimal_stop(err:longint);
 begin
   DoneCompiler;
-  olddo_stop{$ifdef FPCPROCVAR}(err){$endif};
+  olddo_stop(err);
 end;
 
 
@@ -377,7 +377,7 @@ var
 {$endif}
 begin
   olddo_stop:=do_stop;
-  do_stop:={$ifdef FPCPROCVAR}@{$endif}minimal_stop;
+  do_stop:=@minimal_stop;
 { Initialize the compiler }
   InitCompiler(cmd);
 
@@ -395,7 +395,7 @@ begin
   if setjmp(recoverpos)=0 then
    begin
      recoverpospointer:=@recoverpos;
-     do_stop:={$ifdef FPCPROCVAR}@{$endif}recoverstop;
+     do_stop:=@recoverstop;
 {$endif USEEXCEPT}
      starttime:=getrealtime;
 {$ifdef PREPROCWRITE}
@@ -433,14 +433,18 @@ begin
   Writeln('Memory used (heapsize): ',DStr(system.Heapsize shr 10),' Kb');
 {$endif SHOWUSEDMEM}
 {$ifdef fixLeaksOnError}
-  do_stop{$ifdef FPCPROCVAR}(){$endif};
+  do_stop;
 {$endif fixLeaksOnError}
 end;
 
 end.
 {
   $Log$
-  Revision 1.48  2004-10-14 17:17:25  mazen
+  Revision 1.49  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.48  2004/10/14 17:17:25  mazen
   * use SysUtils unit instead of Dos Unit
 
   Revision 1.47  2004/09/08 11:23:31  michael

compiler/cutils.pas

@@ -141,11 +141,7 @@ interface
 implementation
 
 uses
-{$ifdef delphi}
-  sysutils
-{$else}
   strings
-{$endif}
   ;
 
     var
@@ -1256,7 +1252,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.45  2004-10-14 14:55:12  mazen
+  Revision 1.46  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.45  2004/10/14 14:55:12  mazen
   * use SysUtils unit instead of Dos Unit
   + overload Replace to use AnsiString
 

compiler/fppu.pas

@@ -412,7 +412,7 @@ uses
     procedure tppumodule.writeusedmacros;
       begin
         ppufile.do_crc:=false;
-        tscannerfile(scanner).macros.foreach({$ifdef FPCPROCVAR}@{$endif}writeusedmacro,nil);
+        tscannerfile(scanner).macros.foreach(@writeusedmacro,nil);
         ppufile.writeentry(ibusedmacros);
         ppufile.do_crc:=true;
       end;
@@ -556,7 +556,7 @@ uses
         { get an ordered list of all symbols to put in the ppu }
         getmem(librarydata.asmsymbolidx,librarydata.asmsymbolppuidx*sizeof(pointer));
         fillchar(librarydata.asmsymbolidx^,librarydata.asmsymbolppuidx*sizeof(pointer),0);
-        librarydata.symbolsearch.foreach({$ifdef FPCPROCVAR}@{$endif}putasmsymbol_in_idx,nil);
+        librarydata.symbolsearch.foreach(@putasmsymbol_in_idx,nil);
         { write the number of symbols }
         ppufile.putlongint(librarydata.asmsymbolppuidx);
         { write the symbols from the indexed list to the ppu }
@@ -1512,7 +1512,11 @@ uses
 end.
 {
   $Log$
-  Revision 1.62  2004-09-13 20:27:27  peter
+  Revision 1.63  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.62  2004/09/13 20:27:27  peter
     * remove check for shortunitname, it broke units with 8 and 9 chars
       with the first 8 chars being equal
 

compiler/gdb.pas

@@ -27,11 +27,7 @@ unit gdb;
 interface
 
 uses
-{$ifdef delphi}
-  sysutils,
-{$else}
   strings,
-{$endif}
   globtype,
   aasmtai;
 
@@ -239,7 +235,11 @@ end.
 
 {
   $Log$
-  Revision 1.19  2004-06-20 08:55:29  florian
+  Revision 1.20  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.19  2004/06/20 08:55:29  florian
     * logs truncated
 
   Revision 1.18  2004/03/08 22:07:46  peter

compiler/globals.pas

@@ -1112,10 +1112,6 @@ implementation
             else
              hs:=currpath;
             hsd:=SplitPath(hs);
-{$IFDEF USE_SYSUTILS}
-{$ELSE USE_SYSUTILS}
-            findfirst(hs,directory,dir);
-{$ENDIF USE_SYSUTILS}
             subdirfound:=false;
 {$IFDEF USE_SYSUTILS}
             if findfirst(hs,faDirectory,dir) = 0
@@ -1134,6 +1130,7 @@ implementation
                  WarnNonExistingPath(currpath);
             until findnext(dir) <> 0;
 {$ELSE USE_SYSUTILS}
+            findfirst(hs,directory,dir);
             while doserror=0 do
              begin
                if (dir.name<>'.') and
@@ -1414,7 +1411,7 @@ implementation
       {$ifdef GETENVOK}
         {$undef GETENVOK}
       {$else}
-        GetEnvPchar:=StrPNew({$ifdef delphi}DMisc{$else}Dos{$endif}.Getenv(envname));
+        GetEnvPchar:=StrPNew(Dos.Getenv(envname));
       {$endif}
       end;
 
@@ -2121,7 +2118,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.144  2004-10-14 18:16:17  mazen
+  Revision 1.145  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.144  2004/10/14 18:16:17  mazen
   * USE_SYSUTILS merged successfully : cycles with and without defines
   * Need to be optimized in performance
 

compiler/globtype.pas

@@ -282,7 +282,6 @@ than 255 characters. That's why using Ansi Strings}
                     (values:longint);
        end;
 
-{$ifndef Delphi}
   {$ifndef xFPC}
     type
       pguid = ^tguid;
@@ -293,7 +292,6 @@ than 255 characters. That's why using Ansi Strings}
         D4: array[0..7] of Byte;
       end;
   {$endif}
-{$endif}
 
     const
        { link options }
@@ -308,7 +306,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.61  2004-10-14 14:42:57  mazen
+  Revision 1.62  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.61  2004/10/14 14:42:57  mazen
   + Needed types aliases to merge USE_SYSUTILS branch
 
   Revision 1.60  2004/09/26 17:45:30  peter

compiler/i386/ag386int.pas

@@ -50,9 +50,6 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-      sysutils,
-{$endif}
       cutils,globtype,globals,systems,cclasses,
       verbose,finput,fmodule,script,cpuinfo,
       itx86int,
@@ -765,7 +762,7 @@ ait_stab_function_name : ;
     procedure T386IntelAssembler.WriteExternals;
       begin
         currentasmlist:=self;
-        objectlibrary.symbolsearch.foreach_static({$ifdef fpcprocvar}@{$endif}writeexternal,nil);
+        objectlibrary.symbolsearch.foreach_static(@writeexternal,nil);
       end;
 
 
@@ -878,7 +875,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.51  2004-09-26 17:45:30  peter
+  Revision 1.52  2004-10-15 09:16:21  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.51  2004/09/26 17:45:30  peter
     * simple regvar support, not yet finished
 
   Revision 1.50  2004/06/20 08:55:31  florian

compiler/i386/ag386nsm.pas

@@ -49,9 +49,6 @@ interface
   implementation
 
     uses
-{$ifdef delphi}
-      sysutils,
-{$endif}
       cutils,globtype,globals,systems,cclasses,
       fmodule,finput,verbose,cpuinfo,cgbase
       ;
@@ -776,7 +773,7 @@ interface
     procedure T386NasmAssembler.WriteExternals;
       begin
         currentasmlist:=self;
-        objectlibrary.symbolsearch.foreach_static({$ifdef fpcprocvar}@{$endif}writeexternal,nil);
+        objectlibrary.symbolsearch.foreach_static(@writeexternal,nil);
       end;
 
 
@@ -909,7 +906,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.48  2004-09-26 17:45:30  peter
+  Revision 1.49  2004-10-15 09:16:21  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.48  2004/09/26 17:45:30  peter
     * simple regvar support, not yet finished
 
   Revision 1.47  2004/06/20 08:55:31  florian

compiler/i386/cgcpu.pas

@@ -32,9 +32,6 @@ unit cgcpu;
        aasmbase,aasmtai,aasmcpu,
        cpubase,cpuinfo,parabase,
        node,symconst
-{$ifdef delphi}
-       ,dmisc
-{$endif}
        ;
 
     type
@@ -574,7 +571,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.56  2004-10-13 21:12:51  peter
+  Revision 1.57  2004-10-15 09:16:21  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.56  2004/10/13 21:12:51  peter
     * -Or fixes for open array
 
   Revision 1.55  2004/10/11 15:46:45  peter

compiler/i386/n386mem.pas

@@ -48,9 +48,6 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-      sysutils,
-{$endif}
       systems,
       cutils,verbose,
       symdef,paramgr,
@@ -144,7 +141,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.63  2004-09-25 14:23:54  peter
+  Revision 1.64  2004-10-15 09:16:22  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.63  2004/09/25 14:23:54  peter
     * ungetregister is now only used for cpuregisters, renamed to
       ungetcpuregister
     * renamed (get|unget)explicitregister(s) to ..cpuregister

compiler/msgtxt.inc

@@ -1,8 +1,4 @@
-{$ifdef Delphi}
-const msgtxt : array[0..000154] of string[240]=(
-{$else Delphi}
 const msgtxt : array[0..000154,1..240] of char=(
-{$endif Delphi}
   '01000_T_Compiler: $1'#000+
   '01001_D_Compiler OS: $1'#000+
   '01002_I_Target OS: $1'#000+

compiler/ncal.pas

@@ -1096,7 +1096,7 @@ type
           begin
              objectdf := objectinfo.objinfo;
              if assigned(objectdf.symtable) then
-               objectdf.symtable.foreach({$ifdef FPCPROCVAR}@{$endif}verifyabstract,nil);
+               objectdf.symtable.foreach(@verifyabstract,nil);
              objectinfo:=tobjectinfoitem(objectinfo.next);
           end;
         if assigned(parents) then
@@ -2054,7 +2054,7 @@ type
         tempnodes.createstatement := createstatement;
         tempnodes.deletestatement := deletestatement;
         setlength(inlinelocals,tprocdef(procdefinition).localst.symindex.count);
-        tprocdef(procdefinition).localst.foreach({$ifdef FPCPROCVAR}@{$endif}createlocaltemps,@tempnodes);
+        tprocdef(procdefinition).localst.foreach(@createlocaltemps,@tempnodes);
         createstatement := tempnodes.createstatement;
         deletestatement := tempnodes.deletestatement;
 {$endif ndef VER1_0}
@@ -2096,7 +2096,7 @@ type
                   { replace complex parameters with temps }
                   createinlineparas(createstatement,deletestatement);
                   { replace the parameter loads with the parameter values }
-                  foreachnode(result,{$ifdef FPCPROCVAR}@{$endif}replaceparaload,@fileinfo);
+                  foreachnode(result,replaceparaload,@fileinfo);
                   { free the temps for the locals }
                   for i := 0 to high(inlinelocals) do
                     if assigned(inlinelocals[i]) then
@@ -2415,7 +2415,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.251  2004-10-12 14:36:38  peter
+  Revision 1.252  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.251  2004/10/12 14:36:38  peter
     * gen high tree makes copy in temp when there is a calln
 
   Revision 1.250  2004/10/10 20:22:53  peter

compiler/ncgcal.pas

@@ -80,11 +80,7 @@ implementation
       cutils,verbose,globals,
       symconst,symsym,symtable,defutil,paramgr,
 {$ifdef GDB}
-  {$ifdef delphi}
-      sysutils,
-  {$else}
       strings,
-  {$endif}
       gdb,
 {$endif GDB}
       cgbase,pass_2,
@@ -1243,7 +1239,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.177  2004-10-10 20:21:18  peter
+  Revision 1.178  2004-10-15 09:14:16  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.177  2004/10/10 20:21:18  peter
     * passing a var parameter to var parameter is now also allowed
       for register locations (=regvars)
 

compiler/ncgcon.pas

@@ -68,9 +68,6 @@ implementation
       symconst,symdef,aasmbase,aasmtai,aasmcpu,defutil,
       cpuinfo,cpubase,
       cgbase,cgobj,
-{$ifdef delphi}
-      ,dmisc
-{$endif}
       ncgutil
       ;
 
@@ -754,7 +751,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.45  2004-08-08 16:00:56  florian
+  Revision 1.46  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.45  2004/08/08 16:00:56  florian
     * constant floating point assignments etc. are now overflow checked
       if Q+ or R+ is turned on
 

compiler/ncgutil.pas

@@ -111,11 +111,7 @@ interface
 implementation
 
   uses
-{$ifdef Delphi}
-    Sysutils,
-{$else}
     strings,
-{$endif}
     cutils,cclasses,
     globals,systems,verbose,
     ppu,defutil,
@@ -2222,7 +2218,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.228  2004-10-14 17:54:06  peter
+  Revision 1.229  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.228  2004/10/14 17:54:06  peter
     * add reg_sync when regvars are allocated to fix first use in
       loop
 

compiler/ncnv.pas

@@ -31,9 +31,6 @@ interface
        symtype,
        defutil,defcmp,
        nld
-{$ifdef Delphi}
-       ,dmisc
-{$endif}
        ;
 
     type
@@ -2465,7 +2462,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.155  2004-10-12 14:33:41  peter
+  Revision 1.156  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.155  2004/10/12 14:33:41  peter
     * give error when converting class to interface are not related
 
   Revision 1.154  2004/10/11 15:48:15  peter

compiler/nflw.pas

@@ -385,13 +385,8 @@ implementation
                 left:=Tunarynode(left).left;
                 t.left:=nil;
                 t.destroy;
-{$ifdef Delphi}
-                { How can this be handled in Delphi ? }
-                RunError(255);
-{$else}
                 {Symdif operator, in case you are wondering:}
                 loopflags:=loopflags >< [lnf_checknegate];
-{$endif}
             end;
          { loop instruction }
          if assigned(right) then
@@ -1429,7 +1424,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.100  2004-09-13 20:28:26  peter
+  Revision 1.101  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.100  2004/09/13 20:28:26  peter
     * for loop variable assignment is not allowed anymore
 
   Revision 1.99  2004/08/30 12:09:45  michael

compiler/nobj.pas

@@ -28,9 +28,6 @@ unit nobj;
 interface
 
     uses
-{$ifdef Delphi}
-       dmisc,
-{$endif}
        cutils,cclasses,
        globtype,
        symdef,symsym,
@@ -145,11 +142,7 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-       sysutils,
-{$else}
        strings,
-{$endif}
        globals,verbose,systems,
        symtable,symconst,symtype,defcmp,paramgr,
 {$ifdef GDB}
@@ -321,7 +314,7 @@ implementation
          root:=nil;
          count:=0;
          { insert all message handlers into a tree, sorted by name }
-         _class.symtable.foreach({$ifdef FPCPROCVAR}@{$endif}insertmsgstr,nil);
+         _class.symtable.foreach(@insertmsgstr,nil);
 
          { write all names }
          if assigned(root) then
@@ -362,7 +355,7 @@ implementation
          root:=nil;
          count:=0;
          { insert all message handlers into a tree, sorted by name }
-         _class.symtable.foreach({$ifdef FPCPROCVAR}@{$endif}insertmsgint,nil);
+         _class.symtable.foreach(@insertmsgint,nil);
 
          { now start writing of the message string table }
          objectlibrary.getdatalabel(r);
@@ -438,7 +431,7 @@ implementation
          count:=0;
          gendmt:=nil;
          { insert all message handlers into a tree, sorted by number }
-         _class.symtable.foreach({$ifdef FPCPROCVAR}@{$endif}insertdmtentry);
+         _class.symtable.foreach(insertdmtentry);
 
          if count>0 then
            begin
@@ -504,14 +497,14 @@ implementation
 
       begin
          count:=0;
-         _class.symtable.foreach({$ifdef FPCPROCVAR}@{$endif}do_count,nil);
+         _class.symtable.foreach(@do_count,nil);
          if count>0 then
            begin
               objectlibrary.getdatalabel(l);
               datasegment.concat(tai_align.create(const_align(sizeof(aint))));
               dataSegment.concat(Tai_label.Create(l));
               dataSegment.concat(Tai_const.Create_32bit(count));
-              _class.symtable.foreach({$ifdef FPCPROCVAR}@{$endif}genpubmethodtableentry,nil);
+              _class.symtable.foreach(@genpubmethodtableentry,nil);
               genpublishedmethodstable:=l;
            end
          else
@@ -825,7 +818,7 @@ implementation
              do_genvmt(p.childof);
 
            { walk through all public syms }
-           p.symtable.foreach({$ifdef FPCPROCVAR}@{$endif}eachsym,nil);
+           p.symtable.foreach(@eachsym,nil);
         end;
 
       begin
@@ -1389,7 +1382,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.77  2004-10-12 14:34:49  peter
+  Revision 1.78  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.77  2004/10/12 14:34:49  peter
     * fixed visibility for procsyms
     * fixed override check when there was no entry yet
 

compiler/ogcoff.pas

@@ -167,11 +167,7 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-       sysutils,
-{$else}
        strings,
-{$endif}
        cutils,verbose,
        globals,fmodule;
 
@@ -1793,7 +1789,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.32  2004-08-27 20:55:08  peter
+  Revision 1.33  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.32  2004/08/27 20:55:08  peter
   don't use .rodata, it doesn't work yet
 
   Revision 1.31  2004/08/25 15:55:32  peter

compiler/ogelf.pas

@@ -112,11 +112,7 @@ interface
 implementation
 
       uses
-{$ifdef delphi}
-        sysutils,
-{$else}
         strings,
-{$endif}
         verbose,
         cutils,globals,fmodule;
 
@@ -922,7 +918,11 @@ initialization
 end.
 {
   $Log$
-  Revision 1.22  2004-08-25 15:55:10  peter
+  Revision 1.23  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.22  2004/08/25 15:55:10  peter
     * .rodata section support, disabled by default since it doesn't work
       yet
 

compiler/oglx.pas

@@ -157,11 +157,7 @@ type    Tlxheader = packed record
 implementation
 
 uses
-{$ifdef delphi}
-       sysutils,
-{$else}
        strings,
-{$endif}
        cutils,verbose,
        globtype,globals,fmodule;
 
@@ -399,7 +395,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.6  2004-06-20 08:55:30  florian
+  Revision 1.7  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.6  2004/06/20 08:55:30  florian
     * logs truncated
 
 }

compiler/options.pas

@@ -1544,13 +1544,8 @@ begin
           case quickinfo[i] of
            'O' :
              addinfo(lower(source_info.shortname));
-{$ifdef Delphi}
-           'P' :
-             addinfo('i386');
-{$else Delphi}
            'P' :
              addinfo(source_cpu_string);
-{$endif Delphi}
            else
              IllegalPara('-i'+QuickInfo);
           end;
@@ -2117,7 +2112,11 @@ finalization
 end.
 {
   $Log$
-  Revision 1.146  2004-10-14 14:03:02  mazen
+  Revision 1.147  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.146  2004/10/14 14:03:02  mazen
   * Merge is complete for this file, cycles !
 
   Revision 1.145  2004/10/05 20:21:02  florian

compiler/owar.pas

@@ -70,11 +70,7 @@ uses
    systems,
    globals,
    verbose,
-{$ifdef Delphi}
-   dmisc;
-{$else Delphi}
    dos;
-{$endif Delphi}
 
 const
   symrelocbufsize = 4096;
@@ -287,7 +283,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.15  2004-06-20 08:55:30  florian
+  Revision 1.16  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.15  2004/06/20 08:55:30  florian
     * logs truncated
 
   Revision 1.14  2004/05/27 18:53:43  peter

compiler/parser.pas

@@ -382,10 +382,8 @@ implementation
       var
          olddata : polddata;
 {$ifdef USEEXCEPT}
-{$ifndef Delphi}
          recoverpos    : jmp_buf;
          oldrecoverpos : pjmp_buf;
-{$endif Delphi}
 {$endif useexcept}
        begin
          inc(compile_level);
@@ -713,7 +711,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.66  2004-06-20 08:55:30  florian
+  Revision 1.67  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.66  2004/06/20 08:55:30  florian
     * logs truncated
 
   Revision 1.65  2004/05/12 13:21:09  karoly

compiler/pdecl.pas

@@ -361,7 +361,7 @@ implementation
                   end;
                end;
              recorddef :
-               trecorddef(pd).symtable.foreach_static({$ifdef FPCPROCVAR}@{$endif}resolve_type_forward,nil);
+               trecorddef(pd).symtable.foreach_static(@resolve_type_forward,nil);
              objectdef :
                begin
                  if not(m_fpc in aktmodeswitches) and
@@ -377,7 +377,7 @@ implementation
                       check objectdefs in objects/records, because these
                       can't exist (anonymous objects aren't allowed) }
                     if not(tsym(p).owner.symtabletype in [objectsymtable,recordsymtable]) then
-                     tobjectdef(pd).symtable.foreach_static({$ifdef FPCPROCVAR}@{$endif}resolve_type_forward,nil);
+                     tobjectdef(pd).symtable.foreach_static(@resolve_type_forward,nil);
                   end;
                end;
           end;
@@ -557,7 +557,7 @@ implementation
             end;
          until token<>_ID;
          typecanbeforward:=false;
-         symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}resolve_type_forward,nil);
+         symtablestack.foreach_static(@resolve_type_forward,nil);
          block_type:=old_block_type;
       end;
 
@@ -659,7 +659,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.88  2004-09-13 20:33:17  peter
+  Revision 1.89  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.88  2004/09/13 20:33:17  peter
     * use realname in error msg
 
   Revision 1.87  2004/06/20 08:55:30  florian

compiler/pdecobj.pas

@@ -41,10 +41,6 @@ implementation
       node,nld,nmem,ncon,ncnv,ncal,
       scanner,
       pbase,pexpr,pdecsub,pdecvar,ptype
-{$ifdef delphi}
-      ,dmisc
-      ,sysutils
-{$endif}
       ;
 
     const
@@ -737,7 +733,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.81  2004-08-29 11:28:10  peter
+  Revision 1.82  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.81  2004/08/29 11:28:10  peter
   allow published for constructors
 
   Revision 1.80  2004/08/25 15:57:04  peter

compiler/pdecsub.pas

@@ -62,11 +62,7 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-       sysutils,
-{$else delphi}
        strings,
-{$endif delphi}
        { common }
        cutils,cclasses,
        { global }
@@ -1285,7 +1281,7 @@ const
     (
       idtok:_ABSTRACT;
       pd_flags : [pd_interface,pd_object,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_abstract;
+      handler  : @pd_abstract;
       pocall   : pocall_none;
       pooption : [po_abstractmethod];
       mutexclpocall : [pocall_internproc,pocall_inline];
@@ -1294,7 +1290,7 @@ const
     ),(
       idtok:_ALIAS;
       pd_flags : [pd_implemen,pd_body,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_alias;
+      handler  : @pd_alias;
       pocall   : pocall_none;
       pooption : [];
       mutexclpocall : [pocall_inline];
@@ -1303,7 +1299,7 @@ const
     ),(
       idtok:_ASMNAME;
       pd_flags : [pd_interface,pd_implemen,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_asmname;
+      handler  : @pd_asmname;
       pocall   : pocall_cdecl;
       pooption : [po_external];
       mutexclpocall : [pocall_internproc,pocall_inline];
@@ -1339,7 +1335,7 @@ const
     ),(
       idtok:_DYNAMIC;
       pd_flags : [pd_interface,pd_object,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_virtual;
+      handler  : @pd_virtual;
       pocall   : pocall_none;
       pooption : [po_virtualmethod];
       mutexclpocall : [pocall_internproc,pocall_inline];
@@ -1348,7 +1344,7 @@ const
     ),(
       idtok:_EXPORT;
       pd_flags : [pd_body,pd_interface,pd_implemen,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_export;
+      handler  : @pd_export;
       pocall   : pocall_none;
       pooption : [po_exports,po_public];
       mutexclpocall : [pocall_internproc,pocall_inline];
@@ -1357,7 +1353,7 @@ const
     ),(
       idtok:_EXTERNAL;
       pd_flags : [pd_implemen,pd_interface,pd_notobject,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_external;
+      handler  : @pd_external;
       pocall   : pocall_none;
       pooption : [po_external];
       mutexclpocall : [pocall_internproc,pocall_inline,pocall_syscall];
@@ -1366,7 +1362,7 @@ const
     ),(
       idtok:_FAR;
       pd_flags : [pd_implemen,pd_body,pd_interface,pd_procvar,pd_notobject,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_far;
+      handler  : @pd_far;
       pocall   : pocall_none;
       pooption : [];
       mutexclpocall : [pocall_internproc,pocall_inline];
@@ -1384,7 +1380,7 @@ const
     ),(
       idtok:_FORWARD;
       pd_flags : [pd_implemen,pd_notobject,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_forward;
+      handler  : @pd_forward;
       pocall   : pocall_none;
       pooption : [];
       mutexclpocall : [pocall_internproc,pocall_inline];
@@ -1402,7 +1398,7 @@ const
     ),(
       idtok:_INLINE;
       pd_flags : [pd_interface,pd_implemen,pd_body,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_inline;
+      handler  : @pd_inline;
       pocall   : pocall_inline;
       pooption : [];
       mutexclpocall : [];
@@ -1411,7 +1407,7 @@ const
     ),(
       idtok:_INTERNCONST;
       pd_flags : [pd_implemen,pd_body,pd_notobject,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_intern;
+      handler  : @pd_intern;
       pocall   : pocall_none;
       pooption : [po_internconst];
       mutexclpocall : [];
@@ -1420,7 +1416,7 @@ const
     ),(
       idtok:_INTERNPROC;
       pd_flags : [pd_implemen,pd_notobject,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_intern;
+      handler  : @pd_intern;
       pocall   : pocall_internproc;
       pooption : [];
       mutexclpocall : [];
@@ -1429,7 +1425,7 @@ const
     ),(
       idtok:_INTERRUPT;
       pd_flags : [pd_implemen,pd_body,pd_notobject,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_interrupt;
+      handler  : @pd_interrupt;
       pocall   : pocall_none;
       pooption : [po_interrupt];
       mutexclpocall : [pocall_internproc,pocall_cdecl,pocall_cppdecl,pocall_stdcall,
@@ -1448,7 +1444,7 @@ const
     ),(
       idtok:_MESSAGE;
       pd_flags : [pd_interface,pd_object,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_message;
+      handler  : @pd_message;
       pocall   : pocall_none;
       pooption : []; { can be po_msgstr or po_msgint }
       mutexclpocall : [pocall_inline,pocall_internproc];
@@ -1457,7 +1453,7 @@ const
     ),(
       idtok:_NEAR;
       pd_flags : [pd_implemen,pd_body,pd_procvar,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_near;
+      handler  : @pd_near;
       pocall   : pocall_none;
       pooption : [];
       mutexclpocall : [pocall_internproc];
@@ -1475,7 +1471,7 @@ const
     ),(
       idtok:_OVERLOAD;
       pd_flags : [pd_implemen,pd_interface,pd_body];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_overload;
+      handler  : @pd_overload;
       pocall   : pocall_none;
       pooption : [po_overload];
       mutexclpocall : [pocall_internproc];
@@ -1484,7 +1480,7 @@ const
     ),(
       idtok:_OVERRIDE;
       pd_flags : [pd_interface,pd_object,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_override;
+      handler  : @pd_override;
       pocall   : pocall_none;
       pooption : [po_overridingmethod,po_virtualmethod];
       mutexclpocall : [pocall_inline,pocall_internproc];
@@ -1520,7 +1516,7 @@ const
     ),(
       idtok:_REINTRODUCE;
       pd_flags : [pd_interface,pd_object,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_reintroduce;
+      handler  : @pd_reintroduce;
       pocall   : pocall_none;
       pooption : [po_reintroduce];
       mutexclpocall : [pocall_inline,pocall_internproc];
@@ -1558,7 +1554,7 @@ const
     ),(
       idtok:_STATIC;
       pd_flags : [pd_interface,pd_object,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_static;
+      handler  : @pd_static;
       pocall   : pocall_none;
       pooption : [po_staticmethod];
       mutexclpocall : [pocall_inline,pocall_internproc];
@@ -1576,7 +1572,7 @@ const
     ),(
       idtok:_SYSCALL;
       pd_flags : [pd_interface,pd_implemen,pd_notobject,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_syscall;
+      handler  : @pd_syscall;
       pocall   : pocall_syscall;
       pooption : [];
       mutexclpocall : [];
@@ -1585,7 +1581,7 @@ const
     ),(
       idtok:_VIRTUAL;
       pd_flags : [pd_interface,pd_object,pd_notobjintf];
-      handler  : {$ifdef FPCPROCVAR}@{$endif}pd_virtual;
+      handler  : @pd_virtual;
       pocall   : pocall_none;
       pooption : [po_virtualmethod];
       mutexclpocall : [pocall_inline,pocall_internproc];
@@ -1809,7 +1805,7 @@ const
                      tprocdef(pd).setmangledname(target_info.Cprefix+tprocdef(pd).procsym.realname);
                   end;
                  { check C cdecl para types }
-                 pd.parast.foreach_static({$ifdef FPCPROCVAR}@{$endif}check_c_para,nil);
+                 pd.parast.foreach_static(@check_c_para,nil);
                end;
             end;
           pocall_cppdecl :
@@ -1820,7 +1816,7 @@ const
                  if not tprocdef(pd).has_mangledname then
                   tprocdef(pd).setmangledname(target_info.Cprefix+tprocdef(pd).cplusplusmangledname);
                  { check C cdecl para types }
-                 pd.parast.foreach_static({$ifdef FPCPROCVAR}@{$endif}check_c_para,nil);
+                 pd.parast.foreach_static(@check_c_para,nil);
                end;
             end;
           pocall_compilerproc :
@@ -1872,7 +1868,7 @@ const
 
         { Make var parameters regable, this must be done after the calling
           convention is set. }
-        pd.parast.foreach_static({$ifdef FPCPROCVAR}@{$endif}set_addr_param_regable,pd);
+        pd.parast.foreach_static(@set_addr_param_regable,pd);
 
         { add mangledname to external list }
         if (pd.deftype=procdef) and
@@ -2270,7 +2266,11 @@ const
 end.
 {
   $Log$
-  Revision 1.193  2004-10-11 15:45:35  peter
+  Revision 1.194  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.193  2004/10/11 15:45:35  peter
     * mark non-regable after calling convention is set
 
   Revision 1.192  2004/10/10 21:08:55  peter

compiler/pdecvar.pas

@@ -56,10 +56,6 @@ implementation
        pbase,pexpr,ptype,ptconst,pdecsub,
        { link }
        import
-{$ifdef Delphi}
-       ,dmisc
-       ,sysutils
-{$endif}
        ;
 
 
@@ -1288,7 +1284,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.80  2004-10-12 14:36:38  peter
+  Revision 1.81  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.80  2004/10/12 14:36:38  peter
     * gen high tree makes copy in temp when there is a calln
 
   Revision 1.79  2004/08/17 16:29:21  jonas

compiler/pexports.pas

@@ -48,10 +48,6 @@ implementation
        pbase,pexpr,
        { link }
        gendef,export
-{$ifdef Delphi}
-       ,dmisc
-       ,sysutils
-{$endif}
        ;
 
 
@@ -186,7 +182,11 @@ end.
 
 {
   $Log$
-  Revision 1.28  2004-06-20 08:55:30  florian
+  Revision 1.29  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.28  2004/06/20 08:55:30  florian
     * logs truncated
 
   Revision 1.27  2004/06/16 20:07:09  florian

compiler/pexpr.pas

@@ -62,9 +62,6 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-       SysUtils,
-{$endif}
        { common }
        cutils,
        { global }
@@ -2481,7 +2478,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.165  2004-10-12 19:51:13  peter
+  Revision 1.166  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.165  2004/10/12 19:51:13  peter
     * all checking for visibility is now done by is_visible_for_object
 
   Revision 1.164  2004/10/12 14:35:47  peter

compiler/pinline.pas

@@ -44,9 +44,6 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-       SysUtils,
-{$endif}
        { common }
        cutils,
        { global }
@@ -759,7 +756,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.32  2004-06-20 08:55:30  florian
+  Revision 1.33  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.32  2004/06/20 08:55:30  florian
     * logs truncated
 
   Revision 1.31  2004/05/23 18:28:41  peter

compiler/pmodules.pas

@@ -247,8 +247,8 @@ implementation
       begin
          ltvTable:=TAAsmoutput.create;
          if assigned(current_module.globalsymtable) then
-           current_module.globalsymtable.foreach_static({$ifdef FPCPROCVAR}@{$endif}AddToThreadvarList,ltvTable);
-         current_module.localsymtable.foreach_static({$ifdef FPCPROCVAR}@{$endif}AddToThreadvarList,ltvTable);
+           current_module.globalsymtable.foreach_static(@AddToThreadvarList,ltvTable);
+         current_module.localsymtable.foreach_static(@AddToThreadvarList,ltvTable);
          if ltvTable.first<>nil then
           begin
             s:=make_mangledname('THREADVARLIST',current_module.localsymtable,'');
@@ -1564,7 +1564,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.165  2004-10-04 18:26:51  peter
+  Revision 1.166  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.165  2004/10/04 18:26:51  peter
     * debuginfo fixes
 
   Revision 1.164  2004/09/14 16:33:46  peter

compiler/pp.lpi

@@ -9,149 +9,147 @@
         <MainUnitHasUsesSectionForAllUnits Value="False"/>
       </Flags>
       <MainUnit Value="0"/>
-      <ActiveEditorIndexAtStart Value="16"/>
+      <ActiveEditorIndexAtStart Value="21"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=""/>
       <Title Value="pp"/>
     </General>
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="systems/t_linux.pas"/>
-        <Caret Line="467" Column="41" TopLine="453"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1871" Column="34" TopLine="1857"/>
       </Position1>
       <Position2>
-        <Filename Value="systems/t_linux.pas"/>
-        <Caret Line="19" Column="24" TopLine="5"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1285" Column="18" TopLine="1269"/>
       </Position2>
       <Position3>
-        <Filename Value="systems/t_linux.pas"/>
-        <Caret Line="435" Column="19" TopLine="429"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1302" Column="18" TopLine="1288"/>
       </Position3>
       <Position4>
-        <Filename Value="systems/t_linux.pas"/>
-        <Caret Line="506" Column="40" TopLine="492"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1338" Column="19" TopLine="1324"/>
       </Position4>
       <Position5>
-        <Filename Value="systems/t_bsd.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1347" Column="19" TopLine="1333"/>
       </Position5>
       <Position6>
-        <Filename Value="systems/t_bsd.pas"/>
-        <Caret Line="531" Column="39" TopLine="516"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1356" Column="19" TopLine="1342"/>
       </Position6>
       <Position7>
-        <Filename Value="systems/t_bsd.pas"/>
-        <Caret Line="494" Column="15" TopLine="480"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1365" Column="19" TopLine="1351"/>
       </Position7>
       <Position8>
-        <Filename Value="systems/t_bsd.pas"/>
-        <Caret Line="562" Column="39" TopLine="548"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1383" Column="19" TopLine="1369"/>
       </Position8>
       <Position9>
-        <Filename Value="systems/t_sunos.pas"/>
-        <Caret Line="445" Column="9" TopLine="443"/>
+        <Filename Value="cutils.pas"/>
+        <Caret Line="944" Column="55" TopLine="930"/>
       </Position9>
       <Position10>
-        <Filename Value="systems/t_sunos.pas"/>
-        <Caret Line="425" Column="40" TopLine="410"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1401" Column="19" TopLine="1387"/>
       </Position10>
       <Position11>
-        <Filename Value="systems/t_sunos.pas"/>
-        <Caret Line="400" Column="20" TopLine="386"/>
+        <Filename Value="cutils.pas"/>
+        <Caret Line="944" Column="55" TopLine="930"/>
       </Position11>
       <Position12>
-        <Filename Value="systems/t_sunos.pas"/>
-        <Caret Line="457" Column="40" TopLine="443"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1419" Column="19" TopLine="1396"/>
       </Position12>
       <Position13>
-        <Filename Value="systems/t_emx.pas"/>
-        <Caret Line="45" Column="19" TopLine="40"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1428" Column="19" TopLine="1414"/>
       </Position13>
       <Position14>
-        <Filename Value="systems/t_emx.pas"/>
-        <Caret Line="474" Column="41" TopLine="459"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1447" Column="19" TopLine="1433"/>
       </Position14>
       <Position15>
-        <Filename Value="systems/t_os2.pas"/>
-        <Caret Line="41" Column="1" TopLine="41"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1456" Column="19" TopLine="1442"/>
       </Position15>
       <Position16>
-        <Filename Value="systems/t_os2.pas"/>
-        <Caret Line="474" Column="42" TopLine="459"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1474" Column="19" TopLine="1460"/>
       </Position16>
       <Position17>
-        <Filename Value="systems/t_win32.pas"/>
-        <Caret Line="1560" Column="31" TopLine="1547"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1483" Column="19" TopLine="1469"/>
       </Position17>
       <Position18>
-        <Filename Value="systems/t_win32.pas"/>
-        <Caret Line="1056" Column="46" TopLine="1041"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1557" Column="19" TopLine="1589"/>
       </Position18>
       <Position19>
-        <Filename Value="systems/t_win32.pas"/>
-        <Caret Line="1017" Column="19" TopLine="1004"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1575" Column="21" TopLine="1561"/>
       </Position19>
       <Position20>
-        <Filename Value="systems/t_win32.pas"/>
-        <Caret Line="1140" Column="42" TopLine="1126"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1584" Column="22" TopLine="1570"/>
       </Position20>
       <Position21>
-        <Filename Value="systems/t_nwm.pas"/>
-        <Caret Line="538" Column="43" TopLine="1"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1269" Column="18" TopLine="1255"/>
       </Position21>
       <Position22>
-        <Filename Value="systems/t_nwm.pas"/>
-        <Caret Line="529" Column="42" TopLine="514"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1808" Column="44" TopLine="1794"/>
       </Position22>
       <Position23>
-        <Filename Value="systems/t_nwl.pas"/>
-        <Caret Line="1" Column="1" TopLine="1"/>
+        <Filename Value="pdecsub.pas"/>
+        <Caret Line="1819" Column="44" TopLine="1805"/>
       </Position23>
       <Position24>
-        <Filename Value="systems/t_nwl.pas"/>
-        <Caret Line="598" Column="40" TopLine="583"/>
+        <Filename Value="pmodules.pas"/>
+        <Caret Line="251" Column="47" TopLine="237"/>
       </Position24>
       <Position25>
-        <Filename Value="systems/t_go32v2.pas"/>
-        <Caret Line="232" Column="41" TopLine="217"/>
+        <Filename Value="i386/ag386nsm.pas"/>
+        <Caret Line="776" Column="51" TopLine="762"/>
       </Position25>
       <Position26>
-        <Filename Value="systems/t_beos.pas"/>
-        <Caret Line="198" Column="28" TopLine="184"/>
+        <Filename Value="i386/ag386int.pas"/>
+        <Caret Line="765" Column="51" TopLine="751"/>
       </Position26>
       <Position27>
-        <Filename Value="systems/t_beos.pas"/>
-        <Caret Line="417" Column="41" TopLine="402"/>
+        <Filename Value="rautils.pas"/>
+        <Caret Line="1191" Column="18" TopLine="1177"/>
       </Position27>
       <Position28>
-        <Filename Value="systems/t_beos.pas"/>
-        <Caret Line="386" Column="20" TopLine="372"/>
+        <Filename Value="compiler.pas"/>
+        <Caret Line="436" Column="10" TopLine="422"/>
       </Position28>
       <Position29>
-        <Filename Value="systems/t_beos.pas"/>
-        <Caret Line="469" Column="41" TopLine="455"/>
+        <Filename Value="compiler.pas"/>
+        <Caret Line="334" Column="17" TopLine="320"/>
       </Position29>
       <Position30>
-        <Filename Value="systems/t_watcom.pas"/>
-        <Caret Line="153" Column="40" TopLine="138"/>
+        <Filename Value="compiler.pas"/>
+        <Caret Line="380" Column="13" TopLine="366"/>
       </Position30>
     </JumpHistory>
-    <Units Count="53">
+    <Units Count="110">
       <Unit0>
-        <CursorPos X="24" Y="33"/>
-        <EditorIndex Value="0"/>
+        <CursorPos X="11" Y="60"/>
         <Filename Value="pp.pas"/>
         <IsPartOfProject Value="True"/>
-        <Loaded Value="True"/>
-        <TopLine Value="17"/>
+        <TopLine Value="45"/>
         <UnitName Value="pp"/>
         <UsageCount Value="226"/>
       </Unit0>
       <Unit1>
-        <CursorPos X="1" Y="82"/>
+        <CursorPos X="22" Y="101"/>
         <Filename Value="fpcdefs.inc"/>
-        <TopLine Value="63"/>
-        <UsageCount Value="2"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="11"/>
       </Unit1>
       <Unit2>
         <CursorPos X="8" Y="322"/>
@@ -162,55 +160,57 @@
       </Unit2>
       <Unit3>
         <CursorPos X="18" Y="38"/>
-        <EditorIndex Value="17"/>
+        <EditorIndex Value="22"/>
         <Filename Value="cutils.pas"/>
         <Loaded Value="True"/>
         <TopLine Value="24"/>
         <UnitName Value="cutils"/>
-        <UsageCount Value="25"/>
+        <UsageCount Value="26"/>
       </Unit3>
       <Unit4>
-        <CursorPos X="46" Y="217"/>
+        <CursorPos X="43" Y="559"/>
+        <EditorIndex Value="9"/>
         <Filename Value="fppu.pas"/>
-        <TopLine Value="203"/>
+        <Loaded Value="True"/>
+        <TopLine Value="545"/>
         <UnitName Value="fppu"/>
-        <UsageCount Value="3"/>
+        <UsageCount Value="10"/>
       </Unit4>
       <Unit5>
-        <CursorPos X="11" Y="365"/>
-        <EditorIndex Value="18"/>
+        <CursorPos X="50" Y="140"/>
+        <EditorIndex Value="0"/>
         <Filename Value="comphook.pas"/>
         <Loaded Value="True"/>
-        <TopLine Value="350"/>
+        <TopLine Value="117"/>
         <UnitName Value="comphook"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="12"/>
       </Unit5>
       <Unit6>
-        <CursorPos X="2" Y="40"/>
+        <CursorPos X="1" Y="39"/>
         <Filename Value="cg64f32.pas"/>
-        <TopLine Value="25"/>
+        <TopLine Value="24"/>
         <UnitName Value="cg64f32"/>
-        <UsageCount Value="3"/>
+        <UsageCount Value="11"/>
       </Unit6>
       <Unit7>
-        <CursorPos X="15" Y="379"/>
+        <CursorPos X="1" Y="84"/>
         <Filename Value="ncgcal.pas"/>
-        <TopLine Value="363"/>
+        <TopLine Value="68"/>
         <UnitName Value="ncgcal"/>
         <UsageCount Value="12"/>
       </Unit7>
       <Unit8>
-        <CursorPos X="2" Y="930"/>
+        <CursorPos X="36" Y="541"/>
+        <EditorIndex Value="6"/>
         <Filename Value="cgobj.pas"/>
-        <TopLine Value="913"/>
+        <Loaded Value="True"/>
+        <TopLine Value="526"/>
         <UnitName Value="cgobj"/>
-        <UsageCount Value="15"/>
+        <UsageCount Value="17"/>
       </Unit8>
       <Unit9>
         <CursorPos X="20" Y="490"/>
-        <EditorIndex Value="6"/>
         <Filename Value="systems/t_linux.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="476"/>
         <UnitName Value="t_linux"/>
         <UsageCount Value="10"/>
@@ -222,11 +222,13 @@
         <UsageCount Value="10"/>
       </Unit10>
       <Unit11>
-        <CursorPos X="25" Y="388"/>
+        <CursorPos X="16" Y="398"/>
+        <EditorIndex Value="21"/>
         <Filename Value="compiler.pas"/>
-        <TopLine Value="412"/>
+        <Loaded Value="True"/>
+        <TopLine Value="384"/>
         <UnitName Value="compiler"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="10"/>
       </Unit11>
       <Unit12>
         <CursorPos X="40" Y="65"/>
@@ -242,11 +244,13 @@
         <UsageCount Value="10"/>
       </Unit13>
       <Unit14>
-        <CursorPos X="34" Y="87"/>
+        <CursorPos X="23" Y="381"/>
+        <EditorIndex Value="1"/>
         <Filename Value="verbose.pas"/>
-        <TopLine Value="87"/>
+        <Loaded Value="True"/>
+        <TopLine Value="366"/>
         <UnitName Value="verbose"/>
-        <UsageCount Value="2"/>
+        <UsageCount Value="11"/>
       </Unit14>
       <Unit15>
         <CursorPos X="1" Y="148"/>
@@ -256,80 +260,74 @@
         <UsageCount Value="2"/>
       </Unit15>
       <Unit16>
-        <CursorPos X="74" Y="306"/>
-        <EditorIndex Value="2"/>
+        <CursorPos X="33" Y="1414"/>
         <Filename Value="globals.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="292"/>
+        <TopLine Value="1400"/>
         <UnitName Value="globals"/>
-        <UsageCount Value="64"/>
+        <UsageCount Value="65"/>
       </Unit16>
       <Unit17>
-        <CursorPos X="30" Y="1960"/>
+        <CursorPos X="1" Y="1549"/>
         <Filename Value="options.pas"/>
-        <TopLine Value="1945"/>
+        <TopLine Value="1532"/>
         <UnitName Value="options"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="10"/>
       </Unit17>
       <Unit18>
-        <CursorPos X="58" Y="629"/>
-        <EditorIndex Value="1"/>
+        <CursorPos X="1" Y="318"/>
         <Filename Value="assemble.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="604"/>
+        <TopLine Value="304"/>
         <UnitName Value="assemble"/>
-        <UsageCount Value="59"/>
+        <UsageCount Value="60"/>
       </Unit18>
       <Unit19>
         <CursorPos X="19" Y="920"/>
-        <EditorIndex Value="19"/>
         <Filename Value="aggas.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="902"/>
         <UnitName Value="aggas"/>
         <UsageCount Value="55"/>
       </Unit19>
       <Unit20>
-        <CursorPos X="9" Y="1857"/>
+        <CursorPos X="13" Y="1301"/>
         <Filename Value="browcol.pas"/>
-        <TopLine Value="1842"/>
+        <TopLine Value="1286"/>
         <UnitName Value="browcol"/>
-        <UsageCount Value="2"/>
+        <UsageCount Value="10"/>
       </Unit20>
       <Unit21>
-        <CursorPos X="1" Y="1"/>
+        <CursorPos X="1" Y="387"/>
         <Filename Value="parser.pas"/>
-        <TopLine Value="1"/>
+        <TopLine Value="370"/>
         <UnitName Value="parser"/>
         <UsageCount Value="10"/>
       </Unit21>
       <Unit22>
         <CursorPos X="16" Y="178"/>
-        <EditorIndex Value="4"/>
         <Filename Value="fmodule.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="169"/>
         <UnitName Value="fmodule"/>
         <UsageCount Value="10"/>
       </Unit22>
       <Unit23>
-        <CursorPos X="33" Y="1038"/>
+        <CursorPos X="20" Y="3230"/>
+        <EditorIndex Value="4"/>
         <Filename Value="scanner.pas"/>
-        <TopLine Value="1024"/>
+        <Loaded Value="True"/>
+        <TopLine Value="3228"/>
         <UnitName Value="scanner"/>
         <UsageCount Value="26"/>
       </Unit23>
       <Unit24>
-        <CursorPos X="8" Y="36"/>
+        <CursorPos X="1" Y="295"/>
         <Filename Value="globtype.pas"/>
-        <TopLine Value="22"/>
+        <TopLine Value="270"/>
         <UnitName Value="globtype"/>
         <UsageCount Value="54"/>
       </Unit24>
       <Unit25>
-        <CursorPos X="11" Y="227"/>
+        <CursorPos X="1" Y="1768"/>
         <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/unix/unix.pp"/>
-        <TopLine Value="213"/>
+        <TopLine Value="1741"/>
         <UnitName Value="Unix"/>
         <UsageCount Value="10"/>
       </Unit25>
@@ -341,19 +339,17 @@
       </Unit26>
       <Unit27>
         <CursorPos X="12" Y="167"/>
-        <EditorIndex Value="3"/>
         <Filename Value="finput.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="161"/>
         <UnitName Value="finput"/>
         <UsageCount Value="10"/>
       </Unit27>
       <Unit28>
-        <CursorPos X="10" Y="1260"/>
+        <CursorPos X="1" Y="401"/>
         <Filename Value="cclasses.pas"/>
-        <TopLine Value="1287"/>
+        <TopLine Value="381"/>
         <UnitName Value="cclasses"/>
-        <UsageCount Value="21"/>
+        <UsageCount Value="22"/>
       </Unit28>
       <Unit29>
         <CursorPos X="20" Y="313"/>
@@ -377,88 +373,70 @@
         <UsageCount Value="2"/>
       </Unit31>
       <Unit32>
-        <CursorPos X="3" Y="45"/>
+        <CursorPos X="16" Y="97"/>
         <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/inc/dosh.inc"/>
-        <TopLine Value="31"/>
-        <UsageCount Value="1"/>
+        <TopLine Value="92"/>
+        <UsageCount Value="11"/>
       </Unit32>
       <Unit33>
         <CursorPos X="1" Y="79"/>
-        <EditorIndex Value="5"/>
         <Filename Value="comprsrc.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="66"/>
         <UnitName Value="comprsrc"/>
         <UsageCount Value="10"/>
       </Unit33>
       <Unit34>
         <CursorPos X="20" Y="446"/>
-        <EditorIndex Value="8"/>
         <Filename Value="systems/t_sunos.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="432"/>
         <UnitName Value="t_sunos"/>
         <UsageCount Value="10"/>
       </Unit34>
       <Unit35>
-        <CursorPos X="20" Y="440"/>
-        <EditorIndex Value="9"/>
+        <CursorPos X="1" Y="43"/>
         <Filename Value="systems/t_emx.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="426"/>
+        <TopLine Value="26"/>
         <UnitName Value="t_emx"/>
         <UsageCount Value="10"/>
       </Unit35>
       <Unit36>
-        <CursorPos X="20" Y="440"/>
-        <EditorIndex Value="10"/>
+        <CursorPos X="1" Y="43"/>
         <Filename Value="systems/t_os2.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="426"/>
+        <TopLine Value="26"/>
         <UnitName Value="t_os2"/>
         <UsageCount Value="10"/>
       </Unit36>
       <Unit37>
-        <CursorPos X="20" Y="1100"/>
-        <EditorIndex Value="11"/>
+        <CursorPos X="1" Y="30"/>
         <Filename Value="systems/t_win32.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="1086"/>
+        <TopLine Value="14"/>
         <UnitName Value="t_win32"/>
         <UsageCount Value="10"/>
       </Unit37>
       <Unit38>
         <CursorPos X="21" Y="510"/>
-        <EditorIndex Value="12"/>
         <Filename Value="systems/t_nwm.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="496"/>
         <UnitName Value="t_nwm"/>
         <UsageCount Value="10"/>
       </Unit38>
       <Unit39>
         <CursorPos X="20" Y="215"/>
-        <EditorIndex Value="14"/>
         <Filename Value="systems/t_go32v2.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="201"/>
         <UnitName Value="t_go32v2"/>
         <UsageCount Value="10"/>
       </Unit39>
       <Unit40>
-        <CursorPos X="20" Y="437"/>
-        <EditorIndex Value="15"/>
+        <CursorPos X="1" Y="64"/>
         <Filename Value="systems/t_beos.pas"/>
-        <Loaded Value="True"/>
-        <TopLine Value="423"/>
+        <TopLine Value="48"/>
         <UnitName Value="t_beos"/>
         <UsageCount Value="10"/>
       </Unit40>
       <Unit41>
         <CursorPos X="20" Y="137"/>
-        <EditorIndex Value="16"/>
         <Filename Value="systems/t_watcom.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="123"/>
         <UnitName Value="t_watcom"/>
         <UsageCount Value="10"/>
@@ -471,17 +449,17 @@
         <UsageCount Value="1"/>
       </Unit42>
       <Unit43>
-        <CursorPos X="15" Y="35"/>
+        <CursorPos X="17" Y="415"/>
         <Filename Value="impdef.pas"/>
-        <TopLine Value="24"/>
+        <TopLine Value="387"/>
         <UnitName Value="impdef"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="11"/>
       </Unit43>
       <Unit44>
-        <CursorPos X="23" Y="90"/>
+        <CursorPos X="13" Y="88"/>
         <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/objpas/sysutils/filutilh.inc"/>
-        <TopLine Value="68"/>
-        <UsageCount Value="1"/>
+        <TopLine Value="61"/>
+        <UsageCount Value="11"/>
       </Unit44>
       <Unit45>
         <CursorPos X="10" Y="28"/>
@@ -524,22 +502,448 @@
       </Unit50>
       <Unit51>
         <CursorPos X="20" Y="551"/>
-        <EditorIndex Value="7"/>
         <Filename Value="systems/t_bsd.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="537"/>
         <UnitName Value="t_bsd"/>
         <UsageCount Value="10"/>
       </Unit51>
       <Unit52>
         <CursorPos X="20" Y="553"/>
-        <EditorIndex Value="13"/>
         <Filename Value="systems/t_nwl.pas"/>
-        <Loaded Value="True"/>
         <TopLine Value="539"/>
         <UnitName Value="t_nwl"/>
         <UsageCount Value="10"/>
       </Unit52>
+      <Unit53>
+        <CursorPos X="10" Y="241"/>
+        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/unix/sysutils.pp"/>
+        <TopLine Value="227"/>
+        <UnitName Value="sysutils"/>
+        <UsageCount Value="11"/>
+      </Unit53>
+      <Unit54>
+        <CursorPos X="27" Y="1"/>
+        <Filename Value="utils/fixlog.pp"/>
+        <TopLine Value="1"/>
+        <UnitName Value="fixlog"/>
+        <UsageCount Value="10"/>
+      </Unit54>
+      <Unit55>
+        <CursorPos X="12" Y="551"/>
+        <Filename Value="globals_new.pas"/>
+        <TopLine Value="284"/>
+        <UnitName Value="globals"/>
+        <UsageCount Value="10"/>
+      </Unit55>
+      <Unit56>
+        <CursorPos X="1" Y="383"/>
+        <Filename Value="/home/neifer/FPC/Demo/src/fpc/rtl/unix/dos.pp"/>
+        <TopLine Value="356"/>
+        <UnitName Value="Dos"/>
+        <UsageCount Value="11"/>
+      </Unit56>
+      <Unit57>
+        <CursorPos X="3" Y="201"/>
+        <Filename Value="aasmbase.pas"/>
+        <TopLine Value="187"/>
+        <UnitName Value="aasmbase"/>
+        <UsageCount Value="11"/>
+      </Unit57>
+      <Unit58>
+        <CursorPos X="3" Y="618"/>
+        <Filename Value="aasmtai.pas"/>
+        <TopLine Value="604"/>
+        <UnitName Value="aasmtai"/>
+        <UsageCount Value="11"/>
+      </Unit58>
+      <Unit59>
+        <CursorPos X="1" Y="68"/>
+        <Filename Value="cmsgs.pas"/>
+        <TopLine Value="52"/>
+        <UnitName Value="cmsgs"/>
+        <UsageCount Value="11"/>
+      </Unit59>
+      <Unit60>
+        <CursorPos X="3" Y="30"/>
+        <Filename Value="gdb.pas"/>
+        <TopLine Value="16"/>
+        <UnitName Value="gdb"/>
+        <UsageCount Value="10"/>
+      </Unit60>
+      <Unit61>
+        <CursorPos X="1" Y="71"/>
+        <Filename Value="ncgcon.pas"/>
+        <TopLine Value="56"/>
+        <UnitName Value="ncgcon"/>
+        <UsageCount Value="10"/>
+      </Unit61>
+      <Unit62>
+        <CursorPos X="1" Y="115"/>
+        <Filename Value="ncgutil.pas"/>
+        <TopLine Value="99"/>
+        <UnitName Value="ncgutil"/>
+        <UsageCount Value="10"/>
+      </Unit62>
+      <Unit63>
+        <CursorPos X="1" Y="34"/>
+        <Filename Value="ncnv.pas"/>
+        <TopLine Value="19"/>
+        <UnitName Value="ncnv"/>
+        <UsageCount Value="10"/>
+      </Unit63>
+      <Unit64>
+        <CursorPos X="3" Y="388"/>
+        <Filename Value="nflw.pas"/>
+        <TopLine Value="374"/>
+        <UnitName Value="nflw"/>
+        <UsageCount Value="10"/>
+      </Unit64>
+      <Unit65>
+        <CursorPos X="32" Y="821"/>
+        <EditorIndex Value="12"/>
+        <Filename Value="nobj.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="807"/>
+        <UnitName Value="nobj"/>
+        <UsageCount Value="10"/>
+      </Unit65>
+      <Unit66>
+        <CursorPos X="3" Y="32"/>
+        <Filename Value="tpexcept.pas"/>
+        <TopLine Value="18"/>
+        <UnitName Value="tpexcept"/>
+        <UsageCount Value="10"/>
+      </Unit66>
+      <Unit67>
+        <CursorPos X="1" Y="161"/>
+        <Filename Value="oglx.pas"/>
+        <TopLine Value="145"/>
+        <UnitName Value="oglx"/>
+        <UsageCount Value="10"/>
+      </Unit67>
+      <Unit68>
+        <CursorPos X="1" Y="171"/>
+        <Filename Value="ogcoff.pas"/>
+        <TopLine Value="155"/>
+        <UnitName Value="ogcoff"/>
+        <UsageCount Value="10"/>
+      </Unit68>
+      <Unit69>
+        <CursorPos X="1" Y="116"/>
+        <Filename Value="ogelf.pas"/>
+        <TopLine Value="100"/>
+        <UnitName Value="ogelf"/>
+        <UsageCount Value="10"/>
+      </Unit69>
+      <Unit70>
+        <CursorPos X="1" Y="74"/>
+        <Filename Value="owar.pas"/>
+        <TopLine Value="58"/>
+        <UnitName Value="owar"/>
+        <UsageCount Value="10"/>
+      </Unit70>
+      <Unit71>
+        <CursorPos X="1" Y="44"/>
+        <Filename Value="pdecobj.pas"/>
+        <TopLine Value="29"/>
+        <UnitName Value="pdecobj"/>
+        <UsageCount Value="10"/>
+      </Unit71>
+      <Unit72>
+        <CursorPos X="35" Y="1871"/>
+        <EditorIndex Value="16"/>
+        <Filename Value="pdecsub.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="1857"/>
+        <UnitName Value="pdecsub"/>
+        <UsageCount Value="10"/>
+      </Unit72>
+      <Unit73>
+        <CursorPos X="1" Y="59"/>
+        <Filename Value="pdecvar.pas"/>
+        <TopLine Value="44"/>
+        <UnitName Value="pdecvar"/>
+        <UsageCount Value="10"/>
+      </Unit73>
+      <Unit74>
+        <CursorPos X="1" Y="51"/>
+        <Filename Value="pexports.pas"/>
+        <TopLine Value="36"/>
+        <UnitName Value="pexports"/>
+        <UsageCount Value="10"/>
+      </Unit74>
+      <Unit75>
+        <CursorPos X="3" Y="65"/>
+        <Filename Value="pexpr.pas"/>
+        <TopLine Value="51"/>
+        <UnitName Value="pexpr"/>
+        <UsageCount Value="10"/>
+      </Unit75>
+      <Unit76>
+        <CursorPos X="1" Y="47"/>
+        <Filename Value="pinline.pas"/>
+        <TopLine Value="32"/>
+        <UnitName Value="pinline"/>
+        <UsageCount Value="10"/>
+      </Unit76>
+      <Unit77>
+        <CursorPos X="1" Y="52"/>
+        <Filename Value="psystem.pas"/>
+        <TopLine Value="37"/>
+        <UnitName Value="psystem"/>
+        <UsageCount Value="10"/>
+      </Unit77>
+      <Unit78>
+        <CursorPos X="1" Y="40"/>
+        <Filename Value="ptconst.pas"/>
+        <TopLine Value="24"/>
+        <UnitName Value="ptconst"/>
+        <UsageCount Value="10"/>
+      </Unit78>
+      <Unit79>
+        <CursorPos X="19" Y="1191"/>
+        <EditorIndex Value="20"/>
+        <Filename Value="rautils.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="1176"/>
+        <UnitName Value="RAUtils"/>
+        <UsageCount Value="10"/>
+      </Unit79>
+      <Unit80>
+        <CursorPos X="1" Y="37"/>
+        <Filename Value="rgobj.pas"/>
+        <TopLine Value="22"/>
+        <UnitName Value="rgobj"/>
+        <UsageCount Value="10"/>
+      </Unit80>
+      <Unit81>
+        <CursorPos X="34" Y="5770"/>
+        <EditorIndex Value="8"/>
+        <Filename Value="symdef.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="5756"/>
+        <UnitName Value="symdef"/>
+        <UsageCount Value="11"/>
+      </Unit81>
+      <Unit82>
+        <CursorPos X="1" Y="309"/>
+        <Filename Value="symsym.pas"/>
+        <TopLine Value="293"/>
+        <UnitName Value="symsym"/>
+        <UsageCount Value="10"/>
+      </Unit82>
+      <Unit83>
+        <CursorPos X="1" Y="38"/>
+        <Filename Value="widestr.pas"/>
+        <TopLine Value="23"/>
+        <UnitName Value="widestr"/>
+        <UsageCount Value="10"/>
+      </Unit83>
+      <Unit84>
+        <CursorPos X="1" Y="1539"/>
+        <Filename Value="options_new.pas"/>
+        <TopLine Value="1522"/>
+        <UnitName Value="options"/>
+        <UsageCount Value="10"/>
+      </Unit84>
+      <Unit85>
+        <CursorPos X="3" Y="237"/>
+        <Filename Value="charset.pas"/>
+        <TopLine Value="223"/>
+        <UnitName Value="charset"/>
+        <UsageCount Value="10"/>
+      </Unit85>
+      <Unit86>
+        <CursorPos X="1" Y="2"/>
+        <Filename Value="msgtxt.inc"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="10"/>
+      </Unit86>
+      <Unit87>
+        <CursorPos X="1" Y="47"/>
+        <Filename Value="powerpc/nppccal.pas"/>
+        <TopLine Value="31"/>
+        <UnitName Value="nppccal"/>
+        <UsageCount Value="10"/>
+      </Unit87>
+      <Unit88>
+        <CursorPos X="30" Y="1357"/>
+        <Filename Value="powerpc/agppcmpw.pas"/>
+        <TopLine Value="1343"/>
+        <UnitName Value="agppcmpw"/>
+        <UsageCount Value="10"/>
+      </Unit88>
+      <Unit89>
+        <CursorPos X="1" Y="51"/>
+        <Filename Value="i386/n386mem.pas"/>
+        <TopLine Value="36"/>
+        <UnitName Value="n386mem"/>
+        <UsageCount Value="10"/>
+      </Unit89>
+      <Unit90>
+        <CursorPos X="1" Y="35"/>
+        <Filename Value="i386/cgcpu.pas"/>
+        <TopLine Value="20"/>
+        <UnitName Value="cgcpu"/>
+        <UsageCount Value="10"/>
+      </Unit90>
+      <Unit91>
+        <CursorPos X="52" Y="776"/>
+        <EditorIndex Value="18"/>
+        <Filename Value="i386/ag386nsm.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="761"/>
+        <UnitName Value="ag386nsm"/>
+        <UsageCount Value="10"/>
+      </Unit91>
+      <Unit92>
+        <CursorPos X="52" Y="765"/>
+        <EditorIndex Value="19"/>
+        <Filename Value="i386/ag386int.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="750"/>
+        <UnitName Value="ag386int"/>
+        <UsageCount Value="10"/>
+      </Unit92>
+      <Unit93>
+        <CursorPos X="1" Y="43"/>
+        <Filename Value="x86/cpubase.pas"/>
+        <TopLine Value="28"/>
+        <UnitName Value="cpubase"/>
+        <UsageCount Value="10"/>
+      </Unit93>
+      <Unit94>
+        <CursorPos X="14" Y="328"/>
+        <Filename Value="utils/msg2inc.pp"/>
+        <TopLine Value="313"/>
+        <UnitName Value="msg2inc"/>
+        <UsageCount Value="10"/>
+      </Unit94>
+      <Unit95>
+        <CursorPos X="1" Y="39"/>
+        <Filename Value="arm/cpubase.pas"/>
+        <TopLine Value="24"/>
+        <UnitName Value="cpubase"/>
+        <UsageCount Value="10"/>
+      </Unit95>
+      <Unit96>
+        <CursorPos X="58" Y="468"/>
+        <EditorIndex Value="5"/>
+        <Filename Value="browlog.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="453"/>
+        <UnitName Value="browlog"/>
+        <UsageCount Value="10"/>
+      </Unit96>
+      <Unit97>
+        <CursorPos X="31" Y="106"/>
+        <EditorIndex Value="2"/>
+        <Filename Value="catch.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="91"/>
+        <UnitName Value="catch"/>
+        <UsageCount Value="10"/>
+      </Unit97>
+      <Unit98>
+        <CursorPos X="51" Y="2057"/>
+        <EditorIndex Value="11"/>
+        <Filename Value="ncal.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="2043"/>
+        <UnitName Value="ncal"/>
+        <UsageCount Value="10"/>
+      </Unit98>
+      <Unit99>
+        <CursorPos X="61" Y="1177"/>
+        <EditorIndex Value="13"/>
+        <Filename Value="pstatmnt.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="1163"/>
+        <UnitName Value="pstatmnt"/>
+        <UsageCount Value="10"/>
+      </Unit99>
+      <Unit100>
+        <CursorPos X="9" Y="1789"/>
+        <Filename Value="scanner_ar.pas"/>
+        <TopLine Value="1775"/>
+        <UnitName Value="scanner"/>
+        <UsageCount Value="10"/>
+      </Unit100>
+      <Unit101>
+        <CursorPos X="40" Y="560"/>
+        <EditorIndex Value="15"/>
+        <Filename Value="pdecl.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="546"/>
+        <UnitName Value="pdecl"/>
+        <UsageCount Value="10"/>
+      </Unit101>
+      <Unit102>
+        <CursorPos X="43" Y="1110"/>
+        <EditorIndex Value="10"/>
+        <Filename Value="scandir.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="1096"/>
+        <UnitName Value="scandir"/>
+        <UsageCount Value="10"/>
+      </Unit102>
+      <Unit103>
+        <CursorPos X="41" Y="1387"/>
+        <EditorIndex Value="14"/>
+        <Filename Value="psub.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="1373"/>
+        <UnitName Value="psub"/>
+        <UsageCount Value="10"/>
+      </Unit103>
+      <Unit104>
+        <CursorPos X="55" Y="251"/>
+        <EditorIndex Value="17"/>
+        <Filename Value="pmodules.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="235"/>
+        <UnitName Value="pmodules"/>
+        <UsageCount Value="10"/>
+      </Unit104>
+      <Unit105>
+        <CursorPos X="3" Y="154"/>
+        <Filename Value="ppheap.pas"/>
+        <TopLine Value="140"/>
+        <UnitName Value="ppheap"/>
+        <UsageCount Value="10"/>
+      </Unit105>
+      <Unit106>
+        <CursorPos X="51" Y="227"/>
+        <Filename Value="regvars.pas"/>
+        <TopLine Value="213"/>
+        <UnitName Value="regvars"/>
+        <UsageCount Value="10"/>
+      </Unit106>
+      <Unit107>
+        <CursorPos X="35" Y="2189"/>
+        <EditorIndex Value="7"/>
+        <Filename Value="symtable.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="2175"/>
+        <UnitName Value="symtable"/>
+        <UsageCount Value="10"/>
+      </Unit107>
+      <Unit108>
+        <CursorPos X="61" Y="84"/>
+        <Filename Value="powerpc/cpupi.pas"/>
+        <TopLine Value="69"/>
+        <UnitName Value="cpupi"/>
+        <UsageCount Value="10"/>
+      </Unit108>
+      <Unit109>
+        <CursorPos X="28" Y="225"/>
+        <EditorIndex Value="3"/>
+        <Filename Value="symbase.pas"/>
+        <Loaded Value="True"/>
+        <TopLine Value="210"/>
+        <UnitName Value="symbase"/>
+        <UsageCount Value="10"/>
+      </Unit109>
     </Units>
     <PublishOptions>
       <Version Value="2"/>

compiler/ppheap.pas

@@ -150,8 +150,8 @@ implementation
             SetExtraInfoString({$ifdef FPC}@{$endif}get_extra_info);
 {$else}
             SetHeapExtraInfo(sizeof(textra_info),
-                             {$ifdef FPCPROCVAR}@{$endif}set_extra_info,
-                             {$ifdef FPCPROCVAR}@{$endif}show_extra_info);
+                             set_extra_info,
+                             show_extra_info);
 {$endif}
          end;
        pp_heap_inited:=true;
@@ -163,7 +163,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.13  2004-06-20 08:55:30  florian
+  Revision 1.14  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.13  2004/06/20 08:55:30  florian
     * logs truncated
 
 }

compiler/pstatmnt.pas

@@ -589,7 +589,7 @@ implementation
                 end;
             end;
             if try_to_consume(_COMMA) then
-              right:=_with_statement{$ifdef FPCPROCVAR}(){$endif}
+              right:=_with_statement
             else
               begin
                 consume(_DO);
@@ -620,7 +620,7 @@ implementation
             { try to recover from error }
             if try_to_consume(_COMMA) then
              begin
-               hp:=_with_statement{$ifdef FPCPROCVAR}(){$endif};
+               hp:=_with_statement;
                if (hp=nil) then; { remove warning about unused }
              end
             else
@@ -1055,7 +1055,7 @@ implementation
                  if token in endtokens then
                    tlabelnode(p).left:=cnothingnode.create
                  else
-                   tlabelnode(p).left:=statement{$ifdef FPCPROCVAR}(){$endif};
+                   tlabelnode(p).left:=statement;
                  { be sure to have left also resulttypepass }
                  resulttypepass(tlabelnode(p).left);
                end
@@ -1173,8 +1173,8 @@ implementation
                  (vm, i386, vm only currently)
              }
              locals:=0;
-             current_procinfo.procdef.localst.foreach_static({$ifdef FPCPROCVAR}@{$endif}count_locals,@locals);
-             current_procinfo.procdef.parast.foreach_static({$ifdef FPCPROCVAR}@{$endif}count_locals,@locals);
+             current_procinfo.procdef.localst.foreach_static(@count_locals,@locals);
+             current_procinfo.procdef.parast.foreach_static(@count_locals,@locals);
              if (locals=0) and
                 (current_procinfo.procdef.owner.symtabletype<>objectsymtable) and
                 (not assigned(current_procinfo.procdef.funcretsym) or
@@ -1206,7 +1206,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.141  2004-09-27 15:15:52  peter
+  Revision 1.142  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.141  2004/09/27 15:15:52  peter
     * register loopvarsym for fields instead of record variable
     * don't allow class fields as loop var
 

compiler/psub.pas

@@ -226,7 +226,7 @@ implementation
             begin
                block:=statement_block(_BEGIN);
                if symtablestack.symtabletype=localsymtable then
-                 symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}initializevars,block);
+                 symtablestack.foreach_static(@initializevars,block);
             end;
       end;
 
@@ -643,8 +643,8 @@ implementation
           cg.t_times:=100;
 
         { clear register count }
-        symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}clearrefs,nil);
-        symtablestack.next.foreach_static({$ifdef FPCPROCVAR}@{$endif}clearrefs,nil);
+        symtablestack.foreach_static(@clearrefs,nil);
+        symtablestack.next.foreach_static(@clearrefs,nil);
 
         { there's always a call to FPC_INITIALIZEUNITS/FPC_DO_EXIT in the main program }
         if (procdef.localst.symtablelevel=main_program_level) and
@@ -652,8 +652,8 @@ implementation
           include(flags,pi_do_call);
 
         { set implicit_finally flag when there are locals/paras to be finalized }
-        current_procinfo.procdef.parast.foreach_static({$ifdef FPCPROCVAR}@{$endif}check_finalize_paras,nil);
-        current_procinfo.procdef.localst.foreach_static({$ifdef FPCPROCVAR}@{$endif}check_finalize_locals,nil);
+        current_procinfo.procdef.parast.foreach_static(@check_finalize_paras,nil);
+        current_procinfo.procdef.localst.foreach_static(@check_finalize_locals,nil);
 
         { firstpass everything }
         flowcontrol:=[];
@@ -956,7 +956,7 @@ implementation
             paraitem := tparaitem(paraitem.next);
           end;
         { we currently can't handle exit-statements (would exit the caller) }
-        result := not foreachnodestatic(procdef.inlininginfo^.code,{$ifdef FPCPROCVAR}@{$endif}containsforbiddennode,nil);
+        result := not foreachnodestatic(procdef.inlininginfo^.code,@containsforbiddennode,nil);
       end;
 
 
@@ -1214,7 +1214,7 @@ implementation
              { check if there are para's which require initing -> set }
              { pi_do_call (if not yet set)                            }
              if not(pi_do_call in current_procinfo.flags) then
-               pd.parast.foreach_static({$ifdef FPCPROCVAR}@{$endif}check_init_paras,nil);
+               pd.parast.foreach_static(@check_init_paras,nil);
 
              { set _FAIL as keyword if constructor }
              if (pd.proctypeoption=potype_constructor) then
@@ -1343,7 +1343,7 @@ implementation
          { check for incomplete class definitions, this is only required
            for fpc modes }
          if (m_fpc in aktmodeswitches) then
-           symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}check_forward_class,nil);
+           symtablestack.foreach_static(@check_forward_class,nil);
       end;
 
 
@@ -1384,14 +1384,18 @@ implementation
          { check for incomplete class definitions, this is only required
            for fpc modes }
          if (m_fpc in aktmodeswitches) then
-          symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}check_forward_class,nil);
+          symtablestack.foreach_static(@check_forward_class,nil);
       end;
 
 
 end.
 {
   $Log$
-  Revision 1.208  2004-10-10 20:22:53  peter
+  Revision 1.209  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.208  2004/10/10 20:22:53  peter
     * symtable allocation rewritten
     * loading of parameters to local temps/regs cleanup
     * regvar support for parameters

compiler/psystem.pas

@@ -49,10 +49,6 @@ implementation
       gdb,
 {$endif GDB}
       node,nbas,nflw,nset,ncon,ncnv,nld,nmem,ncal,nmat,nadd,ninl,nopt
-{$ifdef Delphi}
-      ,dmisc
-      ,sysutils
-{$endif}
       ;
 
 
@@ -538,7 +534,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.71  2004-07-05 21:49:43  olle
+  Revision 1.72  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.71  2004/07/05 21:49:43  olle
     + macpas style: exit, cycle, leave
     + macpas compiler directive: PUSH POP
 

compiler/ptconst.pas

@@ -36,11 +36,7 @@ interface
 implementation
 
     uses
-{$ifdef Delphi}
-       sysutils,
-{$else}
        strings,
-{$endif Delphi}
        globtype,systems,tokens,verbose,
        cutils,globals,widestr,scanner,
        symconst,symbase,symdef,symtable,
@@ -1091,7 +1087,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.91  2004-07-12 17:58:19  peter
+  Revision 1.92  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.91  2004/07/12 17:58:19  peter
     * remove maxlen field from ansistring/widestrings
 
   Revision 1.90  2004/07/03 14:06:35  daniel

compiler/rautils.pas

@@ -215,11 +215,7 @@ Function SearchIConstant(const s:string; var l:aint): boolean;
 Implementation
 
 uses
-{$ifdef delphi}
-  sysutils,
-{$else}
   strings,
-{$endif}
   defutil,systems,verbose,globals,
   symtable,paramgr,
   aasmcpu,
@@ -1192,7 +1188,7 @@ end;
 
 procedure TLocalLabelList.CheckEmitted;
 begin
-  ForEach_Static({$ifdef FPCPROCVAR}@{$endif}LocalLabelEmitted,nil)
+  ForEach_Static(@LocalLabelEmitted,nil)
 end;
 
 
@@ -1668,7 +1664,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.90  2004-10-08 17:09:43  peter
+  Revision 1.91  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.90  2004/10/08 17:09:43  peter
     * tvarsym.varregable added, split vo_regable from varoptions
 
   Revision 1.89  2004/09/27 15:14:34  peter

compiler/regvars.pas

@@ -160,10 +160,10 @@ implementation
           if (p.registersint<maxvarregs) then
             begin
               parasym:=false;
-              symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchregvars,@parasym);
+              symtablestack.foreach_static(searchregvars,@parasym);
               { copy parameter into a register ? }
               parasym:=true;
-              symtablestack.next.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchregvars,@parasym);
+              symtablestack.next.foreach_static(searchregvars,@parasym);
               { hold needed registers free }
               for i:=maxvarregs downto maxvarregs-p.registersint+1 do
                 begin
@@ -215,7 +215,7 @@ implementation
             if ((p.registersfpu+1)<maxfpuvarregs) then
               begin
                 parasym:=false;
-                symtablestack.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchfpuregvars,@parasym);
+                symtablestack.foreach_static(searchfpuregvars,@parasym);
 {$ifndef i386}
                 { this code should be never enabled because     }
                 { 1. the caller loads parameters into registers }
@@ -224,7 +224,7 @@ implementation
                 {                                        (FK)   }
                 { copy parameter into a register ? }
                 parasym:=true;
-                symtablestack.next.foreach_static({$ifdef FPCPROCVAR}@{$endif}searchregvars,@parasym);
+                symtablestack.next.foreach_static(searchregvars,@parasym);
 {$endif i386}
                 { hold needed registers free }
 
@@ -669,7 +669,11 @@ end.
 
 {
   $Log$
-  Revision 1.80  2004-09-26 17:45:30  peter
+  Revision 1.81  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.80  2004/09/26 17:45:30  peter
     * simple regvar support, not yet finished
 
   Revision 1.79  2004/09/25 14:23:54  peter

compiler/rgobj.pas

@@ -34,9 +34,6 @@ unit rgobj;
       cutils, cpubase,
       aasmbase,aasmtai,aasmcpu,
       cclasses,globtype,cgbase,node,
-{$ifdef delphi}
-      dmisc,
-{$endif}
       cpuinfo
       ;
 
@@ -1995,7 +1992,11 @@ unit rgobj;
 end.
 {
   $Log$
-  Revision 1.142  2004-10-13 21:12:51  peter
+  Revision 1.143  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.142  2004/10/13 21:12:51  peter
     * -Or fixes for open array
 
   Revision 1.141  2004/10/11 15:47:03  peter

compiler/scandir.pas

@@ -1024,90 +1024,90 @@ implementation
 
     procedure InitScannerDirectives;
       begin
-        AddDirective('ALIGN',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_align);
+        AddDirective('ALIGN',directive_all, @dir_align);
 {$ifdef m68k}
-        AddDirective('APPID',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_appid);
-        AddDirective('APPNAME',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_appname);
+        AddDirective('APPID',directive_all, @dir_appid);
+        AddDirective('APPNAME',directive_all, @dir_appname);
 {$endif m68k}
-        AddDirective('APPTYPE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_apptype);
-        AddDirective('ASMMODE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_asmmode);
-        AddDirective('ASSERTIONS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_assertions);
-        AddDirective('BOOLEVAL',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_booleval);
-        AddDirective('CALLING',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_calling);
-        AddDirective('CODEPAGE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_codepage);
-        AddDirective('COPYRIGHT',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_copyright);
-        AddDirective('D',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_description);
-        AddDirective('DEBUGINFO',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_debuginfo);
-        AddDirective('DESCRIPTION',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_description);
-        AddDirective('ERROR',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_error);
-        AddDirective('ERRORC',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_error);
-        AddDirective('EXTENDEDSYNTAX',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_extendedsyntax);
-        AddDirective('EXTERNALSYM',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_externalsym);
-        AddDirective('FATAL',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_fatal);
-        AddDirective('FPUTYPE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_fputype);
-        AddDirective('GOTO',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_goto);
-        AddDirective('HINT',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_hint);
-        AddDirective('HINTS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_hints);
-        AddDirective('IOCHECKS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_iochecks);
-        AddDirective('IMPLICITEXCEPTIONS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_implicitexceptions);
-        AddDirective('INCLUDEPATH',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_includepath);
-        AddDirective('INFO',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_info);
-        AddDirective('INLINE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_inline);
-        AddDirective('INTERFACES',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_interfaces);
-        AddDirective('L',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_link);
-        AddDirective('LIBEXPORT',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_libexport);
-        AddDirective('LIBRARYPATH',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_librarypath);
-        AddDirective('LINK',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_link);
-        AddDirective('LINKLIB',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_linklib);
-        AddDirective('LOCALSYMBOLS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_localsymbols);
-        AddDirective('LONGSTRINGS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_longstrings);
-        AddDirective('M',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_memory);
-        AddDirective('MACRO',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_macro);
-        AddDirective('MAXFPUREGISTERS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_maxfpuregisters);
-        AddDirective('MEMORY',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_memory);
-        AddDirective('MESSAGE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_message);
-        AddDirective('MINENUMSIZE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_packenum);
-        AddDirective('MMX',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_mmx);
-        AddDirective('MODE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_mode);
-        AddDirective('NOTE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_note);
-        AddDirective('NOTES',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_notes);
-        AddDirective('OBJECTCHECKS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_objectchecks);
-        AddDirective('OBJECTPATH',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_objectpath);
-        AddDirective('OPENSTRINGS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_openstrings);
-        AddDirective('OUTPUT_FORMAT',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_output_format);
-        AddDirective('OVERFLOWCHECKS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_overflowchecks);
-        AddDirective('PACKENUM',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_packenum);
-        AddDirective('PACKRECORDS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_packrecords);
+        AddDirective('APPTYPE',directive_all, @dir_apptype);
+        AddDirective('ASMMODE',directive_all, @dir_asmmode);
+        AddDirective('ASSERTIONS',directive_all, @dir_assertions);
+        AddDirective('BOOLEVAL',directive_all, @dir_booleval);
+        AddDirective('CALLING',directive_all, @dir_calling);
+        AddDirective('CODEPAGE',directive_all, @dir_codepage);
+        AddDirective('COPYRIGHT',directive_all, @dir_copyright);
+        AddDirective('D',directive_all, @dir_description);
+        AddDirective('DEBUGINFO',directive_all, @dir_debuginfo);
+        AddDirective('DESCRIPTION',directive_all, @dir_description);
+        AddDirective('ERROR',directive_all, @dir_error);
+        AddDirective('ERRORC',directive_mac, @dir_error);
+        AddDirective('EXTENDEDSYNTAX',directive_all, @dir_extendedsyntax);
+        AddDirective('EXTERNALSYM',directive_all, @dir_externalsym);
+        AddDirective('FATAL',directive_all, @dir_fatal);
+        AddDirective('FPUTYPE',directive_all, @dir_fputype);
+        AddDirective('GOTO',directive_all, @dir_goto);
+        AddDirective('HINT',directive_all, @dir_hint);
+        AddDirective('HINTS',directive_all, @dir_hints);
+        AddDirective('IOCHECKS',directive_all, @dir_iochecks);
+        AddDirective('IMPLICITEXCEPTIONS',directive_all, @dir_implicitexceptions);
+        AddDirective('INCLUDEPATH',directive_all, @dir_includepath);
+        AddDirective('INFO',directive_all, @dir_info);
+        AddDirective('INLINE',directive_all, @dir_inline);
+        AddDirective('INTERFACES',directive_all, @dir_interfaces);
+        AddDirective('L',directive_all, @dir_link);
+        AddDirective('LIBEXPORT',directive_mac, @dir_libexport);
+        AddDirective('LIBRARYPATH',directive_all, @dir_librarypath);
+        AddDirective('LINK',directive_all, @dir_link);
+        AddDirective('LINKLIB',directive_all, @dir_linklib);
+        AddDirective('LOCALSYMBOLS',directive_all, @dir_localsymbols);
+        AddDirective('LONGSTRINGS',directive_all, @dir_longstrings);
+        AddDirective('M',directive_all, @dir_memory);
+        AddDirective('MACRO',directive_all, @dir_macro);
+        AddDirective('MAXFPUREGISTERS',directive_all, @dir_maxfpuregisters);
+        AddDirective('MEMORY',directive_all, @dir_memory);
+        AddDirective('MESSAGE',directive_all, @dir_message);
+        AddDirective('MINENUMSIZE',directive_all, @dir_packenum);
+        AddDirective('MMX',directive_all, @dir_mmx);
+        AddDirective('MODE',directive_all, @dir_mode);
+        AddDirective('NOTE',directive_all, @dir_note);
+        AddDirective('NOTES',directive_all, @dir_notes);
+        AddDirective('OBJECTCHECKS',directive_all, @dir_objectchecks);
+        AddDirective('OBJECTPATH',directive_all, @dir_objectpath);
+        AddDirective('OPENSTRINGS',directive_all, @dir_openstrings);
+        AddDirective('OUTPUT_FORMAT',directive_all, @dir_output_format);
+        AddDirective('OVERFLOWCHECKS',directive_all, @dir_overflowchecks);
+        AddDirective('PACKENUM',directive_all, @dir_packenum);
+        AddDirective('PACKRECORDS',directive_all, @dir_packrecords);
 {$IFDEF TestVarsets}
-        AddDirective('PACKSET',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_packset);
+        AddDirective('PACKSET',directive_all, @dir_packset);
 {$ENDIF}
-        AddDirective('POP',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_pop);
-        AddDirective('PROFILE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_profile);
-        AddDirective('PUSH',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_push);
-        AddDirective('R',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_resource);
-        AddDirective('RANGECHECKS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_rangechecks);
-        AddDirective('REFERENCEINFO',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_referenceinfo);
-        AddDirective('RESOURCE',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_resource);
-        AddDirective('SATURATION',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_saturation);
-        AddDirective('SCREENNAME',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_screenname);
-        AddDirective('SMARTLINK',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_smartlink);
-        AddDirective('STACKFRAMES',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_stackframes);
-        AddDirective('STATIC',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_static);
-        AddDirective('STOP',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_stop);
-        AddDirective('THREADING',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_threading);
-        AddDirective('THREADNAME',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_threadname);
-        AddDirective('TYPEDADDRESS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_typedaddress);
-        AddDirective('TYPEINFO',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_typeinfo);
-        AddDirective('UNITPATH',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_unitpath);
-        AddDirective('VARSTRINGCHECKS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_varstringchecks);
-        AddDirective('VERSION',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_version);
-        AddDirective('WAIT',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_wait);
-        AddDirective('WARNING',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_warning);
-        AddDirective('WARNINGS',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_warnings);
-        AddDirective('WRITEABLECONST',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_writeableconst);
-        AddDirective('Z1',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_z1);
-        AddDirective('Z2',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_z2);
-        AddDirective('Z4',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_z4);
+        AddDirective('POP',directive_mac, @dir_pop);
+        AddDirective('PROFILE',directive_all, @dir_profile);
+        AddDirective('PUSH',directive_mac, @dir_push);
+        AddDirective('R',directive_all, @dir_resource);
+        AddDirective('RANGECHECKS',directive_all, @dir_rangechecks);
+        AddDirective('REFERENCEINFO',directive_all, @dir_referenceinfo);
+        AddDirective('RESOURCE',directive_all, @dir_resource);
+        AddDirective('SATURATION',directive_all, @dir_saturation);
+        AddDirective('SCREENNAME',directive_all, @dir_screenname);
+        AddDirective('SMARTLINK',directive_all, @dir_smartlink);
+        AddDirective('STACKFRAMES',directive_all, @dir_stackframes);
+        AddDirective('STATIC',directive_all, @dir_static);
+        AddDirective('STOP',directive_all, @dir_stop);
+        AddDirective('THREADING',directive_all, @dir_threading);
+        AddDirective('THREADNAME',directive_all, @dir_threadname);
+        AddDirective('TYPEDADDRESS',directive_all, @dir_typedaddress);
+        AddDirective('TYPEINFO',directive_all, @dir_typeinfo);
+        AddDirective('UNITPATH',directive_all, @dir_unitpath);
+        AddDirective('VARSTRINGCHECKS',directive_all, @dir_varstringchecks);
+        AddDirective('VERSION',directive_all, @dir_version);
+        AddDirective('WAIT',directive_all, @dir_wait);
+        AddDirective('WARNING',directive_all, @dir_warning);
+        AddDirective('WARNINGS',directive_all, @dir_warnings);
+        AddDirective('WRITEABLECONST',directive_all, @dir_writeableconst);
+        AddDirective('Z1',directive_all, @dir_z1);
+        AddDirective('Z2',directive_all, @dir_z2);
+        AddDirective('Z4',directive_all, @dir_z4);
       end;
 
 begin
@@ -1115,7 +1115,11 @@ begin
 end.
 {
   $Log$
-  Revision 1.43  2004-09-04 21:18:47  armin
+  Revision 1.44  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.43  2004/09/04 21:18:47  armin
   * target netwlibc added (libc is preferred for newer netware versions)
 
   Revision 1.42  2004/08/31 22:07:04  olle

compiler/scanner.pas

@@ -203,11 +203,7 @@ interface
 implementation
 
     uses
-{$ifdef delphi}
-      dmisc,
-{$else}
       dos,
-{$endif delphi}
       cutils,
       systems,
       switches,
@@ -1683,7 +1679,7 @@ implementation
         oldaktfilepos:=aktfilepos;
         repeat
           current_scanner.gettokenpos;
-          p.proc{$ifdef FPCPROCVAR}(){$endif};
+          p.proc;
           { accept the text ? }
           if (current_scanner.preprocstack=nil) or current_scanner.preprocstack.accept then
            break
@@ -1780,7 +1776,7 @@ implementation
                else
                 begin
                   Message1(scan_d_handling_switch,'$'+hs);
-                  t.proc{$ifdef FPCPROCVAR}(){$endif};
+                  t.proc;
                 end;
              end
             else
@@ -3228,31 +3224,31 @@ exit_label:
         mac_scannerdirectives:=TDictionary.Create;
 
         { Default directives and conditionals for all modes }
-        AddDirective('I',directive_all, {$ifdef FPCPROCVAR}@{$endif}dir_include);
+        AddDirective('I',directive_all, @dir_include);
 
         { Common directives and conditionals }
-        AddDirective('DEFINE',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_define);
-        AddDirective('UNDEF',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_undef);
-        AddDirective('INCLUDE',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_include);
-        AddDirective('LIBPREFIX',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_libprefix);
-        AddDirective('LIBSUFFIX',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_libsuffix);
-        AddDirective('EXTENSION',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_extension);
-
-        AddConditional('ELSE',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_else);
-        AddConditional('ELSEIF',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_elseif);
-        AddConditional('ENDIF',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_endif);
-        AddConditional('IFEND',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_endif);
-        AddConditional('IF',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_if);
-        AddConditional('IFDEF',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_ifdef);
-        AddConditional('IFNDEF',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_ifndef);
-        AddConditional('IFOPT',directive_turbo, {$ifdef FPCPROCVAR}@{$endif}dir_ifopt);
+        AddDirective('DEFINE',directive_turbo, @dir_define);
+        AddDirective('UNDEF',directive_turbo, @dir_undef);
+        AddDirective('INCLUDE',directive_turbo, @dir_include);
+        AddDirective('LIBPREFIX',directive_turbo, @dir_libprefix);
+        AddDirective('LIBSUFFIX',directive_turbo, @dir_libsuffix);
+        AddDirective('EXTENSION',directive_turbo, @dir_extension);
+
+        AddConditional('ELSE',directive_turbo, @dir_else);
+        AddConditional('ELSEIF',directive_turbo, @dir_elseif);
+        AddConditional('ENDIF',directive_turbo, @dir_endif);
+        AddConditional('IFEND',directive_turbo, @dir_endif);
+        AddConditional('IF',directive_turbo, @dir_if);
+        AddConditional('IFDEF',directive_turbo, @dir_ifdef);
+        AddConditional('IFNDEF',directive_turbo, @dir_ifndef);
+        AddConditional('IFOPT',directive_turbo, @dir_ifopt);
         
         { Default Mac directives and conditionals: }
-        AddDirective('SETC',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_setc);
-        AddDirective('DEFINEC',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_define);
-        AddConditional('IFC',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_if);
-        AddConditional('ELSEC',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_else);
-        AddConditional('ENDC',directive_mac, {$ifdef FPCPROCVAR}@{$endif}dir_endif);
+        AddDirective('SETC',directive_mac, @dir_setc);
+        AddDirective('DEFINEC',directive_mac, @dir_define);
+        AddConditional('IFC',directive_mac, @dir_if);
+        AddConditional('ELSEC',directive_mac, @dir_else);
+        AddConditional('ENDC',directive_mac, @dir_endif);
       end;
 
 
@@ -3267,7 +3263,11 @@ exit_label:
 end.
 {
   $Log$
-  Revision 1.91  2004-10-09 11:29:15  olle
+  Revision 1.92  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.91  2004/10/09 11:29:15  olle
     * Exchanged hardcoded "./" to CurDirRelPath
 
   Revision 1.90  2004/09/29 06:52:43  mazen

compiler/symbase.pas

@@ -222,7 +222,7 @@ implementation
           writeln('Symtable ',name^)
         else
           writeln('Symtable <not named>');
-        symsearch.foreach({$ifdef FPCPROCVAR}@{$endif}dumpsym,nil);
+        symsearch.foreach(@dumpsym,nil);
       end;
 {$endif EXTDEBUG}
 
@@ -331,7 +331,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.22  2004-07-09 22:17:32  peter
+  Revision 1.23  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.22  2004/07/09 22:17:32  peter
     * revert has_localst patch
     * replace aktstaticsymtable/aktglobalsymtable with current_module
 

compiler/symdef.pas

@@ -40,9 +40,6 @@ interface
        aasmbase,aasmtai,
        cpubase,cpuinfo,
        cgbase,parabase
-{$ifdef Delphi}
-       ,dmisc
-{$endif}
        ;
 
 
@@ -829,11 +826,7 @@ interface
 implementation
 
     uses
-{$ifdef Delphi}
-       sysutils,
-{$else Delphi}
        strings,
-{$endif Delphi}
        { global }
        verbose,
        { target }
@@ -3236,7 +3229,7 @@ implementation
         strpcopy(state.stabstring,'s'+tostr(size));
         state.recoffset:=0;
         state.stabsize:=strlen(state.stabstring);
-        symtable.foreach({$ifdef FPCPROCVAR}@{$endif}field_addname,@state);
+        symtable.foreach(@field_addname,@state);
         state.stabstring[state.stabsize]:=';';
         state.stabstring[state.stabsize+1]:=#0;
         reallocmem(state.stabstring,state.stabsize+2);
@@ -3248,7 +3241,7 @@ implementation
       begin
         if (stab_state in [stab_state_writing,stab_state_written]) then
           exit;
-        symtable.foreach({$ifdef FPCPROCVAR}@{$endif}field_concatstabto,asmlist);
+        symtable.foreach(@field_concatstabto,asmlist);
         inherited concatstabto(asmlist);
       end;
 {$endif GDB}
@@ -3257,7 +3250,7 @@ implementation
     procedure trecorddef.write_child_rtti_data(rt:trttitype);
       begin
          FRTTIType:=rt;
-         symtable.foreach({$ifdef FPCPROCVAR}@{$endif}generate_field_rtti,nil);
+         symtable.foreach(@generate_field_rtti,nil);
       end;
 
 
@@ -3271,9 +3264,9 @@ implementation
          rttiList.concat(Tai_const.Create_32bit(size));
          Count:=0;
          FRTTIType:=rt;
-         symtable.foreach({$ifdef FPCPROCVAR}@{$endif}count_field_rtti,nil);
+         symtable.foreach(@count_field_rtti,nil);
          rttiList.concat(Tai_const.Create_32bit(Count));
-         symtable.foreach({$ifdef FPCPROCVAR}@{$endif}write_field_rtti,nil);
+         symtable.foreach(@write_field_rtti,nil);
       end;
 
 
@@ -5070,7 +5063,7 @@ implementation
         sd:=nil;
         while assigned(o) do
           begin
-             o.symtable.foreach_static({$ifdef FPCPROCVAR}@{$endif}_searchdestructor,@sd);
+             o.symtable.foreach_static(@_searchdestructor,@sd);
              if assigned(sd) then
                begin
                   searchdestructor:=sd;
@@ -5254,7 +5247,7 @@ implementation
             {virtual table to implement yet}
             state.recoffset:=0;
             state.stabsize:=strlen(state.stabstring);
-            symtable.foreach({$ifdef FPCPROCVAR}@{$endif}field_addname,@state);
+            symtable.foreach(@field_addname,@state);
             if (oo_has_vmt in objectoptions) then
               if not assigned(childof) or not(oo_has_vmt in childof.objectoptions) then
                  begin
@@ -5262,7 +5255,7 @@ implementation
                     strpcopy(state.stabstring+state.stabsize,ts);
                     inc(state.stabsize,length(ts));
                  end;
-            symtable.foreach({$ifdef FPCPROCVAR}@{$endif}proc_addname,@state);
+            symtable.foreach(@proc_addname,@state);
             if (oo_has_vmt in objectoptions) then
               begin
                  anc := self;
@@ -5355,8 +5348,8 @@ implementation
             anc:=anc.childof;
             anc.concatstabto(asmlist);
           end;
-        symtable.foreach({$ifdef FPCPROCVAR}@{$endif}field_concatstabto,asmlist);
-        symtable.foreach({$ifdef FPCPROCVAR}@{$endif}proc_concatstabto,asmlist);
+        symtable.foreach(@field_concatstabto,asmlist);
+        symtable.foreach(@proc_concatstabto,asmlist);
         stab_state:=stab_state_used;
         if objecttype=odt_class then
           begin
@@ -5560,9 +5553,9 @@ implementation
          FRTTIType:=rt;
          case rt of
            initrtti :
-             symtable.foreach({$ifdef FPCPROCVAR}@{$endif}generate_field_rtti,nil);
+             symtable.foreach(@generate_field_rtti,nil);
            fullrtti :
-             symtable.foreach({$ifdef FPCPROCVAR}@{$endif}generate_published_child_rtti,nil);
+             symtable.foreach(@generate_published_child_rtti,nil);
            else
              internalerror(200108301);
          end;
@@ -5685,7 +5678,7 @@ implementation
          else
            i:=0;
          count:=0;
-         symtable.foreach({$ifdef FPCPROCVAR}@{$endif}count_published_properties,nil);
+         symtable.foreach(@count_published_properties,nil);
          next_free_name_index:=i+count;
       end;
 
@@ -5719,9 +5712,9 @@ implementation
                 begin
                   count:=0;
                   FRTTIType:=rt;
-                  symtable.foreach({$ifdef FPCPROCVAR}@{$endif}count_field_rtti,nil);
+                  symtable.foreach(@count_field_rtti,nil);
                   rttiList.concat(Tai_const.Create_32bit(count));
-                  symtable.foreach({$ifdef FPCPROCVAR}@{$endif}write_field_rtti,nil);
+                  symtable.foreach(@write_field_rtti,nil);
                 end;
              end;
            fullrtti :
@@ -5745,7 +5738,7 @@ implementation
                  count:=0;
 
                { write it }
-               symtable.foreach({$ifdef FPCPROCVAR}@{$endif}count_published_properties,nil);
+               symtable.foreach(@count_published_properties,nil);
                rttiList.concat(Tai_const.Create_16bit(count));
 
                { write unit name }
@@ -5758,7 +5751,7 @@ implementation
 
                { write published properties count }
                count:=0;
-               symtable.foreach({$ifdef FPCPROCVAR}@{$endif}count_published_properties,nil);
+               symtable.foreach(@count_published_properties,nil);
                rttiList.concat(Tai_const.Create_16bit(count));
 
 {$ifdef cpurequiresproperalignment}
@@ -5774,7 +5767,7 @@ implementation
                else
                  count:=0;
 
-               symtable.foreach({$ifdef FPCPROCVAR}@{$endif}write_property_info,nil);
+               symtable.foreach(@write_property_info,nil);
              end;
          end;
       end;
@@ -6204,7 +6197,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.258  2004-10-10 21:08:55  peter
+  Revision 1.259  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.258  2004/10/10 21:08:55  peter
     * parameter regvar fixes
 
   Revision 1.257  2004/10/04 21:23:15  florian

compiler/symsym.pas

@@ -305,11 +305,7 @@ interface
 implementation
 
     uses
-{$ifdef Delphi}
-       sysutils,
-{$else Delphi}
        strings,
-{$endif Delphi}
        { global }
        verbose,
        { target }
@@ -2255,7 +2251,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.187  2004-10-13 18:47:45  peter
+  Revision 1.188  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.187  2004/10/13 18:47:45  peter
     * fix misplaced begin..end for self stabs
     * no fpu regable for staticsymtable
 

compiler/symtable.pas

@@ -776,7 +776,7 @@ implementation
          if (tsym(p).typ=typesym) and
             (ttypesym(p).restype.def.deftype=objectdef) and
             (ttypesym(p).restype.def.typesym=tsym(p)) then
-           tobjectdef(ttypesym(p).restype.def).symtable.foreach({$ifdef FPCPROCVAR}@{$endif}TestPrivate,nil);
+           tobjectdef(ttypesym(p).restype.def).symtable.foreach(@TestPrivate,nil);
       end;
 
 
@@ -815,31 +815,31 @@ implementation
     { checks, if all procsyms and methods are defined }
     procedure tstoredsymtable.check_forwards;
       begin
-         foreach({$ifdef FPCPROCVAR}@{$endif}check_forward,nil);
+         foreach(@check_forward,nil);
       end;
 
 
     procedure tstoredsymtable.checklabels;
       begin
-         foreach({$ifdef FPCPROCVAR}@{$endif}labeldefined,nil);
+         foreach(@labeldefined,nil);
       end;
 
 
     procedure tstoredsymtable.allsymbolsused;
       begin
-         foreach({$ifdef FPCPROCVAR}@{$endif}varsymbolused,nil);
+         foreach(@varsymbolused,nil);
       end;
 
 
     procedure tstoredsymtable.allprivatesused;
       begin
-         foreach({$ifdef FPCPROCVAR}@{$endif}objectprivatesymbolused,nil);
+         foreach(@objectprivatesymbolused,nil);
       end;
 
 
     procedure tstoredsymtable.unchain_overloaded;
       begin
-         foreach({$ifdef FPCPROCVAR}@{$endif}unchain_overloads,nil);
+         foreach(@unchain_overloads,nil);
       end;
 
 
@@ -894,7 +894,7 @@ implementation
     function tstoredsymtable.needs_init_final : boolean;
       begin
          b_needs_init_final:=false;
-         foreach({$ifdef FPCPROCVAR}@{$endif}_needs_init_final,nil);
+         foreach(@_needs_init_final,nil);
          needs_init_final:=b_needs_init_final;
       end;
 
@@ -2186,7 +2186,7 @@ implementation
         _defaultprop:=nil;
         while assigned(pd) do
           begin
-             pd.symtable.foreach({$ifdef FPCPROCVAR}@{$endif}tstoredsymtable(pd.symtable).testfordefaultproperty,@_defaultprop);
+             pd.symtable.foreach(@tstoredsymtable(pd.symtable).testfordefaultproperty,@_defaultprop);
              if assigned(_defaultprop) then
                break;
              pd:=pd.childof;
@@ -2314,7 +2314,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.158  2004-10-12 19:51:13  peter
+  Revision 1.159  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.158  2004/10/12 19:51:13  peter
     * all checking for visibility is now done by is_visible_for_object
 
   Revision 1.157  2004/10/11 15:48:15  peter

compiler/tpexcept.pas

@@ -52,8 +52,8 @@ type
 
    pjmp_buf = ^jmp_buf;
 
-  function setjmp(var rec : jmp_buf) : longint;{$ifdef Delphi}stdcall;{$else}{$ifndef ver1_0}oldfpccall;{$endif}{$endif}
-  procedure longjmp(const rec : jmp_buf;return_value : longint);{$ifdef Delphi}stdcall;{$else}{$ifndef ver1_0}oldfpccall;{$endif}{$endif}
+  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}
 
@@ -258,7 +258,11 @@ implementation
 end.
 {
   $Log$
-  Revision 1.11  2004-06-20 08:55:30  florian
+  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

compiler/verbose.pas

@@ -24,11 +24,6 @@ unit verbose;
 
 {$i fpcdefs.inc}
 
-{ Don't include messages in the executable }
-{$ifdef Delphi}
-{$define EXTERN_MSG}
-{$endif}
-
 interface
 
     uses
@@ -383,7 +378,7 @@ var
     procedure ShowStatus;
       begin
         UpdateStatus;
-        if do_status{$ifdef FPCPROCVAR}(){$endif} then
+        if do_status() then
          stop(1);
       end;
 
@@ -873,7 +868,11 @@ finalization
 end.
 {
   $Log$
-  Revision 1.33  2004-09-08 11:23:31  michael
+  Revision 1.34  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.33  2004/09/08 11:23:31  michael
   + Check if outputdir exists,  Fix exitcode when displaying help pages
 
   Revision 1.32  2004/06/20 08:55:30  florian

compiler/widestr.pas

@@ -28,23 +28,13 @@ unit widestr;
 
     uses
        charset,globtype
-{$ifdef delphi}
-       ,sysutils
-{$endif}
        ;
 
 
     type
        tcompilerwidechar = word;
        tcompilerwidecharptr = ^tcompilerwidechar;
-{$ifdef delphi}
-       SizeInt = integer;
-       { delphi doesn't allow pointer accessing as array }
-       tcompilerwidechararray = array[0..0] of tcompilerwidechar;
-       pcompilerwidechar = ^tcompilerwidechararray;
-{$else}
        pcompilerwidechar = ^tcompilerwidechar;
-{$endif}
 
        pcompilerwidestring = ^_tcompilerwidestring;
        _tcompilerwidestring = record
@@ -152,11 +142,7 @@ unit widestr;
          temp:=s2^.len;
          if maxi>temp then
            maxi:=Temp;
-{$ifdef Delphi}
-         temp:=SizeInt(comparemem(@s1^.data,@s2^.data,maxi));
-{$else}
          temp:=compareword(s1^.data^,s2^.data^,maxi);
-{$endif}
          if temp=0 then
            temp:=s1^.len-s2^.len;
          comparewidestrings:=temp;
@@ -240,7 +226,11 @@ unit widestr;
 end.
 {
   $Log$
-  Revision 1.15  2004-06-20 08:55:30  florian
+  Revision 1.16  2004-10-15 09:14:17  mazen
+  - remove $IFDEF DELPHI and related code
+  - remove $IFDEF FPCPROCVAR and related code
+
+  Revision 1.15  2004/06/20 08:55:30  florian
     * logs truncated
 
   Revision 1.14  2004/06/16 20:07:10  florian