Regenerate the test files

6 files changed, 550 insertions, 60 deletions

diff --git a/tests/coq/array/Array_Funs.v b/tests/coq/array/Array_Funs.v
index 4a862d1b..6d791873 100644
--- a/tests/coq/array/Array_Funs.v
+++ b/tests/coq/array/Array_Funs.v
@@ -199,25 +199,156 @@ Definition array_local_deep_copy_fwd (x : array u32 32%usize) : result unit :=
   Return tt
 .
 
-(** [array::f0]: forward function *)
-Definition f0_fwd : result unit :=
+(** [array::take_array]: forward function *)
+Definition take_array_fwd (a : array u32 2%usize) : result unit :=
+  Return tt.
+
+(** [array::take_array_borrow]: forward function *)
+Definition take_array_borrow_fwd (a : array u32 2%usize) : result unit :=
+  Return tt
+.
+
+(** [array::take_slice]: forward function *)
+Definition take_slice_fwd (s : slice u32) : result unit :=
+  Return tt.
+
+(** [array::take_mut_slice]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ()) *)
+Definition take_mut_slice_fwd_back (s : slice u32) : result (slice u32) :=
+  Return s
+.
+
+(** [array::take_all]: forward function *)
+Definition take_all_fwd : result unit :=
+  _ <- take_array_fwd (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  _ <- take_array_borrow_fwd (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
   s <-
-    array_to_slice_mut_fwd u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ]);
-  s0 <- slice_index_mut_back u32 s 0%usize 1%u32;
+    array_to_slice_shared u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  _ <- take_slice_fwd s;
+  s0 <-
+    array_to_slice_mut_fwd u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  s1 <- take_mut_slice_fwd_back s0;
   _ <-
-    array_to_slice_mut_back u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ])
-      s0;
+    array_to_slice_mut_back u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ])
+      s1;
   Return tt
 .
 
