added: CreateConflictsKValueEntry and the overload for AddOrUpdate wi…

…th Type with inlining the object initializer
dadhi · Mar 19, 2020 · ed0bbb3 · ed0bbb3
1 parent 8cdb5c1
commit ed0bbb3
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/src/ImTools/ImTools.Experimental.cs b/src/ImTools/ImTools.Experimental.cs
@@ -604,6 +604,7 @@ private ImMapTree<V> BalanceNewLeftTree(ImMapTree<V> newLeftTree)
                     new ImMapTree<V>(Entry, leftRightTree.Right, Right, rightHeight + 1),
                     leftLeftHeight + 2);
 
+                // Saving the old code to explaining what's happening in the new one
                 //return new ImMapTree<V>(leftRightTree.Entry,
                 //    new ImMapTree<V>(newLeftTree.Entry, leftLeftHeight, newLeftTree.Left, leftRightTree.Left),
                 //    new ImMapTree<V>(Entry, leftRightTree.Right, rightHeight, Right));
@@ -1432,30 +1433,31 @@ private static ImMap<KValue<K>> UpdateEntryOrAddOrUpdateConflict<K>(ImMap<KValue
             return map.UpdateEntryUnsafe(conflictsEntry);
         }
 
-        /// <summary>Efficiently creates the new entry</summary>
+        /// <summary>Creates the new entry</summary>
         [MethodImpl((MethodImplOptions)256)]
-        private static ImMapEntry<KValue<K>> CreateKValueEntry<K>(int hash, K key, object value)
-        {
-            var newEntry = new ImMapEntry<KValue<K>>(hash);
-            newEntry.Value.Key = key;
-            newEntry.Value.Value = value;
-            return newEntry;
-        }
+        private static ImMapEntry<KValue<K>> CreateKValueEntry<K>(int hash, K key, object value) => 
+            new ImMapEntry<KValue<K>>(hash) { Value = { Key = key, Value = value }};
 
-        /// <summary>Efficiently creates the new entry</summary>
+        /// <summary>Creates the new entry with the conflicts - the Key for the new entry is not set, but the value contains the actual conflict entries array</summary>
         [MethodImpl((MethodImplOptions)256)]
-        public static ImMapEntry<KValue<K>> CreateKValueEntry<K>(int hash, K key)
-        {
-            var newEntry = new ImMapEntry<KValue<K>>(hash);
-            newEntry.Value.Key = key;
-            return newEntry;
-        }
+        private static ImMapEntry<KValue<K>> CreateConflictsKValueEntry<K>(int hash, ImMapEntry<KValue<K>>[] conflicts) => 
+            new ImMapEntry<KValue<K>>(hash) { Value = { Value = conflicts }};
+
+        /// <summary>Creates the new entry</summary>
+        [MethodImpl((MethodImplOptions)256)]
+        public static ImMapEntry<KValue<K>> CreateKValueEntry<K>(int hash, K key) => 
+            new ImMapEntry<KValue<K>>(hash) { Value = { Key = key }};
 
         /// <summary>Uses the user provided hash and adds or updates the tree with passed key-value. Returns a new tree.</summary>
         [MethodImpl((MethodImplOptions)256)]
         public static ImMap<KValue<K>> AddOrUpdate<K>(this ImMap<KValue<K>> map, int hash, K key, object value) =>
             map.AddOrUpdate(hash, CreateKValueEntry(hash, key, value));
 
+        /// <summary>Adds or updates the tree with passed Type key and the value. Returns a new tree.</summary>
+        [MethodImpl((MethodImplOptions)256)]
+        public static ImMap<KValue<Type>> AddOrUpdate(this ImMap<KValue<Type>> map, Type key, object value) =>
+            map.AddOrUpdate(RuntimeHelpers.GetHashCode(key), key, value);
+
         /// <summary>Adds or updates the tree with passed key-value. Returns a new tree.</summary>
         [MethodImpl((MethodImplOptions)256)]
         public static ImMap<KValue<K>> AddOrUpdate<K>(this ImMap<KValue<K>> map, K key, object value) =>
@@ -1508,7 +1510,7 @@ private static ImMap<KValue<K>> UpdateEntryOrAddOrUpdateConflict<K>(ImMap<KValue
                 newConflicts = new[] { oldEntry, newEntry };
             }
 
-            return map.UpdateEntryUnsafe(CreateKValueEntry(hash, default(K), newConflicts));
+            return map.UpdateEntryUnsafe(CreateConflictsKValueEntry(hash, newConflicts));
         }
 
         /// <summary>Adds the new entry or keeps the current map if entry key is already present</summary>
@@ -1560,7 +1562,7 @@ private static ImMap<KValue<K>> AddOrKeepConflict<K>(ImMap<KValue<K>> map, int h
                 newConflicts = new[] { oldEntry, CreateKValueEntry(hash, key, value) };
             }
 
-            return map.UpdateEntryUnsafe(CreateKValueEntry(hash, default(K), newConflicts));
+            return map.UpdateEntryUnsafe(CreateConflictsKValueEntry(hash, newConflicts));
         }
 
         /// <summary>Updates the map with the new value if key is found, otherwise returns the same unchanged map.</summary>
@@ -1603,7 +1605,7 @@ private static ImMap<KValue<K>> UpdateEntryOrReturnSelf<K>(ImMap<KValue<K>> map,
                 return map;
             }
 
-            return map.UpdateEntryUnsafe(CreateKValueEntry(hash, default(K), newConflicts));
+            return map.UpdateEntryUnsafe(CreateConflictsKValueEntry(hash, newConflicts));
         }
 
         /// <summary>Updates the map with the default value if the key is found, otherwise returns the same unchanged map.</summary>