Changeset 54 for branches/DelphiToC/Produce/UProducerPascal.pas

Timestamp:

Aug 10, 2010, 11:54:18 AM (14 years ago)

Author:

george

Message:

Added support for multiple source files and compilations for multiple modules in Project.pas

File:

• branches/DelphiToC/Produce/UProducerPascal.pas (modified) (7 diffs)

branches/DelphiToC/Produce/UProducerPascal.pas

@@ -38 +38 @@
     IndentationLength: Integer;
     Indetation: Integer;
-    procedure Produce; override;
+    procedure Produce(Module: TModule; ProducedCode: TStringList); override;
     constructor Create;
     destructor Destroy; override;
@@ -49 +49 @@
 constructor TProducerPascal.Create;
 begin
-  TextSource := TStringList.Create;
   IndentationLength := 2;
 end;
@@ -55 +54 @@
 destructor TProducerPascal.Destroy;
 begin
-  TextSource.Free;
   inherited;
 end;
@@ -86 +84 @@
 procedure TProducerPascal.GenerateModule(Module: TModule);
 begin
-  Emit('program ' + Module.Name + ';');
+  case Module.ModuleType of
+    mdProgram: Emit('program', False);
+    mdUnit: Emit('unit', False);
+    mdLibrary: Emit('library', False);
+    mdPackage: Emit('package', False);
+  end;
+  Emit(' ' + Module.Name + ';');
   Emit('');
   GenerateUses(Module.UsedModules);
@@ -144 +148 @@
 end;
 
-procedure TProducerPascal.Produce;
+procedure TProducerPascal.Produce(Module: TModule; ProducedCode: TStringList);
 begin
   inherited;
+  TextSource := ProducedCode;
   TextSource.Clear;
-  GenerateProgram(ProgramCode);
+  GenerateModule(Module);
 end;
 
@@ -183 +188 @@
       Line := Line + ')';
     end;
-    if HaveResult then Line := Line + ': ' + ResultType.Name;
+    if HaveResult and Assigned(ResultType) then
+      Line := Line + ': ' + ResultType.Name;
     Emit(Line + ';');
     GenerateBeginEnd(Code);
@@ -256 +262 @@
 begin
   with ForToDo do begin
+    if Assigned(ControlVariable) and Assigned(Start) and Assigned(Stop) then
     Emit('for ' + ControlVariable.Name + ' := ' +
       GenerateExpression(Start) + ' to ' + GenerateExpression(Stop) + ' do ');