Changeset 75 for trunk/Compiler/Compiler.pas

Timestamp:

Jun 4, 2024, 12:22:49 AM (5 months ago)

Author:

chronos

Message:

• Modified: Removed U prefix from unit names.
• Modified: Updated Common package.

File:

• trunk/Compiler/Compiler.pas (moved) (moved from trunk/Compiler/UCompiler.pas ) (6 diffs)

trunk/Compiler/Compiler.pas

@@ -1 @@
-unit UCompiler;
-
-{$MODE Delphi}
+unit Compiler;
 
 interface
 
 uses
-  SysUtils, Variants, Classes, Contnrs, FileUtil, UModularSystem, UCompilerAPI,
-  Dialogs, USourceCodePascal, UProducer, UAnalyzer, SpecializedList, UTarget,
-  fgl;
+  SysUtils, Variants, Classes, FileUtil, ModularSystem, CompilerAPI,
+  Dialogs, SourceCodePascal, Producer, Analyzer, Generics.Collections, Target;
 
 type
@@ -20 +17 @@
 
   TSourceFileManager = class
-    Files: TListString;
+    Files: TStringList;
     function LoadStringFromFile(FileName: string): string;
     procedure SaveStringToFile(FileName: string; Content: string);
@@ -45 +42 @@
   public
     AbstractCode: TProgram;
-    ErrorMessages: TFPGObjectList<TErrorMessage>;
+    ErrorMessages: TObjectList<TErrorMessage>;
     CompiledFolder: string;
 
-    Targets: TListTarget;
-    Analyzers: TListAnalyzer;
-    Convertors: TListObject;
-    Executors: TListObject;
+    Targets: TTargets;
+    Analyzers: TAnalyzers;
+    Convertors: TObjectList<TObject>;
+    Executors: TObjectList<TObject>;
     API: TCompilerAPI;
     TargetFolder: string;
@@ -73 +70 @@
 
 uses
-  UAnalyzerPascal;
+  AnalyzerPascal;
 
 resourcestring
@@ -146 +143 @@
 constructor TSourceFileManager.Create;
 begin
-  Files := TListString.Create;
+  Files := TStringList.Create;
 end;
 
 destructor TSourceFileManager.Destroy;
 begin
-  Files.Free;
-  inherited Destroy;
+  FreeAndNil(Files);
+  inherited;
 end;
 
@@ -168 +165 @@
 constructor TCompiler.Create;
 begin
-  Targets := TListTarget.Create;
-  Analyzers := TListAnalyzer.Create;
-  Convertors := TListObject.Create;
-  Executors := TListObject.Create;
+  Targets := TTargets.Create;
+  Analyzers := TAnalyzers.Create;
+  Convertors := TObjectList<TObject>.Create;
+  Executors := TObjectList<TObject>.Create;
   API := TCompilerAPI.Create;
   API.Compiler := Self;
   AbstractCode := TProgram.Create;
-  ErrorMessages := TFPGObjectList<TErrorMessage>.Create;
+  ErrorMessages := TObjectList<TErrorMessage>.Create;
   CompiledFolder := 'Compiled';
   ModuleManager := TModuleManager.Create(nil);