Merge pull request #32 from AeneasVerif/son_arrays

Add support for arrays/slices and const generics

19 files changed, 503 insertions, 5 deletions

diff --git a/tests/lean/Array.lean b/tests/lean/Array.lean
new file mode 100644
index 00000000..277b63d9
--- /dev/null
+++ b/tests/lean/Array.lean
@@ -0,0 +1 @@
+import Array.Funs
diff --git a/tests/lean/Array/Funs.lean b/tests/lean/Array/Funs.lean
new file mode 100644
index 00000000..ad737dca
--- /dev/null
+++ b/tests/lean/Array/Funs.lean
@@ -0,0 +1,465 @@
+-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
+-- [array]: function definitions
+import Base
+import Array.Types
+open Primitives
+
+namespace array
+
+/- [array::array_to_shared_slice_]: forward function -/
+def array_to_shared_slice_
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) : Result (Slice T0) :=
+  Array.to_slice_shared T0 (Usize.ofInt 32) s
+
+/- [array::array_to_mut_slice_]: forward function -/
+def array_to_mut_slice_
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) : Result (Slice T0) :=
+  Array.to_slice_mut T0 (Usize.ofInt 32) s
+
+/- [array::array_to_mut_slice_]: backward function 0 -/
+def array_to_mut_slice__back
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) (ret0 : Slice T0) :
+  Result (Array T0 (Usize.ofInt 32))
+  :=
+  Array.to_slice_mut_back T0 (Usize.ofInt 32) s ret0
+
+/- [array::array_len]: forward function -/
+def array_len (T0 : Type) (s : Array T0 (Usize.ofInt 32)) : Result Usize :=
+  do
+    let s0 ← Array.to_slice_shared T0 (Usize.ofInt 32) s
+    let i := Slice.len T0 s0
+    Result.ret i
+
+/- [array::shared_array_len]: forward function -/
+def shared_array_len
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) : Result Usize :=
+  do
+    let s0 ← Array.to_slice_shared T0 (Usize.ofInt 32) s
+    let i := Slice.len T0 s0
+    Result.ret i
+
+/- [array::shared_slice_len]: forward function -/
+def shared_slice_len (T0 : Type) (s : Slice T0) : Result Usize :=
+  let i := Slice.len T0 s
+  Result.ret i
+
+/- [array::index_array_shared]: forward function -/
+def index_array_shared
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) (i : Usize) : Result T0 :=
+  Array.index_shared T0 (Usize.ofInt 32) s i
+
+/- [array::index_array_u32]: forward function -/
+def index_array_u32
+  (s : Array U32 (Usize.ofInt 32)) (i : Usize) : Result U32 :=
+  Array.index_shared U32 (Usize.ofInt 32) s i
+
+/- [array::index_array_generic]: forward function -/
+def index_array_generic
+  (N : Usize) (s : Array U32 N) (i : Usize) : Result U32 :=
+  Array.index_shared U32 N s i
+
+/- [array::index_array_generic_call]: forward function -/
+def index_array_generic_call
+  (N : Usize) (s : Array U32 N) (i : Usize) : Result U32 :=
+  index_array_generic N s i
+
+/- [array::index_array_copy]: forward function -/
+def index_array_copy (x : Array U32 (Usize.ofInt 32)) : Result U32 :=
+  Array.index_shared U32 (Usize.ofInt 32) x (Usize.ofInt 0)
+
+/- [array::index_mut_array]: forward function -/
+def index_mut_array
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) (i : Usize) : Result T0 :=
+  Array.index_mut T0 (Usize.ofInt 32) s i
+
+/- [array::index_mut_array]: backward function 0 -/
+def index_mut_array_back
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) (i : Usize) (ret0 : T0) :
+  Result (Array T0 (Usize.ofInt 32))
+  :=
+  Array.index_mut_back T0 (Usize.ofInt 32) s i ret0
+
+/- [array::index_slice]: forward function -/
+def index_slice (T0 : Type) (s : Slice T0) (i : Usize) : Result T0 :=
+  Slice.index_shared T0 s i
+
+/- [array::index_mut_slice]: forward function -/
+def index_mut_slice (T0 : Type) (s : Slice T0) (i : Usize) : Result T0 :=
+  Slice.index_mut T0 s i
+
+/- [array::index_mut_slice]: backward function 0 -/
+def index_mut_slice_back
+  (T0 : Type) (s : Slice T0) (i : Usize) (ret0 : T0) : Result (Slice T0) :=
+  Slice.index_mut_back T0 s i ret0
+
+/- [array::slice_subslice_shared_]: forward function -/
+def slice_subslice_shared_
+  (x : Slice U32) (y : Usize) (z : Usize) : Result (Slice U32) :=
+  Slice.subslice_shared U32 x (Range.mk y z)
+
+/- [array::slice_subslice_mut_]: forward function -/
+def slice_subslice_mut_
+  (x : Slice U32) (y : Usize) (z : Usize) : Result (Slice U32) :=
+  Slice.subslice_mut U32 x (Range.mk y z)
+
+/- [array::slice_subslice_mut_]: backward function 0 -/
+def slice_subslice_mut__back
+  (x : Slice U32) (y : Usize) (z : Usize) (ret0 : Slice U32) :
+  Result (Slice U32)
+  :=
+  Slice.subslice_mut_back U32 x (Range.mk y z) ret0
+
+/- [array::array_to_slice_shared_]: forward function -/
+def array_to_slice_shared_
+  (x : Array U32 (Usize.ofInt 32)) : Result (Slice U32) :=
+  Array.to_slice_shared U32 (Usize.ofInt 32) x
+
+/- [array::array_to_slice_mut_]: forward function -/
+def array_to_slice_mut_
+  (x : Array U32 (Usize.ofInt 32)) : Result (Slice U32) :=
+  Array.to_slice_mut U32 (Usize.ofInt 32) x
+
+/- [array::array_to_slice_mut_]: backward function 0 -/
+def array_to_slice_mut__back
+  (x : Array U32 (Usize.ofInt 32)) (ret0 : Slice U32) :
+  Result (Array U32 (Usize.ofInt 32))
+  :=
+  Array.to_slice_mut_back U32 (Usize.ofInt 32) x ret0
+
+/- [array::array_subslice_shared_]: forward function -/
+def array_subslice_shared_
+  (x : Array U32 (Usize.ofInt 32)) (y : Usize) (z : Usize) :
+  Result (Slice U32)
+  :=
+  Array.subslice_shared U32 (Usize.ofInt 32) x (Range.mk y z)
+
+/- [array::array_subslice_mut_]: forward function -/
+def array_subslice_mut_
+  (x : Array U32 (Usize.ofInt 32)) (y : Usize) (z : Usize) :
+  Result (Slice U32)
+  :=
+  Array.subslice_mut U32 (Usize.ofInt 32) x (Range.mk y z)
+
+/- [array::array_subslice_mut_]: backward function 0 -/
+def array_subslice_mut__back
+  (x : Array U32 (Usize.ofInt 32)) (y : Usize) (z : Usize) (ret0 : Slice U32) :
+  Result (Array U32 (Usize.ofInt 32))
+  :=
+  Array.subslice_mut_back U32 (Usize.ofInt 32) x (Range.mk y z) ret0
+
+/- [array::index_slice_0]: forward function -/
+def index_slice_0 (T0 : Type) (s : Slice T0) : Result T0 :=
+  Slice.index_shared T0 s (Usize.ofInt 0)
+
+/- [array::index_array_0]: forward function -/
+def index_array_0 (T0 : Type) (s : Array T0 (Usize.ofInt 32)) : Result T0 :=
+  Array.index_shared T0 (Usize.ofInt 32) s (Usize.ofInt 0)
+
+/- [array::index_index_array]: forward function -/
+def index_index_array
+  (s : Array (Array U32 (Usize.ofInt 32)) (Usize.ofInt 32)) (i : Usize)
+  (j : Usize) :
+  Result U32
+  :=
+  do
+    let a ←
+      Array.index_shared (Array U32 (Usize.ofInt 32)) (Usize.ofInt 32) s i
+    Array.index_shared U32 (Usize.ofInt 32) a j
+
+/- [array::update_update_array]: forward function -/
+def update_update_array
+  (s : Array (Array U32 (Usize.ofInt 32)) (Usize.ofInt 32)) (i : Usize)
+  (j : Usize) :
+  Result Unit
+  :=
+  do
+    let a ← Array.index_mut (Array U32 (Usize.ofInt 32)) (Usize.ofInt 32) s i
+    let a0 ← Array.index_mut_back U32 (Usize.ofInt 32) a j (U32.ofInt 0)
+    let _ ←
+      Array.index_mut_back (Array U32 (Usize.ofInt 32)) (Usize.ofInt 32) s i a0
+    Result.ret ()
+
+/- [array::array_local_deep_copy]: forward function -/
+def array_local_deep_copy (x : Array U32 (Usize.ofInt 32)) : Result Unit :=
+  Result.ret ()
+
+/- [array::take_array]: forward function -/
+def take_array (a : Array U32 (Usize.ofInt 2)) : Result Unit :=
+  Result.ret ()
+
+/- [array::take_array_borrow]: forward function -/
+def take_array_borrow (a : Array U32 (Usize.ofInt 2)) : Result Unit :=
+  Result.ret ()
+
+/- [array::take_slice]: forward function -/
+def take_slice (s : Slice U32) : Result Unit :=
+  Result.ret ()
+
+/- [array::take_mut_slice]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ()) -/
+def take_mut_slice (s : Slice U32) : Result (Slice U32) :=
+  Result.ret s
+
+/- [array::take_all]: forward function -/
+def take_all : Result Unit :=
+  do
+    let _ ←
+      take_array
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let _ ←
+      take_array_borrow
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let s ←
+      Array.to_slice_shared U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let _ ← take_slice s
+    let s0 ←
+      Array.to_slice_mut U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let s1 ← take_mut_slice s0
+    let _ ←
+      Array.to_slice_mut_back U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ]) s1
+    Result.ret ()
+
+/- [array::index_array]: forward function -/
+def index_array (x : Array U32 (Usize.ofInt 2)) : Result U32 :=
+  Array.index_shared U32 (Usize.ofInt 2) x (Usize.ofInt 0)
+
+/- [array::index_array_borrow]: forward function -/
+def index_array_borrow (x : Array U32 (Usize.ofInt 2)) : Result U32 :=
+  Array.index_shared U32 (Usize.ofInt 2) x (Usize.ofInt 0)
+
+/- [array::index_slice_u32_0]: forward function -/
+def index_slice_u32_0 (x : Slice U32) : Result U32 :=
+  Slice.index_shared U32 x (Usize.ofInt 0)
+
+/- [array::index_mut_slice_u32_0]: forward function -/
+def index_mut_slice_u32_0 (x : Slice U32) : Result U32 :=
+  Slice.index_shared U32 x (Usize.ofInt 0)
+
+/- [array::index_mut_slice_u32_0]: backward function 0 -/
+def index_mut_slice_u32_0_back (x : Slice U32) : Result (Slice U32) :=
+  do
+    let _ ← Slice.index_shared U32 x (Usize.ofInt 0)
+    Result.ret x
+
+/- [array::index_all]: forward function -/
+def index_all : Result U32 :=
+  do
+    let i ←
+      index_array
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let i0 ←
+      index_array
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let i1 ← i + i0
+    let i2 ←
+      index_array_borrow
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let i3 ← i1 + i2
+    let s ←
+      Array.to_slice_shared U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let i4 ← index_slice_u32_0 s
+    let i5 ← i3 + i4
+    let s0 ←
+      Array.to_slice_mut U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let i6 ← index_mut_slice_u32_0 s0
+    let i7 ← i5 + i6
+    let s1 ← index_mut_slice_u32_0_back s0
+    let _ ←
+      Array.to_slice_mut_back U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ]) s1
+    Result.ret i7
+
+/- [array::update_array]: forward function -/
+def update_array (x : Array U32 (Usize.ofInt 2)) : Result Unit :=
+  do
+    let _ ←
+      Array.index_mut_back U32 (Usize.ofInt 2) x (Usize.ofInt 0) (U32.ofInt 1)
+    Result.ret ()
+
+/- [array::update_array_mut_borrow]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ()) -/
+def update_array_mut_borrow
+  (x : Array U32 (Usize.ofInt 2)) : Result (Array U32 (Usize.ofInt 2)) :=
+  Array.index_mut_back U32 (Usize.ofInt 2) x (Usize.ofInt 0) (U32.ofInt 1)
+
+/- [array::update_mut_slice]: merged forward/backward function
+   (there is a single backward function, and the forward function returns ()) -/
+def update_mut_slice (x : Slice U32) : Result (Slice U32) :=
+  Slice.index_mut_back U32 x (Usize.ofInt 0) (U32.ofInt 1)
+
+/- [array::update_all]: forward function -/
+def update_all : Result Unit :=
+  do
+    let _ ←
+      update_array
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let x ←
+      update_array_mut_borrow
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let s ← Array.to_slice_mut U32 (Usize.ofInt 2) x
+    let s0 ← update_mut_slice s
+    let _ ← Array.to_slice_mut_back U32 (Usize.ofInt 2) x s0
+    Result.ret ()
+
+/- [array::range_all]: forward function -/
+def range_all : Result Unit :=
+  do
+    let s ←
+      Array.subslice_mut U32 (Usize.ofInt 4)
+        (Array.make U32 (Usize.ofInt 4) [
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0)
+          ]) (Range.mk (Usize.ofInt 1) (Usize.ofInt 3))
+    let s0 ← update_mut_slice s
+    let _ ←
+      Array.subslice_mut_back U32 (Usize.ofInt 4)
+        (Array.make U32 (Usize.ofInt 4) [
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0)
+          ]) (Range.mk (Usize.ofInt 1) (Usize.ofInt 3)) s0
+    Result.ret ()
+
+/- [array::deref_array_borrow]: forward function -/
+def deref_array_borrow (x : Array U32 (Usize.ofInt 2)) : Result U32 :=
+  Array.index_shared U32 (Usize.ofInt 2) x (Usize.ofInt 0)
+
+/- [array::deref_array_mut_borrow]: forward function -/
+def deref_array_mut_borrow (x : Array U32 (Usize.ofInt 2)) : Result U32 :=
+  Array.index_shared U32 (Usize.ofInt 2) x (Usize.ofInt 0)
+
+/- [array::deref_array_mut_borrow]: backward function 0 -/
+def deref_array_mut_borrow_back
+  (x : Array U32 (Usize.ofInt 2)) : Result (Array U32 (Usize.ofInt 2)) :=
+  do
+    let _ ← Array.index_shared U32 (Usize.ofInt 2) x (Usize.ofInt 0)
+    Result.ret x
+
+/- [array::take_array_t]: forward function -/
+def take_array_t (a : Array T (Usize.ofInt 2)) : Result Unit :=
+  Result.ret ()
+
+/- [array::non_copyable_array]: forward function -/
+def non_copyable_array : Result Unit :=
+  do
+    let _ ← take_array_t (Array.make T (Usize.ofInt 2) [ T.A, T.B ])
+    Result.ret ()
+
+/- [array::sum]: loop 0: forward function -/
+divergent def sum_loop (s : Slice U32) (sum0 : U32) (i : Usize) : Result U32 :=
+  let i0 := Slice.len U32 s
+  if i < i0
+  then
+    do
+      let i1 ← Slice.index_shared U32 s i
+      let sum1 ← sum0 + i1
+      let i2 ← i + (Usize.ofInt 1)
+      sum_loop s sum1 i2
+  else Result.ret sum0
+
+/- [array::sum]: forward function -/
+def sum (s : Slice U32) : Result U32 :=
+  sum_loop s (U32.ofInt 0) (Usize.ofInt 0)
+
+/- [array::sum2]: loop 0: forward function -/
+divergent def sum2_loop
+  (s : Slice U32) (s2 : Slice U32) (sum0 : U32) (i : Usize) : Result U32 :=
+  let i0 := Slice.len U32 s
+  if i < i0
+  then
+    do
+      let i1 ← Slice.index_shared U32 s i
+      let i2 ← Slice.index_shared U32 s2 i
+      let i3 ← i1 + i2
+      let sum1 ← sum0 + i3
+      let i4 ← i + (Usize.ofInt 1)
+      sum2_loop s s2 sum1 i4
+  else Result.ret sum0
+
+/- [array::sum2]: forward function -/
+def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
+  let i := Slice.len U32 s
+  let i0 := Slice.len U32 s2
+  if not (i = i0)
+  then Result.fail Error.panic
+  else sum2_loop s s2 (U32.ofInt 0) (Usize.ofInt 0)
+
+/- [array::f0]: forward function -/
+def f0 : Result Unit :=
+  do
+    let s ←
+      Array.to_slice_mut U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 1), (U32.ofInt 2) ])
+    let s0 ← Slice.index_mut_back U32 s (Usize.ofInt 0) (U32.ofInt 1)
+    let _ ←
+      Array.to_slice_mut_back U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 1), (U32.ofInt 2) ]) s0
+    Result.ret ()
+
+/- [array::f1]: forward function -/
+def f1 : Result Unit :=
+  do
+    let _ ←
+      Array.index_mut_back U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 1), (U32.ofInt 2) ])
+        (Usize.ofInt 0) (U32.ofInt 1)
+    Result.ret ()
+
+/- [array::f2]: forward function -/
+def f2 (i : U32) : Result Unit :=
+  Result.ret ()
+
+/- [array::f4]: forward function -/
+def f4
+  (x : Array U32 (Usize.ofInt 32)) (y : Usize) (z : Usize) :
+  Result (Slice U32)
+  :=
+  Array.subslice_shared U32 (Usize.ofInt 32) x (Range.mk y z)
+
+/- [array::f3]: forward function -/
+def f3 : Result U32 :=
+  do
+    let i ←
+      Array.index_shared U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 1), (U32.ofInt 2) ])
+        (Usize.ofInt 0)
+    let _ ← f2 i
+    let s ←
+      Array.to_slice_shared U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 1), (U32.ofInt 2) ])
+    let s0 ←
+      f4
+        (Array.make U32 (Usize.ofInt 32) [
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0),
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0),
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0),
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0),
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0),
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0),
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0),
+          (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0), (U32.ofInt 0)
+          ]) (Usize.ofInt 16) (Usize.ofInt 18)
+    sum2 s s0
+
+/- [array::ite]: forward function -/
+def ite : Result Unit :=
+  do
+    let s ←
+      Array.to_slice_mut U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let s0 ←
+      Array.to_slice_mut U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ])
+    let s1 ← index_mut_slice_u32_0_back s0
+    let _ ←
+      Array.to_slice_mut_back U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ]) s1
+    let s2 ← index_mut_slice_u32_0_back s
+    let _ ←
+      Array.to_slice_mut_back U32 (Usize.ofInt 2)
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ]) s2
+    Result.ret ()
+
+end array
diff --git a/tests/lean/Array/Types.lean b/tests/lean/Array/Types.lean
new file mode 100644
index 00000000..72241276
--- /dev/null
+++ b/tests/lean/Array/Types.lean
@@ -0,0 +1,13 @@
+-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
+-- [array]: type definitions
+import Base
+open Primitives
+
+namespace array
+
+/- [array::T] -/
+inductive T :=
+| A : T
+| B : T
+
+end array
diff --git a/tests/lean/BetreeMain/Funs.lean b/tests/lean/BetreeMain/Funs.lean
index 142adf08..a6c6f496 100644
--- a/tests/lean/BetreeMain/Funs.lean
+++ b/tests/lean/BetreeMain/Funs.lean
@@ -4,6 +4,7 @@ import Base
 import BetreeMain.Types
 import BetreeMain.FunsExternal
 open Primitives
