Changeset 75 for trunk/Compiler/Analyzer.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/Analyzer.pas (moved) (moved from trunk/Compiler/UAnalyzer.pas ) (7 diffs)

trunk/Compiler/Analyzer.pas

@@ -1 @@
-unit UAnalyzer;
-
-{$MODE Delphi}
-{$MACRO ON}
+unit Analyzer;
 
 interface
 
 uses
-  SysUtils, Variants, Classes, Contnrs,
-  Dialogs, USourceCodePascal, FileUtil, SpecializedList;
+  SysUtils, Variants, Classes, Dialogs, SourceCodePascal, FileUtil,
+  Generics.Collections;
 
 type
@@ -54 +51 @@
     CodePosition: TPoint;
     SourceCode2: string;
-    Tokens: TObjectList; // TObjectList<TToken>
+    Tokens: TObjectList<TToken>;
     TokenIndex: Integer;
     constructor Create;
@@ -83 +80 @@
   end;
 
-  { TListAnalyzer }
-
-  TListAnalyzer = class(TListObject)
+  { TAnalyzers }
+
+  TAnalyzers = class(TObjectList<TAnalyzer>)
     function SearchBySysName(Name: string): TAnalyzer;
     procedure LoadToStrings(Strings: TStrings);
@@ -93 +90 @@
   SExpectedButFound = 'Expected "%s" but "%s" found.';
 
+
 implementation
 
-{ TListAnalyzer }
-
-function TListAnalyzer.SearchBySysName(Name: string): TAnalyzer;
+{ TAnalyzers }
+
+function TAnalyzers.SearchBySysName(Name: string): TAnalyzer;
 var
   I: Integer;
@@ -107 +105 @@
 end;
 
-procedure TListAnalyzer.LoadToStrings(Strings: TStrings);
+procedure TAnalyzers.LoadToStrings(Strings: TStrings);
 var
   I: Integer;
@@ -154 +152 @@
 constructor TAnalyzer.Create;
 begin
-  Tokens := TObjectList.Create;
+  Tokens := TObjectList<TToken>.Create;
   {$IFDEF windows}
   LineEndingChar := LineEnding[1];
@@ -164 +162 @@
 destructor TAnalyzer.Destroy;
 begin
-  Tokens.Free;
-  inherited Destroy;
+  FreeAndNil(Tokens);
+  inherited;
 end;