From 63ee3b1bc65b67aeed843f052d7f67c9f3c0ab89 Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Fri, 2 Feb 2024 23:16:57 +0100
Subject: Start fixing the tests

---
 tests/lean/Array.lean           |   2 +-
 tests/lean/Constants.lean       |  36 +++++------
 tests/lean/NoNestedBorrows.lean |   4 +-
 tests/lean/Traits.lean          |   4 +-
 tests/lean/Tutorial.lean        |   2 +-
 tests/lean/lake-manifest.json   | 128 +++++++++++++++++++++++-----------------
 tests/lean/lean-toolchain       |   2 +-
 7 files changed, 98 insertions(+), 80 deletions(-)

(limited to 'tests/lean')

diff --git a/tests/lean/Array.lean b/tests/lean/Array.lean
index 7785a208..b49e30fb 100644
--- a/tests/lean/Array.lean
+++ b/tests/lean/Array.lean
@@ -452,7 +452,7 @@ def f3 : Result U32 :=
 /- [array::SZ]
    Source: 'src/array.rs', lines 286:0-286:19 -/
 def sz_body : Result Usize := Result.ret 32#usize
-def sz_c : Usize := eval_global sz_body (by simp)
+def sz_c : Usize := eval_global sz_body (by decide)
 
 /- [array::f5]:
    Source: 'src/array.rs', lines 289:0-289:31 -/
diff --git a/tests/lean/Constants.lean b/tests/lean/Constants.lean
index 2912805f..4c626ab3 100644
--- a/tests/lean/Constants.lean
+++ b/tests/lean/Constants.lean
@@ -8,17 +8,17 @@ namespace constants
 /- [constants::X0]
    Source: 'src/constants.rs', lines 5:0-5:17 -/
 def x0_body : Result U32 := Result.ret 0#u32
-def x0_c : U32 := eval_global x0_body (by simp)
+def x0_c : U32 := eval_global x0_body (by decide)
 
 /- [constants::X1]
    Source: 'src/constants.rs', lines 7:0-7:17 -/
 def x1_body : Result U32 := Result.ret core_u32_max
-def x1_c : U32 := eval_global x1_body (by simp)
+def x1_c : U32 := eval_global x1_body (by decide)
 
 /- [constants::X2]
    Source: 'src/constants.rs', lines 10:0-10:17 -/
 def x2_body : Result U32 := Result.ret 3#u32
-def x2_c : U32 := eval_global x2_body (by simp)
+def x2_c : U32 := eval_global x2_body (by decide)
 
 /- [constants::incr]:
    Source: 'src/constants.rs', lines 17:0-17:32 -/
@@ -28,7 +28,7 @@ def incr (n : U32) : Result U32 :=
 /- [constants::X3]
    Source: 'src/constants.rs', lines 15:0-15:17 -/
 def x3_body : Result U32 := incr 32#u32
-def x3_c : U32 := eval_global x3_body (by simp)
+def x3_c : U32 := eval_global x3_body (by decide)
 
 /- [constants::mk_pair0]:
    Source: 'src/constants.rs', lines 23:0-23:51 -/
@@ -49,22 +49,22 @@ def mk_pair1 (x : U32) (y : U32) : Result (Pair U32 U32) :=
 /- [constants::P0]
    Source: 'src/constants.rs', lines 31:0-31:24 -/
 def p0_body : Result (U32 × U32) := mk_pair0 0#u32 1#u32
-def p0_c : (U32 × U32) := eval_global p0_body (by simp)
+def p0_c : (U32 × U32) := eval_global p0_body (by decide)
 
 /- [constants::P1]
    Source: 'src/constants.rs', lines 32:0-32:28 -/
 def p1_body : Result (Pair U32 U32) := mk_pair1 0#u32 1#u32