-(** [array::f1]: forward function *)
-Definition f1_fwd : result unit :=
+(** [array::index_array]: forward function *)
+Definition index_array_fwd (x : array u32 2%usize) : result u32 :=
+  array_index_shared u32 2%usize x 0%usize
+.
+
+(** [array::index_array_borrow]: forward function *)
+Definition index_array_borrow_fwd (x : array u32 2%usize) : result u32 :=
+  array_index_shared u32 2%usize x 0%usize
+.
+
+(** [array::index_slice_u32_0]: forward function *)
+Definition index_slice_u32_0_fwd (x : slice u32) : result u32 :=
+  slice_index_shared u32 x 0%usize
+.
+
+(** [array::index_mut_slice_u32_0]: forward function *)
+Definition index_mut_slice_u32_0_fwd (x : slice u32) : result u32 :=
+  slice_index_shared u32 x 0%usize
+.
+
+(** [array::index_mut_slice_u32_0]: backward function 0 *)
+Definition index_mut_slice_u32_0_back (x : slice u32) : result (slice u32) :=
+  _ <- slice_index_shared u32 x 0%usize; Return x
+.
+
+(** [array::index_all]: forward function *)
+Definition index_all_fwd : result u32 :=
+  i <- index_array_fwd (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  i0 <- index_array_fwd (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  i1 <- u32_add i i0;
+  i2 <- index_array_borrow_fwd (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  i3 <- u32_add i1 i2;
+  s <-
+    array_to_slice_shared u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  i4 <- index_slice_u32_0_fwd s;
+  i5 <- u32_add i3 i4;
+  s0 <-
+    array_to_slice_mut_fwd u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  i6 <- index_mut_slice_u32_0_fwd s0;
+  i7 <- u32_add i5 i6;
+  s1 <- index_mut_slice_u32_0_back s0;
   _ <-
-    array_index_mut_back u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ])
-      0%usize 1%u32;
+    array_to_slice_mut_back u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ])
+      s1;
+  Return i7
+.
+
+(** [array::update_array]: forward function *)
+Definition update_array_fwd (x : array u32 2%usize) : result unit :=
+  _ <- array_index_mut_back u32 2%usize x 0%usize 1%u32; Return tt
+.
+
+(** [array::update_array_mut_borrow]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ()) *)
+Definition update_array_mut_borrow_fwd_back
+  (x : array u32 2%usize) : result (array u32 2%usize) :=
+  array_index_mut_back 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 ()) *)
+Definition update_mut_slice_fwd_back (x : slice u32) : result (slice u32) :=
+  slice_index_mut_back u32 x 0%usize 1%u32
+.
+
+(** [array::update_all]: forward function *)
+Definition update_all_fwd : result unit :=
+  _ <- update_array_fwd (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  x <-
+    update_array_mut_borrow_fwd_back (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  s <- array_to_slice_mut_fwd u32 2%usize x;
+  s0 <- update_mut_slice_fwd_back s;
+  _ <- array_to_slice_mut_back u32 2%usize x s0;
   Return tt
 .
 
+(** [array::range_all]: forward function *)
+Definition range_all_fwd : result unit :=
+  s <-
+    array_subslice_mut_fwd u32 4%usize
+      (mk_array u32 4%usize [ 0%u32; 0%u32; 0%u32; 0%u32 ]) (mk_range 1%usize
+      3%usize);
+  s0 <- update_mut_slice_fwd_back s;
+  _ <-
+    array_subslice_mut_back u32 4%usize
+      (mk_array u32 4%usize [ 0%u32; 0%u32; 0%u32; 0%u32 ]) (mk_range 1%usize
+      3%usize) s0;
+  Return tt
+.
+
+(** [array::deref_array_borrow]: forward function *)
+Definition deref_array_borrow_fwd (x : array u32 2%usize) : result u32 :=
+  array_index_shared u32 2%usize x 0%usize
+.
+
+(** [array::deref_array_mut_borrow]: forward function *)
+Definition deref_array_mut_borrow_fwd (x : array u32 2%usize) : result u32 :=
+  array_index_shared u32 2%usize x 0%usize
+.
+
+(** [array::deref_array_mut_borrow]: backward function 0 *)
+Definition deref_array_mut_borrow_back
+  (x : array u32 2%usize) : result (array u32 2%usize) :=
+  _ <- array_index_shared u32 2%usize x 0%usize; Return x
+.
+
+(** [array::take_array_t]: forward function *)
+Definition take_array_t_fwd (a : array T_t 2%usize) : result unit :=
+  Return tt.
+
+(** [array::non_copyable_array]: forward function *)
+Definition non_copyable_array_fwd : result unit :=
+  _ <- take_array_t_fwd (mk_array T_t 2%usize [ TA; TB ]); Return tt
+.
+
 (** [array::sum]: loop 0: forward function *)
 Fixpoint sum_loop_fwd
   (n : nat) (s : slice u32) (sum : u32) (i : usize) : result u32 :=
@@ -268,6 +399,25 @@ Definition sum2_fwd (n : nat) (s : slice u32) (s2 : slice u32) : result u32 :=
   if negb (i s= i0) then Fail_ Failure else sum2_loop_fwd n s s2 0%u32 0%usize
 .
 
+(** [array::f0]: forward function *)
+Definition f0_fwd : result unit :=
+  s <-
+    array_to_slice_mut_fwd u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ]);
+  s0 <- slice_index_mut_back u32 s 0%usize 1%u32;
+  _ <-
+    array_to_slice_mut_back u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ])
+      s0;
+  Return tt
+.
+
+(** [array::f1]: forward function *)
+Definition f1_fwd : result unit :=
+  _ <-
+    array_index_mut_back u32 2%usize (mk_array u32 2%usize [ 1%u32; 2%u32 ])
+      0%usize 1%u32;
+  Return tt
+.
+
 (** [array::f2]: forward function *)
 Definition f2_fwd (i : u32) : result unit :=
   Return tt.
@@ -297,4 +447,21 @@ Definition f3_fwd (n : nat) : result u32 :=
   sum2_fwd n s s0
 .
 
