Changeset 6 for trunk/Compiler/Produce

Timestamp:

Nov 5, 2010, 11:31:04 AM (14 years ago)

Author:

george

Message:

• Added: Typecasting support.
• Fixed: Function call in expressions.
• Added: Producer module specify generated file name, extension and placing.

Location:

trunk/Compiler/Produce

Files:

• UProducer.pas (modified) (1 diff)
• UProducerAsm8051.pas (modified) (3 diffs)
• UProducerDynamicC.pas (modified) (12 diffs)
• UProducerGCCC.pas (modified) (3 diffs)
• UProducerPascal.pas (modified) (3 diffs)
• UProducerTreeView.pas (modified) (1 diff)

trunk/Compiler/Produce/UProducer.pas

@@ -10 +10 @@
 type
   TProducer = class
-    FileExtension: string;
     procedure AssignToStringList(Target: TStringList); virtual; abstract;
     procedure Produce(Module: TModule); virtual; abstract;

trunk/Compiler/Produce/UProducerAsm8051.pas

@@ -108 +108 @@
 begin
   AssemblyCode := TObjectList.Create;
-  FileExtension := '.asm';
 end;
 
@@ -155 +154 @@
     ntNone: ;
     ntVariable: if Assigned(Variable) then AddInstruction('', 'GETVAR', Variable.Name, '');
-    nTFunction: AddInstruction('', 'CALL', FunctionCall.Name, '');
+    nTFunction: AddInstruction('', 'CALL', FunctionCall.FunctionRef.Name, '');
     ntConstant: AddInstruction('', 'CONST', '', '');
     ntOperator: begin
@@ -192 +191 @@
 procedure TProducerAsm8051.GenerateModule(Module: TModule);
 begin
-
+  Module.TargetFile := Module.Name + '.asm';
 end;
 

trunk/Compiler/Produce/UProducerDynamicC.pas

@@ -27 +27 @@
     procedure GenerateProgram(ProgramBlock: TProgram);
     procedure GenerateFunctions(Functions: TFunctionList;
-      Prefix: string = '');
+      Prefix: string = ''; HeaderOnly: Boolean = False);
     procedure GenerateBeginEnd(BeginEnd: TBeginEnd);
     procedure GenerateVariableList(VariableList: TVariableList);
@@ -36 +36 @@
     procedure GenerateIfThenElse(IfThenElse: TIfThenElse);
     procedure GenerateAssignment(Assignment: TAssignment);
-    procedure GenerateFunctionCall(FunctionCall: TFunctionCall);
+    function GenerateFunctionCall(FunctionCall: TFunctionCall): string;
     function GenerateExpression(Expression: TExpression): string;
   public
@@ -55 +55 @@
 begin
   TextSource := TStringList.Create;
-  FileExtension := '.c';
   IndentationLength := 2;
 end;
@@ -119 +118 @@
 procedure TProducerDynamicC.GenerateModule(Module: TModule);
 begin
-  EmitLn('#use "platform.lib"');
-  EmitLn;
   if Module is TModuleProgram then begin
+    Module.TargetFile := Module.Name + '.c';
+    EmitLn('#use "platform.lib"');
+    EmitLn;
     TModuleProgram(Module).Body.Name := 'main';
     GenerateUses(TModuleProgram(Module).UsedModules);
@@ -127 +127 @@
   end else
   if Module is TModuleUnit then begin
+    Module.TargetFile := 'Lib\' + Module.Name + '.lib';
+    EmitLn('/*** BeginHeader */');
+    EmitLn('#ifndef ' + UpperCase(Module.Name) + '_H');
+    EmitLn('#define ' + UpperCase(Module.Name) + '_H');
+    EmitLn;
+    EmitLn('#use "platform.lib"');
     GenerateUses(TModuleProgram(Module).UsedModules);
+    GenerateTypes(TModuleUnit(Module).Body.Types);
+    EmitLn('/*** EndHeader */');
+    EmitLn;
+    EmitLn('/*** BeginHeader */');
+    GenerateFunctions(TModuleUnit(Module).Body.Functions, '', True);
+    EmitLn('/*** EndHeader */');
+    EmitLn;
+
+    GenerateFunctions(TModuleUnit(Module).Body.Functions);
+
     GenerateCommonBlock(TModuleUnit(Module).Body, '');
