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

Timestamp:

Oct 21, 2010, 1:20:57 PM (14 years ago)

Author:

george

Message:

• Enhanced: Tokenizerm, parsing of record type, generation C code for record type.
• Added: Logging of debug information.

File:

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

branches/Transpascal/Compiler/Produce/UProducerC.pas

@@ -19 +19 @@
     function TranslateType(Name: string): string;
     function TranslateOperator(Name: string): string;
-    procedure Emit(AText: string; NewLine: Boolean = True);
+    procedure Emit(AText: string);
+    procedure EmitLn(AText: string = '');
     procedure GenerateUses(UsedModules: TUsedModuleList);
     procedure GenerateModule(Module: TModule);
@@ -27 +28 @@
     procedure GenerateTypes(Types: TTypeList);
     procedure GenerateProgram(ProgramBlock: TProgram);
-    procedure GenerateFunctions(Functions: TFunctionList);
+    procedure GenerateFunctions(Functions: TFunctionList;
+      Prefix: string = '');
     procedure GenerateBeginEnd(BeginEnd: TBeginEnd);
     procedure GenerateVariableList(VariableList: TVariableList);
@@ -94 +96 @@
 end;
 
-procedure TProducerC.Emit(AText: string; NewLine: Boolean = True);
+procedure TProducerC.EmitLn(AText: string = '');
+begin
+  Emit(AText);
+  TextSource.Add('');
+end;
+
+procedure TProducerC.Emit(AText: string);
 begin
   with TextSource do begin
@@ -101 +109 @@
       Strings[Count - 1] := Strings[Count - 1] + DupeString(' ', IndentationLength * Indetation);
     Strings[Count - 1] := Strings[Count - 1] + AText;
-    if NewLine then Add('');
   end;
 end;
@@ -111 +118 @@
   for I := 0 to UsedModules.Count - 1 do
     if Dialect = pdDynamicC then
-      Emit('#use "' + TUsedModule(UsedModules[I]).Name + '.lib"')
-      else Emit('#include "' + TUsedModule(UsedModules[I]).Name + '.h"');
-  Emit('');
+      EmitLn('#use "' + TUsedModule(UsedModules[I]).Name + '.lib"')
+      else EmitLn('#include "' + TUsedModule(UsedModules[I]).Name + '.h"');
+  EmitLn;
 end;
 
 procedure TProducerC.GenerateModule(Module: TModule);
 begin
-  if Dialect = pdDynamicC then Emit('#use "platform.lib"')
-    else Emit('#include "platform.h"');
-  Emit('');
+  if Dialect = pdDynamicC then EmitLn('#use "platform.lib"')
+    else EmitLn('#include "platform.h"');
+  EmitLn;
   if Module is TModuleProgram then begin
     TModuleProgram(Module).Body.Name := 'main';
@@ -149 +156 @@
 end;
 
-procedure TProducerC.GenerateFunctions(Functions: TFunctionList);
+procedure TProducerC.GenerateFunctions(Functions: TFunctionList;
+  Prefix: string = '');
 var
   I: Integer;
@@ -157 +165 @@
   for I := 0 to Functions.Count - 1 do
   with TFunction(Functions[I]) do
-  if not System then
-  begin
-    if HaveResult then Line := TranslateType(ResultType.Name) + ' '
+  if not System then begin
+    if HaveResult and Assigned(ResultType) then Line := TranslateType(ResultType.Name) + ' '
       else Line := 'void ';
-    Line := Line + Name + '(';
+    Line := Line + Prefix + Name + '(';
     if Parameters.Count > 0 then
     for J := 0 to Parameters.Count - 1 do begin
@@ -169 +176 @@
     end;
     Line := Line + ')';
-    Emit(Line);
+    EmitLn(Line);
     GenerateBeginEnd(Code);
-    Emit('');
+    EmitLn;
   end;
 end;
@@ -179 +186 @@
   I: Integer;
 begin
-  Emit('{');
+  EmitLn('{');
   Inc(Indetation);
 
@@ -192 +199 @@
 
   Dec(Indetation);
-  Emit('}');
+  EmitLn('}');
 end;
 
@@ -201 +208 @@
   for I := 0 to VariableList.Count - 1 do
     GenerateVariable(TVariable(VariableList[I]));
-//  Emit('');
+//  EmitLn;
 end;
 
@@ -207 +214 @@
 begin
   with Variable do
-    Emit(TranslateType(ValueType.Name) + ' ' + Name + ';');
+    EmitLn(TranslateType(ValueType.Name) + ' ' + Name + ';');
 end;
 
@@ -222 +229 @@
 procedure TProducerC.GenerateWhileDo(WhileDo: TWhileDo);
 begin
