refractor codetools includes

Villavu · Dec 19, 2023 · ec97b8b · ec97b8b
1 parent 240dab3
commit ec97b8b
Show file tree

Hide file tree

Showing 17 changed files with 381 additions and 525 deletions.
diff --git a/Source/codetools/mpaslex.pas b/Source/codetools/mpaslex.pas
@@ -589,12 +589,12 @@ procedure TmwBasePasLex.BraceOpenProc;
         end;
       tokIncludeDirect, tokIncludeOnceDirect:
         begin
-          if Assigned(fOnIncludeDirect) and (FDefineStack = 0) then
+          if Assigned(fOnIncludeDirect) and (FDefineStack = 0) and (not IsJunk) then
             fOnIncludeDirect(Self);
         end;
       tokLibraryDirect:
         begin
-          if Assigned(fOnLibraryDirect) and (FDefineStack = 0) then
+          if Assigned(fOnLibraryDirect) and (FDefineStack = 0) and (not IsJunk) then
             fOnLibraryDirect(Self);
         end;
       tokUndefDirect:

diff --git a/Source/codetools/msimplepaspar.pas b/Source/codetools/msimplepaspar.pas
@@ -344,10 +344,8 @@   TmwSimplePasPar = class(TObject)
 
     procedure Assign(From: TObject); virtual;
 
-    procedure SetScript(Script: String; FileName: String = ''; Defines: TStringArray = nil); virtual;
-    procedure SetFile(FileName: String; Defines: TStringArray = nil); virtual;
-
-    function HasFile(FileName: String): Boolean;
+    procedure SetScript(Script: String; FileName: String = ''); virtual;
+    procedure SetFile(FileName: String); virtual;
 
     procedure Reset; virtual;
     procedure Run; virtual;
@@ -592,29 +590,16 @@ procedure TmwSimplePasPar.Reset;
   fLexerStack.Clear();
 end;
 
-procedure TmwSimplePasPar.SetScript(Script: String; FileName: String; Defines: TStringArray);
+procedure TmwSimplePasPar.SetScript(Script: String; FileName: String);
 begin
   Reset();
   PushLexer(TmwPasLex.Create(Script, FileName));
-  fLexer.Defines.AddStrings(Defines);
 end;
 
-procedure TmwSimplePasPar.SetFile(FileName: String; Defines: TStringArray);
+procedure TmwSimplePasPar.SetFile(FileName: String);
 begin
   Reset();
   PushLexer(TmwPasLex.CreateFromFile(FileName));
-  fLexer.Defines.AddStrings(Defines);
-end;
-
-function TmwSimplePasPar.HasFile(FileName: String): Boolean;
-var
-  I: Integer;
-begin
-  for I := 0 to fLexers.Count - 1 do
-    if (fLexers[I].FileName = FileName) then
-      Exit(True);
-
-  Result := False;
 end;
 
 procedure TmwSimplePasPar.ParseFile;