+
 namespace betree_main
 
 /- [betree_main::betree::load_internal_node]: forward function -/
diff --git a/tests/lean/BetreeMain/Types.lean b/tests/lean/BetreeMain/Types.lean
index 783ade64..c02c148a 100644
--- a/tests/lean/BetreeMain/Types.lean
+++ b/tests/lean/BetreeMain/Types.lean
@@ -2,6 +2,7 @@
 -- [betree_main]: type definitions
 import Base
 open Primitives
+
 namespace betree_main
 
 /- [betree_main::betree::List] -/
diff --git a/tests/lean/Constants.lean b/tests/lean/Constants.lean
index 4a5a7b8f..ec07d0fe 100644
--- a/tests/lean/Constants.lean
+++ b/tests/lean/Constants.lean
@@ -2,6 +2,7 @@
 -- [constants]
 import Base
 open Primitives
+
 namespace constants
 
 /- [constants::X0] -/
diff --git a/tests/lean/External/Funs.lean b/tests/lean/External/Funs.lean
index 674aaebd..055d7860 100644
--- a/tests/lean/External/Funs.lean
+++ b/tests/lean/External/Funs.lean
@@ -4,6 +4,7 @@ import Base
 import External.Types
 import External.FunsExternal
 open Primitives
+
 namespace external
 
 /- [external::swap]: forward function -/
