summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorSon Ho2023-12-05 15:00:46 +0100
committerSon Ho2023-12-05 15:00:46 +0100
commit60ce69b83cbd749781543bb16becb5357f0e1a0a (patch)
treebd847cb3ed7a00644ea643325468e5328f06e220 /tests
parent054d7256ed90f752ae6b39ebba608f89076d38e7 (diff)
Update following changes in Charon
Diffstat (limited to '')
-rw-r--r--tests/coq/betree/BetreeMain_Funs.v46
-rw-r--r--tests/coq/misc/NoNestedBorrows.v204
-rw-r--r--tests/coq/misc/_CoqProject2
-rw-r--r--tests/fstar/betree/BetreeMain.Clauses.Template.fst14
-rw-r--r--tests/fstar/betree/BetreeMain.Funs.fst32
-rw-r--r--tests/fstar/betree_back_stateful/BetreeMain.Clauses.Template.fst14
-rw-r--r--tests/fstar/betree_back_stateful/BetreeMain.Funs.fst32
-rw-r--r--tests/fstar/misc/NoNestedBorrows.fst202
-rw-r--r--tests/lean/BetreeMain/Funs.lean30
-rw-r--r--tests/lean/NoNestedBorrows.lean204
10 files changed, 476 insertions, 304 deletions
diff --git a/tests/coq/betree/BetreeMain_Funs.v b/tests/coq/betree/BetreeMain_Funs.v
index aadaa20d..a5dd4230 100644
--- a/tests/coq/betree/BetreeMain_Funs.v
+++ b/tests/coq/betree/BetreeMain_Funs.v
@@ -318,6 +318,29 @@ Fixpoint betree_Node_lookup_first_message_for_key_back
end
.
+(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
+ Source: 'src/betree.rs', lines 636:4-636:80 *)
+Fixpoint betree_Node_lookup_in_bindings
+ (n : nat) (key : u64) (bindings : betree_List_t (u64 * u64)) :
+ result (option u64)
+ :=
+ match n with
+ | O => Fail_ OutOfFuel
+ | S n0 =>
+ match bindings with
+ | Betree_List_Cons hd tl =>
+ let (i, i0) := hd in
+ if i s= key
+ then Return (Some i0)
+ else
+ if i s> key
+ then Return None
+ else betree_Node_lookup_in_bindings n0 key tl
+ | Betree_List_Nil => Return None
+ end
+ end
+.
+
(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: forward function
Source: 'src/betree.rs', lines 819:4-819:90 *)
Fixpoint betree_Node_apply_upserts
@@ -382,29 +405,6 @@ Fixpoint betree_Node_apply_upserts_back
end
.
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
- Source: 'src/betree.rs', lines 636:4-636:80 *)
-Fixpoint betree_Node_lookup_in_bindings
- (n : nat) (key : u64) (bindings : betree_List_t (u64 * u64)) :
- result (option u64)
- :=
- match n with
- | O => Fail_ OutOfFuel
- | S n0 =>
- match bindings with
- | Betree_List_Cons hd tl =>
- let (i, i0) := hd in
- if i s= key
- then Return (Some i0)
- else
- if i s> key
- then Return None
- else betree_Node_lookup_in_bindings n0 key tl
- | Betree_List_Nil => Return None
- end
- end
-.
-
(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: forward function
Source: 'src/betree.rs', lines 395:4-395:63 *)
Fixpoint betree_Internal_lookup_in_children
diff --git a/tests/coq/misc/NoNestedBorrows.v b/tests/coq/misc/NoNestedBorrows.v
index 16a2e816..1a0014c0 100644
--- a/tests/coq/misc/NoNestedBorrows.v
+++ b/tests/coq/misc/NoNestedBorrows.v
@@ -59,53 +59,111 @@ Arguments Sum_Right { _ _ }.
Definition neg_test (x : i32) : result i32 :=
i32_neg x.
-(** [no_nested_borrows::add_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 54:0-54:38 *)
-Definition add_test (x : u32) (y : u32) : result u32 :=
+(** [no_nested_borrows::add_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 54:0-54:37 *)
+Definition add_u32 (x : u32) (y : u32) : result u32 :=
u32_add x y.
-(** [no_nested_borrows::subs_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 60:0-60:39 *)
-Definition subs_test (x : u32) (y : u32) : result u32 :=
+(** [no_nested_borrows::subs_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 60:0-60:38 *)
+Definition subs_u32 (x : u32) (y : u32) : result u32 :=
u32_sub x y.
-(** [no_nested_borrows::div_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 66:0-66:38 *)
-Definition div_test (x : u32) (y : u32) : result u32 :=
+(** [no_nested_borrows::div_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 66:0-66:37 *)
+Definition div_u32 (x : u32) (y : u32) : result u32 :=
u32_div x y.
-(** [no_nested_borrows::div_test1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 73:0-73:31 *)
-Definition div_test1 (x : u32) : result u32 :=
+(** [no_nested_borrows::div_u32_const]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 73:0-73:35 *)
+Definition div_u32_const (x : u32) : result u32 :=
u32_div x 2%u32.
-(** [no_nested_borrows::rem_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 78:0-78:38 *)
-Definition rem_test (x : u32) (y : u32) : result u32 :=
+(** [no_nested_borrows::rem_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 78:0-78:37 *)
+Definition rem_u32 (x : u32) (y : u32) : result u32 :=
u32_rem x y.
-(** [no_nested_borrows::mul_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 82:0-82:38 *)
-Definition mul_test (x : u32) (y : u32) : result u32 :=
+(** [no_nested_borrows::mul_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 82:0-82:37 *)
+Definition mul_u32 (x : u32) (y : u32) : result u32 :=
u32_mul x y.
+(** [no_nested_borrows::add_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 88:0-88:37 *)
+Definition add_i32 (x : i32) (y : i32) : result i32 :=
+ i32_add x y.
+
+(** [no_nested_borrows::subs_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 92:0-92:38 *)
+Definition subs_i32 (x : i32) (y : i32) : result i32 :=
+ i32_sub x y.
+
+(** [no_nested_borrows::div_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 96:0-96:37 *)
+Definition div_i32 (x : i32) (y : i32) : result i32 :=
+ i32_div x y.
+
+(** [no_nested_borrows::div_i32_const]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 100:0-100:35 *)
+Definition div_i32_const (x : i32) : result i32 :=
+ i32_div x 2%i32.
+
+(** [no_nested_borrows::rem_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 104:0-104:37 *)
+Definition rem_i32 (x : i32) (y : i32) : result i32 :=
+ i32_rem x y.
+
+(** [no_nested_borrows::mul_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 108:0-108:37 *)
+Definition mul_i32 (x : i32) (y : i32) : result i32 :=
+ i32_mul x y.
+
+(** [no_nested_borrows::mix_arith_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 112:0-112:51 *)
+Definition mix_arith_u32 (x : u32) (y : u32) (z : u32) : result u32 :=
+ i <- u32_add x y;
+ i0 <- u32_div x y;
+ i1 <- u32_mul i i0;
+ i2 <- u32_rem z y;
+ i3 <- u32_sub x i2;
+ i4 <- u32_add i1 i3;
+ i5 <- u32_add x y;
+ i6 <- u32_add i5 z;
+ u32_rem i4 i6
+.
+
+(** [no_nested_borrows::mix_arith_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 116:0-116:51 *)
+Definition mix_arith_i32 (x : i32) (y : i32) (z : i32) : result i32 :=
+ i <- i32_add x y;
+ i0 <- i32_div x y;
+ i1 <- i32_mul i i0;
+ i2 <- i32_rem z y;
+ i3 <- i32_sub x i2;
+ i4 <- i32_add i1 i3;
+ i5 <- i32_add x y;
+ i6 <- i32_add i5 z;
+ i32_rem i4 i6
+.
+
(** [no_nested_borrows::CONST0]
- Source: 'src/no_nested_borrows.rs', lines 91:0-91:23 *)
+ Source: 'src/no_nested_borrows.rs', lines 125:0-125:23 *)
Definition const0_body : result usize := usize_add 1%usize 1%usize.
Definition const0_c : usize := const0_body%global.
(** [no_nested_borrows::CONST1]
- Source: 'src/no_nested_borrows.rs', lines 92:0-92:23 *)
+ Source: 'src/no_nested_borrows.rs', lines 126:0-126:23 *)
Definition const1_body : result usize := usize_mul 2%usize 2%usize.
Definition const1_c : usize := const1_body%global.
(** [no_nested_borrows::cast_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 94:0-94:31 *)
+ Source: 'src/no_nested_borrows.rs', lines 128:0-128:31 *)
Definition cast_test (x : u32) : result i32 :=
scalar_cast U32 I32 x.
(** [no_nested_borrows::test2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 99:0-99:14 *)
+ Source: 'src/no_nested_borrows.rs', lines 133:0-133:14 *)
Definition test2 : result unit :=
_ <- u32_add 23%u32 44%u32; Return tt.
@@ -113,13 +171,13 @@ Definition test2 : result unit :=
Check (test2 )%return.
(** [no_nested_borrows::get_max]: forward function
- Source: 'src/no_nested_borrows.rs', lines 111:0-111:37 *)
+ Source: 'src/no_nested_borrows.rs', lines 145:0-145:37 *)
Definition get_max (x : u32) (y : u32) : result u32 :=
if x s>= y then Return x else Return y
.
(** [no_nested_borrows::test3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 119:0-119:14 *)
+ Source: 'src/no_nested_borrows.rs', lines 153:0-153:14 *)
Definition test3 : result unit :=
x <- get_max 4%u32 3%u32;
y <- get_max 10%u32 11%u32;
@@ -131,7 +189,7 @@ Definition test3 : result unit :=
Check (test3 )%return.
(** [no_nested_borrows::test_neg1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 126:0-126:18 *)
+ Source: 'src/no_nested_borrows.rs', lines 160:0-160:18 *)
Definition test_neg1 : result unit :=
y <- i32_neg 3%i32; if negb (y s= (-3)%i32) then Fail_ Failure else Return tt
.
@@ -140,7 +198,7 @@ Definition test_neg1 : result unit :=
Check (test_neg1 )%return.
(** [no_nested_borrows::refs_test1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 133:0-133:19 *)
+ Source: 'src/no_nested_borrows.rs', lines 167:0-167:19 *)
Definition refs_test1 : result unit :=
if negb (1%i32 s= 1%i32) then Fail_ Failure else Return tt
.
@@ -149,7 +207,7 @@ Definition refs_test1 : result unit :=
Check (refs_test1 )%return.
(** [no_nested_borrows::refs_test2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 144:0-144:19 *)
+ Source: 'src/no_nested_borrows.rs', lines 178:0-178:19 *)
Definition refs_test2 : result unit :=
if negb (2%i32 s= 2%i32)
then Fail_ Failure
@@ -166,7 +224,7 @@ Definition refs_test2 : result unit :=
Check (refs_test2 )%return.
(** [no_nested_borrows::test_list1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 160:0-160:19 *)
+ Source: 'src/no_nested_borrows.rs', lines 194:0-194:19 *)
Definition test_list1 : result unit :=
Return tt.
@@ -174,7 +232,7 @@ Definition test_list1 : result unit :=
Check (test_list1 )%return.
(** [no_nested_borrows::test_box1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 165:0-165:18 *)
+ Source: 'src/no_nested_borrows.rs', lines 199:0-199:18 *)
Definition test_box1 : result unit :=
let b := 0%i32 in
b0 <- alloc_boxed_Box_deref_mut_back i32 b 1%i32;
@@ -186,24 +244,24 @@ Definition test_box1 : result unit :=
Check (test_box1 )%return.
(** [no_nested_borrows::copy_int]: forward function
- Source: 'src/no_nested_borrows.rs', lines 175:0-175:30 *)
+ Source: 'src/no_nested_borrows.rs', lines 209:0-209:30 *)
Definition copy_int (x : i32) : result i32 :=
Return x.
(** [no_nested_borrows::test_unreachable]: forward function
- Source: 'src/no_nested_borrows.rs', lines 181:0-181:32 *)
+ Source: 'src/no_nested_borrows.rs', lines 215:0-215:32 *)
Definition test_unreachable (b : bool) : result unit :=
if b then Fail_ Failure else Return tt
.
(** [no_nested_borrows::test_panic]: forward function
- Source: 'src/no_nested_borrows.rs', lines 189:0-189:26 *)
+ Source: 'src/no_nested_borrows.rs', lines 223:0-223:26 *)
Definition test_panic (b : bool) : result unit :=
if b then Fail_ Failure else Return tt
.
(** [no_nested_borrows::test_copy_int]: forward function
- Source: 'src/no_nested_borrows.rs', lines 196:0-196:22 *)
+ Source: 'src/no_nested_borrows.rs', lines 230:0-230:22 *)
Definition test_copy_int : result unit :=
y <- copy_int 0%i32; if negb (0%i32 s= y) then Fail_ Failure else Return tt
.
@@ -212,13 +270,13 @@ Definition test_copy_int : result unit :=
Check (test_copy_int )%return.
(** [no_nested_borrows::is_cons]: forward function
- Source: 'src/no_nested_borrows.rs', lines 203:0-203:38 *)
+ Source: 'src/no_nested_borrows.rs', lines 237:0-237:38 *)
Definition is_cons (T : Type) (l : List_t T) : result bool :=
match l with | List_Cons t l0 => Return true | List_Nil => Return false end
.
(** [no_nested_borrows::test_is_cons]: forward function
- Source: 'src/no_nested_borrows.rs', lines 210:0-210:21 *)
+ Source: 'src/no_nested_borrows.rs', lines 244:0-244:21 *)
Definition test_is_cons : result unit :=
let l := List_Nil in
b <- is_cons i32 (List_Cons 0%i32 l);
@@ -229,7 +287,7 @@ Definition test_is_cons : result unit :=
Check (test_is_cons )%return.
(** [no_nested_borrows::split_list]: forward function
- Source: 'src/no_nested_borrows.rs', lines 216:0-216:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 250:0-250:48 *)
Definition split_list (T : Type) (l : List_t T) : result (T * (List_t T)) :=
match l with
| List_Cons hd tl => Return (hd, tl)
@@ -238,7 +296,7 @@ Definition split_list (T : Type) (l : List_t T) : result (T * (List_t T)) :=
.
(** [no_nested_borrows::test_split_list]: forward function
- Source: 'src/no_nested_borrows.rs', lines 224:0-224:24 *)
+ Source: 'src/no_nested_borrows.rs', lines 258:0-258:24 *)
Definition test_split_list : result unit :=
let l := List_Nil in
p <- split_list i32 (List_Cons 0%i32 l);
@@ -250,20 +308,20 @@ Definition test_split_list : result unit :=
Check (test_split_list )%return.
(** [no_nested_borrows::choose]: forward function
- Source: 'src/no_nested_borrows.rs', lines 231:0-231:70 *)
+ Source: 'src/no_nested_borrows.rs', lines 265:0-265:70 *)
Definition choose (T : Type) (b : bool) (x : T) (y : T) : result T :=
if b then Return x else Return y
.
(** [no_nested_borrows::choose]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 231:0-231:70 *)
+ Source: 'src/no_nested_borrows.rs', lines 265:0-265:70 *)
Definition choose_back
(T : Type) (b : bool) (x : T) (y : T) (ret : T) : result (T * T) :=
if b then Return (ret, y) else Return (x, ret)
.
(** [no_nested_borrows::choose_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 239:0-239:20 *)
+ Source: 'src/no_nested_borrows.rs', lines 273:0-273:20 *)
Definition choose_test : result unit :=
z <- choose i32 true 0%i32 0%i32;
z0 <- i32_add z 1%i32;
@@ -281,18 +339,18 @@ Definition choose_test : result unit :=
Check (choose_test )%return.
(** [no_nested_borrows::test_char]: forward function
- Source: 'src/no_nested_borrows.rs', lines 251:0-251:26 *)
+ Source: 'src/no_nested_borrows.rs', lines 285:0-285:26 *)
Definition test_char : result char :=
Return (char_of_byte Coq.Init.Byte.x61).
(** [no_nested_borrows::Tree]
- Source: 'src/no_nested_borrows.rs', lines 256:0-256:16 *)
+ Source: 'src/no_nested_borrows.rs', lines 290:0-290:16 *)
Inductive Tree_t (T : Type) :=
| Tree_Leaf : T -> Tree_t T
| Tree_Node : T -> NodeElem_t T -> Tree_t T -> Tree_t T
(** [no_nested_borrows::NodeElem]
- Source: 'src/no_nested_borrows.rs', lines 261:0-261:20 *)
+ Source: 'src/no_nested_borrows.rs', lines 295:0-295:20 *)
with NodeElem_t (T : Type) :=
| NodeElem_Cons : Tree_t T -> NodeElem_t T -> NodeElem_t T
| NodeElem_Nil : NodeElem_t T
@@ -305,7 +363,7 @@ Arguments NodeElem_Cons { _ }.
Arguments NodeElem_Nil { _ }.
(** [no_nested_borrows::list_length]: forward function
- Source: 'src/no_nested_borrows.rs', lines 296:0-296:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 330:0-330:48 *)
Fixpoint list_length (T : Type) (l : List_t T) : result u32 :=
match l with
| List_Cons t l1 => i <- list_length T l1; u32_add 1%u32 i
@@ -314,7 +372,7 @@ Fixpoint list_length (T : Type) (l : List_t T) : result u32 :=
.
(** [no_nested_borrows::list_nth_shared]: forward function
- Source: 'src/no_nested_borrows.rs', lines 304:0-304:62 *)
+ Source: 'src/no_nested_borrows.rs', lines 338:0-338:62 *)
Fixpoint list_nth_shared (T : Type) (l : List_t T) (i : u32) : result T :=
match l with
| List_Cons x tl =>
@@ -326,7 +384,7 @@ Fixpoint list_nth_shared (T : Type) (l : List_t T) (i : u32) : result T :=
.
(** [no_nested_borrows::list_nth_mut]: forward function
- Source: 'src/no_nested_borrows.rs', lines 320:0-320:67 *)
+ Source: 'src/no_nested_borrows.rs', lines 354:0-354:67 *)
Fixpoint list_nth_mut (T : Type) (l : List_t T) (i : u32) : result T :=
match l with
| List_Cons x tl =>
@@ -338,7 +396,7 @@ Fixpoint list_nth_mut (T : Type) (l : List_t T) (i : u32) : result T :=
.
(** [no_nested_borrows::list_nth_mut]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 320:0-320:67 *)
+ Source: 'src/no_nested_borrows.rs', lines 354:0-354:67 *)
Fixpoint list_nth_mut_back
(T : Type) (l : List_t T) (i : u32) (ret : T) : result (List_t T) :=
match l with
@@ -354,7 +412,7 @@ Fixpoint list_nth_mut_back
.
(** [no_nested_borrows::list_rev_aux]: forward function
- Source: 'src/no_nested_borrows.rs', lines 336:0-336:63 *)
+ Source: 'src/no_nested_borrows.rs', lines 370:0-370:63 *)
Fixpoint list_rev_aux
(T : Type) (li : List_t T) (lo : List_t T) : result (List_t T) :=
match li with
@@ -365,14 +423,14 @@ Fixpoint list_rev_aux
(** [no_nested_borrows::list_rev]: merged forward/backward function
(there is a single backward function, and the forward function returns ())
- Source: 'src/no_nested_borrows.rs', lines 350:0-350:42 *)
+ Source: 'src/no_nested_borrows.rs', lines 384:0-384:42 *)
Definition list_rev (T : Type) (l : List_t T) : result (List_t T) :=
let li := core_mem_replace (List_t T) l List_Nil in
list_rev_aux T li List_Nil
.
(** [no_nested_borrows::test_list_functions]: forward function
- Source: 'src/no_nested_borrows.rs', lines 355:0-355:28 *)
+ Source: 'src/no_nested_borrows.rs', lines 389:0-389:28 *)
Definition test_list_functions : result unit :=
let l := List_Nil in
let l0 := List_Cons 2%i32 l in
@@ -410,73 +468,73 @@ Definition test_list_functions : result unit :=
Check (test_list_functions )%return.
(** [no_nested_borrows::id_mut_pair1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 371:0-371:89 *)
+ Source: 'src/no_nested_borrows.rs', lines 405:0-405:89 *)
Definition id_mut_pair1 (T1 T2 : Type) (x : T1) (y : T2) : result (T1 * T2) :=
Return (x, y)
.
(** [no_nested_borrows::id_mut_pair1]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 371:0-371:89 *)
+ Source: 'src/no_nested_borrows.rs', lines 405:0-405:89 *)
Definition id_mut_pair1_back
(T1 T2 : Type) (x : T1) (y : T2) (ret : (T1 * T2)) : result (T1 * T2) :=
let (t, t0) := ret in Return (t, t0)
.
(** [no_nested_borrows::id_mut_pair2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 375:0-375:88 *)
+ Source: 'src/no_nested_borrows.rs', lines 409:0-409:88 *)
Definition id_mut_pair2 (T1 T2 : Type) (p : (T1 * T2)) : result (T1 * T2) :=
let (t, t0) := p in Return (t, t0)
.
(** [no_nested_borrows::id_mut_pair2]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 375:0-375:88 *)
+ Source: 'src/no_nested_borrows.rs', lines 409:0-409:88 *)
Definition id_mut_pair2_back
(T1 T2 : Type) (p : (T1 * T2)) (ret : (T1 * T2)) : result (T1 * T2) :=
let (t, t0) := ret in Return (t, t0)
.
(** [no_nested_borrows::id_mut_pair3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 *)
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 *)
Definition id_mut_pair3 (T1 T2 : Type) (x : T1) (y : T2) : result (T1 * T2) :=
Return (x, y)
.
(** [no_nested_borrows::id_mut_pair3]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 *)
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 *)
Definition id_mut_pair3_back'a
(T1 T2 : Type) (x : T1) (y : T2) (ret : T1) : result T1 :=
Return ret
.
(** [no_nested_borrows::id_mut_pair3]: backward function 1
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 *)
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 *)
Definition id_mut_pair3_back'b
(T1 T2 : Type) (x : T1) (y : T2) (ret : T2) : result T2 :=
Return ret
.
(** [no_nested_borrows::id_mut_pair4]: forward function
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 *)
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 *)
Definition id_mut_pair4 (T1 T2 : Type) (p : (T1 * T2)) : result (T1 * T2) :=
let (t, t0) := p in Return (t, t0)
.
(** [no_nested_borrows::id_mut_pair4]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 *)
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 *)
Definition id_mut_pair4_back'a
(T1 T2 : Type) (p : (T1 * T2)) (ret : T1) : result T1 :=
Return ret
.
(** [no_nested_borrows::id_mut_pair4]: backward function 1
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 *)
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 *)
Definition id_mut_pair4_back'b
(T1 T2 : Type) (p : (T1 * T2)) (ret : T2) : result T2 :=
Return ret
.
(** [no_nested_borrows::StructWithTuple]
- Source: 'src/no_nested_borrows.rs', lines 390:0-390:34 *)
+ Source: 'src/no_nested_borrows.rs', lines 424:0-424:34 *)
Record StructWithTuple_t (T1 T2 : Type) :=
mkStructWithTuple_t {
structWithTuple_p : (T1 * T2);
@@ -487,25 +545,25 @@ Arguments mkStructWithTuple_t { _ _ }.
Arguments structWithTuple_p { _ _ }.
(** [no_nested_borrows::new_tuple1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 394:0-394:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 428:0-428:48 *)
Definition new_tuple1 : result (StructWithTuple_t u32 u32) :=
Return {| structWithTuple_p := (1%u32, 2%u32) |}
.
(** [no_nested_borrows::new_tuple2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 398:0-398:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 432:0-432:48 *)
Definition new_tuple2 : result (StructWithTuple_t i16 i16) :=
Return {| structWithTuple_p := (1%i16, 2%i16) |}
.
(** [no_nested_borrows::new_tuple3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 402:0-402:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 436:0-436:48 *)
Definition new_tuple3 : result (StructWithTuple_t u64 i64) :=
Return {| structWithTuple_p := (1%u64, 2%i64) |}
.
(** [no_nested_borrows::StructWithPair]
- Source: 'src/no_nested_borrows.rs', lines 407:0-407:33 *)
+ Source: 'src/no_nested_borrows.rs', lines 441:0-441:33 *)
Record StructWithPair_t (T1 T2 : Type) :=
mkStructWithPair_t {
structWithPair_p : Pair_t T1 T2;
@@ -516,13 +574,13 @@ Arguments mkStructWithPair_t { _ _ }.
Arguments structWithPair_p { _ _ }.
(** [no_nested_borrows::new_pair1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 411:0-411:46 *)
+ Source: 'src/no_nested_borrows.rs', lines 445:0-445:46 *)
Definition new_pair1 : result (StructWithPair_t u32 u32) :=
Return {| structWithPair_p := {| pair_x := 1%u32; pair_y := 2%u32 |} |}
.
(** [no_nested_borrows::test_constants]: forward function
- Source: 'src/no_nested_borrows.rs', lines 419:0-419:23 *)
+ Source: 'src/no_nested_borrows.rs', lines 453:0-453:23 *)
Definition test_constants : result unit :=
swt <- new_tuple1;
let (i, _) := swt.(structWithTuple_p) in
@@ -549,7 +607,7 @@ Definition test_constants : result unit :=
Check (test_constants )%return.
(** [no_nested_borrows::test_weird_borrows1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 428:0-428:28 *)
+ Source: 'src/no_nested_borrows.rs', lines 462:0-462:28 *)
Definition test_weird_borrows1 : result unit :=
Return tt.
@@ -558,31 +616,31 @@ Check (test_weird_borrows1 )%return.
(** [no_nested_borrows::test_mem_replace]: merged forward/backward function
(there is a single backward function, and the forward function returns ())
- Source: 'src/no_nested_borrows.rs', lines 438:0-438:37 *)
+ Source: 'src/no_nested_borrows.rs', lines 472:0-472:37 *)
Definition test_mem_replace (px : u32) : result u32 :=
let y := core_mem_replace u32 px 1%u32 in
if negb (y s= 0%u32) then Fail_ Failure else Return 2%u32
.
(** [no_nested_borrows::test_shared_borrow_bool1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 445:0-445:47 *)
+ Source: 'src/no_nested_borrows.rs', lines 479:0-479:47 *)
Definition test_shared_borrow_bool1 (b : bool) : result u32 :=
if b then Return 0%u32 else Return 1%u32
.
(** [no_nested_borrows::test_shared_borrow_bool2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 458:0-458:40 *)
+ Source: 'src/no_nested_borrows.rs', lines 492:0-492:40 *)
Definition test_shared_borrow_bool2 : result u32 :=
Return 0%u32.
(** [no_nested_borrows::test_shared_borrow_enum1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 473:0-473:52 *)
+ Source: 'src/no_nested_borrows.rs', lines 507:0-507:52 *)
Definition test_shared_borrow_enum1 (l : List_t u32) : result u32 :=
match l with | List_Cons i l0 => Return 1%u32 | List_Nil => Return 0%u32 end
.
(** [no_nested_borrows::test_shared_borrow_enum2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 485:0-485:40 *)
+ Source: 'src/no_nested_borrows.rs', lines 519:0-519:40 *)
Definition test_shared_borrow_enum2 : result u32 :=
Return 0%u32.
diff --git a/tests/coq/misc/_CoqProject b/tests/coq/misc/_CoqProject
index abbf6aa8..869cdb4d 100644
--- a/tests/coq/misc/_CoqProject
+++ b/tests/coq/misc/_CoqProject
@@ -7,10 +7,10 @@ Loops.v
External_Types.v
Primitives.v
External_Funs.v
-Paper.v
External_TypesExternal.v
Constants.v
PoloniusList.v
+Paper.v
NoNestedBorrows.v
External_FunsExternal.v
Bitwise.v
diff --git a/tests/fstar/betree/BetreeMain.Clauses.Template.fst b/tests/fstar/betree/BetreeMain.Clauses.Template.fst
index 4ae29302..537705c5 100644
--- a/tests/fstar/betree/BetreeMain.Clauses.Template.fst
+++ b/tests/fstar/betree/BetreeMain.Clauses.Template.fst
@@ -33,6 +33,13 @@ let betree_Node_lookup_first_message_for_key_decreases (key : u64)
(msgs : betree_List_t (u64 & betree_Message_t)) : nat =
admit ()
+(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: decreases clause
+ Source: 'src/betree.rs', lines 636:4-636:80 *)
+unfold
+let betree_Node_lookup_in_bindings_decreases (key : u64)
+ (bindings : betree_List_t (u64 & u64)) : nat =
+ admit ()
+
(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: decreases clause
Source: 'src/betree.rs', lines 819:4-819:90 *)
unfold
@@ -41,13 +48,6 @@ let betree_Node_apply_upserts_decreases
(key : u64) (st : state) : nat =
admit ()
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: decreases clause
- Source: 'src/betree.rs', lines 636:4-636:80 *)
-unfold
-let betree_Node_lookup_in_bindings_decreases (key : u64)
- (bindings : betree_List_t (u64 & u64)) : nat =
- admit ()
-
(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: decreases clause
Source: 'src/betree.rs', lines 395:4-395:63 *)
unfold
diff --git a/tests/fstar/betree/BetreeMain.Funs.fst b/tests/fstar/betree/BetreeMain.Funs.fst
index fef8a8e1..f844b0ec 100644
--- a/tests/fstar/betree/BetreeMain.Funs.fst
+++ b/tests/fstar/betree/BetreeMain.Funs.fst
@@ -258,6 +258,22 @@ let rec betree_Node_lookup_first_message_for_key_back
| Betree_List_Nil -> Return ret
end
+(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
+ Source: 'src/betree.rs', lines 636:4-636:80 *)
+let rec betree_Node_lookup_in_bindings
+ (key : u64) (bindings : betree_List_t (u64 & u64)) :
+ Tot (result (option u64))
+ (decreases (betree_Node_lookup_in_bindings_decreases key bindings))
+ =
+ begin match bindings with
+ | Betree_List_Cons hd tl ->
+ let (i, i0) = hd in
+ if i = key
+ then Return (Some i0)
+ else if i > key then Return None else betree_Node_lookup_in_bindings key tl
+ | Betree_List_Nil -> Return None
+ end
+
(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: forward function
Source: 'src/betree.rs', lines 819:4-819:90 *)
let rec betree_Node_apply_upserts
@@ -312,22 +328,6 @@ let rec betree_Node_apply_upserts_back
betree_List_push_front (u64 & betree_Message_t) msgs (key,
Betree_Message_Insert v)
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
- Source: 'src/betree.rs', lines 636:4-636:80 *)
-let rec betree_Node_lookup_in_bindings
- (key : u64) (bindings : betree_List_t (u64 & u64)) :
- Tot (result (option u64))
- (decreases (betree_Node_lookup_in_bindings_decreases key bindings))
- =
- begin match bindings with
- | Betree_List_Cons hd tl ->
- let (i, i0) = hd in
- if i = key
- then Return (Some i0)
- else if i > key then Return None else betree_Node_lookup_in_bindings key tl
- | Betree_List_Nil -> Return None
- end
-
(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: forward function
Source: 'src/betree.rs', lines 395:4-395:63 *)
let rec betree_Internal_lookup_in_children
diff --git a/tests/fstar/betree_back_stateful/BetreeMain.Clauses.Template.fst b/tests/fstar/betree_back_stateful/BetreeMain.Clauses.Template.fst
index 4ae29302..537705c5 100644
--- a/tests/fstar/betree_back_stateful/BetreeMain.Clauses.Template.fst
+++ b/tests/fstar/betree_back_stateful/BetreeMain.Clauses.Template.fst
@@ -33,6 +33,13 @@ let betree_Node_lookup_first_message_for_key_decreases (key : u64)
(msgs : betree_List_t (u64 & betree_Message_t)) : nat =
admit ()
+(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: decreases clause
+ Source: 'src/betree.rs', lines 636:4-636:80 *)
+unfold
+let betree_Node_lookup_in_bindings_decreases (key : u64)
+ (bindings : betree_List_t (u64 & u64)) : nat =
+ admit ()
+
(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: decreases clause
Source: 'src/betree.rs', lines 819:4-819:90 *)
unfold
@@ -41,13 +48,6 @@ let betree_Node_apply_upserts_decreases
(key : u64) (st : state) : nat =
admit ()
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: decreases clause
- Source: 'src/betree.rs', lines 636:4-636:80 *)
-unfold
-let betree_Node_lookup_in_bindings_decreases (key : u64)
- (bindings : betree_List_t (u64 & u64)) : nat =
- admit ()
-
(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: decreases clause
Source: 'src/betree.rs', lines 395:4-395:63 *)
unfold
diff --git a/tests/fstar/betree_back_stateful/BetreeMain.Funs.fst b/tests/fstar/betree_back_stateful/BetreeMain.Funs.fst
index b912a316..6c3c2161 100644
--- a/tests/fstar/betree_back_stateful/BetreeMain.Funs.fst
+++ b/tests/fstar/betree_back_stateful/BetreeMain.Funs.fst
@@ -295,6 +295,22 @@ let rec betree_Node_lookup_first_message_for_key_back
| Betree_List_Nil -> Return ret
end
+(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
+ Source: 'src/betree.rs', lines 636:4-636:80 *)
+let rec betree_Node_lookup_in_bindings
+ (key : u64) (bindings : betree_List_t (u64 & u64)) :
+ Tot (result (option u64))
+ (decreases (betree_Node_lookup_in_bindings_decreases key bindings))
+ =
+ begin match bindings with
+ | Betree_List_Cons hd tl ->
+ let (i, i0) = hd in
+ if i = key
+ then Return (Some i0)
+ else if i > key then Return None else betree_Node_lookup_in_bindings key tl
+ | Betree_List_Nil -> Return None
+ end
+
(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: forward function
Source: 'src/betree.rs', lines 819:4-819:90 *)
let rec betree_Node_apply_upserts
@@ -351,22 +367,6 @@ let rec betree_Node_apply_upserts_back
Betree_Message_Insert v) in
Return (st0, msgs0)
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
- Source: 'src/betree.rs', lines 636:4-636:80 *)
-let rec betree_Node_lookup_in_bindings
- (key : u64) (bindings : betree_List_t (u64 & u64)) :
- Tot (result (option u64))
- (decreases (betree_Node_lookup_in_bindings_decreases key bindings))
- =
- begin match bindings with
- | Betree_List_Cons hd tl ->
- let (i, i0) = hd in
- if i = key
- then Return (Some i0)
- else if i > key then Return None else betree_Node_lookup_in_bindings key tl
- | Betree_List_Nil -> Return None
- end
-
(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: forward function
Source: 'src/betree.rs', lines 395:4-395:63 *)
let rec betree_Internal_lookup_in_children
diff --git a/tests/fstar/misc/NoNestedBorrows.fst b/tests/fstar/misc/NoNestedBorrows.fst
index 2e14d67d..130b02f2 100644
--- a/tests/fstar/misc/NoNestedBorrows.fst
+++ b/tests/fstar/misc/NoNestedBorrows.fst
@@ -42,53 +42,109 @@ type sum_t (t1 t2 : Type0) =
let neg_test (x : i32) : result i32 =
i32_neg x
-(** [no_nested_borrows::add_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 54:0-54:38 *)
-let add_test (x : u32) (y : u32) : result u32 =
+(** [no_nested_borrows::add_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 54:0-54:37 *)
+let add_u32 (x : u32) (y : u32) : result u32 =
u32_add x y
-(** [no_nested_borrows::subs_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 60:0-60:39 *)
-let subs_test (x : u32) (y : u32) : result u32 =
+(** [no_nested_borrows::subs_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 60:0-60:38 *)
+let subs_u32 (x : u32) (y : u32) : result u32 =
u32_sub x y
-(** [no_nested_borrows::div_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 66:0-66:38 *)
-let div_test (x : u32) (y : u32) : result u32 =
+(** [no_nested_borrows::div_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 66:0-66:37 *)
+let div_u32 (x : u32) (y : u32) : result u32 =
u32_div x y
-(** [no_nested_borrows::div_test1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 73:0-73:31 *)
-let div_test1 (x : u32) : result u32 =
+(** [no_nested_borrows::div_u32_const]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 73:0-73:35 *)
+let div_u32_const (x : u32) : result u32 =
u32_div x 2
-(** [no_nested_borrows::rem_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 78:0-78:38 *)
-let rem_test (x : u32) (y : u32) : result u32 =
+(** [no_nested_borrows::rem_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 78:0-78:37 *)
+let rem_u32 (x : u32) (y : u32) : result u32 =
u32_rem x y
-(** [no_nested_borrows::mul_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 82:0-82:38 *)
-let mul_test (x : u32) (y : u32) : result u32 =
+(** [no_nested_borrows::mul_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 82:0-82:37 *)
+let mul_u32 (x : u32) (y : u32) : result u32 =
u32_mul x y
+(** [no_nested_borrows::add_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 88:0-88:37 *)
+let add_i32 (x : i32) (y : i32) : result i32 =
+ i32_add x y
+
+(** [no_nested_borrows::subs_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 92:0-92:38 *)
+let subs_i32 (x : i32) (y : i32) : result i32 =
+ i32_sub x y
+
+(** [no_nested_borrows::div_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 96:0-96:37 *)
+let div_i32 (x : i32) (y : i32) : result i32 =
+ i32_div x y
+
+(** [no_nested_borrows::div_i32_const]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 100:0-100:35 *)
+let div_i32_const (x : i32) : result i32 =
+ i32_div x 2
+
+(** [no_nested_borrows::rem_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 104:0-104:37 *)
+let rem_i32 (x : i32) (y : i32) : result i32 =
+ i32_rem x y
+
+(** [no_nested_borrows::mul_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 108:0-108:37 *)
+let mul_i32 (x : i32) (y : i32) : result i32 =
+ i32_mul x y
+
+(** [no_nested_borrows::mix_arith_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 112:0-112:51 *)
+let mix_arith_u32 (x : u32) (y : u32) (z : u32) : result u32 =
+ let* i = u32_add x y in
+ let* i0 = u32_div x y in
+ let* i1 = u32_mul i i0 in
+ let* i2 = u32_rem z y in
+ let* i3 = u32_sub x i2 in
+ let* i4 = u32_add i1 i3 in
+ let* i5 = u32_add x y in
+ let* i6 = u32_add i5 z in
+ u32_rem i4 i6
+
+(** [no_nested_borrows::mix_arith_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 116:0-116:51 *)
+let mix_arith_i32 (x : i32) (y : i32) (z : i32) : result i32 =
+ let* i = i32_add x y in
+ let* i0 = i32_div x y in
+ let* i1 = i32_mul i i0 in
+ let* i2 = i32_rem z y in
+ let* i3 = i32_sub x i2 in
+ let* i4 = i32_add i1 i3 in
+ let* i5 = i32_add x y in
+ let* i6 = i32_add i5 z in
+ i32_rem i4 i6
+
(** [no_nested_borrows::CONST0]
- Source: 'src/no_nested_borrows.rs', lines 91:0-91:23 *)
+ Source: 'src/no_nested_borrows.rs', lines 125:0-125:23 *)
let const0_body : result usize = usize_add 1 1
let const0_c : usize = eval_global const0_body
(** [no_nested_borrows::CONST1]
- Source: 'src/no_nested_borrows.rs', lines 92:0-92:23 *)
+ Source: 'src/no_nested_borrows.rs', lines 126:0-126:23 *)
let const1_body : result usize = usize_mul 2 2
let const1_c : usize = eval_global const1_body
(** [no_nested_borrows::cast_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 94:0-94:31 *)
+ Source: 'src/no_nested_borrows.rs', lines 128:0-128:31 *)
let cast_test (x : u32) : result i32 =
scalar_cast U32 I32 x
(** [no_nested_borrows::test2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 99:0-99:14 *)
+ Source: 'src/no_nested_borrows.rs', lines 133:0-133:14 *)
let test2 : result unit =
let* _ = u32_add 23 44 in Return ()
@@ -96,12 +152,12 @@ let test2 : result unit =
let _ = assert_norm (test2 = Return ())
(** [no_nested_borrows::get_max]: forward function
- Source: 'src/no_nested_borrows.rs', lines 111:0-111:37 *)
+ Source: 'src/no_nested_borrows.rs', lines 145:0-145:37 *)
let get_max (x : u32) (y : u32) : result u32 =
if x >= y then Return x else Return y
(** [no_nested_borrows::test3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 119:0-119:14 *)
+ Source: 'src/no_nested_borrows.rs', lines 153:0-153:14 *)
let test3 : result unit =
let* x = get_max 4 3 in
let* y = get_max 10 11 in
@@ -112,7 +168,7 @@ let test3 : result unit =
let _ = assert_norm (test3 = Return ())
(** [no_nested_borrows::test_neg1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 126:0-126:18 *)
+ Source: 'src/no_nested_borrows.rs', lines 160:0-160:18 *)
let test_neg1 : result unit =
let* y = i32_neg 3 in if not (y = -3) then Fail Failure else Return ()
@@ -120,7 +176,7 @@ let test_neg1 : result unit =
let _ = assert_norm (test_neg1 = Return ())
(** [no_nested_borrows::refs_test1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 133:0-133:19 *)
+ Source: 'src/no_nested_borrows.rs', lines 167:0-167:19 *)
let refs_test1 : result unit =
if not (1 = 1) then Fail Failure else Return ()
@@ -128,7 +184,7 @@ let refs_test1 : result unit =
let _ = assert_norm (refs_test1 = Return ())
(** [no_nested_borrows::refs_test2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 144:0-144:19 *)
+ Source: 'src/no_nested_borrows.rs', lines 178:0-178:19 *)
let refs_test2 : result unit =
if not (2 = 2)
then Fail Failure
@@ -144,7 +200,7 @@ let refs_test2 : result unit =
let _ = assert_norm (refs_test2 = Return ())
(** [no_nested_borrows::test_list1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 160:0-160:19 *)
+ Source: 'src/no_nested_borrows.rs', lines 194:0-194:19 *)
let test_list1 : result unit =
Return ()
@@ -152,7 +208,7 @@ let test_list1 : result unit =
let _ = assert_norm (test_list1 = Return ())
(** [no_nested_borrows::test_box1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 165:0-165:18 *)
+ Source: 'src/no_nested_borrows.rs', lines 199:0-199:18 *)
let test_box1 : result unit =
let b = 0 in
let* b0 = alloc_boxed_Box_deref_mut_back i32 b 1 in
@@ -163,22 +219,22 @@ let test_box1 : result unit =
let _ = assert_norm (test_box1 = Return ())
(** [no_nested_borrows::copy_int]: forward function
- Source: 'src/no_nested_borrows.rs', lines 175:0-175:30 *)
+ Source: 'src/no_nested_borrows.rs', lines 209:0-209:30 *)
let copy_int (x : i32) : result i32 =
Return x
(** [no_nested_borrows::test_unreachable]: forward function
- Source: 'src/no_nested_borrows.rs', lines 181:0-181:32 *)
+ Source: 'src/no_nested_borrows.rs', lines 215:0-215:32 *)
let test_unreachable (b : bool) : result unit =
if b then Fail Failure else Return ()
(** [no_nested_borrows::test_panic]: forward function
- Source: 'src/no_nested_borrows.rs', lines 189:0-189:26 *)
+ Source: 'src/no_nested_borrows.rs', lines 223:0-223:26 *)
let test_panic (b : bool) : result unit =
if b then Fail Failure else Return ()
(** [no_nested_borrows::test_copy_int]: forward function
- Source: 'src/no_nested_borrows.rs', lines 196:0-196:22 *)
+ Source: 'src/no_nested_borrows.rs', lines 230:0-230:22 *)
let test_copy_int : result unit =
let* y = copy_int 0 in if not (0 = y) then Fail Failure else Return ()
@@ -186,7 +242,7 @@ let test_copy_int : result unit =
let _ = assert_norm (test_copy_int = Return ())
(** [no_nested_borrows::is_cons]: forward function
- Source: 'src/no_nested_borrows.rs', lines 203:0-203:38 *)
+ Source: 'src/no_nested_borrows.rs', lines 237:0-237:38 *)
let is_cons (t : Type0) (l : list_t t) : result bool =
begin match l with
| List_Cons x l0 -> Return true
@@ -194,7 +250,7 @@ let is_cons (t : Type0) (l : list_t t) : result bool =
end
(** [no_nested_borrows::test_is_cons]: forward function
- Source: 'src/no_nested_borrows.rs', lines 210:0-210:21 *)
+ Source: 'src/no_nested_borrows.rs', lines 244:0-244:21 *)
let test_is_cons : result unit =
let l = List_Nil in
let* b = is_cons i32 (List_Cons 0 l) in
@@ -204,7 +260,7 @@ let test_is_cons : result unit =
let _ = assert_norm (test_is_cons = Return ())
(** [no_nested_borrows::split_list]: forward function
- Source: 'src/no_nested_borrows.rs', lines 216:0-216:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 250:0-250:48 *)
let split_list (t : Type0) (l : list_t t) : result (t & (list_t t)) =
begin match l with
| List_Cons hd tl -> Return (hd, tl)
@@ -212,7 +268,7 @@ let split_list (t : Type0) (l : list_t t) : result (t & (list_t t)) =
end
(** [no_nested_borrows::test_split_list]: forward function
- Source: 'src/no_nested_borrows.rs', lines 224:0-224:24 *)
+ Source: 'src/no_nested_borrows.rs', lines 258:0-258:24 *)
let test_split_list : result unit =
let l = List_Nil in
let* p = split_list i32 (List_Cons 0 l) in
@@ -223,18 +279,18 @@ let test_split_list : result unit =
let _ = assert_norm (test_split_list = Return ())
(** [no_nested_borrows::choose]: forward function
- Source: 'src/no_nested_borrows.rs', lines 231:0-231:70 *)
+ Source: 'src/no_nested_borrows.rs', lines 265:0-265:70 *)
let choose (t : Type0) (b : bool) (x : t) (y : t) : result t =
if b then Return x else Return y
(** [no_nested_borrows::choose]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 231:0-231:70 *)
+ Source: 'src/no_nested_borrows.rs', lines 265:0-265:70 *)
let choose_back
(t : Type0) (b : bool) (x : t) (y : t) (ret : t) : result (t & t) =
if b then Return (ret, y) else Return (x, ret)
(** [no_nested_borrows::choose_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 239:0-239:20 *)
+ Source: 'src/no_nested_borrows.rs', lines 273:0-273:20 *)
let choose_test : result unit =
let* z = choose i32 true 0 0 in
let* z0 = i32_add z 1 in
@@ -250,24 +306,24 @@ let choose_test : result unit =
let _ = assert_norm (choose_test = Return ())
(** [no_nested_borrows::test_char]: forward function
- Source: 'src/no_nested_borrows.rs', lines 251:0-251:26 *)
+ Source: 'src/no_nested_borrows.rs', lines 285:0-285:26 *)
let test_char : result char =
Return 'a'
(** [no_nested_borrows::Tree]
- Source: 'src/no_nested_borrows.rs', lines 256:0-256:16 *)
+ Source: 'src/no_nested_borrows.rs', lines 290:0-290:16 *)
type tree_t (t : Type0) =
| Tree_Leaf : t -> tree_t t
| Tree_Node : t -> nodeElem_t t -> tree_t t -> tree_t t
(** [no_nested_borrows::NodeElem]
- Source: 'src/no_nested_borrows.rs', lines 261:0-261:20 *)
+ Source: 'src/no_nested_borrows.rs', lines 295:0-295:20 *)
and nodeElem_t (t : Type0) =
| NodeElem_Cons : tree_t t -> nodeElem_t t -> nodeElem_t t
| NodeElem_Nil : nodeElem_t t
(** [no_nested_borrows::list_length]: forward function
- Source: 'src/no_nested_borrows.rs', lines 296:0-296:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 330:0-330:48 *)
let rec list_length (t : Type0) (l : list_t t) : result u32 =
begin match l with
| List_Cons x l1 -> let* i = list_length t l1 in u32_add 1 i
@@ -275,7 +331,7 @@ let rec list_length (t : Type0) (l : list_t t) : result u32 =
end
(** [no_nested_borrows::list_nth_shared]: forward function
- Source: 'src/no_nested_borrows.rs', lines 304:0-304:62 *)
+ Source: 'src/no_nested_borrows.rs', lines 338:0-338:62 *)
let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
begin match l with
| List_Cons x tl ->
@@ -286,7 +342,7 @@ let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
end
(** [no_nested_borrows::list_nth_mut]: forward function
- Source: 'src/no_nested_borrows.rs', lines 320:0-320:67 *)
+ Source: 'src/no_nested_borrows.rs', lines 354:0-354:67 *)
let rec list_nth_mut (t : Type0) (l : list_t t) (i : u32) : result t =
begin match l with
| List_Cons x tl ->
@@ -295,7 +351,7 @@ let rec list_nth_mut (t : Type0) (l : list_t t) (i : u32) : result t =
end
(** [no_nested_borrows::list_nth_mut]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 320:0-320:67 *)
+ Source: 'src/no_nested_borrows.rs', lines 354:0-354:67 *)
let rec list_nth_mut_back
(t : Type0) (l : list_t t) (i : u32) (ret : t) : result (list_t t) =
begin match l with
@@ -310,7 +366,7 @@ let rec list_nth_mut_back
end
(** [no_nested_borrows::list_rev_aux]: forward function
- Source: 'src/no_nested_borrows.rs', lines 336:0-336:63 *)
+ Source: 'src/no_nested_borrows.rs', lines 370:0-370:63 *)
let rec list_rev_aux
(t : Type0) (li : list_t t) (lo : list_t t) : result (list_t t) =
begin match li with
@@ -320,12 +376,12 @@ let rec list_rev_aux
(** [no_nested_borrows::list_rev]: merged forward/backward function
(there is a single backward function, and the forward function returns ())
- Source: 'src/no_nested_borrows.rs', lines 350:0-350:42 *)
+ Source: 'src/no_nested_borrows.rs', lines 384:0-384:42 *)
let list_rev (t : Type0) (l : list_t t) : result (list_t t) =
let li = core_mem_replace (list_t t) l List_Nil in list_rev_aux t li List_Nil
(** [no_nested_borrows::test_list_functions]: forward function
- Source: 'src/no_nested_borrows.rs', lines 355:0-355:28 *)
+ Source: 'src/no_nested_borrows.rs', lines 389:0-389:28 *)
let test_list_functions : result unit =
let l = List_Nil in
let l0 = List_Cons 2 l in
@@ -362,91 +418,91 @@ let test_list_functions : result unit =
let _ = assert_norm (test_list_functions = Return ())
(** [no_nested_borrows::id_mut_pair1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 371:0-371:89 *)
+ Source: 'src/no_nested_borrows.rs', lines 405:0-405:89 *)
let id_mut_pair1 (t1 t2 : Type0) (x : t1) (y : t2) : result (t1 & t2) =
Return (x, y)
(** [no_nested_borrows::id_mut_pair1]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 371:0-371:89 *)
+ Source: 'src/no_nested_borrows.rs', lines 405:0-405:89 *)
let id_mut_pair1_back
(t1 t2 : Type0) (x : t1) (y : t2) (ret : (t1 & t2)) : result (t1 & t2) =
let (x0, x1) = ret in Return (x0, x1)
(** [no_nested_borrows::id_mut_pair2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 375:0-375:88 *)
+ Source: 'src/no_nested_borrows.rs', lines 409:0-409:88 *)
let id_mut_pair2 (t1 t2 : Type0) (p : (t1 & t2)) : result (t1 & t2) =
let (x, x0) = p in Return (x, x0)
(** [no_nested_borrows::id_mut_pair2]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 375:0-375:88 *)
+ Source: 'src/no_nested_borrows.rs', lines 409:0-409:88 *)
let id_mut_pair2_back
(t1 t2 : Type0) (p : (t1 & t2)) (ret : (t1 & t2)) : result (t1 & t2) =
let (x, x0) = ret in Return (x, x0)
(** [no_nested_borrows::id_mut_pair3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 *)
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 *)
let id_mut_pair3 (t1 t2 : Type0) (x : t1) (y : t2) : result (t1 & t2) =
Return (x, y)
(** [no_nested_borrows::id_mut_pair3]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 *)
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 *)
let id_mut_pair3_back'a
(t1 t2 : Type0) (x : t1) (y : t2) (ret : t1) : result t1 =
Return ret
(** [no_nested_borrows::id_mut_pair3]: backward function 1
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 *)
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 *)
let id_mut_pair3_back'b
(t1 t2 : Type0) (x : t1) (y : t2) (ret : t2) : result t2 =
Return ret
(** [no_nested_borrows::id_mut_pair4]: forward function
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 *)
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 *)
let id_mut_pair4 (t1 t2 : Type0) (p : (t1 & t2)) : result (t1 & t2) =
let (x, x0) = p in Return (x, x0)
(** [no_nested_borrows::id_mut_pair4]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 *)
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 *)
let id_mut_pair4_back'a
(t1 t2 : Type0) (p : (t1 & t2)) (ret : t1) : result t1 =
Return ret
(** [no_nested_borrows::id_mut_pair4]: backward function 1
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 *)
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 *)
let id_mut_pair4_back'b
(t1 t2 : Type0) (p : (t1 & t2)) (ret : t2) : result t2 =
Return ret
(** [no_nested_borrows::StructWithTuple]
- Source: 'src/no_nested_borrows.rs', lines 390:0-390:34 *)
+ Source: 'src/no_nested_borrows.rs', lines 424:0-424:34 *)
type structWithTuple_t (t1 t2 : Type0) = { p : (t1 & t2); }
(** [no_nested_borrows::new_tuple1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 394:0-394:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 428:0-428:48 *)
let new_tuple1 : result (structWithTuple_t u32 u32) =
Return { p = (1, 2) }
(** [no_nested_borrows::new_tuple2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 398:0-398:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 432:0-432:48 *)
let new_tuple2 : result (structWithTuple_t i16 i16) =
Return { p = (1, 2) }
(** [no_nested_borrows::new_tuple3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 402:0-402:48 *)
+ Source: 'src/no_nested_borrows.rs', lines 436:0-436:48 *)
let new_tuple3 : result (structWithTuple_t u64 i64) =
Return { p = (1, 2) }
(** [no_nested_borrows::StructWithPair]
- Source: 'src/no_nested_borrows.rs', lines 407:0-407:33 *)
+ Source: 'src/no_nested_borrows.rs', lines 441:0-441:33 *)
type structWithPair_t (t1 t2 : Type0) = { p : pair_t t1 t2; }
(** [no_nested_borrows::new_pair1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 411:0-411:46 *)
+ Source: 'src/no_nested_borrows.rs', lines 445:0-445:46 *)
let new_pair1 : result (structWithPair_t u32 u32) =
Return { p = { x = 1; y = 2 } }
(** [no_nested_borrows::test_constants]: forward function
- Source: 'src/no_nested_borrows.rs', lines 419:0-419:23 *)
+ Source: 'src/no_nested_borrows.rs', lines 453:0-453:23 *)
let test_constants : result unit =
let* swt = new_tuple1 in
let (i, _) = swt.p in
@@ -470,7 +526,7 @@ let test_constants : result unit =
let _ = assert_norm (test_constants = Return ())
(** [no_nested_borrows::test_weird_borrows1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 428:0-428:28 *)
+ Source: 'src/no_nested_borrows.rs', lines 462:0-462:28 *)
let test_weird_borrows1 : result unit =
Return ()
@@ -479,28 +535,28 @@ let _ = assert_norm (test_weird_borrows1 = Return ())
(** [no_nested_borrows::test_mem_replace]: merged forward/backward function
(there is a single backward function, and the forward function returns ())
- Source: 'src/no_nested_borrows.rs', lines 438:0-438:37 *)
+ Source: 'src/no_nested_borrows.rs', lines 472:0-472:37 *)
let test_mem_replace (px : u32) : result u32 =
let y = core_mem_replace u32 px 1 in
if not (y = 0) then Fail Failure else Return 2
(** [no_nested_borrows::test_shared_borrow_bool1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 445:0-445:47 *)
+ Source: 'src/no_nested_borrows.rs', lines 479:0-479:47 *)
let test_shared_borrow_bool1 (b : bool) : result u32 =
if b then Return 0 else Return 1
(** [no_nested_borrows::test_shared_borrow_bool2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 458:0-458:40 *)
+ Source: 'src/no_nested_borrows.rs', lines 492:0-492:40 *)
let test_shared_borrow_bool2 : result u32 =
Return 0
(** [no_nested_borrows::test_shared_borrow_enum1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 473:0-473:52 *)
+ Source: 'src/no_nested_borrows.rs', lines 507:0-507:52 *)
let test_shared_borrow_enum1 (l : list_t u32) : result u32 =
begin match l with | List_Cons i l0 -> Return 1 | List_Nil -> Return 0 end
(** [no_nested_borrows::test_shared_borrow_enum2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 485:0-485:40 *)
+ Source: 'src/no_nested_borrows.rs', lines 519:0-519:40 *)
let test_shared_borrow_enum2 : result u32 =
Return 0
diff --git a/tests/lean/BetreeMain/Funs.lean b/tests/lean/BetreeMain/Funs.lean
index 4c862225..0d7cb984 100644
--- a/tests/lean/BetreeMain/Funs.lean
+++ b/tests/lean/BetreeMain/Funs.lean
@@ -256,6 +256,21 @@ divergent def betree.Node.lookup_first_message_for_key_back
Result.ret (betree.List.Cons (i, m) next_msgs0)
| betree.List.Nil => Result.ret ret
+/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
+ Source: 'src/betree.rs', lines 636:4-636:80 -/
+divergent def betree.Node.lookup_in_bindings
+ (key : U64) (bindings : betree.List (U64 × U64)) : Result (Option U64) :=
+ match bindings with
+ | betree.List.Cons hd tl =>
+ let (i, i0) := hd
+ if i = key
+ then Result.ret (some i0)
+ else
+ if i > key
+ then Result.ret none
+ else betree.Node.lookup_in_bindings key tl
+ | betree.List.Nil => Result.ret none
+
/- [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: forward function
Source: 'src/betree.rs', lines 819:4-819:90 -/
divergent def betree.Node.apply_upserts
@@ -316,21 +331,6 @@ divergent def betree.Node.apply_upserts_back
betree.List.push_front (U64 × betree.Message) msgs (key,
betree.Message.Insert v)
-/- [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: forward function
- Source: 'src/betree.rs', lines 636:4-636:80 -/
-divergent def betree.Node.lookup_in_bindings
- (key : U64) (bindings : betree.List (U64 × U64)) : Result (Option U64) :=
- match bindings with
- | betree.List.Cons hd tl =>
- let (i, i0) := hd
- if i = key
- then Result.ret (some i0)
- else
- if i > key
- then Result.ret none
- else betree.Node.lookup_in_bindings key tl
- | betree.List.Nil => Result.ret none
-
/- [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: forward function
Source: 'src/betree.rs', lines 395:4-395:63 -/
mutual divergent def betree.Internal.lookup_in_children
diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean
index ca66c628..0c7dff8e 100644
--- a/tests/lean/NoNestedBorrows.lean
+++ b/tests/lean/NoNestedBorrows.lean
@@ -48,53 +48,111 @@ inductive Sum (T1 T2 : Type) :=
def neg_test (x : I32) : Result I32 :=
- x
-/- [no_nested_borrows::add_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 54:0-54:38 -/
-def add_test (x : U32) (y : U32) : Result U32 :=
+/- [no_nested_borrows::add_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 54:0-54:37 -/
+def add_u32 (x : U32) (y : U32) : Result U32 :=
x + y
-/- [no_nested_borrows::subs_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 60:0-60:39 -/
-def subs_test (x : U32) (y : U32) : Result U32 :=
+/- [no_nested_borrows::subs_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 60:0-60:38 -/
+def subs_u32 (x : U32) (y : U32) : Result U32 :=
x - y
-/- [no_nested_borrows::div_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 66:0-66:38 -/
-def div_test (x : U32) (y : U32) : Result U32 :=
+/- [no_nested_borrows::div_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 66:0-66:37 -/
+def div_u32 (x : U32) (y : U32) : Result U32 :=
x / y
-/- [no_nested_borrows::div_test1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 73:0-73:31 -/
-def div_test1 (x : U32) : Result U32 :=
+/- [no_nested_borrows::div_u32_const]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 73:0-73:35 -/
+def div_u32_const (x : U32) : Result U32 :=
x / 2#u32
-/- [no_nested_borrows::rem_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 78:0-78:38 -/
-def rem_test (x : U32) (y : U32) : Result U32 :=
+/- [no_nested_borrows::rem_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 78:0-78:37 -/
+def rem_u32 (x : U32) (y : U32) : Result U32 :=
x % y
-/- [no_nested_borrows::mul_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 82:0-82:38 -/
-def mul_test (x : U32) (y : U32) : Result U32 :=
+/- [no_nested_borrows::mul_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 82:0-82:37 -/
+def mul_u32 (x : U32) (y : U32) : Result U32 :=
x * y
+/- [no_nested_borrows::add_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 88:0-88:37 -/
+def add_i32 (x : I32) (y : I32) : Result I32 :=
+ x + y
+
+/- [no_nested_borrows::subs_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 92:0-92:38 -/
+def subs_i32 (x : I32) (y : I32) : Result I32 :=
+ x - y
+
+/- [no_nested_borrows::div_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 96:0-96:37 -/
+def div_i32 (x : I32) (y : I32) : Result I32 :=
+ x / y
+
+/- [no_nested_borrows::div_i32_const]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 100:0-100:35 -/
+def div_i32_const (x : I32) : Result I32 :=
+ x / 2#i32
+
+/- [no_nested_borrows::rem_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 104:0-104:37 -/
+def rem_i32 (x : I32) (y : I32) : Result I32 :=
+ x % y
+
+/- [no_nested_borrows::mul_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 108:0-108:37 -/
+def mul_i32 (x : I32) (y : I32) : Result I32 :=
+ x * y
+
+/- [no_nested_borrows::mix_arith_u32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 112:0-112:51 -/
+def mix_arith_u32 (x : U32) (y : U32) (z : U32) : Result U32 :=
+ do
+ let i ← x + y
+ let i0 ← x / y
+ let i1 ← i * i0
+ let i2 ← z % y
+ let i3 ← x - i2
+ let i4 ← i1 + i3
+ let i5 ← x + y
+ let i6 ← i5 + z
+ i4 % i6
+
+/- [no_nested_borrows::mix_arith_i32]: forward function
+ Source: 'src/no_nested_borrows.rs', lines 116:0-116:51 -/
+def mix_arith_i32 (x : I32) (y : I32) (z : I32) : Result I32 :=
+ do
+ let i ← x + y
+ let i0 ← x / y
+ let i1 ← i * i0
+ let i2 ← z % y
+ let i3 ← x - i2
+ let i4 ← i1 + i3
+ let i5 ← x + y
+ let i6 ← i5 + z
+ i4 % i6
+
/- [no_nested_borrows::CONST0]
- Source: 'src/no_nested_borrows.rs', lines 91:0-91:23 -/
+ 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)
/- [no_nested_borrows::CONST1]
- Source: 'src/no_nested_borrows.rs', lines 92:0-92:23 -/
+ 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)
/- [no_nested_borrows::cast_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 94:0-94:31 -/
+ Source: 'src/no_nested_borrows.rs', lines 128:0-128:31 -/
def cast_test (x : U32) : Result I32 :=
Scalar.cast .I32 x
/- [no_nested_borrows::test2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 99:0-99:14 -/
+ Source: 'src/no_nested_borrows.rs', lines 133:0-133:14 -/
def test2 : Result Unit :=
do
let _ ← 23#u32 + 44#u32
@@ -104,14 +162,14 @@ def test2 : Result Unit :=
#assert (test2 == Result.ret ())
/- [no_nested_borrows::get_max]: forward function
- Source: 'src/no_nested_borrows.rs', lines 111:0-111:37 -/
+ Source: 'src/no_nested_borrows.rs', lines 145:0-145:37 -/
def get_max (x : U32) (y : U32) : Result U32 :=
if x >= y
then Result.ret x
else Result.ret y
/- [no_nested_borrows::test3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 119:0-119:14 -/
+ Source: 'src/no_nested_borrows.rs', lines 153:0-153:14 -/
def test3 : Result Unit :=
do
let x ← get_max 4#u32 3#u32
@@ -125,7 +183,7 @@ def test3 : Result Unit :=
#assert (test3 == Result.ret ())
/- [no_nested_borrows::test_neg1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 126:0-126:18 -/
+ Source: 'src/no_nested_borrows.rs', lines 160:0-160:18 -/
def test_neg1 : Result Unit :=
do
let y ← - 3#i32
@@ -137,7 +195,7 @@ def test_neg1 : Result Unit :=
#assert (test_neg1 == Result.ret ())
/- [no_nested_borrows::refs_test1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 133:0-133:19 -/
+ Source: 'src/no_nested_borrows.rs', lines 167:0-167:19 -/
def refs_test1 : Result Unit :=
if not (1#i32 = 1#i32)
then Result.fail .panic
@@ -147,7 +205,7 @@ def refs_test1 : Result Unit :=
#assert (refs_test1 == Result.ret ())
/- [no_nested_borrows::refs_test2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 144:0-144:19 -/
+ Source: 'src/no_nested_borrows.rs', lines 178:0-178:19 -/
def refs_test2 : Result Unit :=
if not (2#i32 = 2#i32)
then Result.fail .panic
@@ -165,7 +223,7 @@ def refs_test2 : Result Unit :=
#assert (refs_test2 == Result.ret ())
/- [no_nested_borrows::test_list1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 160:0-160:19 -/
+ Source: 'src/no_nested_borrows.rs', lines 194:0-194:19 -/
def test_list1 : Result Unit :=
Result.ret ()
@@ -173,7 +231,7 @@ def test_list1 : Result Unit :=
#assert (test_list1 == Result.ret ())
/- [no_nested_borrows::test_box1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 165:0-165:18 -/
+ Source: 'src/no_nested_borrows.rs', lines 199:0-199:18 -/
def test_box1 : Result Unit :=
do
let b := 0#i32
@@ -187,26 +245,26 @@ def test_box1 : Result Unit :=
#assert (test_box1 == Result.ret ())
/- [no_nested_borrows::copy_int]: forward function
- Source: 'src/no_nested_borrows.rs', lines 175:0-175:30 -/
+ Source: 'src/no_nested_borrows.rs', lines 209:0-209:30 -/
def copy_int (x : I32) : Result I32 :=
Result.ret x
/- [no_nested_borrows::test_unreachable]: forward function
- Source: 'src/no_nested_borrows.rs', lines 181:0-181:32 -/
+ Source: 'src/no_nested_borrows.rs', lines 215:0-215:32 -/
def test_unreachable (b : Bool) : Result Unit :=
if b
then Result.fail .panic
else Result.ret ()
/- [no_nested_borrows::test_panic]: forward function
- Source: 'src/no_nested_borrows.rs', lines 189:0-189:26 -/
+ Source: 'src/no_nested_borrows.rs', lines 223:0-223:26 -/
def test_panic (b : Bool) : Result Unit :=
if b
then Result.fail .panic
else Result.ret ()
/- [no_nested_borrows::test_copy_int]: forward function
- Source: 'src/no_nested_borrows.rs', lines 196:0-196:22 -/
+ Source: 'src/no_nested_borrows.rs', lines 230:0-230:22 -/
def test_copy_int : Result Unit :=
do
let y ← copy_int 0#i32
@@ -218,14 +276,14 @@ def test_copy_int : Result Unit :=
#assert (test_copy_int == Result.ret ())
/- [no_nested_borrows::is_cons]: forward function
- Source: 'src/no_nested_borrows.rs', lines 203:0-203:38 -/
+ Source: 'src/no_nested_borrows.rs', lines 237:0-237:38 -/
def is_cons (T : Type) (l : List T) : Result Bool :=
match l with
| List.Cons t l0 => Result.ret true
| List.Nil => Result.ret false
/- [no_nested_borrows::test_is_cons]: forward function
- Source: 'src/no_nested_borrows.rs', lines 210:0-210:21 -/
+ Source: 'src/no_nested_borrows.rs', lines 244:0-244:21 -/
def test_is_cons : Result Unit :=
do
let l := List.Nil
@@ -238,14 +296,14 @@ def test_is_cons : Result Unit :=
#assert (test_is_cons == Result.ret ())
/- [no_nested_borrows::split_list]: forward function
- Source: 'src/no_nested_borrows.rs', lines 216:0-216:48 -/
+ Source: 'src/no_nested_borrows.rs', lines 250:0-250:48 -/
def split_list (T : Type) (l : List T) : Result (T × (List T)) :=
match l with
| List.Cons hd tl => Result.ret (hd, tl)
| List.Nil => Result.fail .panic
/- [no_nested_borrows::test_split_list]: forward function
- Source: 'src/no_nested_borrows.rs', lines 224:0-224:24 -/
+ Source: 'src/no_nested_borrows.rs', lines 258:0-258:24 -/
def test_split_list : Result Unit :=
do
let l := List.Nil
@@ -259,14 +317,14 @@ def test_split_list : Result Unit :=
#assert (test_split_list == Result.ret ())
/- [no_nested_borrows::choose]: forward function
- Source: 'src/no_nested_borrows.rs', lines 231:0-231:70 -/
+ Source: 'src/no_nested_borrows.rs', lines 265:0-265:70 -/
def choose (T : Type) (b : Bool) (x : T) (y : T) : Result T :=
if b
then Result.ret x
else Result.ret y
/- [no_nested_borrows::choose]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 231:0-231:70 -/
+ Source: 'src/no_nested_borrows.rs', lines 265:0-265:70 -/
def choose_back
(T : Type) (b : Bool) (x : T) (y : T) (ret : T) : Result (T × T) :=
if b
@@ -274,7 +332,7 @@ def choose_back
else Result.ret (x, ret)
/- [no_nested_borrows::choose_test]: forward function
- Source: 'src/no_nested_borrows.rs', lines 239:0-239:20 -/
+ Source: 'src/no_nested_borrows.rs', lines 273:0-273:20 -/
def choose_test : Result Unit :=
do
let z ← choose I32 true 0#i32 0#i32
@@ -294,20 +352,20 @@ def choose_test : Result Unit :=
#assert (choose_test == Result.ret ())
/- [no_nested_borrows::test_char]: forward function
- Source: 'src/no_nested_borrows.rs', lines 251:0-251:26 -/
+ Source: 'src/no_nested_borrows.rs', lines 285:0-285:26 -/
def test_char : Result Char :=
Result.ret 'a'
mutual
/- [no_nested_borrows::Tree]
- Source: 'src/no_nested_borrows.rs', lines 256:0-256:16 -/
+ Source: 'src/no_nested_borrows.rs', lines 290:0-290:16 -/
inductive Tree (T : Type) :=
| Leaf : T → Tree T
| Node : T → NodeElem T → Tree T → Tree T
/- [no_nested_borrows::NodeElem]
- Source: 'src/no_nested_borrows.rs', lines 261:0-261:20 -/
+ Source: 'src/no_nested_borrows.rs', lines 295:0-295:20 -/
inductive NodeElem (T : Type) :=
| Cons : Tree T → NodeElem T → NodeElem T
| Nil : NodeElem T
@@ -315,7 +373,7 @@ inductive NodeElem (T : Type) :=
end
/- [no_nested_borrows::list_length]: forward function
- Source: 'src/no_nested_borrows.rs', lines 296:0-296:48 -/
+ Source: 'src/no_nested_borrows.rs', lines 330:0-330:48 -/
divergent def list_length (T : Type) (l : List T) : Result U32 :=
match l with
| List.Cons t l1 => do
@@ -324,7 +382,7 @@ divergent def list_length (T : Type) (l : List T) : Result U32 :=
| List.Nil => Result.ret 0#u32
/- [no_nested_borrows::list_nth_shared]: forward function
- Source: 'src/no_nested_borrows.rs', lines 304:0-304:62 -/
+ Source: 'src/no_nested_borrows.rs', lines 338:0-338:62 -/
divergent def list_nth_shared (T : Type) (l : List T) (i : U32) : Result T :=
match l with
| List.Cons x tl =>
@@ -336,7 +394,7 @@ divergent def list_nth_shared (T : Type) (l : List T) (i : U32) : Result T :=
| List.Nil => Result.fail .panic
/- [no_nested_borrows::list_nth_mut]: forward function
- Source: 'src/no_nested_borrows.rs', lines 320:0-320:67 -/
+ Source: 'src/no_nested_borrows.rs', lines 354:0-354:67 -/
divergent def list_nth_mut (T : Type) (l : List T) (i : U32) : Result T :=
match l with
| List.Cons x tl =>
@@ -348,7 +406,7 @@ divergent def list_nth_mut (T : Type) (l : List T) (i : U32) : Result T :=
| List.Nil => Result.fail .panic
/- [no_nested_borrows::list_nth_mut]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 320:0-320:67 -/
+ Source: 'src/no_nested_borrows.rs', lines 354:0-354:67 -/
divergent def list_nth_mut_back
(T : Type) (l : List T) (i : U32) (ret : T) : Result (List T) :=
match l with
@@ -363,7 +421,7 @@ divergent def list_nth_mut_back
| List.Nil => Result.fail .panic
/- [no_nested_borrows::list_rev_aux]: forward function
- Source: 'src/no_nested_borrows.rs', lines 336:0-336:63 -/
+ Source: 'src/no_nested_borrows.rs', lines 370:0-370:63 -/
divergent def list_rev_aux
(T : Type) (li : List T) (lo : List T) : Result (List T) :=
match li with
@@ -372,13 +430,13 @@ divergent def list_rev_aux
/- [no_nested_borrows::list_rev]: merged forward/backward function
(there is a single backward function, and the forward function returns ())
- Source: 'src/no_nested_borrows.rs', lines 350:0-350:42 -/
+ Source: 'src/no_nested_borrows.rs', lines 384:0-384:42 -/
def list_rev (T : Type) (l : List T) : Result (List T) :=
let li := core.mem.replace (List T) l List.Nil
list_rev_aux T li List.Nil
/- [no_nested_borrows::test_list_functions]: forward function
- Source: 'src/no_nested_borrows.rs', lines 355:0-355:28 -/
+ Source: 'src/no_nested_borrows.rs', lines 389:0-389:28 -/
def test_list_functions : Result Unit :=
do
let l := List.Nil
@@ -425,97 +483,97 @@ def test_list_functions : Result Unit :=
#assert (test_list_functions == Result.ret ())
/- [no_nested_borrows::id_mut_pair1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 371:0-371:89 -/
+ Source: 'src/no_nested_borrows.rs', lines 405:0-405:89 -/
def id_mut_pair1 (T1 T2 : Type) (x : T1) (y : T2) : Result (T1 × T2) :=
Result.ret (x, y)
/- [no_nested_borrows::id_mut_pair1]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 371:0-371:89 -/
+ Source: 'src/no_nested_borrows.rs', lines 405:0-405:89 -/
def id_mut_pair1_back
(T1 T2 : Type) (x : T1) (y : T2) (ret : (T1 × T2)) : Result (T1 × T2) :=
let (t, t0) := ret
Result.ret (t, t0)
/- [no_nested_borrows::id_mut_pair2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 375:0-375:88 -/
+ Source: 'src/no_nested_borrows.rs', lines 409:0-409:88 -/
def id_mut_pair2 (T1 T2 : Type) (p : (T1 × T2)) : Result (T1 × T2) :=
let (t, t0) := p
Result.ret (t, t0)
/- [no_nested_borrows::id_mut_pair2]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 375:0-375:88 -/
+ Source: 'src/no_nested_borrows.rs', lines 409:0-409:88 -/
def id_mut_pair2_back
(T1 T2 : Type) (p : (T1 × T2)) (ret : (T1 × T2)) : Result (T1 × T2) :=
let (t, t0) := ret
Result.ret (t, t0)
/- [no_nested_borrows::id_mut_pair3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 -/
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 -/
def id_mut_pair3 (T1 T2 : Type) (x : T1) (y : T2) : Result (T1 × T2) :=
Result.ret (x, y)
/- [no_nested_borrows::id_mut_pair3]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 -/
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 -/
def id_mut_pair3_back'a
(T1 T2 : Type) (x : T1) (y : T2) (ret : T1) : Result T1 :=
Result.ret ret
/- [no_nested_borrows::id_mut_pair3]: backward function 1
- Source: 'src/no_nested_borrows.rs', lines 379:0-379:93 -/
+ Source: 'src/no_nested_borrows.rs', lines 413:0-413:93 -/
def id_mut_pair3_back'b
(T1 T2 : Type) (x : T1) (y : T2) (ret : T2) : Result T2 :=
Result.ret ret
/- [no_nested_borrows::id_mut_pair4]: forward function
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 -/
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 -/
def id_mut_pair4 (T1 T2 : Type) (p : (T1 × T2)) : Result (T1 × T2) :=
let (t, t0) := p
Result.ret (t, t0)
/- [no_nested_borrows::id_mut_pair4]: backward function 0
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 -/
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 -/
def id_mut_pair4_back'a
(T1 T2 : Type) (p : (T1 × T2)) (ret : T1) : Result T1 :=
Result.ret ret
/- [no_nested_borrows::id_mut_pair4]: backward function 1
- Source: 'src/no_nested_borrows.rs', lines 383:0-383:92 -/
+ Source: 'src/no_nested_borrows.rs', lines 417:0-417:92 -/
def id_mut_pair4_back'b
(T1 T2 : Type) (p : (T1 × T2)) (ret : T2) : Result T2 :=
Result.ret ret
/- [no_nested_borrows::StructWithTuple]
- Source: 'src/no_nested_borrows.rs', lines 390:0-390:34 -/
+ Source: 'src/no_nested_borrows.rs', lines 424:0-424:34 -/
structure StructWithTuple (T1 T2 : Type) where
p : (T1 × T2)
/- [no_nested_borrows::new_tuple1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 394:0-394:48 -/
+ Source: 'src/no_nested_borrows.rs', lines 428:0-428:48 -/
def new_tuple1 : Result (StructWithTuple U32 U32) :=
Result.ret { p := (1#u32, 2#u32) }
/- [no_nested_borrows::new_tuple2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 398:0-398:48 -/
+ Source: 'src/no_nested_borrows.rs', lines 432:0-432:48 -/
def new_tuple2 : Result (StructWithTuple I16 I16) :=
Result.ret { p := (1#i16, 2#i16) }
/- [no_nested_borrows::new_tuple3]: forward function
- Source: 'src/no_nested_borrows.rs', lines 402:0-402:48 -/
+ Source: 'src/no_nested_borrows.rs', lines 436:0-436:48 -/
def new_tuple3 : Result (StructWithTuple U64 I64) :=
Result.ret { p := (1#u64, 2#i64) }
/- [no_nested_borrows::StructWithPair]
- Source: 'src/no_nested_borrows.rs', lines 407:0-407:33 -/
+ Source: 'src/no_nested_borrows.rs', lines 441:0-441:33 -/
structure StructWithPair (T1 T2 : Type) where
p : Pair T1 T2
/- [no_nested_borrows::new_pair1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 411:0-411:46 -/
+ Source: 'src/no_nested_borrows.rs', lines 445:0-445:46 -/
def new_pair1 : Result (StructWithPair U32 U32) :=
Result.ret { p := { x := 1#u32, y := 2#u32 } }
/- [no_nested_borrows::test_constants]: forward function
- Source: 'src/no_nested_borrows.rs', lines 419:0-419:23 -/
+ Source: 'src/no_nested_borrows.rs', lines 453:0-453:23 -/
def test_constants : Result Unit :=
do
let swt ← new_tuple1
@@ -545,7 +603,7 @@ def test_constants : Result Unit :=
#assert (test_constants == Result.ret ())
/- [no_nested_borrows::test_weird_borrows1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 428:0-428:28 -/
+ Source: 'src/no_nested_borrows.rs', lines 462:0-462:28 -/
def test_weird_borrows1 : Result Unit :=
Result.ret ()
@@ -554,7 +612,7 @@ def test_weird_borrows1 : Result Unit :=
/- [no_nested_borrows::test_mem_replace]: merged forward/backward function
(there is a single backward function, and the forward function returns ())
- Source: 'src/no_nested_borrows.rs', lines 438:0-438:37 -/
+ Source: 'src/no_nested_borrows.rs', lines 472:0-472:37 -/
def test_mem_replace (px : U32) : Result U32 :=
let y := core.mem.replace U32 px 1#u32
if not (y = 0#u32)
@@ -562,26 +620,26 @@ def test_mem_replace (px : U32) : Result U32 :=
else Result.ret 2#u32
/- [no_nested_borrows::test_shared_borrow_bool1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 445:0-445:47 -/
+ Source: 'src/no_nested_borrows.rs', lines 479:0-479:47 -/
def test_shared_borrow_bool1 (b : Bool) : Result U32 :=
if b
then Result.ret 0#u32
else Result.ret 1#u32
/- [no_nested_borrows::test_shared_borrow_bool2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 458:0-458:40 -/
+ Source: 'src/no_nested_borrows.rs', lines 492:0-492:40 -/
def test_shared_borrow_bool2 : Result U32 :=
Result.ret 0#u32
/- [no_nested_borrows::test_shared_borrow_enum1]: forward function
- Source: 'src/no_nested_borrows.rs', lines 473:0-473:52 -/
+ Source: 'src/no_nested_borrows.rs', lines 507:0-507:52 -/
def test_shared_borrow_enum1 (l : List U32) : Result U32 :=
match l with
| List.Cons i l0 => Result.ret 1#u32
| List.Nil => Result.ret 0#u32
/- [no_nested_borrows::test_shared_borrow_enum2]: forward function
- Source: 'src/no_nested_borrows.rs', lines 485:0-485:40 -/
+ Source: 'src/no_nested_borrows.rs', lines 519:0-519:40 -/
def test_shared_borrow_enum2 : Result U32 :=
Result.ret 0#u32