Changeset 17 for trunk/Compiler/Analyze/UAnalyzerPascal.pas

Timestamp:

Nov 8, 2010, 2:14:13 PM (14 years ago)

Author:

george

Message:

• Modified: Enhanced Delphi producer.

File:

• trunk/Compiler/Analyze/UAnalyzerPascal.pas (modified) (3 diffs)

trunk/Compiler/Analyze/UAnalyzerPascal.pas

@@ -27 +27 @@
       Expressions: TListExpression; var Func: TFunctionCall): Boolean;
     function ParseUses(SourceCode: TUsedModuleList; AExported: Boolean): Boolean;
+    function ParseUsesItem(SourceCode: TUsedModuleList; AExported: Boolean): Boolean;
     function ParseModule(ProgramCode: TProgram): TModule; override;
     function ParseUnit(var SourceCode: TModuleUnit; ProgramCode: TProgram): Boolean;
@@ -1256 +1257 @@
   if NextToken = 'uses' then begin
     Expect('uses');
+    ParseUsesItem(SourceCode, AExported);
+    while NextToken = ',' do begin
+      Expect(',');
+      ParseUsesItem(SourceCode, AExported);
+    end;
+    Expect(';');
+    Result := True;
+  end else Result := False;
+end;
+
+function TAnalyzerPascal.ParseUsesItem(SourceCode: TUsedModuleList;
+  AExported: Boolean): Boolean;
+begin
     with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do begin
       Name := ReadToken;
@@ -1273 +1287 @@
       end;
     end;
-    while NextToken = ',' do begin
-      Expect(',');
-      with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do
-      begin
-        Name := ReadToken;
-        if NextToken = 'in' then begin
-          Expect('in');
-          Location := ReadToken;
-        end else Location := Name + '.pas';
-        Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
-        if not Assigned(Module) then begin
-          if not ParseFile(Name) then begin
-            ErrorMessage(SUnitNotFound, [Name], -2);
-            SourceCode.Delete(SourceCode.Count - 1);
-          end;
-        end;
-      end;
-    end;
-    Expect(';');
-    Result := True;
-  end else Result := False;
 end;