diff --git a/tests/lean/External/Types.lean b/tests/lean/External/Types.lean
index ba984e2a..71d70eed 100644
--- a/tests/lean/External/Types.lean
+++ b/tests/lean/External/Types.lean
@@ -2,6 +2,7 @@
 -- [external]: type definitions
 import Base
 open Primitives
+
 namespace external
 
 /- [core::num::nonzero::NonZeroU32] -/
diff --git a/tests/lean/Hashmap/Funs.lean b/tests/lean/Hashmap/Funs.lean
index 870693b5..d6796932 100644
--- a/tests/lean/Hashmap/Funs.lean
+++ b/tests/lean/Hashmap/Funs.lean
@@ -3,6 +3,7 @@
 import Base
 import Hashmap.Types
 open Primitives
+
 namespace hashmap
 
 /- [hashmap::hash_key]: forward function -/
@@ -238,7 +239,7 @@ def HashMap.contains_key
     let hash ← hash_key key
     let i := Vec.len (List T) self.slots
     let hash_mod ← hash % i
-    let l ← Vec.index (List T) self.slots hash_mod
+    let l ← Vec.index_shared (List T) self.slots hash_mod
     HashMap.contains_key_in_list T key l
 
 /- [hashmap::HashMap::{0}::get_in_list]: loop 0: forward function -/
