Changeset 47 for branches/DelphiToC/Produce/UProducerC.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/Produce/UProducerC.pas (modified) (4 diffs)

branches/DelphiToC/Produce/UProducerC.pas

@@ -29 +29 @@
     procedure GenerateIfThenElse(IfThenElse: TIfThenElse);
     procedure GenerateAssignment(Assignment: TAssignment);
-    procedure GenerateMethodCall(MethodCall: TMethodCall);
+    procedure GenerateMethodCall(MethodCall: TFunctionCall);
     function GenerateExpression(Expression: TExpression): string;
   public
@@ -158 +158 @@
   else if Command is TIfThenElse then GenerateIfThenElse(TIfThenElse(Command))
   else if Command is TAssignment then GenerateAssignment(TAssignment(Command))
-  else if Command is TMethodCall then GenerateMethodCall(TMethodCall(Command));
+  else if Command is TFunctionCall then GenerateMethodCall(TFunctionCall(Command));
 end;
 
@@ -171 +171 @@
   Emit('if(' + GenerateExpression(IfThenElse.Condition) + ')');
   GenerateCommand(IfThenElse.Command);
-  Emit('else ');
-  GenerateCommand(IfThenElse.ElseCommand);
+  if Assigned(IfThenElse.ElseCommand) then begin
+    Emit('else ');
+    GenerateCommand(IfThenElse.ElseCommand);
+  end;
 end;
 
@@ -180 +182 @@
 end;
 
-procedure TCProducer.GenerateMethodCall(MethodCall: TMethodCall);
-begin
-  Emit(MethodCall.Method.Name + '();');
+procedure TCProducer.GenerateMethodCall(MethodCall: TFunctionCall);
+begin
+  Emit(MethodCall.FunctionRef.Name + '();');
 end;