Changeset 7 for trunk/Compiler/Analyze

Timestamp:

Nov 5, 2010, 1:50:02 PM (14 years ago)

Author:

george

Message:

• Added: Support for unit initialization and finalization sections.

File:

• trunk/Compiler/Analyze/UPascalParser.pas (modified) (7 diffs)

trunk/Compiler/Analyze/UPascalParser.pas

@@ -33 +33 @@
     function ParseUnitInterface(SourceCode: TModuleUnit): Boolean;
     function ParseUnitImplementation(SourceCode: TModuleUnit): Boolean;
-    procedure ParseProgram(SourceCode: TModuleProgram);
+    function ParseProgram(var SourceCode: TModuleProgram; ProgramCode: TProgram): Boolean;
     procedure ParseCommonBlock(SourceCode: TCommonBlock; EndSymbol: char = ';';
       WithBody: Boolean = True);
@@ -396 +396 @@
 begin
   Self.ProgramCode := ProgramCode;
-  if not ParseUnit(TModuleUnit(Result), ProgramCode) then begin
-    Result := TModuleProgram.Create;
-    Result.ParentProgram := ProgramCode;
-    ParseProgram(TModuleProgram(Result));
-  end else
+  if not ParseUnit(TModuleUnit(Result), ProgramCode) then
+  if not ParseProgram(TModuleProgram(Result), ProgramCode) then
     ErrorMessage(SUnknownModuleType, [NextToken]);
 end;
 
-procedure TPascalParser.ParseProgram(SourceCode: TModuleProgram);
+function TPascalParser.ParseProgram(var SourceCode: TModuleProgram; ProgramCode: TProgram): Boolean;
 var
   Identifier: string;
 begin
   with SourceCode do begin
+    SourceCode := TModuleProgram.Create;
+    SourceCode.ParentProgram := ProgramCode;
     if NextToken = 'program' then begin
       Expect('program');
@@ -421 +420 @@
     ParseCommonBlock(Body, '.');
     SourceCode.ParentProgram.Modules.Add(SourceCode);
+    Result := True;
   end;
 end;
@@ -427 +427 @@
 var
   NewModule: TModule;
+  NewCommand: TCommand;
 begin
   if NextToken = 'unit' then begin
@@ -447 +448 @@
     if NextToken = 'initialization' then begin
       Expect('initialization');
+      while (NextToken <> 'end') and (NextToken <> 'finalization')
+      and (NextTokenType <> ttEndOfFile) do
+      begin
+        NewCommand := ParseCommand(SourceCode.InititializeSection);
+        if Assigned(NewCommand) then
+          SourceCode.InititializeSection.Code.Commands.Add(NewCommand);
+       //ShowMessage(NextCode);
+        if NextToken = ';' then
+          ReadToken;
+      end;
     end;
     if NextToken = 'finalization' then begin
       Expect('finalization');
-    end;
+      while (NextToken <> 'end') and (NextTokenType <> ttEndOfFile) do
+      begin
+        NewCommand := ParseCommand(SourceCode.FinalalizeSection);
+        if Assigned(NewCommand) then
+          SourceCode.FinalalizeSection.Code.Commands.Add(NewCommand);
+       //ShowMessage(NextCode);
+        if NextToken = ';' then
+          ReadToken;
+      end;
+    end;
+    Expect('end');
+    Expect('.');
     Result := True;
   end else Result := False;
@@ -487 +509 @@
 begin
   with SourceCode do begin
-    while (NextToken <> EndSymbol) do begin
+    while (NextToken <> EndSymbol) and (NextTokenType <> ttEndOfFile) do begin
       if not ParseVariableList(Variables) then
       if not ParseConstantList(Constants) then
@@ -1270 +1292 @@
 end;
 
-
 end.