Changeset 3 for trunk/Compiler/Analyze

Timestamp:

Nov 4, 2010, 12:19:14 PM (14 years ago)

Author:

george

Message:

• Modified: More parsing procedures transformed to functions.

Location:

trunk

Files:

• . (modified) (1 prop)
• Compiler (modified) (1 prop)
• Compiler/Analyze/UParser.pas (modified) (1 diff)
• Compiler/Analyze/UPascalParser.pas (modified) (12 diffs)

trunk/Compiler/Analyze/UParser.pas

@@ -360 +360 @@
         // Update cursor position
         Inc(CodePosition.X);
-        if (CurrentChar = LineEnding) then begin
+        if (CurrentChar = LineEnding[1]) then begin
           CodePosition.X := 0;
           Inc(CodePosition.Y);

trunk/Compiler/Analyze/UPascalParser.pas

@@ -18 +18 @@
   public
     function ParseFile(Name: string): Boolean;
-    procedure ParseWhileDo(SourceCode: TWhileDo);
+    function ParseWhileDo(var WhileDo: TWhileDo; SourceCode: TCommonBlock): Boolean;
     procedure ParseExpression(SourceCode: TExpression);
     function ParseRightValue(SourceCode: TExpression): TObject;
     function ParseFunctionCall(SourceCode: TExpression): TObject;
-    procedure ParseUses(SourceCode: TUsedModuleList; AExported: Boolean);
+    function ParseUses(SourceCode: TUsedModuleList; AExported: Boolean): Boolean;
     function ParseModule(ProgramCode: TProgram): TModule;