@@ -261,7 +262,7 @@ def HashMap.get (T : Type) (self : HashMap T) (key : Usize) : Result T :=
     let hash ← hash_key key
     let i := Vec.len (List T) self.slots
     let hash_mod ← hash % i
-    let l ← Vec.index (List T) self.slots hash_mod
+    let l ← Vec.index_shared (List T) self.slots hash_mod
     HashMap.get_in_list T key l
 
 /- [hashmap::HashMap::{0}::get_mut_in_list]: loop 0: forward function -/
diff --git a/tests/lean/Hashmap/Properties.lean b/tests/lean/Hashmap/Properties.lean
index 3652f608..ab95b854 100644
--- a/tests/lean/Hashmap/Properties.lean
+++ b/tests/lean/Hashmap/Properties.lean
@@ -284,6 +284,10 @@ def mk_opaque {α : Sort u} (x : α) : { y : α // y = x}  :=
 attribute [pp_dot] List.length -- use the dot notation when printing
 set_option pp.coercions false -- do not print coercions with ↑ (this doesn't parse)
 
+-- The proof below is a bit expensive, so we need to increase the maximum number
+-- of heart beats
+set_option maxHeartbeats 400000
+
 theorem insert_no_resize_spec {α : Type} (hm : HashMap α) (key : Usize) (value : α)
   (hinv : hm.inv) (hnsat : hm.lookup key = none → hm.len_s < Usize.max) :
   ∃ nhm, hm.insert_no_resize α key value = ret nhm  ∧
diff --git a/tests/lean/Hashmap/Types.lean b/tests/lean/Hashmap/Types.lean
index 6606cf9e..6455798d 100644
--- a/tests/lean/Hashmap/Types.lean
+++ b/tests/lean/Hashmap/Types.lean
@@ -2,6 +2,7 @@
 -- [hashmap]: type definitions
 import Base
 open Primitives
+
 namespace hashmap
 
 /- [hashmap::List] -/
diff --git a/tests/lean/HashmapMain/Funs.lean b/tests/lean/HashmapMain/Funs.lean
index 610bae46..74fe8a54 100644
--- a/tests/lean/HashmapMain/Funs.lean
+++ b/tests/lean/HashmapMain/Funs.lean
@@ -4,6 +4,7 @@ import Base
 import HashmapMain.Types
 import HashmapMain.FunsExternal
 open Primitives
+
 namespace hashmap_main
 
 /- [hashmap_main::hashmap::hash_key]: forward function -/
@@ -260,7 +261,7 @@ def hashmap.HashMap.contains_key
     let hash ← hashmap.hash_key key
     let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ← Vec.index (hashmap.List T) self.slots hash_mod
+    let l ← Vec.index_shared (hashmap.List T) self.slots hash_mod
     hashmap.HashMap.contains_key_in_list T key l
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_in_list]: loop 0: forward function -/
@@ -285,7 +286,7 @@ def hashmap.HashMap.get
     let hash ← hashmap.hash_key key
     let i := Vec.len (hashmap.List T) self.slots
     let hash_mod ← hash % i
-    let l ← Vec.index (hashmap.List T) self.slots hash_mod
+    let l ← Vec.index_shared (hashmap.List T) self.slots hash_mod
     hashmap.HashMap.get_in_list T key l
 
 /- [hashmap_main::hashmap::HashMap::{0}::get_mut_in_list]: loop 0: forward function -/
diff --git a/tests/lean/HashmapMain/Types.lean b/tests/lean/HashmapMain/Types.lean
index 3b3d0d7c..2b5cbd6c 100644
--- a/tests/lean/HashmapMain/Types.lean
+++ b/tests/lean/HashmapMain/Types.lean
@@ -2,6 +2,7 @@
 -- [hashmap_main]: type definitions
 import Base
 open Primitives
+
 namespace hashmap_main
 
 /- [hashmap_main::hashmap::List] -/
diff --git a/tests/lean/Loops/Funs.lean b/tests/lean/Loops/Funs.lean
index f7e6603d..5fbe200f 100644
--- a/tests/lean/Loops/Funs.lean
+++ b/tests/lean/Loops/Funs.lean
@@ -3,6 +3,7 @@
 import Base
 import Loops.Types
 open Primitives
+
 namespace loops
 
 /- [loops::sum]: loop 0: forward function -/
@@ -177,7 +178,7 @@ divergent def get_elem_shared_loop
 /- [loops::get_elem_shared]: forward function -/
 def get_elem_shared (slots : Vec (List Usize)) (x : Usize) : Result Usize :=
   do
-    let l ← Vec.index (List Usize) slots (Usize.ofInt 0)
+    let l ← Vec.index_shared (List Usize) slots (Usize.ofInt 0)
     get_elem_shared_loop x l
 
 /- [loops::id_mut]: forward function -/
diff --git a/tests/lean/Loops/Types.lean b/tests/lean/Loops/Types.lean
index f8bc193b..018af901 100644
--- a/tests/lean/Loops/Types.lean
+++ b/tests/lean/Loops/Types.lean
@@ -2,6 +2,7 @@
 -- [loops]: type definitions
 import Base
 open Primitives
+
 namespace loops
 
 /- [loops::List] -/
diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean
index bc707fd9..1a180c60 100644
--- a/tests/lean/NoNestedBorrows.lean
+++ b/tests/lean/NoNestedBorrows.lean
@@ -2,6 +2,7 @@
 -- [no_nested_borrows]
 import Base
 open Primitives
+
 namespace no_nested_borrows
 
 /- [no_nested_borrows::Pair] -/
diff --git a/tests/lean/Paper.lean b/tests/lean/Paper.lean
index cee7128a..c15c5e4b 100644
--- a/tests/lean/Paper.lean
+++ b/tests/lean/Paper.lean
@@ -2,6 +2,7 @@
 -- [paper]
 import Base
 open Primitives
+
 namespace paper
 
 /- [paper::ref_incr]: merged forward/backward function
diff --git a/tests/lean/PoloniusList.lean b/tests/lean/PoloniusList.lean
index 1453c275..07f206a8 100644
--- a/tests/lean/PoloniusList.lean
+++ b/tests/lean/PoloniusList.lean
@@ -2,6 +2,7 @@
 -- [polonius_list]
 import Base
 open Primitives
+
 namespace polonius_list
 
 /- [polonius_list::List] -/
diff --git a/tests/lean/lakefile.lean b/tests/lean/lakefile.lean
index ae63b129..cc63c48f 100644
--- a/tests/lean/lakefile.lean
+++ b/tests/lean/lakefile.lean
@@ -17,3 +17,4 @@ package «tests» {}
 @[default_target] lean_lib noNestedBorrows
 @[default_target] lean_lib paper
 @[default_target] lean_lib poloniusList
+@[default_target] lean_lib array