Changeset 50

Timestamp:

Aug 9, 2010, 3:05:26 PM (14 years ago)

Author:

george

Message:

Added support for loop for-to-do.
System types and functions are not generated to output code.

Location:

branches/DelphiToC

Files:

• Analyze/UPascalParser.pas (modified) (43 diffs)
• DelphiToC.lpi (modified) (12 diffs)
• Example.pas (modified) (2 diffs)
• Produce/UProducerC.pas (modified) (4 diffs)
• Produce/UProducerPascal.pas (modified) (2 diffs)
• UPascalCompiler.pas (modified) (1 diff)
• UPascalSource.pas (modified) (5 diffs)
• Visual/USourceTree.pas (modified) (5 diffs)

branches/DelphiToC/Analyze/UPascalParser.pas

@@ -10 +10 @@
 
 type
-  TOnErrorMessage = procedure (Text: string; Position: TPoint) of object;
+  TOnErrorMessage = procedure(Text: string; Position: TPoint) of object;
 
   TTokenType = (ttNone, ttIdentifier, ttConstantNumber, ttConstantString,
@@ -24 +24 @@
     FNextToken: string;
     FNextTokenType: TTokenType;
-    PreviousChar: Char;
-    CurrentChar: Char;
+    PreviousChar: char;
+    CurrentChar: char;
     procedure ErrorMessage(const Text: string; const Arguments: array of const);
   public
-    CodeStreamPosition: Integer;
+    CodeStreamPosition: integer;
     CodePosition: TPoint;
     SourceCodeText: TStringList;
-    function IsAlphanumeric(Character: Char): Boolean;
+    function IsAlphanumeric(Character: char): boolean;
     procedure GetNextToken;
     function ReadCode: string;
     procedure Expect(Code: string);
-    function IsWhiteSpace(Character: Char): Boolean;
-    function IsAlphabetic(Character: Char): Boolean;
-    function IsIdentificator(Text: string): Boolean;
-    function IsKeyword(Text: string): Boolean;
-    function IsOperator(Text: string): Boolean;
+    function IsWhiteSpace(Character: char): boolean;
+    function IsAlphabetic(Character: char): boolean;
+    function IsIdentificator(Text: string): boolean;
+    function IsKeyword(Text: string): boolean;
+    function IsOperator(Text: string): boolean;
     procedure Log(Text: string);
     property OnErrorMessage: TOnErrorMessage read FOnErrorMessage write FOnErrorMessage;
@@ -55 +55 @@
     procedure ParseProgram(SourceCode: TModule);
     procedure ParseAll(SourceCode: TProgram);
-    procedure ParseCommonBlock(SourceCode: TCommonBlock; EndSymbol: Char = ';');
+    procedure ParseCommonBlock(SourceCode: TCommonBlock; EndSymbol: char = ';');
     function ParseCommand(SourceCode: TCommonBlock): TCommand;
     procedure ParseBeginEnd(SourceCode: TBeginEnd);
     procedure ParseFunctionList(SourceCode: TFunctionList);
     procedure ParseIfThenElse(SourceCode: TIfThenElse);
+    procedure ParseForToDo(SourceCode: TForToDo);
     procedure ParseVariableList(SourceCode: TVariableList);
     procedure ParseVariable(SourceCode: TVariable);
@@ -78 +79 @@
   STypeNotDefined = 'Type "%s" not defined.';
   SEndOfDataReached = 'Parser reached to end of input data.';
+  SUndefinedVariable = 'Undefined variable.';
 
 
@@ -91 +93 @@
 begin
   Log('Expected: ' + Code + '  Readed: ' + FNextToken);
-  if FNextToken <> Code then begin
+  if FNextToken <> Code then
+  begin
     ErrorMessage(SExpectedButFound, [Code, FNextToken]);
 
@@ -101 +104 @@
 end;
 
-function TBaseParser.IsAlphabetic(Character: Char): Boolean;
+function TBaseParser.IsAlphabetic(Character: char): boolean;
 begin
   Result := (Character in ['a'..'z']) or (Character in ['A'..'Z']);
 end;
 
-function TBaseParser.IsAlphanumeric(Character: Char): Boolean;
+function TBaseParser.IsAlphanumeric(Character: char): boolean;
 begin
   Result := IsAlphabetic(Character) or (Character in ['0'..'9']);
 end;
 
-function TBaseParser.IsKeyword(Text: string): Boolean;
-var
-  I: Integer;
+function TBaseParser.IsKeyword(Text: string): boolean;
+var
+  I: integer;
 begin
   Result := False;
@@ -121 +124 @@
 end;
 
-function TBaseParser.IsOperator(Text: string): Boolean;
-var
-  I: Integer;
+function TBaseParser.IsOperator(Text: string): boolean;
+var
+  I: integer;
 begin
   Result := False;
@@ -131 +134 @@
 end;
 
-function TBaseParser.IsIdentificator(Text: string): Boolean;
-var
-  I: Integer;
+function TBaseParser.IsIdentificator(Text: string): boolean;
+var
+  I: integer;
 begin
   Result := True;
-  if Length(Text) = 0 then Result := False;
-  if IsKeyWord(Text) then Result := False;
+  if Length(Text) = 0 then
+    Result := False;
+  if IsKeyWord(Text) then
+    Result := False;
   if Length(Text) > 0 then
     if not (Text[1] in ['a'..'z', 'A'..'Z', '%', '_']) then
@@ -146 +151 @@
 end;
 
-function TBaseParser.IsWhiteSpace(Character: Char): Boolean;
+function TBaseParser.IsWhiteSpace(Character: char): boolean;
 begin
   Result := (Character = ' ') or (Character = #13) or (Character = #10);
@@ -160 +165 @@
     if FileExistsUTF8(LogFileName) { *Converted from FileExists*  } then
       LogFile := TFileStream.Create(LogFileName, fmOpenWrite)
-      else LogFile := TFileStream.Create(LogFileName, fmCreate);
-    if Length(Text) > 0 then begin
+    else
+      LogFile := TFileStream.Create(LogFileName, fmCreate);
+    if Length(Text) > 0 then
+    begin
       LogFile.Write(Text[1], Length(Text));
       LogFile.Write(#13#10, 2);
@@ -183 +190 @@
 procedure TBaseParser.GetNextToken;
 var
-  I: Integer;
-  II: Integer;
-  J: Integer;
+  I: integer;
+  II: integer;
+  J: integer;
 const
-  SpecChar: set of char = [';', '.', ',', ':', '(', ')', '[', ']', '+', '-', '/', '*',
-    '^', '=', '<' , '>' , '@'];
-  DoubleSpecChar : array[0..6] of string = (':=', '..', '<=', '>=', '<>', '+=', '-=');
-begin
-    FNextToken := '';
-    FNextTokenType := ttNone;
-    with SourceCodeText do
-    while True do begin
-      if CodeStreamPosition < Length(Text) then begin
+  SpecChar: set of char = [';', '.', ',', ':', '(', ')', '[', ']',
+    '+', '-', '/', '*', '^', '=', '<', '>', '@'];
+  DoubleSpecChar: array[0..6] of string = (':=', '..', '<=', '>=', '<>', '+=', '-=');
+begin
+  FNextToken := '';
+  FNextTokenType := ttNone;
+  with SourceCodeText do
+    while True do
+    begin
+      if CodeStreamPosition < Length(Text) then
+      begin
         CurrentChar := Text[CodeStreamPosition];
-      end else begin
+      end
+      else
+      begin
         FNextToken := '';
         FNextTokenType := ttEndOfFile;
@@ -203 +214 @@
       end;
 
-      if FNextTokenType = ttNone then begin
-        if IsWhiteSpace(CurrentChar) then FNextTokenType := ttWhiteSpace
-        else
-        if CurrentChar = '{' then begin
+      if FNextTokenType = ttNone then
+      begin
+        if IsWhiteSpace(CurrentChar) then
+          FNextTokenType := ttWhiteSpace
+        else
+        if CurrentChar = '{' then
+        begin
           FNextTokenType := ttBlockComment1;
-        end else
-        if CurrentChar = '''' then begin
+        end
+        else
+        if CurrentChar = '''' then
+        begin
           FNextTokenType := ttConstantString;
-        end else
-        if CurrentChar in SpecChar then begin
+        end
+        else
+        if CurrentChar in SpecChar then
+        begin
           FNextTokenType := ttOperator;
           FNextToken := FNextToken + CurrentChar;
-        end else
-        if IsAlphanumeric(CurrentChar) then begin
+        end
+        else
+        if IsAlphanumeric(CurrentChar) then
+        begin
           FNextTokenType := ttIdentifier;
           FNextToken := FNextToken + CurrentChar;
-        end else FNextTokenType := ttUnknown;
-      end else
-      if FNextTokenType = ttLineComment then begin
+        end
+        else
+          FNextTokenType := ttUnknown;
+      end
+      else
+      if FNextTokenType = ttLineComment then
+      begin
         if (CurrentChar = #13) or (CurrentChar = #10) then
           FNextTokenType := ttNone;
-      end else
-      if FNextTokenType = ttBlockComment1 then begin
+      end
+      else
+      if FNextTokenType = ttBlockComment1 then
+      begin
         if (CurrentChar = '}') then
           FNextTokenType := ttNone;
-      end else
-      if FNextTokenType = ttBlockComment2 then begin
+      end
+      else
+      if FNextTokenType = ttBlockComment2 then
+      begin
         if (PreviousChar = '*') and (CurrentChar = ')') then
           FNextTokenType := ttNone;
-      end else
-      if FNextTokenType = ttConstantString then begin
+      end
+      else
+      if FNextTokenType = ttConstantString then
+      begin
         if (CurrentChar = '''') and (PreviousChar = '''') then
-          Break else
+          Break
+        else
           FNextToken := FNextToken + CurrentChar;
-      end else
-      if FNextTokenType = ttOperator then begin
-        if (CurrentChar = '*') and (PreviousChar = '(') then begin
+      end
+      else
+      if FNextTokenType = ttOperator then
+      begin
+        if (CurrentChar = '*') and (PreviousChar = '(') then
+        begin
           FNextToken := '';
           FNextTokenType := ttBlockComment2;
-        end else
-        if (CurrentChar = '/') and (PreviousChar = '/') then begin
+        end
+        else
+        if (CurrentChar = '/') and (PreviousChar = '/') then
+        begin
           FNextToken := '';
           FNextTokenType := ttLineComment;
-        end else
+        end
+        else
         if not (CurrentChar in SpecChar) then
-          Break else begin
-            J := 0;
-            while (J < Length(DoubleSpecChar)) and ((PreviousChar + CurrentChar) <> DoubleSpecChar[J]) do Inc(J);
-            if J < Length(DoubleSpecChar) then
-              FNextToken := FNextToken + CurrentChar else Break;
-          end;
-      end else
-      if FNextTokenType = ttIdentifier then begin
+          Break
+        else
+        begin
+          J := 0;
+          while (J < Length(DoubleSpecChar)) and
+            ((PreviousChar + CurrentChar) <> DoubleSpecChar[J]) do
+            Inc(J);
+          if J < Length(DoubleSpecChar) then
+            FNextToken := FNextToken + CurrentChar
+          else
+            Break;
+        end;
+      end
+      else
+      if FNextTokenType = ttIdentifier then
+      begin
         if not IsAlphanumeric(CurrentChar) then
-          Break else
+          Break
+        else
           FNextToken := FNextToken + CurrentChar;
       end
@@ -263 +309 @@
         FNextTokenType := ttNone;
 
-      if FNextTokenType <> ttNone then begin
+      if FNextTokenType <> ttNone then
+      begin
         // Update cursor position
         Inc(CodePosition.X);
-        if (CurrentChar = #13) then begin
+        if (CurrentChar = #13) then
+        begin
           CodePosition.X := 1;
           Inc(CodePosition.Y);
@@ -288 +336 @@
 procedure TPascalParser.ParseWhileDo(SourceCode: TWhileDo);
 begin
-  with SourceCode do begin
+  with SourceCode do
+  begin
     Expect('while');
     Condition.CommonBlock := CommonBlock;
@@ -306 +355 @@
   Method: TFunction;
   Constant: TConstant;
-//  Brackets: Integer;
+  //  Brackets: Integer;
   Expressions: TExpressionList;
-  I: Integer;
-  II: Integer;
+  I: integer;
+  II: integer;
 begin
   Expressions := TExpressionList.Create;
   Expressions.Add(TExpression.Create);
-  with SourceCode do begin
-    while ((FNextToken <> ';') and (FNextToken <> ',') and (not IsKeyWord(FNextToken))) and
-      not (((FNextToken = ')') or (FNextToken = ']'))) do begin
-        Identifier := ReadCode;
-        if Identifier = '(' then begin
-          // Subexpression
-          with TExpression(Expressions.Last) do begin
+  with SourceCode do
+  begin
+    while ((FNextToken <> ';') and (FNextToken <> ',') and
+        (not IsKeyWord(FNextToken))) and not
+      (((FNextToken = ')') or (FNextToken = ']'))) do
+    begin
+      Identifier := ReadCode;
+      if Identifier = '(' then
+      begin
+        // Subexpression
+        with TExpression(Expressions.Last) do
+        begin
+          SubItems[1] := TExpression.Create;
+          ParseExpression(TExpression(SubItems[1]));
+        end;
+        with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do
+        begin
+          CommonBlock := SourceCode.CommonBlock;
+          SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
+        end;
+        Expect(')');
+      end
+      else
+      if IsOperator(Identifier) then
+      begin
+        // Operator
+        TExpression(Expressions.Last).OperatorName := Identifier;
+        TExpression(Expressions.Last).NodeType := ntOperator;
+      end
+      else
+      if IsIdentificator(Identifier) then
+      begin
+        // Reference to identificator
+        NewVariable := CommonBlock.Variables.Search(Identifier);
+        if Assigned(NewVariable) then
+        begin
+          // Referenced variable
+          with TExpression(Expressions.Last) do
+          begin
             SubItems[1] := TExpression.Create;
-            ParseExpression(TExpression(SubItems[1]));
+            TExpression(SubItems[1]).NodeType := ntVariable;
+            TExpression(SubItems[1]).Variable := NewVariable;
           end;
-          with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
+          with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do
+          begin
             CommonBlock := SourceCode.CommonBlock;
             SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
           end;
-          Expect(')');
-        end else
-        if IsOperator(Identifier) then begin
-          // Operator
-          TExpression(Expressions.Last).OperatorName := Identifier;
-          TExpression(Expressions.Last).NodeType := ntOperator;
-        end else
-        if IsIdentificator(Identifier) then begin
-          // Reference to identificator
-          NewVariable := CommonBlock.Variables.Search(Identifier);
-          if Assigned(NewVariable) then begin
-            // Referenced variable
-            with TExpression(Expressions.Last) do begin
+        end
+        else
+        begin
+          Method := CommonBlock.Functions.Search(Identifier);
+          if Assigned(Method) then
+          begin
+            // Referenced method
+            with TExpression(Expressions.Last) do
+            begin
               SubItems[1] := TExpression.Create;
-              TExpression(SubItems[1]).NodeType := ntVariable;
-              TExpression(SubItems[1]).Variable := NewVariable;
-            end;
-            with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
-              CommonBlock := SourceCode.CommonBlock;
-              SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
-            end;
-          end else begin
-            Method := CommonBlock.Functions.Search(Identifier);
-            if Assigned(Method) then begin
-              // Referenced method
-              with TExpression(Expressions.Last) do begin
-                SubItems[1] := TExpression.Create;
-                if FNextToken  = '(' then               // Method with parameters
-                with TExpression(SubItems[1]) do begin
+              if FNextToken = '(' then               // Method with parameters
+                with TExpression(SubItems[1]) do
+                begin
                   Expect('(');
                   NewExpression := TExpression.Create;
@@ -361 +428 @@
                   ParseExpression(NewExpression);
                   SubItems.Add(NewExpression);
-                  while FNextToken = ',' do begin
+                  while FNextToken = ',' do
+                  begin
                     Expect(',');
                     NewExpression := TExpression.Create;
@@ -370 +438 @@
                   Expect(')');
                 end;
-                TExpression(SubItems[1]).NodeType := ntFunction;
-                TExpression(SubItems[1]).Method := Method;
+              TExpression(SubItems[1]).NodeType := ntFunction;
+              TExpression(SubItems[1]).Method := Method;
+            end;
+            with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do
+            begin
+              CommonBlock := SourceCode.CommonBlock;
+              SubItems[0] :=
+                TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
+            end;
+          end
+          else
+          begin
+            Constant := CommonBlock.Constants.Search(Identifier);
+            if Assigned(Constant) then
+            begin
+              // Referenced constant
+              with TExpression(Expressions.Last) do
+              begin
+                SubItems[1] := TExpression.Create;
+                TExpression(SubItems[1]).NodeType := ntConstant;
+                TExpression(SubItems[1]).Value := Constant.Value;
               end;
-              with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
+              with TExpression(Expressions.Items[Expressions.Add(
+                  TExpression.Create)]) do
+              begin
                 CommonBlock := SourceCode.CommonBlock;
-                SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
+                SubItems[0] :=
+                  TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
               end;
-            end else begin
-              Constant := CommonBlock.Constants.Search(Identifier);
-              if Assigned(Constant) then begin
-                // Referenced constant
-                with TExpression(Expressions.Last) do begin
-                  SubItems[1] := TExpression.Create;
-                  TExpression(SubItems[1]).NodeType := ntConstant;
-                  TExpression(SubItems[1]).Value := Constant.Value;
-                end;
-                with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
-                  CommonBlock := SourceCode.CommonBlock;
-                  SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
-                end;
-              end else begin
-                ErrorMessage(SUnknownIdentifier, [Identifier]);
-              end;
+            end
+            else
+            begin
+              ErrorMessage(SUnknownIdentifier, [Identifier]);
             end;
           end;
-        end else
-        begin
-          // Constant value
-          with TExpression(Expressions.Last) do begin
-            SubItems[1] := TExpression.Create;
-            TExpression(SubItems[1]).CommonBlock := SourceCode.CommonBlock;
-            TExpression(SubItems[1]).NodeType := ntConstant;
-
-            if Identifier[1] = '''' then begin
-              TExpression(SubItems[1]).Value := Identifier;
-              //SetLength(TExpression(SubItems[1]).Value, Length(Identifier));
-              //for I := 1 to Length(Identifier) do
-              //  TExpression(SubItems[1]).Value[I - 1] := Byte(Identifier[I]);
-            end else begin
-              TExpression(SubItems[1]).Value := Identifier;
-            end;
+        end;
+      end
+      else
+      begin
+        // Constant value
+        with TExpression(Expressions.Last) do
+        begin
+          SubItems[1] := TExpression.Create;
+          TExpression(SubItems[1]).CommonBlock := SourceCode.CommonBlock;
+          TExpression(SubItems[1]).NodeType := ntConstant;
+
+          if Identifier[1] = '''' then
+          begin
+            TExpression(SubItems[1]).Value := Identifier;
+            //SetLength(TExpression(SubItems[1]).Value, Length(Identifier));
+            //for I := 1 to Length(Identifier) do
+            //  TExpression(SubItems[1]).Value[I - 1] := Byte(Identifier[I]);
+          end
+          else
+          begin
+            TExpression(SubItems[1]).Value := Identifier;
           end;
-          //ShowMessage(IntToStr(Expressions.Count));
-          with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
-            CommonBlock := SourceCode.CommonBlock;
-            SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
-          end;
-        end;
+        end;
+        //ShowMessage(IntToStr(Expressions.Count));
+        with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do
+        begin
+          CommonBlock := SourceCode.CommonBlock;
+          SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
+        end;
+      end;
     end;
 
     // Build expression tree
-    for II := 0 to High(Operators) do begin
+    for II := 0 to High(Operators) do
+    begin
       I := 1;
-      while (I < Expressions.Count - 1) do begin
+      while (I < Expressions.Count - 1) do
+      begin
         if not TExpression(Expressions[I]).Associated and
-          (TExpression(Expressions[I]).OperatorName = Operators[II]) then begin
-            TExpression(Expressions[I]).Associated := True;
-            TExpression(Expressions[I - 1]).SubItems[1] := Expressions[I];
-            TExpression(Expressions[I + 1]).SubItems[0] := Expressions[I];
-            //Expressions.Delete(I);
-          end else Inc(I);
+          (TExpression(Expressions[I]).OperatorName = Operators[II]) then
+        begin
+          TExpression(Expressions[I]).Associated := True;
+          TExpression(Expressions[I - 1]).SubItems[1] := Expressions[I];
+          TExpression(Expressions[I + 1]).SubItems[0] := Expressions[I];
+          //Expressions.Delete(I);
+        end
+        else
+          Inc(I);
       end;
     end;
@@ -450 +540 @@
   First: TOperation;
   Second: TOperation;
-  StartIndex: Integer;
+  StartIndex: integer;
   LoopVariable: TVariable;
   IdentName: string;
@@ -456 +546 @@
 begin
   begin
-    if FNextToken = 'begin' then begin
+    if FNextToken = 'begin' then
+    begin
       Result := TBeginEnd.Create;
       TBeginEnd(Result).CommonBlock := SourceCode;
@@ -462 +553 @@
       // + ' ' + IntToStr(Integer(Result)));
       ParseBeginEnd(TBeginEnd(Result));
-    end else
-    if FNextToken = 'if' then begin
+    end
+    else
+    if FNextToken = 'if' then
+    begin
       Result := TIfThenElse.Create;
       TIfThenElse(Result).CommonBlock := SourceCode;
       ParseIfThenElse(TIfThenElse(Result));
-    end else
-    if FNextToken = 'while' then begin
+    end
+    else
+    if FNextToken = 'while' then
+    begin
       Result := TWhileDo.Create;
       TWhileDo(Result).CommonBlock := SourceCode;
       ParseWhileDo(TWhileDo(Result));
-    end else
-    if IsIdentificator(FNextToken) then begin
-      if Assigned(SourceCode.Variables.Search(FNextToken)) then begin
+    end
+    else
+    if FNextToken = 'for' then
+    begin
+      Result := TForToDo.Create;
+      TForToDo(Result).CommonBlock := SourceCode;
+      ParseForToDo(TForToDo(Result));
+    end
+    else
+    if IsIdentificator(FNextToken) then
+    begin
+      if Assigned(SourceCode.Variables.Search(FNextToken)) then
+      begin
         // Variable assignment
         Result := TAssignment.Create;
@@ -484 +589 @@
         TAssignment(Result).Source.CommonBlock := SourceCode;
         ParseExpression(TAssignment(Result).Source);
-      end else
-      if Assigned(SourceCode.Functions.Search(FNextToken)) then begin
+      end
+      else
+      if Assigned(SourceCode.Functions.Search(FNextToken)) then
+      begin
         // Function call
         FunctionName := ReadCode;
@@ -491 +598 @@
         TFunctionCall(Result).CommonBlock := SourceCode;
         TFunctionCall(Result).FunctionRef := SourceCode.Functions.Search(FunctionName);
-        if FNextToken = '(' then begin
+        if FNextToken = '(' then
+        begin
           Expect('(');
-          with TFunctionCall(Result) do begin
+          with TFunctionCall(Result) do
+          begin
             ParameterExpression.Add(TExpression.Create);
             TExpression(ParameterExpression.Last).CommonBlock := SourceCode;
@@ -500 +609 @@
           Expect(')');
         end;
-      end else begin
+      end
+      else
+      begin
         Result := nil;
         ErrorMessage(SUnknownIdentifier, [ReadCode]);
       end;
-    end else
+    end
+    else
     if FNextToken = ';' then
-    else begin
+    else
+    begin
       Result := nil;
       ErrorMessage(SIllegalExpression, [ReadCode]);
@@ -521 +634 @@
   else if FNextToken = 'unit' then
     ParseUnit(SourceCode)
-  else ParseProgram(SourceCode);
+  else
+    ParseProgram(SourceCode);
 end;
 
@@ -528 +642 @@
   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 := '';
+    end
+    else
+      Name := '';
 
     // Uses section
@@ -547 +665 @@
 begin
   Expect('unit');
-  with TModule(ProgramCode.Modules[0]) do begin
+  with TModule(ProgramCode.Modules[0]) do
+  begin
     Name := ReadCode;
     ModuleType := mdUnit;
@@ -560 +679 @@
 procedure TPascalParser.ParseAll(SourceCode: TProgram);
 var
-  I: Integer;
-begin
-  with SourceCode do begin
+  I: integer;
+begin
+  with SourceCode do
+  begin
     for I := 0 to Modules.Count - 1 do
       ParseModule(TModule(Modules[I]));
@@ -570 +690 @@
 { TParserCommonBlock }
 
-procedure TPascalParser.ParseCommonBlock(SourceCode: TCommonBlock; EndSymbol: Char = ';');
-begin
-  with SourceCode do begin
-    while FNextToken <> EndSymbol do begin
+procedure TPascalParser.ParseCommonBlock(SourceCode: TCommonBlock;
+  EndSymbol: char = ';');
+begin
+  with SourceCode do
+  begin
+    while FNextToken <> EndSymbol do
+    begin
       if FNextToken = 'var' then
         ParseVariableList(Variables)
@@ -584 +707 @@
       else if FNextToken = 'function' then
         ParseFunctionList(Functions)
-      else begin
+      else
+      begin
         ParseBeginEnd(Code);
         Break;
@@ -600 +724 @@
 begin
   //ShowMessage(IntToStr(Integer(SourceCode)) + ' ' + IntToStr(Integer(SourceCode.CommonBlock)));
-  with SourceCode do begin
+  with SourceCode do
+  begin
     Expect('begin');
-    while (FNextToken <> 'end') and (FNextTokenType <> ttEndOfFile) do begin
+    while (FNextToken <> 'end') and (FNextTokenType <> ttEndOfFile) do
+    begin
       NewCommand := ParseCommand(CommonBlock);
-      if Assigned(NewCommand) then Commands.Add(NewCommand);
+      if Assigned(NewCommand) then
+        Commands.Add(NewCommand);
       //ShowMessage(NextCode);
-      if FNextToken = ';' then ReadCode;
+      if FNextToken = ';' then
+        ReadCode;
     end;
     Expect('end');
@@ -621 +749 @@
   VariableName: string;
   Variable: TParameter;
-  I: Integer;
+  I: integer;
 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 begin
+      if FNextToken = 'procedure' then
+      begin
         Expect('procedure');
         HaveResult := False;
-      end else begin
+      end
+      else
+      begin
         Expect('function');
         HaveResult := True;
@@ -636 +769 @@
       Name := ReadCode;
 
-      if FNextToken = '(' then begin
+      if FNextToken = '(' then
+      begin
         Expect('(');
-        while FNextToken <> ')' do begin
-//    while IsIdentificator(NextCode) do begin
-          with TParameterList(Parameters) do begin
+        while FNextToken <> ')' do
+        begin
+          //    while IsIdentificator(NextCode) do begin
+          with TParameterList(Parameters) do
+          begin
             VariableName := ReadCode;
             Variable := Search(VariableName);
-            if not Assigned(Variable) then begin
+            if not Assigned(Variable) then
+            begin
               Identifiers.Add(VariableName);
-              while FNextToken = ',' do begin
+              while FNextToken = ',' do
+              begin
                 Expect(',');
                 Identifiers.Add(ReadCode);
               end;
-            end else ErrorMessage(SRedefineIdentifier, [VariableName]);
+            end
+            else
+              ErrorMessage(SRedefineIdentifier, [VariableName]);
             Expect(':');
             TypeName := ReadCode;
             NewValueType := Parent.Types.Search(TypeName);
-            if not Assigned(NewValueType) then ErrorMessage(STypeNotDefined, [TypeName])
-              else for I := 0 to Identifiers.Count - 1 do
-                with TParameter(Items[Add(TParameter.Create)]) do begin
+            if not Assigned(NewValueType) then
+              ErrorMessage(STypeNotDefined, [TypeName])
+            else
+              for I := 0 to Identifiers.Count - 1 do
+                with TParameter(Items[Add(TParameter.Create)]) do
+                begin
                   Name := Identifiers[I];
                   ValueType := NewValueType;
@@ -664 +807 @@
 
         // Parse function result type
-        if HaveResult then begin
+        if HaveResult then
+        begin
           Expect(':');
           TypeName := ReadCode;
           NewValueType := Parent.Types.Search(TypeName);
-          if not Assigned(NewValueType) then ErrorMessage(STypeNotDefined, [TypeName])
-            else begin
-              ResultType := NewValueType;
-              with TVariable(Parent.Variables.Items[Parent.Variables.Add(TVariable.Create)]) do begin
-                Name := 'Result';
-                ValueType := NewValueType;
-              end;
+          if not Assigned(NewValueType) then
+            ErrorMessage(STypeNotDefined, [TypeName])
+          else
+          begin
+            ResultType := NewValueType;
+            with TVariable(Parent.Variables.Items[Parent.Variables.Add(
+                TVariable.Create)]) do
+            begin
+              Name := 'Result';
+              ValueType := NewValueType;
             end;
+          end;
         end;
       end;
@@ -689 +837 @@
 procedure TPascalParser.ParseIfThenElse(SourceCode: TIfThenElse);
 begin
-  with Sourcecode do begin
+  with Sourcecode do
+  begin
     Expect('if');
     Condition.CommonBlock := CommonBlock;
@@ -695 +844 @@
     Expect('then');
     Command := ParseCommand(CommonBlock);
-    if FNextToken = 'else' then begin
+    if FNextToken = 'else' then
+    begin
       Expect('else');
       ElseCommand := ParseCommand(CommonBlock);
     end;
+  end;
+end;
+
+procedure TPascalParser.ParseForToDo(SourceCode: TForToDo);
+var
+  VariableName: string;
+begin
+  with SourceCode do
+  begin
+    Expect('for');
+    VariableName := ReadCode;
+    ControlVariable := SourceCode.CommonBlock.Variables.Search(VariableName);
+    if not Assigned(ControlVariable) then
+      ErrorMessage(SUndefinedVariable, [VariableName]);
+    Expect(':=');
+    Start.CommonBlock := CommonBlock;
+    ParseExpression(Start);
+    Expect('to');
+    Stop.CommonBlock := CommonBlock;
+    ParseExpression(Stop);
+    Expect('do');
+    Command := ParseCommand(CommonBlock);
   end;
 end;
@@ -711 +883 @@
   VariableName: string;
   Variable: TVariable;
-  I: Integer;
+  I: integer;
 begin
   Identifiers := TStringList.Create;
-  with SourceCode do begin
+  with SourceCode do
+  begin
     Expect('var');
-    while IsIdentificator(FNextToken) do begin
+    while IsIdentificator(FNextToken) do
+    begin
       Identifiers.Clear;
       VariableName := ReadCode;
       Variable := Search(VariableName);
-      if not Assigned(Variable) then begin
+      if not Assigned(Variable) then
+      begin
         Identifiers.Add(VariableName);
-        while FNextToken = ',' do begin
+        while FNextToken = ',' do
+        begin
           Expect(',');
           Identifiers.Add(ReadCode);
         end;
-      end else ErrorMessage(SRedefineIdentifier, [VariableName]);
+      end
+      else
+        ErrorMessage(SRedefineIdentifier, [VariableName]);
       Expect(':');
       TypeName := ReadCode;
       NewValueType := Parent.Types.Search(TypeName);
-      if NewValueType = nil then ErrorMessage(STypeNotDefined, [TypeName])
-        else for I := 0 to Identifiers.Count - 1 do
-          with TVariable(Items[Add(TVariable.Create)]) do begin
+      if NewValueType = nil then
+        ErrorMessage(STypeNotDefined, [TypeName])
+      else
+        for I := 0 to Identifiers.Count - 1 do
+          with TVariable(Items[Add(TVariable.Create)]) do
+          begin
             Name := Identifiers[I];
             ValueType := NewValueType;
@@ -746 +927 @@
 procedure TPascalParser.ParseVariable(SourceCode: TVariable);
 begin
-  with SourceCode do begin
+  with SourceCode do
+  begin
     Name := FNextToken;
     Expect(':=');
@@ -762 +944 @@
   ConstantName: string;
   Constant: TConstant;
-  I: Integer;
+  I: integer;
   ConstantValue: string;
 begin
   Identifiers := TStringList.Create;
-  with SourceCode do begin
+  with SourceCode do
+  begin
     Expect('const');
-    while IsIdentificator(FNextToken) do begin
+    while IsIdentificator(FNextToken) do
+    begin
       ConstantName := ReadCode;
       Constant := Search(ConstantName);
-      if not Assigned(Constant) then begin
+      if not Assigned(Constant) then
+      begin
         Identifiers.Add(ConstantName);
-        while FNextToken = ',' do begin
+        while FNextToken = ',' do
+        begin
           Expect(',');
           Identifiers.Add(ReadCode);
         end;
-      end else ErrorMessage(SRedefineIdentifier, [ConstantName]);
+      end
+      else
+        ErrorMessage(SRedefineIdentifier, [ConstantName]);
       Expect(':');
       TypeName := ReadCode;
@@ -785 +973 @@
       Expect(';');
 
-      if NewValueType = nil then ErrorMessage(STypeNotDefined, [TypeName])
-        else for I := 0 to Identifiers.Count - 1 do
-          with TConstant(Items[Add(TConstant.Create)]) do begin
+      if NewValueType = nil then
+        ErrorMessage(STypeNotDefined, [TypeName])
+      else
+        for I := 0 to Identifiers.Count - 1 do
+          with TConstant(Items[Add(TConstant.Create)]) do
+          begin
             Name := Identifiers[I];
             ValueType := NewValueType;
@@ -801 +992 @@
 procedure TPascalParser.ParseTypeList(SourceCode: TTypeList);
 begin
-  with SourceCode do begin
+  with SourceCode do
+  begin
     Expect('type');
     while IsIdentificator(FNextToken) do
-      with TType(Items[Add(TType.Create)]) do begin
+      with TType(Items[Add(TType.Create)]) do
+      begin
         Parent := SourceCode;
         ParseType(TType(Items[Count - 1]));
@@ -815 +1008 @@
 procedure TPascalParser.ParseType(SourceCode: TType);
 begin
-  with SourceCode do begin
+  with SourceCode do
+  begin
     Name := FNextToken;
     Expect('=');
@@ -829 +1023 @@
 begin
   Expect('uses');
-  with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do begin
+  with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do
+  begin
     Name := ReadCode;
   end;
-  while FNextToken = ',' do begin
+  while FNextToken = ',' do
+  begin
     Expect(',');
-    with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do begin
+    with TUsedModule(SourceCode.Items[SourceCode.Add(TUsedModule.Create)]) do
+    begin
       Name := ReadCode;
     end;
@@ -842 +1039 @@
 
 end.
+

branches/DelphiToC/DelphiToC.lpi

@@ -44 +44 @@
         <Filename Value="DelphiToC.lpr"/>
         <IsPartOfProject Value="True"/>
+        <EditorIndex Value="8"/>
         <WindowIndex Value="0"/>
         <TopLine Value="4"/>
         <CursorPos X="1" Y="29"/>
-        <UsageCount Value="111"/>
+        <UsageCount Value="112"/>
+        <Loaded Value="True"/>
       </Unit0>
       <Unit1>
@@ -58 +60 @@
         <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="67"/>
-        <CursorPos X="21" Y="83"/>
-        <UsageCount Value="111"/>
+        <TopLine Value="97"/>
+        <CursorPos X="60" Y="112"/>
+        <UsageCount Value="112"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -71 +73 @@
         <TopLine Value="1"/>
         <CursorPos X="1" Y="1"/>
-        <UsageCount Value="111"/>
+        <UsageCount Value="112"/>
       </Unit2>
       <Unit3>
@@ -79 +81 @@
         <EditorIndex Value="5"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="264"/>
-        <CursorPos X="5" Y="277"/>
-        <UsageCount Value="111"/>
+        <TopLine Value="141"/>
+        <CursorPos X="21" Y="155"/>
+        <UsageCount Value="112"/>
         <Loaded Value="True"/>
       </Unit3>
@@ -88 +90 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UPascalCompiler"/>
-        <IsVisibleTab Value="True"/>
-        <EditorIndex Value="10"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="41"/>
-        <CursorPos X="22" Y="45"/>
-        <UsageCount Value="111"/>
+        <EditorIndex Value="11"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="101"/>
+        <CursorPos X="17" Y="102"/>
+        <UsageCount Value="112"/>
         <Loaded Value="True"/>
       </Unit4>
@@ -100 +101 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UAssemblerSource"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="9"/>
         <WindowIndex Value="0"/>
         <TopLine Value="112"/>
         <CursorPos X="48" Y="128"/>
-        <UsageCount Value="111"/>
+        <UsageCount Value="112"/>
         <Loaded Value="True"/>
       </Unit5>
@@ -115 +116 @@
         <TopLine Value="1"/>
         <CursorPos X="15" Y="13"/>
-        <UsageCount Value="111"/>
+        <UsageCount Value="112"/>
         <Loaded Value="True"/>
       </Unit6>
@@ -122 +123 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UProducerC"/>
-        <EditorIndex Value="9"/>
-        <WindowIndex Value="0"/>
-        <TopLine Value="89"/>
-        <CursorPos X="44" Y="96"/>
-        <UsageCount Value="111"/>
+        <EditorIndex Value="10"/>
+        <WindowIndex Value="0"/>
+        <TopLine Value="128"/>
+        <CursorPos X="34" Y="141"/>
+        <UsageCount Value="112"/>
         <Loaded Value="True"/>
       </Unit7>
@@ -135 +136 @@
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="254"/>
-        <CursorPos X="9" Y="273"/>
-        <UsageCount Value="111"/>
+        <TopLine Value="851"/>
+        <CursorPos X="31" Y="862"/>
+        <UsageCount Value="112"/>
         <Loaded Value="True"/>
       </Unit8>
@@ -207 +208 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="USourceTree"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="247"/>
-        <CursorPos X="56" Y="267"/>
-        <UsageCount Value="73"/>
+        <TopLine Value="209"/>
+        <CursorPos X="16" Y="218"/>
+        <UsageCount Value="74"/>
         <Loaded Value="True"/>
       </Unit17>
@@ -235 +237 @@
         <EditorIndex Value="7"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="13" Y="82"/>
-        <UsageCount Value="27"/>
+        <TopLine Value="104"/>
+        <CursorPos X="21" Y="112"/>
+        <UsageCount Value="28"/>
         <Loaded Value="True"/>
       </Unit20>
@@ -243 +245 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
-        <Filename Value="Analyze\UPascalParser.pas"/>
-        <Caret Line="87" Column="17" TopLine="84"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="88" Column="1" TopLine="88"/>
       </Position1>
       <Position2>
-        <Filename Value="Analyze\UPascalParser.pas"/>
-        <Caret Line="23" Column="32" TopLine="10"/>
+        <Filename Value="UMainForm.pas"/>
+        <Caret Line="33" Column="1" TopLine="20"/>
       </Position2>
       <Position3>
-        <Filename Value="Analyze\UPascalParser.pas"/>
-        <Caret Line="12" Column="44" TopLine="1"/>
+        <Filename Value="DelphiToC.lpr"/>
+        <Caret Line="29" Column="1" TopLine="4"/>
       </Position3>
       <Position4>
-        <Filename Value="UPascalCompiler.pas"/>
-        <Caret Line="96" Column="53" TopLine="76"/>
+        <Filename Value="DelphiToC.lpr"/>
+        <Caret Line="20" Column="36" TopLine="4"/>
       </Position4>
       <Position5>
-        <Filename Value="UPascalCompiler.pas"/>
-        <Caret Line="52" Column="31" TopLine="39"/>
+        <Filename Value="Produce\UProducerC.pas"/>
+        <Caret Line="217" Column="71" TopLine="207"/>
       </Position5>
       <Position6>
-        <Filename Value="UPascalCompiler.pas"/>
-        <Caret Line="19" Column="58" TopLine="6"/>
+        <Filename Value="Produce\UProducerC.pas"/>
+        <Caret Line="216" Column="80" TopLine="203"/>
       </Position6>
       <Position7>
-        <Filename Value="UPascalCompiler.pas"/>
-        <Caret Line="63" Column="64" TopLine="63"/>
+        <Filename Value="Produce\UProducerC.pas"/>
+        <Caret Line="182" Column="44" TopLine="177"/>
       </Position7>
       <Position8>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="79" Column="1" TopLine="56"/>
+        <Filename Value="Produce\UProducerC.pas"/>
+        <Caret Line="205" Column="3" TopLine="202"/>
       </Position8>
       <Position9>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="102" Column="38" TopLine="89"/>
+        <Filename Value="UPascalCompiler.pas"/>
+        <Caret Line="128" Column="12" TopLine="111"/>
       </Position9>
       <Position10>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="34" Column="58" TopLine="21"/>
+        <Filename Value="UPascalCompiler.pas"/>
+        <Caret Line="127" Column="21" TopLine="111"/>
       </Position10>
       <Position11>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="105" Column="16" TopLine="100"/>
+        <Filename Value="DelphiToC.lpr"/>
+        <Caret Line="16" Column="36" TopLine="4"/>
       </Position11>
       <Position12>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="11" Column="27" TopLine="1"/>
+        <Filename Value="UPascalSource.pas"/>
+        <Caret Line="7" Column="59" TopLine="1"/>
       </Position12>
       <Position13>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="103" Column="1" TopLine="94"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="477" Column="13" TopLine="457"/>
       </Position13>
       <Position14>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="102" Column="1" TopLine="93"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="62" Column="50" TopLine="45"/>
       </Position14>
       <Position15>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="103" Column="1" TopLine="94"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="1037" Column="1" TopLine="1012"/>
       </Position15>
       <Position16>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="59" Column="20" TopLine="46"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="865" Column="62" TopLine="391"/>
       </Position16>
       <Position17>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="102" Column="20" TopLine="89"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="910" Column="55" TopLine="900"/>
       </Position17>
       <Position18>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="103" Column="26" TopLine="90"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="862" Column="65" TopLine="850"/>
       </Position18>
       <Position19>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="104" Column="47" TopLine="97"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="81" Column="3" TopLine="66"/>
       </Position19>
       <Position20>
-        <Filename Value="UPascalCompiler.pas"/>
-        <Caret Line="32" Column="1" TopLine="10"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="862" Column="13" TopLine="850"/>
       </Position20>
       <Position21>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="27" Column="1" TopLine="16"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="866" Column="24" TopLine="850"/>
       </Position21>
       <Position22>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="91" Column="1" TopLine="83"/>
+        <Filename Value="UPascalSource.pas"/>
+        <Caret Line="101" Column="34" TopLine="82"/>
       </Position22>
       <Position23>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="92" Column="18" TopLine="78"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="866" Column="24" TopLine="850"/>
       </Position23>
       <Position24>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="98" Column="48" TopLine="85"/>
+        <Filename Value="Analyze\UPascalParser.pas"/>
+        <Caret Line="864" Column="7" TopLine="850"/>
       </Position24>
       <Position25>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="113" Column="1" TopLine="100"/>
+        <Filename Value="Visual\USourceTree.pas"/>
+        <Caret Line="29" Column="64" TopLine="14"/>
       </Position25>
       <Position26>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="35" Column="32" TopLine="17"/>
+        <Filename Value="Visual\USourceTree.pas"/>
+        <Caret Line="112" Column="19" TopLine="105"/>
       </Position26>
       <Position27>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="106" Column="17" TopLine="102"/>
+        <Filename Value="Visual\USourceTree.pas"/>
+        <Caret Line="78" Column="33" TopLine="62"/>
       </Position27>
       <Position28>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="107" Column="52" TopLine="94"/>
+        <Filename Value="Visual\USourceTree.pas"/>
+        <Caret Line="300" Column="1" TopLine="275"/>
       </Position28>
       <Position29>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="88" Column="1" TopLine="88"/>
+        <Filename Value="Visual\USourceTree.pas"/>
+        <Caret Line="84" Column="30" TopLine="65"/>
       </Position29>
       <Position30>
-        <Filename Value="UMainForm.pas"/>
-        <Caret Line="33" Column="1" TopLine="20"/>
+        <Filename Value="UPascalCompiler.pas"/>
+        <Caret Line="102" Column="17" TopLine="101"/>
       </Position30>
     </JumpHistory>

branches/DelphiToC/Example.pas

@@ -12 +12 @@
 
 const
-  Verze: Bytel = 11;
+  Verze: Byte = 11;
 var
   a: Byte;
@@ -21 +21 @@
   WriteLn(A);
   begin
-    WriteLn;
+    WriteLn(11);
     Pokus;
     dsd;
     begin
-      WriteLn;
+      WriteLn(A);
     end;
   end;
   A := 1;
+  for A := 1 to 2 do WriteLn(A);
   if A = 2 then begin
     A := 3;
   end;
   while A < 1 do A := A + 1;
-  WriteLn;
+  WriteLn(D);
 end.

branches/DelphiToC/Produce/UProducerC.pas

@@ -98 +98 @@
 procedure TCProducer.GenerateModule(Module: TModule);
 begin
+  Emit('#define int8 char');
+  Emit('#define int16 int');
+  Emit('#define int32 long');
+  Emit('#define uint8 unsigned char');
+  Emit('#define uint16 unsigned int');
+  Emit('#define uint32 unsigned long');
+  Emit('');
   GenerateUses(Module.UsedModules);
   GenerateCommonBlock(Module, '');
@@ -127 +134 @@
   for I := 0 to Functions.Count - 1 do
   with TFunction(Functions[I]) do
+  if not System then
   begin
     if HaveResult then Line := TranslateType(ResultType.Name) + ' '
@@ -195 +203 @@
 procedure TCProducer.GenerateAssignment(Assignment: TAssignment);
 begin
-  Emit(Assignment.Target.Name + ' = ' + GenerateExpression(Assignment.Source) + ';');
+  if Assignment.Target.Name = 'Result' then Emit('return(' + GenerateExpression(Assignment.Source) + ');')
+    else Emit(Assignment.Target.Name + ' = ' + GenerateExpression(Assignment.Source) + ';');
 end;
 
@@ -201 +210 @@
 var
   Line: string;
-begin
-  Line := FunctionCall.FunctionRef.Name + '(';
-  Line := Line + ');';
-  Emit(Line);
+  I: Integer;
+begin
+  with FunctionCall do begin
+    Line := FunctionRef.Name + '(';
+    if ParameterExpression.Count > 0 then begin
+      for I := 0 to ParameterExpression.Count - 1 do begin
+        Line := Line + GenerateExpression(TExpression(ParameterExpression[I]));
+        if I < ParameterExpression.Count - 1 then Line := Line + ', ';
+      end;
+    end;
+    Line := Line + ');';
+    Emit(Line);
+  end;
 end;
 

branches/DelphiToC/Produce/UProducerPascal.pas

@@ -78 +78 @@
 procedure TProducerPascal.GenerateModule(Module: TModule);
 begin
+  Emit('program ' + Module.Name + ';');
+  Emit('');
   GenerateUses(Module.UsedModules);
   GenerateCommonBlock(Module, '');
@@ -108 +110 @@
   for I := 0 to Functions.Count - 1 do
   with TFunction(Functions[I]) do
+  if not System then
   begin
     if HaveResult then

branches/DelphiToC/UPascalCompiler.pas

@@ -100 +100 @@
           UsedType := nil;
         end;
+        with TType(Types[Types.Add(TType.Create)]) do begin
+          Name := 'ShortInt';
+          System := True;
+          Size := 1;
+          UsedType := nil;
+        end;
+        with TType(Types[Types.Add(TType.Create)]) do begin
+          Name := 'Word';
+          System := True;
+          Size := 2;
+          UsedType := nil;
+        end;
+        with TType(Types[Types.Add(TType.Create)]) do begin
+          Name := 'SmallInt';
+          System := True;
+          Size := 2;
+          UsedType := nil;
+        end;
+        with TType(Types[Types.Add(TType.Create)]) do begin
+          Name := 'Cardinal';
+          System := True;
+          Size := 3;
+          UsedType := nil;
+        end;
+        with TType(Types[Types.Add(TType.Create)]) do begin
+          Name := 'Integer';
+          System := True;
+          Size := 3;
+          UsedType := nil;
+        end;
+        with TType(Types[Types.Add(TType.Create)]) do begin
+          Name := 'Char';
+          System := True;
+          Size := 1;
+          UsedType := nil;
+        end;
+        with TType(Types[Types.Add(TType.Create)]) do begin
+          Name := 'String';
+          System := True;
+          Size := 1;
+          UsedType := nil;
+        end;
         with TFunction(Functions[Functions.Add(TFunction.Create)]) do begin
           Name := 'Exit';
+          System := True;
+          ResultType := TType(TModule(Modules[0]).Types[0]);
+        end;
+        with TFunction(Functions[Functions.Add(TFunction.Create)]) do begin
+          Name := 'Break';
+          System := True;
+          ResultType := TType(TModule(Modules[0]).Types[0]);
+        end;
+        with TFunction(Functions[Functions.Add(TFunction.Create)]) do begin
+          Name := 'Continue';
+          System := True;
           ResultType := TType(TModule(Modules[0]).Types[0]);
         end;

branches/DelphiToC/UPascalSource.pas

@@ -91 +91 @@
   end;
 
+  { TForToDo }
+
   TForToDo = class(TCommand)
     ControlVariable: TVariable;
@@ -96 +98 @@
     Stop: TExpression;
     Command: TCommand;
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -149 +153 @@
 
   TType = class
+    System: Boolean;
     Parent: TTypeList;
     Name: string;
@@ -243 +248 @@
   TFunction = class(TCommonBlock)
   public
+    System: Boolean;
     HaveResult: Boolean;
     Parameters: TParameterList;
@@ -641 +647 @@
 end;
 
+{ TForToDo }
+
+constructor TForToDo.Create;
+begin
+  inherited;
+  Start := TExpression.Create;
+  Stop := TExpression.Create;
+end;
+
+destructor TForToDo.Destroy;
+begin
+  Start.Free;
+  Stop.Free;;
+  inherited Destroy;
+end;
+
 end.
 

branches/DelphiToC/Visual/USourceTree.pas

@@ -27 +27 @@
     procedure AddNodeProgram(Node: TTreeNode; Code: TProgram);
     procedure AddNodeWhileDo(Node: TTreeNode; WhileDo: TWhileDo);
+    procedure AddNodeForToDo(Node: TTreeNode; ForToDo: TForToDo);
     procedure AddNodeCommand(Node: TTreeNode; Command: TCommand);
     procedure AddNodeExpression(Node: TTreeNode; Expression: TExpression);
@@ -58 +59 @@
   I: Integer;
 begin
-  NewNode := TreeView.Items.AddChild(Node, 'while-do');
+  NewNode := TreeView.Items.AddChild(Node, 'while');
   NewNode2 := TreeView.Items.AddChild(NewNode, 'condition');
   AddNodeExpression(NewNode2, WhileDo.Condition);
-  NewNode2 := TreeView.Items.AddChild(NewNode, 'command');
+  NewNode2 := TreeView.Items.AddChild(NewNode, 'do');
   AddNodeCommand(NewNode2, WhileDo.Command);
+end;
+
+procedure TSourceTree.AddNodeForToDo(Node: TTreeNode; ForToDo: TForToDo);
+var
+  NewNode: TTreeNode;
+  NewNode2: TTreeNode;
+  NewNode3: TTreeNode;
+  I: Integer;
+begin
+  with ForToDo do begin
+    NewNode := TreeView.Items.AddChild(Node, 'for');
+    NewNode2 := TreeView.Items.AddChild(NewNode, 'control');
+    NewNode3 := TreeView.Items.AddChild(NewNode2, ControlVariable.Name);
+    NewNode2 := TreeView.Items.AddChild(NewNode, 'from');
+    AddNodeExpression(NewNode2, Start);
+    NewNode2 := TreeView.Items.AddChild(NewNode, 'to');
+    AddNodeExpression(NewNode2, Stop);
+    NewNode2 := TreeView.Items.AddChild(NewNode, 'do');
+    AddNodeCommand(NewNode2, Command);
+  end;
 end;
 
@@ -101 +122 @@
 begin
   if Command is TBeginEnd then
-    AddNodeBeginEnd(Node, TBeginEnd(Command));
+    AddNodeBeginEnd(Node, TBeginEnd(Command))
+  else
   if Command is TWhileDo then
-    AddNodeWhileDo(Node, TWhileDo(Command));
+    AddNodeWhileDo(Node, TWhileDo(Command))
+  else
   if Command is TFunctionCall then
-    AddNodeMethodCall(Node, TFunctionCall(Command));
+    AddNodeMethodCall(Node, TFunctionCall(Command))
+  else
   if Command is TIfThenElse then
-    AddNodeIfThenElse(Node, TIfThenElse(Command));
+    AddNodeIfThenElse(Node, TIfThenElse(Command))
+  else
+  if Command is TForToDo then
+    AddNodeForToDo(Node, TForToDo(Command))
+  else
   if Command is TAssignment then
     AddNodeAssignment(Node, TAssignment(Command));
@@ -172 +200 @@
     NewNode := TreeView.Items.AddChild(Node, 'type');
     for I := 0 to Types.Count - 1 do
-    with TType(Types[I]) do begin
+    with TType(Types[I]) do
+    if not System then begin
       NewNode2 := TreeView.Items.AddChild(NewNode, Name + ' = ');
     end;
@@ -186 +215 @@
 begin
   for I := 0 to Methods.Count - 1 do
-  with TFunction(Methods[I]) do begin
+  with TFunction(Methods[I]) do
+  if not System then begin
     if HaveResult then
       NewNode := TreeView.Items.AddChild(Node, 'function ' + Name)