* fixed macro within macro endless-loop

compiler/files.pas

@@ -444,6 +444,12 @@ uses
         tempopen:=false;
         if is_macro then
          begin
+           { seek buffer postion to bufstart }
+           if bufstart>0 then
+            begin
+              move(buf[bufstart],buf[0],bufsize-bufstart+1);
+              bufstart:=0;
+            end;
            tempopen:=true;
            exit;
          end;
@@ -593,6 +599,9 @@ uses
 
     procedure tfilemanager.register_file(f : pinputfile);
       begin
+         { don't register macro's }
+         if f^.is_macro then
+          exit;
          inc(last_ref_index);
          f^.ref_next:=files;
          f^.ref_index:=last_ref_index;
@@ -1331,7 +1340,10 @@ end;
 end.
 {
   $Log$
-  Revision 1.103  1999-09-16 08:00:50  pierre
+  Revision 1.104  1999-09-27 23:40:12  peter
+    * fixed macro within macro endless-loop
+
+  Revision 1.103  1999/09/16 08:00:50  pierre
    + compiled_module to avoid wrong file info when load PPU files
 
   Revision 1.102  1999/08/31 15:51:10  pierre

compiler/scanner.pas

@@ -94,7 +94,7 @@ unit scanner;
           procedure nextfile;
           procedure addfile(hp:pinputfile);
           procedure reload;
-          procedure insertmacro(p:pchar;len:longint);
+          procedure insertmacro(const macname:string;p:pchar;len:longint);
         { Scanner things }
           procedure gettokenpos;
           procedure inc_comment_level;
@@ -143,7 +143,6 @@ implementation
 
     const
       { use any special name that is an invalid file name to avoid problems }
-      macro_special_name = '____Macro____';
       preprocstring : array [preproctyp] of string[7]
         = ('$IFDEF','$IFNDEF','$IF','$IFOPT','$ELSE');
 
@@ -341,8 +340,11 @@ implementation
          begin
            repeat
            { still more to read?, then change the #0 to a space so its seen
-             as a seperator }
-             if (c=#0) and (bufsize>0) and (inputpointer-inputbuffer<bufsize) then
+             as a seperator, this can't be used for macro's which can change
+             the place of the #0 in the buffer with tempopen }
+             if (c=#0) and (bufsize>0) and
+                not(inputfile^.is_macro) and
+                (inputpointer-inputbuffer<bufsize) then
               begin
                 c:=' ';
                 inc(longint(inputpointer));
@@ -389,7 +391,7 @@ implementation
       end;
 
 
-    procedure tscannerfile.insertmacro(p:pchar;len:longint);
+    procedure tscannerfile.insertmacro(const macname:string;p:pchar;len:longint);
       var
         hp : pinputfile;
       begin
@@ -400,7 +402,7 @@ implementation
         tempcloseinputfile;
       { create macro 'file' }
         { use special name to dispose after !! }
-        hp:=new(pinputfile,init(macro_special_name));
+        hp:=new(pinputfile,init('_Macro_.'+macname));
         addfile(hp);
         with inputfile^ do
          begin
@@ -1102,7 +1104,7 @@ implementation
                  mac:=pmacrosym(macros^.search(pattern));
                  if assigned(mac) and (assigned(mac^.buftext)) then
                   begin
-                    insertmacro(mac^.buftext,mac^.buflen);
+                    insertmacro(pattern,mac^.buftext,mac^.buflen);
                   { handle empty macros }
                     if c=#0 then
                      reload;
@@ -1669,7 +1671,10 @@ exit_label:
 end.
 {
   $Log$
-  Revision 1.95  1999-09-03 10:02:48  peter
+  Revision 1.96  1999-09-27 23:40:10  peter
+    * fixed macro within macro endless-loop
+
+  Revision 1.95  1999/09/03 10:02:48  peter
     * $IFNDEF is 7 chars and not 6 chars
 
   Revision 1.94  1999/09/02 18:47:47  daniel