Changeset 48 for branches/DelphiToC/UPascalSource.pas

Timestamp:

Aug 9, 2010, 1:53:33 PM (14 years ago)

Author:

george

Message:

Added support of parameters for function call.

File:

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

branches/DelphiToC/UPascalSource.pas

@@ -57 +57 @@
   end;
 
+  { TFunctionCall }
+
   TFunctionCall = class(TCommand)
     FunctionRef: TFunction;
+    ParameterExpression: TObjectList; // TObjectList<TExpression>
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -136 +141 @@
     Types: TTypeList;
     Variables: TVariableList;
-    Methods: TFunctionList;
+    Functions: TFunctionList;
     Code: TBeginEnd;
     constructor Create; virtual;
@@ -349 +354 @@
   Variables.Clear;
   Constants.Clear;
-  Methods.Clear;
+  Functions.Clear;
   Code.Clear;
 end;
@@ -386 +391 @@
   Variables := TVariableList.Create;
   Variables.Parent := Self;
-  Methods := TFunctionList.Create;
-  Methods.Parent := Self;
+  Functions := TFunctionList.Create;
+  Functions.Parent := Self;
   Code := TBeginEnd.Create;
   Code.Parent := Self;
@@ -398 +403 @@
   Types.Destroy;
   Variables.Destroy;
-  Methods.Destroy;
+  Functions.Destroy;
   Code.Destroy;
   inherited;
@@ -416 +421 @@
   I := 0;
   while (I < Count) and (LowerCase(TType(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
-  if I < Count then Result := TType(Items[I]) else begin
-    if Assigned(Parent.Parent) then Result := Parent.Parent.Types.Search(Name)
-      else begin
-        Result := nil;
-      end;
-  end;
+  if I < Count then Result := TType(Items[I]) else Result := nil;
+
+   if not Assigned(Result) and Assigned(Parent.Parent) then
+     Result := Parent.Parent.Types.Search(Name);
 end;
 
@@ -477 +480 @@
   while (I < Count) and (LowerCase(TFunction(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
   if I < Count then Result := TFunction(Items[I]) else begin
-    if Assigned(Parent.Parent) then Result := Parent.Parent.Methods.Search(Name)
+    if Assigned(Parent.Parent) then Result := Parent.Parent.Functions.Search(Name)
       else begin
         Result := nil;
@@ -624 +627 @@
 end;
 
+{ TFunctionCall }
+
+constructor TFunctionCall.Create;
+begin
+  inherited;
+  ParameterExpression := TObjectList.Create;
+end;
+
+destructor TFunctionCall.Destroy;
+begin
+  ParameterExpression.Free;
+  inherited Destroy;
+end;
+
 end.