chore: move immut/sparse_array to internal lib (moonbitlang#562)

* chore: move immut/sparse_array to internal lib * fix: pass moon test --enable-coverage * internal: move to internal/sparse_array/ * update --------- Co-authored-by: Hongbo Zhang <[email protected]>
yj-qin · Jun 17, 2024 · 4031acf · 4031acf
1 parent afb3459
commit 4031acf
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 308 deletions.
diff --git a/immut/hashmap/HAMT.mbt b/immut/hashmap/HAMT.mbt
@@ -16,13 +16,13 @@
 //
 // Hash-Array-Mapped-Trie (HAMT) is a persistent hash-table data structure.
 // It is a trie over the hash of keys (i.e. strings of binary digits)
-// 
+//
 // Every level in a HAMT can have up to 32 branches (5 digits),
 // so HAMT has a tree height of at most 7,
 // and is more efficient compared to most other tree data structures.
-// 
+//
 // HAMT uses bitmap-based sparse array to avoid space waste
-// 
+//
 // Some references:
 // - <https://handwiki.org/wiki/Hash%20array%20mapped%20trie>
 // - <https://lampwww.epfl.ch/papers/idealhashtrees.pdf>
@@ -32,7 +32,7 @@ enum Map[K, V] {
   Empty
   Leaf(K, V) // optimize for the case of no collision
   Collision(Bucket[K, V]) // use a list of buckets to resolve collision
-  Branch(SparseArray[Map[K, V]])
+  Branch(@sparse_array.SparseArray[Map[K, V]])
 }
 
 // The number of bits consumed at every [Branch] node
@@ -50,7 +50,7 @@ pub fn find[K : Eq + Hash, V](self : Map[K, V], key : K) -> V? {
     Empty, _ => None
     Leaf(key1, value), _ => if key == key1 { Some(value) } else { None }
     Collision(bucket), _ => bucket.find(key)
-    // get the first segment (lower 5 bits) of the hash value      
+    // get the first segment (lower 5 bits) of the hash value
     // inline the hot path of Sparse_array::op_get
     Branch(children), hash => {
       let idx = hash.land(segment_mask)
@@ -86,7 +86,7 @@ fn add_with_hash[K : Eq, V](
         hash.lsr(segment_length),
         value,
       )
-      Map::Branch(singleton(idx, child))
+      Map::Branch(@sparse_array.SparseArray::singleton(idx, child))
     }
   }
 

diff --git a/immut/hashmap/moon.pkg.json b/immut/hashmap/moon.pkg.json
@@ -2,7 +2,8 @@
   "import": [
     "moonbitlang/core/builtin",
     "moonbitlang/core/array",
-    "moonbitlang/core/coverage"
+    "moonbitlang/core/coverage",
+    "moonbitlang/core/immut/internal/sparse_array"
   ],
   "test-import" : [
     "moonbitlang/core/assertion",

diff --git a/immut/hashmap/sparse_array.mbt b/immut/hashmap/sparse_array.mbt
diff --git a/immut/hashset/HAMT.mbt b/immut/hashset/HAMT.mbt
@@ -16,13 +16,13 @@
 //
 // Hash-Array-Mapped-Trie (HAMT) is a persistent hash-table data structure.
 // It is a trie over the hash of keys (i.e. strings of binary digits)
-// 
+//
 // Every level in a HAMT can have up to 32 branches (5 digits),
 // so HAMT has a tree height of at most 7,
 // and is more efficient compared to most other tree data structures.
-// 
+//
 // HAMT uses bitmap-based sparse array to avoid space waste
-// 
+//
 // Some references:
 // - <https://handwiki.org/wiki/Hash%20array%20mapped%20trie>
 // - <https://lampwww.epfl.ch/papers/idealhashtrees.pdf>
@@ -32,7 +32,7 @@ enum Set[T] {
   Empty
   Leaf(T) // optimize for the case of no collision
   Collision(Bucket[T]) // use a list of buckets to resolve collision
-  Branch(SparseArray[Set[T]])
+  Branch(@sparse_array.SparseArray[Set[T]])
 }
 
 // The number of bits consumed at every [Branch] node
@@ -50,7 +50,7 @@ pub fn contain[T : Eq + Hash](self : Set[T], key : T) -> Bool {
     Empty, _ => false
     Leaf(key1), _ => key == key1
     Collision(bucket), _ => bucket.find(key)
-    // get the first segment (lower 5 bits) of the hash value      
+    // get the first segment (lower 5 bits) of the hash value
     // inline the hot path of Sparse_array::op_get
     Branch(children), hash => {
       let idx = hash.land(segment_mask)
@@ -80,7 +80,7 @@ fn add_with_hash[T : Eq](
         key,
         hash.lsr(segment_length),
       )
-      Set::Branch(singleton(idx, child))
+      Set::Branch(@sparse_array.SparseArray::singleton(idx, child))
     }
   }
 

diff --git a/immut/hashset/bitset.mbt b/immut/hashset/bitset.mbt
diff --git a/immut/hashset/bitset_test.mbt b/immut/hashset/bitset_test.mbt
diff --git a/immut/hashset/moon.pkg.json b/immut/hashset/moon.pkg.json
@@ -2,7 +2,8 @@
   "import": [
     "moonbitlang/core/builtin",
     "moonbitlang/core/array",
-    "moonbitlang/core/coverage"
+    "moonbitlang/core/coverage",
+    "moonbitlang/core/immut/internal/sparse_array"
   ],
   "test-import" : [
     "moonbitlang/core/assertion",

diff --git a/immut/hashset/sparse_array_test.mbt b/immut/hashset/sparse_array_test.mbt