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

Timestamp:

Aug 5, 2010, 9:51:16 AM (14 years ago)

Author:

george

Message:

Fixed expression parsing.

File:

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

branches/DelphiToC/Analyze/UPascalParser.pas

@@ -7 +7 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, UPascalSource, FileUtil;
+  Dialogs, UPascalSource, FileUtil;
 
 type
@@ -254 +254 @@
   with Parser do begin
     Expect('while');
+    Condition.CommonBlock := CommonBlock;
     TParserExpression(Condition).Parse(Parser);
     Expect('do');
@@ -282 +283 @@
         if Identifier = '(' then begin
           // Subexpression
-          with TExpression(Expressions[Expressions.Count - 1]) do begin
+          with TExpression(Expressions.Last) do begin
             SubItems[1] := TExpression.Create;
             TParserExpression(SubItems[1]).Parse(Parser);
           end;
           with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
+            CommonBlock := Self.CommonBlock;
             SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
           end;
@@ -293 +295 @@
         if IsOperator(Identifier) then begin
           // Operator
-          TExpression(Expressions[Expressions.Count - 1]).OperatorName := Identifier;
-          TExpression(Expressions[Expressions.Count - 1]).NodeType := ntOperator;
+          TExpression(Expressions.Last).OperatorName := Identifier;
+          TExpression(Expressions.Last).NodeType := ntOperator;
         end else
         if IsIdentificator(Identifier) then begin
@@ -301 +303 @@
           if Assigned(NewVariable) then begin
             // Referenced variable
-            with TExpression(Expressions[Expressions.Count - 1]) do begin
+            with TExpression(Expressions.Last) do begin
               SubItems[1] := TExpression.Create;
               TExpression(SubItems[1]).NodeType := ntVariable;
@@ -307 +309 @@
             end;
             with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
+              CommonBlock := Self.CommonBlock;
               SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
             end;
@@ -313 +316 @@
             if Assigned(Method) then begin
               // Referenced method
-              with TExpression(Expressions[Expressions.Count - 1]) do begin
+              with TExpression(Expressions.Last) do begin
                 SubItems[1] := TExpression.Create;
                 if NextCode  = '(' then               // Method with parameters
@@ -331 +334 @@
                   Expect(')');
                 end;
-                TExpression(SubItems[1]).NodeType := nTFunction;
+                TExpression(SubItems[1]).NodeType := ntFunction;
                 TExpression(SubItems[1]).Method := Method;
               end;
               with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
+                CommonBlock := Self.CommonBlock;
                 SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
               end;
@@ -341 +345 @@
               if Assigned(Constant) then begin
                 // Referenced constant
-                with TExpression(Expressions[Expressions.Count - 1]) do begin
+                with TExpression(Expressions.Last) do begin
                   SubItems[1] := TExpression.Create;
                   TExpression(SubItems[1]).NodeType := ntConstant;
@@ -347 +351 @@
                 end;
                 with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
+                  CommonBlock := Self.CommonBlock;
                   SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
                 end;
@@ -357 +362 @@
         begin
           // Constant value
-          with TExpression(Expressions[Expressions.Count - 1]) do begin
+          with TExpression(Expressions.Last) do begin
             SubItems[1] := TExpression.Create;
+            TExpression(SubItems[1]).CommonBlock := Self.CommonBlock;
             TExpression(SubItems[1]).NodeType := ntConstant;
 
@@ -367 +373 @@
               //  TExpression(SubItems[1]).Value[I - 1] := Byte(Identifier[I]);
             end else begin
-              //SetLength(TExpression(SubItems[1]).Value, 1);
-              //TExpression(SubItems[1]).Value[0] := StrToInt(Identifier);
+              TExpression(SubItems[1]).Value := Identifier;
             end;
           end;
+          //ShowMessage(IntToStr(Expressions.Count));
           with TExpression(Expressions.Items[Expressions.Add(TExpression.Create)]) do begin
+            CommonBlock := Self.CommonBlock;
             SubItems[0] := TExpression(Expressions[Expressions.Count - 2]).SubItems[1];
           end;
@@ -386 +393 @@
             TExpression(Expressions[I - 1]).SubItems[1] := Expressions[I];
             TExpression(Expressions[I + 1]).SubItems[0] := Expressions[I];
-            Expressions.Delete(I);
+            //Expressions.Delete(I);
           end else Inc(I);
       end;
     end;
   end;
-  Result := TExpression(TExpression(Expressions[0]).SubItems[1]);
-  TExpression(Expressions[0]).SubItems[1] := nil;
+  Assign(TExpression(TExpression(Expressions.First).SubItems[1]));
+  TExpression(Expressions.First).SubItems[1] := nil;
+  //ShowMessage(IntToStr(Expressions.Count));
   TExpression(Expressions[1]).SubItems[0] := nil;
   Expressions.Destroy;