Allow hashMap collisions to be located at any level

Abduqodiri Qurbonzoda · Abduqodiri Qurbonzoda · commit 01838db72269 · 2019-09-20T02:33:51.000+03:00
diff --git a/core/commonMain/src/implementations/immutableMap/PersistentHashMapBuilderContentIterators.kt b/core/commonMain/src/implementations/immutableMap/PersistentHashMapBuilderContentIterators.kt
@@ -79,7 +79,7 @@ internal abstract class PersistentHashMapBuilderBaseIterator<K, V, T>(private va
 
         val nodeIndex = node.nodeIndex(keyPositionMask)
         val targetNode = node.nodeAtIndex(nodeIndex)
-        if (shift == MAX_SHIFT) {   // collision
+        if (targetNode.isCollision()) {
             path[pathIndex].reset(node.buffer, node.buffer.size, 0)
             while (path[pathIndex].currentKey() != key) {
                 path[pathIndex].moveToNextKey()
diff --git a/core/commonMain/src/implementations/immutableMap/PersistentHashMapContentIterators.kt b/core/commonMain/src/implementations/immutableMap/PersistentHashMapContentIterators.kt
@@ -116,7 +116,7 @@ internal abstract class PersistentHashMapBaseIterator<K, V, T>(node: TrieNode<K,
         }
         if (path[pathIndex].hasNextNode()) {
             val node = path[pathIndex].currentNode()
-            if (pathIndex == TRIE_MAX_HEIGHT - 1) {     // collision
+            if (node.isCollision()) {
                 path[pathIndex + 1].reset(node.buffer, node.buffer.size)
             } else {
                 path[pathIndex + 1].reset(node.buffer, ENTRY_SIZE * node.entryCount())
diff --git a/core/commonMain/src/implementations/immutableMap/TrieNode.kt b/core/commonMain/src/implementations/immutableMap/TrieNode.kt

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ internal abstract class PersistentHashMapBaseIterator<K, V, T>(node: TrieNode<K,`
`116`	`116`	`}`
`117`	`117`	`if (path[pathIndex].hasNextNode()) {`
`118`	`118`	`val node = path[pathIndex].currentNode()`
`119`		`- if (pathIndex == TRIE_MAX_HEIGHT - 1) { // collision`
	`119`	`+ if (node.isCollision()) {`
`120`	`120`	`path[pathIndex + 1].reset(node.buffer, node.buffer.size)`
`121`	`121`	`} else {`
`122`	`122`	`path[pathIndex + 1].reset(node.buffer, ENTRY_SIZE * node.entryCount())`