+(** [array::ite]: forward function *)
+Definition ite_fwd : result unit :=
+  s <-
+    array_to_slice_mut_fwd u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  s0 <-
+    array_to_slice_mut_fwd u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ]);
+  s1 <- index_mut_slice_u32_0_back s0;
+  _ <-
+    array_to_slice_mut_back u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ])
+      s1;
+  s2 <- index_mut_slice_u32_0_back s;
+  _ <-
+    array_to_slice_mut_back u32 2%usize (mk_array u32 2%usize [ 0%u32; 0%u32 ])
+      s2;
+  Return tt
+.
+
 End Array_Funs .
diff --git a/tests/coq/array/Array_Types.v b/tests/coq/array/Array_Types.v
index 7e1f2a07..7be6dc9b 100644
--- a/tests/coq/array/Array_Types.v
+++ b/tests/coq/array/Array_Types.v
@@ -8,4 +8,7 @@ Import ListNotations.
 Local Open Scope Primitives_scope.
 Module Array_Types.
 
+(** [array::T] *)
+Inductive T_t := | TA : T_t | TB : T_t.
+
 End Array_Types .
diff --git a/tests/fstar/array/Array.Funs.fst b/tests/fstar/array/Array.Funs.fst
index 985633bc..7c1d0b09 100644
--- a/tests/fstar/array/Array.Funs.fst
+++ b/tests/fstar/array/Array.Funs.fst
@@ -151,18 +151,125 @@ let update_update_array_fwd
 let array_local_deep_copy_fwd (x : array u32 32) : result unit =
   Return ()
 
-(** [array::f0]: forward function *)
-let f0_fwd : result unit =
-  let* s = array_to_slice_mut_fwd u32 2 (mk_array u32 2 [ 1; 2 ]) in
-  let* s0 = slice_index_mut_back u32 s 0 1 in
-  let* _ = array_to_slice_mut_back u32 2 (mk_array u32 2 [ 1; 2 ]) s0 in
+(** [array::take_array]: forward function *)
+let take_array_fwd (a : array u32 2) : result unit =
   Return ()
 
