Changeset 74 for trunk/Compiler/UCompiler.pas

Timestamp:

Jan 18, 2018, 11:54:13 PM (6 years ago)

Author:

chronos

Message:

• Fixed: Build under Lazarus 1.8.0.

File:

• trunk/Compiler/UCompiler.pas (modified) (6 diffs)

trunk/Compiler/UCompiler.pas

@@ -7 +7 @@
 uses
   SysUtils, Variants, Classes, Contnrs, FileUtil, UModularSystem, UCompilerAPI,
-  Dialogs, USourceCodePascal, UProducer, UAnalyzer, SpecializedList, UTarget;
+  Dialogs, USourceCodePascal, UProducer, UAnalyzer, SpecializedList, UTarget,
+  fgl;
 
 type
@@ -44 +45 @@
   public
     AbstractCode: TProgram;
-    ErrorMessages: TListObject; // TListObject<TErrorMessage>
+    ErrorMessages: TFPGObjectList<TErrorMessage>;
     CompiledFolder: string;
 
@@ -76 +77 @@
 resourcestring
   SNothingToAnalyze = 'Nothing to analyze';
-  SRewritingExistedTarget = 'Reqriting existing target file %s';
+  SRewritingExistedTarget = 'Rewriting existing target file %s';
 
 { TSourceFileManager }
@@ -99 +100 @@
 begin
   try
-    ForceDirectoriesUTF8(ExtractFileDir(FileName));
-    if FileExistsUTF8(FileName) then
+    ForceDirectories(ExtractFileDir(FileName));
+    if FileExists(FileName) then
       F := TFileStream.Create(UTF8Decode(FileName), fmOpenWrite)
       else F := TFileStream.Create(UTF8Decode(FileName), fmCreate);
@@ -118 +119 @@
   while (I < Files.Count) and (ExtractFileName(Files[I]) <> Name) do Inc(I);
   if I < Files.Count then begin
-    if FileExistsUTF8(Files[I]) then begin
+    if FileExists(Files[I]) then begin
       Content := LoadStringFromFile(Files[I]);
       Result := True;
@@ -172 +173 @@
   Executors := TListObject.Create;
   API := TCompilerAPI.Create;
+  API.Compiler := Self;
   AbstractCode := TProgram.Create;
-  ErrorMessages := TListObject.Create;
+  ErrorMessages := TFPGObjectList<TErrorMessage>.Create;
   CompiledFolder := 'Compiled';
   ModuleManager := TModuleManager.Create(nil);