Changeset 39 for branches/DelphiToC/UPascalSource.pas

Timestamp:

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

Author:

george

Message:

Fixed expression parsing.

File:

• branches/DelphiToC/UPascalSource.pas (modified) (10 diffs)

branches/DelphiToC/UPascalSource.pas

@@ -7 +7 @@
 uses
   SysUtils, Variants, Classes, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, Contnrs;
+  Dialogs, Contnrs;
 
 type
@@ -200 +200 @@
   end;
 
+  { TExpression }
+
   TExpression = class
     CommonBlock: TCommonBlock;
@@ -211 +213 @@
     constructor Create;
     destructor Destroy; override;
+    procedure Assign(Source: TExpression);
   end;
 
@@ -310 +313 @@
 
 destructor TConstantList.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Count - 1 do
-    TConstant(Items[I]).Free;
+begin
   inherited;
 end;
@@ -394 +393 @@
 
 destructor TTypeList.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Count - 1 do
-    TType(Items[I]).Free;
+begin
   inherited;
 end;
@@ -430 +425 @@
   while (I < Count) and (TVariable(Items[I]).Name <> Name) do Inc(I);
   if I < Count then Result := TVariable(Items[I]) else begin
-    if Assigned(Parent.Parent) then Result := Parent.Parent.Variables.Search(Name)
-      else begin
-        Result := nil;
-      end;
+    if Assigned(Parent.Parent) then
+      Result := Parent.Parent.Variables.Search(Name)
+      else Result := nil;
   end;
 end;
@@ -473 +467 @@
   SubItems := TExpressionList.Create;
   SubItems.Count := 2;
+  SubItems.OwnsObjects := False;
 end;
 
@@ -479 +474 @@
   SubItems.Free;
   inherited;
+end;
+
+procedure TExpression.Assign(Source: TExpression);
+begin
+  CommonBlock := Source.CommonBlock;
+  NodeType := Source.NodeType;
+  Method := Source.Method;
+  Value := Source.Value;
+  Associated := Source.Associated;
+  OperatorName := Source.OperatorName;
+  Variable := Source.Variable;
+  SubItems.Assign(Source.SubItems);
 end;
 
@@ -503 +510 @@
 
 destructor TExpressionList.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Count - 1 do
-    TExpression(Items[I]).Free;
+begin
   inherited;
 end;
@@ -514 +517 @@
 
 destructor TParameterList.Destroy;
-var
-  I: Integer;
-begin
-  for I := 0 to Count - 1 do
-    TParameter(Items[I]).Free;
+begin
   inherited;
 end;