optimizations

Author: sglienke

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

@@ -523,6 +523,7 @@       TValueCollection = class(TEnumerableBase<TValue>,
   {$ENDREGION}
 
   {$REGION 'Implements IMap<TKey, TValue>'}
+    procedure Add(const key: TKey; const value: TValue); overload;
     function TryAdd(const key: TKey; const value: TValue): Boolean;
     function Remove(const key: TKey): Boolean; overload;
     function Remove(const key: TKey; const value: TValue): Boolean; overload;
@@ -2340,6 +2341,21 @@ destructor TSortedDictionary<TKey, TValue>.Destroy;
   inherited Destroy;
 end;
 
+procedure TSortedDictionary<TKey, TValue>.Add(const key: TKey;
+  const value: TValue);
+begin
+  if fTree.Add(key, value) then
+  begin
+    IncUnchecked(fVersion);
+    if Assigned(Notify) then
+      DoNotify(key, value, caAdded);
+    KeyChanged(key, caAdded);
+    ValueChanged(value, caAdded);
+  end
+  else
+    raise Error.DuplicateKey;
+end;
+
 procedure TSortedDictionary<TKey, TValue>.AddOrSetValue(const key: TKey;
   const value: TValue);
 begin

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

@@ -118,27 +118,26 @@ function THashTable.Add(const key; hashCode: Integer): Pointer;
   entry: THashTableEntry;
 begin
   entry.HashCode := hashCode;
-  if not Find(key, entry) then
+
+  if Find(key, entry) then
+    Exit(nil);
+
+  if fItemCount = DynArrayLength(fItems) then
   begin
-    if fItemCount = DynArrayLength(fItems) then
-    begin
-      Grow;
-      Find(key, entry);
-    end;
+    Grow;
+    Find(key, entry);
+  end;
 
-    {$Q-}
-    Inc(fVersion);
-    {$IFDEF OVERFLOWCHECKS_ON}{$Q+}{$ENDIF}
-    fBuckets[entry.BucketIndex] := entry.ItemIndex or (entry.HashCode and fBucketHashCodeMask);
+  {$Q-}
+  Inc(fVersion);
+  {$IFDEF OVERFLOWCHECKS_ON}{$Q+}{$ENDIF}
+  fBuckets[entry.BucketIndex] := entry.ItemIndex or (entry.HashCode and fBucketHashCodeMask);
 
-    Result := fItems + entry.ItemIndex * fItemSize;
-    PInteger(Result)^ := entry.HashCode;
+  Inc(fCount);
+  Inc(fItemCount);
 
-    Inc(fCount);
-    Inc(fItemCount);
-  end
-  else
-    Result := nil;
+  Result := fItems + entry.ItemIndex * fItemSize;
+  PInteger(Result)^ := entry.HashCode;
 end;
 
 function THashTable.AddOrSet(const key; hashCode: Integer;

Source/Base/Spring.pas

@@ -3621,7 +3621,9 @@ function VarArrayLength(const value: Variant; dim: Integer): Integer;
 
 function GetVirtualMethod(const classType: TClass; const index: Integer): Pointer;
 begin
+  {$Q-}
   Result := PPointer(IntPtr(classType) + IntPtr(index * SizeOf(Pointer)))^;
+  {$IFDEF OVERFLOWCHECKS_ON}{$Q+}{$ENDIF}
 end;
 
 type