Merge branch 'develop' of https://bitbucket.org/sglienke/spring4d into develop

Author: vincentparrett

Packages/Delphi11/Spring.Base.dproj

@@ -4,7 +4,7 @@
         <MainSource>Spring.Base.dpk</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>3</TargetedPlatforms>
+        <TargetedPlatforms>131</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>None</FrameworkType>
         <ProjectVersion>19.3</ProjectVersion>
@@ -201,6 +201,7 @@
                 <Excluded_Packages/>
             </Delphi.Personality>
             <Platforms>
+                <Platform value="Linux64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>

Packages/Delphi11/Spring.Core.dproj

@@ -4,7 +4,7 @@
         <MainSource>Spring.Core.dpk</MainSource>
         <Base>True</Base>
         <Config Condition="'$(Config)'==''">Debug</Config>
-        <TargetedPlatforms>3</TargetedPlatforms>
+        <TargetedPlatforms>131</TargetedPlatforms>
         <AppType>Package</AppType>
         <FrameworkType>None</FrameworkType>
         <ProjectVersion>19.3</ProjectVersion>
@@ -170,6 +170,7 @@
                 <Excluded_Packages/>
             </Delphi.Personality>
             <Platforms>
+                <Platform value="Linux64">True</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>

Packages/Delphi11/Spring.Data.dproj

@@ -135,6 +135,7 @@
                 <Excluded_Packages/>
             </Delphi.Personality>
             <Platforms>
+                <Platform value="Linux64">False</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>

Packages/Delphi11/Spring.Extensions.dproj

@@ -150,6 +150,7 @@
                 <Excluded_Packages/>
             </Delphi.Personality>
             <Platforms>
+                <Platform value="Linux64">False</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>

Packages/Delphi11/Spring.Persistence.dproj

@@ -174,6 +174,7 @@
                 <Excluded_Packages/>
             </Delphi.Personality>
             <Platforms>
+                <Platform value="Linux64">False</Platform>
                 <Platform value="Win32">True</Platform>
                 <Platform value="Win64">True</Platform>
             </Platforms>

Source/Base/Collections/Spring.Collections.Base.pas

@@ -185,6 +185,8 @@   TEnumerableBase<T> = class abstract(TEnumerableBase)
     function Min(const comparer: IComparer<T>): T; overload;
     function Min(const comparer: TComparison<T>): T; overload;
 
+    function Memoize: IEnumerable<T>;
+
     function Ordered: IEnumerable<T>; overload;
     function Ordered(const comparer: IComparer<T>): IEnumerable<T>; overload;
     function Ordered(const comparer: TComparison<T>): IEnumerable<T>; overload;
@@ -260,7 +262,7 @@   TCollectionWrapper = class(TEnumerableWrapper, ICollection)
 
   TIteratorKind = (
     Partition, &Array,
-    Concat, Ordered, Reversed, Shuffled,
+    Concat, Memoize, Ordered, Reversed, Shuffled,
     SkipWhile, SkipWhileIndex,
     TakeWhile, TakeWhileIndex,
     Where, WhereIndex, Select);
@@ -292,6 +294,7 @@   TIteratorBlock = record
 
     function GetEnumerator: Boolean;
     function GetEnumeratorAndSkip: Boolean;
+    function GetEnumeratorMemoize: Boolean;
 
     function _Release: Integer; stdcall;
     function MoveNext: Boolean;
@@ -309,6 +312,15 @@   TIteratorBase = record
     function GetCountFast: Integer;
   end;
 
+  TMemoizeIterator<T> = record
+    // only used via pointer internally
+    // field layout has to match with TIteratorBase
+    Source: IEnumerable;
+    Enumerator: IEnumerator<T>;
+    Items: TArray<T>;
+    Index, Count: Integer;
+  end;
+
   TIteratorBase<T> = class abstract(TEnumerableBase<T>)
   private
     function HasLimit: Boolean; inline;
@@ -361,6 +373,7 @@   TIteratorBlock<T> = record
     function GetCurrent: T;
 
     function MoveNextConcat: Boolean;
+    function MoveNextMemoize: Boolean;
     function MoveNextOrdered: Boolean;
     function MoveNextReversed: Boolean;
     function MoveNextSkipWhile: Boolean;
@@ -1505,6 +1518,16 @@ function TEnumerableBase<T>.Min(const comparer: TComparison<T>): T;
   Result := IEnumerable<T>(this).Min(IComparer<T>(PPointer(@comparer)^));
 end;
 
