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

branches/DelphiToC/Produce/UProducerC.pas

@@ -23 +23 @@
       LabelPrefix: string);
     procedure GenerateProgram(ProgramBlock: TProgram);
-    procedure GenerateMethods(Methods: TFunctionList);
+    procedure GenerateFunctions(Functions: TFunctionList);
     procedure GenerateBeginEnd(BeginEnd: TBeginEnd);
     procedure GenerateCommand(Command: TCommand);
@@ -29 +29 @@
     procedure GenerateIfThenElse(IfThenElse: TIfThenElse);
     procedure GenerateAssignment(Assignment: TAssignment);
-    procedure GenerateMethodCall(MethodCall: TFunctionCall);
+    procedure GenerateFunctionCall(FunctionCall: TFunctionCall);
     function GenerateExpression(Expression: TExpression): string;
   public
@@ -58 +58 @@
 function TCProducer.TranslateType(Name: string): string;
 begin
-  if Name = 'Byte' then Result := 'uint8_t';
-  if Name = 'Word' then Result := 'uint16_t';
-  if Name = 'Void' then Result := 'void';
+  if Name = 'Byte' then Result := 'uint8'
+  else if Name = 'ShortInt' then Result := 'int8'
+  else if Name = 'Word' then Result := 'int16'
+  else if Name = 'SmallInt' then Result := 'int16'
+  else if Name = 'Cardinal' then Result := 'uint32'
+  else if Name = 'Integer' then Result := 'int32'
+  else if Name = 'Void' then Result := 'void';
 end;
 
@@ -115 +119 @@
 end;
 
-procedure TCProducer.GenerateMethods(Methods: TFunctionList);
-var
-  I: Integer;
-begin
-  for I := 0 to Methods.Count - 1 do
-  with TFunction(Methods[I]) do
+procedure TCProducer.GenerateFunctions(Functions: TFunctionList);
+var
+  I: Integer;
+  J: Integer;
+  Line: string;
+begin
+  for I := 0 to Functions.Count - 1 do
+  with TFunction(Functions[I]) do
   begin
-    Emit('void ' + Name + '()');
+    if HaveResult then Line := TranslateType(ResultType.Name) + ' '
+      else Line := 'void ';
+    Line := Line + Name + '(';
+    if Parameters.Count > 0 then
+    for J := 0 to Parameters.Count - 1 do begin
+      Line := Line + TranslateType(TParameter(Parameters[J]).ValueType.Name) +
+        ' ' + TParameter(Parameters[J]).Name;
+      if J < Parameters.Count - 1 then Line := Line + ', ';
+    end;
+    Line := Line + ')';
+    Emit(Line);
     GenerateBeginEnd(Code);
     Emit('');
@@ -158 +174 @@
   else if Command is TIfThenElse then GenerateIfThenElse(TIfThenElse(Command))
   else if Command is TAssignment then GenerateAssignment(TAssignment(Command))
-  else if Command is TFunctionCall then GenerateMethodCall(TFunctionCall(Command));
+  else if Command is TFunctionCall then GenerateFunctionCall(TFunctionCall(Command));
 end;
 
@@ -182 +198 @@
 end;
 
-procedure TCProducer.GenerateMethodCall(MethodCall: TFunctionCall);
-begin
-  Emit(MethodCall.FunctionRef.Name + '();');
+procedure TCProducer.GenerateFunctionCall(FunctionCall: TFunctionCall);
+var
+  Line: string;
+begin
+  Line := FunctionCall.FunctionRef.Name + '(';
+  Line := Line + ');';
+  Emit(Line);
 end;
 
@@ -208 +228 @@
 begin
   with CommonBlock do begin
-    GenerateMethods(Methods);
+    GenerateFunctions(Functions);
     Emit('void ' + Name + '()');
     GenerateBeginEnd(Code);