summaryrefslogtreecommitdiff
path: root/tests/coq
diff options
context:
space:
mode:
Diffstat (limited to 'tests/coq')
-rw-r--r--tests/coq/array/Array.v18
-rw-r--r--tests/coq/betree/BetreeMain_Funs.v40
-rw-r--r--tests/coq/hashmap/Hashmap_Funs.v8
-rw-r--r--tests/coq/hashmap_on_disk/HashmapMain_Funs.v10
-rw-r--r--tests/coq/misc/External_Funs.v4
-rw-r--r--tests/coq/misc/NoNestedBorrows.v37
-rw-r--r--tests/coq/misc/Paper.v11
-rw-r--r--tests/coq/misc/PoloniusList.v8
-rw-r--r--tests/coq/traits/Traits.v2
9 files changed, 47 insertions, 91 deletions
diff --git a/tests/coq/array/Array.v b/tests/coq/array/Array.v
index faa0e92c..3a30413a 100644
--- a/tests/coq/array/Array.v
+++ b/tests/coq/array/Array.v
@@ -32,8 +32,7 @@ Definition array_to_mut_slice_
:=
p <- array_to_slice_mut T 32%usize s;
let (s1, to_slice_mut_back) := p in
- let back := fun (ret : slice T) => to_slice_mut_back ret in
- Return (s1, back)
+ Return (s1, to_slice_mut_back)
.
(** [array::array_len]:
@@ -81,8 +80,7 @@ Definition index_mut_array
:=
p <- array_index_mut_usize T 32%usize s i;
let (t, index_mut_back) := p in
- let back := fun (ret : T) => index_mut_back ret in
- Return (t, back)
+ Return (t, index_mut_back)
.
(** [array::index_slice]:
@@ -99,8 +97,7 @@ Definition index_mut_slice
:=
p <- slice_index_mut_usize T s i;
let (t, index_mut_back) := p in
- let back := fun (ret : T) => index_mut_back ret in
- Return (t, back)
+ Return (t, index_mut_back)
.
(** [array::slice_subslice_shared_]:
@@ -123,8 +120,7 @@ Definition slice_subslice_mut_
(core_slice_index_SliceIndexRangeUsizeSliceTInst u32) x
{| core_ops_range_Range_start := y; core_ops_range_Range_end_ := z |};
let (s, index_mut_back) := p in
- let back := fun (ret : slice u32) => index_mut_back ret in
- Return (s, back)
+ Return (s, index_mut_back)
.
(** [array::array_to_slice_shared_]:
@@ -142,8 +138,7 @@ Definition array_to_slice_mut_
:=
p <- array_to_slice_mut u32 32%usize x;
let (s, to_slice_mut_back) := p in
- let back := fun (ret : slice u32) => to_slice_mut_back ret in
- Return (s, back)
+ Return (s, to_slice_mut_back)
.
(** [array::array_subslice_shared_]:
@@ -168,8 +163,7 @@ Definition array_subslice_mut_
(core_slice_index_SliceIndexRangeUsizeSliceTInst u32)) x
{| core_ops_range_Range_start := y; core_ops_range_Range_end_ := z |};
let (s, index_mut_back) := p in
- let back := fun (ret : slice u32) => index_mut_back ret in
- Return (s, back)
+ Return (s, index_mut_back)
.
(** [array::index_slice_0]:
diff --git a/tests/coq/betree/BetreeMain_Funs.v b/tests/coq/betree/BetreeMain_Funs.v
index 516bc7b7..cefab0f4 100644
--- a/tests/coq/betree/BetreeMain_Funs.v
+++ b/tests/coq/betree/BetreeMain_Funs.v
@@ -123,8 +123,7 @@ Fixpoint betree_List_split_at
i <- u64_sub n1 1%u64;
p <- betree_List_split_at T n2 tl i;
let (ls0, ls1) := p in
- let l := ls0 in
- Return (Betree_List_Cons hd l, ls1)
+ Return (Betree_List_Cons hd ls0, ls1)
| Betree_List_Nil => Fail_ Failure
end
end
@@ -135,8 +134,7 @@ Fixpoint betree_List_split_at
Definition betree_List_push_front
(T : Type) (self : betree_List_t T) (x : T) : result (betree_List_t T) :=
let (tl, _) := core_mem_replace (betree_List_t T) self Betree_List_Nil in
- let l := tl in
- Return (Betree_List_Cons x l)
+ Return (Betree_List_Cons x tl)
.
(** [betree_main::betree::{betree_main::betree::List<T>#1}::pop_front]:
@@ -186,8 +184,7 @@ Fixpoint betree_ListTupleU64T_partition_at_pivot
else (
p <- betree_ListTupleU64T_partition_at_pivot T n1 tl pivot;
let (ls0, ls1) := p in
- let l := ls0 in
- Return (Betree_List_Cons (i, t) l, ls1))
+ Return (Betree_List_Cons (i, t) ls0, ls1))
| Betree_List_Nil => Return (Betree_List_Nil, Betree_List_Nil)
end
end
@@ -242,10 +239,7 @@ Fixpoint betree_Node_lookup_first_message_for_key
| Betree_List_Cons x next_msgs =>
let (i, m) := x in
if i s>= key
- then
- let back_'a :=
- fun (ret : betree_List_t (u64 * betree_Message_t)) => Return ret in
- Return (Betree_List_Cons (i, m) next_msgs, back_'a)
+ then Return (Betree_List_Cons (i, m) next_msgs, Return)
else (
p <- betree_Node_lookup_first_message_for_key n1 key next_msgs;
let (l, lookup_first_message_for_key_back) := p in
@@ -254,10 +248,7 @@ Fixpoint betree_Node_lookup_first_message_for_key
next_msgs1 <- lookup_first_message_for_key_back ret;
Return (Betree_List_Cons (i, m) next_msgs1) in
Return (l, back_'a))
- | Betree_List_Nil =>
- let back_'a :=
- fun (ret : betree_List_t (u64 * betree_Message_t)) => Return ret in
- Return (Betree_List_Nil, back_'a)
+ | Betree_List_Nil => Return (Betree_List_Nil, Return)
end
end
.
@@ -456,14 +447,8 @@ Fixpoint betree_Node_lookup_first_message_after_key
next_msgs1 <- lookup_first_message_after_key_back ret;
Return (Betree_List_Cons (k, m) next_msgs1) in
Return (l, back_'a))
- else
- let back_'a :=
- fun (ret : betree_List_t (u64 * betree_Message_t)) => Return ret in
- Return (Betree_List_Cons (k, m) next_msgs, back_'a)
- | Betree_List_Nil =>
- let back_'a :=
- fun (ret : betree_List_t (u64 * betree_Message_t)) => Return ret in
- Return (Betree_List_Nil, back_'a)
+ else Return (Betree_List_Cons (k, m) next_msgs, Return)
+ | Betree_List_Nil => Return (Betree_List_Nil, Return)
end
end
.
@@ -562,9 +547,7 @@ Fixpoint betree_Node_lookup_mut_in_bindings
| Betree_List_Cons hd tl =>
let (i, i1) := hd in
if i s>= key
- then
- let back_'a := fun (ret : betree_List_t (u64 * u64)) => Return ret in
- Return (Betree_List_Cons (i, i1) tl, back_'a)
+ then Return (Betree_List_Cons (i, i1) tl, Return)
else (
p <- betree_Node_lookup_mut_in_bindings n1 key tl;
let (l, lookup_mut_in_bindings_back) := p in
@@ -573,9 +556,7 @@ Fixpoint betree_Node_lookup_mut_in_bindings
tl1 <- lookup_mut_in_bindings_back ret;
Return (Betree_List_Cons (i, i1) tl1) in
Return (l, back_'a))
- | Betree_List_Nil =>
- let back_'a := fun (ret : betree_List_t (u64 * u64)) => Return ret in
- Return (Betree_List_Nil, back_'a)
+ | Betree_List_Nil => Return (Betree_List_Nil, Return)
end
end
.
@@ -751,10 +732,9 @@ Definition betree_Node_apply
(new_msg : betree_Message_t) (st : state) :
result (state * (betree_Node_t * betree_NodeIdCounter_t))
:=
- let l := Betree_List_Nil in
p <-
betree_Node_apply_messages n self params node_id_cnt (Betree_List_Cons
- (key, new_msg) l) st;
+ (key, new_msg) Betree_List_Nil) st;
let (st1, p1) := p in
let (self1, node_id_cnt1) := p1 in
Return (st1, (self1, node_id_cnt1))
diff --git a/tests/coq/hashmap/Hashmap_Funs.v b/tests/coq/hashmap/Hashmap_Funs.v
index 5cd9fe70..0478edbe 100644
--- a/tests/coq/hashmap/Hashmap_Funs.v
+++ b/tests/coq/hashmap/Hashmap_Funs.v
@@ -49,8 +49,7 @@ Definition hashMap_new_with_capacity
(max_load_divisor : usize) :
result (HashMap_t T)
:=
- let v := alloc_vec_Vec_new (List_t T) in
- slots <- hashMap_allocate_slots T n v capacity;
+ slots <- hashMap_allocate_slots T n (alloc_vec_Vec_new (List_t T)) capacity;
i <- usize_mul capacity max_load_dividend;
i1 <- usize_div i max_load_divisor;
Return
@@ -128,7 +127,7 @@ Fixpoint hashMap_insert_in_list_loop
p <- hashMap_insert_in_list_loop T n1 key value tl;
let (b, back) := p in
Return (b, List_Cons ckey cvalue back))
- | List_Nil => let l := List_Nil in Return (true, List_Cons key value l)
+ | List_Nil => Return (true, List_Cons key value List_Nil)
end
end
.
@@ -401,8 +400,7 @@ Definition hashMap_get_mut_in_list
:=
p <- hashMap_get_mut_in_list_loop T n ls key;
let (t, back_'a) := p in
- let back_'a1 := fun (ret : T) => back_'a ret in
- Return (t, back_'a1)
+ Return (t, back_'a)
.
(** [hashmap::{hashmap::HashMap<T>}::get_mut]:
diff --git a/tests/coq/hashmap_on_disk/HashmapMain_Funs.v b/tests/coq/hashmap_on_disk/HashmapMain_Funs.v
index b74fa61a..6a7eeb2d 100644
--- a/tests/coq/hashmap_on_disk/HashmapMain_Funs.v
+++ b/tests/coq/hashmap_on_disk/HashmapMain_Funs.v
@@ -53,8 +53,9 @@ Definition hashmap_HashMap_new_with_capacity
(max_load_divisor : usize) :
result (hashmap_HashMap_t T)
:=
- let v := alloc_vec_Vec_new (hashmap_List_t T) in
- slots <- hashmap_HashMap_allocate_slots T n v capacity;
+ slots <-
+ hashmap_HashMap_allocate_slots T n (alloc_vec_Vec_new (hashmap_List_t T))
+ capacity;
i <- usize_mul capacity max_load_dividend;
i1 <- usize_div i max_load_divisor;
Return
@@ -138,7 +139,7 @@ Fixpoint hashmap_HashMap_insert_in_list_loop
let (b, back) := p in
Return (b, Hashmap_List_Cons ckey cvalue back))
| Hashmap_List_Nil =>
- let l := Hashmap_List_Nil in Return (true, Hashmap_List_Cons key value l)
+ Return (true, Hashmap_List_Cons key value Hashmap_List_Nil)
end
end
.
@@ -424,8 +425,7 @@ Definition hashmap_HashMap_get_mut_in_list
:=
p <- hashmap_HashMap_get_mut_in_list_loop T n ls key;
let (t, back_'a) := p in
- let back_'a1 := fun (ret : T) => back_'a ret in
- Return (t, back_'a1)
+ Return (t, back_'a)
.
(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut]:
diff --git a/tests/coq/misc/External_Funs.v b/tests/coq/misc/External_Funs.v
index 049f5d39..91ea88c9 100644
--- a/tests/coq/misc/External_Funs.v
+++ b/tests/coq/misc/External_Funs.v
@@ -31,9 +31,7 @@ Definition test_new_non_zero_u32
(** [external::test_vec]:
Source: 'src/external.rs', lines 17:0-17:17 *)
Definition test_vec : result unit :=
- let v := alloc_vec_Vec_new u32 in
- _ <- alloc_vec_Vec_push u32 v 0%u32;
- Return tt
+ _ <- alloc_vec_Vec_push u32 (alloc_vec_Vec_new u32) 0%u32; Return tt
.
(** Unit test for [external::test_vec] *)
diff --git a/tests/coq/misc/NoNestedBorrows.v b/tests/coq/misc/NoNestedBorrows.v
index 081c65c3..8857d4b6 100644
--- a/tests/coq/misc/NoNestedBorrows.v
+++ b/tests/coq/misc/NoNestedBorrows.v
@@ -244,11 +244,10 @@ Check (test_list1 )%return.
(** [no_nested_borrows::test_box1]:
Source: 'src/no_nested_borrows.rs', lines 208:0-208:18 *)
Definition test_box1 : result unit :=
- let b := 0%i32 in
- p <- alloc_boxed_Box_deref_mut i32 b;
+ p <- alloc_boxed_Box_deref_mut i32 0%i32;
let (_, deref_mut_back) := p in
- b1 <- deref_mut_back 1%i32;
- x <- alloc_boxed_Box_deref i32 b1;
+ b <- deref_mut_back 1%i32;
+ x <- alloc_boxed_Box_deref i32 b;
if negb (x s= 1%i32) then Fail_ Failure else Return tt
.
@@ -290,8 +289,7 @@ Definition is_cons (T : Type) (l : List_t T) : result bool :=
(** [no_nested_borrows::test_is_cons]:
Source: 'src/no_nested_borrows.rs', lines 253:0-253:21 *)
Definition test_is_cons : result unit :=
- let l := List_Nil in
- b <- is_cons i32 (List_Cons 0%i32 l);
+ b <- is_cons i32 (List_Cons 0%i32 List_Nil);
if negb b then Fail_ Failure else Return tt
.
@@ -310,8 +308,7 @@ Definition split_list (T : Type) (l : List_t T) : result (T * (List_t T)) :=
(** [no_nested_borrows::test_split_list]:
Source: 'src/no_nested_borrows.rs', lines 267:0-267:24 *)
Definition test_split_list : result unit :=
- let l := List_Nil in
- p <- split_list i32 (List_Cons 0%i32 l);
+ p <- split_list i32 (List_Cons 0%i32 List_Nil);
let (hd, _) := p in
if negb (hd s= 0%i32) then Fail_ Failure else Return tt
.
@@ -436,26 +433,25 @@ Definition list_rev (T : Type) (l : List_t T) : result (List_t T) :=
(** [no_nested_borrows::test_list_functions]:
Source: 'src/no_nested_borrows.rs', lines 398:0-398:28 *)
Definition test_list_functions : result unit :=
- let l := List_Nil in
- let l1 := List_Cons 2%i32 l in
- let l2 := List_Cons 1%i32 l1 in
- i <- list_length i32 (List_Cons 0%i32 l2);
+ let l := List_Cons 2%i32 List_Nil in
+ let l1 := List_Cons 1%i32 l in
+ i <- list_length i32 (List_Cons 0%i32 l1);
if negb (i s= 3%u32)
then Fail_ Failure
else (
- i1 <- list_nth_shared i32 (List_Cons 0%i32 l2) 0%u32;
+ i1 <- list_nth_shared i32 (List_Cons 0%i32 l1) 0%u32;
if negb (i1 s= 0%i32)
then Fail_ Failure
else (
- i2 <- list_nth_shared i32 (List_Cons 0%i32 l2) 1%u32;
+ i2 <- list_nth_shared i32 (List_Cons 0%i32 l1) 1%u32;
if negb (i2 s= 1%i32)
then Fail_ Failure
else (
- i3 <- list_nth_shared i32 (List_Cons 0%i32 l2) 2%u32;
+ i3 <- list_nth_shared i32 (List_Cons 0%i32 l1) 2%u32;
if negb (i3 s= 2%i32)
then Fail_ Failure
else (
- p <- list_nth_mut i32 (List_Cons 0%i32 l2) 1%u32;
+ p <- list_nth_mut i32 (List_Cons 0%i32 l1) 1%u32;
let (_, list_nth_mut_back) := p in
ls <- list_nth_mut_back 3%i32;
i4 <- list_nth_shared i32 ls 0%u32;
@@ -502,9 +498,7 @@ Definition id_mut_pair3
(T1 T2 : Type) (x : T1) (y : T2) :
result ((T1 * T2) * (T1 -> result T1) * (T2 -> result T2))
:=
- let back_'a := fun (ret : T1) => Return ret in
- let back_'b := fun (ret : T2) => Return ret in
- Return ((x, y), back_'a, back_'b)
+ Return ((x, y), Return, Return)
.
(** [no_nested_borrows::id_mut_pair4]:
@@ -513,10 +507,7 @@ Definition id_mut_pair4
(T1 T2 : Type) (p : (T1 * T2)) :
result ((T1 * T2) * (T1 -> result T1) * (T2 -> result T2))
:=
- let (t, t1) := p in
- let back_'a := fun (ret : T1) => Return ret in
- let back_'b := fun (ret : T2) => Return ret in
- Return ((t, t1), back_'a, back_'b)
+ let (t, t1) := p in Return ((t, t1), Return, Return)
.
(** [no_nested_borrows::StructWithTuple]
diff --git a/tests/coq/misc/Paper.v b/tests/coq/misc/Paper.v
index e46df0ce..769cf34c 100644
--- a/tests/coq/misc/Paper.v
+++ b/tests/coq/misc/Paper.v
@@ -96,14 +96,13 @@ Fixpoint sum (l : List_t i32) : result i32 :=
(** [paper::test_nth]:
Source: 'src/paper.rs', lines 68:0-68:17 *)
Definition test_nth : result unit :=
- let l := List_Nil in
- let l1 := List_Cons 3%i32 l in
- let l2 := List_Cons 2%i32 l1 in
- p <- list_nth_mut i32 (List_Cons 1%i32 l2) 2%u32;
+ let l := List_Cons 3%i32 List_Nil in
+ let l1 := List_Cons 2%i32 l in
+ p <- list_nth_mut i32 (List_Cons 1%i32 l1) 2%u32;
let (x, list_nth_mut_back) := p in
x1 <- i32_add x 1%i32;
- l3 <- list_nth_mut_back x1;
- i <- sum l3;
+ l2 <- list_nth_mut_back x1;
+ i <- sum l2;
if negb (i s= 7%i32) then Fail_ Failure else Return tt
.
diff --git a/tests/coq/misc/PoloniusList.v b/tests/coq/misc/PoloniusList.v
index 7e967855..8f403a8e 100644
--- a/tests/coq/misc/PoloniusList.v
+++ b/tests/coq/misc/PoloniusList.v
@@ -27,9 +27,7 @@ Fixpoint get_list_at_x
match ls with
| List_Cons hd tl =>
if hd s= x
- then
- let back_'a := fun (ret : List_t u32) => Return ret in
- Return (List_Cons hd tl, back_'a)
+ then Return (List_Cons hd tl, Return)
else (
p <- get_list_at_x tl x;
let (l, get_list_at_x_back) := p in
@@ -37,9 +35,7 @@ Fixpoint get_list_at_x
fun (ret : List_t u32) =>
tl1 <- get_list_at_x_back ret; Return (List_Cons hd tl1) in
Return (l, back_'a))
- | List_Nil =>
- let back_'a := fun (ret : List_t u32) => Return ret in
- Return (List_Nil, back_'a)
+ | List_Nil => Return (List_Nil, Return)
end
.
diff --git a/tests/coq/traits/Traits.v b/tests/coq/traits/Traits.v
index 7055e25d..7abf2021 100644
--- a/tests/coq/traits/Traits.v
+++ b/tests/coq/traits/Traits.v
@@ -334,7 +334,7 @@ Definition use_with_const_ty1
(H : Type) (LEN : usize) (withConstTyHLENInst : WithConstTy_t H LEN) :
result usize
:=
- let i := withConstTyHLENInst.(WithConstTy_tWithConstTy_t_LEN1) in Return i
+ Return withConstTyHLENInst.(WithConstTy_tWithConstTy_t_LEN1)
.
(** [traits::use_with_const_ty2]:
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-19 14:19:00 +0000