+function TEnumerableBase<T>.Memoize: IEnumerable<T>;
+begin
+  if (GetInterfaceEntry(ICollectionOfTGuid) <> nil)
+    or (GetInterfaceEntry(IReadOnlyCollectionOfTGuid) <> nil) then
+    Result := IEnumerable<T>(this)
+  else
+    Result := TEnumerableIterator<T>.Create(IEnumerable<T>(this),
+      0, 0, nil, TIteratorKind.Memoize);
+end;
+
 function TEnumerableBase<T>.Ordered: IEnumerable<T>;
 begin
   Result := TEnumerableIterator<T>.Create(IEnumerable<T>(this),
@@ -1693,30 +1716,28 @@ function TEnumerableBase<T>.SkipWhile(
 end;
 
 function TEnumerableBase<T>.Sum: T;
-var
-  enumerator: IEnumerator<T>;
-  item: T;
 begin
-  Result := Default(T);
-  enumerator := IEnumerable<T>(this).GetEnumerator;
-  while enumerator.MoveNext do
-  begin
-    {$IFDEF RSP31615}
-    if IsManagedType(T) then
-      IEnumeratorInternal(enumerator).GetCurrent(item)
-    else
+  if TypeInfo(T) = TypeInfo(Integer) then
+    PInteger(@Result)^ := TEnumerable.Sum(IEnumerable<Integer>(this))
+  else if TypeInfo(T) = TypeInfo(Int64) then
+    PInt64(@Result)^ := TEnumerable.Sum(IEnumerable<Int64>(this))
+  else if TypeInfo(T) = TypeInfo(NativeInt) then
+    {$IFDEF CPU32BITS}
+    PInteger(@Result)^ := TEnumerable.Sum(IEnumerable<Integer>(this))
+    {$ELSE}
+    PInt64(@Result)^ := TEnumerable.Sum(IEnumerable<Int64>(this))
     {$ENDIF}
-    item := enumerator.Current;
-    case TType.Kind<T> of
-      tkInteger: PInteger(@Result)^ := PInteger(@Result)^ + PInteger(@item)^;
-      tkInt64: PInt64(@Result)^ := PInt64(@Result)^ + PInt64(@item)^;
-      tkFloat:
-      case GetTypeData(TypeInfo(T)).FloatType of
-        ftSingle: PSingle(@Result)^ := PSingle(@Result)^ + PSingle(@item)^;
-        ftDouble: PDouble(@Result)^ := PDouble(@Result)^ + PDouble(@item)^;
-      end;
-    end;
-  end;
+  else if TypeInfo(T) = TypeInfo(System.Single) then
+    PSingle(@Result)^ := TEnumerable.Sum(IEnumerable<System.Single>(this))
+  else if TypeInfo(T) = TypeInfo(Double) then
+    PDouble(@Result)^ := TEnumerable.Sum(IEnumerable<Double>(this))
+  else if TypeInfo(T) = TypeInfo(Currency) then
+    PCurrency(@Result)^ := TEnumerable.Sum(IEnumerable<Currency>(this))
+  else
+    // if T is not of any of the above types this way of calling Sum is not supported
+    // consider using TEnumerable.Sum with a selector function to turn the values
+    // to any of the supported types for calculating the sum
+    RaiseHelper.NotSupported;
 end;
 
 function TEnumerableBase<T>.Take(count: Integer): IEnumerable<T>;
@@ -3040,6 +3061,21 @@ function TIteratorBlock.GetEnumeratorAndSkip: Boolean;
   end;
 end;
 
+function TIteratorBlock.GetEnumeratorMemoize: Boolean;
+begin
+  if PIteratorBase(Predicate).fCount = 0 then
+  begin
+  {$IFDEF MSWINDOWS}
+    IEnumerableInternal(Source).GetEnumerator(IEnumerator(PIteratorBase(Predicate).fPredicate));
+  {$ELSE}
+    IEnumerator(PIteratorBase(Predicate).fPredicate) := Source.GetEnumerator;
+  {$ENDIF}
+    PIteratorBase(Predicate).fCount := PIteratorBase(Predicate).fCount or not CountMask;
+  end;
+  DoMoveNext := Methods.MoveNext;
+  Result := DoMoveNext(@Self);
+end;
+
 function TIteratorBlock.MoveNextEmpty: Boolean;
 begin
   Result := False;
@@ -3072,6 +3108,8 @@ class function TIteratorBlock<T>.Create(const iterator: TIteratorBase<T>): IEnum
     Count := iterator.fCount;
     Kind := iterator.fKind;
     Methods.Finalize := @TIteratorBlock<T>.Finalize;
+    if Kind = Memoize then
+      Pointer(Predicate) := @iterator.fSource;
   end;
   rec.InitMethods;
   rec.InitVtable;
@@ -3118,6 +3156,16 @@ procedure TIteratorBlock<T>.InitMethods;
       Methods.MoveNext := @TIteratorBlock<T>.MoveNextConcat;
       DoMoveNext := @TIteratorBlock.GetEnumerator;
     end;
+    TIteratorKind.Memoize:
+    begin
+      if Count = 0 then
+      begin
+        Methods.MoveNext := @TIteratorBlock<T>.MoveNextMemoize;
+        DoMoveNext := @TIteratorBlock.GetEnumeratorMemoize;
+      end
+      else
+        DoMoveNext := @TIteratorBlock<T>.MoveNextMemoize;
+    end;
     TIteratorKind.Ordered:
     begin
       Methods.MoveNext := @TIteratorBlock<T>.MoveNextOrdered;
@@ -3179,7 +3227,10 @@ function TIteratorBlock<T>.Finalize: Boolean;
 begin
   Enumerator := nil;
   Source := nil;
-  Predicate := nil;
+  if Kind <> Memoize then
+    Predicate := nil
+  else
+    Pointer(Predicate) := nil;
   Items := nil;
 {$IFDEF DELPHIXE7_UP}
   if IsManagedType(T) then
@@ -3227,7 +3278,7 @@ function TIteratorBlock<T>.MoveNextConcat: Boolean;
     {$IFDEF MSWINDOWS}
     IEnumerableInternal(Predicate).GetEnumerator(IEnumerator(Enumerator));
     {$ELSE}
-    Enumerator := IEnumerable(Predicate).GetEnumerator;
+    Enumerator := IEnumerable<T>(Predicate).GetEnumerator;
     {$ENDIF}
     Predicate := nil;
   until False;
@@ -3282,6 +3333,44 @@ function TIteratorBlock<T>.MoveNextIndexed: Boolean;
   end;
 end;
 
+function TIteratorBlock<T>.MoveNextMemoize: Boolean;
+var
+  iterator: ^TMemoizeIterator<T>;
+  count, capacity: NativeInt;
+begin
+  iterator := Pointer(Predicate);
+  count := iterator.Count and CountMask;
+  if Index >= count then
+  begin
+    if iterator.Enumerator = nil then
+      Exit(False);
+
+    if not iterator.Enumerator.MoveNext then
+    begin
+      iterator.Enumerator := nil;
+      Exit(False);
+    end;
+
+    capacity := DynArrayLength(iterator.Items);
+    if count >= capacity then
+    begin
+      capacity := GrowCapacity(capacity);
+      SetLength(iterator.Items, capacity);
+    end;
+    {$IF defined(DELPHIXE7_UP) and defined(MSWINDOWS)}
+    if IsManagedType(T) then
+      IEnumeratorInternal(iterator.Enumerator).GetCurrent(iterator.Items[count])
+    else
+    {$IFEND}
+    iterator.Items[count] := iterator.Enumerator.Current;
+    Inc(iterator.Count);
+  end;
+
+  Current := iterator.Items[Index];
+  Inc(Index);
+  Result := True;
+end;
+
 function TIteratorBlock<T>.MoveNextOrdered: Boolean;
 begin
   if Index < Count then
@@ -3416,12 +3505,10 @@ function TIteratorBlock<T>.MoveNextWhereIndex: Boolean;
 function TIteratorBlock<T>.ToArray: Boolean;
 begin
   Items := Source.ToArray;
-  Count := Length(Items);
+  Count := DynArrayLength(Items);
   case Kind of
     TIteratorKind.Ordered:
       TArray.Sort<T>(Items, IComparer<T>(Predicate));
-    TIteratorKind.Reversed:
-      Count := Length(Items);
     TIteratorKind.Shuffled:
       TArray.Shuffle<T>(Items, DynArrayHigh(Items));
   end;
@@ -3624,7 +3711,7 @@ function TIteratorBase<T>.ToArray: TArray<T>;
     TIteratorKind.Array:
     begin
       Result := fItems;
-      SetLength(Result, Length(Result));
+      SetLength(Result, DynArrayLength(Result));
       Exit;
     end;
     TIteratorKind.Ordered:
@@ -3810,7 +3897,7 @@ procedure TArrayIterator<T>.CopyTo(var values: TArray<T>; index: Integer);
 var
   count: Integer;
 begin
-  count := Length(fItems);
+  count := DynArrayLength(fItems);
   if count > 0 then
     if TType.IsManaged<T> then
       MoveManaged(@fItems[0], @values[index], TypeInfo(T), count)

Source/Base/Collections/Spring.Collections.Extensions.pas

@@ -235,7 +235,7 @@   TRangeIterator = class(TEnumerableBase<Integer>,
     TEnumerator = record
       Vtable: Pointer;
       RefCount: Integer;
-      fCurrent, fMax: Integer;
+      fCurrent, fEnd: Integer;
       function GetCurrent: Integer;
       function MoveNext: Boolean;
       function _Release: Integer; stdcall;
@@ -1559,8 +1559,8 @@ class function TRangeIterator.TEnumerator.Create(start, count: Integer): IEnumer
     RefCount := 1;
     {$Q-}
     fCurrent := start - 1;
+    fEnd := start + count;
     {$IFDEF OVERFLOWCHECKS_ON}{$Q+}{$ENDIF}
-    fMax := fCurrent + count;
   end;
 end;
 
@@ -1570,9 +1570,15 @@ function TRangeIterator.TEnumerator.GetCurrent: Integer;
 end;
 
 function TRangeIterator.TEnumerator.MoveNext: Boolean;
-begin
-  Result := fCurrent < fMax;
-  Inc(fCurrent, Byte(Result));
+var
+  current: Integer;
+begin
+  current := fCurrent;
+  {$Q-}
+  Inc(current);
+  {$IFDEF OVERFLOWCHECKS_ON}{$Q+}{$ENDIF}
+  fCurrent := current;
+  Result := current <> fEnd;
 end;
 
 function TRangeIterator.TEnumerator._Release: Integer;