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

Timestamp:

Aug 10, 2010, 3:41:49 PM (14 years ago)

Author:

george

Message:

Slightly enhanced parsing of unit.

File:

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

branches/Transpascal/Analyze/UParser.pas

@@ -57 +57 @@
     procedure ParseProgram(SourceCode: TModuleProgram);
     procedure ParseCommonBlock(SourceCode: TCommonBlock; EndSymbol: char = ';');
+    procedure ParseCommonBlockInterface(SourceCode: TCommonBlock);
     function ParseCommand(SourceCode: TCommonBlock): TCommand;
     procedure ParseBeginEnd(SourceCode: TBeginEnd);
-    procedure ParseFunctionList(SourceCode: TFunctionList);
+    procedure ParseFunctionList(SourceCode: TFunctionList; IncludeBody: Boolean = True);
     procedure ParseIfThenElse(SourceCode: TIfThenElse);
     procedure ParseForToDo(SourceCode: TForToDo);
@@ -682 +683 @@
     ParseUsedModuleList(SourceCode.UsedModules);
 
-  ParseCommonBlock(SourceCode.Body, '.');
+  ParseCommonBlockInterface(SourceCode.Body);
 end;
 
@@ -725 +726 @@
 end;
 
+procedure TPascalParser.ParseCommonBlockInterface(SourceCode: TCommonBlock);
+begin
+  with SourceCode do begin
+    while FNextToken <> 'implementation' do begin
+      if FNextToken = 'var' then
+        ParseVariableList(Variables)
+      else if FNextToken = 'const' then
+        ParseConstantList(Constants)
+      else if FNextToken = 'type' then
+        ParseTypeList(Types)
+      else if FNextToken = 'procedure' then
+        ParseFunctionList(Functions, False)
+      else if FNextToken = 'function' then
+        ParseFunctionList(Functions, False)
+      else ErrorMessage(SUnknownIdentifier, [FNextToken]);
+    end;
+  end;
+end;
+
 { TParserBeginEnd }
 
@@ -750 +770 @@
 { TParserParseFunctionList }
 
-procedure TPascalParser.ParseFunctionList(SourceCode: TFunctionList);
+procedure TPascalParser.ParseFunctionList(SourceCode: TFunctionList; IncludeBody: Boolean = True);
 var
   Identifiers: TStringList;
@@ -760 +780 @@
 begin
   Identifiers := TStringList.Create;
-  with SourceCode do
-  begin
-    with TFunction(Items[Add(TFunction.Create)]) do
-    begin
+  with SourceCode do begin
+    with TFunction(Items[Add(TFunction.Create)]) do begin
       Parent := SourceCode.Parent;
       if FNextToken = 'procedure' then
@@ -834 +852 @@
         end;
       end;
-    end;
-    Expect(';');
-    ParseCommonBlock(TFunction(Last));
+      Expect(';');
+
+      // Check directives
+      if FNextToken = 'internal' then begin
+        Expect('internal');
+        Expect(';');
+        System := True;
+      end;
+    end;
+
+    if IncludeBody then ParseCommonBlock(TFunction(Last));
   end;
   Identifiers.Destroy;