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

branches/DelphiToC/Produce/UProducerPascal.pas

@@ -15 +15 @@
   TProducerPascal = class(TCodeProducer)
   private
-    procedure Emit(Text: string);
+    procedure Emit(Text: string; NewLine: Boolean = True);
     procedure GenerateUses(UsedModules: TUsedModuleList);
     procedure GenerateModule(Module: TModule);
@@ -22 +22 @@
     procedure GenerateProgram(ProgramBlock: TProgram);
     procedure GenerateFunctions(Functions: TFunctionList);
+    procedure GenerateConstants(Constants: TConstantList);
     procedure GenerateBeginEnd(BeginEnd: TBeginEnd);
     procedure GenerateVariableList(Variables: TVariableList);
@@ -28 +29 @@
     procedure GenerateIfThenElse(IfThenElse: TIfThenElse);
     procedure GenerateAssignment(Assignment: TAssignment);
-    procedure GenerateMethodCall(MethodCall: TFunctionCall);
+    procedure GenerateFunctionCall(ConstantCall: TFunctionCall);
     function GenerateExpression(Expression: TExpression): string;
   public
@@ -55 +56 @@
 end;
 
-procedure TProducerPascal.Emit(Text: string);
-begin
-  TextSource.Add(DupeString(' ', IndentationLength * Indetation) + Text);
+procedure TProducerPascal.Emit(Text: string; NewLine: Boolean = True);
+begin
+  if NewLine then TextSource.Add(DupeString(' ', IndentationLength * Indetation) + Text)
+    else TextSource.Strings[TextSource.Count - 1] := TextSource.Strings[TextSource.Count - 1] + Text;
 end;
 
@@ -68 +70 @@
   for I := 0 to UsedModules.Count - 1 do begin
     Line := Line + TUsedModule(UsedModules[I]).Name;
-    if I < UsedModules.Count then Line := Line + ', ';
-  end;
-  Emit(Line);
+    if I < UsedModules.Count - 1 then Line := Line + ', ';
+  end;
+  Emit(Line + ';');
   Emit('');
 end;
@@ -78 +80 @@
   GenerateUses(Module.UsedModules);
   GenerateCommonBlock(Module, '');
+  Emit(';', False);
 end;
 
@@ -125 +128 @@
 end;
 
+procedure TProducerPascal.GenerateConstants(Constants: TConstantList);
+var
+  I: Integer;
+begin
+  Emit('const');
+  Inc(Indetation);
+  for I := 0 to Constants.Count - 1 do
+  with TConstant(Constants[I]) do
+    Emit(Name + ': ' + ValueType.Name + ' = ' + Value + ';');
+  Dec(Indetation);
+  Emit('');
+end;
+
 procedure TProducerPascal.GenerateBeginEnd(BeginEnd: TBeginEnd);
 var
@@ -132 +148 @@
   Inc(Indetation);
   // Commands
-  for I := 0 to BeginEnd.Commands.Count - 1 do
+  for I := 0 to BeginEnd.Commands.Count - 1 do begin
     GenerateCommand(TCommand(BeginEnd.Commands[I]));
+    Emit(';', False);
+  end;
 
   Dec(Indetation);
-  Emit('end;');
+  Emit('end');
 end;
 
@@ -144 +162 @@
 begin
   Emit('var');
+  Inc(Indetation);
   for I := 0 to Variables.Count - 1 do
   with TVariable(Variables[I]) do
     Emit(Name + ': ' + ValueType.Name + ';');
+  Dec(Indetation);
   Emit('');
 end;
@@ -156 +176 @@
   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;
 
@@ -177 +197 @@
 procedure TProducerPascal.GenerateAssignment(Assignment: TAssignment);
 begin
-  Emit(Assignment.Target.Name + ' := ' + GenerateExpression(Assignment.Source) + ';');
-end;
-
-procedure TProducerPascal.GenerateMethodCall(MethodCall: TFunctionCall);
-begin
-  Emit(MethodCall.FunctionRef.Name + ';');
+  Emit(Assignment.Target.Name + ' := ' + GenerateExpression(Assignment.Source));
+end;
+
+procedure TProducerPascal.GenerateFunctionCall(ConstantCall: TFunctionCall);
+var
+  Line: string;
+  I: Integer;
+begin
+  with ConstantCall do begin
+    Line := FunctionRef.Name;
+    if ParameterExpression.Count > 0 then begin
+      Line := Line + '(';
+      for I := 0 to ParameterExpression.Count - 1 do begin
+        Line := Line + GenerateExpression(TExpression(ParameterExpression[I]));
+        if I < ParameterExpression.Count - 1 then Line := Line + ', ';
+      end;
+      Line := Line + ')';
+    end;
+  end;
+  Emit(Line);
 end;
 
@@ -206 +240 @@
 begin
   with CommonBlock do begin
-    GenerateFunctions(Methods);
-    Emit('procedure ' + Name + '');
+    GenerateFunctions(Functions);
+    GenerateConstants(Constants);
+    GenerateVariableList(Variables);
     GenerateBeginEnd(Code);
   end;