Changeset 47 for branches/DelphiToC/Visual/USourceTree.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/Visual/USourceTree.pas (modified) (5 diffs)

branches/DelphiToC/Visual/USourceTree.pas

@@ -17 +17 @@
     procedure AddNodeBeginEnd(Node: TTreeNode; BeginEnd: TBeginEnd);
     procedure AddNodeIfThenElse(Node: TTreeNode; IfThenElse: TIfThenElse);
-    procedure AddNodeMethodCall(Node: TTreeNode; Method: TMethodCall);
+    procedure AddNodeMethodCall(Node: TTreeNode; Method: TFunctionCall);
     procedure AddNodeMethodList(Node: TTreeNode; Methods: TFunctionList);
+    procedure AddNodeParameterList(Node: TTreeNode; Parameters: TParameterList);
     procedure AddNodeTypeList(Node: TTreeNode; Types: TTypeList);
     procedure AddNodeVariableList(Node: TTreeNode; Variables: TVariableList);
@@ -82 +83 @@
 end;
 
-procedure TSourceTree.AddNodeMethodCall(Node: TTreeNode; Method: TMethodCall);
-var
-  NewNode: TTreeNode;
-begin
-  NewNode := TreeView.Items.AddChild(Node, Method.Method.Name);
+procedure TSourceTree.AddNodeMethodCall(Node: TTreeNode; Method: TFunctionCall);
+var
+  NewNode: TTreeNode;
+begin
+  NewNode := TreeView.Items.AddChild(Node, Method.FunctionRef.Name);
 end;
 
@@ -103 +104 @@
   if Command is TWhileDo then
     AddNodeWhileDo(Node, TWhileDo(Command));
-  if Command is TMethodCall then
-    AddNodeMethodCall(Node, TMethodCall(Command));
+  if Command is TFunctionCall then
+    AddNodeMethodCall(Node, TFunctionCall(Command));
   if Command is TIfThenElse then
     AddNodeIfThenElse(Node, TIfThenElse(Command));
@@ -186 +187 @@
   for I := 0 to Methods.Count - 1 do
   with TFunction(Methods[I]) do begin
-    NewNode := TreeView.Items.AddChild(Node, 'procedure ' + Name);
+    if HaveResult then
+      NewNode := TreeView.Items.AddChild(Node, 'function ' + Name)
+      else NewNode := TreeView.Items.AddChild(Node, 'procedure ' + Name);
+    AddNodeParameterList(NewNode, Parameters);
     AddNodeMethodList(NewNode, Methods);
     AddNodeConstantList(NewNode, Constants);
@@ -192 +196 @@
     AddNodeTypeList(NewNode, Types);
     AddNodeBeginEnd(NewNode, Code);
+  end;
+end;
+
+procedure TSourceTree.AddNodeParameterList(Node: TTreeNode;
+  Parameters: TParameterList);
+var
+  I: Integer;
+  NewNode: TTreeNode;
+begin
+  if Parameters.Count > 0 then begin
+    NewNode := TreeView.Items.AddChild(Node, 'parametery');
+    for I := 0 to Parameters.Count - 1 do
+    with TParameter(Parameters[I]) do begin
+      TreeView.Items.AddChild(NewNode, Name + ': ' + ValueType.Name);
+    end;
   end;
 end;