-    procedure ParseUnit(SourceCode: TModuleUnit);
-    procedure ParseUnitInterface(SourceCode: TModuleUnit);
-    procedure ParseUnitImplementation(SourceCode: TModuleUnit);
+    function ParseUnit(var SourceCode: TModuleUnit; ProgramCode: TProgram): Boolean;
+    function ParseUnitInterface(SourceCode: TModuleUnit): Boolean;
+    function ParseUnitImplementation(SourceCode: TModuleUnit): Boolean;
     procedure ParseProgram(SourceCode: TModuleProgram);
     procedure ParseCommonBlock(SourceCode: TCommonBlock; EndSymbol: char = ';';
@@ -32 +32 @@
     procedure ParseCommonBlockInterface(SourceCode: TCommonBlock);
     function ParseCommand(SourceCode: TCommonBlock): TCommand;
-    procedure ParseBeginEnd(SourceCode: TBeginEnd);
+    function ParseBeginEnd(var BeginEnd: TBeginEnd; SourceCode: TCommonBlock): Boolean;
     function ParseFunctionList(SourceCode: TFunctionList; Exported: Boolean = False): Boolean;
     procedure ParseFunctionParameters(SourceCode: TFunction; ValidateParams: Boolean = False);
-    procedure ParseIfThenElse(SourceCode: TIfThenElse);
-    procedure ParseForToDo(SourceCode: TForToDo);
+    function ParseIfThenElse(var IfThenElse: TIfThenElse; SourceCode: TCommonBlock): Boolean;
+    function ParseForToDo(var ForToDo: TForToDo; SourceCode: TCommonBlock): Boolean;
     function ParseVariableList(SourceCode: TVariableList; Exported: Boolean = False): Boolean;
     procedure ParseVariable(SourceCode: TVariableList; Exported: Boolean = False);
@@ -107 +107 @@
 end;
 
-procedure TPascalParser.ParseWhileDo(SourceCode: TWhileDo);
-begin
-  with SourceCode do
-  begin
+function TPascalParser.ParseWhileDo(var WhileDo: TWhileDo; SourceCode: TCommonBlock): Boolean;
+begin
+  if NextToken = 'while' then begin
     Expect('while');
-    Condition.CommonBlock := CommonBlock;
-    ParseExpression(Condition);
-    Expect('do');
-    Command := ParseCommand(CommonBlock);
-  end;
+    WhileDo := TWhileDo.Create;
+    WhileDo.CommonBlock := SourceCode;
+    with WhileDo do begin
+      Condition.CommonBlock := CommonBlock;
+      ParseExpression(Condition);
+      Expect('do');
+      Command := ParseCommand(CommonBlock);
+    end;
+    Result := True;
+  end else Result := False;
 end;
 
@@ -311 +315 @@
 begin
   begin
-    if NextToken = 'begin' then begin
-      Result := TBeginEnd.Create;
-      TBeginEnd(Result).CommonBlock := SourceCode;
-      //ShowMessage(IntToStr(Integer(SourceCode))
-      // + ' ' + IntToStr(Integer(Result)));
-      ParseBeginEnd(TBeginEnd(Result));
-    end else
-    if NextToken = 'if' then begin
-      Result := TIfThenElse.Create;
-      TIfThenElse(Result).CommonBlock := SourceCode;
-      ParseIfThenElse(TIfThenElse(Result));
-    end else
-    if NextToken = 'while' then begin
-      Result := TWhileDo.Create;
-      TWhileDo(Result).CommonBlock := SourceCode;
-      ParseWhileDo(TWhileDo(Result));
-    end else
-    if NextToken = 'for' then begin
-      Result := TForToDo.Create;
-      TForToDo(Result).CommonBlock := SourceCode;
-      ParseForToDo(TForToDo(Result));
-    end else
+    if not ParseBeginEnd(TBeginEnd(Result), SourceCode) then
+    if not ParseIfThenElse(TIfThenElse(Result), SourceCode) then
+    if not ParseWhileDo(TWhileDo(Result), SourceCode) then
+    if not ParseForToDo(TForToDo(Result), SourceCode) then
     if IsIdentificator(NextToken) then begin
       if Assigned(SourceCode.Variables.Search(NextToken)) then begin
@@ -381 +367 @@
 begin
   Self.ProgramCode := ProgramCode;
-  if NextToken = 'unit' then begin
-    Result := TModuleUnit.Create;
-    Result.ParentProgram := ProgramCode;
-    ParseUnit(TModuleUnit(Result));
-  end else
-  if NextToken = 'program' then begin
+  if not ParseUnit(TModuleUnit(Result), ProgramCode) then begin
     Result := TModuleProgram.Create;
     Result.ParentProgram := ProgramCode;
@@ -414 +395 @@
 end;
 
-procedure TPascalParser.ParseUnit(SourceCode: TModuleUnit);
+function TPascalParser.ParseUnit(var SourceCode: TModuleUnit; ProgramCode: TProgram): Boolean;
 var
   NewModule: TModule;
 begin
-  Expect('unit');
-  with Sourcecode do begin
-    Name := ReadToken;
-  end;
-  Expect(';');
-
-  ParseUnitInterface(SourceCode);
-  if NextToken = 'implementation' then
-    ParseUnitImplementation(SourceCode);
-
-  SourceCode.ParentProgram.Modules.Add(SourceCode);
-
-  if NextToken = 'initialization' then begin
-    Expect('initialization');
-  end;
-  if NextToken = 'finalization' then begin
-    Expect('finalization');
-  end;
-end;
-
-procedure TPascalParser.ParseUnitInterface(SourceCode: TModuleUnit);
-begin
-  Expect('interface');
-  // Uses section
-  if NextToken = 'uses' then
+  if NextToken = 'unit' then begin
+    SourceCode := TModuleUnit.Create;
+    SourceCode.ParentProgram := ProgramCode;
+    Expect('unit');
+    with Sourcecode do begin
+      Name := ReadToken;
+    end;
+    Expect(';');
+
+    if not ParseUnitInterface(SourceCode) then
+      ErrorMessage(SExpectedButFound, ['interface', NextToken]);
+
+    if not ParseUnitImplementation(SourceCode) then
+      ErrorMessage(SExpectedButFound, ['implementation', NextToken]);
+
+    SourceCode.ParentProgram.Modules.Add(SourceCode);
+
+    if NextToken = 'initialization' then begin
+      Expect('initialization');
+    end;
+    if NextToken = 'finalization' then begin
+      Expect('finalization');
+    end;
+    Result := True;
+  end else Result := False;
+end;
+
+function TPascalParser.ParseUnitInterface(SourceCode: TModuleUnit): Boolean;
+begin
+  if NextToken = 'interface' then begin
+    Expect('interface');
+    // Uses section
     ParseUses(SourceCode.UsedModules, True);
 
-  ParseCommonBlockInterface(SourceCode.Body);
-end;
-
-procedure TPascalParser.ParseUnitImplementation(SourceCode: TModuleUnit);
-begin
-  Expect('implementation');
-
-  // Uses section
-  if NextToken = 'uses' then
-    ParseUses(SourceCode.UsedModules, False);
-
-  ParseCommonBlock(SourceCode.Body, '.', False);
+    ParseCommonBlockInterface(SourceCode.Body);
+    Result := True;
+  end else Result := False;
+end;
+
+function TPascalParser.ParseUnitImplementation(SourceCode: TModuleUnit): Boolean;
+begin
+  if NextToken = 'implementation' then begin
+    Expect('implementation');
+
+    // Uses section
+    if NextToken = 'uses' then
+      ParseUses(SourceCode.UsedModules, False);
+
+    ParseCommonBlock(SourceCode.Body, '.', False);
+    Result := True;
+  end else Result := False;
 end;
 
@@ -471 +464 @@
       if not ParseFunctionList(Functions) then begin
         if WithBody then
-          ParseBeginEnd(Code);
+          if not ParseBeginEnd(Code, SourceCode) then
+            ErrorMessage(SExpectedButFound, ['begin', NextToken]);
         Break;
       end;
@@ -496 +490 @@
 { TParserBeginEnd }
 
-procedure TPascalParser.ParseBeginEnd(SourceCode: TBeginEnd);
+function TPascalParser.ParseBeginEnd(var BeginEnd: TBeginEnd; SourceCode: TCommonBlock): Boolean;
 var
   NewCommand: TCommand;
 begin
-  //ShowMessage(IntToStr(Integer(SourceCode)) + ' ' + IntToStr(Integer(SourceCode.CommonBlock)));
-  with SourceCode do
-  begin
-    Expect('begin');
-    while (NextToken <> 'end') and (NextTokenType <> ttEndOfFile) do
+  if NextToken = 'begin' then begin
+    //ShowMessage(IntToStr(Integer(SourceCode)) + ' ' + IntToStr(Integer(SourceCode.CommonBlock)));
+    BeginEnd := TBeginEnd.Create;
+    TBeginEnd(BeginEnd).CommonBlock := SourceCode;
+    with BeginEnd do
     begin
-      NewCommand := ParseCommand(CommonBlock);
-      if Assigned(NewCommand) then
-        Commands.Add(NewCommand);
-      //ShowMessage(NextCode);
-      if NextToken = ';' then
-        ReadToken;
-    end;
-    Expect('end');
-  end;
+      Expect('begin');
+      while (NextToken <> 'end') and (NextTokenType <> ttEndOfFile) do
+      begin
+        NewCommand := ParseCommand(CommonBlock);
+        if Assigned(NewCommand) then
+          Commands.Add(NewCommand);
+       //ShowMessage(NextCode);
+        if NextToken = ';' then
+          ReadToken;
+      end;
+      Expect('end');
+    end;
+    Result := True;
+  end else Result := False;
 end;
 
@@ -680 +679 @@
 { TParserIfThenElse }
 
-procedure TPascalParser.ParseIfThenElse(SourceCode: TIfThenElse);
-begin
-  with SourceCode do begin
-    Expect('if');
-    Condition.CommonBlock := CommonBlock;
-    ParseExpression(Condition);
-    Expect('then');
-    Command := ParseCommand(CommonBlock);
-    if NextToken = 'else' then
-    begin
-      Expect('else');
-      ElseCommand := ParseCommand(CommonBlock);
-    end;
-  end;
-end;
-
-procedure TPascalParser.ParseForToDo(SourceCode: TForToDo);
+function TPascalParser.ParseIfThenElse(var IfThenElse: TIfThenElse; SourceCode: TCommonBlock): Boolean;
+begin
+  if NextToken = 'if' then begin
+    IfThenElse := TIfThenElse.Create;
+    IfThenElse.CommonBlock := SourceCode;
+    with IfThenElse do begin
+      Expect('if');
+      Condition.CommonBlock := CommonBlock;
+      ParseExpression(Condition);
+      Expect('then');
+      Command := ParseCommand(CommonBlock);
+      if NextToken = 'else' then
+      begin
+        Expect('else');
+        ElseCommand := ParseCommand(CommonBlock);
+      end;
+    end;
+    Result := True;
+  end else Result := False;
+end;
+
+function TPascalParser.ParseForToDo(var ForToDo: TForToDo; SourceCode: TCommonBlock): Boolean;
 var
   VariableName: string;
 begin
-  with SourceCode do
-  begin
-    Expect('for');
-    VariableName := ReadToken;
-    ControlVariable := SourceCode.CommonBlock.Variables.Search(VariableName);
-    if not Assigned(ControlVariable) then
-      ErrorMessage(SUndefinedVariable, [VariableName], -1);
-    Expect(':=');
-    Start.CommonBlock := CommonBlock;
-    ParseExpression(Start);
-    Expect('to');
-    Stop.CommonBlock := CommonBlock;
-    ParseExpression(Stop);
-    Expect('do');
-    Command := ParseCommand(CommonBlock);
-  end;
+  if NextToken = 'for' then begin
+    ForToDo := TForToDo.Create;
+    ForToDo.CommonBlock := SourceCode;
+    with ForToDo do begin
+      Expect('for');
+      VariableName := ReadToken;
+      ControlVariable := ForToDo.CommonBlock.Variables.Search(VariableName);
+      if not Assigned(ControlVariable) then
+        ErrorMessage(SUndefinedVariable, [VariableName], -1);
+      Expect(':=');
+      Start.CommonBlock := CommonBlock;
+      ParseExpression(Start);
+      Expect('to');
+      Stop.CommonBlock := CommonBlock;
+      ParseExpression(Stop);
+      Expect('do');
+      Command := ParseCommand(CommonBlock);
+    end;
+    Result := True;
+  end else Result := False;
 end;
 
@@ -1128 +1136 @@
 { TParserUsedModuleList }
 
-procedure TPascalParser.ParseUses(SourceCode: TUsedModuleList; AExported: Boolean = False);
+function TPascalParser.ParseUses(SourceCode: TUsedModuleList; AExported: Boolean = False): Boolean;
 var
   NewUsedModule: TUsedModule;
 begin
-  Expect('uses');
-  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 ParseFile(Name) then begin
-        Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
-        Exported := AExported;
-      end else begin
-        ErrorMessage(SUnitNotFound, [Name], -2);
-        SourceCode.Delete(SourceCode.Count - 1);
-      end;
-    end;
-  end;
-  while NextToken = ',' do begin
-    Expect(',');
-    with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do
-    begin
+  if NextToken = 'uses' then begin
+    Expect('uses');
+    with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do begin
       Name := ReadToken;
       if NextToken = 'in' then begin
@@ -1162 +1150 @@
       Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
       if not Assigned(Module) then begin
-        if not ParseFile(Name) then begin
+        if ParseFile(Name) then begin
+          Module := SourceCode.ParentModule.ParentProgram.Modules.Search(Name);
+          Exported := AExported;
+        end else begin
           ErrorMessage(SUnitNotFound, [Name], -2);
           SourceCode.Delete(SourceCode.Count - 1);
@@ -1168 +1159 @@
       end;
     end;
-  end;
-  Expect(';');
+    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;