Changeset 75 for branches/Transpascal/Compiler/Produce/UProducerC.pas

Timestamp:

Oct 21, 2010, 7:56:25 AM (14 years ago)

Author:

george

Message:

• Modified: Parsing sections in record type.

File:

• branches/Transpascal/Compiler/Produce/UProducerC.pas (modified) (7 diffs)

branches/Transpascal/Compiler/Produce/UProducerC.pas

@@ -29 +29 @@
     procedure GenerateFunctions(Functions: TFunctionList);
     procedure GenerateBeginEnd(BeginEnd: TBeginEnd);
+    procedure GenerateVariableList(VariableList: TVariableList);
+    procedure GenerateVariable(Variable: TVariable);
     procedure GenerateCommand(Command: TCommand);
     procedure GenerateWhileDo(WhileDo: TWhileDo);
@@ -123 +125 @@
     GenerateUses(TModuleProgram(Module).UsedModules);
     GenerateCommonBlock(TModuleProgram(Module).Body, '');
+  end else
+  if Module is TModuleUnit then begin
+    GenerateUses(TModuleProgram(Module).UsedModules);
+    GenerateCommonBlock(TModuleUnit(Module).Body, '');
   end;
 end;
@@ -176 +182 @@
   Inc(Indetation);
 
-
   // Variables
   if BeginEnd.Parent is TCommonBlock then begin
-    for I := 0 to BeginEnd.CommonBlock.Variables.Count - 1 do
-    with TVariable(BeginEnd.CommonBlock.Variables[I]) do
-      Emit(TranslateType(ValueType.Name) + ' ' + Name + ';');
-    Emit('');
+    GenerateVariableList(BeginEnd.CommonBlock.Variables);
   end;
 
@@ -191 +193 @@
   Dec(Indetation);
   Emit('}');
+end;
+
+procedure TProducerC.GenerateVariableList(VariableList: TVariableList);
+var
+  I: Integer;
+begin
+  for I := 0 to VariableList.Count - 1 do
+    GenerateVariable(TVariable(VariableList[I]));
+//  Emit('');
+end;
+
+procedure TProducerC.GenerateVariable(Variable: TVariable);
+begin
+  with Variable do
+    Emit(TranslateType(ValueType.Name) + ' ' + Name + ';');
 end;
 
@@ -296 +313 @@
   if Assigned(AType) then begin
   if AType is TTypeRecord then begin
-    Emit('typedef struct');
+    Emit('struct');
     Emit('{');
     Inc(Indetation);
-    for I := 0 to TTypeRecord(AType).CommonBlock.Types.Count - 1 do begin
-      GenerateType(TType(TTypeRecord(AType).CommonBlock.Types[I]));
-      Emit(';');
-    end;
+    GenerateVariableList(TTypeRecord(AType).CommonBlock.Variables);
     Dec(Indetation);
     Emit('} ' + TranslateType(AType.Name), False);
@@ -321 +335 @@
   end else begin
     if Assigned(AType.UsedType) then begin
-      GenerateType(AType.UsedType);
+      //GenerateType(AType.UsedType);
+      Emit(AType.UsedType.Name, False);
       Emit(' ', False);
     end;
@@ -338 +353 @@
     with TType(Types[I]) do
     if (not System) then begin
+      Emit('typedef ', False);
       GenerateType(TType(Types[I]));
       Emit(';');