Changeset 47 for branches/DelphiToC/UPascalSource.pas

Timestamp:

Aug 9, 2010, 12:48:14 PM (14 years ago)

Author:

george

Message:

Support for function definition with result type.

File:

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

branches/DelphiToC/UPascalSource.pas

@@ -57 +57 @@
   end;
 
-  TMethodCall = class(TCommand)
-    Method: TFunction;
+  TFunctionCall = class(TCommand)
+    FunctionRef: TFunction;
   end;
 
@@ -185 +185 @@
     Name: string;
     ValueType: TType;
-    Value: TValue;
+    DefaultValue: TValue;
   end;
 
@@ -194 +194 @@
   end;
 
-  TParameter = class
-    Name: string;
-    ValueType: TType;
-    DafaultValue: TValue;
+  TParameter = class(TVariable)
   end;
 
@@ -241 +238 @@
   TFunction = class(TCommonBlock)
   public
+    HaveResult: Boolean;
     Parameters: TParameterList;
     ResultType: TType;
@@ -439 +437 @@
   I := 0;
   while (I < Count) and (LowerCase(TVariable(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
-  if I < Count then Result := TVariable(Items[I]) else begin
+  if I < Count then Result := TVariable(Items[I]) else Result := nil;
+
+  if not Assigned(Result) then begin
     if Assigned(Parent.Parent) then
       Result := Parent.Parent.Variables.Search(Name)
+      else Result := nil;
+  end;
+
+  if not Assigned(Result) then begin
+    if Assigned(Parent) and (Parent is TFunction) then
+      Result := TFunction(Parent).Parameters.Search(Name)
+      else Result := nil;
+  end;
+
+  if not Assigned(Result) then begin
+    if Assigned(Parent.Parent) and (Parent.Parent is TFunction) then
+      Result := TFunction(Parent.Parent).Parameters.Search(Name)
       else Result := nil;
   end;
@@ -533 +545 @@
 begin
   I := 0;
-  while (I < Count) and (TParameter(Items[I]).Name <> LowerCase(Name)) do Inc(I);
+  while (I < Count) and (LowerCase(TParameter(Items[I]).Name) <> LowerCase(Name)) do Inc(I);
   if I < Count then Result := TParameter(Items[I])
     else Result := nil;