Changeset 55 for branches/DelphiToC/Analyze/UParser.pas

Timestamp:

Aug 10, 2010, 1:48:38 PM (14 years ago)

Author:

george

Message:

Fix: View proper source file after click to error message.
Made partial changes to support unit interface and implementation sections.

File:

• branches/DelphiToC/Analyze/UParser.pas (modified) (3 diffs)

branches/DelphiToC/Analyze/UParser.pas

@@ -51 +51 @@
     procedure ParseExpression(SourceCode: TExpression);
     procedure ParseUsedModuleList(SourceCode: TUsedModuleList);
-    procedure ParseModule(SourceCode: TModule);
-    procedure ParseUnit(SourceCode: TModule);
-    procedure ParseProgram(SourceCode: TModule);
+    function ParseModule: TModule;
+    procedure ParseUnit(SourceCode: TModuleUnit);
+    procedure ParseUnitInterface(SourceCode: TUnitInterface);
+    procedure ParseUnitImplementation(SourceCode: TUnitImplementation);
+    procedure ParseProgram(SourceCode: TModuleProgram);
     procedure ParseCommonBlock(SourceCode: TCommonBlock; EndSymbol: char = ';');
     function ParseCommand(SourceCode: TCommonBlock): TCommand;
@@ -628 +630 @@
 { TParserModule }
 
-procedure TPascalParser.ParseModule(SourceCode: TModule);
-begin
-  if FNextToken = 'program' then
-    ParseProgram(SourceCode)
-  else if FNextToken = 'unit' then
-    ParseUnit(SourceCode)
-  else
-    ParseProgram(SourceCode);
-end;
-
-procedure TPascalParser.ParseProgram(SourceCode: TModule);
+function TPascalParser.ParseModule: TModule;
+begin
+  if FNextToken = 'unit' then begin
+    Result := TModuleUnit.Create;
+    ParseUnit(TModuleUnit(Result));
+  end else begin //if FNextToken = 'program' then begin
+    Result := TModuleProgram.Create;
+    ParseProgram(TModuleProgram(Result));
+  end;
+end;
+
+procedure TPascalParser.ParseProgram(SourceCode: TModuleProgram);
 var
   Identifier: string;
 begin
-  with SourceCode do
-  begin
-    if FNextToken = 'program' then
-    begin
+  with SourceCode do begin
+    if FNextToken = 'program' then begin
       Expect('program');
       Name := ReadCode;
-      ModuleType := mdProgram;
       Expect(';');
     end else Name := '';
@@ -656 +656 @@
       ParseUsedModuleList(UsedModules);
 
-    ParseCommonBlock(SourceCode, '.');
-  end;
-end;
-
-procedure TPascalParser.ParseUnit(SourceCode: TModule);
+    ParseCommonBlock(Body, '.');
+  end;
+end;
+
+procedure TPascalParser.ParseUnit(SourceCode: TModuleUnit);
 var
   NewModule: TModule;
 begin
   Expect('unit');
-  with Sourcecode do
-  begin
+  with Sourcecode do begin
     Name := ReadCode;
-    ModuleType := mdUnit;
   end;
   Expect(';');
-  //ParseInterface;
-  //ParseImplementation;
-end;
-
-{ TParserProgram }
+
+  ParseUnitInterface(SourceCode.InterfaceSection);
+  if FNextToken = 'implementation' then
+    ParseUnitImplementation(SourceCode.ImplementationSection);
+end;
+
+procedure TPascalParser.ParseUnitInterface(SourceCode: TUnitInterface);
+begin
+  Expect('interface');
+  // Uses section
+  if FNextToken = 'uses' then
+    ParseUsedModuleList(SourceCode.UsedModules);
+
+  ParseCommonBlock(SourceCode.Body, '.');
+end;
+
+procedure TPascalParser.ParseUnitImplementation(SourceCode: TUnitImplementation);
+begin
+  Expect('implementation');
+
+  // Uses section
+  if FNextToken = 'uses' then
+    ParseUsedModuleList(SourceCode.UsedModules);
+
+  ParseCommonBlock(SourceCode.Body, '.');
+end;
 
 { TParserCommonBlock }