-def p1_c : Pair U32 U32 := eval_global p1_body (by simp)
+def p1_c : Pair U32 U32 := eval_global p1_body (by decide)
 
 /- [constants::P2]
    Source: 'src/constants.rs', lines 33:0-33:24 -/
 def p2_body : Result (U32 × U32) := Result.ret (0#u32, 1#u32)
-def p2_c : (U32 × U32) := eval_global p2_body (by simp)
+def p2_c : (U32 × U32) := eval_global p2_body (by decide)
 
 /- [constants::P3]
    Source: 'src/constants.rs', lines 34:0-34:28 -/
 def p3_body : Result (Pair U32 U32) := Result.ret { x := 0#u32, y := 1#u32 }
-def p3_c : Pair U32 U32 := eval_global p3_body (by simp)
+def p3_c : Pair U32 U32 := eval_global p3_body (by decide)
 
 /- [constants::Wrap]
    Source: 'src/constants.rs', lines 49:0-49:18 -/
@@ -79,7 +79,7 @@ def Wrap.new (T : Type) (value : T) : Result (Wrap T) :=
 /- [constants::Y]
    Source: 'src/constants.rs', lines 41:0-41:22 -/
 def y_body : Result (Wrap I32) := Wrap.new I32 2#i32
-def y_c : Wrap I32 := eval_global y_body (by simp)
+def y_c : Wrap I32 := eval_global y_body (by decide)
 
 /- [constants::unwrap_y]:
    Source: 'src/constants.rs', lines 43:0-43:30 -/
@@ -89,12 +89,12 @@ def unwrap_y : Result I32 :=
 /- [constants::YVAL]
    Source: 'src/constants.rs', lines 47:0-47:19 -/
 def yval_body : Result I32 := unwrap_y
-def yval_c : I32 := eval_global yval_body (by simp)
+def yval_c : I32 := eval_global yval_body (by decide)
 
 /- [constants::get_z1::Z1]
    Source: 'src/constants.rs', lines 62:4-62:17 -/
 def get_z1_z1_body : Result I32 := Result.ret 3#i32
-def get_z1_z1_c : I32 := eval_global get_z1_z1_body (by simp)
+def get_z1_z1_c : I32 := eval_global get_z1_z1_body (by decide)
 
 /- [constants::get_z1]:
    Source: 'src/constants.rs', lines 61:0-61:28 -/
@@ -109,17 +109,17 @@ def add (a : I32) (b : I32) : Result I32 :=
 /- [constants::Q1]
    Source: 'src/constants.rs', lines 74:0-74:17 -/
 def q1_body : Result I32 := Result.ret 5#i32
-def q1_c : I32 := eval_global q1_body (by simp)
+def q1_c : I32 := eval_global q1_body (by decide)
 
 /- [constants::Q2]
    Source: 'src/constants.rs', lines 75:0-75:17 -/
 def q2_body : Result I32 := Result.ret q1_c
-def q2_c : I32 := eval_global q2_body (by simp)
+def q2_c : I32 := eval_global q2_body (by decide)
 
 /- [constants::Q3]
    Source: 'src/constants.rs', lines 76:0-76:17 -/
 def q3_body : Result I32 := add q2_c 3#i32
-def q3_c : I32 := eval_global q3_body (by simp)
+def q3_c : I32 := eval_global q3_body (by decide)
 
 /- [constants::get_z2]:
    Source: 'src/constants.rs', lines 70:0-70:28 -/
@@ -132,21 +132,21 @@ def get_z2 : Result I32 :=
 /- [constants::S1]
    Source: 'src/constants.rs', lines 80:0-80:18 -/
 def s1_body : Result U32 := Result.ret 6#u32
-def s1_c : U32 := eval_global s1_body (by simp)
+def s1_c : U32 := eval_global s1_body (by decide)
 
 /- [constants::S2]
    Source: 'src/constants.rs', lines 81:0-81:18 -/
 def s2_body : Result U32 := incr s1_c
-def s2_c : U32 := eval_global s2_body (by simp)
+def s2_c : U32 := eval_global s2_body (by decide)
 
 /- [constants::S3]
    Source: 'src/constants.rs', lines 82:0-82:29 -/
 def s3_body : Result (Pair U32 U32) := Result.ret p3_c
-def s3_c : Pair U32 U32 := eval_global s3_body (by simp)
+def s3_c : Pair U32 U32 := eval_global s3_body (by decide)
 
 /- [constants::S4]
    Source: 'src/constants.rs', lines 83:0-83:29 -/
 def s4_body : Result (Pair U32 U32) := mk_pair1 7#u32 8#u32
-def s4_c : Pair U32 U32 := eval_global s4_body (by simp)
+def s4_c : Pair U32 U32 := eval_global s4_body (by decide)
 
 end constants
diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean
index 0dd29429..bed71d94 100644
--- a/tests/lean/NoNestedBorrows.lean
+++ b/tests/lean/NoNestedBorrows.lean
@@ -139,12 +139,12 @@ def mix_arith_i32 (x : I32) (y : I32) (z : I32) : Result I32 :=
 /- [no_nested_borrows::CONST0]
    Source: 'src/no_nested_borrows.rs', lines 125:0-125:23 -/
 def const0_body : Result Usize := 1#usize + 1#usize
-def const0_c : Usize := eval_global const0_body (by simp)
+def const0_c : Usize := eval_global const0_body (by decide)
 
 /- [no_nested_borrows::CONST1]
    Source: 'src/no_nested_borrows.rs', lines 126:0-126:23 -/
 def const1_body : Result Usize := 2#usize * 2#usize
-def const1_c : Usize := eval_global const1_body (by simp)
+def const1_c : Usize := eval_global const1_body (by decide)
 
 /- [no_nested_borrows::cast_u32_to_i32]:
    Source: 'src/no_nested_borrows.rs', lines 128:0-128:37 -/
diff --git a/tests/lean/Traits.lean b/tests/lean/Traits.lean
index d32aba86..3ef4febc 100644
--- a/tests/lean/Traits.lean
+++ b/tests/lean/Traits.lean
@@ -249,7 +249,7 @@ def traits.ToTypetraitsBoolWrapperTInst (T : Type) (ToTypeBoolTInst : ToType
    Source: 'src/traits.rs', lines 164:4-164:21 -/
 def with_const_ty_len2_body : Result Usize := Result.ret 32#usize
 def with_const_ty_len2_c : Usize :=
-  eval_global with_const_ty_len2_body (by simp)
+  eval_global with_const_ty_len2_body (by decide)
 
 /- Trait declaration: [traits::WithConstTy]
    Source: 'src/traits.rs', lines 161:0-161:39 -/
@@ -264,7 +264,7 @@ structure WithConstTy (Self : Type) (LEN : Usize) where
 /- [traits::{bool#8}::LEN1]
    Source: 'src/traits.rs', lines 175:4-175:21 -/
 def bool_len1_body : Result Usize := Result.ret 12#usize
-def bool_len1_c : Usize := eval_global bool_len1_body (by simp)
+def bool_len1_c : Usize := eval_global bool_len1_body (by decide)
 
 /- [traits::{bool#8}::f]:
    Source: 'src/traits.rs', lines 180:4-180:39 -/
diff --git a/tests/lean/Tutorial.lean b/tests/lean/Tutorial.lean
index 840a606e..d92b2dd7 100644
--- a/tests/lean/Tutorial.lean
+++ b/tests/lean/Tutorial.lean
@@ -376,7 +376,7 @@ theorem i32_id_spec (x : I32) (h : 0 ≤ x.val) :
 --
 -- We first specify a decreasing value. Here, we state that [x], seen as a natural number,
 -- decreases at every recursive call.
-termination_by i32_id_spec x _ => x.val.toNat
+termination_by x.val.toNat
 -- And we now have to prove that it indeed decreases - you can skip this for now.
 decreasing_by
   -- We first need to "massage" the goal (in practice, all the proofs of [decreasing_by]
diff --git a/tests/lean/lake-manifest.json b/tests/lean/lake-manifest.json
index 5c20ec3b..e167e841 100644
--- a/tests/lean/lake-manifest.json
+++ b/tests/lean/lake-manifest.json
@@ -1,56 +1,74 @@
-{"version": 5,
- "packagesDir": "lake-packages",
+{"version": 7,
+ "packagesDir": ".lake/packages",
  "packages":
- [{"git":
-   {"url": "https://github.com/EdAyers/ProofWidgets4",
-    "subDir?": null,
-    "rev": "a0c2cd0ac3245a0dade4f925bcfa97e06dd84229",
-    "opts": {},
-    "name": "proofwidgets",
-    "inputRev?": "v0.0.13",
-    "inherited": true}},
-  {"path":
-   {"opts": {},
-    "name": "Base",
-    "inherited": false,
-    "dir": "./../../backends/lean"}},
-  {"git":
-   {"url": "https://github.com/mhuisi/lean4-cli.git",
-    "subDir?": null,
-    "rev": "21dac2e9cc7e3cf7da5800814787b833e680b2fd",
-    "opts": {},
-    "name": "Cli",
-    "inputRev?": "nightly",
-    "inherited": true}},
-  {"git":
-   {"url": "https://github.com/leanprover-community/mathlib4.git",
-    "subDir?": null,
-    "rev": "b639e46a19a0328adfb9b1fdf8cbe39dfc1de76b",
-    "opts": {},
-    "name": "mathlib",
-    "inputRev?": null,
-    "inherited": false}},
-  {"git":
-   {"url": "https://github.com/gebner/quote4",
-    "subDir?": null,
-    "rev": "e75daed95ad1c92af4e577fea95e234d7a8401c1",
-    "opts": {},
-    "name": "Qq",
-    "inputRev?": "master",
-    "inherited": true}},
-  {"git":
-   {"url": "https://github.com/JLimperg/aesop",
-    "subDir?": null,
-    "rev": "1a0cded2be292b5496e659b730d2accc742de098",
-    "opts": {},
-    "name": "aesop",
-    "inputRev?": "master",
-    "inherited": true}},
-  {"git":
-   {"url": "https://github.com/leanprover/std4",
-    "subDir?": null,
-    "rev": "ba5e5e3af519b4fc5221ad0fa4b2c87276f1d323",
-    "opts": {},
-    "name": "std",
-    "inputRev?": "main",
-    "inherited": true}}]}
+ [{"url": "https://github.com/leanprover/std4",
+   "type": "git",
+   "subDir": null,
+   "rev": "276953b13323ca151939eafaaec9129bf7970306",
+   "name": "std",
+   "manifestFile": "lake-manifest.json",
+   "inputRev": "main",
+   "inherited": true,
+   "configFile": "lakefile.lean"},
+  {"url": "https://github.com/leanprover-community/quote4",
+   "type": "git",
+   "subDir": null,
+   "rev": "1c88406514a636d241903e2e288d21dc6d861e01",
+   "name": "Qq",
+   "manifestFile": "lake-manifest.json",
+   "inputRev": "master",
+   "inherited": true,
+   "configFile": "lakefile.lean"},
+  {"url": "https://github.com/leanprover-community/aesop",
+   "type": "git",
+   "subDir": null,
+   "rev": "6beed82dcfbb7731d173cd517675df27d62ad0f4",
+   "name": "aesop",
+   "manifestFile": "lake-manifest.json",
+   "inputRev": "master",
+   "inherited": true,
+   "configFile": "lakefile.lean"},
+  {"url": "https://github.com/leanprover-community/ProofWidgets4",
+   "type": "git",
+   "subDir": null,
+   "rev": "af1e86cf7a37389632a02f4a111e6b501b2b818f",
+   "name": "proofwidgets",
+   "manifestFile": "lake-manifest.json",
+   "inputRev": "v0.0.27",
+   "inherited": true,
+   "configFile": "lakefile.lean"},
+  {"url": "https://github.com/leanprover/lean4-cli",
+   "type": "git",
+   "subDir": null,
+   "rev": "a751d21d4b68c999accb6fc5d960538af26ad5ec",
+   "name": "Cli",
+   "manifestFile": "lake-manifest.json",
+   "inputRev": "main",
+   "inherited": true,
+   "configFile": "lakefile.lean"},
+  {"url": "https://github.com/leanprover-community/import-graph.git",
+   "type": "git",
+   "subDir": null,
+   "rev": "8079d2d1d0e073bde42eab159c24f4c2d0d3a871",
+   "name": "importGraph",
+   "manifestFile": "lake-manifest.json",
+   "inputRev": "main",
+   "inherited": true,
+   "configFile": "lakefile.lean"},
+  {"url": "https://github.com/leanprover-community/mathlib4.git",
+   "type": "git",
+   "subDir": null,
+   "rev": "d04f8d39c0e47a0d73450b49f6c0665897cdcaf7",
+   "name": "mathlib",
+   "manifestFile": "lake-manifest.json",
+   "inputRev": null,
+   "inherited": false,
+   "configFile": "lakefile.lean"},
+  {"type": "path",
+   "name": "base",
+   "manifestFile": "lake-manifest.json",
+   "inherited": false,
+   "dir": "./../../backends/lean",
+   "configFile": "lakefile.lean"}],
+ "name": "Tests",
+ "lakeDir": ".lake"}
diff --git a/tests/lean/lean-toolchain b/tests/lean/lean-toolchain
index fbca4d37..cfcdd327 100644
--- a/tests/lean/lean-toolchain
+++ b/tests/lean/lean-toolchain
@@ -1 +1 @@
-leanprover/lean4:v4.0.0
\ No newline at end of file
+leanprover/lean4:v4.6.0-rc1
-- 
cgit v1.2.3


From 5cf7d9c0d6b0bc77f2219e7b8b29badce26d51e8 Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Fri, 2 Feb 2024 23:17:30 +0100
Subject: Make progress on fixing the tests

---
 tests/lean/lakefile.lean | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'tests/lean')

diff --git a/tests/lean/lakefile.lean b/tests/lean/lakefile.lean
index fef94971..502d8098 100644
--- a/tests/lean/lakefile.lean
+++ b/tests/lean/lakefile.lean
@@ -4,19 +4,19 @@ open Lake DSL
 require mathlib from git
   "https://github.com/leanprover-community/mathlib4.git"
 
-require Base from "../../backends/lean"
+require base from "../../backends/lean"
 
-package «tests» {}
+package «Tests» {}
 
-@[default_target] lean_lib tutorial
-@[default_target] lean_lib betreeMain
-@[default_target] lean_lib constants
-@[default_target] lean_lib external
-@[default_target] lean_lib hashmap
-@[default_target] lean_lib hashmapMain
-@[default_target] lean_lib loops
-@[default_target] lean_lib noNestedBorrows
-@[default_target] lean_lib paper
-@[default_target] lean_lib poloniusList
 @[default_target] lean_lib array
-@[default_target] lean_lib traits
+@[default_target] lean_lib Tutorial
+@[default_target] lean_lib BetreeMain
+@[default_target] lean_lib Constants
+@[default_target] lean_lib External
+@[default_target] lean_lib Hashmap
+@[default_target] lean_lib HashmapMain
+@[default_target] lean_lib Loops
+@[default_target] lean_lib NoNestedBorrows
+@[default_target] lean_lib Paper
+@[default_target] lean_lib PoloniusList
+@[default_target] lean_lib Traits
-- 
cgit v1.2.3


From 7ecf28dc36f724a4ab4b3b4976421e4e4c397f3b Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Fri, 2 Feb 2024 23:33:20 +0100
Subject: Rename and regenerate some files

---
 tests/lean/Array.lean       | 476 --------------------------------------------
 tests/lean/Array/Funs.lean  | 431 ---------------------------------------
 tests/lean/Array/Types.lean |  13 --
 tests/lean/Arrays.lean      | 476 ++++++++++++++++++++++++++++++++++++++++++++
 tests/lean/lakefile.lean    |   4 +-
 5 files changed, 478 insertions(+), 922 deletions(-)
 delete mode 100644 tests/lean/Array.lean
 delete mode 100644 tests/lean/Array/Funs.lean
 delete mode 100644 tests/lean/Array/Types.lean
 create mode 100644 tests/lean/Arrays.lean

(limited to 'tests/lean')

diff --git a/tests/lean/Array.lean b/tests/lean/Array.lean
deleted file mode 100644
index b49e30fb..00000000
--- a/tests/lean/Array.lean
+++ /dev/null
@@ -1,476 +0,0 @@
--- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
--- [array]
-import Base
-open Primitives
-
-namespace array
-
-/- [array::AB]
-   Source: 'src/array.rs', lines 3:0-3:11 -/
-inductive AB :=
-| A : AB
-| B : AB
-
-/- [array::incr]:
-   Source: 'src/array.rs', lines 8:0-8:24 -/
-def incr (x : U32) : Result U32 :=
-  x + 1#u32
-
-/- [array::array_to_shared_slice_]:
-   Source: 'src/array.rs', lines 16:0-16:53 -/
-def array_to_shared_slice_
-  (T : Type) (s : Array T 32#usize) : Result (Slice T) :=
-  Array.to_slice T 32#usize s
-
-/- [array::array_to_mut_slice_]:
-   Source: 'src/array.rs', lines 21:0-21:58 -/
-def array_to_mut_slice_
-  (T : Type) (s : Array T 32#usize) :
-  Result ((Slice T) × (Slice T → Result (Array T 32#usize)))
-  :=
-  do
-  let (s1, to_slice_mut_back) ← Array.to_slice_mut T 32#usize s
-  Result.ret (s1, to_slice_mut_back)
-
-/- [array::array_len]:
-   Source: 'src/array.rs', lines 25:0-25:40 -/
-def array_len (T : Type) (s : Array T 32#usize) : Result Usize :=
-  do
-  let s1 ← Array.to_slice T 32#usize s
-  let i := Slice.len T s1
-  Result.ret i
-
-/- [array::shared_array_len]:
-   Source: 'src/array.rs', lines 29:0-29:48 -/
-def shared_array_len (T : Type) (s : Array T 32#usize) : Result Usize :=
-  do
-  let s1 ← Array.to_slice T 32#usize s
-  let i := Slice.len T s1
-  Result.ret i
-
-/- [array::shared_slice_len]:
-   Source: 'src/array.rs', lines 33:0-33:44 -/
-def shared_slice_len (T : Type) (s : Slice T) : Result Usize :=
-  let i := Slice.len T s
-  Result.ret i
-
-/- [array::index_array_shared]:
-   Source: 'src/array.rs', lines 37:0-37:57 -/
-def index_array_shared
-  (T : Type) (s : Array T 32#usize) (i : Usize) : Result T :=
-  Array.index_usize T 32#usize s i
-
-/- [array::index_array_u32]:
-   Source: 'src/array.rs', lines 44:0-44:53 -/
-def index_array_u32 (s : Array U32 32#usize) (i : Usize) : Result U32 :=
-  Array.index_usize U32 32#usize s i
-
-/- [array::index_array_copy]:
-   Source: 'src/array.rs', lines 48:0-48:45 -/
-def index_array_copy (x : Array U32 32#usize) : Result U32 :=
-  Array.index_usize U32 32#usize x 0#usize
-
-/- [array::index_mut_array]:
-   Source: 'src/array.rs', lines 52:0-52:62 -/
-def index_mut_array
-  (T : Type) (s : Array T 32#usize) (i : Usize) :
-  Result (T × (T → Result (Array T 32#usize)))
-  :=
-  do
-  let (t, index_mut_back) ← Array.index_mut_usize T 32#usize s i
-  Result.ret (t, index_mut_back)
-
-/- [array::index_slice]:
-   Source: 'src/array.rs', lines 56:0-56:46 -/
-def index_slice (T : Type) (s : Slice T) (i : Usize) : Result T :=
-  Slice.index_usize T s i
-
-/- [array::index_mut_slice]:
-   Source: 'src/array.rs', lines 60:0-60:58 -/
-def index_mut_slice
-  (T : Type) (s : Slice T) (i : Usize) :
-  Result (T × (T → Result (Slice T)))
-  :=
-  do
-  let (t, index_mut_back) ← Slice.index_mut_usize T s i
-  Result.ret (t, index_mut_back)
-
-/- [array::slice_subslice_shared_]:
-   Source: 'src/array.rs', lines 64:0-64:70 -/
-def slice_subslice_shared_
-  (x : Slice U32) (y : Usize) (z : Usize) : Result (Slice U32) :=
-  core.slice.index.Slice.index U32 (core.ops.range.Range Usize)
-    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32) x
-    { start := y, end_ := z }
-
-/- [array::slice_subslice_mut_]:
-   Source: 'src/array.rs', lines 68:0-68:75 -/
-def slice_subslice_mut_
-  (x : Slice U32) (y : Usize) (z : Usize) :
-  Result ((Slice U32) × (Slice U32 → Result (Slice U32)))
-  :=
-  do
-  let (s, index_mut_back) ←
-    core.slice.index.Slice.index_mut U32 (core.ops.range.Range Usize)
-      (core.slice.index.SliceIndexRangeUsizeSliceTInst U32) x
-      { start := y, end_ := z }
-  Result.ret (s, index_mut_back)
-
-/- [array::array_to_slice_shared_]:
-   Source: 'src/array.rs', lines 72:0-72:54 -/
-def array_to_slice_shared_ (x : Array U32 32#usize) : Result (Slice U32) :=
-  Array.to_slice U32 32#usize x
-
-/- [array::array_to_slice_mut_]:
-   Source: 'src/array.rs', lines 76:0-76:59 -/
-def array_to_slice_mut_
-  (x : Array U32 32#usize) :
-  Result ((Slice U32) × (Slice U32 → Result (Array U32 32#usize)))
-  :=
-  do
-  let (s, to_slice_mut_back) ← Array.to_slice_mut U32 32#usize x
-  Result.ret (s, to_slice_mut_back)
-
-/- [array::array_subslice_shared_]:
-   Source: 'src/array.rs', lines 80:0-80:74 -/
-def array_subslice_shared_
-  (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
-  core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
-    (core.ops.index.IndexSliceTIInst U32 (core.ops.range.Range Usize)
-    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
-    { start := y, end_ := z }
-
-/- [array::array_subslice_mut_]:
-   Source: 'src/array.rs', lines 84:0-84:79 -/
-def array_subslice_mut_
-  (x : Array U32 32#usize) (y : Usize) (z : Usize) :
-  Result ((Slice U32) × (Slice U32 → Result (Array U32 32#usize)))
-  :=
-  do
-  let (s, index_mut_back) ←
-    core.array.Array.index_mut U32 (core.ops.range.Range Usize) 32#usize
-      (core.ops.index.IndexMutSliceTIInst U32 (core.ops.range.Range Usize)
-      (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
-      { start := y, end_ := z }
-  Result.ret (s, index_mut_back)
-
-/- [array::index_slice_0]:
-   Source: 'src/array.rs', lines 88:0-88:38 -/
-def index_slice_0 (T : Type) (s : Slice T) : Result T :=
-  Slice.index_usize T s 0#usize
-
-/- [array::index_array_0]:
-   Source: 'src/array.rs', lines 92:0-92:42 -/
-def index_array_0 (T : Type) (s : Array T 32#usize) : Result T :=
-  Array.index_usize T 32#usize s 0#usize
-
-/- [array::index_index_array]:
-   Source: 'src/array.rs', lines 103:0-103:71 -/
-def index_index_array
-  (s : Array (Array U32 32#usize) 32#usize) (i : Usize) (j : Usize) :
-  Result U32
-  :=
-  do
-  let a ← Array.index_usize (Array U32 32#usize) 32#usize s i
-  Array.index_usize U32 32#usize a j
-
-/- [array::update_update_array]:
-   Source: 'src/array.rs', lines 114:0-114:70 -/
-def update_update_array
-  (s : Array (Array U32 32#usize) 32#usize) (i : Usize) (j : Usize) :
-  Result Unit
-  :=
-  do
-  let (a, index_mut_back) ←
-    Array.index_mut_usize (Array U32 32#usize) 32#usize s i
-  let (_, index_mut_back1) ← Array.index_mut_usize U32 32#usize a j
-  let a1 ← index_mut_back1 0#u32
-  let _ ← index_mut_back a1
-  Result.ret ()
-
-/- [array::array_local_deep_copy]:
-   Source: 'src/array.rs', lines 118:0-118:43 -/
-def array_local_deep_copy (x : Array U32 32#usize) : Result Unit :=
-  Result.ret ()
-
-/- [array::take_array]:
-   Source: 'src/array.rs', lines 122:0-122:30 -/
-def take_array (a : Array U32 2#usize) : Result Unit :=
-  Result.ret ()
-
-/- [array::take_array_borrow]:
-   Source: 'src/array.rs', lines 123:0-123:38 -/
-def take_array_borrow (a : Array U32 2#usize) : Result Unit :=
-  Result.ret ()
-
-/- [array::take_slice]:
-   Source: 'src/array.rs', lines 124:0-124:28 -/
-def take_slice (s : Slice U32) : Result Unit :=
-  Result.ret ()
-
-/- [array::take_mut_slice]:
-   Source: 'src/array.rs', lines 125:0-125:36 -/
-def take_mut_slice (s : Slice U32) : Result (Slice U32) :=
-  Result.ret s
-
-/- [array::const_array]:
-   Source: 'src/array.rs', lines 127:0-127:32 -/
-def const_array : Result (Array U32 2#usize) :=
-  Result.ret (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-
-/- [array::const_slice]:
-   Source: 'src/array.rs', lines 131:0-131:20 -/
-def const_slice : Result Unit :=
-  do
-  let _ ←
-    Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  Result.ret ()
-
-/- [array::take_all]:
-   Source: 'src/array.rs', lines 141:0-141:17 -/
-def take_all : Result Unit :=
-  do
-  let _ ← take_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let _ ← take_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let _ ← take_array_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let s ←
-    Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let _ ← take_slice s
-  let (s1, to_slice_mut_back) ←
-    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let s2 ← take_mut_slice s1
-  let _ ← to_slice_mut_back s2
-  Result.ret ()
-
-/- [array::index_array]:
-   Source: 'src/array.rs', lines 155:0-155:38 -/
-def index_array (x : Array U32 2#usize) : Result U32 :=
-  Array.index_usize U32 2#usize x 0#usize
-
-/- [array::index_array_borrow]:
-   Source: 'src/array.rs', lines 158:0-158:46 -/
-def index_array_borrow (x : Array U32 2#usize) : Result U32 :=
-  Array.index_usize U32 2#usize x 0#usize
-
-/- [array::index_slice_u32_0]:
-   Source: 'src/array.rs', lines 162:0-162:42 -/
-def index_slice_u32_0 (x : Slice U32) : Result U32 :=
-  Slice.index_usize U32 x 0#usize
-
-/- [array::index_mut_slice_u32_0]:
-   Source: 'src/array.rs', lines 166:0-166:50 -/
-def index_mut_slice_u32_0 (x : Slice U32) : Result (U32 × (Slice U32)) :=
-  do
-  let i ← Slice.index_usize U32 x 0#usize
-  Result.ret (i, x)
-
-/- [array::index_all]:
-   Source: 'src/array.rs', lines 170:0-170:25 -/
-def index_all : Result U32 :=
-  do
-  let i ← index_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let i1 ← index_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let i2 ← i + i1
-  let i3 ← index_array_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let i4 ← i2 + i3
-  let s ←
-    Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let i5 ← index_slice_u32_0 s
-  let i6 ← i4 + i5
-  let (s1, to_slice_mut_back) ←
-    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let (i7, s2) ← index_mut_slice_u32_0 s1
-  let i8 ← i6 + i7
-  let _ ← to_slice_mut_back s2
-  Result.ret i8
-
-/- [array::update_array]:
-   Source: 'src/array.rs', lines 184:0-184:36 -/
-def update_array (x : Array U32 2#usize) : Result Unit :=
-  do
-  let (_, index_mut_back) ← Array.index_mut_usize U32 2#usize x 0#usize
-  let _ ← index_mut_back 1#u32
-  Result.ret ()
-
-/- [array::update_array_mut_borrow]:
-   Source: 'src/array.rs', lines 187:0-187:48 -/
-def update_array_mut_borrow
-  (x : Array U32 2#usize) : Result (Array U32 2#usize) :=
-  do
-  let (_, index_mut_back) ← Array.index_mut_usize U32 2#usize x 0#usize
-  index_mut_back 1#u32
-
-/- [array::update_mut_slice]:
-   Source: 'src/array.rs', lines 190:0-190:38 -/
-def update_mut_slice (x : Slice U32) : Result (Slice U32) :=
-  do
-  let (_, index_mut_back) ← Slice.index_mut_usize U32 x 0#usize
-  index_mut_back 1#u32
-
-/- [array::update_all]:
-   Source: 'src/array.rs', lines 194:0-194:19 -/
-def update_all : Result Unit :=
-  do
-  let _ ← update_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let _ ← update_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let a ← update_array_mut_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let (s, to_slice_mut_back) ← Array.to_slice_mut U32 2#usize a
-  let s1 ← update_mut_slice s
-  let _ ← to_slice_mut_back s1
-  Result.ret ()
-
-/- [array::range_all]:
-   Source: 'src/array.rs', lines 205:0-205:18 -/
-def range_all : Result Unit :=
-  do
-  let (s, index_mut_back) ←
-    core.array.Array.index_mut U32 (core.ops.range.Range Usize) 4#usize
-      (core.ops.index.IndexMutSliceTIInst U32 (core.ops.range.Range Usize)
-      (core.slice.index.SliceIndexRangeUsizeSliceTInst U32))
-      (Array.make U32 4#usize [ 0#u32, 0#u32, 0#u32, 0#u32 ])
-      { start := 1#usize, end_ := 3#usize }
-  let s1 ← update_mut_slice s
-  let _ ← index_mut_back s1
-  Result.ret ()
-
-/- [array::deref_array_borrow]:
-   Source: 'src/array.rs', lines 214:0-214:46 -/
-def deref_array_borrow (x : Array U32 2#usize) : Result U32 :=
-  Array.index_usize U32 2#usize x 0#usize
-
-/- [array::deref_array_mut_borrow]:
-   Source: 'src/array.rs', lines 219:0-219:54 -/
-def deref_array_mut_borrow
-  (x : Array U32 2#usize) : Result (U32 × (Array U32 2#usize)) :=
-  do
-  let i ← Array.index_usize U32 2#usize x 0#usize
-  Result.ret (i, x)
-
-/- [array::take_array_t]:
-   Source: 'src/array.rs', lines 227:0-227:31 -/
-def take_array_t (a : Array AB 2#usize) : Result Unit :=
-  Result.ret ()
-
-/- [array::non_copyable_array]:
-   Source: 'src/array.rs', lines 229:0-229:27 -/
-def non_copyable_array : Result Unit :=
-  do
-  let _ ← take_array_t (Array.make AB 2#usize [ AB.A, AB.B ])
-  Result.ret ()
-
-/- [array::sum]: loop 0:
-   Source: 'src/array.rs', lines 242:0-250:1 -/
-divergent def sum_loop (s : Slice U32) (sum1 : U32) (i : Usize) : Result U32 :=
-  let i1 := Slice.len U32 s
-  if i < i1
-  then
-    do
-    let i2 ← Slice.index_usize U32 s i
-    let sum3 ← sum1 + i2
-    let i3 ← i + 1#usize
-    sum_loop s sum3 i3
-  else Result.ret sum1
-
-/- [array::sum]:
-   Source: 'src/array.rs', lines 242:0-242:28 -/
-def sum (s : Slice U32) : Result U32 :=
-  sum_loop s 0#u32 0#usize
-
-/- [array::sum2]: loop 0:
-   Source: 'src/array.rs', lines 252:0-261:1 -/
-divergent def sum2_loop
-  (s : Slice U32) (s2 : Slice U32) (sum1 : U32) (i : Usize) : Result U32 :=
-  let i1 := Slice.len U32 s
-  if i < i1
-  then
-    do
-    let i2 ← Slice.index_usize U32 s i
-    let i3 ← Slice.index_usize U32 s2 i
-    let i4 ← i2 + i3
-    let sum3 ← sum1 + i4
-    let i5 ← i + 1#usize
-    sum2_loop s s2 sum3 i5
-  else Result.ret sum1
-
-/- [array::sum2]:
-   Source: 'src/array.rs', lines 252:0-252:41 -/
-def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
-  let i := Slice.len U32 s
-  let i1 := Slice.len U32 s2
-  if not (i = i1)
-  then Result.fail .panic
-  else sum2_loop s s2 0#u32 0#usize
-
-/- [array::f0]:
-   Source: 'src/array.rs', lines 263:0-263:11 -/
-def f0 : Result Unit :=
-  do
-  let (s, to_slice_mut_back) ←
-    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
-  let (_, index_mut_back) ← Slice.index_mut_usize U32 s 0#usize
-  let s1 ← index_mut_back 1#u32
-  let _ ← to_slice_mut_back s1
-  Result.ret ()
-
-/- [array::f1]:
-   Source: 'src/array.rs', lines 268:0-268:11 -/
-def f1 : Result Unit :=
-  do
-  let (_, index_mut_back) ←
-    Array.index_mut_usize U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
-      0#usize
-  let _ ← index_mut_back 1#u32
-  Result.ret ()
-
-/- [array::f2]:
-   Source: 'src/array.rs', lines 273:0-273:17 -/
-def f2 (i : U32) : Result Unit :=
-  Result.ret ()
-
-/- [array::f4]:
-   Source: 'src/array.rs', lines 282:0-282:54 -/
-def f4 (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
-  core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
-    (core.ops.index.IndexSliceTIInst U32 (core.ops.range.Range Usize)
-    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
-    { start := y, end_ := z }
-
-/- [array::f3]:
-   Source: 'src/array.rs', lines 275:0-275:18 -/
-def f3 : Result U32 :=
-  do
-  let i ←
-    Array.index_usize U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
-      0#usize
-  let _ ← f2 i
-  let b := Array.repeat U32 32#usize 0#u32
-  let s ←
-    Array.to_slice U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
-  let s1 ← f4 b 16#usize 18#usize
-  sum2 s s1
-
-/- [array::SZ]
-   Source: 'src/array.rs', lines 286:0-286:19 -/
-def sz_body : Result Usize := Result.ret 32#usize
-def sz_c : Usize := eval_global sz_body (by decide)
-
-/- [array::f5]:
-   Source: 'src/array.rs', lines 289:0-289:31 -/
-def f5 (x : Array U32 32#usize) : Result U32 :=
-  Array.index_usize U32 32#usize x 0#usize
-
-/- [array::ite]:
-   Source: 'src/array.rs', lines 294:0-294:12 -/
-def ite : Result Unit :=
-  do
-  let (s, to_slice_mut_back) ←
-    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let (_, s1) ← index_mut_slice_u32_0 s
-  let (s2, to_slice_mut_back1) ←
-    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-  let (_, s3) ← index_mut_slice_u32_0 s2
-  let _ ← to_slice_mut_back1 s3
-  let _ ← to_slice_mut_back s1
-  Result.ret ()
-
-end array
diff --git a/tests/lean/Array/Funs.lean b/tests/lean/Array/Funs.lean
deleted file mode 100644
index 32ae6248..00000000
--- a/tests/lean/Array/Funs.lean
+++ /dev/null
@@ -1,431 +0,0 @@
--- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
--- [array]: function definitions
-import Base
-import Array.Types
-open Primitives
-
-namespace array
-
-/- [array::incr]: merged forward/backward function
-   (there is a single backward function, and the forward function returns ()) -/
-def incr (x : U32) : Result U32 :=
-  x + 1#u32
-
-/- [array::array_to_shared_slice_]: forward function -/
-def array_to_shared_slice_
-  (T : Type) (s : Array T 32#usize) : Result (Slice T) :=
-  Array.to_slice T 32#usize s
-
-/- [array::array_to_mut_slice_]: forward function -/
-def array_to_mut_slice_ (T : Type) (s : Array T 32#usize) : Result (Slice T) :=
-  Array.to_slice T 32#usize s
-
-/- [array::array_to_mut_slice_]: backward function 0 -/
-def array_to_mut_slice__back
-  (T : Type) (s : Array T 32#usize) (ret0 : Slice T) :
-  Result (Array T 32#usize)
-  :=
-  Array.from_slice T 32#usize s ret0
-
-/- [array::array_len]: forward function -/
-def array_len (T : Type) (s : Array T 32#usize) : Result Usize :=
-  do
-    let s0 ← Array.to_slice T 32#usize s
-    let i := Slice.len T s0
-    Result.ret i
-
-/- [array::shared_array_len]: forward function -/
-def shared_array_len (T : Type) (s : Array T 32#usize) : Result Usize :=
-  do
-    let s0 ← Array.to_slice T 32#usize s
-    let i := Slice.len T s0
-    Result.ret i
-
-/- [array::shared_slice_len]: forward function -/
-def shared_slice_len (T : Type) (s : Slice T) : Result Usize :=
-  let i := Slice.len T s
-  Result.ret i
-
-/- [array::index_array_shared]: forward function -/
-def index_array_shared
-  (T : Type) (s : Array T 32#usize) (i : Usize) : Result T :=
-  Array.index_usize T 32#usize s i
-
-/- [array::index_array_u32]: forward function -/
-def index_array_u32 (s : Array U32 32#usize) (i : Usize) : Result U32 :=
-  Array.index_usize U32 32#usize s i
-
-/- [array::index_array_copy]: forward function -/
-def index_array_copy (x : Array U32 32#usize) : Result U32 :=
-  Array.index_usize U32 32#usize x 0#usize
-
-/- [array::index_mut_array]: forward function -/
-def index_mut_array (T : Type) (s : Array T 32#usize) (i : Usize) : Result T :=
-  Array.index_usize T 32#usize s i
-
-/- [array::index_mut_array]: backward function 0 -/
-def index_mut_array_back
-  (T : Type) (s : Array T 32#usize) (i : Usize) (ret0 : T) :
-  Result (Array T 32#usize)
-  :=
-  Array.update_usize T 32#usize s i ret0
-
-/- [array::index_slice]: forward function -/
-def index_slice (T : Type) (s : Slice T) (i : Usize) : Result T :=
-  Slice.index_usize T s i
-
-/- [array::index_mut_slice]: forward function -/
-def index_mut_slice (T : Type) (s : Slice T) (i : Usize) : Result T :=
-  Slice.index_usize T s i
-
-/- [array::index_mut_slice]: backward function 0 -/
-def index_mut_slice_back
-  (T : Type) (s : Slice T) (i : Usize) (ret0 : T) : Result (Slice T) :=
-  Slice.update_usize T s i ret0
-
-/- [array::slice_subslice_shared_]: forward function -/
-def slice_subslice_shared_
-  (x : Slice U32) (y : Usize) (z : Usize) : Result (Slice U32) :=
-  core.slice.index.Slice.index U32 (core.ops.range.Range Usize)
-    (core.slice.index.Range.coresliceindexSliceIndexInst U32) x
-    { start := y, end_ := z }
-
-/- [array::slice_subslice_mut_]: forward function -/
-def slice_subslice_mut_
-  (x : Slice U32) (y : Usize) (z : Usize) : Result (Slice U32) :=
-  core.slice.index.Slice.index_mut U32 (core.ops.range.Range Usize)
-    (core.slice.index.Range.coresliceindexSliceIndexInst U32) x
-    { start := y, end_ := 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)
-  :=
-  core.slice.index.Slice.index_mut_back U32 (core.ops.range.Range Usize)
-    (core.slice.index.Range.coresliceindexSliceIndexInst U32) x
-    { start := y, end_ := z } ret0
-
-/- [array::array_to_slice_shared_]: forward function -/
-def array_to_slice_shared_ (x : Array U32 32#usize) : Result (Slice U32) :=
-  Array.to_slice U32 32#usize x
-
-/- [array::array_to_slice_mut_]: forward function -/
-def array_to_slice_mut_ (x : Array U32 32#usize) : Result (Slice U32) :=
-  Array.to_slice U32 32#usize x
-
-/- [array::array_to_slice_mut_]: backward function 0 -/
-def array_to_slice_mut__back
-  (x : Array U32 32#usize) (ret0 : Slice U32) : Result (Array U32 32#usize) :=
-  Array.from_slice U32 32#usize x ret0
-
-/- [array::array_subslice_shared_]: forward function -/
-def array_subslice_shared_
-  (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
-  core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
-    (core.slice.index.Slice.coreopsindexIndexInst U32 (core.ops.range.Range
-    Usize) (core.slice.index.Range.coresliceindexSliceIndexInst U32)) x
-    { start := y, end_ := z }
-
-/- [array::array_subslice_mut_]: forward function -/
-def array_subslice_mut_
-  (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
-  core.array.Array.index_mut U32 (core.ops.range.Range Usize) 32#usize
-    (core.slice.index.Slice.coreopsindexIndexMutInst U32 (core.ops.range.Range
-    Usize) (core.slice.index.Range.coresliceindexSliceIndexInst U32)) x
-    { start := y, end_ := z }
-
-/- [array::array_subslice_mut_]: backward function 0 -/
-def array_subslice_mut__back
-  (x : Array U32 32#usize) (y : Usize) (z : Usize) (ret0 : Slice U32) :
-  Result (Array U32 32#usize)
-  :=
-  core.array.Array.index_mut_back U32 (core.ops.range.Range Usize) 32#usize
-    (core.slice.index.Slice.coreopsindexIndexMutInst U32 (core.ops.range.Range
-    Usize) (core.slice.index.Range.coresliceindexSliceIndexInst U32)) x
-    { start := y, end_ := z } ret0
-
-/- [array::index_slice_0]: forward function -/
-def index_slice_0 (T : Type) (s : Slice T) : Result T :=
-  Slice.index_usize T s 0#usize
-
-/- [array::index_array_0]: forward function -/
-def index_array_0 (T : Type) (s : Array T 32#usize) : Result T :=
-  Array.index_usize T 32#usize s 0#usize
-
-/- [array::index_index_array]: forward function -/
-def index_index_array
-  (s : Array (Array U32 32#usize) 32#usize) (i : Usize) (j : Usize) :
-  Result U32
-  :=
-  do
-    let a ← Array.index_usize (Array U32 32#usize) 32#usize s i
-    Array.index_usize U32 32#usize a j
-
-/- [array::update_update_array]: forward function -/
-def update_update_array
-  (s : Array (Array U32 32#usize) 32#usize) (i : Usize) (j : Usize) :
-  Result Unit
-  :=
-  do
-    let a ← Array.index_usize (Array U32 32#usize) 32#usize s i
-    let a0 ← Array.update_usize U32 32#usize a j 0#u32
-    let _ ← Array.update_usize (Array U32 32#usize) 32#usize s i a0
-    Result.ret ()
-
-/- [array::array_local_deep_copy]: forward function -/
-def array_local_deep_copy (x : Array U32 32#usize) : Result Unit :=
-  Result.ret ()
-
-/- [array::take_array]: forward function -/
-def take_array (a : Array U32 2#usize) : Result Unit :=
-  Result.ret ()
-
-/- [array::take_array_borrow]: forward function -/
-def take_array_borrow (a : Array U32 2#usize) : 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 2#usize [ 0#u32, 0#u32 ])
-    let _ ← take_array_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let s ←
-      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let _ ← take_slice s
-    let s0 ←
-      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let s1 ← take_mut_slice s0
-    let _ ←
-      Array.from_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ]) s1
-    Result.ret ()
-
-/- [array::index_array]: forward function -/
-def index_array (x : Array U32 2#usize) : Result U32 :=
-  Array.index_usize U32 2#usize x 0#usize
-
-/- [array::index_array_borrow]: forward function -/
-def index_array_borrow (x : Array U32 2#usize) : Result U32 :=
-  Array.index_usize U32 2#usize x 0#usize
-
-/- [array::index_slice_u32_0]: forward function -/
-def index_slice_u32_0 (x : Slice U32) : Result U32 :=
-  Slice.index_usize U32 x 0#usize
-
-/- [array::index_mut_slice_u32_0]: forward function -/
-def index_mut_slice_u32_0 (x : Slice U32) : Result U32 :=
-  Slice.index_usize U32 x 0#usize
-
-/- [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_usize U32 x 0#usize
-    Result.ret x
-
-/- [array::index_all]: forward function -/
-def index_all : Result U32 :=
-  do
-    let i ← index_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let i0 ← index_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let i1 ← i + i0
-    let i2 ← index_array_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let i3 ← i1 + i2
-    let s ←
-      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let i4 ← index_slice_u32_0 s
-    let i5 ← i3 + i4
-    let s0 ←
-      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let i6 ← index_mut_slice_u32_0 s0
-    let i7 ← i5 + i6
-    let s1 ← index_mut_slice_u32_0_back s0
-    let _ ←
-      Array.from_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ]) s1
-    Result.ret i7
-
-/- [array::update_array]: forward function -/
-def update_array (x : Array U32 2#usize) : Result Unit :=
-  do
-    let _ ← Array.update_usize U32 2#usize x 0#usize 1#u32
-    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 2#usize) : Result (Array U32 2#usize) :=
-  Array.update_usize U32 2#usize x 0#usize 1#u32
-
-/- [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.update_usize U32 x 0#usize 1#u32
-
-/- [array::update_all]: forward function -/
-def update_all : Result Unit :=
-  do
-    let _ ← update_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let x ← update_array_mut_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let s ← Array.to_slice U32 2#usize x
-    let s0 ← update_mut_slice s
-    let _ ← Array.from_slice U32 2#usize x s0
-    Result.ret ()
-
-/- [array::range_all]: forward function -/
-def range_all : Result Unit :=
-  do
-    let s ←
-      core.array.Array.index_mut U32 (core.ops.range.Range Usize) 4#usize
-        (core.slice.index.Slice.coreopsindexIndexMutInst U32
-        (core.ops.range.Range Usize)
-        (core.slice.index.Range.coresliceindexSliceIndexInst U32))
-        (Array.make U32 4#usize [ 0#u32, 0#u32, 0#u32, 0#u32 ])
-        { start := 1#usize, end_ := 3#usize }
-    let s0 ← update_mut_slice s
-    let _ ←
-      core.array.Array.index_mut_back U32 (core.ops.range.Range Usize) 4#usize
-        (core.slice.index.Slice.coreopsindexIndexMutInst U32
-        (core.ops.range.Range Usize)
-        (core.slice.index.Range.coresliceindexSliceIndexInst U32))
-        (Array.make U32 4#usize [ 0#u32, 0#u32, 0#u32, 0#u32 ])
-        { start := 1#usize, end_ := 3#usize } s0
-    Result.ret ()
-
-/- [array::deref_array_borrow]: forward function -/
-def deref_array_borrow (x : Array U32 2#usize) : Result U32 :=
-  Array.index_usize U32 2#usize x 0#usize
-
-/- [array::deref_array_mut_borrow]: forward function -/
-def deref_array_mut_borrow (x : Array U32 2#usize) : Result U32 :=
-  Array.index_usize U32 2#usize x 0#usize
-
-/- [array::deref_array_mut_borrow]: backward function 0 -/
-def deref_array_mut_borrow_back
-  (x : Array U32 2#usize) : Result (Array U32 2#usize) :=
-  do
-    let _ ← Array.index_usize U32 2#usize x 0#usize
-    Result.ret x
-
-/- [array::take_array_t]: forward function -/
-def take_array_t (a : Array AB 2#usize) : Result Unit :=
-  Result.ret ()
-
-/- [array::non_copyable_array]: forward function -/
-def non_copyable_array : Result Unit :=
-  do
-    let _ ← take_array_t (Array.make AB 2#usize [ AB.A, AB.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_usize U32 s i
-      let sum1 ← sum0 + i1
-      let i2 ← i + 1#usize
-      sum_loop s sum1 i2
-  else Result.ret sum0
-
-/- [array::sum]: forward function -/
-def sum (s : Slice U32) : Result U32 :=
-  sum_loop s 0#u32 0#usize
-
-/- [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_usize U32 s i
-      let i2 ← Slice.index_usize U32 s2 i
-      let i3 ← i1 + i2
-      let sum1 ← sum0 + i3
-      let i4 ← i + 1#usize
-      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 0#u32 0#usize
-
-/- [array::f0]: forward function -/
-def f0 : Result Unit :=
-  do
-    let s ←
-      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
-    let s0 ← Slice.update_usize U32 s 0#usize 1#u32
-    let _ ←
-      Array.from_slice U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ]) s0
-    Result.ret ()
-
-/- [array::f1]: forward function -/
-def f1 : Result Unit :=
-  do
-    let _ ←
-      Array.update_usize U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
-        0#usize 1#u32
-    Result.ret ()
-
-/- [array::f2]: forward function -/
-def f2 (i : U32) : Result Unit :=
-  Result.ret ()
-
-/- [array::f4]: forward function -/
-def f4 (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
-  core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
-    (core.slice.index.Slice.coreopsindexIndexInst U32 (core.ops.range.Range
-    Usize) (core.slice.index.Range.coresliceindexSliceIndexInst U32)) x
-    { start := y, end_ := z }
-
-/- [array::f3]: forward function -/
-def f3 : Result U32 :=
-  do
-    let i ←
-      Array.index_usize U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
-        0#usize
-    let _ ← f2 i
-    let b := Array.repeat U32 32#usize 0#u32
-    let s ←
-      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
-    let s0 ← f4 b 16#usize 18#usize
-    sum2 s s0
-
-/- [array::SZ] -/
-def sz_body : Result Usize := Result.ret 32#usize
-def sz_c : Usize := eval_global sz_body (by simp)
-
-/- [array::f5]: forward function -/
-def f5 (x : Array U32 32#usize) : Result U32 :=
-  Array.index_usize U32 32#usize x 0#usize
-
-/- [array::ite]: forward function -/
-def ite : Result Unit :=
-  do
-    let s ←
-      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let s0 ←
-      Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
-    let s1 ← index_mut_slice_u32_0_back s0
-    let _ ←
-      Array.from_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ]) s1
-    let s2 ← index_mut_slice_u32_0_back s
-    let _ ←
-      Array.from_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ]) s2
-    Result.ret ()
-
-end array
diff --git a/tests/lean/Array/Types.lean b/tests/lean/Array/Types.lean
deleted file mode 100644
index 60fa81ab..00000000
--- a/tests/lean/Array/Types.lean
+++ /dev/null
@@ -1,13 +0,0 @@
--- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
--- [array]: type definitions
-import Base
-open Primitives
-
-namespace array
-
-/- [array::AB] -/
-inductive AB :=
-| A : AB
-| B : AB
-
-end array
diff --git a/tests/lean/Arrays.lean b/tests/lean/Arrays.lean
new file mode 100644
index 00000000..5158ca28
--- /dev/null
+++ b/tests/lean/Arrays.lean
@@ -0,0 +1,476 @@
+-- THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS
+-- [arrays]
+import Base
+open Primitives
+
+namespace arrays
+
+/- [arrays::AB]
+   Source: 'src/arrays.rs', lines 3:0-3:11 -/
+inductive AB :=
+| A : AB
+| B : AB
+
+/- [arrays::incr]:
+   Source: 'src/arrays.rs', lines 8:0-8:24 -/
+def incr (x : U32) : Result U32 :=
+  x + 1#u32
+
+/- [arrays::array_to_shared_slice_]:
+   Source: 'src/arrays.rs', lines 16:0-16:53 -/
+def array_to_shared_slice_
+  (T : Type) (s : Array T 32#usize) : Result (Slice T) :=
+  Array.to_slice T 32#usize s
+
+/- [arrays::array_to_mut_slice_]:
+   Source: 'src/arrays.rs', lines 21:0-21:58 -/
+def array_to_mut_slice_
+  (T : Type) (s : Array T 32#usize) :
+  Result ((Slice T) × (Slice T → Result (Array T 32#usize)))
+  :=
+  do
+  let (s1, to_slice_mut_back) ← Array.to_slice_mut T 32#usize s
+  Result.ret (s1, to_slice_mut_back)
+
+/- [arrays::array_len]:
+   Source: 'src/arrays.rs', lines 25:0-25:40 -/
+def array_len (T : Type) (s : Array T 32#usize) : Result Usize :=
+  do
+  let s1 ← Array.to_slice T 32#usize s
+  let i := Slice.len T s1
+  Result.ret i
+
+/- [arrays::shared_array_len]:
+   Source: 'src/arrays.rs', lines 29:0-29:48 -/
+def shared_array_len (T : Type) (s : Array T 32#usize) : Result Usize :=
+  do
+  let s1 ← Array.to_slice T 32#usize s
+  let i := Slice.len T s1
+  Result.ret i
+
+/- [arrays::shared_slice_len]:
+   Source: 'src/arrays.rs', lines 33:0-33:44 -/
+def shared_slice_len (T : Type) (s : Slice T) : Result Usize :=
+  let i := Slice.len T s
+  Result.ret i
+
+/- [arrays::index_array_shared]:
+   Source: 'src/arrays.rs', lines 37:0-37:57 -/
+def index_array_shared
+  (T : Type) (s : Array T 32#usize) (i : Usize) : Result T :=
+  Array.index_usize T 32#usize s i
+
+/- [arrays::index_array_u32]:
+   Source: 'src/arrays.rs', lines 44:0-44:53 -/
+def index_array_u32 (s : Array U32 32#usize) (i : Usize) : Result U32 :=
+  Array.index_usize U32 32#usize s i
+
+/- [arrays::index_array_copy]:
+   Source: 'src/arrays.rs', lines 48:0-48:45 -/
+def index_array_copy (x : Array U32 32#usize) : Result U32 :=
+  Array.index_usize U32 32#usize x 0#usize
+
+/- [arrays::index_mut_array]:
+   Source: 'src/arrays.rs', lines 52:0-52:62 -/
+def index_mut_array
+  (T : Type) (s : Array T 32#usize) (i : Usize) :
+  Result (T × (T → Result (Array T 32#usize)))
+  :=
+  do
+  let (t, index_mut_back) ← Array.index_mut_usize T 32#usize s i
+  Result.ret (t, index_mut_back)
+
+/- [arrays::index_slice]:
+   Source: 'src/arrays.rs', lines 56:0-56:46 -/
+def index_slice (T : Type) (s : Slice T) (i : Usize) : Result T :=
+  Slice.index_usize T s i
+
+/- [arrays::index_mut_slice]:
+   Source: 'src/arrays.rs', lines 60:0-60:58 -/
+def index_mut_slice
+  (T : Type) (s : Slice T) (i : Usize) :
+  Result (T × (T → Result (Slice T)))
+  :=
+  do
+  let (t, index_mut_back) ← Slice.index_mut_usize T s i
+  Result.ret (t, index_mut_back)
+
+/- [arrays::slice_subslice_shared_]:
+   Source: 'src/arrays.rs', lines 64:0-64:70 -/
+def slice_subslice_shared_
+  (x : Slice U32) (y : Usize) (z : Usize) : Result (Slice U32) :=
+  core.slice.index.Slice.index U32 (core.ops.range.Range Usize)
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32) x
+    { start := y, end_ := z }
+
+/- [arrays::slice_subslice_mut_]:
+   Source: 'src/arrays.rs', lines 68:0-68:75 -/
+def slice_subslice_mut_
+  (x : Slice U32) (y : Usize) (z : Usize) :
+  Result ((Slice U32) × (Slice U32 → Result (Slice U32)))
+  :=
+  do
+  let (s, index_mut_back) ←
+    core.slice.index.Slice.index_mut U32 (core.ops.range.Range Usize)
+      (core.slice.index.SliceIndexRangeUsizeSliceTInst U32) x
+      { start := y, end_ := z }
+  Result.ret (s, index_mut_back)
+
+/- [arrays::array_to_slice_shared_]:
+   Source: 'src/arrays.rs', lines 72:0-72:54 -/
+def array_to_slice_shared_ (x : Array U32 32#usize) : Result (Slice U32) :=
+  Array.to_slice U32 32#usize x
+
+/- [arrays::array_to_slice_mut_]:
+   Source: 'src/arrays.rs', lines 76:0-76:59 -/
+def array_to_slice_mut_
+  (x : Array U32 32#usize) :
+  Result ((Slice U32) × (Slice U32 → Result (Array U32 32#usize)))
+  :=
+  do
+  let (s, to_slice_mut_back) ← Array.to_slice_mut U32 32#usize x
+  Result.ret (s, to_slice_mut_back)
+
+/- [arrays::array_subslice_shared_]:
+   Source: 'src/arrays.rs', lines 80:0-80:74 -/
+def array_subslice_shared_
+  (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
+  core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
+    (core.ops.index.IndexSliceTIInst U32 (core.ops.range.Range Usize)
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
+    { start := y, end_ := z }
+
+/- [arrays::array_subslice_mut_]:
+   Source: 'src/arrays.rs', lines 84:0-84:79 -/
+def array_subslice_mut_
+  (x : Array U32 32#usize) (y : Usize) (z : Usize) :
+  Result ((Slice U32) × (Slice U32 → Result (Array U32 32#usize)))
+  :=
+  do
+  let (s, index_mut_back) ←
+    core.array.Array.index_mut U32 (core.ops.range.Range Usize) 32#usize
+      (core.ops.index.IndexMutSliceTIInst U32 (core.ops.range.Range Usize)
+      (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
+      { start := y, end_ := z }
+  Result.ret (s, index_mut_back)
+
+/- [arrays::index_slice_0]:
+   Source: 'src/arrays.rs', lines 88:0-88:38 -/
+def index_slice_0 (T : Type) (s : Slice T) : Result T :=
+  Slice.index_usize T s 0#usize
+
+/- [arrays::index_array_0]:
+   Source: 'src/arrays.rs', lines 92:0-92:42 -/
+def index_array_0 (T : Type) (s : Array T 32#usize) : Result T :=
+  Array.index_usize T 32#usize s 0#usize
+
+/- [arrays::index_index_array]:
+   Source: 'src/arrays.rs', lines 103:0-103:71 -/
+def index_index_array
+  (s : Array (Array U32 32#usize) 32#usize) (i : Usize) (j : Usize) :
+  Result U32
+  :=
+  do
+  let a ← Array.index_usize (Array U32 32#usize) 32#usize s i
+  Array.index_usize U32 32#usize a j
+
+/- [arrays::update_update_array]:
+   Source: 'src/arrays.rs', lines 114:0-114:70 -/
+def update_update_array
+  (s : Array (Array U32 32#usize) 32#usize) (i : Usize) (j : Usize) :
+  Result Unit
+  :=
+  do
+  let (a, index_mut_back) ←
+    Array.index_mut_usize (Array U32 32#usize) 32#usize s i
+  let (_, index_mut_back1) ← Array.index_mut_usize U32 32#usize a j
+  let a1 ← index_mut_back1 0#u32
+  let _ ← index_mut_back a1
+  Result.ret ()
+
+/- [arrays::array_local_deep_copy]:
+   Source: 'src/arrays.rs', lines 118:0-118:43 -/
+def array_local_deep_copy (x : Array U32 32#usize) : Result Unit :=
+  Result.ret ()
+
+/- [arrays::take_array]:
+   Source: 'src/arrays.rs', lines 122:0-122:30 -/
+def take_array (a : Array U32 2#usize) : Result Unit :=
+  Result.ret ()
+
+/- [arrays::take_array_borrow]:
+   Source: 'src/arrays.rs', lines 123:0-123:38 -/
+def take_array_borrow (a : Array U32 2#usize) : Result Unit :=
+  Result.ret ()
+
+/- [arrays::take_slice]:
+   Source: 'src/arrays.rs', lines 124:0-124:28 -/
+def take_slice (s : Slice U32) : Result Unit :=
+  Result.ret ()
+
+/- [arrays::take_mut_slice]:
+   Source: 'src/arrays.rs', lines 125:0-125:36 -/
+def take_mut_slice (s : Slice U32) : Result (Slice U32) :=
+  Result.ret s
+
+/- [arrays::const_array]:
+   Source: 'src/arrays.rs', lines 127:0-127:32 -/
+def const_array : Result (Array U32 2#usize) :=
+  Result.ret (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+
+/- [arrays::const_slice]:
+   Source: 'src/arrays.rs', lines 131:0-131:20 -/
+def const_slice : Result Unit :=
+  do
+  let _ ←
+    Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  Result.ret ()
+
+/- [arrays::take_all]:
+   Source: 'src/arrays.rs', lines 141:0-141:17 -/
+def take_all : Result Unit :=
+  do
+  let _ ← take_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let _ ← take_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let _ ← take_array_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let s ←
+    Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let _ ← take_slice s
+  let (s1, to_slice_mut_back) ←
+    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let s2 ← take_mut_slice s1
+  let _ ← to_slice_mut_back s2
+  Result.ret ()
+
+/- [arrays::index_array]:
+   Source: 'src/arrays.rs', lines 155:0-155:38 -/
+def index_array (x : Array U32 2#usize) : Result U32 :=
+  Array.index_usize U32 2#usize x 0#usize
+
+/- [arrays::index_array_borrow]:
+   Source: 'src/arrays.rs', lines 158:0-158:46 -/
+def index_array_borrow (x : Array U32 2#usize) : Result U32 :=
+  Array.index_usize U32 2#usize x 0#usize
+
+/- [arrays::index_slice_u32_0]:
+   Source: 'src/arrays.rs', lines 162:0-162:42 -/
+def index_slice_u32_0 (x : Slice U32) : Result U32 :=
+  Slice.index_usize U32 x 0#usize
+
+/- [arrays::index_mut_slice_u32_0]:
+   Source: 'src/arrays.rs', lines 166:0-166:50 -/
+def index_mut_slice_u32_0 (x : Slice U32) : Result (U32 × (Slice U32)) :=
+  do
+  let i ← Slice.index_usize U32 x 0#usize
+  Result.ret (i, x)
+
+/- [arrays::index_all]:
+   Source: 'src/arrays.rs', lines 170:0-170:25 -/
+def index_all : Result U32 :=
+  do
+  let i ← index_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let i1 ← index_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let i2 ← i + i1
+  let i3 ← index_array_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let i4 ← i2 + i3
+  let s ←
+    Array.to_slice U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let i5 ← index_slice_u32_0 s
+  let i6 ← i4 + i5
+  let (s1, to_slice_mut_back) ←
+    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let (i7, s2) ← index_mut_slice_u32_0 s1
+  let i8 ← i6 + i7
+  let _ ← to_slice_mut_back s2
+  Result.ret i8
+
+/- [arrays::update_array]:
+   Source: 'src/arrays.rs', lines 184:0-184:36 -/
+def update_array (x : Array U32 2#usize) : Result Unit :=
+  do
+  let (_, index_mut_back) ← Array.index_mut_usize U32 2#usize x 0#usize
+  let _ ← index_mut_back 1#u32
+  Result.ret ()
+
+/- [arrays::update_array_mut_borrow]:
+   Source: 'src/arrays.rs', lines 187:0-187:48 -/
+def update_array_mut_borrow
+  (x : Array U32 2#usize) : Result (Array U32 2#usize) :=
+  do
+  let (_, index_mut_back) ← Array.index_mut_usize U32 2#usize x 0#usize
+  index_mut_back 1#u32
+
+/- [arrays::update_mut_slice]:
+   Source: 'src/arrays.rs', lines 190:0-190:38 -/
+def update_mut_slice (x : Slice U32) : Result (Slice U32) :=
+  do
+  let (_, index_mut_back) ← Slice.index_mut_usize U32 x 0#usize
+  index_mut_back 1#u32
+
+/- [arrays::update_all]:
+   Source: 'src/arrays.rs', lines 194:0-194:19 -/
+def update_all : Result Unit :=
+  do
+  let _ ← update_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let _ ← update_array (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let a ← update_array_mut_borrow (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let (s, to_slice_mut_back) ← Array.to_slice_mut U32 2#usize a
+  let s1 ← update_mut_slice s
+  let _ ← to_slice_mut_back s1
+  Result.ret ()
+
+/- [arrays::range_all]:
+   Source: 'src/arrays.rs', lines 205:0-205:18 -/
+def range_all : Result Unit :=
+  do
+  let (s, index_mut_back) ←
+    core.array.Array.index_mut U32 (core.ops.range.Range Usize) 4#usize
+      (core.ops.index.IndexMutSliceTIInst U32 (core.ops.range.Range Usize)
+      (core.slice.index.SliceIndexRangeUsizeSliceTInst U32))
+      (Array.make U32 4#usize [ 0#u32, 0#u32, 0#u32, 0#u32 ])
+      { start := 1#usize, end_ := 3#usize }
+  let s1 ← update_mut_slice s
+  let _ ← index_mut_back s1
+  Result.ret ()
+
+/- [arrays::deref_array_borrow]:
+   Source: 'src/arrays.rs', lines 214:0-214:46 -/
+def deref_array_borrow (x : Array U32 2#usize) : Result U32 :=
+  Array.index_usize U32 2#usize x 0#usize
+
+/- [arrays::deref_array_mut_borrow]:
+   Source: 'src/arrays.rs', lines 219:0-219:54 -/
+def deref_array_mut_borrow
+  (x : Array U32 2#usize) : Result (U32 × (Array U32 2#usize)) :=
+  do
+  let i ← Array.index_usize U32 2#usize x 0#usize
+  Result.ret (i, x)
+
+/- [arrays::take_array_t]:
+   Source: 'src/arrays.rs', lines 227:0-227:31 -/
+def take_array_t (a : Array AB 2#usize) : Result Unit :=
+  Result.ret ()
+
+/- [arrays::non_copyable_array]:
+   Source: 'src/arrays.rs', lines 229:0-229:27 -/
+def non_copyable_array : Result Unit :=
+  do
+  let _ ← take_array_t (Array.make AB 2#usize [ AB.A, AB.B ])
+  Result.ret ()
+
+/- [arrays::sum]: loop 0:
+   Source: 'src/arrays.rs', lines 242:0-250:1 -/
+divergent def sum_loop (s : Slice U32) (sum1 : U32) (i : Usize) : Result U32 :=
+  let i1 := Slice.len U32 s
+  if i < i1
+  then
+    do
+    let i2 ← Slice.index_usize U32 s i
+    let sum3 ← sum1 + i2
+    let i3 ← i + 1#usize
+    sum_loop s sum3 i3
+  else Result.ret sum1
+
+/- [arrays::sum]:
+   Source: 'src/arrays.rs', lines 242:0-242:28 -/
+def sum (s : Slice U32) : Result U32 :=
+  sum_loop s 0#u32 0#usize
+
+/- [arrays::sum2]: loop 0:
+   Source: 'src/arrays.rs', lines 252:0-261:1 -/
+divergent def sum2_loop
+  (s : Slice U32) (s2 : Slice U32) (sum1 : U32) (i : Usize) : Result U32 :=
+  let i1 := Slice.len U32 s
+  if i < i1
+  then
+    do
+    let i2 ← Slice.index_usize U32 s i
+    let i3 ← Slice.index_usize U32 s2 i
+    let i4 ← i2 + i3
+    let sum3 ← sum1 + i4
+    let i5 ← i + 1#usize
+    sum2_loop s s2 sum3 i5
+  else Result.ret sum1
+
+/- [arrays::sum2]:
+   Source: 'src/arrays.rs', lines 252:0-252:41 -/
+def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
+  let i := Slice.len U32 s
+  let i1 := Slice.len U32 s2
+  if not (i = i1)
+  then Result.fail .panic
+  else sum2_loop s s2 0#u32 0#usize
+
+/- [arrays::f0]:
+   Source: 'src/arrays.rs', lines 263:0-263:11 -/
+def f0 : Result Unit :=
+  do
+  let (s, to_slice_mut_back) ←
+    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
+  let (_, index_mut_back) ← Slice.index_mut_usize U32 s 0#usize
+  let s1 ← index_mut_back 1#u32
+  let _ ← to_slice_mut_back s1
+  Result.ret ()
+
+/- [arrays::f1]:
+   Source: 'src/arrays.rs', lines 268:0-268:11 -/
+def f1 : Result Unit :=
+  do
+  let (_, index_mut_back) ←
+    Array.index_mut_usize U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
+      0#usize
+  let _ ← index_mut_back 1#u32
+  Result.ret ()
+
+/- [arrays::f2]:
+   Source: 'src/arrays.rs', lines 273:0-273:17 -/
+def f2 (i : U32) : Result Unit :=
+  Result.ret ()
+
+/- [arrays::f4]:
+   Source: 'src/arrays.rs', lines 282:0-282:54 -/
+def f4 (x : Array U32 32#usize) (y : Usize) (z : Usize) : Result (Slice U32) :=
+  core.array.Array.index U32 (core.ops.range.Range Usize) 32#usize
+    (core.ops.index.IndexSliceTIInst U32 (core.ops.range.Range Usize)
+    (core.slice.index.SliceIndexRangeUsizeSliceTInst U32)) x
+    { start := y, end_ := z }
+
+/- [arrays::f3]:
+   Source: 'src/arrays.rs', lines 275:0-275:18 -/
+def f3 : Result U32 :=
+  do
+  let i ←
+    Array.index_usize U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
+      0#usize
+  let _ ← f2 i
+  let b := Array.repeat U32 32#usize 0#u32
+  let s ←
+    Array.to_slice U32 2#usize (Array.make U32 2#usize [ 1#u32, 2#u32 ])
+  let s1 ← f4 b 16#usize 18#usize
+  sum2 s s1
+
+/- [arrays::SZ]
+   Source: 'src/arrays.rs', lines 286:0-286:19 -/
+def sz_body : Result Usize := Result.ret 32#usize
+def sz_c : Usize := eval_global sz_body (by decide)
+
+/- [arrays::f5]:
+   Source: 'src/arrays.rs', lines 289:0-289:31 -/
+def f5 (x : Array U32 32#usize) : Result U32 :=
+  Array.index_usize U32 32#usize x 0#usize
+
+/- [arrays::ite]:
+   Source: 'src/arrays.rs', lines 294:0-294:12 -/
+def ite : Result Unit :=
+  do
+  let (s, to_slice_mut_back) ←
+    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let (_, s1) ← index_mut_slice_u32_0 s
+  let (s2, to_slice_mut_back1) ←
+    Array.to_slice_mut U32 2#usize (Array.make U32 2#usize [ 0#u32, 0#u32 ])
+  let (_, s3) ← index_mut_slice_u32_0 s2
+  let _ ← to_slice_mut_back1 s3
+  let _ ← to_slice_mut_back s1
+  Result.ret ()
+
+end arrays
diff --git a/tests/lean/lakefile.lean b/tests/lean/lakefile.lean
index 502d8098..781fc8b8 100644
--- a/tests/lean/lakefile.lean
+++ b/tests/lean/lakefile.lean
@@ -6,9 +6,8 @@ require mathlib from git
 
 require base from "../../backends/lean"
 
-package «Tests» {}
+package «tests» {}
 
-@[default_target] lean_lib array
 @[default_target] lean_lib Tutorial
 @[default_target] lean_lib BetreeMain
 @[default_target] lean_lib Constants
@@ -19,4 +18,5 @@ package «Tests» {}
 @[default_target] lean_lib NoNestedBorrows
 @[default_target] lean_lib Paper
 @[default_target] lean_lib PoloniusList
+@[default_target] lean_lib Arrays
 @[default_target] lean_lib Traits
-- 
cgit v1.2.3


From 53aad0bc77a5c3aac5482030f6b5e3dcff1f9f65 Mon Sep 17 00:00:00 2001
From: Son Ho
Date: Fri, 2 Feb 2024 23:34:10 +0100
Subject: Update the .gitignore files

---
 tests/lean/.gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/lean')

diff --git a/tests/lean/.gitignore b/tests/lean/.gitignore
index 4d1c5853..071df2d0 100644
--- a/tests/lean/.gitignore
+++ b/tests/lean/.gitignore
@@ -1,2 +1,3 @@
 lake-packages
-build
\ No newline at end of file
+build
+.lake
\ No newline at end of file
-- 
cgit v1.2.3