-(** [array::f1]: forward function *)
-let f1_fwd : result unit =
-  let* _ = array_index_mut_back u32 2 (mk_array u32 2 [ 1; 2 ]) 0 1 in
+(** [array::take_array_borrow]: forward function *)
+let take_array_borrow_fwd (a : array u32 2) : result unit =
+  Return ()
+
+(** [array::take_slice]: forward function *)
+let take_slice_fwd (s : slice u32) : result unit =
+  Return ()
+
+(** [array::take_mut_slice]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ()) *)
+let take_mut_slice_fwd_back (s : slice u32) : result (slice u32) =
+  Return s
+
+(** [array::take_all]: forward function *)
+let take_all_fwd : result unit =
+  let* _ = take_array_fwd (mk_array u32 2 [ 0; 0 ]) in
+  let* _ = take_array_borrow_fwd (mk_array u32 2 [ 0; 0 ]) in
+  let* s = array_to_slice_shared u32 2 (mk_array u32 2 [ 0; 0 ]) in
+  let* _ = take_slice_fwd s in
+  let* s0 = array_to_slice_mut_fwd u32 2 (mk_array u32 2 [ 0; 0 ]) in
+  let* s1 = take_mut_slice_fwd_back s0 in
+  let* _ = array_to_slice_mut_back u32 2 (mk_array u32 2 [ 0; 0 ]) s1 in
+  Return ()
+
+(** [array::index_array]: forward function *)
+let index_array_fwd (x : array u32 2) : result u32 =
+  array_index_shared u32 2 x 0
+
+(** [array::index_array_borrow]: forward function *)
+let index_array_borrow_fwd (x : array u32 2) : result u32 =
+  array_index_shared u32 2 x 0
+
+(** [array::index_slice_u32_0]: forward function *)
+let index_slice_u32_0_fwd (x : slice u32) : result u32 =
+  slice_index_shared u32 x 0
+
+(** [array::index_mut_slice_u32_0]: forward function *)
+let index_mut_slice_u32_0_fwd (x : slice u32) : result u32 =
+  slice_index_shared u32 x 0
+
+(** [array::index_mut_slice_u32_0]: backward function 0 *)
+let index_mut_slice_u32_0_back (x : slice u32) : result (slice u32) =
+  let* _ = slice_index_shared u32 x 0 in Return x
+
+(** [array::index_all]: forward function *)
+let index_all_fwd : result u32 =
+  let* i = index_array_fwd (mk_array u32 2 [ 0; 0 ]) in
+  let* i0 = index_array_fwd (mk_array u32 2 [ 0; 0 ]) in
+  let* i1 = u32_add i i0 in
+  let* i2 = index_array_borrow_fwd (mk_array u32 2 [ 0; 0 ]) in
+  let* i3 = u32_add i1 i2 in
+  let* s = array_to_slice_shared u32 2 (mk_array u32 2 [ 0; 0 ]) in
+  let* i4 = index_slice_u32_0_fwd s in
+  let* i5 = u32_add i3 i4 in
+  let* s0 = array_to_slice_mut_fwd u32 2 (mk_array u32 2 [ 0; 0 ]) in
+  let* i6 = index_mut_slice_u32_0_fwd s0 in
+  let* i7 = u32_add i5 i6 in
+  let* s1 = index_mut_slice_u32_0_back s0 in
+  let* _ = array_to_slice_mut_back u32 2 (mk_array u32 2 [ 0; 0 ]) s1 in
+  Return i7
+
+(** [array::update_array]: forward function *)
+let update_array_fwd (x : array u32 2) : result unit =
+  let* _ = array_index_mut_back u32 2 x 0 1 in Return ()
+
+(** [array::update_array_mut_borrow]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ()) *)
+let update_array_mut_borrow_fwd_back (x : array u32 2) : result (array u32 2) =
+  array_index_mut_back u32 2 x 0 1
+
+(** [array::update_mut_slice]: merged forward/backward function
+    (there is a single backward function, and the forward function returns ()) *)
+let update_mut_slice_fwd_back (x : slice u32) : result (slice u32) =
+  slice_index_mut_back u32 x 0 1
+
+(** [array::update_all]: forward function *)
+let update_all_fwd : result unit =
+  let* _ = update_array_fwd (mk_array u32 2 [ 0; 0 ]) in
+  let* x = update_array_mut_borrow_fwd_back (mk_array u32 2 [ 0; 0 ]) in
+  let* s = array_to_slice_mut_fwd u32 2 x in
+  let* s0 = update_mut_slice_fwd_back s in
+  let* _ = array_to_slice_mut_back u32 2 x s0 in
+  Return ()
+
+(** [array::range_all]: forward function *)
+let range_all_fwd : result unit =
+  let* s =
+    array_subslice_mut_fwd u32 4 (mk_array u32 4 [ 0; 0; 0; 0 ]) (Mkrange 1 3)
+    in
+  let* s0 = update_mut_slice_fwd_back s in
+  let* _ =
+    array_subslice_mut_back u32 4 (mk_array u32 4 [ 0; 0; 0; 0 ]) (Mkrange 1 3)
+      s0 in
+  Return ()
+
+(** [array::deref_array_borrow]: forward function *)
+let deref_array_borrow_fwd (x : array u32 2) : result u32 =
+  array_index_shared u32 2 x 0
+
+(** [array::deref_array_mut_borrow]: forward function *)
+let deref_array_mut_borrow_fwd (x : array u32 2) : result u32 =
+  array_index_shared u32 2 x 0
+
+(** [array::deref_array_mut_borrow]: backward function 0 *)
+let deref_array_mut_borrow_back (x : array u32 2) : result (array u32 2) =
+  let* _ = array_index_shared u32 2 x 0 in Return x
+
+(** [array::take_array_t]: forward function *)
+let take_array_t_fwd (a : array t_t 2) : result unit =
   Return ()
 
