Changeset 59 for branches/Transpascal/Analyze/UParser.pas

Timestamp:

Oct 14, 2010, 8:41:34 AM (14 years ago)

Author:

george

Message:

• Added: On parsing uses section load and parse unit files.

File:

• branches/Transpascal/Analyze/UParser.pas (modified) (10 diffs)

branches/Transpascal/Analyze/UParser.pas

@@ -45 +45 @@
   end;
 
+  TGetSourceEvent = function (Name: string; Source: TStringList): Boolean of object;
+
   { TPascalParser }
 
   TPascalParser = class(TBaseParser)
+  private
+    FOnGetSource: TGetSourceEvent;
+  public
+    function ParseFile(Name: string): Boolean;
     procedure ParseWhileDo(SourceCode: TWhileDo);
     procedure ParseExpression(SourceCode: TExpression);
-    procedure ParseUsedModuleList(SourceCode: TUsedModuleList);
-    function ParseModule: TModule;
+    procedure ParseUses(SourceCode: TUsedModuleList);
+    function ParseModule(ProgramCode: TProgram): TModule;
     procedure ParseUnit(SourceCode: TModuleUnit);
     procedure ParseUnitInterface(SourceCode: TUnitInterface);
@@ -68 +74 @@
     procedure ParseTypeList(SourceCode: TTypeList);
     function ParseType(TypeList: TTypeList; ExpectName: Boolean = True; AssignSymbol: string = '='): TType;
-  private
+    property OnGetSource: TGetSourceEvent read FOnGetSource
+      write FOnGetSource;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -84 +93 @@
   SUndefinedType = 'Undefined type "%s".';
   SUndefinedConstant = 'Undefined constant "%s".';
+  SUnitNotFound = 'Unit "%s" not found.';
 
 { TBaseParser }
@@ -335 +345 @@
 end;
 
-{ TParserWhileDo }
+{ TPascalParser }
+
+function TPascalParser.ParseFile(Name: string): Boolean;
+var
+  Parser: TPascalParser;
+  NewModule: TModule;
+begin
+  try
+    Parser := TPascalParser.Create;
+    Parser.SourceCodeText := TStringList.Create;
+    Parser.ProgramCode := ProgramCode;
+    if Assigned(FOnGetSource) then begin
+      if FOnGetSource(Name, Parser.SourceCodeText) then begin
+        Parser.Init;
+        NewModule := Parser.ParseModule(ProgramCode);
+        ProgramCode.Modules.Add(NewModule);
+        Result := True;
+      end else Result := False;
+    end else Result := False;
+  finally
+    Parser.SourceCodeText.Free;
+    Parser.Free;
+  end;
+end;
 
 procedure TPascalParser.ParseWhileDo(SourceCode: TWhileDo);
@@ -631 +664 @@
 { TParserModule }
 
-function TPascalParser.ParseModule: TModule;
-begin
+function TPascalParser.ParseModule(ProgramCode: TProgram): TModule;
+begin
+  Self.ProgramCode := ProgramCode;
   if FNextToken = 'unit' then begin
     Result := TModuleUnit.Create;
+    Result.ParentProgram := ProgramCode;
     ParseUnit(TModuleUnit(Result));
   end else begin //if FNextToken = 'program' then begin
     Result := TModuleProgram.Create;
+    Result.ParentProgram := ProgramCode;
     ParseProgram(TModuleProgram(Result));
   end;
@@ -655 +691 @@
     // Uses section
     if FNextToken = 'uses' then
-      ParseUsedModuleList(UsedModules);
+      ParseUses(UsedModules);
 
     ParseCommonBlock(Body, '.');
@@ -681 +717 @@
   // Uses section
   if FNextToken = 'uses' then
-    ParseUsedModuleList(SourceCode.UsedModules);
+    ParseUses(SourceCode.UsedModules);
 
   ParseCommonBlockInterface(SourceCode.Body);
@@ -692 +728 @@
   // Uses section
   if FNextToken = 'uses' then
-    ParseUsedModuleList(SourceCode.UsedModules);
+    ParseUses(SourceCode.UsedModules);
 
   ParseCommonBlock(SourceCode.Body, '.');
@@ -1103 +1139 @@
 end;
 
+constructor TPascalParser.Create;
+begin
+end;
+
+destructor TPascalParser.Destroy;
+begin
+  inherited Destroy;
+end;
+
 { TParserUsedModuleList }
 
-procedure TPascalParser.ParseUsedModuleList(SourceCode: TUsedModuleList);
+procedure TPascalParser.ParseUses(SourceCode: TUsedModuleList);
 var
   NewUsedModule: TUsedModule;
@@ -1113 +1158 @@
   begin
     Name := ReadCode;
-  end;
-  while FNextToken = ',' do
-  begin
+    Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
+    if not Assigned(Module) then begin
+      if not ParseFile(Name) then ErrorMessage(SUnitNotFound, [Name]);
+    end;
+  end;
+  while FNextToken = ',' do begin
     Expect(',');
     with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do
     begin
       Name := ReadCode;
+      Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
+      if not Assigned(Module) then begin
+        if not ParseFile(Name) then ErrorMessage(SUnitNotFound, [Name]);
+      end;
     end;
   end;