* give include file name on error

compiler/parser.pas

@@ -42,9 +42,6 @@ unit parser;
     procedure initparser;
     procedure doneparser;
 
-    const
-       parser_current_file : string = '';
-
   implementation
 
     uses
@@ -446,7 +443,10 @@ unit parser;
 end.
 {
   $Log$
-  Revision 1.66  1999-01-23 23:29:35  florian
+  Revision 1.67  1999-01-27 13:05:44  pierre
+   * give include file name on error
+
+  Revision 1.66  1999/01/23 23:29:35  florian
     * first running version of the new code generator
     * when compiling exceptions under Linux fixed
 

compiler/pp.pas

@@ -115,8 +115,6 @@ uses
   catch,
 {$endif}
 {$endif FPC}
-  { added for parser_current_file info }
-  parser,
   globals,compiler
   ;
 
@@ -269,7 +267,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.39  1999-01-22 12:19:30  pierre
+  Revision 1.40  1999-01-27 13:05:41  pierre
+   * give include file name on error
+
+  Revision 1.39  1999/01/22 12:19:30  pierre
    + currently compiled file name added on errors
 
   Revision 1.38  1999/01/19 10:19:03  florian

compiler/scanner.pas

@@ -310,6 +310,8 @@ implementation
         inputpointer:=inputfile^.saveinputpointer;
         lastlinepos:=inputfile^.savelastlinepos;
         line_no:=inputfile^.saveline_no;
+        if not inputfile^.is_macro then
+          parser_current_file:=inputfile^.name^;
       end;
 
 
@@ -1504,7 +1506,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.70  1999-01-19 12:14:38  peter
+  Revision 1.71  1999-01-27 13:05:45  pierre
+   * give include file name on error
+
+  Revision 1.70  1999/01/19 12:14:38  peter
     * fixed eof bug with includefiles
 
   Revision 1.69  1998/12/11 00:03:46  peter