-  Emit('while (' + GenerateExpression(WhileDo.Condition) + ')');
-  GenerateCommand(WhileDo.Command);
+  EmitLn('while (' + GenerateExpression(WhileDo.Condition) + ')');
+  if Assigned(WhileDo.Command) then GenerateCommand(WhileDo.Command);
 end;
 
@@ -229 +236 @@
 begin
   with ForToDo do begin
-    Emit('for(' + ControlVariable.Name + ' = ' +
+    if Assigned(ControlVariable) then
+    EmitLn('for(' + ControlVariable.Name + ' = ' +
       GenerateExpression(Start) + '; ' + ControlVariable.Name + ' < ' +
       GenerateExpression(Stop) + '; ' + ControlVariable.Name + '++)');
@@ -238 +246 @@
 procedure TProducerC.GenerateIfThenElse(IfThenElse: TIfThenElse);
 begin
-  Emit('if(' + GenerateExpression(IfThenElse.Condition) + ')');
+  EmitLn('if(' + GenerateExpression(IfThenElse.Condition) + ')');
   GenerateCommand(IfThenElse.Command);
   if Assigned(IfThenElse.ElseCommand) then begin
-    Emit('else ');
+    EmitLn('else ');
     GenerateCommand(IfThenElse.ElseCommand);
   end;
@@ -248 +256 @@
 procedure TProducerC.GenerateAssignment(Assignment: TAssignment);
 begin
-  if Assignment.Target.Name = 'Result' then Emit('return(' + GenerateExpression(Assignment.Source) + ');')
-    else Emit(Assignment.Target.Name + ' = ' + GenerateExpression(Assignment.Source) + ';');
+  if Assignment.Target.Name = 'Result' then EmitLn('return(' + GenerateExpression(Assignment.Source) + ');')
+    else EmitLn(Assignment.Target.Name + ' = ' + GenerateExpression(Assignment.Source) + ';');
 end;
 
@@ -266 +274 @@
     end;
     Line := Line + ');';
-    Emit(Line);
+    EmitLn(Line);
   end;
 end;
@@ -302 +310 @@
     GenerateTypes(Types);
     GenerateFunctions(Functions);
-    Emit('void ' + Name + '()');
+    EmitLn('void ' + Name + '()');
     GenerateBeginEnd(Code);
   end;
@@ -313 +321 @@
   if Assigned(AType) then begin
   if AType is TTypeRecord then begin
-    Emit('struct');
-    Emit('{');
+    EmitLn('struct');
+    EmitLn('{');
     Inc(Indetation);
     GenerateVariableList(TTypeRecord(AType).CommonBlock.Variables);
     Dec(Indetation);
-    Emit('} ' + TranslateType(AType.Name), False);
+    EmitLn('} ' + TranslateType(AType.Name) + ';');
+    EmitLn;
+    GenerateFunctions(TTypeRecord(AType).CommonBlock.Functions, AType.Name + '_');
   end else
   if AType is TTypeArray then begin
     GenerateType(TTypeArray(AType).ItemType);
-    Emit('* ', False);
+    EmitLn('* ');
 
 (*    if Assigned(TTypeArray(AType).IndexType) then begin
-      Emit(AType.Name + '[', False);
-      Emit('[', False);
+      Emit(AType.Name + '[');
+      Emit('[');
       GenerateType(TTypeArray(AType).IndexType);
-      Emit(']', False);
-    end;
-    Emit(' of ', False);
+      Emit(']');
+    end;
+    Emit(' of ');
     if Assigned(TTypeArray(AType).ItemType) then*)
-    Emit(TranslateType(AType.Name), False);
+    Emit(TranslateType(AType.Name));
+  end else
+  if AType is TTypePointer then begin
+    if Assigned(AType.UsedType) then begin
+      Emit(AType.UsedType.Name);
+      Emit(' *');
+    end;
+    Emit(TranslateType(AType.Name));
   end else begin
     if Assigned(AType.UsedType) then begin
       //GenerateType(AType.UsedType);
-      Emit(AType.UsedType.Name, False);
-      Emit(' ', False);
-    end;
-    Emit(TranslateType(AType.Name), False);
+      Emit(AType.UsedType.Name);
+      Emit(' ');
+    end;
+    Emit(TranslateType(AType.Name));
   end;
   end;
@@ -353 +370 @@
     with TType(Types[I]) do
     if (not System) then begin
-      Emit('typedef ', False);
+      Emit('typedef ');
       GenerateType(TType(Types[I]));
-      Emit(';');
+      EmitLn(';');
     end;
     Dec(Indetation);
-    Emit('');
-  end;
-end;
-
-
+    EmitLn('');
+  end;
+end;
 
 end.