+(** [array::non_copyable_array]: forward function *)
+let non_copyable_array_fwd : result unit =
+  let* _ = take_array_t_fwd (mk_array t_t 2 [ TA; TB ]) in Return ()
+
 (** [array::sum]: loop 0: forward function *)
 let rec sum_loop_fwd
   (s : slice u32) (sum : u32) (i : usize) :
@@ -203,6 +310,18 @@ let sum2_fwd (s : slice u32) (s2 : slice u32) : result u32 =
   let i0 = slice_len u32 s2 in
   if not (i = i0) then Fail Failure else sum2_loop_fwd s s2 0 0
 
+(** [array::f0]: forward function *)
+let f0_fwd : result unit =
+  let* s = array_to_slice_mut_fwd u32 2 (mk_array u32 2 [ 1; 2 ]) in
+  let* s0 = slice_index_mut_back u32 s 0 1 in
+  let* _ = array_to_slice_mut_back u32 2 (mk_array u32 2 [ 1; 2 ]) s0 in
+  Return ()
+
+(** [array::f1]: forward function *)
+let f1_fwd : result unit =
+  let* _ = array_index_mut_back u32 2 (mk_array u32 2 [ 1; 2 ]) 0 1 in
+  Return ()
+
 (** [array::f2]: forward function *)
 let f2_fwd (i : u32) : result unit =
   Return ()
@@ -224,3 +343,13 @@ let f3_fwd : result u32 =
         ]) 16 18 in
   sum2_fwd s s0
 
+(** [array::ite]: forward function *)
+let ite_fwd : result unit =
+  let* s = array_to_slice_mut_fwd u32 2 (mk_array u32 2 [ 0; 0 ]) in
+  let* s0 = array_to_slice_mut_fwd u32 2 (mk_array u32 2 [ 0; 0 ]) in
+  let* s1 = index_mut_slice_u32_0_back s0 in
+  let* _ = array_to_slice_mut_back u32 2 (mk_array u32 2 [ 0; 0 ]) s1 in
+  let* s2 = index_mut_slice_u32_0_back s in
+  let* _ = array_to_slice_mut_back u32 2 (mk_array u32 2 [ 0; 0 ]) s2 in
+  Return ()
+
diff --git a/tests/fstar/array/Array.Types.fst b/tests/fstar/array/Array.Types.fst
index d20f1718..5e8e81d8 100644
--- a/tests/fstar/array/Array.Types.fst
+++ b/tests/fstar/array/Array.Types.fst
@@ -5,3 +5,6 @@ open Primitives
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
+(** [array::T] *)
+type t_t = | TA : t_t | TB : t_t
+
diff --git a/tests/lean/Array/Funs.lean b/tests/lean/Array/Funs.lean
index 8a2c1045..ad737dca 100644
--- a/tests/lean/Array/Funs.lean
+++ b/tests/lean/Array/Funs.lean
@@ -8,45 +8,45 @@ namespace array
 
 /- [array::array_to_shared_slice_]: forward function -/
 def array_to_shared_slice_
-  (T : Type) (s : Array T (Usize.ofInt 32)) : Result (Slice T) :=
-  Array.to_slice_shared T (Usize.ofInt 32) s
+  (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_
-  (T : Type) (s : Array T (Usize.ofInt 32)) : Result (Slice T) :=
-  Array.to_slice_mut T (Usize.ofInt 32) s
+  (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
-  (T : Type) (s : Array T (Usize.ofInt 32)) (ret0 : Slice T) :
-  Result (Array T (Usize.ofInt 32))
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) (ret0 : Slice T0) :
+  Result (Array T0 (Usize.ofInt 32))
   :=
-  Array.to_slice_mut_back T (Usize.ofInt 32) s ret0
+  Array.to_slice_mut_back T0 (Usize.ofInt 32) s ret0
 
 /- [array::array_len]: forward function -/
-def array_len (T : Type) (s : Array T (Usize.ofInt 32)) : Result Usize :=
+def array_len (T0 : Type) (s : Array T0 (Usize.ofInt 32)) : Result Usize :=
   do
-    let s0 ← Array.to_slice_shared T (Usize.ofInt 32) s
-    let i := Slice.len T s0
+    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
-  (T : Type) (s : Array T (Usize.ofInt 32)) : Result Usize :=
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) : Result Usize :=
   do