+
+    EmitLn;
+    EmitLn('/*** BeginHeader */');
+    EmitLn('#endif');
+    EmitLn('/*** EndHeader */');
   end;
 end;
@@ -150 +171 @@
 
 procedure TProducerDynamicC.GenerateFunctions(Functions: TFunctionList;
-  Prefix: string = '');
+  Prefix: string = ''; HeaderOnly: Boolean = False);
 var
   I: Integer;
@@ -171 +192 @@
     Line := Line + ')';
     EmitLn(Line);
-    GenerateBeginEnd(Code);
+    if not HeaderOnly then GenerateBeginEnd(Code);
     EmitLn;
   end;
@@ -218 +239 @@
   else if Command is TIfThenElse then GenerateIfThenElse(TIfThenElse(Command))
   else if Command is TAssignment then GenerateAssignment(TAssignment(Command))
-  else if Command is TFunctionCall then GenerateFunctionCall(TFunctionCall(Command));
+  else if Command is TFunctionCall then EmitLn(GenerateFunctionCall(TFunctionCall(Command)) + ';');
 end;
 
@@ -254 +275 @@
 end;
 
-procedure TProducerDynamicC.GenerateFunctionCall(FunctionCall: TFunctionCall);
+function TProducerDynamicC.GenerateFunctionCall(FunctionCall: TFunctionCall): string;
 var
   Line: string;
@@ -267 +288 @@
       end;
     end;
-    Line := Line + ');';
-    EmitLn(Line);
-  end;
+    Line := Line + ')';
+  end;
+  Result := Line;
 end;
 
@@ -285 +306 @@
       end;
       ntVariable: Result := Expression.Variable.Name;
-      ntFunction: Result := Expression.FunctionCall.Name;
+      ntFunction: Result := GenerateFunctionCall(Expression.FunctionCall);
       ntOperator: begin
         Result := GenerateExpression(TExpression(Expression.SubItems.First))
@@ -308 +329 @@
 begin
   with CommonBlock do begin
-    GenerateTypes(Types);
-    GenerateFunctions(Functions);
     EmitLn('void ' + Name + '()');
     GenerateBeginEnd(Code);

trunk/Compiler/Produce/UProducerGCCC.pas

@@ -55 +55 @@
 begin
   TextSource := TStringList.Create;
-  FileExtension := '.c';
   IndentationLength := 2;
 end;
@@ -119 +118 @@
 procedure TProducerGCCC.GenerateModule(Module: TModule);
 begin
+  Module.TargetFile := Module.Name + '.c';
   EmitLn('#include "platform.h"');
   EmitLn;
@@ -281 +281 @@
     end;
     ntVariable: Result := Expression.Variable.Name;
-    ntFunction: Result := Expression.FunctionCall.Name;
+    ntFunction: Result := Expression.FunctionCall.FunctionRef.Name;
     ntOperator: begin
       Result := GenerateExpression(TExpression(Expression.SubItems.First))

trunk/Compiler/Produce/UProducerPascal.pas

@@ -51 +51 @@
 begin
   IndentationLength := 2;
-  FileExtension := '.pas';
   TextSource := TStringList.Create;
 end;
@@ -88 +87 @@
 procedure TProducerPascal.GenerateModule(Module: TModule);
 begin
+  Module.TargetFile := Module.Name + '.pas';
   if Module is TModuleProgram then
   with TModuleProgram(Module) do begin
@@ -320 +320 @@
       end;
       ntVariable: Result := Expression.Variable.Name;
-      ntFunction: Result := Expression.FunctionCall.Name;
+      ntFunction: Result := Expression.FunctionCall.FunctionRef.Name;
       ntOperator: begin
         Result := GenerateExpression(TExpression(Expression.SubItems.First))

trunk/Compiler/Produce/UProducerTreeView.pas

@@ -152 +152 @@
     ntConstant: NewNode := TreeView.Items.AddChild(Node, Expression.Value);
     ntVariable: NewNode := TreeView.Items.AddChild(Node, Expression.Variable.Name);
-    ntFunction: NewNode := TreeView.Items.AddChild(Node, Expression.FunctionCall.Name);
+    ntFunction: NewNode := TreeView.Items.AddChild(Node, Expression.FunctionCall.FunctionRef.Name);
     ntOperator: begin
       NewNode := TreeView.Items.AddChild(Node, Expression.OperatorName);