Changeset 93 for branches/dcomp

Timestamp:

Nov 4, 2016, 9:17:57 PM (8 years ago)

Author:

chronos

Message:

• Modified: Use generic lists in supported analyzers and parsers.
• Fixed: Build under Delphi.

Location:

branches/dcomp/CmdLine

Files:

• Compiler/UAnalyzerPascal.pas (modified) (1 diff)
• Compiler/UCompiler.pas (modified) (3 diffs)
• dcomp.dpr (modified) (1 diff)

branches/dcomp/CmdLine/Compiler/UAnalyzerPascal.pas

@@ -1 +1 @@
 unit UAnalyzerPascal;
-
-{$mode delphi}
 
 interface

branches/dcomp/CmdLine/Compiler/UCompiler.pas

@@ -4 +4 @@
 
 uses
-  SysUtils, UAnalyzer, UTarget;
+  SysUtils, Generics.Collections, UAnalyzer, UTarget;
 
 type
@@ -11 +11 @@
 
   TCompiler = class
-    Analyzers: array of TAnalyzer;
-    Targets: array of TTarget;
+    SupportedAnalyzers: TObjectList<TAnalyzer>;
+    SupportedTargets: TObjectList<TTarget>;
     Analyzer: TAnalyzer;
     Target: TTarget;
+    MainSourceFile: string;
     procedure Compile;
     procedure RegisterTarget(TargetClass: TTargetClass);
     procedure RegisterAnalyzer(AnalyzerClass: TAnalyzerClass);
+    constructor Create;
+    destructor Destroy; override;
   end;
 
@@ -33 +36 @@
 procedure TCompiler.RegisterTarget(TargetClass: TTargetClass);
 begin
-  SetLength(Targets, Length(Targets) + 1);
-  Targets[Length(Targets) - 1] := TargetClass.Create;
+  SupportedTargets.Add(TargetClass.Create);
   if not Assigned(Target) then
-    Target := Targets[Length(Targets) - 1];
+    Target := SupportedTargets.Last;
+end;
+
+constructor TCompiler.Create;
+begin
+  SupportedTargets := TObjectList<TTarget>.Create;
+  SupportedAnalyzers := TObjectList<TAnalyzer>.Create;
+end;
+
+destructor TCompiler.Destroy;
+begin
+  SupportedTargets.Free;
+  SupportedAnalyzers.Free;
+  inherited;
 end;
 
 procedure TCompiler.RegisterAnalyzer(AnalyzerClass: TAnalyzerClass);
 begin
-  SetLength(Analyzers, Length(Analyzers) + 1);
-  Analyzers[Length(Analyzers) - 1] := AnalyzerClass.Create;
+  SupportedAnalyzers.Add(AnalyzerClass.Create);
   if not Assigned(Analyzer) then
-    Analyzer := Analyzers[Length(Analyzers) - 1];
+    Analyzer := SupportedAnalyzers.Last;
 end;
 

branches/dcomp/CmdLine/dcomp.dpr

@@ -1 +1 @@
 program dcomp;
 
+{$APPTYPE CONSOLE}
+
 uses
-  UCompiler, UTargetPHP, UAnalyzerPascal;
+  System.SysUtils,
+  UCompiler in 'Compiler\UCompiler.pas',
+  UTargetPHP in 'TargetPHP\UTargetPHP.pas',
+  UAnalyzerPascal in 'Compiler\UAnalyzerPascal.pas',
+  UAnalyzer in 'Compiler\UAnalyzer.pas',
+  UTarget in 'Compiler\UTarget.pas';
 
+type
+  TApplication = class
+    procedure Run;
+  end;
+
+{ TApplication }
+
+procedure TApplication.Run;
 var
   Compiler: TCompiler;
 begin
   Compiler := TCompiler.Create;
+  if ParamCount > 0 then
+    Compiler.MainSourceFile := ParamStr(1);
   Compiler.RegisterTarget(TTargetPHP);
   Compiler.RegisterAnalyzer(TAnalyzerPascal);
   Compiler.Compile;
-  Compiler.Free; 
+end;
+
+var
+  Application: TApplication;
+begin
+  try
+    Application := TApplication.Create;
+    Application.Run;
+    Application.Free;
+    ReadLn;
+    { TODO -oUser -cConsole Main : Insert code here }
+  except
+    on E: Exception do
+      Writeln(E.ClassName, ': ', E.Message);
+  end;
 end.
+