-    let s0 ← Array.to_slice_shared T (Usize.ofInt 32) s
-    let i := Slice.len T s0
+    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 (T : Type) (s : Slice T) : Result Usize :=
-  let i := Slice.len T s
+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
-  (T : Type) (s : Array T (Usize.ofInt 32)) (i : Usize) : Result T :=
-  Array.index_shared T (Usize.ofInt 32) s i
+  (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
@@ -69,28 +69,28 @@ def index_array_copy (x : Array U32 (Usize.ofInt 32)) : Result U32 :=
 
 /- [array::index_mut_array]: forward function -/
 def index_mut_array
-  (T : Type) (s : Array T (Usize.ofInt 32)) (i : Usize) : Result T :=
-  Array.index_mut T (Usize.ofInt 32) s i
+  (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
-  (T : Type) (s : Array T (Usize.ofInt 32)) (i : Usize) (ret0 : T) :
-  Result (Array T (Usize.ofInt 32))
+  (T0 : Type) (s : Array T0 (Usize.ofInt 32)) (i : Usize) (ret0 : T0) :
+  Result (Array T0 (Usize.ofInt 32))
   :=
-  Array.index_mut_back T (Usize.ofInt 32) s i ret0
+  Array.index_mut_back T0 (Usize.ofInt 32) s i ret0
 
 /- [array::index_slice]: forward function -/
-def index_slice (T : Type) (s : Slice T) (i : Usize) : Result T :=
-  Slice.index_shared T s i
+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 (T : Type) (s : Slice T) (i : Usize) : Result T :=
-  Slice.index_mut T s i
+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
-  (T : Type) (s : Slice T) (i : Usize) (ret0 : T) : Result (Slice T) :=
-  Slice.index_mut_back T s i ret0
+  (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_
@@ -148,12 +148,12 @@ def array_subslice_mut__back
   Array.subslice_mut_back U32 (Usize.ofInt 32) x (Range.mk y z) ret0
 
 /- [array::index_slice_0]: forward function -/
-def index_slice_0 (T : Type) (s : Slice T) : Result T :=
-  Slice.index_shared T s (Usize.ofInt 0)
+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 (T : Type) (s : Array T (Usize.ofInt 32)) : Result T :=
-  Array.index_shared T (Usize.ofInt 32) s (Usize.ofInt 0)
+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
@@ -183,25 +183,168 @@ def update_update_array
 def array_local_deep_copy (x : Array U32 (Usize.ofInt 32)) : Result Unit :=
   Result.ret ()
 
-/- [array::f0]: forward function -/
-def f0 : Result Unit :=
+/- [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 1), (U32.ofInt 2) ])
-    let s0 ← Slice.index_mut_back U32 s (Usize.ofInt 0) (U32.ofInt 1)
+        (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 1), (U32.ofInt 2) ]) s0
+        (Array.make U32 (Usize.ofInt 2) [ (U32.ofInt 0), (U32.ofInt 0) ]) s1
     Result.ret ()
 
-/- [array::f1]: forward function -/
-def f1 : Result Unit :=
+/- [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.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)
+      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 -/
@@ -243,6 +386,27 @@ def sum2 (s : Slice U32) (s2 : Slice U32) : Result U32 :=
   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 ()
@@ -279,4 +443,23 @@ def f3 : Result U32 :=
           ]) (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
index 407ce826..72241276 100644
--- a/tests/lean/Array/Types.lean
+++ b/tests/lean/Array/Types.lean
@@ -5,4 +5,9 @@ open Primitives
 
 namespace array
 
+/- [array::T] -/
+inductive T :=
+| A : T
+| B : T
+
 end array