tweak

Author: bobzhang

immut/hashmap/HAMT.mbt

@@ -77,7 +77,7 @@ fn[K : Eq, V] Node::get_with_path(
       }
     (Branch(children), path) => {
       let idx = path.idx()
-      if children[idx] is Some(child) {
+      if children.get(idx) is Some(child) {
         continue (child, path.next())
       }
       None
@@ -140,7 +140,7 @@ fn[K : Eq, V] add_with_path(
       }
     Branch(children) => {
       let idx = path.idx()
-      match children[idx] {
+      match children.get(idx) {
         Some(child) => {
           let child = child.add_with_path(key, value, path.next())
           Branch(children.replace(idx, child))
@@ -322,7 +322,7 @@ fn[K : Eq, V] remove_with_path(
       }
     Branch(children) => {
       let idx = path.idx()
-      match children[idx] {
+      match children.get(idx) {
         None => Some(self)
         Some(child) => {
           let new_child = child.remove_with_path(key, path.next())

immut/hashset/HAMT.mbt

@@ -46,7 +46,7 @@ fn[A : Eq] Node::contains(self : Node[A], key : A, path : Path) -> Bool {
     (Flat(key1, path1), path) => path == path1 && key == key1
     (Branch(children), path) => {
       let idx = path.idx()
-      if children[idx] is Some(child) {
+      if children.get(idx) is Some(child) {
         continue (child, path.next())
       }
       false
@@ -93,7 +93,7 @@ fn[A : Eq] add_with_path(self : Node[A], key : A, path : Path) -> Node[A] {
       }
     Branch(children) => {
       let idx = path.idx()
-      match children[idx] {
+      match children.get(idx) {
         Some(child) => {
           let child = child.add_with_path(key, path.next())
           Branch(children.replace(idx, child))
@@ -147,7 +147,7 @@ fn[A : Eq] remove_with_path(self : Node[A], key : A, path : Path) -> Node[A]? {
       }
     Branch(children) => {
       let idx = path.idx()
-      match children[idx] {
+      match children.get(idx) {
         None => Some(self)
         Some(child) => {
           let new_child = child.remove_with_path(key, path.next())

immut/internal/sparse_array/README.mbt.md

@@ -17,7 +17,7 @@ test "sparse array basics" {
   inspect(single.size(), content="1")
   
   // Check if element exists
-  match single[5] {
+  match single.get(5) {
     Some(val) => inspect(val, content="value")
     None => inspect(false, content="true")
   }
@@ -49,7 +49,7 @@ test "sparse array operations" {
   inspect(removed.size(), content="1")
   
   // Check final value
-  match removed[3] {
+  match removed.get(3) {
     Some(val) => inspect(val, content="150")
     None => inspect(false, content="true")
   }
@@ -73,7 +73,7 @@ test "bitset operations" {
   inspect(with_more.size(), content="3")
   
   // Access elements by index
-  match with_more[3] {
+  match with_more.get(3) {
     Some(val) => inspect(val, content="test")
     None => inspect(false, content="true")
   }
@@ -120,7 +120,7 @@ test "sparse array transformations" {
   // Map values to new type
   let doubled = numbers.map(fn(x) { x * 2 })
   inspect(doubled.size(), content="2")
-  match doubled[1] {
+  match doubled.get(1) {
     Some(val) => inspect(val, content="20")
     None => inspect(false, content="true")
   }
@@ -148,7 +148,7 @@ test "sparse array combinations" {
   inspect(combined.size(), content="3")
   
   // Check combined values
-  match combined[3] {
+  match combined.get(3) {
     Some(val) => inspect(val, content="cC")  // Combined "c" + "C"
     None => inspect(false, content="true")
   }
@@ -168,13 +168,13 @@ test "advanced sparse operations" {
   inspect(extended.size(), content="4")
   
   // Access specific elements
-  match extended[10] {
+  match extended.get(10) {
     Some(val) => inspect(val, content="100")
     None => inspect(false, content="true")
   }
   
   // Check non-existent element
-  match extended[7] {
+  match extended.get(7) {
     Some(_) => inspect(false, content="true")
     None => inspect(true, content="true")  // Should be None
   }

immut/internal/sparse_array/pkg.generated.mbti

@@ -31,9 +31,9 @@ fn[X] SparseArray::add(Self[X], Int, X) -> Self[X]
 fn[X] SparseArray::difference(Self[X], Self[X], (X, X) -> X?) -> Self[X]?
 fn[X] SparseArray::each(Self[X], (X) -> Unit raise?) -> Unit raise?
 fn[X] SparseArray::filter(Self[X], (X) -> X? raise?) -> Self[X]? raise?
+fn[X] SparseArray::get(Self[X], Int) -> X?
 fn[X] SparseArray::intersection(Self[X], Self[X], (X, X) -> X? raise?) -> Self[X]? raise?
 fn[X, Y] SparseArray::map(Self[X], (X) -> Y raise?) -> Self[Y] raise?
-fn[X] SparseArray::op_get(Self[X], Int) -> X?
 fn[X] SparseArray::remove(Self[X], Int) -> Self[X]
 fn[X] SparseArray::replace(Self[X], Int, X) -> Self[X]
 fn[X] SparseArray::size(Self[X]) -> Int

immut/internal/sparse_array/sparse_array.mbt

@@ -32,7 +32,7 @@ pub fn[X] singleton(idx : Int, value : X) -> SparseArray[X] {
 }
 
 ///|
-pub fn[X] op_get(self : SparseArray[X], idx : Int) -> X? {
+pub fn[X] get(self : SparseArray[X], idx : Int) -> X? {
   if self.elem_info.has(idx) {
     Some(self.data[self.elem_info.index_of(idx)])
   } else {
@@ -115,10 +115,10 @@ pub fn[X] SparseArray::union(
   let data = FixedArray::make(union_elem_info.size(), self.data[0])
   for rest = union_elem_info, index = 0; rest != empty_bitset; {
     let idx = rest.first_idx()
-    data[index] = match self[idx] {
+    data[index] = match self.get(idx) {
       None => other.unsafe_get(idx)
       Some(value1) =>
-        match other[idx] {
+        match other.get(idx) {
           None => value1
           Some(value2) => f(value1, value2)
         }
@@ -180,7 +180,7 @@ pub fn[X] SparseArray::difference(
   for rest = self_elem_info, index = 0, elem_info = self_elem_info; rest !=
      empty_bitset; {
     let idx = rest.first_idx()
-    match other[idx] {
+    match other.get(idx) {
       None => {
         data[index] = self.unsafe_get(idx)
         continue rest.remove(idx), index + 1, elem_info

immut/internal/sparse_array/sparse_array_test.mbt

@@ -15,13 +15,25 @@
 ///|
 test "SparseArray" {
   let arr0 = @sparse_array.singleton(1, 1)
-  inspect([arr0[0], arr0[1], arr0[2]], content="[None, Some(1), None]")
+  inspect(
+    [arr0.get(0), arr0.get(1), arr0.get(2)],
+    content="[None, Some(1), None]",
+  )
   let arr1 = arr0.add(2, 2)
-  inspect([arr1[0], arr1[1], arr1[2]], content="[None, Some(1), Some(2)]")
+  inspect(
+    [arr1.get(0), arr1.get(1), arr1.get(2)],
+    content="[None, Some(1), Some(2)]",
+  )
   let arr2 = arr1.add(0, 0)
-  inspect([arr2[0], arr2[1], arr2[2]], content="[Some(0), Some(1), Some(2)]")
+  inspect(
+    [arr2.get(0), arr2.get(1), arr2.get(2)],
+    content="[Some(0), Some(1), Some(2)]",
+  )
   let arr3 = arr2.replace(1, 42)
-  inspect([arr3[0], arr3[1], arr3[2]], content="[Some(0), Some(42), Some(2)]")
+  inspect(
+    [arr3.get(0), arr3.get(1), arr3.get(2)],
+    content="[Some(0), Some(42), Some(2)]",
+  )
 }
 
 ///|
@@ -34,7 +46,15 @@ test "SparseArray::union" {
   let arr2 = @sparse_array.singleton(1, 10).add(2, 2).add(4, 40).add(31, 31)
   let arr3 = arr1.union(arr2, (_x, y) => y)
   inspect(
-    [arr3[0], arr3[1], arr3[2], arr3[3], arr3[4], arr3[5], arr3[31]],
+    [
+      arr3.get(0),
+      arr3.get(1),
+      arr3.get(2),
+      arr3.get(3),
+      arr3.get(4),
+      arr3.get(5),
+      arr3.get(31),
+    ],
     content="[Some(0), Some(10), Some(2), Some(3), Some(40), Some(5), Some(31)]",
   )
 }