feat: Adding TEntriesEnumerator

Author: gcarreno

utilities/script_builder/Common/scriptbuilder.common.pas

@@ -61,18 +61,19 @@ implementation
   cTestBash            = 'test_all.sh';
   cRunBash             = 'run_all.sh';
 
-  cLazbuild            = '%s -B "%s"';
+  cLazbuildDefault     = '%s -B "%s"';
   cLazbuildRelease     = '%s -B --bm="Release" "%s"';
 
   cReplaceName         = '[[name]]';
   cReplaceJSONResults  = '[[results-json]]';
   cReplaceEntryBinary  = '[[entry-binary]]';
   cReplaceEntryInput   = '[[input]]';
   cReplaceEntryThreads = '[[threads]]';
+
   cCompilerFPC         = 'fpc';
+  //  cCompilerDelphi      = 'delphi';
   cSSD                 = 'SSD';
   cHDD                 = 'HDD';
-//  cCompilerDelphi      = 'delphi';
 
 resourcestring
   rsEPatternsLengthDOntMatch = 'Patterns length does not match';
@@ -135,13 +136,15 @@ function TBuilder.StringsReplace(
 procedure TBuilder.BuildCompileScriptBash;
 var
   index: Integer;
+  //entry: TEntry;
   line: String;
 begin
   FScriptFile:= IncludeTrailingPathDelimiter(FConfig.RootFolder) + cCompileBash;
   FScriptStream:= TFileStream.Create(FScriptFile, fmCreate);
   try
     line:= '#!/bin/bash' + LineEnding + LineEnding;
     for index:= 0 to Pred(FConfig.Entries.Count) do
+    //for entry in FConfig.Entries do
     begin
       Write(GenerateProgressBar(index+1, FConfig.Entries.Count, 50), lineBreak);
       if FConfig.Entries[index].Compiler <> cCompilerFPC then continue;
@@ -164,7 +167,7 @@ procedure TBuilder.BuildCompileScriptBash;
       else
       begin
         line:= line  +
-        Format(cLazbuild, [
+        Format(cLazbuildDefault, [
           FConfig.Lazbuild,
           ExpandFileName(
             ConcatPaths([

utilities/script_builder/Common/scriptbuilder.data.entries.pas

@@ -31,7 +31,7 @@ interface
 //  ENodeStatusParamsWrongType = Exception;
 
 { TEntry }
-  TEntry = class
+  TEntry = class(TObject)
   private
     FName: String;
     FNotes: String;
@@ -85,7 +85,8 @@   TEntry = class
   end;
 
 { TEntries }
-  TEntries = class
+  TEntriesEnumerator = class; //Forward
+  TEntries = class(TObject)
   private
     FEntries: TFPObjectList;
 
@@ -103,15 +104,32 @@   TEntries = class
 
     destructor Destroy; override;
 
+    function GetEnumerator: TEntriesEnumerator;
+
     property Count: Integer
       read GetCount;
     property Items[Index: Integer]: TEntry
       read GetEntry
       write SetEntry; default;
   published
   end;
+  //TEntriesClass = class of TEntries;
+
+{ TEntriesEnumerator }
+  TEntriesEnumerator = class(TObject)
+  private
+    FEntries: TEntries;
+    FPosition: Integer;
+  protected
+  public
+    constructor Create(const AEntries: TEntries);
+    function GetCurrent: TEntry;
+    function MoveNext: Boolean;
 
-{ TEntriesIterator }
+    property Current: TEntry
+      read GetCurrent;
+  published
+  end;
 
 implementation
 
@@ -234,4 +252,28 @@ destructor TEntries.Destroy;
   inherited Destroy;
 end;
 
+function TEntries.GetEnumerator: TEntriesEnumerator;
+begin
+    Result:= TEntriesEnumerator.Create(Self);
+end;
+
+{ TEntriesEnumerator }
+
+constructor TEntriesEnumerator.Create(const AEntries: TEntries);
+begin
+  FEntries := AEntries;
+  FPosition := -1;
+end;
+
+function TEntriesEnumerator.GetCurrent: TEntry;
+begin
+  Result:= FEntries.Items[FPosition] as TEntry;
+end;
+
+function TEntriesEnumerator.MoveNext: Boolean;
+begin
+  Inc(FPosition);
+  Result := FPosition < FEntries.Count;
+end;
+
 end.