Changeset 42 for branches/DelphiToC/Analyze/UPascalParser.pas

Timestamp:

Aug 5, 2010, 3:13:03 PM (14 years ago)

Author:

george

Message:

Enhanced C code generation.

File:

• branches/DelphiToC/Analyze/UPascalParser.pas (modified) (9 diffs)

branches/DelphiToC/Analyze/UPascalParser.pas

@@ -104 +104 @@
 resourcestring
   SUnknownIdentifier = 'Unknown identificator "%s".';
+  SIllegalExpression = 'Illegal expression "%s".';
   SExpectedButFound = 'Expected "%s" but "%s" found.';
   SRedefineIdentifier = 'Identificator "%s" redefinition.';
@@ -430 +431 @@
     if NextCode = 'begin' then begin
       Result := TBeginEnd.Create;
-      Result.CommonBlock := SourceCode;
+      TBeginEnd(Result).CommonBlock := SourceCode;
+      //ShowMessage(IntToStr(Integer(SourceCode))
+      // + ' ' + IntToStr(Integer(Result)));
       TParserBeginEnd.Parse(Parser, TBeginEnd(Result));
     end else
     if NextCode = 'if' then begin
       Result := TIfThenElse.Create;
-      Result.CommonBlock := SourceCode;
+      TIfThenElse(Result).CommonBlock := SourceCode;
       TParserIfThenElse.Parse(Parser, TIfThenElse(Result));
     end else
     if NextCode = 'while' then begin
       Result := TWhileDo.Create;
-      Result.CommonBlock := SourceCode;
+      TWhileDo(Result).CommonBlock := SourceCode;
       TParserWhileDo.Parse(Parser, TWhileDo(Result));
     end else
@@ -446 +449 @@
       if Assigned(SourceCode.Variables.Search(NextCode)) then begin
         Result := TAssignment.Create;
-        Result.CommonBlock := SourceCode;
+        TAssignment(Result).CommonBlock := SourceCode;
         IdentName := ReadCode;
         TAssignment(Result).Target := SourceCode.Variables.Search(IdentName);
@@ -456 +459 @@
       if Assigned(SourceCode.Methods.Search(NextCode)) then begin
         Result := TMethodCall.Create;
-        Result.CommonBlock := SourceCode;
+        TMethodCall(Result).CommonBlock := SourceCode;
+        TMethodCall(Result).Method := SourceCode.Methods.Search(NextCode);
+        ReadCode;
   //      ParseMetVariable(TMethodCall(Result).Target);
       end else begin
@@ -462 +467 @@
         ErrorMessage(SUnknownIdentifier, [ReadCode]);
       end;
+    end else begin
+      Result := nil;
+      ErrorMessage(SIllegalExpression, [ReadCode]);
     end;
   end;
@@ -650 +658 @@
     Modules.Clear;
     with TModule(Modules[Modules.Add(TModule.Create)]) do begin
-      Name := 'main';
+      Name := 'Main';
       with TType(Types[Types.Add(TType.Create)]) do begin
-        Name := 'void';
+        Name := 'Void';
         Size := 0;
         UsedType := nil;
       end;
       with TType(Types[Types.Add(TType.Create)]) do begin
-        Name := 'byte';
+        Name := 'Byte';
         Size := 1;
         UsedType := nil;
       end;
       with TFunction(Methods[Methods.Add(TFunction.Create)]) do begin
-        Name := 'exit';
+        Name := 'Exit';
+        ResultType := TType(TModule(Modules[0]).Types[0]);
+      end;
+      with TFunction(Methods[Methods.Add(TFunction.Create)]) do begin
+        Name := 'WriteLn';
         ResultType := TType(TModule(Modules[0]).Types[0]);
       end;
@@ -699 +711 @@
   NewCommand: TCommand;
 begin
+  //ShowMessage(IntToStr(Integer(SourceCode)) + ' ' + IntToStr(Integer(SourceCode.CommonBlock)));
   with Parser, SourceCode do begin
     Expect('begin');
@@ -766 +779 @@
 class procedure TParserIfThenElse.Parse(Parser: TPascalParser; SourceCode: TIfThenElse);
 begin
-  with Parser do begin
+  with Parser, Sourcecode do begin
     Expect('if');
-    Expect('than');
+    Condition.CommonBlock := CommonBlock;
+    TParserExpression.Parse(Parser, Condition);
+    Expect('then');
+    Command := TParserCommonBlock.ParseCommand(Parser, CommonBlock);
     if NextCode = 'else' then begin
       Expect('else');
+      ElseCommand := TParserCommonBlock.ParseCommand(Parser, CommonBlock);
     end;
   end;
@@ -790 +807 @@
     Expect('var');
     while IsIdentificator(NextCode) do begin
+      Identifiers.Clear;
       VariableName := ReadCode;
       Variable := Search(VariableName);