Changeset 14 for branches/Void/UOutputGenerator.pas

Timestamp:

Nov 10, 2009, 8:19:41 AM (15 years ago)

Author:

george

Message:

• Upraveno: Lepší zpracování parametrů procedůr.

File:

• branches/Void/UOutputGenerator.pas (modified) (8 diffs)

branches/Void/UOutputGenerator.pas

@@ -21 +21 @@
   end;
 
+  { TPascalGenerator }
+
   TPascalGenerator = class(TOutputGenerator)
+  private
+    function GenerateVariableValue(Value: TVariableValue): string;
+  public
     procedure Generate(Model: TModel); override;
     procedure GenerateModule(Module: TModule);
   end;
+
+  { TCGenerator }
 
   TCGenerator = class(TOutputGenerator)
   private
     function ConvertType(Name: string): string;
+    function GenerateVariableValue(Value: TVariableValue): string;
   public
     procedure Generate(Model: TModel); override;
@@ -60 +68 @@
 
 { TPascalGenerator }
+
+function TPascalGenerator.GenerateVariableValue(Value: TVariableValue): string;
+begin
+  case Value.ValueType of
+    vtVariable: if Assigned(Value.VariableDef) then Result := Value.VariableDef.Name
+      else Result := '';
+    vtFloat: Result := FloatToStr(Value.FloatConstant);
+    vtNumber: Result := IntToStr(Value.NumberConstant);
+    vtString: Result := '''' + Value.StringConstant + '''';
+    vtChar: Result := '''' + Value.CharConstant + '''';
+  end;
+end;
 
 procedure TPascalGenerator.Generate(Model: TModel);
@@ -92 +112 @@
     for I := 0 to BeginEnd.Commands.Count - 1 do
       with TCommand(BeginEnd.Commands[I]) do begin
-        if Name = 'Assignment' then Output.Add(Indent + Parameters[0] + ' := ' + Parameters[1] + ';')
+        if Name = 'Assignment' then Output.Add(Indent +
+          TVariableValue(Parameters[0]).VariableDef.Name + ' := ' +
+          GenerateVariableValue(TVariableValue(Parameters[1])) + ';')
         else begin
         Row := Name;
@@ -98 +120 @@
           ParameterText := '';
           for P := 0 to Parameters.Count - 1 do
-            ParameterText := ParameterText + '''' + Parameters[P] + ''', ';
+            ParameterText := ParameterText + GenerateVariableValue(Parameters[P]) + ', ';
           Row := Row + '(' + Copy(ParameterText, 1, Length(ParameterText) - 2) + ')';
         end;
@@ -124 +146 @@
 end;
 
+function TCGenerator.GenerateVariableValue(Value: TVariableValue): string;
+begin
+  case Value.ValueType of
+    vtVariable: if Assigned(Value.VariableDef) then Result := Value.VariableDef.Name
+      else Result := '';
+    vtFloat: Result := FloatToStr(Value.FloatConstant);
+    vtNumber: Result := IntToStr(Value.NumberConstant);
+    vtString: Result := '"' + Value.StringConstant + '"';
+    vtChar: Result := '''' + Value.CharConstant + '''';
+  end;
+end;
+
 procedure TCGenerator.Generate(Model: TModel);
 begin
@@ -145 +179 @@
     Inc(IndentCount);
 
-    // variable section
+    // Variable section
     for I := 0 to Variables.Count - 1 do
       with TVariable(Variables[I]) do
-        Output.Add(Indent + '  ' + ConvertType(VarType.Name) + ' ' + Name + ';');
+        Output.Add(Indent + ConvertType(VarType.Name) + ' ' + Name + ';');
     if Variables.Count > 0 then Output.Add('');
 
@@ -154 +188 @@
     for I := 0 to BeginEnd.Commands.Count - 1 do
       with TCommand(BeginEnd.Commands[I]) do begin
-        if Name = 'Assignment' then Output.Add(Indent + Parameters[0] + ' = ' + Parameters[1] + ';')
+        if Name = 'Assignment' then Output.Add(Indent +
+          TVariableValue(Parameters[0]).VariableDef.Name + ' = ' +
+          GenerateVariableValue(TVariableValue(Parameters[1])) + ';')
         else begin
           if Name = 'WriteLn' then Row := 'printf'
@@ -163 +199 @@
             ParameterText := '';
             for P := 0 to Parameters.Count - 1 do
-              ParameterText := ParameterText + '''' + Parameters[P] + ''', ';
+              ParameterText := ParameterText + GenerateVariableValue(Parameters[P]) + ', ';
             Row := Row + Copy(ParameterText, 1, Length(ParameterText) - 2);
           end;