diff --git a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg index edcae4251c..c2c229cccb 100644 --- a/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg +++ b/creusot/tests/should_fail/bug/01_resolve_unsoundness.mlcfg @@ -131,7 +131,7 @@ module C01ResolveUnsoundness_MakeVecOfSize goto BB1 } BB1 { - [#"../01_resolve_unsoundness.rs" 11 16 11 17] i <- ([#"../01_resolve_unsoundness.rs" 11 16 11 17] (0 : usize)); + [#"../01_resolve_unsoundness.rs" 11 16 11 17] i <- (0 : usize); goto BB2 } BB2 { @@ -139,7 +139,7 @@ module C01ResolveUnsoundness_MakeVecOfSize goto BB3 } BB3 { - [#"../01_resolve_unsoundness.rs" 13 10 13 16] _9 <- ([#"../01_resolve_unsoundness.rs" 13 10 13 16] i <= n); + [#"../01_resolve_unsoundness.rs" 13 10 13 16] _9 <- i <= n; switch (_9) | False -> goto BB6 | True -> goto BB4 @@ -153,11 +153,11 @@ module C01ResolveUnsoundness_MakeVecOfSize goto BB5 } BB5 { - [#"../01_resolve_unsoundness.rs" 15 8 15 14] i <- ([#"../01_resolve_unsoundness.rs" 15 8 15 14] i + (1 : usize)); + [#"../01_resolve_unsoundness.rs" 15 8 15 14] i <- i + (1 : usize); goto BB2 } BB6 { - [#"../01_resolve_unsoundness.rs" 17 11 17 14] _0 <- ([#"../01_resolve_unsoundness.rs" 17 11 17 14] out); + [#"../01_resolve_unsoundness.rs" 17 11 17 14] _0 <- out; out <- any Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global); goto BB7 } diff --git a/creusot/tests/should_fail/bug/222.mlcfg b/creusot/tests/should_fail/bug/222.mlcfg index 2d61a81f46..878590ff99 100644 --- a/creusot/tests/should_fail/bug/222.mlcfg +++ b/creusot/tests/should_fail/bug/222.mlcfg @@ -106,7 +106,7 @@ module C222_UsesInvariant goto BB2 } BB2 { - [#"../222.rs" 40 42 42 1] _0 <- ([#"../222.rs" 40 42 42 1] ()); + [#"../222.rs" 40 42 42 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_fail/bug/492.mlcfg b/creusot/tests/should_fail/bug/492.mlcfg index 21d7ec792e..4186e8084e 100644 --- a/creusot/tests/should_fail/bug/492.mlcfg +++ b/creusot/tests/should_fail/bug/492.mlcfg @@ -52,7 +52,7 @@ module C492_ReborrowTuple [#"../492.rs" 6 5 6 6] _3 <- Borrow.borrow_final ( * x) (Borrow.get_id x); [#"../492.rs" 6 5 6 6] x <- { x with current = ( ^ _3) ; }; assume { inv0 ( ^ _3) }; - [#"../492.rs" 6 4 6 11] _0 <- ([#"../492.rs" 6 4 6 11] (_3, (32 : uint32))); + [#"../492.rs" 6 4 6 11] _0 <- (_3, (32 : uint32)); _3 <- any borrowed t; assert { [@expl:type invariant] inv1 x }; assume { resolve0 x }; @@ -119,7 +119,7 @@ module C492_Test goto BB0 } BB0 { - [#"../492.rs" 11 16 11 17] x <- ([#"../492.rs" 11 16 11 17] (5 : int32)); + [#"../492.rs" 11 16 11 17] x <- (5 : int32); [#"../492.rs" 12 34 12 40] _6 <- Borrow.borrow_mut x; [#"../492.rs" 12 34 12 40] x <- ^ _6; [#"../492.rs" 12 34 12 40] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6); @@ -129,14 +129,14 @@ module C492_Test goto BB1 } BB1 { - [#"../492.rs" 12 9 12 12] res <- ([#"../492.rs" 12 9 12 12] let (a, _) = _4 in a); + [#"../492.rs" 12 9 12 12] res <- (let (a, _) = _4 in a); _4 <- (let (x0, x1) = _4 in (any borrowed int32, x1)); assume { resolve0 _4 }; assume { resolve1 _6 }; assert { [@expl:assertion] [#"../492.rs" 13 18 13 30] ^ res = (5 : int32) }; - [#"../492.rs" 14 4 14 13] res <- { res with current = ([#"../492.rs" 14 4 14 13] (10 : int32)) ; }; + [#"../492.rs" 14 4 14 13] res <- { res with current = (10 : int32) ; }; assume { resolve1 res }; - [#"../492.rs" 10 14 15 1] _0 <- ([#"../492.rs" 10 14 15 1] ()); + [#"../492.rs" 10 14 15 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_fail/bug/692.mlcfg b/creusot/tests/should_fail/bug/692.mlcfg index b38b939b26..b0f01f7a22 100644 --- a/creusot/tests/should_fail/bug/692.mlcfg +++ b/creusot/tests/should_fail/bug/692.mlcfg @@ -157,7 +157,7 @@ module C692_Incorrect goto BB1 } BB1 { - [#"../692.rs" 8 77 8 79] _0 <- ([#"../692.rs" 8 77 8 79] ()); + [#"../692.rs" 8 77 8 79] _0 <- (); goto BB2 } BB2 { @@ -219,19 +219,19 @@ module C692_ValidNormal_Closure2 end } BB1 { - [#"../692.rs" 16 25 16 26] _4 <- ([#"../692.rs" 16 25 16 26] (2 : uint32)); + [#"../692.rs" 16 25 16 26] _4 <- (2 : uint32); goto BB3 } BB2 { - [#"../692.rs" 16 36 16 37] _4 <- ([#"../692.rs" 16 36 16 37] (1 : uint32)); + [#"../692.rs" 16 36 16 37] _4 <- (1 : uint32); goto BB3 } BB3 { - [#"../692.rs" 16 14 16 39] _1 <- { _1 with current = (let C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 x0 = * _1 in C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 ({ (field_00 ( * _1)) with current = ([#"../692.rs" 16 14 16 39] _4) ; })) ; }; + [#"../692.rs" 16 14 16 39] _1 <- { _1 with current = (let C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 x0 = * _1 in C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 ({ (field_00 ( * _1)) with current = _4 ; })) ; }; _4 <- any uint32; assume { resolve0 _1 }; - [#"../692.rs" 16 14 16 39] res <- ([#"../692.rs" 16 14 16 39] ()); - [#"../692.rs" 15 17 15 64] _0 <- ([#"../692.rs" 15 17 15 64] res); + [#"../692.rs" 16 14 16 39] res <- (); + [#"../692.rs" 15 17 15 64] _0 <- res; return _0 } @@ -267,8 +267,8 @@ module C692_ValidNormal_Closure1 goto BB0 } BB0 { - [#"../692.rs" 14 7 14 15] res <- ([#"../692.rs" 14 7 14 15] field_00 _1 > (7 : uint32)); - [#"../692.rs" 13 15 13 47] _0 <- ([#"../692.rs" 13 15 13 47] res); + [#"../692.rs" 14 7 14 15] res <- field_00 _1 > (7 : uint32); + [#"../692.rs" 13 15 13 47] _0 <- res; return _0 } @@ -341,11 +341,11 @@ module C692_ValidNormal goto BB0 } BB0 { - [#"../692.rs" 12 16 12 20] r <- ([#"../692.rs" 12 16 12 20] (0 : uint32)); - [#"../692.rs" 13 15 13 47] cond <- ([#"../692.rs" 13 15 13 47] C692_ValidNormal_Closure1.C692_ValidNormal_Closure1 n); + [#"../692.rs" 12 16 12 20] r <- (0 : uint32); + [#"../692.rs" 13 15 13 47] cond <- C692_ValidNormal_Closure1.C692_ValidNormal_Closure1 n; [#"../692.rs" 15 17 15 64] _7 <- Borrow.borrow_mut r; [#"../692.rs" 15 17 15 64] r <- ^ _7; - [#"../692.rs" 15 17 15 64] branch <- ([#"../692.rs" 15 17 15 64] C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 _7); + [#"../692.rs" 15 17 15 64] branch <- C692_ValidNormal_Closure2.C692_ValidNormal_Closure2 _7; _7 <- any borrowed uint32; assume { resolve0 cond }; [#"../692.rs" 17 4 17 27] _8 <- ([#"../692.rs" 17 4 17 27] incorrect0 cond branch); @@ -353,7 +353,7 @@ module C692_ValidNormal goto BB1 } BB1 { - [#"../692.rs" 18 4 18 5] _0 <- ([#"../692.rs" 18 4 18 5] r); + [#"../692.rs" 18 4 18 5] _0 <- r; return _0 } diff --git a/creusot/tests/should_fail/bug/695.mlcfg b/creusot/tests/should_fail/bug/695.mlcfg index d3ed638384..07f5d5e444 100644 --- a/creusot/tests/should_fail/bug/695.mlcfg +++ b/creusot/tests/should_fail/bug/695.mlcfg @@ -193,7 +193,7 @@ module C695_InversedIf goto BB2 } BB2 { - [#"../695.rs" 7 8 7 14] _7 <- ([#"../695.rs" 7 8 7 14] ()); + [#"../695.rs" 7 8 7 14] _7 <- (); [#"../695.rs" 7 8 7 14] _5 <- ([#"../695.rs" 7 8 7 14] call0 cond _7); _7 <- any (); goto BB3 @@ -207,7 +207,7 @@ module C695_InversedIf BB4 { assert { [@expl:type invariant] inv0 cond }; assume { resolve0 cond }; - [#"../695.rs" 10 8 10 21] _11 <- ([#"../695.rs" 10 8 10 21] (false)); + [#"../695.rs" 10 8 10 21] _11 <- (false); [#"../695.rs" 10 8 10 21] _0 <- ([#"../695.rs" 10 8 10 21] call_once0 branch _11); branch <- any b; _11 <- any bool; @@ -216,7 +216,7 @@ module C695_InversedIf BB5 { assert { [@expl:type invariant] inv0 cond }; assume { resolve0 cond }; - [#"../695.rs" 8 8 8 20] _9 <- ([#"../695.rs" 8 8 8 20] (true)); + [#"../695.rs" 8 8 8 20] _9 <- (true); [#"../695.rs" 8 8 8 20] _0 <- ([#"../695.rs" 8 8 8 20] call_once0 branch _9); branch <- any b; _9 <- any bool; @@ -288,19 +288,19 @@ module C695_Valid_Closure2 end } BB1 { - [#"../695.rs" 20 25 20 26] _4 <- ([#"../695.rs" 20 25 20 26] (2 : uint32)); + [#"../695.rs" 20 25 20 26] _4 <- (2 : uint32); goto BB3 } BB2 { - [#"../695.rs" 20 36 20 37] _4 <- ([#"../695.rs" 20 36 20 37] (1 : uint32)); + [#"../695.rs" 20 36 20 37] _4 <- (1 : uint32); goto BB3 } BB3 { - [#"../695.rs" 20 14 20 39] _1 <- { _1 with current = (let C695_Valid_Closure2.C695_Valid_Closure2 x0 = * _1 in C695_Valid_Closure2.C695_Valid_Closure2 ({ (field_00 ( * _1)) with current = ([#"../695.rs" 20 14 20 39] _4) ; })) ; }; + [#"../695.rs" 20 14 20 39] _1 <- { _1 with current = (let C695_Valid_Closure2.C695_Valid_Closure2 x0 = * _1 in C695_Valid_Closure2.C695_Valid_Closure2 ({ (field_00 ( * _1)) with current = _4 ; })) ; }; _4 <- any uint32; assume { resolve0 _1 }; - [#"../695.rs" 20 14 20 39] res <- ([#"../695.rs" 20 14 20 39] ()); - [#"../695.rs" 19 17 19 64] _0 <- ([#"../695.rs" 19 17 19 64] res); + [#"../695.rs" 20 14 20 39] res <- (); + [#"../695.rs" 19 17 19 64] _0 <- res; return _0 } @@ -336,8 +336,8 @@ module C695_Valid_Closure1 goto BB0 } BB0 { - [#"../695.rs" 18 7 18 15] res <- ([#"../695.rs" 18 7 18 15] field_00 _1 > (7 : uint32)); - [#"../695.rs" 17 15 17 47] _0 <- ([#"../695.rs" 17 15 17 47] res); + [#"../695.rs" 18 7 18 15] res <- field_00 _1 > (7 : uint32); + [#"../695.rs" 17 15 17 47] _0 <- res; return _0 } @@ -415,11 +415,11 @@ module C695_Valid goto BB0 } BB0 { - [#"../695.rs" 16 16 16 20] r <- ([#"../695.rs" 16 16 16 20] (0 : uint32)); - [#"../695.rs" 17 15 17 47] cond <- ([#"../695.rs" 17 15 17 47] C695_Valid_Closure1.C695_Valid_Closure1 n); + [#"../695.rs" 16 16 16 20] r <- (0 : uint32); + [#"../695.rs" 17 15 17 47] cond <- C695_Valid_Closure1.C695_Valid_Closure1 n; [#"../695.rs" 19 17 19 64] _7 <- Borrow.borrow_mut r; [#"../695.rs" 19 17 19 64] r <- ^ _7; - [#"../695.rs" 19 17 19 64] branch <- ([#"../695.rs" 19 17 19 64] C695_Valid_Closure2.C695_Valid_Closure2 _7); + [#"../695.rs" 19 17 19 64] branch <- C695_Valid_Closure2.C695_Valid_Closure2 _7; _7 <- any borrowed uint32; assume { resolve0 cond }; [#"../695.rs" 21 4 21 29] _8 <- ([#"../695.rs" 21 4 21 29] inversed_if0 cond branch); @@ -428,7 +428,7 @@ module C695_Valid } BB1 { assert { [@expl:assertion] [#"../695.rs" 22 20 22 25] false }; - [#"../695.rs" 23 4 23 5] _0 <- ([#"../695.rs" 23 4 23 5] r); + [#"../695.rs" 23 4 23 5] _0 <- r; return _0 } diff --git a/creusot/tests/should_fail/bug/869.mlcfg b/creusot/tests/should_fail/bug/869.mlcfg index 336bd0c7c1..6e9004f4cd 100644 --- a/creusot/tests/should_fail/bug/869.mlcfg +++ b/creusot/tests/should_fail/bug/869.mlcfg @@ -61,13 +61,13 @@ module C869_Unsound goto BB3 } BB3 { - [#"../869.rs" 18 4 18 64] evil <- { evil with current = ([#"../869.rs" 18 4 18 64] _15) ; }; + [#"../869.rs" 18 4 18 64] evil <- { evil with current = _15 ; }; _15 <- any Snapshot.snap_ty bool; assume { resolve0 evil }; assume { resolve0 xm }; assert { [@expl:assertion] [#"../869.rs" 19 20 19 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( ^ evil)) }; assert { [@expl:assertion] [#"../869.rs" 20 20 20 37] Snapshot.inner ( * evil) = (not Snapshot.inner ( * evil)) }; - [#"../869.rs" 4 17 21 1] _0 <- ([#"../869.rs" 4 17 21 1] ()); + [#"../869.rs" 4 17 21 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_fail/bug/specialize.mlcfg b/creusot/tests/should_fail/bug/specialize.mlcfg index 2b62b6f2c4..97bceeeae3 100644 --- a/creusot/tests/should_fail/bug/specialize.mlcfg +++ b/creusot/tests/should_fail/bug/specialize.mlcfg @@ -62,7 +62,7 @@ module Specialize_F } BB1 { assert { [@expl:assertion] [#"../specialize.rs" 24 20 24 25] false }; - [#"../specialize.rs" 21 18 25 1] _0 <- ([#"../specialize.rs" 21 18 25 1] ()); + [#"../specialize.rs" 21 18 25 1] _0 <- (); goto BB2 } BB2 { @@ -126,7 +126,7 @@ module Specialize_G } BB1 { assert { [@expl:assertion] [#"../specialize.rs" 31 20 31 25] false }; - [#"../specialize.rs" 27 19 32 1] _0 <- ([#"../specialize.rs" 27 19 32 1] ()); + [#"../specialize.rs" 27 19 32 1] _0 <- (); goto BB2 } BB2 { @@ -191,7 +191,7 @@ module Specialize_H } BB1 { assert { [@expl:assertion] [#"../specialize.rs" 37 20 37 25] false }; - [#"../specialize.rs" 34 18 38 1] _0 <- ([#"../specialize.rs" 34 18 38 1] ()); + [#"../specialize.rs" 34 18 38 1] _0 <- (); goto BB2 } BB2 { diff --git a/creusot/tests/should_fail/bug/subregion.mlcfg b/creusot/tests/should_fail/bug/subregion.mlcfg index f5199bad20..a865f6f38c 100644 --- a/creusot/tests/should_fail/bug/subregion.mlcfg +++ b/creusot/tests/should_fail/bug/subregion.mlcfg @@ -15,7 +15,7 @@ module Subregion_ListReversalH goto BB0 } BB0 { - [#"../subregion.rs" 4 16 4 17] r <- ([#"../subregion.rs" 4 16 4 17] (0 : usize)); + [#"../subregion.rs" 4 16 4 17] r <- (0 : usize); goto BB1 } BB1 { @@ -23,7 +23,7 @@ module Subregion_ListReversalH goto BB2 } BB2 { - [#"../subregion.rs" 6 10 6 16] _7 <- ([#"../subregion.rs" 6 10 6 16] l <> (0 : usize)); + [#"../subregion.rs" 6 10 6 16] _7 <- l <> (0 : usize); switch (_7) | False -> goto BB4 | True -> goto BB3 @@ -31,13 +31,13 @@ module Subregion_ListReversalH } BB3 { assert { [@expl:assertion] [#"../subregion.rs" 7 22 7 27] false }; - [#"../subregion.rs" 8 16 8 17] x <- ([#"../subregion.rs" 8 16 8 17] r); - [#"../subregion.rs" 9 18 9 19] tmp <- ([#"../subregion.rs" 9 18 9 19] l); - [#"../subregion.rs" 10 8 10 15] r <- ([#"../subregion.rs" 10 8 10 15] tmp); + [#"../subregion.rs" 8 16 8 17] x <- r; + [#"../subregion.rs" 9 18 9 19] tmp <- l; + [#"../subregion.rs" 10 8 10 15] r <- tmp; goto BB1 } BB4 { - [#"../subregion.rs" 13 11 13 12] _0 <- ([#"../subregion.rs" 13 11 13 12] r); + [#"../subregion.rs" 13 11 13 12] _0 <- r; return _0 } diff --git a/creusot/tests/should_fail/final_borrows.mlcfg b/creusot/tests/should_fail/final_borrows.mlcfg index a4d8b7fa04..67334882c2 100644 --- a/creusot/tests/should_fail/final_borrows.mlcfg +++ b/creusot/tests/should_fail/final_borrows.mlcfg @@ -48,7 +48,7 @@ module FinalBorrows_NotFinalBorrow assume { inv0 ( ^ _b2) }; assert { [@expl:type invariant] inv1 _b2 }; assume { resolve0 _b2 }; - [#"../final_borrows.rs" 5 40 9 1] _0 <- ([#"../final_borrows.rs" 5 40 9 1] ()); + [#"../final_borrows.rs" 5 40 9 1] _0 <- (); assert { [@expl:type invariant] inv1 bor }; assume { resolve0 bor }; return _0 @@ -106,7 +106,7 @@ module FinalBorrows_StoreChangesProphecy goto BB1 } BB1 { - [#"../final_borrows.rs" 14 4 14 8] bor <- { bor with current = ([#"../final_borrows.rs" 14 4 14 8] x) ; }; + [#"../final_borrows.rs" 14 4 14 8] bor <- { bor with current = x ; }; x <- any t; assert { [@expl:type invariant] inv0 ( * bor) }; assume { resolve1 ( * bor) }; @@ -116,7 +116,7 @@ module FinalBorrows_StoreChangesProphecy } BB3 { assert { [@expl:assertion] [#"../final_borrows.rs" 15 18 15 27] b1 = bor }; - [#"../final_borrows.rs" 11 52 16 1] _0 <- ([#"../final_borrows.rs" 11 52 16 1] ()); + [#"../final_borrows.rs" 11 52 16 1] _0 <- (); goto BB4 } BB4 { @@ -134,7 +134,7 @@ module FinalBorrows_CallChangesProphecy_Inner goto BB0 } BB0 { - [#"../final_borrows.rs" 20 8 20 9] _0 <- ([#"../final_borrows.rs" 20 8 20 9] (2 : int32)); + [#"../final_borrows.rs" 20 8 20 9] _0 <- (2 : int32); return _0 } @@ -167,11 +167,11 @@ module FinalBorrows_CallChangesProphecy goto BB1 } BB1 { - [#"../final_borrows.rs" 24 4 24 18] bor <- { bor with current = ([#"../final_borrows.rs" 24 4 24 18] _3) ; }; + [#"../final_borrows.rs" 24 4 24 18] bor <- { bor with current = _3 ; }; _3 <- any int32; assume { resolve0 bor }; assert { [@expl:assertion] [#"../final_borrows.rs" 25 18 25 27] b1 = bor }; - [#"../final_borrows.rs" 18 44 26 1] _0 <- ([#"../final_borrows.rs" 18 44 26 1] ()); + [#"../final_borrows.rs" 18 44 26 1] _0 <- (); return _0 } @@ -368,9 +368,9 @@ module FinalBorrows_Indexing goto BB0 } BB0 { - [#"../final_borrows.rs" 38 11 38 12] _6 <- ([#"../final_borrows.rs" 38 11 38 12] (0 : usize)); - [#"../final_borrows.rs" 38 9 38 13] _7 <- ([#"../final_borrows.rs" 38 9 38 13] Slice.length ( * x)); - [#"../final_borrows.rs" 38 9 38 13] _8 <- ([#"../final_borrows.rs" 38 9 38 13] _6 < _7); + [#"../final_borrows.rs" 38 11 38 12] _6 <- (0 : usize); + [#"../final_borrows.rs" 38 9 38 13] _7 <- Slice.length ( * x); + [#"../final_borrows.rs" 38 9 38 13] _8 <- _6 < _7; assert { [@expl:index in bounds] [#"../final_borrows.rs" 38 9 38 13] _8 }; goto BB1 } diff --git a/creusot/tests/should_fail/opaque_unproveable.mlcfg b/creusot/tests/should_fail/opaque_unproveable.mlcfg index 3e329c822b..170bbf82d0 100644 --- a/creusot/tests/should_fail/opaque_unproveable.mlcfg +++ b/creusot/tests/should_fail/opaque_unproveable.mlcfg @@ -12,7 +12,7 @@ module OpaqueUnproveable_Test } BB0 { assert { [@expl:assertion] [#"../opaque_unproveable.rs" 16 18 16 29] opaque0 () }; - [#"../opaque_unproveable.rs" 14 14 17 1] _0 <- ([#"../opaque_unproveable.rs" 14 14 17 1] ()); + [#"../opaque_unproveable.rs" 14 14 17 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg index 2b137a4f8b..f266021f42 100644 --- a/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg +++ b/creusot/tests/should_fail/traits/17_impl_refinement.mlcfg @@ -14,7 +14,7 @@ module C17ImplRefinement_Impl0_MyFunction goto BB0 } BB0 { - [#"../17_impl_refinement.rs" 15 8 15 10] _0 <- ([#"../17_impl_refinement.rs" 15 8 15 10] (20 : usize)); + [#"../17_impl_refinement.rs" 15 8 15 10] _0 <- (20 : usize); return _0 } diff --git a/creusot/tests/should_succeed/100doors.mlcfg b/creusot/tests/should_succeed/100doors.mlcfg index 81005bcef7..1d597066d7 100644 --- a/creusot/tests/should_succeed/100doors.mlcfg +++ b/creusot/tests/should_succeed/100doors.mlcfg @@ -383,7 +383,7 @@ module C100doors_F goto BB1 } BB1 { - [#"../100doors.rs" 21 16 21 22] _3 <- ([#"../100doors.rs" 21 16 21 22] Core_Ops_Range_Range_Type.C_Range (1 : usize) (101 : usize)); + [#"../100doors.rs" 21 16 21 22] _3 <- Core_Ops_Range_Range_Type.C_Range (1 : usize) (101 : usize); [#"../100doors.rs" 20 4 20 41] iter <- ([#"../100doors.rs" 20 4 20 41] into_iter0 _3); _3 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB2 @@ -426,7 +426,7 @@ module C100doors_F } BB9 { assume { resolve2 door_open }; - [#"../100doors.rs" 20 4 20 41] _0 <- ([#"../100doors.rs" 20 4 20 41] ()); + [#"../100doors.rs" 20 4 20 41] _0 <- (); goto BB21 } BB10 { @@ -438,15 +438,15 @@ module C100doors_F absurd } BB12 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _12); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _12; [#"../100doors.rs" 20 4 20 41] _17 <- ([#"../100doors.rs" 20 4 20 41] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB13 } BB13 { - [#"../100doors.rs" 20 4 20 41] produced <- ([#"../100doors.rs" 20 4 20 41] _17); + [#"../100doors.rs" 20 4 20 41] produced <- _17; _17 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] pass <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); - [#"../100doors.rs" 22 30 22 34] door <- ([#"../100doors.rs" 22 30 22 34] pass); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] pass <- __creusot_proc_iter_elem; + [#"../100doors.rs" 22 30 22 34] door <- pass; goto BB14 } BB14 { @@ -458,14 +458,14 @@ module C100doors_F goto BB16 } BB16 { - [#"../100doors.rs" 25 14 25 25] _23 <- ([#"../100doors.rs" 25 14 25 25] door <= (100 : usize)); + [#"../100doors.rs" 25 14 25 25] _23 <- door <= (100 : usize); switch (_23) | False -> goto BB20 | True -> goto BB17 end } BB17 { - [#"../100doors.rs" 26 45 26 53] _28 <- ([#"../100doors.rs" 26 45 26 53] door - (1 : usize)); + [#"../100doors.rs" 26 45 26 53] _28 <- door - (1 : usize); [#"../100doors.rs" 26 44 26 54] _26 <- ([#"../100doors.rs" 26 44 26 54] index0 door_open _28); _28 <- any usize; goto BB18 @@ -473,21 +473,21 @@ module C100doors_F BB18 { [#"../100doors.rs" 26 12 26 21] _31 <- Borrow.borrow_mut door_open; [#"../100doors.rs" 26 12 26 21] door_open <- ^ _31; - [#"../100doors.rs" 26 22 26 30] _32 <- ([#"../100doors.rs" 26 22 26 30] door - (1 : usize)); + [#"../100doors.rs" 26 22 26 30] _32 <- door - (1 : usize); [#"../100doors.rs" 26 21 26 31] _30 <- ([#"../100doors.rs" 26 21 26 31] index_mut0 _31 _32); _31 <- any borrowed (Alloc_Vec_Vec_Type.t_vec bool (Alloc_Alloc_Global_Type.t_global)); _32 <- any usize; goto BB19 } BB19 { - [#"../100doors.rs" 26 12 26 54] _30 <- { _30 with current = ([#"../100doors.rs" 26 12 26 54] not _26) ; }; + [#"../100doors.rs" 26 12 26 54] _30 <- { _30 with current = (not _26) ; }; assume { resolve1 _30 }; - [#"../100doors.rs" 27 12 27 24] door <- ([#"../100doors.rs" 27 12 27 24] door + pass); - [#"../100doors.rs" 25 26 28 9] _11 <- ([#"../100doors.rs" 25 26 28 9] ()); + [#"../100doors.rs" 27 12 27 24] door <- door + pass; + [#"../100doors.rs" 25 26 28 9] _11 <- (); goto BB15 } BB20 { - [#"../100doors.rs" 25 8 28 9] _11 <- ([#"../100doors.rs" 25 8 28 9] ()); + [#"../100doors.rs" 25 8 28 9] _11 <- (); goto BB6 } BB21 { diff --git a/creusot/tests/should_succeed/all_zero.mlcfg b/creusot/tests/should_succeed/all_zero.mlcfg index a5d2f172c2..8bacc8b472 100644 --- a/creusot/tests/should_succeed/all_zero.mlcfg +++ b/creusot/tests/should_succeed/all_zero.mlcfg @@ -85,7 +85,7 @@ module AllZero_AllZero goto BB1 } BB1 { - [#"../all_zero.rs" 37 21 37 22] loop_l <- ([#"../all_zero.rs" 37 21 37 22] l); + [#"../all_zero.rs" 37 21 37 22] loop_l <- l; l <- any borrowed (AllZero_List_Type.t_list); goto BB2 } @@ -108,19 +108,19 @@ module AllZero_AllZero [#"../all_zero.rs" 43 19 43 24] loop_l <- { loop_l with current = (let AllZero_List_Type.C_Cons x0 x1 = * loop_l in AllZero_List_Type.C_Cons ( ^ value) x1) ; }; [#"../all_zero.rs" 43 26 43 30] next <- Borrow.borrow_final (AllZero_List_Type.cons_1 ( * loop_l)) (Borrow.inherit_id (Borrow.get_id loop_l) 2); [#"../all_zero.rs" 43 26 43 30] loop_l <- { loop_l with current = (let AllZero_List_Type.C_Cons x0 x1 = * loop_l in AllZero_List_Type.C_Cons x0 ( ^ next)) ; }; - [#"../all_zero.rs" 44 8 44 18] value <- { value with current = ([#"../all_zero.rs" 44 8 44 18] (0 : uint32)) ; }; + [#"../all_zero.rs" 44 8 44 18] value <- { value with current = (0 : uint32) ; }; assume { resolve0 value }; [#"../all_zero.rs" 45 17 45 21] _13 <- Borrow.borrow_mut ( * next); [#"../all_zero.rs" 45 17 45 21] next <- { next with current = ( ^ _13) ; }; assume { resolve1 loop_l }; - [#"../all_zero.rs" 45 8 45 21] loop_l <- ([#"../all_zero.rs" 45 8 45 21] _13); + [#"../all_zero.rs" 45 8 45 21] loop_l <- _13; _13 <- any borrowed (AllZero_List_Type.t_list); assume { resolve2 next }; goto BB2 } BB6 { assume { resolve1 loop_l }; - [#"../all_zero.rs" 43 4 46 5] _0 <- ([#"../all_zero.rs" 43 4 46 5] ()); + [#"../all_zero.rs" 43 4 46 5] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bdd.mlcfg b/creusot/tests/should_succeed/bdd.mlcfg index 5f5e1a999c..9469bcd8c0 100644 --- a/creusot/tests/should_succeed/bdd.mlcfg +++ b/creusot/tests/should_succeed/bdd.mlcfg @@ -218,7 +218,7 @@ module Bdd_Impl13_AssertReceiverIsTotalEq goto BB0 } BB0 { - [#"../bdd.rs" 90 9 90 11] _0 <- ([#"../bdd.rs" 90 9 90 11] ()); + [#"../bdd.rs" 90 9 90 11] _0 <- (); return _0 } @@ -254,7 +254,7 @@ module Bdd_Impl7_Eq goto BB0 } BB0 { - [#"../bdd.rs" 203 8 203 21] _0 <- ([#"../bdd.rs" 203 8 203 21] Bdd_Bdd_Type.bdd_1 self = Bdd_Bdd_Type.bdd_1 o); + [#"../bdd.rs" 203 8 203 21] _0 <- Bdd_Bdd_Type.bdd_1 self = Bdd_Bdd_Type.bdd_1 o; return _0 } @@ -353,7 +353,7 @@ module Bdd_Impl14_Eq goto BB0 } BB0 { - [#"../bdd.rs" 90 13 90 22] _4 <- ([#"../bdd.rs" 90 13 90 22] (self, rhs)); + [#"../bdd.rs" 90 13 90 22] _4 <- (self, rhs); switch (let (a, _) = _4 in a) | Bdd_Node_Type.C_False -> goto BB1 | Bdd_Node_Type.C_True -> goto BB4 @@ -371,7 +371,7 @@ module Bdd_Impl14_Eq } BB3 { assume { resolve0 _4 }; - [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] false); + [#"../bdd.rs" 90 13 90 22] _0 <- false; goto BB22 } BB4 { @@ -394,21 +394,21 @@ module Bdd_Impl14_Eq } BB8 { assume { resolve0 _4 }; - [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true); + [#"../bdd.rs" 90 13 90 22] _0 <- true; goto BB22 } BB9 { assume { resolve0 _4 }; - [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true); + [#"../bdd.rs" 90 13 90 22] _0 <- true; goto BB22 } BB10 { - [#"../bdd.rs" 94 9 94 10] v_1 <- ([#"../bdd.rs" 94 9 94 10] Bdd_Node_Type.if_v (let (a, _) = _4 in a)); - [#"../bdd.rs" 94 17 94 23] childt_1 <- ([#"../bdd.rs" 94 17 94 23] Bdd_Node_Type.if_childt (let (a, _) = _4 in a)); - [#"../bdd.rs" 94 38 94 44] childf_1 <- ([#"../bdd.rs" 94 38 94 44] Bdd_Node_Type.if_childf (let (a, _) = _4 in a)); - [#"../bdd.rs" 94 9 94 10] v_2 <- ([#"../bdd.rs" 94 9 94 10] Bdd_Node_Type.if_v (let (_, a) = _4 in a)); - [#"../bdd.rs" 94 17 94 23] childt_2 <- ([#"../bdd.rs" 94 17 94 23] Bdd_Node_Type.if_childt (let (_, a) = _4 in a)); - [#"../bdd.rs" 94 38 94 44] childf_2 <- ([#"../bdd.rs" 94 38 94 44] Bdd_Node_Type.if_childf (let (_, a) = _4 in a)); + [#"../bdd.rs" 94 9 94 10] v_1 <- Bdd_Node_Type.if_v (let (a, _) = _4 in a); + [#"../bdd.rs" 94 17 94 23] childt_1 <- Bdd_Node_Type.if_childt (let (a, _) = _4 in a); + [#"../bdd.rs" 94 38 94 44] childf_1 <- Bdd_Node_Type.if_childf (let (a, _) = _4 in a); + [#"../bdd.rs" 94 9 94 10] v_2 <- Bdd_Node_Type.if_v (let (_, a) = _4 in a); + [#"../bdd.rs" 94 17 94 23] childt_2 <- Bdd_Node_Type.if_childt (let (_, a) = _4 in a); + [#"../bdd.rs" 94 38 94 44] childf_2 <- Bdd_Node_Type.if_childf (let (_, a) = _4 in a); assume { resolve0 _4 }; [#"../bdd.rs" 90 13 90 22] _17 <- ([#"../bdd.rs" 90 13 90 22] eq0 childf_1 childf_2); goto BB11 @@ -440,7 +440,7 @@ module Bdd_Impl14_Eq end } BB16 { - [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] true); + [#"../bdd.rs" 90 13 90 22] _0 <- true; goto BB21 } BB17 { @@ -453,7 +453,7 @@ module Bdd_Impl14_Eq goto BB20 } BB20 { - [#"../bdd.rs" 90 13 90 22] _0 <- ([#"../bdd.rs" 90 13 90 22] false); + [#"../bdd.rs" 90 13 90 22] _0 <- false; goto BB21 } BB21 { @@ -477,7 +477,7 @@ module Bdd_Impl0_Clone goto BB0 } BB0 { - [#"../bdd.rs" 110 8 110 13] _0 <- ([#"../bdd.rs" 110 8 110 13] self); + [#"../bdd.rs" 110 8 110 13] _0 <- self; return _0 } @@ -526,10 +526,10 @@ module Bdd_Impl15_Clone goto BB6 } BB3 { - [#"../bdd.rs" 94 9 94 10] v_1 <- ([#"../bdd.rs" 94 9 94 10] Bdd_Node_Type.if_v self); - [#"../bdd.rs" 94 17 94 23] childt_1 <- ([#"../bdd.rs" 94 17 94 23] Bdd_Node_Type.if_childt self); - [#"../bdd.rs" 94 38 94 44] childf_1 <- ([#"../bdd.rs" 94 38 94 44] Bdd_Node_Type.if_childf self); - [#"../bdd.rs" 90 24 90 29] _9 <- ([#"../bdd.rs" 90 24 90 29] v_1); + [#"../bdd.rs" 94 9 94 10] v_1 <- Bdd_Node_Type.if_v self; + [#"../bdd.rs" 94 17 94 23] childt_1 <- Bdd_Node_Type.if_childt self; + [#"../bdd.rs" 94 38 94 44] childf_1 <- Bdd_Node_Type.if_childf self; + [#"../bdd.rs" 90 24 90 29] _9 <- v_1; [#"../bdd.rs" 90 24 90 29] _7 <- ([#"../bdd.rs" 90 24 90 29] clone0 _9); goto BB7 } @@ -538,25 +538,25 @@ module Bdd_Impl15_Clone absurd } BB5 { - [#"../bdd.rs" 91 5 92 9] _0 <- ([#"../bdd.rs" 91 5 92 9] Bdd_Node_Type.C_False); + [#"../bdd.rs" 91 5 92 9] _0 <- Bdd_Node_Type.C_False; goto BB10 } BB6 { - [#"../bdd.rs" 91 5 93 8] _0 <- ([#"../bdd.rs" 91 5 93 8] Bdd_Node_Type.C_True); + [#"../bdd.rs" 91 5 93 8] _0 <- Bdd_Node_Type.C_True; goto BB10 } BB7 { - [#"../bdd.rs" 90 24 90 29] _12 <- ([#"../bdd.rs" 90 24 90 29] childt_1); + [#"../bdd.rs" 90 24 90 29] _12 <- childt_1; [#"../bdd.rs" 90 24 90 29] _10 <- ([#"../bdd.rs" 90 24 90 29] clone1 _12); goto BB8 } BB8 { - [#"../bdd.rs" 90 24 90 29] _15 <- ([#"../bdd.rs" 90 24 90 29] childf_1); + [#"../bdd.rs" 90 24 90 29] _15 <- childf_1; [#"../bdd.rs" 90 24 90 29] _13 <- ([#"../bdd.rs" 90 24 90 29] clone1 _15); goto BB9 } BB9 { - [#"../bdd.rs" 90 24 90 29] _0 <- ([#"../bdd.rs" 90 24 90 29] Bdd_Node_Type.C_If _7 _10 _13); + [#"../bdd.rs" 90 24 90 29] _0 <- Bdd_Node_Type.C_If _7 _10 _13; _7 <- any uint64; _10 <- any Bdd_Bdd_Type.t_bdd; _13 <- any Bdd_Bdd_Type.t_bdd; @@ -578,7 +578,7 @@ module Bdd_Impl19_AssertReceiverIsTotalEq goto BB0 } BB0 { - [#"../bdd.rs" 104 15 104 17] _0 <- ([#"../bdd.rs" 104 15 104 17] ()); + [#"../bdd.rs" 104 15 104 17] _0 <- (); return _0 } @@ -670,9 +670,9 @@ module Bdd_Impl1_Hash goto BB6 } BB3 { - [#"../bdd.rs" 120 17 120 18] v <- ([#"../bdd.rs" 120 17 120 18] Bdd_Node_Type.if_v self); - [#"../bdd.rs" 120 20 120 26] childt <- ([#"../bdd.rs" 120 20 120 26] Bdd_Node_Type.if_childt self); - [#"../bdd.rs" 120 28 120 34] childf <- ([#"../bdd.rs" 120 28 120 34] Bdd_Node_Type.if_childf self); + [#"../bdd.rs" 120 17 120 18] v <- Bdd_Node_Type.if_v self; + [#"../bdd.rs" 120 20 120 26] childt <- Bdd_Node_Type.if_childt self; + [#"../bdd.rs" 120 28 120 34] childf <- Bdd_Node_Type.if_childf self; [#"../bdd.rs" 121 31 121 55] _9 <- ([#"../bdd.rs" 121 31 121 55] wrapping_mul0 (Bdd_Bdd_Type.bdd_1 childt) (5 : uint64)); goto BB7 } @@ -681,11 +681,11 @@ module Bdd_Impl1_Hash absurd } BB5 { - [#"../bdd.rs" 118 21 118 22] _0 <- ([#"../bdd.rs" 118 21 118 22] (1 : uint64)); + [#"../bdd.rs" 118 21 118 22] _0 <- (1 : uint64); goto BB11 } BB6 { - [#"../bdd.rs" 119 20 119 21] _0 <- ([#"../bdd.rs" 119 20 119 21] (2 : uint64)); + [#"../bdd.rs" 119 20 119 21] _0 <- (2 : uint64); goto BB11 } BB7 { @@ -747,7 +747,7 @@ module Bdd_Impl2_Hash goto BB0 } BB0 { - [#"../bdd.rs" 143 8 143 14] _0 <- ([#"../bdd.rs" 143 8 143 14] Bdd_Bdd_Type.bdd_1 self); + [#"../bdd.rs" 143 8 143 14] _0 <- Bdd_Bdd_Type.bdd_1 self; return _0 } @@ -1726,7 +1726,7 @@ module Bdd_Impl11_New ensures { [#"../bdd.rs" 67 18 67 47] shallow_model0 result = Const.const (Core_Option_Option_Type.C_None) } let constant promoted0 [#"../bdd.rs" 424 4 424 52] : Bdd_Node_Type.t_node = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../bdd.rs" 425 17 425 21] Bdd_Node_Type.C_True in let _0 = [#"../bdd.rs" 425 16 425 21] _1 in _0 + let _1 = Bdd_Node_Type.C_True in let _0 = _1 in _0 let rec cfg new [#"../bdd.rs" 424 4 424 52] [@cfg:stackify] [@cfg:subregion_analysis] (alloc : Bdd_Bumpalo_Bump_Type.t_bump) : Bdd_Context_Type.t_context ensures { [#"../bdd.rs" 424 48 424 52] inv0 result } @@ -1743,8 +1743,8 @@ module Bdd_Impl11_New goto BB0 } BB0 { - [#"../bdd.rs" 425 16 425 21] _10 <- ([#"../bdd.rs" 425 16 425 21] promoted0); - [#"../bdd.rs" 425 16 425 21] t <- ([#"../bdd.rs" 425 16 425 21] _10); + [#"../bdd.rs" 425 16 425 21] _10 <- promoted0; + [#"../bdd.rs" 425 16 425 21] t <- _10; [#"../bdd.rs" 428 22 428 47] _5 <- ([#"../bdd.rs" 428 22 428 47] new0 ()); goto BB1 } @@ -1761,7 +1761,7 @@ module Bdd_Impl11_New goto BB4 } BB4 { - [#"../bdd.rs" 426 8 433 9] _0 <- ([#"../bdd.rs" 426 8 433 9] Bdd_Context_Type.C_Context alloc _5 _6 _8 _9 (0 : uint64)); + [#"../bdd.rs" 426 8 433 9] _0 <- Bdd_Context_Type.C_Context alloc _5 _6 _8 _9 (0 : uint64); _5 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Node_Type.t_node) (Bdd_Bdd_Type.t_bdd); _6 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node)); _8 <- any Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd); @@ -2045,7 +2045,7 @@ module Bdd_Impl11_Hashcons goto BB0 } BB0 { - [#"../bdd.rs" 441 44 441 46] _11 <- ([#"../bdd.rs" 441 44 441 46] n); + [#"../bdd.rs" 441 44 441 46] _11 <- n; [#"../bdd.rs" 441 26 441 47] _8 <- ([#"../bdd.rs" 441 26 441 47] get0 (Bdd_Context_Type.context_hashcons ( * self)) _11); goto BB1 } @@ -2059,11 +2059,11 @@ module Bdd_Impl11_Hashcons goto BB3 } BB3 { - [#"../bdd.rs" 441 21 441 22] r <- ([#"../bdd.rs" 441 21 441 22] Core_Option_Option_Type.some_0 _8); + [#"../bdd.rs" 441 21 441 22] r <- Core_Option_Option_Type.some_0 _8; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; assert { [@expl:assertion] [#"../bdd.rs" 442 28 442 38] shallow_model0 (Bdd_Bdd_Type.bdd_0 r) = shallow_model1 n }; - [#"../bdd.rs" 443 19 443 20] _0 <- ([#"../bdd.rs" 443 19 443 20] r); + [#"../bdd.rs" 443 19 443 20] _0 <- r; goto BB12 } BB4 { @@ -2071,7 +2071,7 @@ module Bdd_Impl11_Hashcons goto BB5 } BB5 { - [#"../bdd.rs" 445 16 445 50] r1 <- ([#"../bdd.rs" 445 16 445 50] Bdd_Bdd_Type.C_Bdd ( * _19) (Bdd_Context_Type.context_cnt ( * self))); + [#"../bdd.rs" 445 16 445 50] r1 <- Bdd_Bdd_Type.C_Bdd ( * _19) (Bdd_Context_Type.context_cnt ( * self)); assume { resolve1 _19 }; [#"../bdd.rs" 446 8 446 21] _24 <- Borrow.borrow_final (Bdd_Context_Type.context_hashcons ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2); [#"../bdd.rs" 446 8 446 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 = * self in Bdd_Context_Type.C_Context x0 ( ^ _24) x2 x3 x4 x5) ; }; @@ -2084,10 +2084,10 @@ module Bdd_Impl11_Hashcons goto BB7 } BB7 { - [#"../bdd.rs" 447 8 447 77] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 = * self in Bdd_Context_Type.C_Context x0 x1 ([#"../bdd.rs" 447 8 447 77] _27) x3 x4 x5) ; }; + [#"../bdd.rs" 447 8 447 77] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 = * self in Bdd_Context_Type.C_Context x0 x1 _27 x3 x4 x5) ; }; _27 <- any Snapshot.snap_ty (Map.map uint64 (Bdd_Node_Type.t_node)); - [#"../bdd.rs" 448 22 448 34] _32 <- ([#"../bdd.rs" 448 22 448 34] (18446744073709551615 : uint64) - (1 : uint64)); - [#"../bdd.rs" 448 11 448 34] _30 <- ([#"../bdd.rs" 448 11 448 34] Bdd_Context_Type.context_cnt ( * self) > _32); + [#"../bdd.rs" 448 22 448 34] _32 <- (18446744073709551615 : uint64) - (1 : uint64); + [#"../bdd.rs" 448 11 448 34] _30 <- Bdd_Context_Type.context_cnt ( * self) > _32; _32 <- any uint64; switch (_30) | False -> goto BB11 @@ -2101,14 +2101,14 @@ module Bdd_Impl11_Hashcons goto BB10 } BB10 { - [#"../bdd.rs" 451 16 451 35] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 = * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 451 16 451 35] Bdd_Context_Type.context_cnt ( * self))) ; }; + [#"../bdd.rs" 451 16 451 35] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 = * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 (Bdd_Context_Type.context_cnt ( * self))) ; }; goto BB9 } BB11 { - [#"../bdd.rs" 454 8 454 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 = * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 ([#"../bdd.rs" 454 8 454 21] Bdd_Context_Type.context_cnt ( * self) + (1 : uint64))) ; }; + [#"../bdd.rs" 454 8 454 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 = * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 (Bdd_Context_Type.context_cnt ( * self) + (1 : uint64))) ; }; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../bdd.rs" 455 8 455 9] _0 <- ([#"../bdd.rs" 455 8 455 9] r1); + [#"../bdd.rs" 455 8 455 9] _0 <- r1; goto BB12 } BB12 { @@ -2320,14 +2320,14 @@ module Bdd_Impl11_Node BB2 { assert { [@expl:type invariant] inv1 self }; assume { resolve0 self }; - [#"../bdd.rs" 467 19 467 25] _0 <- ([#"../bdd.rs" 467 19 467 25] childt); + [#"../bdd.rs" 467 19 467 25] _0 <- childt; goto BB5 } BB3 { [#"../bdd.rs" 469 8 469 12] _17 <- Borrow.borrow_final ( * self) (Borrow.get_id self); [#"../bdd.rs" 469 8 469 12] self <- { self with current = ( ^ _17) ; }; assume { inv0 ( ^ _17) }; - [#"../bdd.rs" 469 22 469 49] _18 <- ([#"../bdd.rs" 469 22 469 49] Bdd_Node_Type.C_If x childt childf); + [#"../bdd.rs" 469 22 469 49] _18 <- Bdd_Node_Type.C_If x childt childf; [#"../bdd.rs" 469 8 469 50] _0 <- ([#"../bdd.rs" 469 8 469 50] hashcons0 _17 _18); _17 <- any borrowed (Bdd_Context_Type.t_context); _18 <- any Bdd_Node_Type.t_node; @@ -2509,7 +2509,7 @@ module Bdd_Impl11_True [#"../bdd.rs" 477 8 477 12] _6 <- Borrow.borrow_final ( * self) (Borrow.get_id self); [#"../bdd.rs" 477 8 477 12] self <- { self with current = ( ^ _6) ; }; assume { inv0 ( ^ _6) }; - [#"../bdd.rs" 477 22 477 26] _7 <- ([#"../bdd.rs" 477 22 477 26] Bdd_Node_Type.C_True); + [#"../bdd.rs" 477 22 477 26] _7 <- Bdd_Node_Type.C_True; [#"../bdd.rs" 477 8 477 27] _0 <- ([#"../bdd.rs" 477 8 477 27] hashcons0 _6 _7); _6 <- any borrowed (Bdd_Context_Type.t_context); _7 <- any Bdd_Node_Type.t_node; @@ -2688,7 +2688,7 @@ module Bdd_Impl11_False [#"../bdd.rs" 485 8 485 12] _6 <- Borrow.borrow_final ( * self) (Borrow.get_id self); [#"../bdd.rs" 485 8 485 12] self <- { self with current = ( ^ _6) ; }; assume { inv0 ( ^ _6) }; - [#"../bdd.rs" 485 22 485 27] _7 <- ([#"../bdd.rs" 485 22 485 27] Bdd_Node_Type.C_False); + [#"../bdd.rs" 485 22 485 27] _7 <- Bdd_Node_Type.C_False; [#"../bdd.rs" 485 8 485 28] _0 <- ([#"../bdd.rs" 485 8 485 28] hashcons0 _6 _7); _6 <- any borrowed (Bdd_Context_Type.t_context); _7 <- any Bdd_Node_Type.t_node; @@ -3210,7 +3210,7 @@ module Bdd_Impl11_Not goto BB0 } BB0 { - [#"../bdd.rs" 504 43 504 45] _13 <- ([#"../bdd.rs" 504 43 504 45] x); + [#"../bdd.rs" 504 43 504 45] _13 <- x; [#"../bdd.rs" 504 25 504 46] _10 <- ([#"../bdd.rs" 504 25 504 46] get0 (Bdd_Context_Type.context_not_memo ( * self)) _13); goto BB1 } @@ -3224,8 +3224,8 @@ module Bdd_Impl11_Not goto BB3 } BB3 { - [#"../bdd.rs" 504 20 504 21] r <- ([#"../bdd.rs" 504 20 504 21] Core_Option_Option_Type.some_0 _10); - [#"../bdd.rs" 505 19 505 21] _0 <- ([#"../bdd.rs" 505 19 505 21] r); + [#"../bdd.rs" 504 20 504 21] r <- Core_Option_Option_Type.some_0 _10; + [#"../bdd.rs" 505 19 505 21] _0 <- r; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; goto BB18 @@ -3250,9 +3250,9 @@ module Bdd_Impl11_Not goto BB9 } BB8 { - [#"../bdd.rs" 510 17 510 18] v <- ([#"../bdd.rs" 510 17 510 18] Bdd_Node_Type.if_v (Bdd_Bdd_Type.bdd_0 x)); - [#"../bdd.rs" 510 20 510 26] childt <- ([#"../bdd.rs" 510 20 510 26] Bdd_Node_Type.if_childt (Bdd_Bdd_Type.bdd_0 x)); - [#"../bdd.rs" 510 28 510 34] childf <- ([#"../bdd.rs" 510 28 510 34] Bdd_Node_Type.if_childf (Bdd_Bdd_Type.bdd_0 x)); + [#"../bdd.rs" 510 17 510 18] v <- Bdd_Node_Type.if_v (Bdd_Bdd_Type.bdd_0 x); + [#"../bdd.rs" 510 20 510 26] childt <- Bdd_Node_Type.if_childt (Bdd_Bdd_Type.bdd_0 x); + [#"../bdd.rs" 510 28 510 34] childf <- Bdd_Node_Type.if_childf (Bdd_Bdd_Type.bdd_0 x); [#"../bdd.rs" 511 29 511 33] _25 <- Borrow.borrow_mut ( * self); [#"../bdd.rs" 511 29 511 33] self <- { self with current = ( ^ _25) ; }; assume { inv1 ( ^ _25) }; @@ -3311,7 +3311,7 @@ module Bdd_Impl11_Not BB17 { assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../bdd.rs" 517 8 517 9] _0 <- ([#"../bdd.rs" 517 8 517 9] r1); + [#"../bdd.rs" 517 8 517 9] _0 <- r1; goto BB18 } BB18 { @@ -3721,8 +3721,8 @@ module Bdd_Impl11_And goto BB0 } BB0 { - [#"../bdd.rs" 528 44 528 50] _16 <- ([#"../bdd.rs" 528 44 528 50] (a, b)); - [#"../bdd.rs" 528 43 528 50] _15 <- ([#"../bdd.rs" 528 43 528 50] _16); + [#"../bdd.rs" 528 44 528 50] _16 <- (a, b); + [#"../bdd.rs" 528 43 528 50] _15 <- _16; [#"../bdd.rs" 528 25 528 51] _12 <- ([#"../bdd.rs" 528 25 528 51] get0 (Bdd_Context_Type.context_and_memo ( * self)) _15); goto BB1 } @@ -3737,8 +3737,8 @@ module Bdd_Impl11_And goto BB3 } BB3 { - [#"../bdd.rs" 528 20 528 21] r <- ([#"../bdd.rs" 528 20 528 21] Core_Option_Option_Type.some_0 _12); - [#"../bdd.rs" 529 19 529 21] _0 <- ([#"../bdd.rs" 529 19 529 21] r); + [#"../bdd.rs" 528 20 528 21] r <- Core_Option_Option_Type.some_0 _12; + [#"../bdd.rs" 529 19 529 21] _0 <- r; assert { [@expl:type invariant] inv0 self }; assume { resolve1 self }; goto BB35 @@ -3748,7 +3748,7 @@ module Bdd_Impl11_And absurd } BB5 { - [#"../bdd.rs" 531 22 531 34] _23 <- ([#"../bdd.rs" 531 22 531 34] (Bdd_Bdd_Type.bdd_0 a, Bdd_Bdd_Type.bdd_0 b)); + [#"../bdd.rs" 531 22 531 34] _23 <- (Bdd_Bdd_Type.bdd_0 a, Bdd_Bdd_Type.bdd_0 b); switch (let (a, _) = _23 in a) | Bdd_Node_Type.C_True -> goto BB7 | _ -> goto BB6 @@ -3792,25 +3792,25 @@ module Bdd_Impl11_And end } BB14 { - [#"../bdd.rs" 537 24 537 26] vb <- ([#"../bdd.rs" 537 24 537 26] Bdd_Node_Type.if_v (let (_, a) = _23 in a)); - [#"../bdd.rs" 537 36 537 43] childtb <- ([#"../bdd.rs" 537 36 537 43] Bdd_Node_Type.if_childt (let (_, a) = _23 in a)); - [#"../bdd.rs" 537 53 537 60] childfb <- ([#"../bdd.rs" 537 53 537 60] Bdd_Node_Type.if_childf (let (_, a) = _23 in a)); - [#"../bdd.rs" 536 24 536 26] va <- ([#"../bdd.rs" 536 24 536 26] Bdd_Node_Type.if_v (let (a, _) = _23 in a)); - [#"../bdd.rs" 536 36 536 43] childta <- ([#"../bdd.rs" 536 36 536 43] Bdd_Node_Type.if_childt (let (a, _) = _23 in a)); - [#"../bdd.rs" 536 53 536 60] childfa <- ([#"../bdd.rs" 536 53 536 60] Bdd_Node_Type.if_childf (let (a, _) = _23 in a)); + [#"../bdd.rs" 537 24 537 26] vb <- Bdd_Node_Type.if_v (let (_, a) = _23 in a); + [#"../bdd.rs" 537 36 537 43] childtb <- Bdd_Node_Type.if_childt (let (_, a) = _23 in a); + [#"../bdd.rs" 537 53 537 60] childfb <- Bdd_Node_Type.if_childf (let (_, a) = _23 in a); + [#"../bdd.rs" 536 24 536 26] va <- Bdd_Node_Type.if_v (let (a, _) = _23 in a); + [#"../bdd.rs" 536 36 536 43] childta <- Bdd_Node_Type.if_childt (let (a, _) = _23 in a); + [#"../bdd.rs" 536 53 536 60] childfa <- Bdd_Node_Type.if_childf (let (a, _) = _23 in a); assume { resolve2 _23 }; - [#"../bdd.rs" 540 29 540 32] _45 <- ([#"../bdd.rs" 540 29 540 32] vb); + [#"../bdd.rs" 540 29 540 32] _45 <- vb; [#"../bdd.rs" 540 22 540 33] _42 <- ([#"../bdd.rs" 540 22 540 33] cmp0 va _45); goto BB19 } BB15 { assume { resolve2 _23 }; - [#"../bdd.rs" 532 25 532 26] r1 <- ([#"../bdd.rs" 532 25 532 26] b); + [#"../bdd.rs" 532 25 532 26] r1 <- b; goto BB33 } BB16 { assume { resolve2 _23 }; - [#"../bdd.rs" 533 25 533 26] r1 <- ([#"../bdd.rs" 533 25 533 26] a); + [#"../bdd.rs" 533 25 533 26] r1 <- a; goto BB33 } BB17 { @@ -3836,7 +3836,7 @@ module Bdd_Impl11_And goto BB26 } BB21 { - [#"../bdd.rs" 552 24 552 30] v <- ([#"../bdd.rs" 552 24 552 30] va); + [#"../bdd.rs" 552 24 552 30] v <- va; [#"../bdd.rs" 553 33 553 37] _67 <- Borrow.borrow_mut ( * self); [#"../bdd.rs" 553 33 553 37] self <- { self with current = ( ^ _67) ; }; assume { inv1 ( ^ _67) }; @@ -3848,7 +3848,7 @@ module Bdd_Impl11_And goto BB23 } BB23 { - [#"../bdd.rs" 542 24 542 30] v <- ([#"../bdd.rs" 542 24 542 30] vb); + [#"../bdd.rs" 542 24 542 30] v <- vb; [#"../bdd.rs" 543 33 543 37] _49 <- Borrow.borrow_mut ( * self); [#"../bdd.rs" 543 33 543 37] self <- { self with current = ( ^ _49) ; }; assume { inv1 ( ^ _49) }; @@ -3857,7 +3857,7 @@ module Bdd_Impl11_And goto BB24 } BB24 { - [#"../bdd.rs" 543 24 543 53] childt <- ([#"../bdd.rs" 543 24 543 53] _48); + [#"../bdd.rs" 543 24 543 53] childt <- _48; _48 <- any Bdd_Bdd_Type.t_bdd; [#"../bdd.rs" 544 33 544 37] _53 <- Borrow.borrow_mut ( * self); [#"../bdd.rs" 544 33 544 37] self <- { self with current = ( ^ _53) ; }; @@ -3867,13 +3867,13 @@ module Bdd_Impl11_And goto BB25 } BB25 { - [#"../bdd.rs" 544 24 544 53] childf <- ([#"../bdd.rs" 544 24 544 53] _52); + [#"../bdd.rs" 544 24 544 53] childf <- _52; _52 <- any Bdd_Bdd_Type.t_bdd; - [#"../bdd.rs" 541 31 545 21] _41 <- ([#"../bdd.rs" 541 31 545 21] ()); + [#"../bdd.rs" 541 31 545 21] _41 <- (); goto BB31 } BB26 { - [#"../bdd.rs" 547 24 547 30] v <- ([#"../bdd.rs" 547 24 547 30] va); + [#"../bdd.rs" 547 24 547 30] v <- va; [#"../bdd.rs" 548 33 548 37] _58 <- Borrow.borrow_mut ( * self); [#"../bdd.rs" 548 33 548 37] self <- { self with current = ( ^ _58) ; }; assume { inv1 ( ^ _58) }; @@ -3882,7 +3882,7 @@ module Bdd_Impl11_And goto BB27 } BB27 { - [#"../bdd.rs" 548 24 548 53] childt <- ([#"../bdd.rs" 548 24 548 53] _57); + [#"../bdd.rs" 548 24 548 53] childt <- _57; _57 <- any Bdd_Bdd_Type.t_bdd; [#"../bdd.rs" 549 33 549 37] _62 <- Borrow.borrow_mut ( * self); [#"../bdd.rs" 549 33 549 37] self <- { self with current = ( ^ _62) ; }; @@ -3892,13 +3892,13 @@ module Bdd_Impl11_And goto BB28 } BB28 { - [#"../bdd.rs" 549 24 549 53] childf <- ([#"../bdd.rs" 549 24 549 53] _61); + [#"../bdd.rs" 549 24 549 53] childf <- _61; _61 <- any Bdd_Bdd_Type.t_bdd; - [#"../bdd.rs" 546 28 550 21] _41 <- ([#"../bdd.rs" 546 28 550 21] ()); + [#"../bdd.rs" 546 28 550 21] _41 <- (); goto BB31 } BB29 { - [#"../bdd.rs" 553 24 553 59] childt <- ([#"../bdd.rs" 553 24 553 59] _66); + [#"../bdd.rs" 553 24 553 59] childt <- _66; _66 <- any Bdd_Bdd_Type.t_bdd; [#"../bdd.rs" 554 33 554 37] _71 <- Borrow.borrow_mut ( * self); [#"../bdd.rs" 554 33 554 37] self <- { self with current = ( ^ _71) ; }; @@ -3908,9 +3908,9 @@ module Bdd_Impl11_And goto BB30 } BB30 { - [#"../bdd.rs" 554 24 554 59] childf <- ([#"../bdd.rs" 554 24 554 59] _70); + [#"../bdd.rs" 554 24 554 59] childf <- _70; _70 <- any Bdd_Bdd_Type.t_bdd; - [#"../bdd.rs" 551 29 555 21] _41 <- ([#"../bdd.rs" 551 29 555 21] ()); + [#"../bdd.rs" 551 29 555 21] _41 <- (); goto BB31 } BB31 { @@ -3927,7 +3927,7 @@ module Bdd_Impl11_And BB33 { [#"../bdd.rs" 560 8 560 21] _79 <- Borrow.borrow_final (Bdd_Context_Type.context_and_memo ( * self)) (Borrow.inherit_id (Borrow.get_id self) 5); [#"../bdd.rs" 560 8 560 21] self <- { self with current = (let Bdd_Context_Type.C_Context x0 x1 x2 x3 x4 x5 = * self in Bdd_Context_Type.C_Context x0 x1 x2 x3 ( ^ _79) x5) ; }; - [#"../bdd.rs" 560 26 560 32] _80 <- ([#"../bdd.rs" 560 26 560 32] (a, b)); + [#"../bdd.rs" 560 26 560 32] _80 <- (a, b); [#"../bdd.rs" 560 8 560 36] _78 <- ([#"../bdd.rs" 560 8 560 36] add0 _79 _80 r1); _79 <- any borrowed (Bdd_Hashmap_MyHashMap_Type.t_myhashmap (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd) (Bdd_Bdd_Type.t_bdd)); _80 <- any (Bdd_Bdd_Type.t_bdd, Bdd_Bdd_Type.t_bdd); @@ -3936,7 +3936,7 @@ module Bdd_Impl11_And BB34 { assert { [@expl:type invariant] inv0 self }; assume { resolve1 self }; - [#"../bdd.rs" 561 8 561 9] _0 <- ([#"../bdd.rs" 561 8 561 9] r1); + [#"../bdd.rs" 561 8 561 9] _0 <- r1; goto BB35 } BB35 { diff --git a/creusot/tests/should_succeed/binary_search.mlcfg b/creusot/tests/should_succeed/binary_search.mlcfg index 1edf5a7ab8..71325c4e33 100644 --- a/creusot/tests/should_succeed/binary_search.mlcfg +++ b/creusot/tests/should_succeed/binary_search.mlcfg @@ -137,8 +137,8 @@ module BinarySearch_Impl0_Index goto BB0 } BB0 { - [#"../binary_search.rs" 46 22 46 24] orig_ix <- ([#"../binary_search.rs" 46 22 46 24] ix); - [#"../binary_search.rs" 47 20 47 24] l <- ([#"../binary_search.rs" 47 20 47 24] self); + [#"../binary_search.rs" 46 22 46 24] orig_ix <- ix; + [#"../binary_search.rs" 47 20 47 24] l <- self; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; goto BB1 @@ -158,11 +158,11 @@ module BinarySearch_Impl0_Index goto BB4 } BB4 { - [#"../binary_search.rs" 51 23 51 24] t <- ([#"../binary_search.rs" 51 23 51 24] BinarySearch_List_Type.cons_0 l); - [#"../binary_search.rs" 51 26 51 28] ls <- ([#"../binary_search.rs" 51 26 51 28] BinarySearch_List_Type.cons_1 l); + [#"../binary_search.rs" 51 23 51 24] t <- BinarySearch_List_Type.cons_0 l; + [#"../binary_search.rs" 51 26 51 28] ls <- BinarySearch_List_Type.cons_1 l; assert { [@expl:type invariant] inv0 l }; assume { resolve0 l }; - [#"../binary_search.rs" 52 15 52 21] _14 <- ([#"../binary_search.rs" 52 15 52 21] ix > (0 : usize)); + [#"../binary_search.rs" 52 15 52 21] _14 <- ix > (0 : usize); switch (_14) | False -> goto BB6 | True -> goto BB5 @@ -171,19 +171,19 @@ module BinarySearch_Impl0_Index BB5 { assert { [@expl:type invariant] inv2 t }; assume { resolve2 t }; - [#"../binary_search.rs" 53 20 53 24] _17 <- ([#"../binary_search.rs" 53 20 53 24] ls); + [#"../binary_search.rs" 53 20 53 24] _17 <- ls; assert { [@expl:type invariant] inv1 ls }; assume { resolve1 ls }; assert { [@expl:type invariant] inv1 _17 }; assume { resolve1 _17 }; - [#"../binary_search.rs" 53 16 53 24] l <- ([#"../binary_search.rs" 53 16 53 24] _17); - [#"../binary_search.rs" 54 16 54 23] ix <- ([#"../binary_search.rs" 54 16 54 23] ix - (1 : usize)); + [#"../binary_search.rs" 53 16 53 24] l <- _17; + [#"../binary_search.rs" 54 16 54 23] ix <- ix - (1 : usize); goto BB1 } BB6 { assert { [@expl:type invariant] inv1 ls }; assume { resolve1 ls }; - [#"../binary_search.rs" 56 23 56 24] _0 <- ([#"../binary_search.rs" 56 23 56 24] t); + [#"../binary_search.rs" 56 23 56 24] _0 <- t; assert { [@expl:type invariant] inv2 t }; assume { resolve2 t }; return _0 @@ -264,8 +264,8 @@ module BinarySearch_Impl0_Len goto BB0 } BB0 { - [#"../binary_search.rs" 67 29 67 30] len <- ([#"../binary_search.rs" 67 29 67 30] (0 : usize)); - [#"../binary_search.rs" 68 20 68 24] l <- ([#"../binary_search.rs" 68 20 68 24] self); + [#"../binary_search.rs" 67 29 67 30] len <- (0 : usize); + [#"../binary_search.rs" 68 20 68 24] l <- self; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; goto BB1 @@ -284,19 +284,19 @@ module BinarySearch_Impl0_Len goto BB4 } BB4 { - [#"../binary_search.rs" 70 26 70 28] ls <- ([#"../binary_search.rs" 70 26 70 28] BinarySearch_List_Type.cons_1 l); + [#"../binary_search.rs" 70 26 70 28] ls <- BinarySearch_List_Type.cons_1 l; assert { [@expl:type invariant] inv0 l }; assume { resolve0 l }; - [#"../binary_search.rs" 71 12 71 20] len <- ([#"../binary_search.rs" 71 12 71 20] len + (1 : usize)); + [#"../binary_search.rs" 71 12 71 20] len <- len + (1 : usize); assert { [@expl:type invariant] inv1 ls }; assume { resolve1 ls }; - [#"../binary_search.rs" 72 12 72 18] l <- ([#"../binary_search.rs" 72 12 72 18] ls); + [#"../binary_search.rs" 72 12 72 18] l <- ls; goto BB1 } BB5 { assert { [@expl:type invariant] inv0 l }; assume { resolve0 l }; - [#"../binary_search.rs" 74 8 74 11] _0 <- ([#"../binary_search.rs" 74 8 74 11] len); + [#"../binary_search.rs" 74 8 74 11] _0 <- len; return _0 } @@ -432,7 +432,7 @@ module BinarySearch_BinarySearch goto BB1 } BB1 { - [#"../binary_search.rs" 110 7 110 21] _9 <- ([#"../binary_search.rs" 110 7 110 21] _10 = (0 : usize)); + [#"../binary_search.rs" 110 7 110 21] _9 <- _10 = (0 : usize); _10 <- any usize; switch (_9) | False -> goto BB3 @@ -440,7 +440,7 @@ module BinarySearch_BinarySearch end } BB2 { - [#"../binary_search.rs" 111 15 111 21] _0 <- ([#"../binary_search.rs" 111 15 111 21] Core_Result_Result_Type.C_Err (0 : usize)); + [#"../binary_search.rs" 111 15 111 21] _0 <- Core_Result_Result_Type.C_Err (0 : usize); goto BB21 } BB3 { @@ -448,7 +448,7 @@ module BinarySearch_BinarySearch goto BB4 } BB4 { - [#"../binary_search.rs" 114 19 114 20] base <- ([#"../binary_search.rs" 114 19 114 20] (0 : usize)); + [#"../binary_search.rs" 114 19 114 20] base <- (0 : usize); goto BB5 } BB5 { @@ -458,42 +458,42 @@ module BinarySearch_BinarySearch goto BB6 } BB6 { - [#"../binary_search.rs" 119 10 119 18] _21 <- ([#"../binary_search.rs" 119 10 119 18] size > (1 : usize)); + [#"../binary_search.rs" 119 10 119 18] _21 <- size > (1 : usize); switch (_21) | False -> goto BB13 | True -> goto BB7 end } BB7 { - [#"../binary_search.rs" 120 19 120 27] _25 <- ([#"../binary_search.rs" 120 19 120 27] (2 : usize) = (0 : usize)); + [#"../binary_search.rs" 120 19 120 27] _25 <- (2 : usize) = (0 : usize); assert { [@expl:division by zero] [#"../binary_search.rs" 120 19 120 27] not _25 }; goto BB8 } BB8 { - [#"../binary_search.rs" 120 19 120 27] half <- ([#"../binary_search.rs" 120 19 120 27] size / (2 : usize)); - [#"../binary_search.rs" 121 18 121 29] mid <- ([#"../binary_search.rs" 121 18 121 29] base + half); + [#"../binary_search.rs" 120 19 120 27] half <- size / (2 : usize); + [#"../binary_search.rs" 121 18 121 29] mid <- base + half; [#"../binary_search.rs" 123 19 123 33] _32 <- ([#"../binary_search.rs" 123 19 123 33] index0 arr mid); goto BB9 } BB9 { - [#"../binary_search.rs" 123 18 123 40] _30 <- ([#"../binary_search.rs" 123 18 123 40] _32 > elem); + [#"../binary_search.rs" 123 18 123 40] _30 <- _32 > elem; switch (_30) | False -> goto BB11 | True -> goto BB10 end } BB10 { - [#"../binary_search.rs" 123 43 123 47] _29 <- ([#"../binary_search.rs" 123 43 123 47] base); + [#"../binary_search.rs" 123 43 123 47] _29 <- base; goto BB12 } BB11 { - [#"../binary_search.rs" 123 57 123 60] _29 <- ([#"../binary_search.rs" 123 57 123 60] mid); + [#"../binary_search.rs" 123 57 123 60] _29 <- mid; goto BB12 } BB12 { - [#"../binary_search.rs" 123 8 123 62] base <- ([#"../binary_search.rs" 123 8 123 62] _29); + [#"../binary_search.rs" 123 8 123 62] base <- _29; _29 <- any usize; - [#"../binary_search.rs" 124 8 124 20] size <- ([#"../binary_search.rs" 124 8 124 20] size - half); + [#"../binary_search.rs" 124 8 124 20] size <- size - half; goto BB5 } BB13 { @@ -501,32 +501,32 @@ module BinarySearch_BinarySearch goto BB14 } BB14 { - [#"../binary_search.rs" 127 14 127 30] cmp <- ([#"../binary_search.rs" 127 14 127 30] _41); - [#"../binary_search.rs" 128 7 128 18] _44 <- ([#"../binary_search.rs" 128 7 128 18] cmp = elem); + [#"../binary_search.rs" 127 14 127 30] cmp <- _41; + [#"../binary_search.rs" 128 7 128 18] _44 <- cmp = elem; switch (_44) | False -> goto BB16 | True -> goto BB15 end } BB15 { - [#"../binary_search.rs" 129 8 129 16] _0 <- ([#"../binary_search.rs" 129 8 129 16] Core_Result_Result_Type.C_Ok base); + [#"../binary_search.rs" 129 8 129 16] _0 <- Core_Result_Result_Type.C_Ok base; goto BB20 } BB16 { - [#"../binary_search.rs" 130 14 130 24] _48 <- ([#"../binary_search.rs" 130 14 130 24] cmp < elem); + [#"../binary_search.rs" 130 14 130 24] _48 <- cmp < elem; switch (_48) | False -> goto BB18 | True -> goto BB17 end } BB17 { - [#"../binary_search.rs" 131 12 131 20] _51 <- ([#"../binary_search.rs" 131 12 131 20] base + (1 : usize)); - [#"../binary_search.rs" 131 8 131 21] _0 <- ([#"../binary_search.rs" 131 8 131 21] Core_Result_Result_Type.C_Err _51); + [#"../binary_search.rs" 131 12 131 20] _51 <- base + (1 : usize); + [#"../binary_search.rs" 131 8 131 21] _0 <- Core_Result_Result_Type.C_Err _51; _51 <- any usize; goto BB19 } BB18 { - [#"../binary_search.rs" 133 8 133 17] _0 <- ([#"../binary_search.rs" 133 8 133 17] Core_Result_Result_Type.C_Err base); + [#"../binary_search.rs" 133 8 133 17] _0 <- Core_Result_Result_Type.C_Err base; goto BB19 } BB19 { diff --git a/creusot/tests/should_succeed/bug/02_derive.mlcfg b/creusot/tests/should_succeed/bug/02_derive.mlcfg index f810252f63..d4f2db604d 100644 --- a/creusot/tests/should_succeed/bug/02_derive.mlcfg +++ b/creusot/tests/should_succeed/bug/02_derive.mlcfg @@ -15,7 +15,7 @@ module C02Derive_Impl0_Clone goto BB0 } BB0 { - [#"../02_derive.rs" 3 9 3 14] _0 <- ([#"../02_derive.rs" 3 9 3 14] C02Derive_Lit_Type.C_Lit); + [#"../02_derive.rs" 3 9 3 14] _0 <- C02Derive_Lit_Type.C_Lit; return _0 } diff --git a/creusot/tests/should_succeed/bug/168.mlcfg b/creusot/tests/should_succeed/bug/168.mlcfg index 44d49dffa9..aa3e922db9 100644 --- a/creusot/tests/should_succeed/bug/168.mlcfg +++ b/creusot/tests/should_succeed/bug/168.mlcfg @@ -9,7 +9,7 @@ module C168_MaxInt goto BB0 } BB0 { - [#"../168.rs" 4 4 4 14] _0 <- ([#"../168.rs" 4 4 4 14] (18446744073709551615 : usize)); + [#"../168.rs" 4 4 4 14] _0 <- (18446744073709551615 : usize); return _0 } diff --git a/creusot/tests/should_succeed/bug/173.mlcfg b/creusot/tests/should_succeed/bug/173.mlcfg index ddd9bd8528..ce500d92d6 100644 --- a/creusot/tests/should_succeed/bug/173.mlcfg +++ b/creusot/tests/should_succeed/bug/173.mlcfg @@ -12,11 +12,11 @@ module C173_Test233 goto BB0 } BB0 { - [#"../173.rs" 20 12 20 14] x <- ([#"../173.rs" 20 12 20 14] (17 : int32)); + [#"../173.rs" 20 12 20 14] x <- (17 : int32); assert { [@expl:assertion] [#"../173.rs" 21 19 21 27] Int32.to_int x = 17 }; - [#"../173.rs" 22 12 22 14] x1 <- ([#"../173.rs" 22 12 22 14] (42 : int32)); + [#"../173.rs" 22 12 22 14] x1 <- (42 : int32); assert { [@expl:assertion] [#"../173.rs" 23 19 23 27] Int32.to_int x1 = 42 }; - [#"../173.rs" 19 18 24 1] _0 <- ([#"../173.rs" 19 18 24 1] ()); + [#"../173.rs" 19 18 24 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/195.mlcfg b/creusot/tests/should_succeed/bug/195.mlcfg index dba60edf38..704b5cef86 100644 --- a/creusot/tests/should_succeed/bug/195.mlcfg +++ b/creusot/tests/should_succeed/bug/195.mlcfg @@ -9,7 +9,7 @@ module C195_Example goto BB0 } BB0 { - [#"../195.rs" 4 41 4 43] _0 <- ([#"../195.rs" 4 41 4 43] ()); + [#"../195.rs" 4 41 4 43] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/206.mlcfg b/creusot/tests/should_succeed/bug/206.mlcfg index 345c839ced..97c4e8b207 100644 --- a/creusot/tests/should_succeed/bug/206.mlcfg +++ b/creusot/tests/should_succeed/bug/206.mlcfg @@ -151,7 +151,7 @@ module C206_Ex goto BB0 } BB0 { - [#"../206.rs" 20 17 20 19] _0 <- ([#"../206.rs" 20 17 20 19] ()); + [#"../206.rs" 20 17 20 19] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/235.mlcfg b/creusot/tests/should_succeed/bug/235.mlcfg index 7ff0fc105d..4ace26cf23 100644 --- a/creusot/tests/should_succeed/bug/235.mlcfg +++ b/creusot/tests/should_succeed/bug/235.mlcfg @@ -24,7 +24,7 @@ module C235_F goto BB1 } BB4 { - [#"../235.rs" 8 4 8 17] _0 <- ([#"../235.rs" 8 4 8 17] ()); + [#"../235.rs" 8 4 8 17] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/256.mlcfg b/creusot/tests/should_succeed/bug/256.mlcfg index 30e3140e33..209e72d7e3 100644 --- a/creusot/tests/should_succeed/bug/256.mlcfg +++ b/creusot/tests/should_succeed/bug/256.mlcfg @@ -11,8 +11,8 @@ module C256_U8Safe goto BB0 } BB0 { - [#"../256.rs" 4 12 4 17] _2 <- ([#"../256.rs" 4 12 4 17] u + (0 : uint8)); - [#"../256.rs" 3 22 5 1] _0 <- ([#"../256.rs" 3 22 5 1] ()); + [#"../256.rs" 4 12 4 17] _2 <- u + (0 : uint8); + [#"../256.rs" 3 22 5 1] _0 <- (); return _0 } @@ -75,7 +75,7 @@ module C256_Bug256 goto BB0 } BB0 { - [#"../256.rs" 8 27 8 29] _0 <- ([#"../256.rs" 8 27 8 29] ()); + [#"../256.rs" 8 27 8 29] _0 <- (); goto BB1 } BB1 { diff --git a/creusot/tests/should_succeed/bug/258.mlcfg b/creusot/tests/should_succeed/bug/258.mlcfg index 52cd1f2235..f44b24d539 100644 --- a/creusot/tests/should_succeed/bug/258.mlcfg +++ b/creusot/tests/should_succeed/bug/258.mlcfg @@ -9,7 +9,7 @@ module C258_Err goto BB0 } BB0 { - [#"../258.rs" 3 23 3 25] _0 <- ([#"../258.rs" 3 23 3 25] ()); + [#"../258.rs" 3 23 3 25] _0 <- (); return _0 } @@ -24,7 +24,7 @@ module C258_Err2 goto BB0 } BB0 { - [#"../258.rs" 5 25 5 27] _0 <- ([#"../258.rs" 5 25 5 27] ()); + [#"../258.rs" 5 25 5 27] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/271.mlcfg b/creusot/tests/should_succeed/bug/271.mlcfg index 1834729226..9e313ab8f1 100644 --- a/creusot/tests/should_succeed/bug/271.mlcfg +++ b/creusot/tests/should_succeed/bug/271.mlcfg @@ -10,15 +10,15 @@ module C271_Ex goto BB0 } BB0 { - [#"../271.rs" 6 12 6 13] a <- ([#"../271.rs" 6 12 6 13] (0 : int32)); + [#"../271.rs" 6 12 6 13] a <- (0 : int32); goto BB2 } BB1 { - [#"../271.rs" 9 13 9 15] _0 <- ([#"../271.rs" 9 13 9 15] ()); + [#"../271.rs" 9 13 9 15] _0 <- (); goto BB3 } BB2 { - [#"../271.rs" 8 13 8 15] _0 <- ([#"../271.rs" 8 13 8 15] ()); + [#"../271.rs" 8 13 8 15] _0 <- (); goto BB3 } BB3 { @@ -37,7 +37,7 @@ module C271_Ex2 goto BB0 } BB0 { - [#"../271.rs" 14 12 14 13] a <- ([#"../271.rs" 14 12 14 13] (0 : int32)); + [#"../271.rs" 14 12 14 13] a <- (0 : int32); switch (a = 0) | True -> goto BB1 | False -> switch (a = 1) @@ -56,15 +56,15 @@ module C271_Ex2 goto BB6 } BB4 { - [#"../271.rs" 18 13 18 15] _0 <- ([#"../271.rs" 18 13 18 15] ()); + [#"../271.rs" 18 13 18 15] _0 <- (); goto BB7 } BB5 { - [#"../271.rs" 16 17 16 19] _0 <- ([#"../271.rs" 16 17 16 19] ()); + [#"../271.rs" 16 17 16 19] _0 <- (); goto BB7 } BB6 { - [#"../271.rs" 17 13 17 15] _0 <- ([#"../271.rs" 17 13 17 15] ()); + [#"../271.rs" 17 13 17 15] _0 <- (); goto BB7 } BB7 { @@ -89,7 +89,7 @@ module C271_Ex3 goto BB0 } BB0 { - [#"../271.rs" 23 12 23 13] a <- ([#"../271.rs" 23 12 23 13] (0 : int32)); + [#"../271.rs" 23 12 23 13] a <- (0 : int32); switch (a = 0) | True -> goto BB1 | False -> switch (a = 1) @@ -114,15 +114,15 @@ module C271_Ex3 goto BB7 } BB5 { - [#"../271.rs" 27 13 27 15] _0 <- ([#"../271.rs" 27 13 27 15] ()); + [#"../271.rs" 27 13 27 15] _0 <- (); goto BB8 } BB6 { - [#"../271.rs" 25 17 25 19] _0 <- ([#"../271.rs" 25 17 25 19] ()); + [#"../271.rs" 25 17 25 19] _0 <- (); goto BB8 } BB7 { - [#"../271.rs" 26 17 26 19] _0 <- ([#"../271.rs" 26 17 26 19] ()); + [#"../271.rs" 26 17 26 19] _0 <- (); goto BB8 } BB8 { diff --git a/creusot/tests/should_succeed/bug/273.mlcfg b/creusot/tests/should_succeed/bug/273.mlcfg index 3e369b934c..ef903d3b21 100644 --- a/creusot/tests/should_succeed/bug/273.mlcfg +++ b/creusot/tests/should_succeed/bug/273.mlcfg @@ -21,7 +21,7 @@ module C273_Ex goto BB0 } BB0 { - [#"../273.rs" 5 21 5 31] _1 <- ([#"../273.rs" 5 21 5 31] Core_Option_Option_Type.C_Some true); + [#"../273.rs" 5 21 5 31] _1 <- Core_Option_Option_Type.C_Some true; switch (_1) | Core_Option_Option_Type.C_Some _ -> goto BB1 | _ -> goto BB3 @@ -31,13 +31,13 @@ module C273_Ex goto BB2 } BB2 { - [#"../273.rs" 5 16 5 17] b <- ([#"../273.rs" 5 16 5 17] Core_Option_Option_Type.some_0 _1); + [#"../273.rs" 5 16 5 17] b <- Core_Option_Option_Type.some_0 _1; assert { [@expl:assertion] [#"../273.rs" 6 22 6 23] b }; - [#"../273.rs" 5 32 7 5] _0 <- ([#"../273.rs" 5 32 7 5] ()); + [#"../273.rs" 5 32 7 5] _0 <- (); goto BB4 } BB3 { - [#"../273.rs" 7 5 7 5] _0 <- ([#"../273.rs" 7 5 7 5] ()); + [#"../273.rs" 7 5 7 5] _0 <- (); goto BB4 } BB4 { diff --git a/creusot/tests/should_succeed/bug/387.mlcfg b/creusot/tests/should_succeed/bug/387.mlcfg index e909861af9..900a54f95f 100644 --- a/creusot/tests/should_succeed/bug/387.mlcfg +++ b/creusot/tests/should_succeed/bug/387.mlcfg @@ -46,7 +46,7 @@ module C387_UseTree goto BB0 } BB0 { - [#"../387.rs" 13 26 13 28] _0 <- ([#"../387.rs" 13 26 13 28] ()); + [#"../387.rs" 13 26 13 28] _0 <- (); return _0 } @@ -117,7 +117,7 @@ module C387_Impl0_Height goto BB4 } BB2 { - [#"../387.rs" 19 22 19 23] n <- ([#"../387.rs" 19 22 19 23] Core_Option_Option_Type.some_0 (C387_Tree_Type.tree_0 self)); + [#"../387.rs" 19 22 19 23] n <- Core_Option_Option_Type.some_0 (C387_Tree_Type.tree_0 self); [#"../387.rs" 19 29 19 44] _5 <- ([#"../387.rs" 19 29 19 44] height (C387_Node_Type.node_left n)); goto BB5 } @@ -126,7 +126,7 @@ module C387_Impl0_Height absurd } BB4 { - [#"../387.rs" 18 26 18 27] _0 <- ([#"../387.rs" 18 26 18 27] (0 : uint64)); + [#"../387.rs" 18 26 18 27] _0 <- (0 : uint64); goto BB8 } BB5 { @@ -140,7 +140,7 @@ module C387_Impl0_Height goto BB7 } BB7 { - [#"../387.rs" 19 29 19 70] _0 <- ([#"../387.rs" 19 29 19 70] _4 + (1 : uint64)); + [#"../387.rs" 19 29 19 70] _0 <- _4 + (1 : uint64); _4 <- any uint64; goto BB8 } diff --git a/creusot/tests/should_succeed/bug/395.mlcfg b/creusot/tests/should_succeed/bug/395.mlcfg index 997c4c4fe2..138e7422d9 100644 --- a/creusot/tests/should_succeed/bug/395.mlcfg +++ b/creusot/tests/should_succeed/bug/395.mlcfg @@ -19,28 +19,28 @@ module C395_SignedDivision goto BB0 } BB0 { - [#"../395.rs" 4 12 4 14] x <- ([#"../395.rs" 4 12 4 14] (10 : int32)); - [#"../395.rs" 5 12 5 13] y <- ([#"../395.rs" 5 12 5 13] (1 : int32)); - [#"../395.rs" 7 12 7 13] _6 <- ([#"../395.rs" 7 12 7 13] x); - [#"../395.rs" 7 16 7 17] _7 <- ([#"../395.rs" 7 16 7 17] y); - [#"../395.rs" 7 12 7 17] _8 <- ([#"../395.rs" 7 12 7 17] _7 = (0 : int32)); + [#"../395.rs" 4 12 4 14] x <- (10 : int32); + [#"../395.rs" 5 12 5 13] y <- (1 : int32); + [#"../395.rs" 7 12 7 13] _6 <- x; + [#"../395.rs" 7 16 7 17] _7 <- y; + [#"../395.rs" 7 12 7 17] _8 <- _7 = (0 : int32); assert { [@expl:division by zero] [#"../395.rs" 7 12 7 17] not _8 }; goto BB1 } BB1 { - [#"../395.rs" 7 12 7 17] _9 <- ([#"../395.rs" 7 12 7 17] _7 = (-1 : int32)); - [#"../395.rs" 7 12 7 17] _10 <- ([#"../395.rs" 7 12 7 17] _6 = (-2147483648 : int32)); - [#"../395.rs" 7 12 7 17] _11 <- ([#"../395.rs" 7 12 7 17] _9 && _10); + [#"../395.rs" 7 12 7 17] _9 <- _7 = (-1 : int32); + [#"../395.rs" 7 12 7 17] _10 <- _6 = (-2147483648 : int32); + [#"../395.rs" 7 12 7 17] _11 <- _9 && _10; _9 <- any bool; _10 <- any bool; assert { [@expl:Div overflow] [#"../395.rs" 7 12 7 17] not _11 }; goto BB2 } BB2 { - [#"../395.rs" 7 12 7 17] _5 <- ([#"../395.rs" 7 12 7 17] _6 / _7); + [#"../395.rs" 7 12 7 17] _5 <- _6 / _7; _6 <- any int32; _7 <- any int32; - [#"../395.rs" 7 12 7 23] _4 <- ([#"../395.rs" 7 12 7 23] _5 = (10 : int32)); + [#"../395.rs" 7 12 7 23] _4 <- _5 = (10 : int32); _5 <- any int32; switch (_4) | False -> goto BB4 @@ -48,7 +48,7 @@ module C395_SignedDivision end } BB3 { - [#"../395.rs" 3 25 8 1] _0 <- ([#"../395.rs" 3 25 8 1] ()); + [#"../395.rs" 3 25 8 1] _0 <- (); return _0 } BB4 { diff --git a/creusot/tests/should_succeed/bug/463.mlcfg b/creusot/tests/should_succeed/bug/463.mlcfg index 1d867edcc7..23eced7b05 100644 --- a/creusot/tests/should_succeed/bug/463.mlcfg +++ b/creusot/tests/should_succeed/bug/463.mlcfg @@ -26,9 +26,9 @@ module C463_Test_Closure0 goto BB0 } BB0 { - [#"../463.rs" 7 19 7 24] res1 <- ([#"../463.rs" 7 19 7 24] x + (1 : usize)); - [#"../463.rs" 5 8 5 30] res <- ([#"../463.rs" 5 8 5 30] res1); - [#"../463.rs" 6 8 6 37] _0 <- ([#"../463.rs" 6 8 6 37] res); + [#"../463.rs" 7 19 7 24] res1 <- x + (1 : usize); + [#"../463.rs" 5 8 5 30] res <- res1; + [#"../463.rs" 6 8 6 37] _0 <- res; return _0 } @@ -56,8 +56,8 @@ module C463_Test goto BB0 } BB0 { - [#"../463.rs" 6 8 6 37] c <- ([#"../463.rs" 6 8 6 37] C463_Test_Closure0.C463_Test_Closure0); - [#"../463.rs" 9 12 9 16] _4 <- ([#"../463.rs" 9 12 9 16] ((2 : usize))); + [#"../463.rs" 6 8 6 37] c <- C463_Test_Closure0.C463_Test_Closure0; + [#"../463.rs" 9 12 9 16] _4 <- ((2 : usize)); [#"../463.rs" 9 12 9 16] y <- ([#"../463.rs" 9 12 9 16] let (a) = _4 in closure00 c a); _4 <- any usize; goto BB1 @@ -65,7 +65,7 @@ module C463_Test BB1 { assume { resolve0 c }; assert { [@expl:assertion] [#"../463.rs" 10 18 10 25] UIntSize.to_int y = 3 }; - [#"../463.rs" 10 4 10 26] _0 <- ([#"../463.rs" 10 4 10 26] ()); + [#"../463.rs" 10 4 10 26] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/486.mlcfg b/creusot/tests/should_succeed/bug/486.mlcfg index 086796c83b..b955515a0b 100644 --- a/creusot/tests/should_succeed/bug/486.mlcfg +++ b/creusot/tests/should_succeed/bug/486.mlcfg @@ -25,8 +25,8 @@ module C486_Test goto BB0 } BB0 { - [#"../486.rs" 8 4 8 12] x <- (let C486_HasMutRef_Type.C_HasMutRef x0 = x in C486_HasMutRef_Type.C_HasMutRef ({ (C486_HasMutRef_Type.hasmutref_0 x) with current = ([#"../486.rs" 8 4 8 12] (5 : uint32)) ; })); - [#"../486.rs" 8 4 8 12] _0 <- ([#"../486.rs" 8 4 8 12] ()); + [#"../486.rs" 8 4 8 12] x <- (let C486_HasMutRef_Type.C_HasMutRef x0 = x in C486_HasMutRef_Type.C_HasMutRef ({ (C486_HasMutRef_Type.hasmutref_0 x) with current = (5 : uint32) ; })); + [#"../486.rs" 8 4 8 12] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/510.mlcfg b/creusot/tests/should_succeed/bug/510.mlcfg index 9a9062e921..a677bc52ec 100644 --- a/creusot/tests/should_succeed/bug/510.mlcfg +++ b/creusot/tests/should_succeed/bug/510.mlcfg @@ -12,8 +12,8 @@ module C510_TestBool goto BB0 } BB0 { - [#"../510.rs" 4 16 4 25] _bing <- ([#"../510.rs" 4 16 4 25] UInt8.of_int (Bool.to_int inp)); - [#"../510.rs" 3 28 5 1] _0 <- ([#"../510.rs" 3 28 5 1] ()); + [#"../510.rs" 4 16 4 25] _bing <- UInt8.of_int (Bool.to_int inp); + [#"../510.rs" 3 28 5 1] _0 <- (); return _0 } @@ -30,8 +30,8 @@ module C510_TestChar goto BB0 } BB0 { - [#"../510.rs" 8 4 8 14] _1 <- ([#"../510.rs" 8 4 8 14] Char.chr (UInt8.to_int (22 : uint8))); - [#"../510.rs" 7 19 9 1] _0 <- ([#"../510.rs" 7 19 9 1] ()); + [#"../510.rs" 8 4 8 14] _1 <- Char.chr (UInt8.to_int (22 : uint8)); + [#"../510.rs" 7 19 9 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/511.mlcfg b/creusot/tests/should_succeed/bug/511.mlcfg index ad7981a790..9fa8d04c41 100644 --- a/creusot/tests/should_succeed/bug/511.mlcfg +++ b/creusot/tests/should_succeed/bug/511.mlcfg @@ -12,8 +12,8 @@ module C511_TestU8 goto BB0 } BB0 { - [#"../511.rs" 4 16 4 28] _bing <- ([#"../511.rs" 4 16 4 28] UIntSize.of_int (UInt8.to_int inp)); - [#"../511.rs" 3 24 5 1] _0 <- ([#"../511.rs" 3 24 5 1] ()); + [#"../511.rs" 4 16 4 28] _bing <- UIntSize.of_int (UInt8.to_int inp); + [#"../511.rs" 3 24 5 1] _0 <- (); return _0 } @@ -31,8 +31,8 @@ module C511_TestU16 goto BB0 } BB0 { - [#"../511.rs" 8 16 8 28] _bing <- ([#"../511.rs" 8 16 8 28] UIntSize.of_int (UInt16.to_int inp)); - [#"../511.rs" 7 26 9 1] _0 <- ([#"../511.rs" 7 26 9 1] ()); + [#"../511.rs" 8 16 8 28] _bing <- UIntSize.of_int (UInt16.to_int inp); + [#"../511.rs" 7 26 9 1] _0 <- (); return _0 } @@ -50,8 +50,8 @@ module C511_TestU128 goto BB0 } BB0 { - [#"../511.rs" 12 16 12 28] _bing <- ([#"../511.rs" 12 16 12 28] UIntSize.of_int (UInt128.to_int inp)); - [#"../511.rs" 11 28 13 1] _0 <- ([#"../511.rs" 11 28 13 1] ()); + [#"../511.rs" 12 16 12 28] _bing <- UIntSize.of_int (UInt128.to_int inp); + [#"../511.rs" 11 28 13 1] _0 <- (); return _0 } @@ -69,8 +69,8 @@ module C511_TestI8 goto BB0 } BB0 { - [#"../511.rs" 16 16 16 28] _bing <- ([#"../511.rs" 16 16 16 28] UIntSize.of_int (Int8.to_int inp)); - [#"../511.rs" 15 24 17 1] _0 <- ([#"../511.rs" 15 24 17 1] ()); + [#"../511.rs" 16 16 16 28] _bing <- UIntSize.of_int (Int8.to_int inp); + [#"../511.rs" 15 24 17 1] _0 <- (); return _0 } @@ -88,8 +88,8 @@ module C511_TestI16 goto BB0 } BB0 { - [#"../511.rs" 20 16 20 28] _bing <- ([#"../511.rs" 20 16 20 28] UIntSize.of_int (Int16.to_int inp)); - [#"../511.rs" 19 26 21 1] _0 <- ([#"../511.rs" 19 26 21 1] ()); + [#"../511.rs" 20 16 20 28] _bing <- UIntSize.of_int (Int16.to_int inp); + [#"../511.rs" 19 26 21 1] _0 <- (); return _0 } @@ -107,8 +107,8 @@ module C511_TestI128 goto BB0 } BB0 { - [#"../511.rs" 24 16 24 28] _bing <- ([#"../511.rs" 24 16 24 28] UIntSize.of_int (Int128.to_int inp)); - [#"../511.rs" 23 28 25 1] _0 <- ([#"../511.rs" 23 28 25 1] ()); + [#"../511.rs" 24 16 24 28] _bing <- UIntSize.of_int (Int128.to_int inp); + [#"../511.rs" 23 28 25 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/528.mlcfg b/creusot/tests/should_succeed/bug/528.mlcfg index 7b9b4401ee..9e4e516f9e 100644 --- a/creusot/tests/should_succeed/bug/528.mlcfg +++ b/creusot/tests/should_succeed/bug/528.mlcfg @@ -10,7 +10,7 @@ module C528_Neq goto BB0 } BB0 { - [#"../528.rs" 4 4 4 10] _0 <- ([#"../528.rs" 4 4 4 10] Bool.neqb a b); + [#"../528.rs" 4 4 4 10] _0 <- Bool.neqb a b; return _0 } diff --git a/creusot/tests/should_succeed/bug/545.mlcfg b/creusot/tests/should_succeed/bug/545.mlcfg index 7df3e0458e..f879e5b54b 100644 --- a/creusot/tests/should_succeed/bug/545.mlcfg +++ b/creusot/tests/should_succeed/bug/545.mlcfg @@ -10,7 +10,7 @@ module C545_NegativeIsNegative } BB0 { assert { [@expl:assertion] [#"../545.rs" 5 18 5 32] (0 : int32) > (-100 : int32) }; - [#"../545.rs" 4 30 6 1] _0 <- ([#"../545.rs" 4 30 6 1] ()); + [#"../545.rs" 4 30 6 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/552.mlcfg b/creusot/tests/should_succeed/bug/552.mlcfg index af756ed851..400413f4dc 100644 --- a/creusot/tests/should_succeed/bug/552.mlcfg +++ b/creusot/tests/should_succeed/bug/552.mlcfg @@ -27,7 +27,7 @@ module C552_Impl1_Transition goto BB0 } BB0 { - [#"../552.rs" 32 8 32 18] _0 <- ([#"../552.rs" 32 8 32 18] C552_Transition_Type.C_Transition); + [#"../552.rs" 32 8 32 18] _0 <- C552_Transition_Type.C_Transition; return _0 } @@ -66,7 +66,7 @@ module C552_Impl0_Step } BB1 { assume { resolve0 self }; - [#"../552.rs" 25 8 25 13] _0 <- ([#"../552.rs" 25 8 25 13] false); + [#"../552.rs" 25 8 25 13] _0 <- false; return _0 } diff --git a/creusot/tests/should_succeed/bug/570.mlcfg b/creusot/tests/should_succeed/bug/570.mlcfg index 1306d8bdf8..fdd51ba50f 100644 --- a/creusot/tests/should_succeed/bug/570.mlcfg +++ b/creusot/tests/should_succeed/bug/570.mlcfg @@ -31,7 +31,7 @@ module C570_TestProgram goto BB0 } BB0 { - [#"../570.rs" 12 27 14 1] _0 <- ([#"../570.rs" 12 27 14 1] ()); + [#"../570.rs" 12 27 14 1] _0 <- (); return _0 } @@ -50,8 +50,8 @@ module C570_TestAssign goto BB0 } BB0 { - [#"../570.rs" 17 4 17 14] s <- (let C570_S2_Type.C_S2 x0 = s in C570_S2_Type.C_S2 (let C570_S1_Type.C_S1 x0 = C570_S2_Type.s2_s1 s in C570_S1_Type.C_S1 ([#"../570.rs" 17 4 17 14] (2 : int32)))); - [#"../570.rs" 16 30 18 1] _0 <- ([#"../570.rs" 16 30 18 1] ()); + [#"../570.rs" 17 4 17 14] s <- (let C570_S2_Type.C_S2 x0 = s in C570_S2_Type.C_S2 (let C570_S1_Type.C_S1 x0 = C570_S2_Type.s2_s1 s in C570_S1_Type.C_S1 (2 : int32))); + [#"../570.rs" 16 30 18 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/594.mlcfg b/creusot/tests/should_succeed/bug/594.mlcfg index 0e34c01bc4..08cb9ca21d 100644 --- a/creusot/tests/should_succeed/bug/594.mlcfg +++ b/creusot/tests/should_succeed/bug/594.mlcfg @@ -23,9 +23,9 @@ module C594_TestProgram goto BB0 } BB0 { - [#"../594.rs" 11 21 11 22] x <- ([#"../594.rs" 11 21 11 22] let (a, _) = _1 in a); + [#"../594.rs" 11 21 11 22] x <- (let (a, _) = _1 in a); assume { resolve0 _1 }; - [#"../594.rs" 12 4 12 5] _0 <- ([#"../594.rs" 12 4 12 5] x); + [#"../594.rs" 12 4 12 5] _0 <- x; return _0 } @@ -66,11 +66,11 @@ module C594_TestClosure_Closure0 goto BB0 } BB0 { - [#"../594.rs" 17 10 17 12] _a <- ([#"../594.rs" 17 10 17 12] let (a, _) = _3 in a); - [#"../594.rs" 17 14 17 15] b <- ([#"../594.rs" 17 14 17 15] let (_, a) = _3 in a); + [#"../594.rs" 17 10 17 12] _a <- (let (a, _) = _3 in a); + [#"../594.rs" 17 14 17 15] b <- (let (_, a) = _3 in a); assume { resolve0 _3 }; - [#"../594.rs" 17 18 17 19] res <- ([#"../594.rs" 17 18 17 19] b); - [#"../594.rs" 16 14 16 37] _0 <- ([#"../594.rs" 16 14 16 37] res); + [#"../594.rs" 17 18 17 19] res <- b; + [#"../594.rs" 16 14 16 37] _0 <- res; return _0 } @@ -111,11 +111,11 @@ module C594_TestClosure_Closure1 goto BB0 } BB0 { - [#"../594.rs" 19 6 19 8] _a <- ([#"../594.rs" 19 6 19 8] let (a, _) = _2 in a); - [#"../594.rs" 19 10 19 11] b <- ([#"../594.rs" 19 10 19 11] let (_, a) = _2 in a); + [#"../594.rs" 19 6 19 8] _a <- (let (a, _) = _2 in a); + [#"../594.rs" 19 10 19 11] b <- (let (_, a) = _2 in a); assume { resolve0 _2 }; - [#"../594.rs" 19 14 19 15] res <- ([#"../594.rs" 19 14 19 15] b); - [#"../594.rs" 18 14 18 37] _0 <- ([#"../594.rs" 18 14 18 37] res); + [#"../594.rs" 19 14 19 15] res <- b; + [#"../594.rs" 18 14 18 37] _0 <- res; return _0 } @@ -162,10 +162,10 @@ module C594_TestClosure goto BB0 } BB0 { - [#"../594.rs" 16 14 16 37] cl1 <- ([#"../594.rs" 16 14 16 37] C594_TestClosure_Closure0.C594_TestClosure_Closure0); - [#"../594.rs" 18 14 18 37] cl2 <- ([#"../594.rs" 18 14 18 37] C594_TestClosure_Closure1.C594_TestClosure_Closure1); - [#"../594.rs" 20 22 20 28] _6 <- ([#"../594.rs" 20 22 20 28] ((0 : int32), (3 : int32))); - [#"../594.rs" 20 13 20 29] _5 <- ([#"../594.rs" 20 13 20 29] ((4 : int32), _6)); + [#"../594.rs" 16 14 16 37] cl1 <- C594_TestClosure_Closure0.C594_TestClosure_Closure0; + [#"../594.rs" 18 14 18 37] cl2 <- C594_TestClosure_Closure1.C594_TestClosure_Closure1; + [#"../594.rs" 20 22 20 28] _6 <- ((0 : int32), (3 : int32)); + [#"../594.rs" 20 13 20 29] _5 <- ((4 : int32), _6); _6 <- any (int32, int32); [#"../594.rs" 20 13 20 29] _a <- ([#"../594.rs" 20 13 20 29] let (a, b) = _5 in closure00 cl1 a b); _5 <- any (int32, (int32, int32)); @@ -173,8 +173,8 @@ module C594_TestClosure } BB1 { assume { resolve0 cl1 }; - [#"../594.rs" 21 19 21 25] _10 <- ([#"../594.rs" 21 19 21 25] ((0 : int32), (4 : int32))); - [#"../594.rs" 21 13 21 26] _9 <- ([#"../594.rs" 21 13 21 26] (_10)); + [#"../594.rs" 21 19 21 25] _10 <- ((0 : int32), (4 : int32)); + [#"../594.rs" 21 13 21 26] _9 <- (_10); _10 <- any (int32, int32); [#"../594.rs" 21 13 21 26] _b <- ([#"../594.rs" 21 13 21 26] let (a) = _9 in closure10 cl2 a); _9 <- any (int32, int32); @@ -182,7 +182,7 @@ module C594_TestClosure } BB2 { assume { resolve1 cl2 }; - [#"../594.rs" 15 22 22 1] _0 <- ([#"../594.rs" 15 22 22 1] ()); + [#"../594.rs" 15 22 22 1] _0 <- (); return _0 } @@ -219,9 +219,9 @@ module C594_Impl0_TestMethod goto BB0 } BB0 { - [#"../594.rs" 33 30 33 31] x <- ([#"../594.rs" 33 30 33 31] let (a, _) = _2 in a); + [#"../594.rs" 33 30 33 31] x <- (let (a, _) = _2 in a); assume { resolve0 _2 }; - [#"../594.rs" 34 8 34 9] _0 <- ([#"../594.rs" 34 8 34 9] x); + [#"../594.rs" 34 8 34 9] _0 <- x; return _0 } diff --git a/creusot/tests/should_succeed/bug/641.mlcfg b/creusot/tests/should_succeed/bug/641.mlcfg index 99b5272429..3da8946a79 100644 --- a/creusot/tests/should_succeed/bug/641.mlcfg +++ b/creusot/tests/should_succeed/bug/641.mlcfg @@ -15,7 +15,7 @@ module C641_TestMaintains goto BB0 } BB0 { - [#"../641.rs" 16 24 16 26] _0 <- ([#"../641.rs" 16 24 16 26] ()); + [#"../641.rs" 16 24 16 26] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/653.mlcfg b/creusot/tests/should_succeed/bug/653.mlcfg index 51cc10c951..1ee383f716 100644 --- a/creusot/tests/should_succeed/bug/653.mlcfg +++ b/creusot/tests/should_succeed/bug/653.mlcfg @@ -13,7 +13,7 @@ module C653_Omg goto BB0 } BB0 { - [#"../653.rs" 7 4 7 5] _0 <- ([#"../653.rs" 7 4 7 5] n); + [#"../653.rs" 7 4 7 5] _0 <- n; return _0 } diff --git a/creusot/tests/should_succeed/bug/682.mlcfg b/creusot/tests/should_succeed/bug/682.mlcfg index 488137d7b9..072ec9229c 100644 --- a/creusot/tests/should_succeed/bug/682.mlcfg +++ b/creusot/tests/should_succeed/bug/682.mlcfg @@ -21,9 +21,9 @@ module C682_AddSome goto BB0 } BB0 { - [#"../682.rs" 7 4 7 11] a <- { a with current = ([#"../682.rs" 7 4 7 11] * a + (1 : uint64)) ; }; + [#"../682.rs" 7 4 7 11] a <- { a with current = ( * a + (1 : uint64)) ; }; assume { resolve0 a }; - [#"../682.rs" 6 25 8 1] _0 <- ([#"../682.rs" 6 25 8 1] ()); + [#"../682.rs" 6 25 8 1] _0 <- (); return _0 } @@ -73,7 +73,7 @@ module C682_Foo BB2 { assume { resolve0 a }; assert { [@expl:assertion] [#"../682.rs" 15 18 15 27] * a > Snapshot.inner a_p }; - [#"../682.rs" 12 24 16 1] _0 <- ([#"../682.rs" 12 24 16 1] ()); + [#"../682.rs" 12 24 16 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/691.mlcfg b/creusot/tests/should_succeed/bug/691.mlcfg index ef2abb420e..ff5ba3ad12 100644 --- a/creusot/tests/should_succeed/bug/691.mlcfg +++ b/creusot/tests/should_succeed/bug/691.mlcfg @@ -42,8 +42,8 @@ module C691_Example_Closure0 goto BB0 } BB0 { - [#"../691.rs" 11 7 11 9] res <- ([#"../691.rs" 11 7 11 9] ()); - [#"../691.rs" 10 12 10 39] _0 <- ([#"../691.rs" 10 12 10 39] res); + [#"../691.rs" 11 7 11 9] res <- (); + [#"../691.rs" 10 12 10 39] _0 <- res; return _0 } @@ -65,10 +65,10 @@ module C691_Example goto BB0 } BB0 { - [#"../691.rs" 9 12 9 29] c <- ([#"../691.rs" 9 12 9 29] C691_Foo_Type.C_Foo (2 : uint32)); - [#"../691.rs" 10 12 10 39] _2 <- ([#"../691.rs" 10 12 10 39] C691_Example_Closure0.C691_Example_Closure0 c); + [#"../691.rs" 9 12 9 29] c <- C691_Foo_Type.C_Foo (2 : uint32); + [#"../691.rs" 10 12 10 39] _2 <- C691_Example_Closure0.C691_Example_Closure0 c; assume { resolve0 _2 }; - [#"../691.rs" 8 17 12 1] _0 <- ([#"../691.rs" 8 17 12 1] ()); + [#"../691.rs" 8 17 12 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/693.mlcfg b/creusot/tests/should_succeed/bug/693.mlcfg index 43a517f18b..4487df2ec7 100644 --- a/creusot/tests/should_succeed/bug/693.mlcfg +++ b/creusot/tests/should_succeed/bug/693.mlcfg @@ -24,7 +24,7 @@ module C693_F goto BB0 } BB0 { - [#"../693.rs" 3 22 3 24] _0 <- ([#"../693.rs" 3 22 3 24] ()); + [#"../693.rs" 3 22 3 24] _0 <- (); assert { [@expl:type invariant] inv0 _1 }; assume { resolve0 _1 }; goto BB1 diff --git a/creusot/tests/should_succeed/bug/789.mlcfg b/creusot/tests/should_succeed/bug/789.mlcfg index 18928f3795..60b8abe150 100644 --- a/creusot/tests/should_succeed/bug/789.mlcfg +++ b/creusot/tests/should_succeed/bug/789.mlcfg @@ -9,7 +9,7 @@ module C789_Meta goto BB0 } BB0 { - [#"../789.rs" 3 23 3 25] _0 <- ([#"../789.rs" 3 23 3 25] ()); + [#"../789.rs" 3 23 3 25] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/791.mlcfg b/creusot/tests/should_succeed/bug/791.mlcfg index b0383fbf44..0826f38ee3 100644 --- a/creusot/tests/should_succeed/bug/791.mlcfg +++ b/creusot/tests/should_succeed/bug/791.mlcfg @@ -7,7 +7,7 @@ module C791_ILoveFloats goto BB0 } BB0 { - [#"../791.rs" 3 23 6 1] _0 <- ([#"../791.rs" 3 23 6 1] ()); + [#"../791.rs" 3 23 6 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/874.mlcfg b/creusot/tests/should_succeed/bug/874.mlcfg index 76a9249439..904a1964b9 100644 --- a/creusot/tests/should_succeed/bug/874.mlcfg +++ b/creusot/tests/should_succeed/bug/874.mlcfg @@ -287,7 +287,7 @@ module C874_CanExtend goto BB0 } BB0 { - [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _4 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp); + [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _4 <- (let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp); goto BB1 } BB1 { @@ -299,7 +299,7 @@ module C874_CanExtend goto BB3 } BB3 { - [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _8 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (4 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (5 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (6 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp); + [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _8 <- (let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (4 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (5 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (6 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp); goto BB4 } BB4 { @@ -320,7 +320,7 @@ module C874_CanExtend } BB7 { assume { resolve0 v }; - [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _15 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Seq.get (__arr_temp.elts) 3 = (4 : int32)}; assume {Seq.get (__arr_temp.elts) 4 = (5 : int32)}; assume {Seq.get (__arr_temp.elts) 5 = (6 : int32)}; assume {Slice.length __arr_temp = 6}; __arr_temp); + [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _15 <- (let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Seq.get (__arr_temp.elts) 3 = (4 : int32)}; assume {Seq.get (__arr_temp.elts) 4 = (5 : int32)}; assume {Seq.get (__arr_temp.elts) 5 = (6 : int32)}; assume {Slice.length __arr_temp = 6}; __arr_temp); goto BB8 } BB8 { @@ -337,7 +337,7 @@ module C874_CanExtend goto BB11 } BB11 { - [#"../874.rs" 4 20 11 1] _0 <- ([#"../874.rs" 4 20 11 1] ()); + [#"../874.rs" 4 20 11 1] _0 <- (); goto BB12 } BB12 { diff --git a/creusot/tests/should_succeed/bug/949.mlcfg b/creusot/tests/should_succeed/bug/949.mlcfg index 837e58198d..dcaa5b8fa2 100644 --- a/creusot/tests/should_succeed/bug/949.mlcfg +++ b/creusot/tests/should_succeed/bug/949.mlcfg @@ -253,7 +253,7 @@ module C949_Main goto BB1 } BB1 { - [#"../949.rs" 6 12 6 23] b <- ([#"../949.rs" 6 12 6 23] (1 : int32)); + [#"../949.rs" 6 12 6 23] b <- (1 : int32); goto BB2 } BB2 { @@ -272,9 +272,9 @@ module C949_Main goto BB4 } BB4 { - [#"../949.rs" 9 4 9 11] r <- ([#"../949.rs" 9 4 9 11] r + (5 : int32)); + [#"../949.rs" 9 4 9 11] r <- r + (5 : int32); assume { resolve0 r }; - [#"../949.rs" 4 14 10 1] _0 <- ([#"../949.rs" 4 14 10 1] ()); + [#"../949.rs" 4 14 10 1] _0 <- (); goto BB5 } BB5 { diff --git a/creusot/tests/should_succeed/bug/final_borrows.mlcfg b/creusot/tests/should_succeed/bug/final_borrows.mlcfg index fb1ab311ec..7c0bbfed22 100644 --- a/creusot/tests/should_succeed/bug/final_borrows.mlcfg +++ b/creusot/tests/should_succeed/bug/final_borrows.mlcfg @@ -569,9 +569,9 @@ module FinalBorrows_Set7 goto BB0 } BB0 { - [#"../final_borrows.rs" 49 4 49 10] r <- { r with current = ([#"../final_borrows.rs" 49 4 49 10] (7 : int32)) ; }; + [#"../final_borrows.rs" 49 4 49 10] r <- { r with current = (7 : int32) ; }; assume { resolve0 r }; - [#"../final_borrows.rs" 48 22 50 1] _0 <- ([#"../final_borrows.rs" 48 22 50 1] ()); + [#"../final_borrows.rs" 48 22 50 1] _0 <- (); return _0 } @@ -604,7 +604,7 @@ module FinalBorrows_NotFinalBorrowWorks goto BB0 } BB0 { - [#"../final_borrows.rs" 54 16 54 20] x <- ([#"../final_borrows.rs" 54 16 54 20] (1 : int32)); + [#"../final_borrows.rs" 54 16 54 20] x <- (1 : int32); [#"../final_borrows.rs" 55 12 55 18] r <- Borrow.borrow_mut x; [#"../final_borrows.rs" 55 12 55 18] x <- ^ r; [#"../final_borrows.rs" 56 13 56 20] r1 <- Borrow.borrow_final ( * r) (Borrow.get_id r); @@ -617,10 +617,10 @@ module FinalBorrows_NotFinalBorrowWorks } BB1 { assume { resolve0 r1 }; - [#"../final_borrows.rs" 58 12 58 14] y <- ([#"../final_borrows.rs" 58 12 58 14] * r); - [#"../final_borrows.rs" 59 4 59 10] r <- { r with current = ([#"../final_borrows.rs" 59 4 59 10] (2 : int32)) ; }; + [#"../final_borrows.rs" 58 12 58 14] y <- * r; + [#"../final_borrows.rs" 59 4 59 10] r <- { r with current = (2 : int32) ; }; assume { resolve0 r }; - [#"../final_borrows.rs" 60 11 60 16] _0 <- ([#"../final_borrows.rs" 60 11 60 16] x + y); + [#"../final_borrows.rs" 60 11 60 16] _0 <- x + y; return _0 } @@ -653,13 +653,13 @@ module FinalBorrows_Branching goto BB0 } BB0 { - [#"../final_borrows.rs" 65 16 65 17] x <- ([#"../final_borrows.rs" 65 16 65 17] (3 : int32)); + [#"../final_borrows.rs" 65 16 65 17] x <- (3 : int32); [#"../final_borrows.rs" 67 17 67 23] r1 <- Borrow.borrow_mut x; [#"../final_borrows.rs" 67 17 67 23] x <- ^ r1; [#"../final_borrows.rs" 69 13 69 21] r2 <- Borrow.borrow_mut ( * r1); [#"../final_borrows.rs" 69 13 69 21] r1 <- { r1 with current = ( ^ r2) ; }; assume { resolve0 r2 }; - [#"../final_borrows.rs" 70 4 70 11] y <- ([#"../final_borrows.rs" 70 4 70 11] * r2); + [#"../final_borrows.rs" 70 4 70 11] y <- * r2; switch (b) | False -> goto BB2 | True -> goto BB1 @@ -671,25 +671,25 @@ module FinalBorrows_Branching [#"../final_borrows.rs" 73 13 73 19] y <- ^ _11; [#"../final_borrows.rs" 73 13 73 19] _10 <- Borrow.borrow_final ( * _11) (Borrow.get_id _11); [#"../final_borrows.rs" 73 13 73 19] _11 <- { _11 with current = ( ^ _10) ; }; - [#"../final_borrows.rs" 73 8 73 19] r1 <- ([#"../final_borrows.rs" 73 8 73 19] _10); + [#"../final_borrows.rs" 73 8 73 19] r1 <- _10; _10 <- any borrowed int32; assume { resolve0 _11 }; assume { resolve0 r1 }; - [#"../final_borrows.rs" 74 8 74 15] y <- ([#"../final_borrows.rs" 74 8 74 15] * r1); - [#"../final_borrows.rs" 71 9 75 5] _8 <- ([#"../final_borrows.rs" 71 9 75 5] ()); + [#"../final_borrows.rs" 74 8 74 15] y <- * r1; + [#"../final_borrows.rs" 71 9 75 5] _8 <- (); goto BB3 } BB2 { [#"../final_borrows.rs" 77 17 77 25] r21 <- Borrow.borrow_final ( * r1) (Borrow.get_id r1); [#"../final_borrows.rs" 77 17 77 25] r1 <- { r1 with current = ( ^ r21) ; }; assume { resolve0 r21 }; - [#"../final_borrows.rs" 78 8 78 15] y <- ([#"../final_borrows.rs" 78 8 78 15] * r21); + [#"../final_borrows.rs" 78 8 78 15] y <- * r21; assume { resolve0 r1 }; - [#"../final_borrows.rs" 75 11 79 5] _8 <- ([#"../final_borrows.rs" 75 11 79 5] ()); + [#"../final_borrows.rs" 75 11 79 5] _8 <- (); goto BB3 } BB3 { - [#"../final_borrows.rs" 80 4 80 5] _0 <- ([#"../final_borrows.rs" 80 4 80 5] y); + [#"../final_borrows.rs" 80 4 80 5] _0 <- y; return _0 } @@ -842,7 +842,7 @@ module FinalBorrows_BoxDeref goto BB1 } BB1 { - [#"../final_borrows.rs" 95 4 95 6] _0 <- ([#"../final_borrows.rs" 95 4 95 6] x); + [#"../final_borrows.rs" 95 4 95 6] _0 <- x; x <- any t; assert { [@expl:type invariant] inv0 x }; assume { resolve0 x }; @@ -927,7 +927,7 @@ module FinalBorrows_BoxReborrowDirect goto BB1 } BB1 { - [#"../final_borrows.rs" 101 4 103 5] _0 <- ([#"../final_borrows.rs" 101 4 103 5] ()); + [#"../final_borrows.rs" 101 4 103 5] _0 <- (); goto BB2 } BB2 { @@ -997,7 +997,7 @@ module FinalBorrows_BoxReborrowIndirect assume { inv0 ( ^ borrow) }; assert { [@expl:type invariant] inv1 _4 }; assume { resolve0 _4 }; - [#"../final_borrows.rs" 109 4 109 11] _0 <- ([#"../final_borrows.rs" 109 4 109 11] * borrow); + [#"../final_borrows.rs" 109 4 109 11] _0 <- * borrow; assert { [@expl:type invariant] inv1 borrow }; assume { resolve0 borrow }; assert { [@expl:type invariant] inv2 x }; @@ -1039,7 +1039,7 @@ module FinalBorrows_BoxReborrowInStruct [#"../final_borrows.rs" 115 27 115 37] borrow <- Borrow.borrow_final ( * _5) (Borrow.get_id _5); [#"../final_borrows.rs" 115 27 115 37] _5 <- { _5 with current = ( ^ borrow) ; }; assume { resolve0 _5 }; - [#"../final_borrows.rs" 116 4 116 11] _0 <- ([#"../final_borrows.rs" 116 4 116 11] * borrow); + [#"../final_borrows.rs" 116 4 116 11] _0 <- * borrow; assume { resolve0 borrow }; assume { resolve1 x }; return _0 @@ -1169,7 +1169,7 @@ module FinalBorrows_BorrowInBoxTuple1 [#"../final_borrows.rs" 127 27 127 39] borrow <- Borrow.borrow_final ( * _5) (Borrow.get_id _5); [#"../final_borrows.rs" 127 27 127 39] _5 <- { _5 with current = ( ^ borrow) ; }; assume { resolve0 _5 }; - [#"../final_borrows.rs" 128 4 128 11] _0 <- ([#"../final_borrows.rs" 128 4 128 11] * borrow); + [#"../final_borrows.rs" 128 4 128 11] _0 <- * borrow; assume { resolve0 borrow }; assume { resolve1 x }; goto BB2 @@ -1225,7 +1225,7 @@ module FinalBorrows_BorrowInBoxTuple2 [#"../final_borrows.rs" 134 27 134 39] borrow <- Borrow.borrow_final ( * _5) (Borrow.get_id _5); [#"../final_borrows.rs" 134 27 134 39] _5 <- { _5 with current = ( ^ borrow) ; }; assume { resolve0 _5 }; - [#"../final_borrows.rs" 135 4 135 11] _0 <- ([#"../final_borrows.rs" 135 4 135 11] * borrow); + [#"../final_borrows.rs" 135 4 135 11] _0 <- * borrow; assume { resolve0 borrow }; assume { resolve1 x }; goto BB2 @@ -1291,13 +1291,13 @@ module FinalBorrows_SharedBorrowNoGen assume { inv0 ( ^ b1) }; assert { [@expl:type invariant] inv1 b1 }; assume { resolve0 b1 }; - [#"../final_borrows.rs" 151 18 151 22] _shared <- ([#"../final_borrows.rs" 151 18 151 22] bor); + [#"../final_borrows.rs" 151 18 151 22] _shared <- bor; assert { [@expl:type invariant] inv2 _shared }; assume { resolve1 _shared }; assert { [@expl:type invariant] inv1 bor }; assume { resolve0 bor }; assert { [@expl:assertion] [#"../final_borrows.rs" 152 18 152 27] b1 = bor }; - [#"../final_borrows.rs" 149 44 153 1] _0 <- ([#"../final_borrows.rs" 149 44 153 1] ()); + [#"../final_borrows.rs" 149 44 153 1] _0 <- (); return _0 } @@ -1371,12 +1371,12 @@ module FinalBorrows_InspectNoGen end } BB5 { - [#"../final_borrows.rs" 159 8 159 14] _0 <- ([#"../final_borrows.rs" 159 8 159 14] ()); + [#"../final_borrows.rs" 159 8 159 14] _0 <- (); goto BB7 } BB6 { assert { [@expl:assertion] [#"../final_borrows.rs" 161 18 161 24] r = x }; - [#"../final_borrows.rs" 155 44 162 1] _0 <- ([#"../final_borrows.rs" 155 44 162 1] ()); + [#"../final_borrows.rs" 155 44 162 1] _0 <- (); goto BB7 } BB7 { @@ -1430,7 +1430,7 @@ module FinalBorrows_PlaceMentionNoGen assert { [@expl:type invariant] inv1 x }; assume { resolve0 x }; assert { [@expl:assertion] [#"../final_borrows.rs" 167 18 167 25] _r = x }; - [#"../final_borrows.rs" 164 50 168 1] _0 <- ([#"../final_borrows.rs" 164 50 168 1] ()); + [#"../final_borrows.rs" 164 50 168 1] _0 <- (); return _0 } @@ -1467,16 +1467,16 @@ module FinalBorrows_ShallowBorrowNoGen end } BB1 { - [#"../final_borrows.rs" 177 13 177 15] _0 <- ([#"../final_borrows.rs" 177 13 177 15] ()); + [#"../final_borrows.rs" 177 13 177 15] _0 <- (); goto BB6 } BB2 { goto BB3 } BB3 { - [#"../final_borrows.rs" 174 13 174 22] inner <- ([#"../final_borrows.rs" 174 13 174 22] Core_Option_Option_Type.some_0 ( * x)); - [#"../final_borrows.rs" 174 13 174 22] inner1 <- ([#"../final_borrows.rs" 174 13 174 22] inner); - [#"../final_borrows.rs" 174 27 174 38] _8 <- ([#"../final_borrows.rs" 174 27 174 38] inner1 = (2 : int32)); + [#"../final_borrows.rs" 174 13 174 22] inner <- Core_Option_Option_Type.some_0 ( * x); + [#"../final_borrows.rs" 174 13 174 22] inner1 <- inner; + [#"../final_borrows.rs" 174 27 174 38] _8 <- inner1 = (2 : int32); switch (_8) | False -> goto BB5 | True -> goto BB4 @@ -1485,7 +1485,7 @@ module FinalBorrows_ShallowBorrowNoGen BB4 { assume { resolve0 x }; assert { [@expl:assertion] [#"../final_borrows.rs" 175 26 175 33] _r = x }; - [#"../final_borrows.rs" 174 42 176 9] _0 <- ([#"../final_borrows.rs" 174 42 176 9] ()); + [#"../final_borrows.rs" 174 42 176 9] _0 <- (); goto BB6 } BB5 { diff --git a/creusot/tests/should_succeed/bug/minus_assoc.mlcfg b/creusot/tests/should_succeed/bug/minus_assoc.mlcfg index be93d0ef42..e87eec7e05 100644 --- a/creusot/tests/should_succeed/bug/minus_assoc.mlcfg +++ b/creusot/tests/should_succeed/bug/minus_assoc.mlcfg @@ -10,7 +10,7 @@ module MinusAssoc_F goto BB0 } BB0 { - [#"../minus_assoc.rs" 6 11 6 13] _0 <- ([#"../minus_assoc.rs" 6 11 6 13] ()); + [#"../minus_assoc.rs" 6 11 6 13] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/bug/two_phase.mlcfg b/creusot/tests/should_succeed/bug/two_phase.mlcfg index 925a87c903..606553cc92 100644 --- a/creusot/tests/should_succeed/bug/two_phase.mlcfg +++ b/creusot/tests/should_succeed/bug/two_phase.mlcfg @@ -166,7 +166,7 @@ module TwoPhase_Test } BB2 { assume { resolve0 v }; - [#"../two_phase.rs" 6 32 8 1] _0 <- ([#"../two_phase.rs" 6 32 8 1] ()); + [#"../two_phase.rs" 6 32 8 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/cell/01.mlcfg b/creusot/tests/should_succeed/cell/01.mlcfg index 1a0d454d08..e4dc8d8c05 100644 --- a/creusot/tests/should_succeed/cell/01.mlcfg +++ b/creusot/tests/should_succeed/cell/01.mlcfg @@ -86,20 +86,20 @@ module C01_AddsTwo goto BB1 } BB1 { - [#"../01.rs" 43 7 43 17] _4 <- ([#"../01.rs" 43 7 43 17] v < (100000 : uint32)); + [#"../01.rs" 43 7 43 17] _4 <- v < (100000 : uint32); switch (_4) | False -> goto BB4 | True -> goto BB2 end } BB2 { - [#"../01.rs" 44 14 44 19] _8 <- ([#"../01.rs" 44 14 44 19] v + (2 : uint32)); + [#"../01.rs" 44 14 44 19] _8 <- v + (2 : uint32); [#"../01.rs" 44 8 44 20] _6 <- ([#"../01.rs" 44 8 44 20] set0 c _8); _8 <- any uint32; goto BB3 } BB3 { - [#"../01.rs" 43 18 45 5] _0 <- ([#"../01.rs" 43 18 45 5] ()); + [#"../01.rs" 43 18 45 5] _0 <- (); goto BB6 } BB4 { @@ -107,7 +107,7 @@ module C01_AddsTwo goto BB5 } BB5 { - [#"../01.rs" 45 11 47 5] _0 <- ([#"../01.rs" 45 11 47 5] ()); + [#"../01.rs" 45 11 47 5] _0 <- (); goto BB6 } BB6 { diff --git a/creusot/tests/should_succeed/cell/02.mlcfg b/creusot/tests/should_succeed/cell/02.mlcfg index 817b08adf8..24f566ce2a 100644 --- a/creusot/tests/should_succeed/cell/02.mlcfg +++ b/creusot/tests/should_succeed/cell/02.mlcfg @@ -226,7 +226,6 @@ module C02_FibMemo val fib_cell0 [#"../02.rs" 84 0 84 32] (v : Alloc_Vec_Vec_Type.t_vec (C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib)) (Alloc_Alloc_Global_Type.t_global)) : bool ensures { result = fib_cell0 v } - use prelude.Snapshot function fib0 [#"../02.rs" 32 0 32 25] (i : int) : int axiom fib0_def : forall i : int . fib0 i = ([#"../02.rs" 29 0 29 8] if i <= 0 then 0 @@ -249,26 +248,6 @@ module C02_FibMemo requires {[#"../02.rs" 24 16 24 20] inv2 self} requires {[#"../02.rs" 24 22 24 23] inv4 v} - use prelude.Snapshot - use int.Power - function lemma_fib_bound0 [#"../02.rs" 47 0 47 30] (i : int) : () - axiom lemma_fib_bound0_def : forall i : int . lemma_fib_bound0 i = ([#"../02.rs" 43 0 43 8] if i = 0 then - () - else - if i = 1 then () else let _ = lemma_fib_bound0 (i - 2) in lemma_fib_bound0 (i - 1) - ) - val lemma_fib_bound0 [#"../02.rs" 47 0 47 30] (i : int) : () - requires {[#"../02.rs" 44 11 44 17] 0 <= i} - ensures { result = lemma_fib_bound0 i } - - axiom lemma_fib_bound0_spec : forall i : int . ([#"../02.rs" 44 11 44 17] 0 <= i) -> ([#"../02.rs" 45 10 45 28] fib0 i <= Power.power 2 i) - use prelude.Snapshot - function lemma_max_int0 [#"../02.rs" 62 0 62 22] (_1 : ()) : () = - [#"../02.rs" 60 0 60 8] () - val lemma_max_int0 [#"../02.rs" 62 0 62 22] (_1 : ()) : () - ensures { result = lemma_max_int0 _1 } - - axiom lemma_max_int0_spec : forall _1 : () . [#"../02.rs" 61 10 61 49] Power.power 2 63 < UIntSize.to_int (18446744073709551615 : usize) val get0 [#"../02.rs" 18 4 18 26] (self : C02_Cell_Type.t_cell (Core_Option_Option_Type.t_option usize) (C02_Fib_Type.t_fib)) : Core_Option_Option_Type.t_option usize requires {[#"../02.rs" 18 16 18 20] inv2 self} ensures { [#"../02.rs" 17 4 17 42] inv3 (C02_Cell_Type.cell_ghost_inv self) result } @@ -312,8 +291,6 @@ module C02_FibMemo var fib_i : usize; var _15 : bool; var _17 : bool; - var _19 : Snapshot.snap_ty (); - var _21 : Snapshot.snap_ty (); var _23 : usize; var _25 : usize; var _27 : usize; @@ -339,7 +316,7 @@ module C02_FibMemo end } BB3 { - [#"../02.rs" 99 27 99 33] _15 <- ([#"../02.rs" 99 27 99 33] i = (0 : usize)); + [#"../02.rs" 99 27 99 33] _15 <- i = (0 : usize); switch (_15) | False -> goto BB8 | True -> goto BB7 @@ -353,47 +330,45 @@ module C02_FibMemo absurd } BB6 { - [#"../02.rs" 97 13 97 14] v <- ([#"../02.rs" 97 13 97 14] Core_Option_Option_Type.some_0 _7); - [#"../02.rs" 97 19 97 20] _0 <- ([#"../02.rs" 97 19 97 20] v); + [#"../02.rs" 97 13 97 14] v <- Core_Option_Option_Type.some_0 _7; + [#"../02.rs" 97 19 97 20] _0 <- v; goto BB19 } BB7 { - [#"../02.rs" 100 16 100 17] fib_i <- ([#"../02.rs" 100 16 100 17] (0 : usize)); + [#"../02.rs" 100 16 100 17] fib_i <- (0 : usize); goto BB16 } BB8 { - [#"../02.rs" 101 22 101 28] _17 <- ([#"../02.rs" 101 22 101 28] i = (1 : usize)); + [#"../02.rs" 101 22 101 28] _17 <- i = (1 : usize); switch (_17) | False -> goto BB10 | True -> goto BB9 end } BB9 { - [#"../02.rs" 102 16 102 17] fib_i <- ([#"../02.rs" 102 16 102 17] (1 : usize)); + [#"../02.rs" 102 16 102 17] fib_i <- (1 : usize); goto BB15 } BB10 { - [#"../02.rs" 104 16 104 43] _19 <- ([#"../02.rs" 104 16 104 43] Snapshot.new ()); goto BB11 } BB11 { - [#"../02.rs" 105 16 105 45] _21 <- ([#"../02.rs" 105 16 105 45] Snapshot.new ()); goto BB12 } BB12 { - [#"../02.rs" 106 30 106 35] _25 <- ([#"../02.rs" 106 30 106 35] i - (1 : usize)); + [#"../02.rs" 106 30 106 35] _25 <- i - (1 : usize); [#"../02.rs" 106 16 106 36] _23 <- ([#"../02.rs" 106 16 106 36] fib_memo mem _25); _25 <- any usize; goto BB13 } BB13 { - [#"../02.rs" 106 53 106 58] _29 <- ([#"../02.rs" 106 53 106 58] i - (2 : usize)); + [#"../02.rs" 106 53 106 58] _29 <- i - (2 : usize); [#"../02.rs" 106 39 106 59] _27 <- ([#"../02.rs" 106 39 106 59] fib_memo mem _29); _29 <- any usize; goto BB14 } BB14 { - [#"../02.rs" 106 16 106 59] fib_i <- ([#"../02.rs" 106 16 106 59] _23 + _27); + [#"../02.rs" 106 16 106 59] fib_i <- _23 + _27; _23 <- any usize; _27 <- any usize; goto BB15 @@ -407,13 +382,13 @@ module C02_FibMemo goto BB17 } BB17 { - [#"../02.rs" 109 23 109 34] _38 <- ([#"../02.rs" 109 23 109 34] Core_Option_Option_Type.C_Some fib_i); + [#"../02.rs" 109 23 109 34] _38 <- Core_Option_Option_Type.C_Some fib_i; [#"../02.rs" 109 12 109 35] _33 <- ([#"../02.rs" 109 12 109 35] set0 _35 _38); _38 <- any Core_Option_Option_Type.t_option usize; goto BB18 } BB18 { - [#"../02.rs" 110 12 110 17] _0 <- ([#"../02.rs" 110 12 110 17] fib_i); + [#"../02.rs" 110 12 110 17] _0 <- fib_i; goto BB19 } BB19 { diff --git a/creusot/tests/should_succeed/checked_ops.mlcfg b/creusot/tests/should_succeed/checked_ops.mlcfg index 9125f4b762..d802c511db 100644 --- a/creusot/tests/should_succeed/checked_ops.mlcfg +++ b/creusot/tests/should_succeed/checked_ops.mlcfg @@ -135,7 +135,7 @@ module CheckedOps_TestU8AddExample goto BB2 } BB2 { - [#"../checked_ops.rs" 6 12 6 46] _2 <- ([#"../checked_ops.rs" 6 12 6 46] _3 = (15 : uint8)); + [#"../checked_ops.rs" 6 12 6 46] _2 <- _3 = (15 : uint8); _3 <- any uint8; switch (_2) | False -> goto BB4 @@ -169,7 +169,7 @@ module CheckedOps_TestU8AddExample absurd } BB9 { - [#"../checked_ops.rs" 9 12 9 38] _12 <- ([#"../checked_ops.rs" 9 12 9 38] _13 = (15 : uint8)); + [#"../checked_ops.rs" 9 12 9 38] _12 <- _13 = (15 : uint8); _13 <- any uint8; switch (_12) | False -> goto BB11 @@ -185,7 +185,7 @@ module CheckedOps_TestU8AddExample absurd } BB12 { - [#"../checked_ops.rs" 10 12 10 39] _16 <- ([#"../checked_ops.rs" 10 12 10 39] _17 = (4 : uint8)); + [#"../checked_ops.rs" 10 12 10 39] _16 <- _17 = (4 : uint8); _17 <- any uint8; switch (_16) | False -> goto BB14 @@ -201,7 +201,7 @@ module CheckedOps_TestU8AddExample absurd } BB15 { - [#"../checked_ops.rs" 12 12 12 40] _20 <- ([#"../checked_ops.rs" 12 12 12 40] _21 = (15 : uint8)); + [#"../checked_ops.rs" 12 12 12 40] _20 <- _21 = (15 : uint8); _21 <- any uint8; switch (_20) | False -> goto BB17 @@ -217,7 +217,7 @@ module CheckedOps_TestU8AddExample absurd } BB18 { - [#"../checked_ops.rs" 13 12 13 43] _24 <- ([#"../checked_ops.rs" 13 12 13 43] _25 = (255 : uint8)); + [#"../checked_ops.rs" 13 12 13 43] _24 <- _25 = (255 : uint8); _25 <- any uint8; switch (_24) | False -> goto BB20 @@ -233,7 +233,7 @@ module CheckedOps_TestU8AddExample absurd } BB21 { - [#"../checked_ops.rs" 16 12 16 23] _29 <- ([#"../checked_ops.rs" 16 12 16 23] (let (a, _) = res in a) = (15 : uint8)); + [#"../checked_ops.rs" 16 12 16 23] _29 <- (let (a, _) = res in a) = (15 : uint8); switch (_29) | False -> goto BB25 | True -> goto BB22 @@ -241,7 +241,7 @@ module CheckedOps_TestU8AddExample } BB22 { assume { resolve0 res }; - [#"../checked_ops.rs" 16 27 16 41] _31 <- ([#"../checked_ops.rs" 16 27 16 41] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 16 27 16 41] _31 <- Bool.eqb (let (_, a) = res in a) false; switch (_31) | False -> goto BB24 | True -> goto BB23 @@ -263,7 +263,7 @@ module CheckedOps_TestU8AddExample absurd } BB27 { - [#"../checked_ops.rs" 18 12 18 22] _36 <- ([#"../checked_ops.rs" 18 12 18 22] (let (a, _) = res1 in a) = (4 : uint8)); + [#"../checked_ops.rs" 18 12 18 22] _36 <- (let (a, _) = res1 in a) = (4 : uint8); switch (_36) | False -> goto BB31 | True -> goto BB28 @@ -271,14 +271,14 @@ module CheckedOps_TestU8AddExample } BB28 { assume { resolve0 res1 }; - [#"../checked_ops.rs" 18 26 18 39] _38 <- ([#"../checked_ops.rs" 18 26 18 39] Bool.eqb (let (_, a) = res1 in a) true); + [#"../checked_ops.rs" 18 26 18 39] _38 <- Bool.eqb (let (_, a) = res1 in a) true; switch (_38) | False -> goto BB30 | True -> goto BB29 end } BB29 { - [#"../checked_ops.rs" 5 29 19 1] _0 <- ([#"../checked_ops.rs" 5 29 19 1] ()); + [#"../checked_ops.rs" 5 29 19 1] _0 <- (); return _0 } BB30 { @@ -405,8 +405,8 @@ module CheckedOps_TestU8AddOverflow absurd } BB5 { - [#"../checked_ops.rs" 25 37 25 42] _13 <- ([#"../checked_ops.rs" 25 37 25 42] a - (1 : uint8)); - [#"../checked_ops.rs" 25 12 25 42] _10 <- ([#"../checked_ops.rs" 25 12 25 42] _11 = _13); + [#"../checked_ops.rs" 25 37 25 42] _13 <- a - (1 : uint8); + [#"../checked_ops.rs" 25 12 25 42] _10 <- _11 = _13; _11 <- any uint8; _13 <- any uint8; switch (_10) @@ -423,7 +423,7 @@ module CheckedOps_TestU8AddOverflow absurd } BB8 { - [#"../checked_ops.rs" 26 12 26 42] _17 <- ([#"../checked_ops.rs" 26 12 26 42] _18 = (255 : uint8)); + [#"../checked_ops.rs" 26 12 26 42] _17 <- _18 = (255 : uint8); _18 <- any uint8; switch (_17) | False -> goto BB10 @@ -439,8 +439,8 @@ module CheckedOps_TestU8AddOverflow absurd } BB11 { - [#"../checked_ops.rs" 28 21 28 26] _26 <- ([#"../checked_ops.rs" 28 21 28 26] a - (1 : uint8)); - [#"../checked_ops.rs" 28 12 28 26] _24 <- ([#"../checked_ops.rs" 28 12 28 26] (let (a, _) = res in a) = _26); + [#"../checked_ops.rs" 28 21 28 26] _26 <- a - (1 : uint8); + [#"../checked_ops.rs" 28 12 28 26] _24 <- (let (a, _) = res in a) = _26; _26 <- any uint8; switch (_24) | False -> goto BB15 @@ -449,14 +449,14 @@ module CheckedOps_TestU8AddOverflow } BB12 { assume { resolve0 res }; - [#"../checked_ops.rs" 28 30 28 43] _28 <- ([#"../checked_ops.rs" 28 30 28 43] Bool.eqb (let (_, a) = res in a) true); + [#"../checked_ops.rs" 28 30 28 43] _28 <- Bool.eqb (let (_, a) = res in a) true; switch (_28) | False -> goto BB14 | True -> goto BB13 end } BB13 { - [#"../checked_ops.rs" 23 35 29 1] _0 <- ([#"../checked_ops.rs" 23 35 29 1] ()); + [#"../checked_ops.rs" 23 35 29 1] _0 <- (); return _0 } BB14 { @@ -600,7 +600,7 @@ module CheckedOps_TestU8OverflowingAdd goto BB2 } BB2 { - [#"../checked_ops.rs" 40 12 40 55] _4 <- ([#"../checked_ops.rs" 40 12 40 55] (let (a, _) = _6 in a) = _9); + [#"../checked_ops.rs" 40 12 40 55] _4 <- (let (a, _) = _6 in a) = _9; _9 <- any uint8; switch (_4) | False -> goto BB4 @@ -625,7 +625,7 @@ module CheckedOps_TestU8OverflowingAdd goto BB7 } BB7 { - [#"../checked_ops.rs" 41 12 41 64] _14 <- ([#"../checked_ops.rs" 41 12 41 64] Bool.eqb (let (_, a) = _16 in a) _19); + [#"../checked_ops.rs" 41 12 41 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19; _19 <- any bool; switch (_14) | False -> goto BB9 @@ -633,7 +633,7 @@ module CheckedOps_TestU8OverflowingAdd end } BB8 { - [#"../checked_ops.rs" 39 45 42 1] _0 <- ([#"../checked_ops.rs" 39 45 42 1] ()); + [#"../checked_ops.rs" 39 45 42 1] _0 <- (); return _0 } BB9 { @@ -790,7 +790,7 @@ module CheckedOps_TestU8SubExample goto BB6 } BB6 { - [#"../checked_ops.rs" 47 12 47 49] _7 <- ([#"../checked_ops.rs" 47 12 47 49] _8 = (240 : uint8)); + [#"../checked_ops.rs" 47 12 47 49] _7 <- _8 = (240 : uint8); _8 <- any uint8; switch (_7) | False -> goto BB8 @@ -806,7 +806,7 @@ module CheckedOps_TestU8SubExample absurd } BB9 { - [#"../checked_ops.rs" 49 12 49 39] _12 <- ([#"../checked_ops.rs" 49 12 49 39] _13 = (251 : uint8)); + [#"../checked_ops.rs" 49 12 49 39] _12 <- _13 = (251 : uint8); _13 <- any uint8; switch (_12) | False -> goto BB11 @@ -822,7 +822,7 @@ module CheckedOps_TestU8SubExample absurd } BB12 { - [#"../checked_ops.rs" 50 12 50 41] _16 <- ([#"../checked_ops.rs" 50 12 50 41] _17 = (240 : uint8)); + [#"../checked_ops.rs" 50 12 50 41] _16 <- _17 = (240 : uint8); _17 <- any uint8; switch (_16) | False -> goto BB14 @@ -838,7 +838,7 @@ module CheckedOps_TestU8SubExample absurd } BB15 { - [#"../checked_ops.rs" 52 12 52 39] _20 <- ([#"../checked_ops.rs" 52 12 52 39] _21 = (0 : uint8)); + [#"../checked_ops.rs" 52 12 52 39] _20 <- _21 = (0 : uint8); _21 <- any uint8; switch (_20) | False -> goto BB17 @@ -854,7 +854,7 @@ module CheckedOps_TestU8SubExample absurd } BB18 { - [#"../checked_ops.rs" 53 12 53 43] _24 <- ([#"../checked_ops.rs" 53 12 53 43] _25 = (240 : uint8)); + [#"../checked_ops.rs" 53 12 53 43] _24 <- _25 = (240 : uint8); _25 <- any uint8; switch (_24) | False -> goto BB20 @@ -870,7 +870,7 @@ module CheckedOps_TestU8SubExample absurd } BB21 { - [#"../checked_ops.rs" 56 12 56 24] _29 <- ([#"../checked_ops.rs" 56 12 56 24] (let (a, _) = res in a) = (251 : uint8)); + [#"../checked_ops.rs" 56 12 56 24] _29 <- (let (a, _) = res in a) = (251 : uint8); switch (_29) | False -> goto BB25 | True -> goto BB22 @@ -878,7 +878,7 @@ module CheckedOps_TestU8SubExample } BB22 { assume { resolve0 res }; - [#"../checked_ops.rs" 56 28 56 41] _31 <- ([#"../checked_ops.rs" 56 28 56 41] Bool.eqb (let (_, a) = res in a) true); + [#"../checked_ops.rs" 56 28 56 41] _31 <- Bool.eqb (let (_, a) = res in a) true; switch (_31) | False -> goto BB24 | True -> goto BB23 @@ -900,7 +900,7 @@ module CheckedOps_TestU8SubExample absurd } BB27 { - [#"../checked_ops.rs" 58 12 58 24] _36 <- ([#"../checked_ops.rs" 58 12 58 24] (let (a, _) = res1 in a) = (240 : uint8)); + [#"../checked_ops.rs" 58 12 58 24] _36 <- (let (a, _) = res1 in a) = (240 : uint8); switch (_36) | False -> goto BB31 | True -> goto BB28 @@ -908,14 +908,14 @@ module CheckedOps_TestU8SubExample } BB28 { assume { resolve0 res1 }; - [#"../checked_ops.rs" 58 28 58 42] _38 <- ([#"../checked_ops.rs" 58 28 58 42] Bool.eqb (let (_, a) = res1 in a) false); + [#"../checked_ops.rs" 58 28 58 42] _38 <- Bool.eqb (let (_, a) = res1 in a) false; switch (_38) | False -> goto BB30 | True -> goto BB29 end } BB29 { - [#"../checked_ops.rs" 45 29 59 1] _0 <- ([#"../checked_ops.rs" 45 29 59 1] ()); + [#"../checked_ops.rs" 45 29 59 1] _0 <- (); return _0 } BB30 { @@ -1044,10 +1044,10 @@ module CheckedOps_TestU8SubOverflow absurd } BB5 { - [#"../checked_ops.rs" 65 35 65 42] _14 <- ([#"../checked_ops.rs" 65 35 65 42] (255 : uint8) - a); - [#"../checked_ops.rs" 65 35 65 46] _13 <- ([#"../checked_ops.rs" 65 35 65 46] _14 + (1 : uint8)); + [#"../checked_ops.rs" 65 35 65 42] _14 <- (255 : uint8) - a; + [#"../checked_ops.rs" 65 35 65 46] _13 <- _14 + (1 : uint8); _14 <- any uint8; - [#"../checked_ops.rs" 65 12 65 46] _10 <- ([#"../checked_ops.rs" 65 12 65 46] _11 = _13); + [#"../checked_ops.rs" 65 12 65 46] _10 <- _11 = _13; _11 <- any uint8; _13 <- any uint8; switch (_10) @@ -1064,7 +1064,7 @@ module CheckedOps_TestU8SubOverflow absurd } BB8 { - [#"../checked_ops.rs" 66 12 66 38] _18 <- ([#"../checked_ops.rs" 66 12 66 38] _19 = (0 : uint8)); + [#"../checked_ops.rs" 66 12 66 38] _18 <- _19 = (0 : uint8); _19 <- any uint8; switch (_18) | False -> goto BB10 @@ -1080,10 +1080,10 @@ module CheckedOps_TestU8SubOverflow absurd } BB11 { - [#"../checked_ops.rs" 68 21 68 28] _28 <- ([#"../checked_ops.rs" 68 21 68 28] (255 : uint8) - a); - [#"../checked_ops.rs" 68 21 68 32] _27 <- ([#"../checked_ops.rs" 68 21 68 32] _28 + (1 : uint8)); + [#"../checked_ops.rs" 68 21 68 28] _28 <- (255 : uint8) - a; + [#"../checked_ops.rs" 68 21 68 32] _27 <- _28 + (1 : uint8); _28 <- any uint8; - [#"../checked_ops.rs" 68 12 68 32] _25 <- ([#"../checked_ops.rs" 68 12 68 32] (let (a, _) = res in a) = _27); + [#"../checked_ops.rs" 68 12 68 32] _25 <- (let (a, _) = res in a) = _27; _27 <- any uint8; switch (_25) | False -> goto BB15 @@ -1092,14 +1092,14 @@ module CheckedOps_TestU8SubOverflow } BB12 { assume { resolve0 res }; - [#"../checked_ops.rs" 68 36 68 49] _30 <- ([#"../checked_ops.rs" 68 36 68 49] Bool.eqb (let (_, a) = res in a) true); + [#"../checked_ops.rs" 68 36 68 49] _30 <- Bool.eqb (let (_, a) = res in a) true; switch (_30) | False -> goto BB14 | True -> goto BB13 end } BB13 { - [#"../checked_ops.rs" 63 35 69 1] _0 <- ([#"../checked_ops.rs" 63 35 69 1] ()); + [#"../checked_ops.rs" 63 35 69 1] _0 <- (); return _0 } BB14 { @@ -1243,7 +1243,7 @@ module CheckedOps_TestU8OverflowingSub goto BB2 } BB2 { - [#"../checked_ops.rs" 80 12 80 55] _4 <- ([#"../checked_ops.rs" 80 12 80 55] (let (a, _) = _6 in a) = _9); + [#"../checked_ops.rs" 80 12 80 55] _4 <- (let (a, _) = _6 in a) = _9; _9 <- any uint8; switch (_4) | False -> goto BB4 @@ -1268,7 +1268,7 @@ module CheckedOps_TestU8OverflowingSub goto BB7 } BB7 { - [#"../checked_ops.rs" 81 12 81 64] _14 <- ([#"../checked_ops.rs" 81 12 81 64] Bool.eqb (let (_, a) = _16 in a) _19); + [#"../checked_ops.rs" 81 12 81 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19; _19 <- any bool; switch (_14) | False -> goto BB9 @@ -1276,7 +1276,7 @@ module CheckedOps_TestU8OverflowingSub end } BB8 { - [#"../checked_ops.rs" 79 45 82 1] _0 <- ([#"../checked_ops.rs" 79 45 82 1] ()); + [#"../checked_ops.rs" 79 45 82 1] _0 <- (); return _0 } BB9 { @@ -1415,7 +1415,7 @@ module CheckedOps_TestU8MulExample goto BB2 } BB2 { - [#"../checked_ops.rs" 86 12 86 46] _2 <- ([#"../checked_ops.rs" 86 12 86 46] _3 = (50 : uint8)); + [#"../checked_ops.rs" 86 12 86 46] _2 <- _3 = (50 : uint8); _3 <- any uint8; switch (_2) | False -> goto BB4 @@ -1449,7 +1449,7 @@ module CheckedOps_TestU8MulExample absurd } BB9 { - [#"../checked_ops.rs" 89 12 89 38] _12 <- ([#"../checked_ops.rs" 89 12 89 38] _13 = (50 : uint8)); + [#"../checked_ops.rs" 89 12 89 38] _12 <- _13 = (50 : uint8); _13 <- any uint8; switch (_12) | False -> goto BB11 @@ -1465,7 +1465,7 @@ module CheckedOps_TestU8MulExample absurd } BB12 { - [#"../checked_ops.rs" 90 12 90 40] _16 <- ([#"../checked_ops.rs" 90 12 90 40] _17 = (244 : uint8)); + [#"../checked_ops.rs" 90 12 90 40] _16 <- _17 = (244 : uint8); _17 <- any uint8; switch (_16) | False -> goto BB14 @@ -1481,7 +1481,7 @@ module CheckedOps_TestU8MulExample absurd } BB15 { - [#"../checked_ops.rs" 92 12 92 40] _20 <- ([#"../checked_ops.rs" 92 12 92 40] _21 = (50 : uint8)); + [#"../checked_ops.rs" 92 12 92 40] _20 <- _21 = (50 : uint8); _21 <- any uint8; switch (_20) | False -> goto BB17 @@ -1497,7 +1497,7 @@ module CheckedOps_TestU8MulExample absurd } BB18 { - [#"../checked_ops.rs" 93 12 93 42] _24 <- ([#"../checked_ops.rs" 93 12 93 42] _25 = (255 : uint8)); + [#"../checked_ops.rs" 93 12 93 42] _24 <- _25 = (255 : uint8); _25 <- any uint8; switch (_24) | False -> goto BB20 @@ -1513,7 +1513,7 @@ module CheckedOps_TestU8MulExample absurd } BB21 { - [#"../checked_ops.rs" 96 12 96 23] _29 <- ([#"../checked_ops.rs" 96 12 96 23] (let (a, _) = res in a) = (50 : uint8)); + [#"../checked_ops.rs" 96 12 96 23] _29 <- (let (a, _) = res in a) = (50 : uint8); switch (_29) | False -> goto BB25 | True -> goto BB22 @@ -1521,7 +1521,7 @@ module CheckedOps_TestU8MulExample } BB22 { assume { resolve0 res }; - [#"../checked_ops.rs" 96 27 96 41] _31 <- ([#"../checked_ops.rs" 96 27 96 41] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 96 27 96 41] _31 <- Bool.eqb (let (_, a) = res in a) false; switch (_31) | False -> goto BB24 | True -> goto BB23 @@ -1543,7 +1543,7 @@ module CheckedOps_TestU8MulExample absurd } BB27 { - [#"../checked_ops.rs" 98 12 98 24] _36 <- ([#"../checked_ops.rs" 98 12 98 24] (let (a, _) = res1 in a) = (244 : uint8)); + [#"../checked_ops.rs" 98 12 98 24] _36 <- (let (a, _) = res1 in a) = (244 : uint8); switch (_36) | False -> goto BB31 | True -> goto BB28 @@ -1551,14 +1551,14 @@ module CheckedOps_TestU8MulExample } BB28 { assume { resolve0 res1 }; - [#"../checked_ops.rs" 98 28 98 41] _38 <- ([#"../checked_ops.rs" 98 28 98 41] Bool.eqb (let (_, a) = res1 in a) true); + [#"../checked_ops.rs" 98 28 98 41] _38 <- Bool.eqb (let (_, a) = res1 in a) true; switch (_38) | False -> goto BB30 | True -> goto BB29 end } BB29 { - [#"../checked_ops.rs" 85 29 99 1] _0 <- ([#"../checked_ops.rs" 85 29 99 1] ()); + [#"../checked_ops.rs" 85 29 99 1] _0 <- (); return _0 } BB30 { @@ -1681,7 +1681,7 @@ module CheckedOps_TestU8MulZero goto BB2 } BB2 { - [#"../checked_ops.rs" 103 12 103 44] _3 <- ([#"../checked_ops.rs" 103 12 103 44] _4 = (0 : uint8)); + [#"../checked_ops.rs" 103 12 103 44] _3 <- _4 = (0 : uint8); _4 <- any uint8; switch (_3) | False -> goto BB4 @@ -1697,7 +1697,7 @@ module CheckedOps_TestU8MulZero absurd } BB5 { - [#"../checked_ops.rs" 104 12 104 36] _9 <- ([#"../checked_ops.rs" 104 12 104 36] _10 = (0 : uint8)); + [#"../checked_ops.rs" 104 12 104 36] _9 <- _10 = (0 : uint8); _10 <- any uint8; switch (_9) | False -> goto BB7 @@ -1713,7 +1713,7 @@ module CheckedOps_TestU8MulZero absurd } BB8 { - [#"../checked_ops.rs" 105 12 105 38] _14 <- ([#"../checked_ops.rs" 105 12 105 38] _15 = (0 : uint8)); + [#"../checked_ops.rs" 105 12 105 38] _14 <- _15 = (0 : uint8); _15 <- any uint8; switch (_14) | False -> goto BB10 @@ -1729,7 +1729,7 @@ module CheckedOps_TestU8MulZero absurd } BB11 { - [#"../checked_ops.rs" 107 12 107 22] _21 <- ([#"../checked_ops.rs" 107 12 107 22] (let (a, _) = res in a) = (0 : uint8)); + [#"../checked_ops.rs" 107 12 107 22] _21 <- (let (a, _) = res in a) = (0 : uint8); switch (_21) | False -> goto BB15 | True -> goto BB12 @@ -1737,14 +1737,14 @@ module CheckedOps_TestU8MulZero } BB12 { assume { resolve0 res }; - [#"../checked_ops.rs" 107 26 107 40] _23 <- ([#"../checked_ops.rs" 107 26 107 40] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 107 26 107 40] _23 <- Bool.eqb (let (_, a) = res in a) false; switch (_23) | False -> goto BB14 | True -> goto BB13 end } BB13 { - [#"../checked_ops.rs" 102 31 108 1] _0 <- ([#"../checked_ops.rs" 102 31 108 1] ()); + [#"../checked_ops.rs" 102 31 108 1] _0 <- (); return _0 } BB14 { @@ -1849,7 +1849,7 @@ module CheckedOps_TestU8OverflowingMul goto BB2 } BB2 { - [#"../checked_ops.rs" 112 12 112 55] _4 <- ([#"../checked_ops.rs" 112 12 112 55] (let (a, _) = _6 in a) = _9); + [#"../checked_ops.rs" 112 12 112 55] _4 <- (let (a, _) = _6 in a) = _9; _9 <- any uint8; switch (_4) | False -> goto BB4 @@ -1874,7 +1874,7 @@ module CheckedOps_TestU8OverflowingMul goto BB7 } BB7 { - [#"../checked_ops.rs" 113 12 113 64] _14 <- ([#"../checked_ops.rs" 113 12 113 64] Bool.eqb (let (_, a) = _16 in a) _19); + [#"../checked_ops.rs" 113 12 113 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19; _19 <- any bool; switch (_14) | False -> goto BB9 @@ -1882,7 +1882,7 @@ module CheckedOps_TestU8OverflowingMul end } BB8 { - [#"../checked_ops.rs" 111 45 114 1] _0 <- ([#"../checked_ops.rs" 111 45 114 1] ()); + [#"../checked_ops.rs" 111 45 114 1] _0 <- (); return _0 } BB9 { @@ -2022,7 +2022,7 @@ module CheckedOps_TestU8DivExample goto BB6 } BB6 { - [#"../checked_ops.rs" 119 12 119 44] _7 <- ([#"../checked_ops.rs" 119 12 119 44] _8 = (2 : uint8)); + [#"../checked_ops.rs" 119 12 119 44] _7 <- _8 = (2 : uint8); _8 <- any uint8; switch (_7) | False -> goto BB8 @@ -2038,7 +2038,7 @@ module CheckedOps_TestU8DivExample absurd } BB9 { - [#"../checked_ops.rs" 120 12 120 36] _12 <- ([#"../checked_ops.rs" 120 12 120 36] _13 = (2 : uint8)); + [#"../checked_ops.rs" 120 12 120 36] _12 <- _13 = (2 : uint8); _13 <- any uint8; switch (_12) | False -> goto BB11 @@ -2054,7 +2054,7 @@ module CheckedOps_TestU8DivExample absurd } BB12 { - [#"../checked_ops.rs" 121 12 121 38] _16 <- ([#"../checked_ops.rs" 121 12 121 38] _17 = (2 : uint8)); + [#"../checked_ops.rs" 121 12 121 38] _16 <- _17 = (2 : uint8); _17 <- any uint8; switch (_16) | False -> goto BB14 @@ -2070,7 +2070,7 @@ module CheckedOps_TestU8DivExample absurd } BB15 { - [#"../checked_ops.rs" 123 12 123 22] _21 <- ([#"../checked_ops.rs" 123 12 123 22] (let (a, _) = res in a) = (2 : uint8)); + [#"../checked_ops.rs" 123 12 123 22] _21 <- (let (a, _) = res in a) = (2 : uint8); switch (_21) | False -> goto BB19 | True -> goto BB16 @@ -2078,14 +2078,14 @@ module CheckedOps_TestU8DivExample } BB16 { assume { resolve0 res }; - [#"../checked_ops.rs" 123 26 123 40] _23 <- ([#"../checked_ops.rs" 123 26 123 40] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 123 26 123 40] _23 <- Bool.eqb (let (_, a) = res in a) false; switch (_23) | False -> goto BB18 | True -> goto BB17 end } BB17 { - [#"../checked_ops.rs" 117 29 124 1] _0 <- ([#"../checked_ops.rs" 117 29 124 1] ()); + [#"../checked_ops.rs" 117 29 124 1] _0 <- (); return _0 } BB18 { @@ -2212,15 +2212,15 @@ module CheckedOps_TestU8DivNoOverflow goto BB2 } BB2 { - [#"../checked_ops.rs" 129 45 129 46] _12 <- ([#"../checked_ops.rs" 129 45 129 46] b); - [#"../checked_ops.rs" 129 41 129 46] _13 <- ([#"../checked_ops.rs" 129 41 129 46] _12 = (0 : uint8)); + [#"../checked_ops.rs" 129 45 129 46] _12 <- b; + [#"../checked_ops.rs" 129 41 129 46] _13 <- _12 = (0 : uint8); assert { [@expl:division by zero] [#"../checked_ops.rs" 129 41 129 46] not _13 }; goto BB3 } BB3 { - [#"../checked_ops.rs" 129 41 129 46] _10 <- ([#"../checked_ops.rs" 129 41 129 46] a / _12); + [#"../checked_ops.rs" 129 41 129 46] _10 <- a / _12; _12 <- any uint8; - [#"../checked_ops.rs" 129 12 129 46] _5 <- ([#"../checked_ops.rs" 129 12 129 46] _6 = _10); + [#"../checked_ops.rs" 129 12 129 46] _5 <- _6 = _10; _6 <- any uint8; _10 <- any uint8; switch (_5) @@ -2237,15 +2237,15 @@ module CheckedOps_TestU8DivNoOverflow absurd } BB6 { - [#"../checked_ops.rs" 130 37 130 38] _22 <- ([#"../checked_ops.rs" 130 37 130 38] b); - [#"../checked_ops.rs" 130 33 130 38] _23 <- ([#"../checked_ops.rs" 130 33 130 38] _22 = (0 : uint8)); + [#"../checked_ops.rs" 130 37 130 38] _22 <- b; + [#"../checked_ops.rs" 130 33 130 38] _23 <- _22 = (0 : uint8); assert { [@expl:division by zero] [#"../checked_ops.rs" 130 33 130 38] not _23 }; goto BB7 } BB7 { - [#"../checked_ops.rs" 130 33 130 38] _20 <- ([#"../checked_ops.rs" 130 33 130 38] a / _22); + [#"../checked_ops.rs" 130 33 130 38] _20 <- a / _22; _22 <- any uint8; - [#"../checked_ops.rs" 130 12 130 38] _16 <- ([#"../checked_ops.rs" 130 12 130 38] _17 = _20); + [#"../checked_ops.rs" 130 12 130 38] _16 <- _17 = _20; _17 <- any uint8; _20 <- any uint8; switch (_16) @@ -2262,15 +2262,15 @@ module CheckedOps_TestU8DivNoOverflow absurd } BB10 { - [#"../checked_ops.rs" 131 39 131 40] _32 <- ([#"../checked_ops.rs" 131 39 131 40] b); - [#"../checked_ops.rs" 131 35 131 40] _33 <- ([#"../checked_ops.rs" 131 35 131 40] _32 = (0 : uint8)); + [#"../checked_ops.rs" 131 39 131 40] _32 <- b; + [#"../checked_ops.rs" 131 35 131 40] _33 <- _32 = (0 : uint8); assert { [@expl:division by zero] [#"../checked_ops.rs" 131 35 131 40] not _33 }; goto BB11 } BB11 { - [#"../checked_ops.rs" 131 35 131 40] _30 <- ([#"../checked_ops.rs" 131 35 131 40] a / _32); + [#"../checked_ops.rs" 131 35 131 40] _30 <- a / _32; _32 <- any uint8; - [#"../checked_ops.rs" 131 12 131 40] _26 <- ([#"../checked_ops.rs" 131 12 131 40] _27 = _30); + [#"../checked_ops.rs" 131 12 131 40] _26 <- _27 = _30; _27 <- any uint8; _30 <- any uint8; switch (_26) @@ -2287,15 +2287,15 @@ module CheckedOps_TestU8DivNoOverflow absurd } BB14 { - [#"../checked_ops.rs" 133 25 133 26] _43 <- ([#"../checked_ops.rs" 133 25 133 26] b); - [#"../checked_ops.rs" 133 21 133 26] _44 <- ([#"../checked_ops.rs" 133 21 133 26] _43 = (0 : uint8)); + [#"../checked_ops.rs" 133 25 133 26] _43 <- b; + [#"../checked_ops.rs" 133 21 133 26] _44 <- _43 = (0 : uint8); assert { [@expl:division by zero] [#"../checked_ops.rs" 133 21 133 26] not _44 }; goto BB15 } BB15 { - [#"../checked_ops.rs" 133 21 133 26] _41 <- ([#"../checked_ops.rs" 133 21 133 26] a / _43); + [#"../checked_ops.rs" 133 21 133 26] _41 <- a / _43; _43 <- any uint8; - [#"../checked_ops.rs" 133 12 133 26] _39 <- ([#"../checked_ops.rs" 133 12 133 26] (let (a, _) = res in a) = _41); + [#"../checked_ops.rs" 133 12 133 26] _39 <- (let (a, _) = res in a) = _41; _41 <- any uint8; switch (_39) | False -> goto BB19 @@ -2304,14 +2304,14 @@ module CheckedOps_TestU8DivNoOverflow } BB16 { assume { resolve0 res }; - [#"../checked_ops.rs" 133 30 133 44] _45 <- ([#"../checked_ops.rs" 133 30 133 44] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 133 30 133 44] _45 <- Bool.eqb (let (_, a) = res in a) false; switch (_45) | False -> goto BB18 | True -> goto BB17 end } BB17 { - [#"../checked_ops.rs" 128 45 134 1] _0 <- ([#"../checked_ops.rs" 128 45 134 1] ()); + [#"../checked_ops.rs" 128 45 134 1] _0 <- (); return _0 } BB18 { @@ -2378,7 +2378,7 @@ module CheckedOps_TestU8DivZero end } BB3 { - [#"../checked_ops.rs" 137 31 139 1] _0 <- ([#"../checked_ops.rs" 137 31 139 1] ()); + [#"../checked_ops.rs" 137 31 139 1] _0 <- (); return _0 } BB4 { @@ -2526,7 +2526,7 @@ module CheckedOps_TestI8AddExample goto BB2 } BB2 { - [#"../checked_ops.rs" 143 12 143 46] _2 <- ([#"../checked_ops.rs" 143 12 143 46] _3 = (15 : int8)); + [#"../checked_ops.rs" 143 12 143 46] _2 <- _3 = (15 : int8); _3 <- any int8; switch (_2) | False -> goto BB4 @@ -2578,7 +2578,7 @@ module CheckedOps_TestI8AddExample absurd } BB13 { - [#"../checked_ops.rs" 147 12 147 38] _17 <- ([#"../checked_ops.rs" 147 12 147 38] _18 = (15 : int8)); + [#"../checked_ops.rs" 147 12 147 38] _17 <- _18 = (15 : int8); _18 <- any int8; switch (_17) | False -> goto BB15 @@ -2594,7 +2594,7 @@ module CheckedOps_TestI8AddExample absurd } BB16 { - [#"../checked_ops.rs" 148 12 148 42] _21 <- ([#"../checked_ops.rs" 148 12 148 42] _22 = (-126 : int8)); + [#"../checked_ops.rs" 148 12 148 42] _21 <- _22 = (-126 : int8); _22 <- any int8; switch (_21) | False -> goto BB18 @@ -2610,7 +2610,7 @@ module CheckedOps_TestI8AddExample absurd } BB19 { - [#"../checked_ops.rs" 149 12 149 45] _25 <- ([#"../checked_ops.rs" 149 12 149 45] _26 = (126 : int8)); + [#"../checked_ops.rs" 149 12 149 45] _25 <- _26 = (126 : int8); _26 <- any int8; switch (_25) | False -> goto BB21 @@ -2626,7 +2626,7 @@ module CheckedOps_TestI8AddExample absurd } BB22 { - [#"../checked_ops.rs" 151 12 151 40] _29 <- ([#"../checked_ops.rs" 151 12 151 40] _30 = (15 : int8)); + [#"../checked_ops.rs" 151 12 151 40] _29 <- _30 = (15 : int8); _30 <- any int8; switch (_29) | False -> goto BB24 @@ -2642,7 +2642,7 @@ module CheckedOps_TestI8AddExample absurd } BB25 { - [#"../checked_ops.rs" 152 12 152 43] _33 <- ([#"../checked_ops.rs" 152 12 152 43] _34 = (127 : int8)); + [#"../checked_ops.rs" 152 12 152 43] _33 <- _34 = (127 : int8); _34 <- any int8; switch (_33) | False -> goto BB27 @@ -2658,7 +2658,7 @@ module CheckedOps_TestI8AddExample absurd } BB28 { - [#"../checked_ops.rs" 153 12 153 48] _37 <- ([#"../checked_ops.rs" 153 12 153 48] _38 = (-128 : int8)); + [#"../checked_ops.rs" 153 12 153 48] _37 <- _38 = (-128 : int8); _38 <- any int8; switch (_37) | False -> goto BB30 @@ -2674,7 +2674,7 @@ module CheckedOps_TestI8AddExample absurd } BB31 { - [#"../checked_ops.rs" 156 12 156 23] _42 <- ([#"../checked_ops.rs" 156 12 156 23] (let (a, _) = res in a) = (15 : int8)); + [#"../checked_ops.rs" 156 12 156 23] _42 <- (let (a, _) = res in a) = (15 : int8); switch (_42) | False -> goto BB35 | True -> goto BB32 @@ -2682,7 +2682,7 @@ module CheckedOps_TestI8AddExample } BB32 { assume { resolve0 res }; - [#"../checked_ops.rs" 156 27 156 41] _44 <- ([#"../checked_ops.rs" 156 27 156 41] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 156 27 156 41] _44 <- Bool.eqb (let (_, a) = res in a) false; switch (_44) | False -> goto BB34 | True -> goto BB33 @@ -2704,7 +2704,7 @@ module CheckedOps_TestI8AddExample absurd } BB37 { - [#"../checked_ops.rs" 158 12 158 25] _49 <- ([#"../checked_ops.rs" 158 12 158 25] (let (a, _) = res1 in a) = (-126 : int8)); + [#"../checked_ops.rs" 158 12 158 25] _49 <- (let (a, _) = res1 in a) = (-126 : int8); switch (_49) | False -> goto BB41 | True -> goto BB38 @@ -2712,7 +2712,7 @@ module CheckedOps_TestI8AddExample } BB38 { assume { resolve0 res1 }; - [#"../checked_ops.rs" 158 29 158 42] _51 <- ([#"../checked_ops.rs" 158 29 158 42] Bool.eqb (let (_, a) = res1 in a) true); + [#"../checked_ops.rs" 158 29 158 42] _51 <- Bool.eqb (let (_, a) = res1 in a) true; switch (_51) | False -> goto BB40 | True -> goto BB39 @@ -2734,7 +2734,7 @@ module CheckedOps_TestI8AddExample absurd } BB43 { - [#"../checked_ops.rs" 160 12 160 24] _56 <- ([#"../checked_ops.rs" 160 12 160 24] (let (a, _) = res2 in a) = (126 : int8)); + [#"../checked_ops.rs" 160 12 160 24] _56 <- (let (a, _) = res2 in a) = (126 : int8); switch (_56) | False -> goto BB47 | True -> goto BB44 @@ -2742,14 +2742,14 @@ module CheckedOps_TestI8AddExample } BB44 { assume { resolve0 res2 }; - [#"../checked_ops.rs" 160 28 160 41] _58 <- ([#"../checked_ops.rs" 160 28 160 41] Bool.eqb (let (_, a) = res2 in a) true); + [#"../checked_ops.rs" 160 28 160 41] _58 <- Bool.eqb (let (_, a) = res2 in a) true; switch (_58) | False -> goto BB46 | True -> goto BB45 end } BB45 { - [#"../checked_ops.rs" 142 29 161 1] _0 <- ([#"../checked_ops.rs" 142 29 161 1] ()); + [#"../checked_ops.rs" 142 29 161 1] _0 <- (); return _0 } BB46 { @@ -2878,10 +2878,10 @@ module CheckedOps_TestI8AddOverflowPos absurd } BB5 { - [#"../checked_ops.rs" 167 37 167 44] _14 <- ([#"../checked_ops.rs" 167 37 167 44] a - (127 : int8)); - [#"../checked_ops.rs" 167 37 167 48] _13 <- ([#"../checked_ops.rs" 167 37 167 48] _14 - (2 : int8)); + [#"../checked_ops.rs" 167 37 167 44] _14 <- a - (127 : int8); + [#"../checked_ops.rs" 167 37 167 48] _13 <- _14 - (2 : int8); _14 <- any int8; - [#"../checked_ops.rs" 167 12 167 48] _10 <- ([#"../checked_ops.rs" 167 12 167 48] _11 = _13); + [#"../checked_ops.rs" 167 12 167 48] _10 <- _11 = _13; _11 <- any int8; _13 <- any int8; switch (_10) @@ -2898,7 +2898,7 @@ module CheckedOps_TestI8AddOverflowPos absurd } BB8 { - [#"../checked_ops.rs" 168 12 168 42] _18 <- ([#"../checked_ops.rs" 168 12 168 42] _19 = (127 : int8)); + [#"../checked_ops.rs" 168 12 168 42] _18 <- _19 = (127 : int8); _19 <- any int8; switch (_18) | False -> goto BB10 @@ -2914,10 +2914,10 @@ module CheckedOps_TestI8AddOverflowPos absurd } BB11 { - [#"../checked_ops.rs" 170 21 170 28] _28 <- ([#"../checked_ops.rs" 170 21 170 28] a - (127 : int8)); - [#"../checked_ops.rs" 170 21 170 32] _27 <- ([#"../checked_ops.rs" 170 21 170 32] _28 - (2 : int8)); + [#"../checked_ops.rs" 170 21 170 28] _28 <- a - (127 : int8); + [#"../checked_ops.rs" 170 21 170 32] _27 <- _28 - (2 : int8); _28 <- any int8; - [#"../checked_ops.rs" 170 12 170 32] _25 <- ([#"../checked_ops.rs" 170 12 170 32] (let (a, _) = res in a) = _27); + [#"../checked_ops.rs" 170 12 170 32] _25 <- (let (a, _) = res in a) = _27; _27 <- any int8; switch (_25) | False -> goto BB15 @@ -2926,14 +2926,14 @@ module CheckedOps_TestI8AddOverflowPos } BB12 { assume { resolve0 res }; - [#"../checked_ops.rs" 170 36 170 49] _30 <- ([#"../checked_ops.rs" 170 36 170 49] Bool.eqb (let (_, a) = res in a) true); + [#"../checked_ops.rs" 170 36 170 49] _30 <- Bool.eqb (let (_, a) = res in a) true; switch (_30) | False -> goto BB14 | True -> goto BB13 end } BB13 { - [#"../checked_ops.rs" 165 39 171 1] _0 <- ([#"../checked_ops.rs" 165 39 171 1] ()); + [#"../checked_ops.rs" 165 39 171 1] _0 <- (); return _0 } BB14 { @@ -3062,10 +3062,10 @@ module CheckedOps_TestI8AddOverflowNeg absurd } BB5 { - [#"../checked_ops.rs" 177 40 177 47] _14 <- ([#"../checked_ops.rs" 177 40 177 47] a + (127 : int8)); - [#"../checked_ops.rs" 177 40 177 51] _13 <- ([#"../checked_ops.rs" 177 40 177 51] _14 + (1 : int8)); + [#"../checked_ops.rs" 177 40 177 47] _14 <- a + (127 : int8); + [#"../checked_ops.rs" 177 40 177 51] _13 <- _14 + (1 : int8); _14 <- any int8; - [#"../checked_ops.rs" 177 12 177 51] _10 <- ([#"../checked_ops.rs" 177 12 177 51] _11 = _13); + [#"../checked_ops.rs" 177 12 177 51] _10 <- _11 = _13; _11 <- any int8; _13 <- any int8; switch (_10) @@ -3082,7 +3082,7 @@ module CheckedOps_TestI8AddOverflowNeg absurd } BB8 { - [#"../checked_ops.rs" 178 12 178 46] _18 <- ([#"../checked_ops.rs" 178 12 178 46] _19 = (-128 : int8)); + [#"../checked_ops.rs" 178 12 178 46] _18 <- _19 = (-128 : int8); _19 <- any int8; switch (_18) | False -> goto BB10 @@ -3098,10 +3098,10 @@ module CheckedOps_TestI8AddOverflowNeg absurd } BB11 { - [#"../checked_ops.rs" 180 21 180 28] _28 <- ([#"../checked_ops.rs" 180 21 180 28] a + (127 : int8)); - [#"../checked_ops.rs" 180 21 180 32] _27 <- ([#"../checked_ops.rs" 180 21 180 32] _28 + (1 : int8)); + [#"../checked_ops.rs" 180 21 180 28] _28 <- a + (127 : int8); + [#"../checked_ops.rs" 180 21 180 32] _27 <- _28 + (1 : int8); _28 <- any int8; - [#"../checked_ops.rs" 180 12 180 32] _25 <- ([#"../checked_ops.rs" 180 12 180 32] (let (a, _) = res in a) = _27); + [#"../checked_ops.rs" 180 12 180 32] _25 <- (let (a, _) = res in a) = _27; _27 <- any int8; switch (_25) | False -> goto BB15 @@ -3110,14 +3110,14 @@ module CheckedOps_TestI8AddOverflowNeg } BB12 { assume { resolve0 res }; - [#"../checked_ops.rs" 180 36 180 49] _30 <- ([#"../checked_ops.rs" 180 36 180 49] Bool.eqb (let (_, a) = res in a) true); + [#"../checked_ops.rs" 180 36 180 49] _30 <- Bool.eqb (let (_, a) = res in a) true; switch (_30) | False -> goto BB14 | True -> goto BB13 end } BB13 { - [#"../checked_ops.rs" 175 39 181 1] _0 <- ([#"../checked_ops.rs" 175 39 181 1] ()); + [#"../checked_ops.rs" 175 39 181 1] _0 <- (); return _0 } BB14 { @@ -3261,7 +3261,7 @@ module CheckedOps_TestI8OverflowingAdd goto BB2 } BB2 { - [#"../checked_ops.rs" 192 12 192 55] _4 <- ([#"../checked_ops.rs" 192 12 192 55] (let (a, _) = _6 in a) = _9); + [#"../checked_ops.rs" 192 12 192 55] _4 <- (let (a, _) = _6 in a) = _9; _9 <- any int8; switch (_4) | False -> goto BB4 @@ -3286,7 +3286,7 @@ module CheckedOps_TestI8OverflowingAdd goto BB7 } BB7 { - [#"../checked_ops.rs" 193 12 193 64] _14 <- ([#"../checked_ops.rs" 193 12 193 64] Bool.eqb (let (_, a) = _16 in a) _19); + [#"../checked_ops.rs" 193 12 193 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19; _19 <- any bool; switch (_14) | False -> goto BB9 @@ -3294,7 +3294,7 @@ module CheckedOps_TestI8OverflowingAdd end } BB8 { - [#"../checked_ops.rs" 191 45 194 1] _0 <- ([#"../checked_ops.rs" 191 45 194 1] ()); + [#"../checked_ops.rs" 191 45 194 1] _0 <- (); return _0 } BB9 { @@ -3443,7 +3443,7 @@ module CheckedOps_TestI8SubExample goto BB2 } BB2 { - [#"../checked_ops.rs" 198 12 198 46] _2 <- ([#"../checked_ops.rs" 198 12 198 46] _3 = (-5 : int8)); + [#"../checked_ops.rs" 198 12 198 46] _2 <- _3 = (-5 : int8); _3 <- any int8; switch (_2) | False -> goto BB4 @@ -3464,7 +3464,7 @@ module CheckedOps_TestI8SubExample goto BB6 } BB6 { - [#"../checked_ops.rs" 199 12 199 49] _7 <- ([#"../checked_ops.rs" 199 12 199 49] _8 = (110 : int8)); + [#"../checked_ops.rs" 199 12 199 49] _7 <- _8 = (110 : int8); _8 <- any int8; switch (_7) | False -> goto BB8 @@ -3498,7 +3498,7 @@ module CheckedOps_TestI8SubExample absurd } BB13 { - [#"../checked_ops.rs" 202 12 202 38] _17 <- ([#"../checked_ops.rs" 202 12 202 38] _18 = (-5 : int8)); + [#"../checked_ops.rs" 202 12 202 38] _17 <- _18 = (-5 : int8); _18 <- any int8; switch (_17) | False -> goto BB15 @@ -3514,7 +3514,7 @@ module CheckedOps_TestI8SubExample absurd } BB16 { - [#"../checked_ops.rs" 203 12 203 41] _21 <- ([#"../checked_ops.rs" 203 12 203 41] _22 = (110 : int8)); + [#"../checked_ops.rs" 203 12 203 41] _21 <- _22 = (110 : int8); _22 <- any int8; switch (_21) | False -> goto BB18 @@ -3530,7 +3530,7 @@ module CheckedOps_TestI8SubExample absurd } BB19 { - [#"../checked_ops.rs" 204 12 204 44] _25 <- ([#"../checked_ops.rs" 204 12 204 44] _26 = (126 : int8)); + [#"../checked_ops.rs" 204 12 204 44] _25 <- _26 = (126 : int8); _26 <- any int8; switch (_25) | False -> goto BB21 @@ -3546,7 +3546,7 @@ module CheckedOps_TestI8SubExample absurd } BB22 { - [#"../checked_ops.rs" 206 12 206 40] _29 <- ([#"../checked_ops.rs" 206 12 206 40] _30 = (-5 : int8)); + [#"../checked_ops.rs" 206 12 206 40] _29 <- _30 = (-5 : int8); _30 <- any int8; switch (_29) | False -> goto BB24 @@ -3562,7 +3562,7 @@ module CheckedOps_TestI8SubExample absurd } BB25 { - [#"../checked_ops.rs" 207 12 207 43] _33 <- ([#"../checked_ops.rs" 207 12 207 43] _34 = (110 : int8)); + [#"../checked_ops.rs" 207 12 207 43] _33 <- _34 = (110 : int8); _34 <- any int8; switch (_33) | False -> goto BB27 @@ -3578,7 +3578,7 @@ module CheckedOps_TestI8SubExample absurd } BB28 { - [#"../checked_ops.rs" 208 12 208 47] _37 <- ([#"../checked_ops.rs" 208 12 208 47] _38 = (-128 : int8)); + [#"../checked_ops.rs" 208 12 208 47] _37 <- _38 = (-128 : int8); _38 <- any int8; switch (_37) | False -> goto BB30 @@ -3594,7 +3594,7 @@ module CheckedOps_TestI8SubExample absurd } BB31 { - [#"../checked_ops.rs" 211 12 211 23] _42 <- ([#"../checked_ops.rs" 211 12 211 23] (let (a, _) = res in a) = (-5 : int8)); + [#"../checked_ops.rs" 211 12 211 23] _42 <- (let (a, _) = res in a) = (-5 : int8); switch (_42) | False -> goto BB35 | True -> goto BB32 @@ -3602,7 +3602,7 @@ module CheckedOps_TestI8SubExample } BB32 { assume { resolve0 res }; - [#"../checked_ops.rs" 211 27 211 41] _44 <- ([#"../checked_ops.rs" 211 27 211 41] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 211 27 211 41] _44 <- Bool.eqb (let (_, a) = res in a) false; switch (_44) | False -> goto BB34 | True -> goto BB33 @@ -3624,7 +3624,7 @@ module CheckedOps_TestI8SubExample absurd } BB37 { - [#"../checked_ops.rs" 213 12 213 24] _49 <- ([#"../checked_ops.rs" 213 12 213 24] (let (a, _) = res1 in a) = (110 : int8)); + [#"../checked_ops.rs" 213 12 213 24] _49 <- (let (a, _) = res1 in a) = (110 : int8); switch (_49) | False -> goto BB41 | True -> goto BB38 @@ -3632,7 +3632,7 @@ module CheckedOps_TestI8SubExample } BB38 { assume { resolve0 res1 }; - [#"../checked_ops.rs" 213 28 213 42] _51 <- ([#"../checked_ops.rs" 213 28 213 42] Bool.eqb (let (_, a) = res1 in a) false); + [#"../checked_ops.rs" 213 28 213 42] _51 <- Bool.eqb (let (_, a) = res1 in a) false; switch (_51) | False -> goto BB40 | True -> goto BB39 @@ -3654,7 +3654,7 @@ module CheckedOps_TestI8SubExample absurd } BB43 { - [#"../checked_ops.rs" 215 12 215 24] _56 <- ([#"../checked_ops.rs" 215 12 215 24] (let (a, _) = res2 in a) = (126 : int8)); + [#"../checked_ops.rs" 215 12 215 24] _56 <- (let (a, _) = res2 in a) = (126 : int8); switch (_56) | False -> goto BB47 | True -> goto BB44 @@ -3662,14 +3662,14 @@ module CheckedOps_TestI8SubExample } BB44 { assume { resolve0 res2 }; - [#"../checked_ops.rs" 215 28 215 41] _58 <- ([#"../checked_ops.rs" 215 28 215 41] Bool.eqb (let (_, a) = res2 in a) true); + [#"../checked_ops.rs" 215 28 215 41] _58 <- Bool.eqb (let (_, a) = res2 in a) true; switch (_58) | False -> goto BB46 | True -> goto BB45 end } BB45 { - [#"../checked_ops.rs" 197 29 216 1] _0 <- ([#"../checked_ops.rs" 197 29 216 1] ()); + [#"../checked_ops.rs" 197 29 216 1] _0 <- (); return _0 } BB46 { @@ -3798,10 +3798,10 @@ module CheckedOps_TestI8SubOverflowPos absurd } BB5 { - [#"../checked_ops.rs" 222 40 222 47] _14 <- ([#"../checked_ops.rs" 222 40 222 47] (127 : int8) - a); - [#"../checked_ops.rs" 222 40 222 51] _13 <- ([#"../checked_ops.rs" 222 40 222 51] _14 + (1 : int8)); + [#"../checked_ops.rs" 222 40 222 47] _14 <- (127 : int8) - a; + [#"../checked_ops.rs" 222 40 222 51] _13 <- _14 + (1 : int8); _14 <- any int8; - [#"../checked_ops.rs" 222 12 222 51] _10 <- ([#"../checked_ops.rs" 222 12 222 51] _11 = _13); + [#"../checked_ops.rs" 222 12 222 51] _10 <- _11 = _13; _11 <- any int8; _13 <- any int8; switch (_10) @@ -3818,7 +3818,7 @@ module CheckedOps_TestI8SubOverflowPos absurd } BB8 { - [#"../checked_ops.rs" 223 12 223 46] _18 <- ([#"../checked_ops.rs" 223 12 223 46] _19 = (-128 : int8)); + [#"../checked_ops.rs" 223 12 223 46] _18 <- _19 = (-128 : int8); _19 <- any int8; switch (_18) | False -> goto BB10 @@ -3834,10 +3834,10 @@ module CheckedOps_TestI8SubOverflowPos absurd } BB11 { - [#"../checked_ops.rs" 225 21 225 28] _28 <- ([#"../checked_ops.rs" 225 21 225 28] (127 : int8) - a); - [#"../checked_ops.rs" 225 21 225 32] _27 <- ([#"../checked_ops.rs" 225 21 225 32] _28 + (1 : int8)); + [#"../checked_ops.rs" 225 21 225 28] _28 <- (127 : int8) - a; + [#"../checked_ops.rs" 225 21 225 32] _27 <- _28 + (1 : int8); _28 <- any int8; - [#"../checked_ops.rs" 225 12 225 32] _25 <- ([#"../checked_ops.rs" 225 12 225 32] (let (a, _) = res in a) = _27); + [#"../checked_ops.rs" 225 12 225 32] _25 <- (let (a, _) = res in a) = _27; _27 <- any int8; switch (_25) | False -> goto BB15 @@ -3846,14 +3846,14 @@ module CheckedOps_TestI8SubOverflowPos } BB12 { assume { resolve0 res }; - [#"../checked_ops.rs" 225 36 225 49] _30 <- ([#"../checked_ops.rs" 225 36 225 49] Bool.eqb (let (_, a) = res in a) true); + [#"../checked_ops.rs" 225 36 225 49] _30 <- Bool.eqb (let (_, a) = res in a) true; switch (_30) | False -> goto BB14 | True -> goto BB13 end } BB13 { - [#"../checked_ops.rs" 220 39 226 1] _0 <- ([#"../checked_ops.rs" 220 39 226 1] ()); + [#"../checked_ops.rs" 220 39 226 1] _0 <- (); return _0 } BB14 { @@ -3984,12 +3984,12 @@ module CheckedOps_TestI8SubOverflowNeg absurd } BB5 { - [#"../checked_ops.rs" 232 38 232 45] _15 <- ([#"../checked_ops.rs" 232 38 232 45] (2 : int8) + a); - [#"../checked_ops.rs" 232 37 232 45] _14 <- ([#"../checked_ops.rs" 232 37 232 45] - _15); + [#"../checked_ops.rs" 232 38 232 45] _15 <- (2 : int8) + a; + [#"../checked_ops.rs" 232 37 232 45] _14 <- - _15; _15 <- any int8; - [#"../checked_ops.rs" 232 37 232 51] _13 <- ([#"../checked_ops.rs" 232 37 232 51] _14 - (127 : int8)); + [#"../checked_ops.rs" 232 37 232 51] _13 <- _14 - (127 : int8); _14 <- any int8; - [#"../checked_ops.rs" 232 12 232 51] _10 <- ([#"../checked_ops.rs" 232 12 232 51] _11 = _13); + [#"../checked_ops.rs" 232 12 232 51] _10 <- _11 = _13; _11 <- any int8; _13 <- any int8; switch (_10) @@ -4006,7 +4006,7 @@ module CheckedOps_TestI8SubOverflowNeg absurd } BB8 { - [#"../checked_ops.rs" 233 12 233 42] _19 <- ([#"../checked_ops.rs" 233 12 233 42] _20 = (127 : int8)); + [#"../checked_ops.rs" 233 12 233 42] _19 <- _20 = (127 : int8); _20 <- any int8; switch (_19) | False -> goto BB10 @@ -4022,12 +4022,12 @@ module CheckedOps_TestI8SubOverflowNeg absurd } BB11 { - [#"../checked_ops.rs" 235 22 235 29] _30 <- ([#"../checked_ops.rs" 235 22 235 29] (2 : int8) + a); - [#"../checked_ops.rs" 235 21 235 29] _29 <- ([#"../checked_ops.rs" 235 21 235 29] - _30); + [#"../checked_ops.rs" 235 22 235 29] _30 <- (2 : int8) + a; + [#"../checked_ops.rs" 235 21 235 29] _29 <- - _30; _30 <- any int8; - [#"../checked_ops.rs" 235 21 235 35] _28 <- ([#"../checked_ops.rs" 235 21 235 35] _29 - (127 : int8)); + [#"../checked_ops.rs" 235 21 235 35] _28 <- _29 - (127 : int8); _29 <- any int8; - [#"../checked_ops.rs" 235 12 235 35] _26 <- ([#"../checked_ops.rs" 235 12 235 35] (let (a, _) = res in a) = _28); + [#"../checked_ops.rs" 235 12 235 35] _26 <- (let (a, _) = res in a) = _28; _28 <- any int8; switch (_26) | False -> goto BB15 @@ -4036,14 +4036,14 @@ module CheckedOps_TestI8SubOverflowNeg } BB12 { assume { resolve0 res }; - [#"../checked_ops.rs" 235 39 235 52] _32 <- ([#"../checked_ops.rs" 235 39 235 52] Bool.eqb (let (_, a) = res in a) true); + [#"../checked_ops.rs" 235 39 235 52] _32 <- Bool.eqb (let (_, a) = res in a) true; switch (_32) | False -> goto BB14 | True -> goto BB13 end } BB13 { - [#"../checked_ops.rs" 230 39 236 1] _0 <- ([#"../checked_ops.rs" 230 39 236 1] ()); + [#"../checked_ops.rs" 230 39 236 1] _0 <- (); return _0 } BB14 { @@ -4187,7 +4187,7 @@ module CheckedOps_TestI8OverflowingSub goto BB2 } BB2 { - [#"../checked_ops.rs" 247 12 247 55] _4 <- ([#"../checked_ops.rs" 247 12 247 55] (let (a, _) = _6 in a) = _9); + [#"../checked_ops.rs" 247 12 247 55] _4 <- (let (a, _) = _6 in a) = _9; _9 <- any int8; switch (_4) | False -> goto BB4 @@ -4212,7 +4212,7 @@ module CheckedOps_TestI8OverflowingSub goto BB7 } BB7 { - [#"../checked_ops.rs" 248 12 248 64] _14 <- ([#"../checked_ops.rs" 248 12 248 64] Bool.eqb (let (_, a) = _16 in a) _19); + [#"../checked_ops.rs" 248 12 248 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19; _19 <- any bool; switch (_14) | False -> goto BB9 @@ -4220,7 +4220,7 @@ module CheckedOps_TestI8OverflowingSub end } BB8 { - [#"../checked_ops.rs" 246 45 249 1] _0 <- ([#"../checked_ops.rs" 246 45 249 1] ()); + [#"../checked_ops.rs" 246 45 249 1] _0 <- (); return _0 } BB9 { @@ -4368,7 +4368,7 @@ module CheckedOps_TestI8MulExample goto BB2 } BB2 { - [#"../checked_ops.rs" 253 12 253 46] _2 <- ([#"../checked_ops.rs" 253 12 253 46] _3 = (50 : int8)); + [#"../checked_ops.rs" 253 12 253 46] _2 <- _3 = (50 : int8); _3 <- any int8; switch (_2) | False -> goto BB4 @@ -4420,7 +4420,7 @@ module CheckedOps_TestI8MulExample absurd } BB13 { - [#"../checked_ops.rs" 257 12 257 38] _17 <- ([#"../checked_ops.rs" 257 12 257 38] _18 = (50 : int8)); + [#"../checked_ops.rs" 257 12 257 38] _17 <- _18 = (50 : int8); _18 <- any int8; switch (_17) | False -> goto BB15 @@ -4436,7 +4436,7 @@ module CheckedOps_TestI8MulExample absurd } BB16 { - [#"../checked_ops.rs" 258 12 258 40] _21 <- ([#"../checked_ops.rs" 258 12 258 40] _22 = (-12 : int8)); + [#"../checked_ops.rs" 258 12 258 40] _21 <- _22 = (-12 : int8); _22 <- any int8; switch (_21) | False -> goto BB18 @@ -4452,7 +4452,7 @@ module CheckedOps_TestI8MulExample absurd } BB19 { - [#"../checked_ops.rs" 259 12 259 40] _25 <- ([#"../checked_ops.rs" 259 12 259 40] _26 = (12 : int8)); + [#"../checked_ops.rs" 259 12 259 40] _25 <- _26 = (12 : int8); _26 <- any int8; switch (_25) | False -> goto BB21 @@ -4468,7 +4468,7 @@ module CheckedOps_TestI8MulExample absurd } BB22 { - [#"../checked_ops.rs" 261 12 261 40] _29 <- ([#"../checked_ops.rs" 261 12 261 40] _30 = (50 : int8)); + [#"../checked_ops.rs" 261 12 261 40] _29 <- _30 = (50 : int8); _30 <- any int8; switch (_29) | False -> goto BB24 @@ -4484,7 +4484,7 @@ module CheckedOps_TestI8MulExample absurd } BB25 { - [#"../checked_ops.rs" 262 12 262 42] _33 <- ([#"../checked_ops.rs" 262 12 262 42] _34 = (127 : int8)); + [#"../checked_ops.rs" 262 12 262 42] _33 <- _34 = (127 : int8); _34 <- any int8; switch (_33) | False -> goto BB27 @@ -4500,7 +4500,7 @@ module CheckedOps_TestI8MulExample absurd } BB28 { - [#"../checked_ops.rs" 263 12 263 44] _37 <- ([#"../checked_ops.rs" 263 12 263 44] _38 = (-128 : int8)); + [#"../checked_ops.rs" 263 12 263 44] _37 <- _38 = (-128 : int8); _38 <- any int8; switch (_37) | False -> goto BB30 @@ -4516,7 +4516,7 @@ module CheckedOps_TestI8MulExample absurd } BB31 { - [#"../checked_ops.rs" 266 12 266 23] _42 <- ([#"../checked_ops.rs" 266 12 266 23] (let (a, _) = res in a) = (50 : int8)); + [#"../checked_ops.rs" 266 12 266 23] _42 <- (let (a, _) = res in a) = (50 : int8); switch (_42) | False -> goto BB35 | True -> goto BB32 @@ -4524,7 +4524,7 @@ module CheckedOps_TestI8MulExample } BB32 { assume { resolve0 res }; - [#"../checked_ops.rs" 266 27 266 41] _44 <- ([#"../checked_ops.rs" 266 27 266 41] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 266 27 266 41] _44 <- Bool.eqb (let (_, a) = res in a) false; switch (_44) | False -> goto BB34 | True -> goto BB33 @@ -4546,7 +4546,7 @@ module CheckedOps_TestI8MulExample absurd } BB37 { - [#"../checked_ops.rs" 268 12 268 24] _49 <- ([#"../checked_ops.rs" 268 12 268 24] (let (a, _) = res1 in a) = (-12 : int8)); + [#"../checked_ops.rs" 268 12 268 24] _49 <- (let (a, _) = res1 in a) = (-12 : int8); switch (_49) | False -> goto BB41 | True -> goto BB38 @@ -4554,7 +4554,7 @@ module CheckedOps_TestI8MulExample } BB38 { assume { resolve0 res1 }; - [#"../checked_ops.rs" 268 28 268 41] _51 <- ([#"../checked_ops.rs" 268 28 268 41] Bool.eqb (let (_, a) = res1 in a) true); + [#"../checked_ops.rs" 268 28 268 41] _51 <- Bool.eqb (let (_, a) = res1 in a) true; switch (_51) | False -> goto BB40 | True -> goto BB39 @@ -4576,7 +4576,7 @@ module CheckedOps_TestI8MulExample absurd } BB43 { - [#"../checked_ops.rs" 270 12 270 23] _56 <- ([#"../checked_ops.rs" 270 12 270 23] (let (a, _) = res2 in a) = (12 : int8)); + [#"../checked_ops.rs" 270 12 270 23] _56 <- (let (a, _) = res2 in a) = (12 : int8); switch (_56) | False -> goto BB47 | True -> goto BB44 @@ -4584,14 +4584,14 @@ module CheckedOps_TestI8MulExample } BB44 { assume { resolve0 res2 }; - [#"../checked_ops.rs" 270 27 270 40] _58 <- ([#"../checked_ops.rs" 270 27 270 40] Bool.eqb (let (_, a) = res2 in a) true); + [#"../checked_ops.rs" 270 27 270 40] _58 <- Bool.eqb (let (_, a) = res2 in a) true; switch (_58) | False -> goto BB46 | True -> goto BB45 end } BB45 { - [#"../checked_ops.rs" 252 29 271 1] _0 <- ([#"../checked_ops.rs" 252 29 271 1] ()); + [#"../checked_ops.rs" 252 29 271 1] _0 <- (); return _0 } BB46 { @@ -4714,7 +4714,7 @@ module CheckedOps_TestI8MulZero goto BB2 } BB2 { - [#"../checked_ops.rs" 275 12 275 44] _3 <- ([#"../checked_ops.rs" 275 12 275 44] _4 = (0 : int8)); + [#"../checked_ops.rs" 275 12 275 44] _3 <- _4 = (0 : int8); _4 <- any int8; switch (_3) | False -> goto BB4 @@ -4730,7 +4730,7 @@ module CheckedOps_TestI8MulZero absurd } BB5 { - [#"../checked_ops.rs" 276 12 276 36] _9 <- ([#"../checked_ops.rs" 276 12 276 36] _10 = (0 : int8)); + [#"../checked_ops.rs" 276 12 276 36] _9 <- _10 = (0 : int8); _10 <- any int8; switch (_9) | False -> goto BB7 @@ -4746,7 +4746,7 @@ module CheckedOps_TestI8MulZero absurd } BB8 { - [#"../checked_ops.rs" 277 12 277 38] _14 <- ([#"../checked_ops.rs" 277 12 277 38] _15 = (0 : int8)); + [#"../checked_ops.rs" 277 12 277 38] _14 <- _15 = (0 : int8); _15 <- any int8; switch (_14) | False -> goto BB10 @@ -4762,7 +4762,7 @@ module CheckedOps_TestI8MulZero absurd } BB11 { - [#"../checked_ops.rs" 279 12 279 22] _21 <- ([#"../checked_ops.rs" 279 12 279 22] (let (a, _) = res in a) = (0 : int8)); + [#"../checked_ops.rs" 279 12 279 22] _21 <- (let (a, _) = res in a) = (0 : int8); switch (_21) | False -> goto BB15 | True -> goto BB12 @@ -4770,14 +4770,14 @@ module CheckedOps_TestI8MulZero } BB12 { assume { resolve0 res }; - [#"../checked_ops.rs" 279 26 279 40] _23 <- ([#"../checked_ops.rs" 279 26 279 40] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 279 26 279 40] _23 <- Bool.eqb (let (_, a) = res in a) false; switch (_23) | False -> goto BB14 | True -> goto BB13 end } BB13 { - [#"../checked_ops.rs" 274 31 280 1] _0 <- ([#"../checked_ops.rs" 274 31 280 1] ()); + [#"../checked_ops.rs" 274 31 280 1] _0 <- (); return _0 } BB14 { @@ -4882,7 +4882,7 @@ module CheckedOps_TestI8OverflowingMul goto BB2 } BB2 { - [#"../checked_ops.rs" 284 12 284 55] _4 <- ([#"../checked_ops.rs" 284 12 284 55] (let (a, _) = _6 in a) = _9); + [#"../checked_ops.rs" 284 12 284 55] _4 <- (let (a, _) = _6 in a) = _9; _9 <- any int8; switch (_4) | False -> goto BB4 @@ -4907,7 +4907,7 @@ module CheckedOps_TestI8OverflowingMul goto BB7 } BB7 { - [#"../checked_ops.rs" 285 12 285 64] _14 <- ([#"../checked_ops.rs" 285 12 285 64] Bool.eqb (let (_, a) = _16 in a) _19); + [#"../checked_ops.rs" 285 12 285 64] _14 <- Bool.eqb (let (_, a) = _16 in a) _19; _19 <- any bool; switch (_14) | False -> goto BB9 @@ -4915,7 +4915,7 @@ module CheckedOps_TestI8OverflowingMul end } BB8 { - [#"../checked_ops.rs" 283 45 286 1] _0 <- ([#"../checked_ops.rs" 283 45 286 1] ()); + [#"../checked_ops.rs" 283 45 286 1] _0 <- (); return _0 } BB9 { @@ -5074,7 +5074,7 @@ module CheckedOps_TestI8DivExample goto BB6 } BB6 { - [#"../checked_ops.rs" 291 12 291 44] _7 <- ([#"../checked_ops.rs" 291 12 291 44] _8 = (2 : int8)); + [#"../checked_ops.rs" 291 12 291 44] _7 <- _8 = (2 : int8); _8 <- any int8; switch (_7) | False -> goto BB8 @@ -5095,7 +5095,7 @@ module CheckedOps_TestI8DivExample goto BB10 } BB10 { - [#"../checked_ops.rs" 292 12 292 46] _12 <- ([#"../checked_ops.rs" 292 12 292 46] _13 = (-2 : int8)); + [#"../checked_ops.rs" 292 12 292 46] _12 <- _13 = (-2 : int8); _13 <- any int8; switch (_12) | False -> goto BB12 @@ -5129,7 +5129,7 @@ module CheckedOps_TestI8DivExample absurd } BB17 { - [#"../checked_ops.rs" 295 12 295 36] _22 <- ([#"../checked_ops.rs" 295 12 295 36] _23 = (2 : int8)); + [#"../checked_ops.rs" 295 12 295 36] _22 <- _23 = (2 : int8); _23 <- any int8; switch (_22) | False -> goto BB19 @@ -5145,7 +5145,7 @@ module CheckedOps_TestI8DivExample absurd } BB20 { - [#"../checked_ops.rs" 296 12 296 38] _26 <- ([#"../checked_ops.rs" 296 12 296 38] _27 = (-2 : int8)); + [#"../checked_ops.rs" 296 12 296 38] _26 <- _27 = (-2 : int8); _27 <- any int8; switch (_26) | False -> goto BB22 @@ -5161,7 +5161,7 @@ module CheckedOps_TestI8DivExample absurd } BB23 { - [#"../checked_ops.rs" 297 12 297 45] _30 <- ([#"../checked_ops.rs" 297 12 297 45] _31 = (-128 : int8)); + [#"../checked_ops.rs" 297 12 297 45] _30 <- _31 = (-128 : int8); _31 <- any int8; switch (_30) | False -> goto BB25 @@ -5177,7 +5177,7 @@ module CheckedOps_TestI8DivExample absurd } BB26 { - [#"../checked_ops.rs" 299 12 299 38] _34 <- ([#"../checked_ops.rs" 299 12 299 38] _35 = (2 : int8)); + [#"../checked_ops.rs" 299 12 299 38] _34 <- _35 = (2 : int8); _35 <- any int8; switch (_34) | False -> goto BB28 @@ -5193,7 +5193,7 @@ module CheckedOps_TestI8DivExample absurd } BB29 { - [#"../checked_ops.rs" 300 12 300 40] _38 <- ([#"../checked_ops.rs" 300 12 300 40] _39 = (-2 : int8)); + [#"../checked_ops.rs" 300 12 300 40] _38 <- _39 = (-2 : int8); _39 <- any int8; switch (_38) | False -> goto BB31 @@ -5209,7 +5209,7 @@ module CheckedOps_TestI8DivExample absurd } BB32 { - [#"../checked_ops.rs" 301 12 301 47] _42 <- ([#"../checked_ops.rs" 301 12 301 47] _43 = (-128 : int8)); + [#"../checked_ops.rs" 301 12 301 47] _42 <- _43 = (-128 : int8); _43 <- any int8; switch (_42) | False -> goto BB34 @@ -5225,7 +5225,7 @@ module CheckedOps_TestI8DivExample absurd } BB35 { - [#"../checked_ops.rs" 304 12 304 22] _47 <- ([#"../checked_ops.rs" 304 12 304 22] (let (a, _) = res in a) = (2 : int8)); + [#"../checked_ops.rs" 304 12 304 22] _47 <- (let (a, _) = res in a) = (2 : int8); switch (_47) | False -> goto BB39 | True -> goto BB36 @@ -5233,7 +5233,7 @@ module CheckedOps_TestI8DivExample } BB36 { assume { resolve0 res }; - [#"../checked_ops.rs" 304 26 304 40] _49 <- ([#"../checked_ops.rs" 304 26 304 40] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 304 26 304 40] _49 <- Bool.eqb (let (_, a) = res in a) false; switch (_49) | False -> goto BB38 | True -> goto BB37 @@ -5255,7 +5255,7 @@ module CheckedOps_TestI8DivExample absurd } BB41 { - [#"../checked_ops.rs" 306 12 306 23] _54 <- ([#"../checked_ops.rs" 306 12 306 23] (let (a, _) = res1 in a) = (-2 : int8)); + [#"../checked_ops.rs" 306 12 306 23] _54 <- (let (a, _) = res1 in a) = (-2 : int8); switch (_54) | False -> goto BB45 | True -> goto BB42 @@ -5263,7 +5263,7 @@ module CheckedOps_TestI8DivExample } BB42 { assume { resolve0 res1 }; - [#"../checked_ops.rs" 306 27 306 41] _56 <- ([#"../checked_ops.rs" 306 27 306 41] Bool.eqb (let (_, a) = res1 in a) false); + [#"../checked_ops.rs" 306 27 306 41] _56 <- Bool.eqb (let (_, a) = res1 in a) false; switch (_56) | False -> goto BB44 | True -> goto BB43 @@ -5285,7 +5285,7 @@ module CheckedOps_TestI8DivExample absurd } BB47 { - [#"../checked_ops.rs" 308 12 308 25] _61 <- ([#"../checked_ops.rs" 308 12 308 25] (let (a, _) = res2 in a) = (-128 : int8)); + [#"../checked_ops.rs" 308 12 308 25] _61 <- (let (a, _) = res2 in a) = (-128 : int8); switch (_61) | False -> goto BB51 | True -> goto BB48 @@ -5293,14 +5293,14 @@ module CheckedOps_TestI8DivExample } BB48 { assume { resolve0 res2 }; - [#"../checked_ops.rs" 308 29 308 42] _63 <- ([#"../checked_ops.rs" 308 29 308 42] Bool.eqb (let (_, a) = res2 in a) true); + [#"../checked_ops.rs" 308 29 308 42] _63 <- Bool.eqb (let (_, a) = res2 in a) true; switch (_63) | False -> goto BB50 | True -> goto BB49 end } BB49 { - [#"../checked_ops.rs" 289 29 309 1] _0 <- ([#"../checked_ops.rs" 289 29 309 1] ()); + [#"../checked_ops.rs" 289 29 309 1] _0 <- (); return _0 } BB50 { @@ -5443,26 +5443,26 @@ module CheckedOps_TestI8DivNoOverflow goto BB2 } BB2 { - [#"../checked_ops.rs" 314 41 314 42] _11 <- ([#"../checked_ops.rs" 314 41 314 42] a); - [#"../checked_ops.rs" 314 45 314 46] _12 <- ([#"../checked_ops.rs" 314 45 314 46] b); - [#"../checked_ops.rs" 314 41 314 46] _13 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = (0 : int8)); + [#"../checked_ops.rs" 314 41 314 42] _11 <- a; + [#"../checked_ops.rs" 314 45 314 46] _12 <- b; + [#"../checked_ops.rs" 314 41 314 46] _13 <- _12 = (0 : int8); assert { [@expl:division by zero] [#"../checked_ops.rs" 314 41 314 46] not _13 }; goto BB3 } BB3 { - [#"../checked_ops.rs" 314 41 314 46] _14 <- ([#"../checked_ops.rs" 314 41 314 46] _12 = (-1 : int8)); - [#"../checked_ops.rs" 314 41 314 46] _15 <- ([#"../checked_ops.rs" 314 41 314 46] _11 = (-128 : int8)); - [#"../checked_ops.rs" 314 41 314 46] _16 <- ([#"../checked_ops.rs" 314 41 314 46] _14 && _15); + [#"../checked_ops.rs" 314 41 314 46] _14 <- _12 = (-1 : int8); + [#"../checked_ops.rs" 314 41 314 46] _15 <- _11 = (-128 : int8); + [#"../checked_ops.rs" 314 41 314 46] _16 <- _14 && _15; _14 <- any bool; _15 <- any bool; assert { [@expl:Div overflow] [#"../checked_ops.rs" 314 41 314 46] not _16 }; goto BB4 } BB4 { - [#"../checked_ops.rs" 314 41 314 46] _10 <- ([#"../checked_ops.rs" 314 41 314 46] _11 / _12); + [#"../checked_ops.rs" 314 41 314 46] _10 <- _11 / _12; _11 <- any int8; _12 <- any int8; - [#"../checked_ops.rs" 314 12 314 46] _5 <- ([#"../checked_ops.rs" 314 12 314 46] _6 = _10); + [#"../checked_ops.rs" 314 12 314 46] _5 <- _6 = _10; _6 <- any int8; _10 <- any int8; switch (_5) @@ -5479,26 +5479,26 @@ module CheckedOps_TestI8DivNoOverflow absurd } BB7 { - [#"../checked_ops.rs" 315 33 315 34] _24 <- ([#"../checked_ops.rs" 315 33 315 34] a); - [#"../checked_ops.rs" 315 37 315 38] _25 <- ([#"../checked_ops.rs" 315 37 315 38] b); - [#"../checked_ops.rs" 315 33 315 38] _26 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = (0 : int8)); + [#"../checked_ops.rs" 315 33 315 34] _24 <- a; + [#"../checked_ops.rs" 315 37 315 38] _25 <- b; + [#"../checked_ops.rs" 315 33 315 38] _26 <- _25 = (0 : int8); assert { [@expl:division by zero] [#"../checked_ops.rs" 315 33 315 38] not _26 }; goto BB8 } BB8 { - [#"../checked_ops.rs" 315 33 315 38] _27 <- ([#"../checked_ops.rs" 315 33 315 38] _25 = (-1 : int8)); - [#"../checked_ops.rs" 315 33 315 38] _28 <- ([#"../checked_ops.rs" 315 33 315 38] _24 = (-128 : int8)); - [#"../checked_ops.rs" 315 33 315 38] _29 <- ([#"../checked_ops.rs" 315 33 315 38] _27 && _28); + [#"../checked_ops.rs" 315 33 315 38] _27 <- _25 = (-1 : int8); + [#"../checked_ops.rs" 315 33 315 38] _28 <- _24 = (-128 : int8); + [#"../checked_ops.rs" 315 33 315 38] _29 <- _27 && _28; _27 <- any bool; _28 <- any bool; assert { [@expl:Div overflow] [#"../checked_ops.rs" 315 33 315 38] not _29 }; goto BB9 } BB9 { - [#"../checked_ops.rs" 315 33 315 38] _23 <- ([#"../checked_ops.rs" 315 33 315 38] _24 / _25); + [#"../checked_ops.rs" 315 33 315 38] _23 <- _24 / _25; _24 <- any int8; _25 <- any int8; - [#"../checked_ops.rs" 315 12 315 38] _19 <- ([#"../checked_ops.rs" 315 12 315 38] _20 = _23); + [#"../checked_ops.rs" 315 12 315 38] _19 <- _20 = _23; _20 <- any int8; _23 <- any int8; switch (_19) @@ -5515,26 +5515,26 @@ module CheckedOps_TestI8DivNoOverflow absurd } BB12 { - [#"../checked_ops.rs" 316 35 316 36] _37 <- ([#"../checked_ops.rs" 316 35 316 36] a); - [#"../checked_ops.rs" 316 39 316 40] _38 <- ([#"../checked_ops.rs" 316 39 316 40] b); - [#"../checked_ops.rs" 316 35 316 40] _39 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = (0 : int8)); + [#"../checked_ops.rs" 316 35 316 36] _37 <- a; + [#"../checked_ops.rs" 316 39 316 40] _38 <- b; + [#"../checked_ops.rs" 316 35 316 40] _39 <- _38 = (0 : int8); assert { [@expl:division by zero] [#"../checked_ops.rs" 316 35 316 40] not _39 }; goto BB13 } BB13 { - [#"../checked_ops.rs" 316 35 316 40] _40 <- ([#"../checked_ops.rs" 316 35 316 40] _38 = (-1 : int8)); - [#"../checked_ops.rs" 316 35 316 40] _41 <- ([#"../checked_ops.rs" 316 35 316 40] _37 = (-128 : int8)); - [#"../checked_ops.rs" 316 35 316 40] _42 <- ([#"../checked_ops.rs" 316 35 316 40] _40 && _41); + [#"../checked_ops.rs" 316 35 316 40] _40 <- _38 = (-1 : int8); + [#"../checked_ops.rs" 316 35 316 40] _41 <- _37 = (-128 : int8); + [#"../checked_ops.rs" 316 35 316 40] _42 <- _40 && _41; _40 <- any bool; _41 <- any bool; assert { [@expl:Div overflow] [#"../checked_ops.rs" 316 35 316 40] not _42 }; goto BB14 } BB14 { - [#"../checked_ops.rs" 316 35 316 40] _36 <- ([#"../checked_ops.rs" 316 35 316 40] _37 / _38); + [#"../checked_ops.rs" 316 35 316 40] _36 <- _37 / _38; _37 <- any int8; _38 <- any int8; - [#"../checked_ops.rs" 316 12 316 40] _32 <- ([#"../checked_ops.rs" 316 12 316 40] _33 = _36); + [#"../checked_ops.rs" 316 12 316 40] _32 <- _33 = _36; _33 <- any int8; _36 <- any int8; switch (_32) @@ -5551,26 +5551,26 @@ module CheckedOps_TestI8DivNoOverflow absurd } BB17 { - [#"../checked_ops.rs" 318 21 318 22] _51 <- ([#"../checked_ops.rs" 318 21 318 22] a); - [#"../checked_ops.rs" 318 25 318 26] _52 <- ([#"../checked_ops.rs" 318 25 318 26] b); - [#"../checked_ops.rs" 318 21 318 26] _53 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = (0 : int8)); + [#"../checked_ops.rs" 318 21 318 22] _51 <- a; + [#"../checked_ops.rs" 318 25 318 26] _52 <- b; + [#"../checked_ops.rs" 318 21 318 26] _53 <- _52 = (0 : int8); assert { [@expl:division by zero] [#"../checked_ops.rs" 318 21 318 26] not _53 }; goto BB18 } BB18 { - [#"../checked_ops.rs" 318 21 318 26] _54 <- ([#"../checked_ops.rs" 318 21 318 26] _52 = (-1 : int8)); - [#"../checked_ops.rs" 318 21 318 26] _55 <- ([#"../checked_ops.rs" 318 21 318 26] _51 = (-128 : int8)); - [#"../checked_ops.rs" 318 21 318 26] _56 <- ([#"../checked_ops.rs" 318 21 318 26] _54 && _55); + [#"../checked_ops.rs" 318 21 318 26] _54 <- _52 = (-1 : int8); + [#"../checked_ops.rs" 318 21 318 26] _55 <- _51 = (-128 : int8); + [#"../checked_ops.rs" 318 21 318 26] _56 <- _54 && _55; _54 <- any bool; _55 <- any bool; assert { [@expl:Div overflow] [#"../checked_ops.rs" 318 21 318 26] not _56 }; goto BB19 } BB19 { - [#"../checked_ops.rs" 318 21 318 26] _50 <- ([#"../checked_ops.rs" 318 21 318 26] _51 / _52); + [#"../checked_ops.rs" 318 21 318 26] _50 <- _51 / _52; _51 <- any int8; _52 <- any int8; - [#"../checked_ops.rs" 318 12 318 26] _48 <- ([#"../checked_ops.rs" 318 12 318 26] (let (a, _) = res in a) = _50); + [#"../checked_ops.rs" 318 12 318 26] _48 <- (let (a, _) = res in a) = _50; _50 <- any int8; switch (_48) | False -> goto BB23 @@ -5579,14 +5579,14 @@ module CheckedOps_TestI8DivNoOverflow } BB20 { assume { resolve0 res }; - [#"../checked_ops.rs" 318 30 318 44] _57 <- ([#"../checked_ops.rs" 318 30 318 44] Bool.eqb (let (_, a) = res in a) false); + [#"../checked_ops.rs" 318 30 318 44] _57 <- Bool.eqb (let (_, a) = res in a) false; switch (_57) | False -> goto BB22 | True -> goto BB21 end } BB21 { - [#"../checked_ops.rs" 313 45 319 1] _0 <- ([#"../checked_ops.rs" 313 45 319 1] ()); + [#"../checked_ops.rs" 313 45 319 1] _0 <- (); return _0 } BB22 { @@ -5653,7 +5653,7 @@ module CheckedOps_TestI8DivZero end } BB3 { - [#"../checked_ops.rs" 322 31 324 1] _0 <- ([#"../checked_ops.rs" 322 31 324 1] ()); + [#"../checked_ops.rs" 322 31 324 1] _0 <- (); return _0 } BB4 { diff --git a/creusot/tests/should_succeed/clones/01.mlcfg b/creusot/tests/should_succeed/clones/01.mlcfg index 4f78788119..256bc7cb36 100644 --- a/creusot/tests/should_succeed/clones/01.mlcfg +++ b/creusot/tests/should_succeed/clones/01.mlcfg @@ -7,7 +7,7 @@ module C01_Func1 goto BB0 } BB0 { - [#"../01.rs" 6 11 6 13] _0 <- ([#"../01.rs" 6 11 6 13] ()); + [#"../01.rs" 6 11 6 13] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/clones/02.mlcfg b/creusot/tests/should_succeed/clones/02.mlcfg index 0562b05b45..0fda766ebb 100644 --- a/creusot/tests/should_succeed/clones/02.mlcfg +++ b/creusot/tests/should_succeed/clones/02.mlcfg @@ -20,7 +20,7 @@ module C02_Program goto BB0 } BB0 { - [#"../02.rs" 20 17 20 19] _0 <- ([#"../02.rs" 20 17 20 19] ()); + [#"../02.rs" 20 17 20 19] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/clones/03.mlcfg b/creusot/tests/should_succeed/clones/03.mlcfg index 3700068abf..7ccb9a27b2 100644 --- a/creusot/tests/should_succeed/clones/03.mlcfg +++ b/creusot/tests/should_succeed/clones/03.mlcfg @@ -35,7 +35,7 @@ module C03_Prog goto BB1 } BB1 { - [#"../03.rs" 11 17 11 19] _0 <- ([#"../03.rs" 11 17 11 19] ()); + [#"../03.rs" 11 17 11 19] _0 <- (); goto BB2 } BB2 { @@ -85,7 +85,7 @@ module C03_Prog2 goto BB1 } BB1 { - [#"../03.rs" 14 15 16 1] _0 <- ([#"../03.rs" 14 15 16 1] ()); + [#"../03.rs" 14 15 16 1] _0 <- (); return _0 } @@ -106,7 +106,7 @@ module C03_Prog3 goto BB0 } BB0 { - [#"../03.rs" 19 15 19 17] _0 <- ([#"../03.rs" 19 15 19 17] ()); + [#"../03.rs" 19 15 19 17] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/clones/04.mlcfg b/creusot/tests/should_succeed/clones/04.mlcfg index ddc9b27915..993461d8a0 100644 --- a/creusot/tests/should_succeed/clones/04.mlcfg +++ b/creusot/tests/should_succeed/clones/04.mlcfg @@ -26,7 +26,7 @@ module C04_F goto BB0 } BB0 { - [#"../04.rs" 21 17 21 19] _0 <- ([#"../04.rs" 21 17 21 19] ()); + [#"../04.rs" 21 17 21 19] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/closures/01_basic.mlcfg b/creusot/tests/should_succeed/closures/01_basic.mlcfg index 6490d5da08..6aebef0234 100644 --- a/creusot/tests/should_succeed/closures/01_basic.mlcfg +++ b/creusot/tests/should_succeed/closures/01_basic.mlcfg @@ -26,7 +26,7 @@ module C01Basic_UsesClosure_Closure0 goto BB0 } BB0 { - [#"../01_basic.rs" 6 17 6 18] _0 <- ([#"../01_basic.rs" 6 17 6 18] field_00 _1); + [#"../01_basic.rs" 6 17 6 18] _0 <- field_00 _1; return _0 } @@ -56,16 +56,16 @@ module C01Basic_UsesClosure goto BB0 } BB0 { - [#"../01_basic.rs" 5 12 5 16] y <- ([#"../01_basic.rs" 5 12 5 16] true); - [#"../01_basic.rs" 6 13 6 19] _4 <- ([#"../01_basic.rs" 6 13 6 19] C01Basic_UsesClosure_Closure0.C01Basic_UsesClosure_Closure0 y); - [#"../01_basic.rs" 6 13 6 21] _6 <- ([#"../01_basic.rs" 6 13 6 21] ()); + [#"../01_basic.rs" 5 12 5 16] y <- true; + [#"../01_basic.rs" 6 13 6 19] _4 <- C01Basic_UsesClosure_Closure0.C01Basic_UsesClosure_Closure0 y; + [#"../01_basic.rs" 6 13 6 21] _6 <- (); [#"../01_basic.rs" 6 13 6 21] _x <- ([#"../01_basic.rs" 6 13 6 21] let () = _6 in closure00 _4); _6 <- any (); goto BB1 } BB1 { assume { resolve0 _4 }; - [#"../01_basic.rs" 4 22 7 1] _0 <- ([#"../01_basic.rs" 4 22 7 1] ()); + [#"../01_basic.rs" 4 22 7 1] _0 <- (); return _0 } @@ -93,7 +93,7 @@ module C01Basic_MultiArg_Closure0 goto BB0 } BB0 { - [#"../01_basic.rs" 10 19 10 24] _0 <- ([#"../01_basic.rs" 10 19 10 24] a + b); + [#"../01_basic.rs" 10 19 10 24] _0 <- a + b; return _0 } @@ -118,15 +118,15 @@ module C01Basic_MultiArg goto BB0 } BB0 { - [#"../01_basic.rs" 10 12 10 24] x <- ([#"../01_basic.rs" 10 12 10 24] C01Basic_MultiArg_Closure0.C01Basic_MultiArg_Closure0); - [#"../01_basic.rs" 11 13 11 22] _4 <- ([#"../01_basic.rs" 11 13 11 22] ((0 : int32), (3 : int32))); + [#"../01_basic.rs" 10 12 10 24] x <- C01Basic_MultiArg_Closure0.C01Basic_MultiArg_Closure0; + [#"../01_basic.rs" 11 13 11 22] _4 <- ((0 : int32), (3 : int32)); [#"../01_basic.rs" 11 13 11 22] _a <- ([#"../01_basic.rs" 11 13 11 22] let (a, b) = _4 in closure00 x a b); _4 <- any (int32, int32); goto BB1 } BB1 { assume { resolve0 x }; - [#"../01_basic.rs" 9 19 12 1] _0 <- ([#"../01_basic.rs" 9 19 12 1] ()); + [#"../01_basic.rs" 9 19 12 1] _0 <- (); return _0 } @@ -172,9 +172,9 @@ module C01Basic_MoveClosure_Closure0 goto BB0 } BB0 { - [#"../01_basic.rs" 20 8 20 15] _1 <- { _1 with current = (let C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 x0 = * _1 in C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 ({ (field_00 ( * _1)) with current = ([#"../01_basic.rs" 20 8 20 15] * field_00 ( * _1) + (1 : int32)) ; })) ; }; + [#"../01_basic.rs" 20 8 20 15] _1 <- { _1 with current = (let C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 x0 = * _1 in C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 ({ (field_00 ( * _1)) with current = ( * field_00 ( * _1) + (1 : int32)) ; })) ; }; assume { resolve0 _1 }; - [#"../01_basic.rs" 19 24 21 5] _0 <- ([#"../01_basic.rs" 19 24 21 5] ()); + [#"../01_basic.rs" 19 24 21 5] _0 <- (); return _0 } @@ -228,14 +228,14 @@ module C01Basic_MoveClosure goto BB0 } BB0 { - [#"../01_basic.rs" 17 17 17 21] _2 <- ([#"../01_basic.rs" 17 17 17 21] (0 : int32)); + [#"../01_basic.rs" 17 17 17 21] _2 <- (0 : int32); [#"../01_basic.rs" 17 12 17 21] a <- Borrow.borrow_mut _2; [#"../01_basic.rs" 17 12 17 21] _2 <- ^ a; - [#"../01_basic.rs" 19 16 21 5] x <- ([#"../01_basic.rs" 19 16 21 5] C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 a); + [#"../01_basic.rs" 19 16 21 5] x <- C01Basic_MoveClosure_Closure0.C01Basic_MoveClosure_Closure0 a; a <- any borrowed int32; [#"../01_basic.rs" 23 4 23 7] _5 <- Borrow.borrow_mut x; [#"../01_basic.rs" 23 4 23 7] x <- ^ _5; - [#"../01_basic.rs" 23 4 23 9] _6 <- ([#"../01_basic.rs" 23 4 23 9] ()); + [#"../01_basic.rs" 23 4 23 9] _6 <- (); [#"../01_basic.rs" 23 4 23 9] _4 <- ([#"../01_basic.rs" 23 4 23 9] let () = _6 in closure00 _5); _5 <- any borrowed C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0; _6 <- any (); @@ -244,7 +244,7 @@ module C01Basic_MoveClosure BB1 { [#"../01_basic.rs" 24 4 24 7] _8 <- Borrow.borrow_mut x; [#"../01_basic.rs" 24 4 24 7] x <- ^ _8; - [#"../01_basic.rs" 24 4 24 9] _9 <- ([#"../01_basic.rs" 24 4 24 9] ()); + [#"../01_basic.rs" 24 4 24 9] _9 <- (); [#"../01_basic.rs" 24 4 24 9] _7 <- ([#"../01_basic.rs" 24 4 24 9] let () = _9 in closure00 _8); _8 <- any borrowed C01Basic_MoveClosure_Closure0.c01basic_moveclosure_closure0; _9 <- any (); @@ -252,7 +252,7 @@ module C01Basic_MoveClosure } BB2 { assume { resolve0 x }; - [#"../01_basic.rs" 16 22 25 1] _0 <- ([#"../01_basic.rs" 16 22 25 1] ()); + [#"../01_basic.rs" 16 22 25 1] _0 <- (); return _0 } @@ -324,12 +324,12 @@ module C01Basic_MoveMut_Closure0 BB1 { [#"../01_basic.rs" 36 12 36 21] _2 <- Borrow.borrow_final ( * _3) (Borrow.get_id _3); [#"../01_basic.rs" 36 12 36 21] _3 <- { _3 with current = ( ^ _2) ; }; - [#"../01_basic.rs" 36 8 36 21] _1 <- { _1 with current = (let C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x0 = * _1 in C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 ([#"../01_basic.rs" 36 8 36 21] _2)) ; }; + [#"../01_basic.rs" 36 8 36 21] _1 <- { _1 with current = (let C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x0 = * _1 in C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 _2) ; }; _2 <- any borrowed uint32; assume { resolve0 (field_00 ( * _1)) }; assume { resolve1 _1 }; assume { resolve0 _3 }; - [#"../01_basic.rs" 35 24 37 5] _0 <- ([#"../01_basic.rs" 35 24 37 5] ()); + [#"../01_basic.rs" 35 24 37 5] _0 <- (); return _0 } @@ -395,14 +395,14 @@ module C01Basic_MoveMut goto BB0 } BB0 { - [#"../01_basic.rs" 33 21 33 25] _2 <- ([#"../01_basic.rs" 33 21 33 25] (0 : uint32)); + [#"../01_basic.rs" 33 21 33 25] _2 <- (0 : uint32); [#"../01_basic.rs" 33 16 33 25] x <- Borrow.borrow_mut _2; [#"../01_basic.rs" 33 16 33 25] _2 <- ^ x; - [#"../01_basic.rs" 35 16 37 5] a <- ([#"../01_basic.rs" 35 16 37 5] C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x); + [#"../01_basic.rs" 35 16 37 5] a <- C01Basic_MoveMut_Closure0.C01Basic_MoveMut_Closure0 x; x <- any borrowed uint32; [#"../01_basic.rs" 38 4 38 7] _5 <- Borrow.borrow_mut a; [#"../01_basic.rs" 38 4 38 7] a <- ^ _5; - [#"../01_basic.rs" 38 4 38 9] _6 <- ([#"../01_basic.rs" 38 4 38 9] ()); + [#"../01_basic.rs" 38 4 38 9] _6 <- (); [#"../01_basic.rs" 38 4 38 9] _4 <- ([#"../01_basic.rs" 38 4 38 9] let () = _6 in closure00 _5); _5 <- any borrowed C01Basic_MoveMut_Closure0.c01basic_movemut_closure0; _6 <- any (); @@ -411,7 +411,7 @@ module C01Basic_MoveMut BB1 { [#"../01_basic.rs" 39 4 39 7] _8 <- Borrow.borrow_mut a; [#"../01_basic.rs" 39 4 39 7] a <- ^ _8; - [#"../01_basic.rs" 39 4 39 9] _9 <- ([#"../01_basic.rs" 39 4 39 9] ()); + [#"../01_basic.rs" 39 4 39 9] _9 <- (); [#"../01_basic.rs" 39 4 39 9] _7 <- ([#"../01_basic.rs" 39 4 39 9] let () = _9 in closure00 _8); _8 <- any borrowed C01Basic_MoveMut_Closure0.c01basic_movemut_closure0; _9 <- any (); @@ -419,7 +419,7 @@ module C01Basic_MoveMut } BB2 { assume { resolve0 a }; - [#"../01_basic.rs" 32 18 40 1] _0 <- ([#"../01_basic.rs" 32 18 40 1] ()); + [#"../01_basic.rs" 32 18 40 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/closures/02_nested.mlcfg b/creusot/tests/should_succeed/closures/02_nested.mlcfg index 333554df29..5923b613ef 100644 --- a/creusot/tests/should_succeed/closures/02_nested.mlcfg +++ b/creusot/tests/should_succeed/closures/02_nested.mlcfg @@ -26,7 +26,7 @@ module C02Nested_NestedClosure_Closure0_Closure0 goto BB0 } BB0 { - [#"../02_nested.rs" 6 21 6 22] _0 <- ([#"../02_nested.rs" 6 21 6 22] field_00 _1); + [#"../02_nested.rs" 6 21 6 22] _0 <- field_00 _1; return _0 } @@ -74,8 +74,8 @@ module C02Nested_NestedClosure_Closure0 goto BB0 } BB0 { - [#"../02_nested.rs" 6 18 6 22] omg <- ([#"../02_nested.rs" 6 18 6 22] C02Nested_NestedClosure_Closure0_Closure0.C02Nested_NestedClosure_Closure0_Closure0 (field_00 _1)); - [#"../02_nested.rs" 7 8 7 15] _5 <- ([#"../02_nested.rs" 7 8 7 15] ()); + [#"../02_nested.rs" 6 18 6 22] omg <- C02Nested_NestedClosure_Closure0_Closure0.C02Nested_NestedClosure_Closure0_Closure0 (field_00 _1); + [#"../02_nested.rs" 7 8 7 15] _5 <- (); [#"../02_nested.rs" 7 8 7 15] _0 <- ([#"../02_nested.rs" 7 8 7 15] let () = _5 in closure00 omg); _5 <- any (); goto BB1 @@ -128,16 +128,16 @@ module C02Nested_NestedClosure goto BB0 } BB0 { - [#"../02_nested.rs" 4 12 4 16] a <- ([#"../02_nested.rs" 4 12 4 16] true); - [#"../02_nested.rs" 5 13 8 6] _4 <- ([#"../02_nested.rs" 5 13 8 6] C02Nested_NestedClosure_Closure0.C02Nested_NestedClosure_Closure0 a); - [#"../02_nested.rs" 5 13 8 8] _6 <- ([#"../02_nested.rs" 5 13 8 8] ()); + [#"../02_nested.rs" 4 12 4 16] a <- true; + [#"../02_nested.rs" 5 13 8 6] _4 <- C02Nested_NestedClosure_Closure0.C02Nested_NestedClosure_Closure0 a; + [#"../02_nested.rs" 5 13 8 8] _6 <- (); [#"../02_nested.rs" 5 13 8 8] _a <- ([#"../02_nested.rs" 5 13 8 8] let () = _6 in closure00 _4); _6 <- any (); goto BB1 } BB1 { assume { resolve0 _4 }; - [#"../02_nested.rs" 3 24 9 1] _0 <- ([#"../02_nested.rs" 3 24 9 1] ()); + [#"../02_nested.rs" 3 24 9 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg index f68b76137f..980e50de9f 100644 --- a/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg +++ b/creusot/tests/should_succeed/closures/03_generic_bound.mlcfg @@ -147,7 +147,7 @@ module C03GenericBound_ClosureParam goto BB0 } BB0 { - [#"../03_generic_bound.rs" 4 4 4 10] _3 <- ([#"../03_generic_bound.rs" 4 4 4 10] ((0 : uint32))); + [#"../03_generic_bound.rs" 4 4 4 10] _3 <- ((0 : uint32)); [#"../03_generic_bound.rs" 4 4 4 10] _0 <- ([#"../03_generic_bound.rs" 4 4 4 10] call0 f _3); _3 <- any uint32; goto BB1 @@ -183,7 +183,7 @@ module C03GenericBound_Caller_Closure0 goto BB0 } BB0 { - [#"../03_generic_bound.rs" 8 28 8 30] _0 <- ([#"../03_generic_bound.rs" 8 28 8 30] ()); + [#"../03_generic_bound.rs" 8 28 8 30] _0 <- (); return _0 } @@ -213,7 +213,7 @@ module C03GenericBound_Caller goto BB0 } BB0 { - [#"../03_generic_bound.rs" 8 18 8 30] _1 <- ([#"../03_generic_bound.rs" 8 18 8 30] C03GenericBound_Caller_Closure0.C03GenericBound_Caller_Closure0); + [#"../03_generic_bound.rs" 8 18 8 30] _1 <- C03GenericBound_Caller_Closure0.C03GenericBound_Caller_Closure0; [#"../03_generic_bound.rs" 8 4 8 31] _0 <- ([#"../03_generic_bound.rs" 8 4 8 31] closure_param0 _1); _1 <- any C03GenericBound_Caller_Closure0.c03genericbound_caller_closure0; goto BB1 diff --git a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg index 1d07ea19da..3bbfd2aa42 100644 --- a/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg +++ b/creusot/tests/should_succeed/closures/04_generic_closure.mlcfg @@ -157,7 +157,7 @@ module C04GenericClosure_GenericClosure goto BB0 } BB0 { - [#"../04_generic_closure.rs" 4 4 4 8] _4 <- ([#"../04_generic_closure.rs" 4 4 4 8] (a)); + [#"../04_generic_closure.rs" 4 4 4 8] _4 <- (a); a <- any a; [#"../04_generic_closure.rs" 4 4 4 8] _0 <- ([#"../04_generic_closure.rs" 4 4 4 8] call0 f _4); _4 <- any a; @@ -218,7 +218,7 @@ module C04GenericClosure_Mapper_Closure0 goto BB0 } BB0 { - [#"../04_generic_closure.rs" 8 33 8 35] _0 <- ([#"../04_generic_closure.rs" 8 33 8 35] ()); + [#"../04_generic_closure.rs" 8 33 8 35] _0 <- (); assert { [@expl:type invariant] inv0 _a }; assume { resolve0 _a }; assume { resolve1 _1 }; @@ -278,14 +278,14 @@ module C04GenericClosure_Mapper goto BB0 } BB0 { - [#"../04_generic_closure.rs" 8 28 8 35] _3 <- ([#"../04_generic_closure.rs" 8 28 8 35] C04GenericClosure_Mapper_Closure0.C04GenericClosure_Mapper_Closure0); + [#"../04_generic_closure.rs" 8 28 8 35] _3 <- C04GenericClosure_Mapper_Closure0.C04GenericClosure_Mapper_Closure0; [#"../04_generic_closure.rs" 8 12 8 39] _2 <- ([#"../04_generic_closure.rs" 8 12 8 39] generic_closure0 _3 x); _3 <- any C04GenericClosure_Mapper_Closure0.c04genericclosure_mapper_closure0 a; x <- any a; goto BB1 } BB1 { - [#"../04_generic_closure.rs" 7 23 9 1] _0 <- ([#"../04_generic_closure.rs" 7 23 9 1] ()); + [#"../04_generic_closure.rs" 7 23 9 1] _0 <- (); goto BB2 } BB2 { diff --git a/creusot/tests/should_succeed/closures/05_map.mlcfg b/creusot/tests/should_succeed/closures/05_map.mlcfg index f0754d7255..3623404251 100644 --- a/creusot/tests/should_succeed/closures/05_map.mlcfg +++ b/creusot/tests/should_succeed/closures/05_map.mlcfg @@ -252,11 +252,11 @@ module C05Map_Impl0_Next goto BB5 } BB3 { - [#"../05_map.rs" 20 17 20 18] e <- ([#"../05_map.rs" 20 17 20 18] Core_Option_Option_Type.some_0 _2); + [#"../05_map.rs" 20 17 20 18] e <- Core_Option_Option_Type.some_0 _2; _2 <- (let Core_Option_Option_Type.C_Some x0 = _2 in Core_Option_Option_Type.C_Some (any a)); assert { [@expl:type invariant] inv1 _2 }; assume { resolve0 _2 }; - [#"../05_map.rs" 20 28 20 42] _8 <- ([#"../05_map.rs" 20 28 20 42] (e)); + [#"../05_map.rs" 20 28 20 42] _8 <- (e); e <- any a; [#"../05_map.rs" 20 28 20 42] _6 <- ([#"../05_map.rs" 20 28 20 42] call0 (C05Map_Map_Type.map_func ( * self)) _8); _8 <- any a; @@ -275,7 +275,7 @@ module C05Map_Impl0_Next assume { resolve0 _2 }; assert { [@expl:type invariant] inv2 self }; assume { resolve1 self }; - [#"../05_map.rs" 19 20 19 24] _0 <- ([#"../05_map.rs" 19 20 19 24] Core_Option_Option_Type.C_None); + [#"../05_map.rs" 19 20 19 24] _0 <- Core_Option_Option_Type.C_None; goto BB10 } BB6 { @@ -284,7 +284,7 @@ module C05Map_Impl0_Next BB7 { assert { [@expl:type invariant] inv2 self }; assume { resolve1 self }; - [#"../05_map.rs" 20 23 20 43] _0 <- ([#"../05_map.rs" 20 23 20 43] Core_Option_Option_Type.C_Some _6); + [#"../05_map.rs" 20 23 20 43] _0 <- Core_Option_Option_Type.C_Some _6; _6 <- any b; goto BB8 } diff --git a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg index 421d85590a..c88e23e70e 100644 --- a/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg +++ b/creusot/tests/should_succeed/closures/06_fn_specs.mlcfg @@ -830,7 +830,7 @@ module C06FnSpecs_FnOnceUser goto BB1 } BB1 { - [#"../06_fn_specs.rs" 45 4 45 8] _4 <- ([#"../06_fn_specs.rs" 45 4 45 8] ((0 : usize))); + [#"../06_fn_specs.rs" 45 4 45 8] _4 <- ((0 : usize)); [#"../06_fn_specs.rs" 45 4 45 8] _0 <- ([#"../06_fn_specs.rs" 45 4 45 8] call_once0 f _4); f <- any f; _4 <- any usize; @@ -867,7 +867,7 @@ module C06FnSpecs_Caller_Closure0 goto BB0 } BB0 { - [#"../06_fn_specs.rs" 49 21 49 23] _0 <- ([#"../06_fn_specs.rs" 49 21 49 23] ()); + [#"../06_fn_specs.rs" 49 21 49 23] _0 <- (); assume { resolve0 _1 }; return _0 } @@ -904,7 +904,7 @@ module C06FnSpecs_Caller goto BB0 } BB0 { - [#"../06_fn_specs.rs" 49 17 49 23] _1 <- ([#"../06_fn_specs.rs" 49 17 49 23] C06FnSpecs_Caller_Closure0.C06FnSpecs_Caller_Closure0); + [#"../06_fn_specs.rs" 49 17 49 23] _1 <- C06FnSpecs_Caller_Closure0.C06FnSpecs_Caller_Closure0; [#"../06_fn_specs.rs" 49 4 49 24] _0 <- ([#"../06_fn_specs.rs" 49 4 49 24] fn_once_user0 _1); _1 <- any C06FnSpecs_Caller_Closure0.c06fnspecs_caller_closure0; goto BB1 diff --git a/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg b/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg index 6aa30a62af..da187d299b 100644 --- a/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg +++ b/creusot/tests/should_succeed/closures/07_mutable_capture.mlcfg @@ -47,11 +47,11 @@ module C07MutableCapture_TestFnmut_Closure1 goto BB0 } BB0 { - [#"../07_mutable_capture.rs" 10 12 10 18] _1 <- { _1 with current = (let C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 x0 = * _1 in C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 ({ (field_00 ( * _1)) with current = ([#"../07_mutable_capture.rs" 10 12 10 18] * field_00 ( * _1) + (1 : uint32)) ; })) ; }; + [#"../07_mutable_capture.rs" 10 12 10 18] _1 <- { _1 with current = (let C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 x0 = * _1 in C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 ({ (field_00 ( * _1)) with current = ( * field_00 ( * _1) + (1 : uint32)) ; })) ; }; assume { resolve0 _1 }; - [#"../07_mutable_capture.rs" 11 12 11 13] res1 <- ([#"../07_mutable_capture.rs" 11 12 11 13] (5 : int32)); - [#"../07_mutable_capture.rs" 7 8 7 35] res <- ([#"../07_mutable_capture.rs" 7 8 7 35] res1); - [#"../07_mutable_capture.rs" 8 8 8 37] _0 <- ([#"../07_mutable_capture.rs" 8 8 8 37] res); + [#"../07_mutable_capture.rs" 11 12 11 13] res1 <- (5 : int32); + [#"../07_mutable_capture.rs" 7 8 7 35] res <- res1; + [#"../07_mutable_capture.rs" 8 8 8 37] _0 <- res; return _0 } @@ -114,11 +114,11 @@ module C07MutableCapture_TestFnmut BB0 { [#"../07_mutable_capture.rs" 8 8 8 37] _4 <- Borrow.borrow_mut x; [#"../07_mutable_capture.rs" 8 8 8 37] x <- ^ _4; - [#"../07_mutable_capture.rs" 8 8 8 37] c <- ([#"../07_mutable_capture.rs" 8 8 8 37] C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 _4); + [#"../07_mutable_capture.rs" 8 8 8 37] c <- C07MutableCapture_TestFnmut_Closure1.C07MutableCapture_TestFnmut_Closure1 _4; _4 <- any borrowed uint32; [#"../07_mutable_capture.rs" 14 4 14 5] _6 <- Borrow.borrow_mut c; [#"../07_mutable_capture.rs" 14 4 14 5] c <- ^ _6; - [#"../07_mutable_capture.rs" 14 4 14 7] _7 <- ([#"../07_mutable_capture.rs" 14 4 14 7] ()); + [#"../07_mutable_capture.rs" 14 4 14 7] _7 <- (); [#"../07_mutable_capture.rs" 14 4 14 7] _5 <- ([#"../07_mutable_capture.rs" 14 4 14 7] let () = _7 in closure10 _6); _6 <- any borrowed C07MutableCapture_TestFnmut_Closure1.c07mutablecapture_testfnmut_closure1; _7 <- any (); @@ -127,7 +127,7 @@ module C07MutableCapture_TestFnmut BB1 { [#"../07_mutable_capture.rs" 15 4 15 5] _9 <- Borrow.borrow_mut c; [#"../07_mutable_capture.rs" 15 4 15 5] c <- ^ _9; - [#"../07_mutable_capture.rs" 15 4 15 7] _10 <- ([#"../07_mutable_capture.rs" 15 4 15 7] ()); + [#"../07_mutable_capture.rs" 15 4 15 7] _10 <- (); [#"../07_mutable_capture.rs" 15 4 15 7] _8 <- ([#"../07_mutable_capture.rs" 15 4 15 7] let () = _10 in closure10 _9); _9 <- any borrowed C07MutableCapture_TestFnmut_Closure1.c07mutablecapture_testfnmut_closure1; _10 <- any (); @@ -136,7 +136,7 @@ module C07MutableCapture_TestFnmut BB2 { assume { resolve0 c }; assert { [@expl:assertion] [#"../07_mutable_capture.rs" 17 20 17 33] UInt32.to_int x = 100002 }; - [#"../07_mutable_capture.rs" 5 30 18 1] _0 <- ([#"../07_mutable_capture.rs" 5 30 18 1] ()); + [#"../07_mutable_capture.rs" 5 30 18 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg b/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg index 671707d640..abfc40383d 100644 --- a/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg +++ b/creusot/tests/should_succeed/closures/08_multiple_calls.mlcfg @@ -37,8 +37,8 @@ module C08MultipleCalls_MultiUse_Closure0 } BB0 { assume { resolve0 _1 }; - [#"../08_multiple_calls.rs" 8 8 8 9] res <- ([#"../08_multiple_calls.rs" 8 8 8 9] (0 : uint32)); - [#"../08_multiple_calls.rs" 5 12 5 31] _0 <- ([#"../08_multiple_calls.rs" 5 12 5 31] res); + [#"../08_multiple_calls.rs" 8 8 8 9] res <- (0 : uint32); + [#"../08_multiple_calls.rs" 5 12 5 31] _0 <- res; return _0 } @@ -121,7 +121,7 @@ module C08MultipleCalls_MultiUse goto BB0 } BB0 { - [#"../08_multiple_calls.rs" 5 12 5 31] c <- ([#"../08_multiple_calls.rs" 5 12 5 31] C08MultipleCalls_MultiUse_Closure0.C08MultipleCalls_MultiUse_Closure0 x); + [#"../08_multiple_calls.rs" 5 12 5 31] c <- C08MultipleCalls_MultiUse_Closure0.C08MultipleCalls_MultiUse_Closure0 x; assume { resolve0 c }; [#"../08_multiple_calls.rs" 11 4 11 14] _4 <- ([#"../08_multiple_calls.rs" 11 4 11 14] uses_fn0 c); goto BB1 @@ -129,7 +129,7 @@ module C08MultipleCalls_MultiUse BB1 { assert { [@expl:type invariant] inv0 x }; assume { resolve1 x }; - [#"../08_multiple_calls.rs" 4 27 14 1] _0 <- ([#"../08_multiple_calls.rs" 4 27 14 1] ()); + [#"../08_multiple_calls.rs" 4 27 14 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/drop_pair.mlcfg b/creusot/tests/should_succeed/drop_pair.mlcfg index b4de795411..ccdd760314 100644 --- a/creusot/tests/should_succeed/drop_pair.mlcfg +++ b/creusot/tests/should_succeed/drop_pair.mlcfg @@ -26,7 +26,7 @@ module DropPair_DropPair } BB0 { assume { resolve0 _x }; - [#"../drop_pair.rs" 7 43 7 45] _0 <- ([#"../drop_pair.rs" 7 43 7 45] ()); + [#"../drop_pair.rs" 7 43 7 45] _0 <- (); return _0 } @@ -55,7 +55,7 @@ module DropPair_DropPair2 } BB0 { assume { resolve0 x }; - [#"../drop_pair.rs" 9 43 11 1] _0 <- ([#"../drop_pair.rs" 9 43 11 1] ()); + [#"../drop_pair.rs" 9 43 11 1] _0 <- (); return _0 } @@ -83,10 +83,10 @@ module DropPair_Drop assume { resolve0 _x }; [#"../drop_pair.rs" 16 9 16 10] _3 <- Borrow.borrow_final ( * y) (Borrow.get_id y); [#"../drop_pair.rs" 16 9 16 10] y <- { y with current = ( ^ _3) ; }; - [#"../drop_pair.rs" 16 4 16 10] _x <- ([#"../drop_pair.rs" 16 4 16 10] _3); + [#"../drop_pair.rs" 16 4 16 10] _x <- _3; _3 <- any borrowed uint32; assume { resolve0 _x }; - [#"../drop_pair.rs" 15 53 17 1] _0 <- ([#"../drop_pair.rs" 15 53 17 1] ()); + [#"../drop_pair.rs" 15 53 17 1] _0 <- (); assume { resolve0 y }; return _0 } diff --git a/creusot/tests/should_succeed/duration.mlcfg b/creusot/tests/should_succeed/duration.mlcfg index 2b78a75c9e..b8f947bb8d 100644 --- a/creusot/tests/should_succeed/duration.mlcfg +++ b/creusot/tests/should_succeed/duration.mlcfg @@ -226,7 +226,7 @@ module Duration_TestDuration goto BB2 } BB2 { - [#"../duration.rs" 10 12 10 32] _5 <- ([#"../duration.rs" 10 12 10 32] _6 = (0 : uint128)); + [#"../duration.rs" 10 12 10 32] _5 <- _6 = (0 : uint128); _6 <- any uint128; switch (_5) | False -> goto BB4 @@ -294,7 +294,7 @@ module Duration_TestDuration goto BB16 } BB16 { - [#"../duration.rs" 29 12 29 33] _31 <- ([#"../duration.rs" 29 12 29 33] (1 : uint64) = _32); + [#"../duration.rs" 29 12 29 33] _31 <- (1 : uint64) = _32; _32 <- any uint64; switch (_31) | False -> goto BB18 @@ -310,7 +310,7 @@ module Duration_TestDuration absurd } BB19 { - [#"../duration.rs" 30 12 30 39] _36 <- ([#"../duration.rs" 30 12 30 39] (0 : uint32) = _37); + [#"../duration.rs" 30 12 30 39] _36 <- (0 : uint32) = _37; _37 <- any uint32; switch (_36) | False -> goto BB21 @@ -326,7 +326,7 @@ module Duration_TestDuration absurd } BB22 { - [#"../duration.rs" 31 12 31 39] _41 <- ([#"../duration.rs" 31 12 31 39] (0 : uint32) = _42); + [#"../duration.rs" 31 12 31 39] _41 <- (0 : uint32) = _42; _42 <- any uint32; switch (_41) | False -> goto BB24 @@ -342,7 +342,7 @@ module Duration_TestDuration absurd } BB25 { - [#"../duration.rs" 32 12 32 38] _46 <- ([#"../duration.rs" 32 12 32 38] (0 : uint32) = _47); + [#"../duration.rs" 32 12 32 38] _46 <- (0 : uint32) = _47; _47 <- any uint32; switch (_46) | False -> goto BB27 @@ -358,13 +358,13 @@ module Duration_TestDuration absurd } BB28 { - [#"../duration.rs" 34 12 34 44] _52 <- ([#"../duration.rs" 34 12 34 44] UInt128.of_int (UInt32.to_int _53)); + [#"../duration.rs" 34 12 34 44] _52 <- UInt128.of_int (UInt32.to_int _53); _53 <- any uint32; [#"../duration.rs" 34 48 34 68] _55 <- ([#"../duration.rs" 34 48 34 68] as_millis0 d_millis); goto BB29 } BB29 { - [#"../duration.rs" 34 12 34 68] _51 <- ([#"../duration.rs" 34 12 34 68] _52 = _55); + [#"../duration.rs" 34 12 34 68] _51 <- _52 = _55; _52 <- any uint128; _55 <- any uint128; switch (_51) @@ -381,13 +381,13 @@ module Duration_TestDuration absurd } BB32 { - [#"../duration.rs" 35 12 35 44] _60 <- ([#"../duration.rs" 35 12 35 44] UInt128.of_int (UInt32.to_int _61)); + [#"../duration.rs" 35 12 35 44] _60 <- UInt128.of_int (UInt32.to_int _61); _61 <- any uint32; [#"../duration.rs" 35 48 35 68] _63 <- ([#"../duration.rs" 35 48 35 68] as_micros0 d_micros); goto BB33 } BB33 { - [#"../duration.rs" 35 12 35 68] _59 <- ([#"../duration.rs" 35 12 35 68] _60 = _63); + [#"../duration.rs" 35 12 35 68] _59 <- _60 = _63; _60 <- any uint128; _63 <- any uint128; switch (_59) @@ -404,13 +404,13 @@ module Duration_TestDuration absurd } BB36 { - [#"../duration.rs" 36 12 36 42] _68 <- ([#"../duration.rs" 36 12 36 42] UInt128.of_int (UInt32.to_int _69)); + [#"../duration.rs" 36 12 36 42] _68 <- UInt128.of_int (UInt32.to_int _69); _69 <- any uint32; [#"../duration.rs" 36 46 36 64] _71 <- ([#"../duration.rs" 36 46 36 64] as_nanos0 d_nanos); goto BB37 } BB37 { - [#"../duration.rs" 36 12 36 64] _67 <- ([#"../duration.rs" 36 12 36 64] _68 = _71); + [#"../duration.rs" 36 12 36 64] _67 <- _68 = _71; _68 <- any uint128; _71 <- any uint128; switch (_67) @@ -577,7 +577,7 @@ module Duration_TestDuration BB73 { assert { [@expl:assertion] [#"../duration.rs" 52 18 52 35] shallow_model0 sum = 1001000 }; assert { [@expl:assertion] [#"../duration.rs" 53 18 53 39] shallow_model0 difference = 999000 }; - [#"../duration.rs" 7 23 54 1] _0 <- ([#"../duration.rs" 7 23 54 1] ()); + [#"../duration.rs" 7 23 54 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/filter_positive.mlcfg b/creusot/tests/should_succeed/filter_positive.mlcfg index fe25709bb5..7fb426d3df 100644 --- a/creusot/tests/should_succeed/filter_positive.mlcfg +++ b/creusot/tests/should_succeed/filter_positive.mlcfg @@ -337,8 +337,8 @@ module FilterPositive_M goto BB0 } BB0 { - [#"../filter_positive.rs" 83 27 83 28] count <- ([#"../filter_positive.rs" 83 27 83 28] (0 : usize)); - [#"../filter_positive.rs" 84 23 84 24] i <- ([#"../filter_positive.rs" 84 23 84 24] (0 : usize)); + [#"../filter_positive.rs" 83 27 83 28] count <- (0 : usize); + [#"../filter_positive.rs" 84 23 84 24] i <- (0 : usize); goto BB1 } BB1 { @@ -358,7 +358,7 @@ module FilterPositive_M goto BB5 } BB5 { - [#"../filter_positive.rs" 89 10 89 21] _10 <- ([#"../filter_positive.rs" 89 10 89 21] i < _12); + [#"../filter_positive.rs" 89 10 89 21] _10 <- i < _12; _12 <- any usize; switch (_10) | False -> goto BB11 @@ -370,24 +370,24 @@ module FilterPositive_M goto BB7 } BB7 { - [#"../filter_positive.rs" 90 11 90 19] _15 <- ([#"../filter_positive.rs" 90 11 90 19] _17 > (0 : int32)); + [#"../filter_positive.rs" 90 11 90 19] _15 <- _17 > (0 : int32); switch (_15) | False -> goto BB9 | True -> goto BB8 end } BB8 { - [#"../filter_positive.rs" 91 12 91 22] count <- ([#"../filter_positive.rs" 91 12 91 22] count + (1 : usize)); - [#"../filter_positive.rs" 91 12 91 22] _14 <- ([#"../filter_positive.rs" 91 12 91 22] ()); + [#"../filter_positive.rs" 91 12 91 22] count <- count + (1 : usize); + [#"../filter_positive.rs" 91 12 91 22] _14 <- (); goto BB10 } BB9 { - [#"../filter_positive.rs" 92 9 92 9] _14 <- ([#"../filter_positive.rs" 92 9 92 9] ()); + [#"../filter_positive.rs" 92 9 92 9] _14 <- (); goto BB10 } BB10 { - [#"../filter_positive.rs" 93 8 93 14] i <- ([#"../filter_positive.rs" 93 8 93 14] i + (1 : usize)); - [#"../filter_positive.rs" 89 22 94 5] _9 <- ([#"../filter_positive.rs" 89 22 94 5] ()); + [#"../filter_positive.rs" 93 8 93 14] i <- i + (1 : usize); + [#"../filter_positive.rs" 89 22 94 5] _9 <- (); goto BB3 } BB11 { @@ -395,8 +395,8 @@ module FilterPositive_M goto BB12 } BB12 { - [#"../filter_positive.rs" 96 4 96 13] count <- ([#"../filter_positive.rs" 96 4 96 13] (0 : usize)); - [#"../filter_positive.rs" 98 4 98 9] i <- ([#"../filter_positive.rs" 98 4 98 9] (0 : usize)); + [#"../filter_positive.rs" 96 4 96 13] count <- (0 : usize); + [#"../filter_positive.rs" 98 4 98 9] i <- (0 : usize); goto BB13 } BB13 { @@ -415,7 +415,7 @@ module FilterPositive_M goto BB17 } BB17 { - [#"../filter_positive.rs" 102 10 102 21] _28 <- ([#"../filter_positive.rs" 102 10 102 21] i < _30); + [#"../filter_positive.rs" 102 10 102 21] _28 <- i < _30; _30 <- any usize; switch (_28) | False -> goto BB27 @@ -427,7 +427,7 @@ module FilterPositive_M goto BB19 } BB19 { - [#"../filter_positive.rs" 103 11 103 19] _33 <- ([#"../filter_positive.rs" 103 11 103 19] _35 > (0 : int32)); + [#"../filter_positive.rs" 103 11 103 19] _33 <- _35 > (0 : int32); switch (_33) | False -> goto BB25 | True -> goto BB20 @@ -453,24 +453,24 @@ module FilterPositive_M goto BB24 } BB24 { - [#"../filter_positive.rs" 113 12 113 27] _46 <- { _46 with current = ([#"../filter_positive.rs" 113 12 113 27] _43) ; }; + [#"../filter_positive.rs" 113 12 113 27] _46 <- { _46 with current = _43 ; }; assume { resolve1 _46 }; - [#"../filter_positive.rs" 114 12 114 22] count <- ([#"../filter_positive.rs" 114 12 114 22] count + (1 : usize)); - [#"../filter_positive.rs" 103 20 115 9] _32 <- ([#"../filter_positive.rs" 103 20 115 9] ()); + [#"../filter_positive.rs" 114 12 114 22] count <- count + (1 : usize); + [#"../filter_positive.rs" 103 20 115 9] _32 <- (); goto BB26 } BB25 { - [#"../filter_positive.rs" 115 9 115 9] _32 <- ([#"../filter_positive.rs" 115 9 115 9] ()); + [#"../filter_positive.rs" 115 9 115 9] _32 <- (); goto BB26 } BB26 { - [#"../filter_positive.rs" 116 8 116 14] i <- ([#"../filter_positive.rs" 116 8 116 14] i + (1 : usize)); - [#"../filter_positive.rs" 102 22 117 5] _9 <- ([#"../filter_positive.rs" 102 22 117 5] ()); + [#"../filter_positive.rs" 116 8 116 14] i <- i + (1 : usize); + [#"../filter_positive.rs" 102 22 117 5] _9 <- (); goto BB15 } BB27 { assume { resolve0 t }; - [#"../filter_positive.rs" 118 11 118 12] _0 <- ([#"../filter_positive.rs" 118 11 118 12] u); + [#"../filter_positive.rs" 118 11 118 12] _0 <- u; u <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global); goto BB28 } diff --git a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg index 3f5801cef8..b737ec0b3e 100644 --- a/creusot/tests/should_succeed/ghost_ptr_token.mlcfg +++ b/creusot/tests/should_succeed/ghost_ptr_token.mlcfg @@ -303,13 +303,13 @@ module GhostPtrToken_Test ensures { [#"../../../../creusot-contracts/src/ghost_ptr.rs" 41 14 41 38] shallow_model0 result = empty0 () } let constant promoted0 [#"../ghost_ptr_token.rs" 3 0 3 13] : int32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../ghost_ptr_token.rs" 17 40 17 41] (1 : int32) in let _0 = _1 in _0 + let _1 = (1 : int32) in let _0 = _1 in _0 let constant promoted1 [#"../ghost_ptr_token.rs" 3 0 3 13] : int32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../ghost_ptr_token.rs" 16 40 16 41] (2 : int32) in let _0 = _1 in _0 + let _1 = (2 : int32) in let _0 = _1 in _0 let constant promoted2 [#"../ghost_ptr_token.rs" 3 0 3 13] : int32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../ghost_ptr_token.rs" 13 20 13 21] (2 : int32) in let _0 = _1 in _0 + let _1 = (2 : int32) in let _0 = _1 in _0 let constant promoted3 [#"../ghost_ptr_token.rs" 3 0 3 13] : int32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../ghost_ptr_token.rs" 12 20 12 21] (1 : int32) in let _0 = _1 in _0 + let _1 = (1 : int32) in let _0 = _1 in _0 let rec cfg test [#"../ghost_ptr_token.rs" 3 0 3 13] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : () = [@vc:do_not_keep_trace] [@vc:sp] var _0 : (); @@ -502,7 +502,7 @@ module GhostPtrToken_Test end } BB18 { - [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- ([#"../ghost_ptr_token.rs" 3 14 18 1] ()); + [#"../ghost_ptr_token.rs" 3 14 18 1] _0 <- (); return _0 } BB19 { diff --git a/creusot/tests/should_succeed/hashmap.mlcfg b/creusot/tests/should_succeed/hashmap.mlcfg index 8decff6f31..5bdd32ea97 100644 --- a/creusot/tests/should_succeed/hashmap.mlcfg +++ b/creusot/tests/should_succeed/hashmap.mlcfg @@ -54,7 +54,7 @@ module Hashmap_Impl2_Hash goto BB0 } BB0 { - [#"../hashmap.rs" 60 8 60 20] _0 <- ([#"../hashmap.rs" 60 8 60 20] UInt64.of_int (UIntSize.to_int self)); + [#"../hashmap.rs" 60 8 60 20] _0 <- UInt64.of_int (UIntSize.to_int self); return _0 } @@ -290,18 +290,18 @@ module Hashmap_Impl5_New goto BB0 } BB0 { - [#"../hashmap.rs" 99 44 99 53] _7 <- ([#"../hashmap.rs" 99 44 99 53] Hashmap_List_Type.C_Nil); + [#"../hashmap.rs" 99 44 99 53] _7 <- Hashmap_List_Type.C_Nil; [#"../hashmap.rs" 99 39 99 60] _6 <- ([#"../hashmap.rs" 99 39 99 60] from_elem0 _7 size); _7 <- any Hashmap_List_Type.t_list (k, v); goto BB1 } BB1 { - [#"../hashmap.rs" 99 18 99 62] res <- ([#"../hashmap.rs" 99 18 99 62] Hashmap_MyHashMap_Type.C_MyHashMap _6); + [#"../hashmap.rs" 99 18 99 62] res <- Hashmap_MyHashMap_Type.C_MyHashMap _6; _6 <- any Alloc_Vec_Vec_Type.t_vec (Hashmap_List_Type.t_list (k, v)) (Alloc_Alloc_Global_Type.t_global); goto BB2 } BB2 { - [#"../hashmap.rs" 100 8 100 11] _0 <- ([#"../hashmap.rs" 100 8 100 11] res); + [#"../hashmap.rs" 100 8 100 11] _0 <- res; res <- any Hashmap_MyHashMap_Type.t_myhashmap k v; goto BB3 } @@ -763,15 +763,15 @@ module Hashmap_Impl5_Add goto BB3 } BB3 { - [#"../hashmap.rs" 110 27 110 46] _12 <- ([#"../hashmap.rs" 110 27 110 46] UIntSize.of_int (UInt64.to_int _13)); + [#"../hashmap.rs" 110 27 110 46] _12 <- UIntSize.of_int (UInt64.to_int _13); _13 <- any uint64; - [#"../hashmap.rs" 110 49 110 55] _15 <- ([#"../hashmap.rs" 110 49 110 55] length); - [#"../hashmap.rs" 110 27 110 55] _16 <- ([#"../hashmap.rs" 110 27 110 55] _15 = (0 : usize)); + [#"../hashmap.rs" 110 49 110 55] _15 <- length; + [#"../hashmap.rs" 110 27 110 55] _16 <- _15 = (0 : usize); assert { [@expl:remainder by zero] [#"../hashmap.rs" 110 27 110 55] not _16 }; goto BB4 } BB4 { - [#"../hashmap.rs" 110 27 110 55] index <- ([#"../hashmap.rs" 110 27 110 55] _12 % _15); + [#"../hashmap.rs" 110 27 110 55] index <- _12 % _15; _12 <- any usize; _15 <- any usize; [#"../hashmap.rs" 111 39 111 51] _20 <- Borrow.borrow_final (Hashmap_MyHashMap_Type.myhashmap_buckets ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1); @@ -826,7 +826,7 @@ module Hashmap_Impl5_Add [#"../hashmap.rs" 121 31 121 33] tl <- Borrow.borrow_final (Hashmap_List_Type.cons_1 ( * l)) (Borrow.inherit_id (Borrow.get_id l) 2); [#"../hashmap.rs" 121 31 121 33] l <- { l with current = (let Hashmap_List_Type.C_Cons x0 x1 = * l in Hashmap_List_Type.C_Cons x0 ( ^ tl)) ; }; assume { inv8 ( ^ tl) }; - [#"../hashmap.rs" 122 21 122 23] tl1 <- ([#"../hashmap.rs" 122 21 122 23] tl); + [#"../hashmap.rs" 122 21 122 23] tl1 <- tl; tl <- any borrowed (Hashmap_List_Type.t_list (k, v)); [#"../hashmap.rs" 123 15 123 24] _38 <- ([#"../hashmap.rs" 123 15 123 24] eq0 ( * k) key); goto BB11 @@ -846,7 +846,7 @@ module Hashmap_Impl5_Add assume { resolve6 key }; assert { [@expl:type invariant] inv7 val' }; assume { resolve7 val' }; - [#"../hashmap.rs" 124 16 124 24] v <- { v with current = ([#"../hashmap.rs" 124 16 124 24] val') ; }; + [#"../hashmap.rs" 124 16 124 24] v <- { v with current = val' ; }; assert { [@expl:type invariant] inv7 ( * v) }; assume { resolve7 ( * v) }; assert { [@expl:type invariant] inv9 v }; @@ -858,7 +858,7 @@ module Hashmap_Impl5_Add assert { [@expl:type invariant] inv12 self }; assume { resolve8 self }; assert { [@expl:assertion] [#"../hashmap.rs" 125 32 125 52] hashmap_inv0 ( * self) }; - [#"../hashmap.rs" 126 16 126 22] _0 <- ([#"../hashmap.rs" 126 16 126 22] ()); + [#"../hashmap.rs" 126 16 126 22] _0 <- (); goto BB20 } BB13 { @@ -874,7 +874,7 @@ module Hashmap_Impl5_Add assume { inv2 ( ^ _45) }; assert { [@expl:type invariant] inv3 l }; assume { resolve1 l }; - [#"../hashmap.rs" 128 12 128 25] l <- ([#"../hashmap.rs" 128 12 128 25] _45); + [#"../hashmap.rs" 128 12 128 25] l <- _45; _45 <- any borrowed (Hashmap_List_Type.t_list (k, v)); assert { [@expl:type invariant] inv3 _46 }; assume { resolve1 _46 }; @@ -887,12 +887,12 @@ module Hashmap_Impl5_Add assume { resolve6 key }; assert { [@expl:type invariant] inv7 val' }; assume { resolve7 val' }; - [#"../hashmap.rs" 131 18 131 28] _51 <- ([#"../hashmap.rs" 131 18 131 28] (key, val')); - [#"../hashmap.rs" 131 39 131 42] _55 <- ([#"../hashmap.rs" 131 39 131 42] Hashmap_List_Type.C_Nil); + [#"../hashmap.rs" 131 18 131 28] _51 <- (key, val'); + [#"../hashmap.rs" 131 39 131 42] _55 <- Hashmap_List_Type.C_Nil; goto BB15 } BB15 { - [#"../hashmap.rs" 131 13 131 44] _50 <- ([#"../hashmap.rs" 131 13 131 44] Hashmap_List_Type.C_Cons _51 _55); + [#"../hashmap.rs" 131 13 131 44] _50 <- Hashmap_List_Type.C_Cons _51 _55; _51 <- any (k, v); _55 <- any Hashmap_List_Type.t_list (k, v); goto BB16 @@ -901,7 +901,7 @@ module Hashmap_Impl5_Add goto BB17 } BB17 { - [#"../hashmap.rs" 131 8 131 10] l <- { l with current = ([#"../hashmap.rs" 131 8 131 10] _50) ; }; + [#"../hashmap.rs" 131 8 131 10] l <- { l with current = _50 ; }; _50 <- any Hashmap_List_Type.t_list (k, v); assert { [@expl:type invariant] inv2 ( * l) }; assume { resolve9 ( * l) }; @@ -915,7 +915,7 @@ module Hashmap_Impl5_Add assert { [@expl:type invariant] inv12 self }; assume { resolve8 self }; assert { [@expl:assertion] [#"../hashmap.rs" 133 24 133 44] hashmap_inv0 ( * self) }; - [#"../hashmap.rs" 106 42 134 5] _0 <- ([#"../hashmap.rs" 106 42 134 5] ()); + [#"../hashmap.rs" 106 42 134 5] _0 <- (); goto BB20 } BB20 { @@ -1256,18 +1256,18 @@ module Hashmap_Impl5_Get goto BB1 } BB1 { - [#"../hashmap.rs" 142 27 142 46] _7 <- ([#"../hashmap.rs" 142 27 142 46] UIntSize.of_int (UInt64.to_int _8)); + [#"../hashmap.rs" 142 27 142 46] _7 <- UIntSize.of_int (UInt64.to_int _8); _8 <- any uint64; [#"../hashmap.rs" 142 49 142 67] _10 <- ([#"../hashmap.rs" 142 49 142 67] len0 (Hashmap_MyHashMap_Type.myhashmap_buckets self)); goto BB2 } BB2 { - [#"../hashmap.rs" 142 27 142 67] _12 <- ([#"../hashmap.rs" 142 27 142 67] _10 = (0 : usize)); + [#"../hashmap.rs" 142 27 142 67] _12 <- _10 = (0 : usize); assert { [@expl:remainder by zero] [#"../hashmap.rs" 142 27 142 67] not _12 }; goto BB3 } BB3 { - [#"../hashmap.rs" 142 27 142 67] index <- ([#"../hashmap.rs" 142 27 142 67] _7 % _10); + [#"../hashmap.rs" 142 27 142 67] index <- _7 % _10; _7 <- any usize; _10 <- any usize; assert { [@expl:type invariant] inv0 self }; @@ -1276,7 +1276,7 @@ module Hashmap_Impl5_Get goto BB4 } BB4 { - [#"../hashmap.rs" 143 20 143 40] l <- ([#"../hashmap.rs" 143 20 143 40] _14); + [#"../hashmap.rs" 143 20 143 40] l <- _14; assert { [@expl:type invariant] inv1 _14 }; assume { resolve1 _14 }; goto BB5 @@ -1295,9 +1295,9 @@ module Hashmap_Impl5_Get goto BB8 } BB8 { - [#"../hashmap.rs" 146 30 146 31] k <- ([#"../hashmap.rs" 146 30 146 31] let (a, _) = Hashmap_List_Type.cons_0 l in a); - [#"../hashmap.rs" 146 33 146 34] v <- ([#"../hashmap.rs" 146 33 146 34] let (_, a) = Hashmap_List_Type.cons_0 l in a); - [#"../hashmap.rs" 146 37 146 39] tl <- ([#"../hashmap.rs" 146 37 146 39] Hashmap_List_Type.cons_1 l); + [#"../hashmap.rs" 146 30 146 31] k <- (let (a, _) = Hashmap_List_Type.cons_0 l in a); + [#"../hashmap.rs" 146 33 146 34] v <- (let (_, a) = Hashmap_List_Type.cons_0 l in a); + [#"../hashmap.rs" 146 37 146 39] tl <- Hashmap_List_Type.cons_1 l; assert { [@expl:type invariant] inv1 l }; assume { resolve1 l }; assert { [@expl:type invariant] inv2 k }; @@ -1318,18 +1318,18 @@ module Hashmap_Impl5_Get assume { resolve5 key }; assert { [@expl:type invariant] inv3 v }; assume { resolve3 v }; - [#"../hashmap.rs" 148 23 148 30] _0 <- ([#"../hashmap.rs" 148 23 148 30] Core_Option_Option_Type.C_Some v); + [#"../hashmap.rs" 148 23 148 30] _0 <- Core_Option_Option_Type.C_Some v; goto BB13 } BB11 { assert { [@expl:type invariant] inv3 v }; assume { resolve3 v }; - [#"../hashmap.rs" 150 16 150 21] _31 <- ([#"../hashmap.rs" 150 16 150 21] tl); + [#"../hashmap.rs" 150 16 150 21] _31 <- tl; assert { [@expl:type invariant] inv4 tl }; assume { resolve4 tl }; assert { [@expl:type invariant] inv1 _31 }; assume { resolve1 _31 }; - [#"../hashmap.rs" 150 12 150 21] l <- ([#"../hashmap.rs" 150 12 150 21] _31); + [#"../hashmap.rs" 150 12 150 21] l <- _31; goto BB5 } BB12 { @@ -1337,7 +1337,7 @@ module Hashmap_Impl5_Get assume { resolve1 l }; assert { [@expl:type invariant] inv5 key }; assume { resolve5 key }; - [#"../hashmap.rs" 152 15 152 19] _0 <- ([#"../hashmap.rs" 152 15 152 19] Core_Option_Option_Type.C_None); + [#"../hashmap.rs" 152 15 152 19] _0 <- Core_Option_Option_Type.C_None; goto BB13 } BB13 { @@ -1753,14 +1753,14 @@ module Hashmap_Impl5_Resize goto BB2 } BB2 { - [#"../hashmap.rs" 163 32 163 54] _9 <- ([#"../hashmap.rs" 163 32 163 54] _10 * (2 : usize)); + [#"../hashmap.rs" 163 32 163 54] _9 <- _10 * (2 : usize); _10 <- any usize; [#"../hashmap.rs" 163 22 163 55] new <- ([#"../hashmap.rs" 163 22 163 55] new1 _9); _9 <- any usize; goto BB3 } BB3 { - [#"../hashmap.rs" 165 27 165 28] i <- ([#"../hashmap.rs" 165 27 165 28] (0 : usize)); + [#"../hashmap.rs" 165 27 165 28] i <- (0 : usize); goto BB4 } BB4 { @@ -1784,7 +1784,7 @@ module Hashmap_Impl5_Resize goto BB8 } BB8 { - [#"../hashmap.rs" 176 14 176 36] _22 <- ([#"../hashmap.rs" 176 14 176 36] i < _24); + [#"../hashmap.rs" 176 14 176 36] _22 <- i < _24; _24 <- any usize; switch (_22) | False -> goto BB29 @@ -1806,7 +1806,7 @@ module Hashmap_Impl5_Resize [#"../hashmap.rs" 177 51 177 71] _27 <- Borrow.borrow_final ( * _28) (Borrow.get_id _28); [#"../hashmap.rs" 177 51 177 71] _28 <- { _28 with current = ( ^ _27) ; }; assume { inv5 ( ^ _27) }; - [#"../hashmap.rs" 177 73 177 82] _32 <- ([#"../hashmap.rs" 177 73 177 82] Hashmap_List_Type.C_Nil); + [#"../hashmap.rs" 177 73 177 82] _32 <- Hashmap_List_Type.C_Nil; [#"../hashmap.rs" 177 33 177 83] l <- ([#"../hashmap.rs" 177 33 177 83] replace0 _27 _32); _27 <- any borrowed (Hashmap_List_Type.t_list (k, v)); _32 <- any Hashmap_List_Type.t_list (k, v); @@ -1856,9 +1856,9 @@ module Hashmap_Impl5_Resize goto BB20 } BB20 { - [#"../hashmap.rs" 188 34 188 35] k <- ([#"../hashmap.rs" 188 34 188 35] let (a, _) = Hashmap_List_Type.cons_0 l in a); - [#"../hashmap.rs" 188 37 188 38] v <- ([#"../hashmap.rs" 188 37 188 38] let (_, a) = Hashmap_List_Type.cons_0 l in a); - [#"../hashmap.rs" 188 41 188 43] tl <- ([#"../hashmap.rs" 188 41 188 43] Hashmap_List_Type.cons_1 l); + [#"../hashmap.rs" 188 34 188 35] k <- (let (a, _) = Hashmap_List_Type.cons_0 l in a); + [#"../hashmap.rs" 188 37 188 38] v <- (let (_, a) = Hashmap_List_Type.cons_0 l in a); + [#"../hashmap.rs" 188 41 188 43] tl <- Hashmap_List_Type.cons_1 l; l <- (let Hashmap_List_Type.C_Cons x0 x1 = l in Hashmap_List_Type.C_Cons x0 (any Hashmap_List_Type.t_list (k, v))); assert { [@expl:type invariant] inv5 l }; assume { resolve4 l }; @@ -1879,12 +1879,12 @@ module Hashmap_Impl5_Resize goto BB22 } BB22 { - [#"../hashmap.rs" 190 16 190 17] l <- ([#"../hashmap.rs" 190 16 190 17] tl); + [#"../hashmap.rs" 190 16 190 17] l <- tl; tl <- any Hashmap_List_Type.t_list (k, v); goto BB24 } BB24 { - [#"../hashmap.rs" 188 49 191 13] _21 <- ([#"../hashmap.rs" 188 49 191 13] ()); + [#"../hashmap.rs" 188 49 191 13] _21 <- (); goto BB26 } BB25 { @@ -1897,8 +1897,8 @@ module Hashmap_Impl5_Resize goto BB17 } BB27 { - [#"../hashmap.rs" 193 12 193 18] i <- ([#"../hashmap.rs" 193 12 193 18] i + (1 : usize)); - [#"../hashmap.rs" 176 37 194 9] _21 <- ([#"../hashmap.rs" 176 37 194 9] ()); + [#"../hashmap.rs" 193 12 193 18] i <- i + (1 : usize); + [#"../hashmap.rs" 176 37 194 9] _21 <- (); goto BB28 } BB28 { @@ -1908,7 +1908,7 @@ module Hashmap_Impl5_Resize goto BB30 } BB30 { - [#"../hashmap.rs" 196 8 196 13] self <- { self with current = ([#"../hashmap.rs" 196 8 196 13] new) ; }; + [#"../hashmap.rs" 196 8 196 13] self <- { self with current = new ; }; new <- any Hashmap_MyHashMap_Type.t_myhashmap k v; assert { [@expl:type invariant] inv2 ( * self) }; assume { resolve1 ( * self) }; @@ -1917,7 +1917,7 @@ module Hashmap_Impl5_Resize goto BB32 } BB32 { - [#"../hashmap.rs" 161 25 197 5] _0 <- ([#"../hashmap.rs" 161 25 197 5] ()); + [#"../hashmap.rs" 161 25 197 5] _0 <- (); goto BB33 } BB33 { @@ -2220,25 +2220,25 @@ module Hashmap_Main goto BB8 } BB8 { - [#"../hashmap.rs" 234 4 234 18] _x <- ([#"../hashmap.rs" 234 4 234 18] _13); + [#"../hashmap.rs" 234 4 234 18] _x <- _13; _13 <- any Core_Option_Option_Type.t_option isize; [#"../hashmap.rs" 235 9 235 18] _15 <- ([#"../hashmap.rs" 235 9 235 18] get0 h1 (2 : usize)); goto BB9 } BB9 { - [#"../hashmap.rs" 235 4 235 18] _y <- ([#"../hashmap.rs" 235 4 235 18] _15); + [#"../hashmap.rs" 235 4 235 18] _y <- _15; _15 <- any Core_Option_Option_Type.t_option isize; [#"../hashmap.rs" 236 9 236 18] _17 <- ([#"../hashmap.rs" 236 9 236 18] get0 h2 (1 : usize)); goto BB10 } BB10 { - [#"../hashmap.rs" 236 4 236 18] _z <- ([#"../hashmap.rs" 236 4 236 18] _17); + [#"../hashmap.rs" 236 4 236 18] _z <- _17; _17 <- any Core_Option_Option_Type.t_option isize; [#"../hashmap.rs" 237 9 237 18] _19 <- ([#"../hashmap.rs" 237 9 237 18] get0 h2 (2 : usize)); goto BB11 } BB11 { - [#"../hashmap.rs" 237 4 237 18] _t <- ([#"../hashmap.rs" 237 4 237 18] _19); + [#"../hashmap.rs" 237 4 237 18] _t <- _19; _19 <- any Core_Option_Option_Type.t_option isize; [#"../hashmap.rs" 240 4 240 6] _22 <- Borrow.borrow_mut h2; [#"../hashmap.rs" 240 4 240 6] h2 <- ^ _22; @@ -2251,27 +2251,27 @@ module Hashmap_Main goto BB13 } BB13 { - [#"../hashmap.rs" 241 4 241 18] _x <- ([#"../hashmap.rs" 241 4 241 18] _23); + [#"../hashmap.rs" 241 4 241 18] _x <- _23; _23 <- any Core_Option_Option_Type.t_option isize; [#"../hashmap.rs" 242 9 242 18] _25 <- ([#"../hashmap.rs" 242 9 242 18] get0 h1 (2 : usize)); goto BB14 } BB14 { - [#"../hashmap.rs" 242 4 242 18] _y <- ([#"../hashmap.rs" 242 4 242 18] _25); + [#"../hashmap.rs" 242 4 242 18] _y <- _25; _25 <- any Core_Option_Option_Type.t_option isize; [#"../hashmap.rs" 243 9 243 18] _27 <- ([#"../hashmap.rs" 243 9 243 18] get0 h2 (1 : usize)); goto BB15 } BB15 { - [#"../hashmap.rs" 243 4 243 18] _z <- ([#"../hashmap.rs" 243 4 243 18] _27); + [#"../hashmap.rs" 243 4 243 18] _z <- _27; _27 <- any Core_Option_Option_Type.t_option isize; [#"../hashmap.rs" 244 9 244 18] _29 <- ([#"../hashmap.rs" 244 9 244 18] get0 h2 (2 : usize)); goto BB16 } BB16 { - [#"../hashmap.rs" 244 4 244 18] _t <- ([#"../hashmap.rs" 244 4 244 18] _29); + [#"../hashmap.rs" 244 4 244 18] _t <- _29; _29 <- any Core_Option_Option_Type.t_option isize; - [#"../hashmap.rs" 217 14 247 1] _0 <- ([#"../hashmap.rs" 217 14 247 1] ()); + [#"../hashmap.rs" 217 14 247 1] _0 <- (); goto BB17 } BB17 { diff --git a/creusot/tests/should_succeed/heapsort_generic.mlcfg b/creusot/tests/should_succeed/heapsort_generic.mlcfg index a94fc218d4..3ffb9eeb19 100644 --- a/creusot/tests/should_succeed/heapsort_generic.mlcfg +++ b/creusot/tests/should_succeed/heapsort_generic.mlcfg @@ -578,7 +578,7 @@ module HeapsortGeneric_SiftDown BB1 { assert { [@expl:type invariant] inv0 old_v }; assume { resolve0 old_v }; - [#"../heapsort_generic.rs" 46 16 46 21] i <- ([#"../heapsort_generic.rs" 46 16 46 21] start); + [#"../heapsort_generic.rs" 46 16 46 21] i <- start; goto BB2 } BB2 { @@ -592,13 +592,13 @@ module HeapsortGeneric_SiftDown goto BB3 } BB3 { - [#"../heapsort_generic.rs" 60 16 60 23] _28 <- ([#"../heapsort_generic.rs" 60 16 60 23] (2 : usize) = (0 : usize)); + [#"../heapsort_generic.rs" 60 16 60 23] _28 <- (2 : usize) = (0 : usize); assert { [@expl:division by zero] [#"../heapsort_generic.rs" 60 16 60 23] not _28 }; goto BB4 } BB4 { - [#"../heapsort_generic.rs" 60 16 60 23] _26 <- ([#"../heapsort_generic.rs" 60 16 60 23] end' / (2 : usize)); - [#"../heapsort_generic.rs" 60 11 60 23] _24 <- ([#"../heapsort_generic.rs" 60 11 60 23] i >= _26); + [#"../heapsort_generic.rs" 60 16 60 23] _26 <- end' / (2 : usize); + [#"../heapsort_generic.rs" 60 11 60 23] _24 <- i >= _26; _26 <- any usize; switch (_24) | False -> goto BB6 @@ -608,15 +608,15 @@ module HeapsortGeneric_SiftDown BB5 { assert { [@expl:type invariant] inv6 v }; assume { resolve3 v }; - [#"../heapsort_generic.rs" 61 12 61 18] _0 <- ([#"../heapsort_generic.rs" 61 12 61 18] ()); + [#"../heapsort_generic.rs" 61 12 61 18] _0 <- (); goto BB23 } BB6 { - [#"../heapsort_generic.rs" 64 24 64 29] _31 <- ([#"../heapsort_generic.rs" 64 24 64 29] (2 : usize) * i); - [#"../heapsort_generic.rs" 64 24 64 33] child <- ([#"../heapsort_generic.rs" 64 24 64 33] _31 + (1 : usize)); + [#"../heapsort_generic.rs" 64 24 64 29] _31 <- (2 : usize) * i; + [#"../heapsort_generic.rs" 64 24 64 33] child <- _31 + (1 : usize); _31 <- any usize; - [#"../heapsort_generic.rs" 65 11 65 20] _35 <- ([#"../heapsort_generic.rs" 65 11 65 20] child + (1 : usize)); - [#"../heapsort_generic.rs" 65 11 65 26] _34 <- ([#"../heapsort_generic.rs" 65 11 65 26] _35 < end'); + [#"../heapsort_generic.rs" 65 11 65 20] _35 <- child + (1 : usize); + [#"../heapsort_generic.rs" 65 11 65 26] _34 <- _35 < end'; _35 <- any usize; switch (_34) | False -> goto BB8 @@ -633,7 +633,7 @@ module HeapsortGeneric_SiftDown BB9 { assert { [@expl:type invariant] inv2 _40 }; assume { resolve1 _40 }; - [#"../heapsort_generic.rs" 65 43 65 52] _46 <- ([#"../heapsort_generic.rs" 65 43 65 52] child + (1 : usize)); + [#"../heapsort_generic.rs" 65 43 65 52] _46 <- child + (1 : usize); [#"../heapsort_generic.rs" 65 42 65 53] _44 <- ([#"../heapsort_generic.rs" 65 42 65 53] index0 ( * v) _46); _46 <- any usize; goto BB10 @@ -651,15 +651,15 @@ module HeapsortGeneric_SiftDown end } BB12 { - [#"../heapsort_generic.rs" 66 12 66 22] child <- ([#"../heapsort_generic.rs" 66 12 66 22] child + (1 : usize)); - [#"../heapsort_generic.rs" 66 12 66 22] _33 <- ([#"../heapsort_generic.rs" 66 12 66 22] ()); + [#"../heapsort_generic.rs" 66 12 66 22] child <- child + (1 : usize); + [#"../heapsort_generic.rs" 66 12 66 22] _33 <- (); goto BB15 } BB13 { goto BB14 } BB14 { - [#"../heapsort_generic.rs" 67 9 67 9] _33 <- ([#"../heapsort_generic.rs" 67 9 67 9] ()); + [#"../heapsort_generic.rs" 67 9 67 9] _33 <- (); goto BB15 } BB15 { @@ -687,7 +687,7 @@ module HeapsortGeneric_SiftDown BB19 { assert { [@expl:type invariant] inv6 v }; assume { resolve3 v }; - [#"../heapsort_generic.rs" 69 12 69 18] _0 <- ([#"../heapsort_generic.rs" 69 12 69 18] ()); + [#"../heapsort_generic.rs" 69 12 69 18] _0 <- (); goto BB23 } BB20 { @@ -709,7 +709,7 @@ module HeapsortGeneric_SiftDown BB22 { assert { [@expl:type invariant] inv5 _61 }; assume { resolve2 _61 }; - [#"../heapsort_generic.rs" 72 8 72 17] i <- ([#"../heapsort_generic.rs" 72 8 72 17] child); + [#"../heapsort_generic.rs" 72 8 72 17] i <- child; goto BB2 } BB23 { @@ -1099,12 +1099,12 @@ module HeapsortGeneric_HeapSort goto BB2 } BB2 { - [#"../heapsort_generic.rs" 99 20 99 31] _10 <- ([#"../heapsort_generic.rs" 99 20 99 31] (2 : usize) = (0 : usize)); + [#"../heapsort_generic.rs" 99 20 99 31] _10 <- (2 : usize) = (0 : usize); assert { [@expl:division by zero] [#"../heapsort_generic.rs" 99 20 99 31] not _10 }; goto BB3 } BB3 { - [#"../heapsort_generic.rs" 99 20 99 31] start <- ([#"../heapsort_generic.rs" 99 20 99 31] _8 / (2 : usize)); + [#"../heapsort_generic.rs" 99 20 99 31] start <- _8 / (2 : usize); _8 <- any usize; goto BB4 } @@ -1115,14 +1115,14 @@ module HeapsortGeneric_HeapSort goto BB5 } BB5 { - [#"../heapsort_generic.rs" 103 10 103 19] _16 <- ([#"../heapsort_generic.rs" 103 10 103 19] start > (0 : usize)); + [#"../heapsort_generic.rs" 103 10 103 19] _16 <- start > (0 : usize); switch (_16) | False -> goto BB9 | True -> goto BB6 end } BB6 { - [#"../heapsort_generic.rs" 104 8 104 18] start <- ([#"../heapsort_generic.rs" 104 8 104 18] start - (1 : usize)); + [#"../heapsort_generic.rs" 104 8 104 18] start <- start - (1 : usize); [#"../heapsort_generic.rs" 105 18 105 19] _19 <- Borrow.borrow_mut ( * v); [#"../heapsort_generic.rs" 105 18 105 19] v <- { v with current = ( ^ _19) ; }; assume { inv2 ( ^ _19) }; @@ -1136,7 +1136,7 @@ module HeapsortGeneric_HeapSort goto BB8 } BB8 { - [#"../heapsort_generic.rs" 103 20 106 5] _15 <- ([#"../heapsort_generic.rs" 103 20 106 5] ()); + [#"../heapsort_generic.rs" 103 20 106 5] _15 <- (); goto BB4 } BB9 { @@ -1155,14 +1155,14 @@ module HeapsortGeneric_HeapSort goto BB12 } BB12 { - [#"../heapsort_generic.rs" 115 10 115 17] _33 <- ([#"../heapsort_generic.rs" 115 10 115 17] end' > (1 : usize)); + [#"../heapsort_generic.rs" 115 10 115 17] _33 <- end' > (1 : usize); switch (_33) | False -> goto BB17 | True -> goto BB13 end } BB13 { - [#"../heapsort_generic.rs" 116 8 116 16] end' <- ([#"../heapsort_generic.rs" 116 8 116 16] end' - (1 : usize)); + [#"../heapsort_generic.rs" 116 8 116 16] end' <- end' - (1 : usize); [#"../heapsort_generic.rs" 117 8 117 9] _38 <- Borrow.borrow_mut ( * v); [#"../heapsort_generic.rs" 117 8 117 9] v <- { v with current = ( ^ _38) ; }; assume { inv2 ( ^ _38) }; @@ -1190,13 +1190,13 @@ module HeapsortGeneric_HeapSort goto BB16 } BB16 { - [#"../heapsort_generic.rs" 115 18 124 5] _15 <- ([#"../heapsort_generic.rs" 115 18 124 5] ()); + [#"../heapsort_generic.rs" 115 18 124 5] _15 <- (); goto BB11 } BB17 { assert { [@expl:type invariant] inv1 v }; assume { resolve1 v }; - [#"../heapsort_generic.rs" 115 4 124 5] _0 <- ([#"../heapsort_generic.rs" 115 4 124 5] ()); + [#"../heapsort_generic.rs" 115 4 124 5] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/hillel.mlcfg b/creusot/tests/should_succeed/hillel.mlcfg index 1ff97fbf85..7b12bfcbb2 100644 --- a/creusot/tests/should_succeed/hillel.mlcfg +++ b/creusot/tests/should_succeed/hillel.mlcfg @@ -216,7 +216,7 @@ module Hillel_RightPad goto BB4 } BB4 { - [#"../hillel.rs" 24 10 24 25] _18 <- ([#"../hillel.rs" 24 10 24 25] _19 < len); + [#"../hillel.rs" 24 10 24 25] _18 <- _19 < len; _19 <- any usize; switch (_18) | False -> goto BB7 @@ -239,7 +239,7 @@ module Hillel_RightPad assume { resolve1 pad }; assert { [@expl:type invariant] inv2 str }; assume { resolve2 str }; - [#"../hillel.rs" 24 4 26 5] _0 <- ([#"../hillel.rs" 24 4 26 5] ()); + [#"../hillel.rs" 24 4 26 5] _0 <- (); return _0 } @@ -442,7 +442,7 @@ module Hillel_LeftPad goto BB5 } BB5 { - [#"../hillel.rs" 43 10 43 25] _19 <- ([#"../hillel.rs" 43 10 43 25] _20 < len); + [#"../hillel.rs" 43 10 43 25] _19 <- _20 < len; _20 <- any usize; switch (_19) | False -> goto BB9 @@ -462,7 +462,7 @@ module Hillel_LeftPad goto BB8 } BB8 { - [#"../hillel.rs" 45 8 45 37] c <- ([#"../hillel.rs" 45 8 45 37] _26); + [#"../hillel.rs" 45 8 45 37] c <- _26; _26 <- any Snapshot.snap_ty usize; goto BB3 } @@ -471,7 +471,7 @@ module Hillel_LeftPad assume { resolve1 pad }; assert { [@expl:type invariant] inv2 str }; assume { resolve2 str }; - [#"../hillel.rs" 43 4 46 5] _0 <- ([#"../hillel.rs" 43 4 46 5] ()); + [#"../hillel.rs" 43 4 46 5] _0 <- (); return _0 } @@ -1076,22 +1076,22 @@ module Hillel_InsertUnique absurd } BB18 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _28); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _28; assert { [@expl:type invariant] inv4 _28 }; assume { resolve6 _28 }; [#"../hillel.rs" 84 4 84 111] _33 <- ([#"../hillel.rs" 84 4 84 111] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB19 } BB19 { - [#"../hillel.rs" 84 4 84 111] produced <- ([#"../hillel.rs" 84 4 84 111] _33); + [#"../hillel.rs" 84 4 84 111] produced <- _33; _33 <- any Snapshot.snap_ty (Seq.seq t); assert { [@expl:type invariant] inv2 produced }; assume { resolve4 produced }; - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] e <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] e <- __creusot_proc_iter_elem; assert { [@expl:type invariant] inv5 __creusot_proc_iter_elem }; assume { resolve7 __creusot_proc_iter_elem }; assert { [@expl:assertion] [#"../hillel.rs" 86 24 86 57] e = index_logic1 (Snapshot.inner ghost_vec) (Seq.length (Snapshot.inner produced) - 1) }; - [#"../hillel.rs" 87 16 87 21] _41 <- ([#"../hillel.rs" 87 16 87 21] elem); + [#"../hillel.rs" 87 16 87 21] _41 <- elem; [#"../hillel.rs" 87 11 87 21] _38 <- ([#"../hillel.rs" 87 11 87 21] eq0 e _41); goto BB20 } @@ -1115,7 +1115,7 @@ module Hillel_InsertUnique goto BB22 } BB22 { - [#"../hillel.rs" 89 12 89 18] _0 <- ([#"../hillel.rs" 89 12 89 18] ()); + [#"../hillel.rs" 89 12 89 18] _0 <- (); goto BB26 } BB23 { @@ -1137,7 +1137,7 @@ module Hillel_InsertUnique BB25 { assert { [@expl:type invariant] inv7 vec }; assume { resolve10 vec }; - [#"../hillel.rs" 79 63 95 1] _0 <- ([#"../hillel.rs" 79 63 95 1] ()); + [#"../hillel.rs" 79 63 95 1] _0 <- (); goto BB26 } BB26 { @@ -1537,7 +1537,7 @@ module Hillel_Unique goto BB3 } BB3 { - [#"../hillel.rs" 107 13 107 25] _10 <- ([#"../hillel.rs" 107 13 107 25] Core_Ops_Range_Range_Type.C_Range (0 : usize) _11); + [#"../hillel.rs" 107 13 107 25] _10 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _11; _11 <- any usize; [#"../hillel.rs" 104 4 104 48] iter <- ([#"../hillel.rs" 104 4 104 48] into_iter0 _10); _10 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -1605,22 +1605,22 @@ module Hillel_Unique absurd } BB16 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _23); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _23; [#"../hillel.rs" 104 4 104 48] _28 <- ([#"../hillel.rs" 104 4 104 48] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB17 } BB17 { - [#"../hillel.rs" 104 4 104 48] produced <- ([#"../hillel.rs" 104 4 104 48] _28); + [#"../hillel.rs" 104 4 104 48] produced <- _28; _28 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); - [#"../hillel.rs" 108 26 108 27] _32 <- ([#"../hillel.rs" 108 26 108 27] i); - [#"../hillel.rs" 108 22 108 28] _33 <- ([#"../hillel.rs" 108 22 108 28] Slice.length str); - [#"../hillel.rs" 108 22 108 28] _34 <- ([#"../hillel.rs" 108 22 108 28] _32 < _33); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem; + [#"../hillel.rs" 108 26 108 27] _32 <- i; + [#"../hillel.rs" 108 22 108 28] _33 <- Slice.length str; + [#"../hillel.rs" 108 22 108 28] _34 <- _32 < _33; assert { [@expl:index in bounds] [#"../hillel.rs" 108 22 108 28] _34 }; goto BB18 } BB18 { - [#"../hillel.rs" 108 22 108 28] elem <- ([#"../hillel.rs" 108 22 108 28] Slice.get str _32); + [#"../hillel.rs" 108 22 108 28] elem <- Slice.get str _32; [#"../hillel.rs" 109 22 109 33] _37 <- Borrow.borrow_mut unique; [#"../hillel.rs" 109 22 109 33] unique <- ^ _37; assume { inv2 ( ^ _37) }; @@ -1640,7 +1640,7 @@ module Hillel_Unique goto BB20 } BB20 { - [#"../hillel.rs" 110 8 110 50] sub_str <- ([#"../hillel.rs" 110 8 110 50] _39); + [#"../hillel.rs" 110 8 110 50] sub_str <- _39; _39 <- any Snapshot.snap_ty (Seq.seq t); assert { [@expl:type invariant] inv0 sub_str }; assume { resolve0 sub_str }; @@ -1648,7 +1648,7 @@ module Hillel_Unique } BB21 { assert { [@expl:assertion] [#"../hillel.rs" 114 20 114 88] Seq.(==) (SeqExt.subsequence (deep_model1 str) 0 (Seq.length (shallow_model0 str))) (deep_model1 str) }; - [#"../hillel.rs" 115 4 115 10] _0 <- ([#"../hillel.rs" 115 4 115 10] unique); + [#"../hillel.rs" 115 4 115 10] _0 <- unique; unique <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global); goto BB22 } @@ -2123,7 +2123,7 @@ module Hillel_Fulcrum goto BB0 } BB0 { - [#"../hillel.rs" 157 25 157 26] total <- ([#"../hillel.rs" 157 25 157 26] (0 : uint32)); + [#"../hillel.rs" 157 25 157 26] total <- (0 : uint32); [#"../hillel.rs" 159 4 159 60] iter <- ([#"../hillel.rs" 159 4 159 60] into_iter0 s); goto BB1 } @@ -2163,9 +2163,9 @@ module Hillel_Fulcrum } BB7 { assert { [@expl:assertion] [#"../hillel.rs" 165 20 165 56] UInt32.to_int total = sum_range0 (shallow_model1 s) 0 (Seq.length (shallow_model1 s)) }; - [#"../hillel.rs" 167 27 167 28] min_i <- ([#"../hillel.rs" 167 27 167 28] (0 : usize)); - [#"../hillel.rs" 168 28 168 33] min_dist <- ([#"../hillel.rs" 168 28 168 33] total); - [#"../hillel.rs" 170 23 170 24] sum <- ([#"../hillel.rs" 170 23 170 24] (0 : uint32)); + [#"../hillel.rs" 167 27 167 28] min_i <- (0 : usize); + [#"../hillel.rs" 168 28 168 33] min_dist <- total; + [#"../hillel.rs" 170 23 170 24] sum <- (0 : uint32); [#"../hillel.rs" 176 16 176 23] _37 <- ([#"../hillel.rs" 176 16 176 23] len2 s); goto BB12 } @@ -2177,20 +2177,20 @@ module Hillel_Fulcrum absurd } BB10 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _19); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _19; [#"../hillel.rs" 159 4 159 60] _24 <- ([#"../hillel.rs" 159 4 159 60] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB11 } BB11 { - [#"../hillel.rs" 159 4 159 60] produced <- ([#"../hillel.rs" 159 4 159 60] _24); + [#"../hillel.rs" 159 4 159 60] produced <- _24; _24 <- any Snapshot.snap_ty (Seq.seq uint32); - [#"../hillel.rs" 161 9 161 10] x <- ([#"../hillel.rs" 161 9 161 10] __creusot_proc_iter_elem); - [#"../hillel.rs" 162 8 162 18] total <- ([#"../hillel.rs" 162 8 162 18] total + x); - [#"../hillel.rs" 161 16 163 5] _18 <- ([#"../hillel.rs" 161 16 163 5] ()); + [#"../hillel.rs" 161 9 161 10] x <- __creusot_proc_iter_elem; + [#"../hillel.rs" 162 8 162 18] total <- total + x; + [#"../hillel.rs" 161 16 163 5] _18 <- (); goto BB4 } BB12 { - [#"../hillel.rs" 176 13 176 23] _36 <- ([#"../hillel.rs" 176 13 176 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _37); + [#"../hillel.rs" 176 13 176 23] _36 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _37; _37 <- any usize; [#"../hillel.rs" 171 4 171 58] iter1 <- ([#"../hillel.rs" 171 4 171 58] into_iter1 _36); _36 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -2234,53 +2234,53 @@ module Hillel_Fulcrum end } BB19 { - [#"../hillel.rs" 186 4 186 9] _0 <- ([#"../hillel.rs" 186 4 186 9] min_i); + [#"../hillel.rs" 186 4 186 9] _0 <- min_i; return _0 } BB20 { goto BB21 } BB21 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _50); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _50; [#"../hillel.rs" 171 4 171 58] _55 <- ([#"../hillel.rs" 171 4 171 58] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1))); goto BB22 } BB22 { - [#"../hillel.rs" 171 4 171 58] produced1 <- ([#"../hillel.rs" 171 4 171 58] _55); + [#"../hillel.rs" 171 4 171 58] produced1 <- _55; _55 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1); - [#"../hillel.rs" 177 32 177 43] _60 <- ([#"../hillel.rs" 177 32 177 43] total - sum); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem1; + [#"../hillel.rs" 177 32 177 43] _60 <- total - sum; [#"../hillel.rs" 177 19 177 44] dist <- ([#"../hillel.rs" 177 19 177 44] abs_diff0 sum _60); _60 <- any uint32; goto BB23 } BB23 { - [#"../hillel.rs" 178 11 178 26] _64 <- ([#"../hillel.rs" 178 11 178 26] dist < min_dist); + [#"../hillel.rs" 178 11 178 26] _64 <- dist < min_dist; switch (_64) | False -> goto BB25 | True -> goto BB24 end } BB24 { - [#"../hillel.rs" 179 12 179 21] min_i <- ([#"../hillel.rs" 179 12 179 21] i); - [#"../hillel.rs" 180 12 180 27] min_dist <- ([#"../hillel.rs" 180 12 180 27] dist); - [#"../hillel.rs" 178 27 181 9] _63 <- ([#"../hillel.rs" 178 27 181 9] ()); + [#"../hillel.rs" 179 12 179 21] min_i <- i; + [#"../hillel.rs" 180 12 180 27] min_dist <- dist; + [#"../hillel.rs" 178 27 181 9] _63 <- (); goto BB26 } BB25 { - [#"../hillel.rs" 181 9 181 9] _63 <- ([#"../hillel.rs" 181 9 181 9] ()); + [#"../hillel.rs" 181 9 181 9] _63 <- (); goto BB26 } BB26 { - [#"../hillel.rs" 183 17 183 18] _70 <- ([#"../hillel.rs" 183 17 183 18] i); - [#"../hillel.rs" 183 15 183 19] _71 <- ([#"../hillel.rs" 183 15 183 19] Slice.length s); - [#"../hillel.rs" 183 15 183 19] _72 <- ([#"../hillel.rs" 183 15 183 19] _70 < _71); + [#"../hillel.rs" 183 17 183 18] _70 <- i; + [#"../hillel.rs" 183 15 183 19] _71 <- Slice.length s; + [#"../hillel.rs" 183 15 183 19] _72 <- _70 < _71; assert { [@expl:index in bounds] [#"../hillel.rs" 183 15 183 19] _72 }; goto BB27 } BB27 { - [#"../hillel.rs" 183 8 183 19] sum <- ([#"../hillel.rs" 183 8 183 19] sum + Slice.get s _70); - [#"../hillel.rs" 176 24 184 5] _18 <- ([#"../hillel.rs" 176 24 184 5] ()); + [#"../hillel.rs" 183 8 183 19] sum <- sum + Slice.get s _70; + [#"../hillel.rs" 176 24 184 5] _18 <- (); goto BB16 } BB29 { diff --git a/creusot/tests/should_succeed/immut.mlcfg b/creusot/tests/should_succeed/immut.mlcfg index ef59f377ef..3105c589dd 100644 --- a/creusot/tests/should_succeed/immut.mlcfg +++ b/creusot/tests/should_succeed/immut.mlcfg @@ -18,11 +18,11 @@ module Immut_F goto BB0 } BB0 { - [#"../immut.rs" 4 16 4 18] a <- ([#"../immut.rs" 4 16 4 18] (10 : uint32)); + [#"../immut.rs" 4 16 4 18] a <- (10 : uint32); [#"../immut.rs" 5 12 5 18] b <- Borrow.borrow_mut a; [#"../immut.rs" 5 12 5 18] a <- ^ b; - [#"../immut.rs" 6 19 6 20] _c <- ([#"../immut.rs" 6 19 6 20] * b); - [#"../immut.rs" 3 11 7 1] _0 <- ([#"../immut.rs" 3 11 7 1] ()); + [#"../immut.rs" 6 19 6 20] _c <- * b; + [#"../immut.rs" 3 11 7 1] _0 <- (); assume { resolve0 b }; return _0 } diff --git a/creusot/tests/should_succeed/index_range.mlcfg b/creusot/tests/should_succeed/index_range.mlcfg index c17e4d2486..72cb0198ae 100644 --- a/creusot/tests/should_succeed/index_range.mlcfg +++ b/creusot/tests/should_succeed/index_range.mlcfg @@ -181,7 +181,7 @@ module IndexRange_CreateArr goto BB6 } BB6 { - [#"../index_range.rs" 23 4 23 7] _0 <- ([#"../index_range.rs" 23 4 23 7] arr); + [#"../index_range.rs" 23 4 23 7] _0 <- arr; arr <- any Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global); goto BB7 } @@ -567,18 +567,18 @@ module IndexRange_TestRange goto BB1 } BB1 { - [#"../index_range.rs" 34 17 34 21] _5 <- ([#"../index_range.rs" 34 17 34 21] Core_Ops_Range_Range_Type.C_Range (0 : usize) (2 : usize)); + [#"../index_range.rs" 34 17 34 21] _5 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) (2 : usize); [#"../index_range.rs" 34 16 34 22] _3 <- ([#"../index_range.rs" 34 16 34 22] index0 arr _5); _5 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB2 } BB2 { - [#"../index_range.rs" 34 12 34 22] s <- ([#"../index_range.rs" 34 12 34 22] _3); + [#"../index_range.rs" 34 12 34 22] s <- _3; [#"../index_range.rs" 35 12 35 19] _8 <- ([#"../index_range.rs" 35 12 35 19] len0 s); goto BB3 } BB3 { - [#"../index_range.rs" 35 12 35 24] _7 <- ([#"../index_range.rs" 35 12 35 24] _8 = (2 : usize)); + [#"../index_range.rs" 35 12 35 24] _7 <- _8 = (2 : usize); _8 <- any usize; switch (_7) | False -> goto BB11 @@ -586,35 +586,35 @@ module IndexRange_TestRange end } BB4 { - [#"../index_range.rs" 35 30 35 31] _12 <- ([#"../index_range.rs" 35 30 35 31] (0 : usize)); - [#"../index_range.rs" 35 28 35 32] _13 <- ([#"../index_range.rs" 35 28 35 32] Slice.length s); - [#"../index_range.rs" 35 28 35 32] _14 <- ([#"../index_range.rs" 35 28 35 32] _12 < _13); + [#"../index_range.rs" 35 30 35 31] _12 <- (0 : usize); + [#"../index_range.rs" 35 28 35 32] _13 <- Slice.length s; + [#"../index_range.rs" 35 28 35 32] _14 <- _12 < _13; assert { [@expl:index in bounds] [#"../index_range.rs" 35 28 35 32] _14 }; goto BB5 } BB5 { - [#"../index_range.rs" 35 28 35 37] _10 <- ([#"../index_range.rs" 35 28 35 37] Slice.get s _12 = (0 : int32)); + [#"../index_range.rs" 35 28 35 37] _10 <- Slice.get s _12 = (0 : int32); switch (_10) | False -> goto BB10 | True -> goto BB6 end } BB6 { - [#"../index_range.rs" 35 43 35 44] _17 <- ([#"../index_range.rs" 35 43 35 44] (1 : usize)); - [#"../index_range.rs" 35 41 35 45] _18 <- ([#"../index_range.rs" 35 41 35 45] Slice.length s); - [#"../index_range.rs" 35 41 35 45] _19 <- ([#"../index_range.rs" 35 41 35 45] _17 < _18); + [#"../index_range.rs" 35 43 35 44] _17 <- (1 : usize); + [#"../index_range.rs" 35 41 35 45] _18 <- Slice.length s; + [#"../index_range.rs" 35 41 35 45] _19 <- _17 < _18; assert { [@expl:index in bounds] [#"../index_range.rs" 35 41 35 45] _19 }; goto BB7 } BB7 { - [#"../index_range.rs" 35 41 35 50] _15 <- ([#"../index_range.rs" 35 41 35 50] Slice.get s _17 = (1 : int32)); + [#"../index_range.rs" 35 41 35 50] _15 <- Slice.get s _17 = (1 : int32); switch (_15) | False -> goto BB9 | True -> goto BB8 end } BB8 { - [#"../index_range.rs" 37 17 37 21] _24 <- ([#"../index_range.rs" 37 17 37 21] Core_Ops_Range_Range_Type.C_Range (3 : usize) (5 : usize)); + [#"../index_range.rs" 37 17 37 21] _24 <- Core_Ops_Range_Range_Type.C_Range (3 : usize) (5 : usize); [#"../index_range.rs" 37 16 37 22] _22 <- ([#"../index_range.rs" 37 16 37 22] index0 arr _24); _24 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB13 @@ -636,12 +636,12 @@ module IndexRange_TestRange absurd } BB13 { - [#"../index_range.rs" 37 12 37 22] s1 <- ([#"../index_range.rs" 37 12 37 22] _22); + [#"../index_range.rs" 37 12 37 22] s1 <- _22; [#"../index_range.rs" 38 12 38 19] _27 <- ([#"../index_range.rs" 38 12 38 19] len0 s1); goto BB14 } BB14 { - [#"../index_range.rs" 38 12 38 24] _26 <- ([#"../index_range.rs" 38 12 38 24] _27 = (2 : usize)); + [#"../index_range.rs" 38 12 38 24] _26 <- _27 = (2 : usize); _27 <- any usize; switch (_26) | False -> goto BB22 @@ -649,35 +649,35 @@ module IndexRange_TestRange end } BB15 { - [#"../index_range.rs" 38 30 38 31] _31 <- ([#"../index_range.rs" 38 30 38 31] (0 : usize)); - [#"../index_range.rs" 38 28 38 32] _32 <- ([#"../index_range.rs" 38 28 38 32] Slice.length s1); - [#"../index_range.rs" 38 28 38 32] _33 <- ([#"../index_range.rs" 38 28 38 32] _31 < _32); + [#"../index_range.rs" 38 30 38 31] _31 <- (0 : usize); + [#"../index_range.rs" 38 28 38 32] _32 <- Slice.length s1; + [#"../index_range.rs" 38 28 38 32] _33 <- _31 < _32; assert { [@expl:index in bounds] [#"../index_range.rs" 38 28 38 32] _33 }; goto BB16 } BB16 { - [#"../index_range.rs" 38 28 38 37] _29 <- ([#"../index_range.rs" 38 28 38 37] Slice.get s1 _31 = (3 : int32)); + [#"../index_range.rs" 38 28 38 37] _29 <- Slice.get s1 _31 = (3 : int32); switch (_29) | False -> goto BB21 | True -> goto BB17 end } BB17 { - [#"../index_range.rs" 38 43 38 44] _36 <- ([#"../index_range.rs" 38 43 38 44] (1 : usize)); - [#"../index_range.rs" 38 41 38 45] _37 <- ([#"../index_range.rs" 38 41 38 45] Slice.length s1); - [#"../index_range.rs" 38 41 38 45] _38 <- ([#"../index_range.rs" 38 41 38 45] _36 < _37); + [#"../index_range.rs" 38 43 38 44] _36 <- (1 : usize); + [#"../index_range.rs" 38 41 38 45] _37 <- Slice.length s1; + [#"../index_range.rs" 38 41 38 45] _38 <- _36 < _37; assert { [@expl:index in bounds] [#"../index_range.rs" 38 41 38 45] _38 }; goto BB18 } BB18 { - [#"../index_range.rs" 38 41 38 50] _34 <- ([#"../index_range.rs" 38 41 38 50] Slice.get s1 _36 = (4 : int32)); + [#"../index_range.rs" 38 41 38 50] _34 <- Slice.get s1 _36 = (4 : int32); switch (_34) | False -> goto BB20 | True -> goto BB19 end } BB19 { - [#"../index_range.rs" 43 16 43 20] _46 <- ([#"../index_range.rs" 43 16 43 20] Core_Ops_Range_Range_Type.C_Range (2 : usize) (2 : usize)); + [#"../index_range.rs" 43 16 43 20] _46 <- Core_Ops_Range_Range_Type.C_Range (2 : usize) (2 : usize); [#"../index_range.rs" 43 15 43 21] _44 <- ([#"../index_range.rs" 43 15 43 21] index0 arr _46); _46 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB24 @@ -703,7 +703,7 @@ module IndexRange_TestRange goto BB25 } BB25 { - [#"../index_range.rs" 43 12 43 32] _41 <- ([#"../index_range.rs" 43 12 43 32] _42 = (0 : usize)); + [#"../index_range.rs" 43 12 43 32] _41 <- _42 = (0 : usize); _42 <- any usize; switch (_41) | False -> goto BB27 @@ -711,7 +711,7 @@ module IndexRange_TestRange end } BB26 { - [#"../index_range.rs" 45 16 45 20] _54 <- ([#"../index_range.rs" 45 16 45 20] Core_Ops_Range_Range_Type.C_Range (5 : usize) (5 : usize)); + [#"../index_range.rs" 45 16 45 20] _54 <- Core_Ops_Range_Range_Type.C_Range (5 : usize) (5 : usize); [#"../index_range.rs" 45 15 45 21] _52 <- ([#"../index_range.rs" 45 15 45 21] index0 arr _54); _54 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB28 @@ -726,7 +726,7 @@ module IndexRange_TestRange goto BB29 } BB29 { - [#"../index_range.rs" 45 12 45 32] _49 <- ([#"../index_range.rs" 45 12 45 32] _50 = (0 : usize)); + [#"../index_range.rs" 45 12 45 32] _49 <- _50 = (0 : usize); _50 <- any usize; switch (_49) | False -> goto BB31 @@ -743,7 +743,7 @@ module IndexRange_TestRange absurd } BB32 { - [#"../index_range.rs" 50 20 50 24] _63 <- ([#"../index_range.rs" 50 20 50 24] Core_Ops_Range_Range_Type.C_Range (2 : usize) (6 : usize)); + [#"../index_range.rs" 50 20 50 24] _63 <- Core_Ops_Range_Range_Type.C_Range (2 : usize) (6 : usize); [#"../index_range.rs" 50 12 50 25] _59 <- ([#"../index_range.rs" 50 12 50 25] get0 _61 _63); _63 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB33 @@ -768,7 +768,7 @@ module IndexRange_TestRange absurd } BB37 { - [#"../index_range.rs" 52 20 52 24] _72 <- ([#"../index_range.rs" 52 20 52 24] Core_Ops_Range_Range_Type.C_Range (2 : usize) (1 : usize)); + [#"../index_range.rs" 52 20 52 24] _72 <- Core_Ops_Range_Range_Type.C_Range (2 : usize) (1 : usize); [#"../index_range.rs" 52 12 52 25] _68 <- ([#"../index_range.rs" 52 12 52 25] get0 _70 _72); _72 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB38 @@ -793,7 +793,7 @@ module IndexRange_TestRange absurd } BB42 { - [#"../index_range.rs" 54 20 54 24] _81 <- ([#"../index_range.rs" 54 20 54 24] Core_Ops_Range_Range_Type.C_Range (6 : usize) (6 : usize)); + [#"../index_range.rs" 54 20 54 24] _81 <- Core_Ops_Range_Range_Type.C_Range (6 : usize) (6 : usize); [#"../index_range.rs" 54 12 54 25] _77 <- ([#"../index_range.rs" 54 12 54 25] get0 _79 _81); _81 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB43 @@ -818,7 +818,7 @@ module IndexRange_TestRange absurd } BB47 { - [#"../index_range.rs" 56 20 56 26] _90 <- ([#"../index_range.rs" 56 20 56 26] Core_Ops_Range_Range_Type.C_Range (10 : usize) (10 : usize)); + [#"../index_range.rs" 56 20 56 26] _90 <- Core_Ops_Range_Range_Type.C_Range (10 : usize) (10 : usize); [#"../index_range.rs" 56 12 56 27] _86 <- ([#"../index_range.rs" 56 12 56 27] get0 _88 _90); _90 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB48 @@ -836,7 +836,7 @@ module IndexRange_TestRange BB50 { [#"../index_range.rs" 59 17 59 20] _94 <- Borrow.borrow_mut arr; [#"../index_range.rs" 59 17 59 20] arr <- ^ _94; - [#"../index_range.rs" 59 21 59 25] _95 <- ([#"../index_range.rs" 59 21 59 25] Core_Ops_Range_Range_Type.C_Range (1 : usize) (4 : usize)); + [#"../index_range.rs" 59 21 59 25] _95 <- Core_Ops_Range_Range_Type.C_Range (1 : usize) (4 : usize); [#"../index_range.rs" 59 20 59 26] _93 <- ([#"../index_range.rs" 59 20 59 26] index_mut0 _94 _95); _94 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)); _95 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -854,7 +854,7 @@ module IndexRange_TestRange goto BB53 } BB53 { - [#"../index_range.rs" 60 12 60 24] _97 <- ([#"../index_range.rs" 60 12 60 24] _98 = (3 : usize)); + [#"../index_range.rs" 60 12 60 24] _97 <- _98 = (3 : usize); _98 <- any usize; switch (_97) | False -> goto BB55 @@ -862,9 +862,9 @@ module IndexRange_TestRange end } BB54 { - [#"../index_range.rs" 61 6 61 7] _101 <- ([#"../index_range.rs" 61 6 61 7] (0 : usize)); - [#"../index_range.rs" 61 4 61 8] _102 <- ([#"../index_range.rs" 61 4 61 8] Slice.length ( * s2)); - [#"../index_range.rs" 61 4 61 8] _103 <- ([#"../index_range.rs" 61 4 61 8] _101 < _102); + [#"../index_range.rs" 61 6 61 7] _101 <- (0 : usize); + [#"../index_range.rs" 61 4 61 8] _102 <- Slice.length ( * s2); + [#"../index_range.rs" 61 4 61 8] _103 <- _101 < _102; assert { [@expl:index in bounds] [#"../index_range.rs" 61 4 61 8] _103 }; goto BB56 } @@ -876,24 +876,24 @@ module IndexRange_TestRange absurd } BB56 { - [#"../index_range.rs" 61 4 61 13] s2 <- { s2 with current = Slice.set ( * s2) _101 ([#"../index_range.rs" 61 4 61 13] (-1 : int32)) ; }; - [#"../index_range.rs" 62 6 62 7] _104 <- ([#"../index_range.rs" 62 6 62 7] (1 : usize)); - [#"../index_range.rs" 62 4 62 8] _105 <- ([#"../index_range.rs" 62 4 62 8] Slice.length ( * s2)); - [#"../index_range.rs" 62 4 62 8] _106 <- ([#"../index_range.rs" 62 4 62 8] _104 < _105); + [#"../index_range.rs" 61 4 61 13] s2 <- { s2 with current = Slice.set ( * s2) _101 (-1 : int32) ; }; + [#"../index_range.rs" 62 6 62 7] _104 <- (1 : usize); + [#"../index_range.rs" 62 4 62 8] _105 <- Slice.length ( * s2); + [#"../index_range.rs" 62 4 62 8] _106 <- _104 < _105; assert { [@expl:index in bounds] [#"../index_range.rs" 62 4 62 8] _106 }; goto BB57 } BB57 { - [#"../index_range.rs" 62 4 62 13] s2 <- { s2 with current = Slice.set ( * s2) _104 ([#"../index_range.rs" 62 4 62 13] (-1 : int32)) ; }; - [#"../index_range.rs" 67 14 67 15] _110 <- ([#"../index_range.rs" 67 14 67 15] (2 : usize)); - [#"../index_range.rs" 67 12 67 16] _111 <- ([#"../index_range.rs" 67 12 67 16] Slice.length ( * s2)); - [#"../index_range.rs" 67 12 67 16] _112 <- ([#"../index_range.rs" 67 12 67 16] _110 < _111); + [#"../index_range.rs" 62 4 62 13] s2 <- { s2 with current = Slice.set ( * s2) _104 (-1 : int32) ; }; + [#"../index_range.rs" 67 14 67 15] _110 <- (2 : usize); + [#"../index_range.rs" 67 12 67 16] _111 <- Slice.length ( * s2); + [#"../index_range.rs" 67 12 67 16] _112 <- _110 < _111; assert { [@expl:index in bounds] [#"../index_range.rs" 67 12 67 16] _112 }; goto BB58 } BB58 { assume { resolve1 s2 }; - [#"../index_range.rs" 67 12 67 21] _108 <- ([#"../index_range.rs" 67 12 67 21] Slice.get ( * s2) _110 = (3 : int32)); + [#"../index_range.rs" 67 12 67 21] _108 <- Slice.get ( * s2) _110 = (3 : int32); assume { resolve1 _93 }; switch (_108) | False -> goto BB60 @@ -910,7 +910,7 @@ module IndexRange_TestRange absurd } BB61 { - [#"../index_range.rs" 69 12 69 26] _115 <- ([#"../index_range.rs" 69 12 69 26] _116 = (5 : usize)); + [#"../index_range.rs" 69 12 69 26] _115 <- _116 = (5 : usize); _116 <- any usize; switch (_115) | False -> goto BB63 @@ -927,7 +927,7 @@ module IndexRange_TestRange absurd } BB64 { - [#"../index_range.rs" 70 12 70 23] _120 <- ([#"../index_range.rs" 70 12 70 23] _122 = (0 : int32)); + [#"../index_range.rs" 70 12 70 23] _120 <- _122 = (0 : int32); switch (_120) | False -> goto BB66 | True -> goto BB65 @@ -943,7 +943,7 @@ module IndexRange_TestRange absurd } BB67 { - [#"../index_range.rs" 71 12 71 24] _126 <- ([#"../index_range.rs" 71 12 71 24] _128 = (-1 : int32)); + [#"../index_range.rs" 71 12 71 24] _126 <- _128 = (-1 : int32); switch (_126) | False -> goto BB69 | True -> goto BB68 @@ -959,7 +959,7 @@ module IndexRange_TestRange absurd } BB70 { - [#"../index_range.rs" 72 12 72 24] _132 <- ([#"../index_range.rs" 72 12 72 24] _134 = (-1 : int32)); + [#"../index_range.rs" 72 12 72 24] _132 <- _134 = (-1 : int32); switch (_132) | False -> goto BB72 | True -> goto BB71 @@ -975,7 +975,7 @@ module IndexRange_TestRange absurd } BB73 { - [#"../index_range.rs" 73 12 73 23] _138 <- ([#"../index_range.rs" 73 12 73 23] _140 = (3 : int32)); + [#"../index_range.rs" 73 12 73 23] _138 <- _140 = (3 : int32); switch (_138) | False -> goto BB75 | True -> goto BB74 @@ -992,14 +992,14 @@ module IndexRange_TestRange } BB76 { assume { resolve0 arr }; - [#"../index_range.rs" 74 12 74 23] _144 <- ([#"../index_range.rs" 74 12 74 23] _146 = (4 : int32)); + [#"../index_range.rs" 74 12 74 23] _144 <- _146 = (4 : int32); switch (_144) | False -> goto BB78 | True -> goto BB77 end } BB77 { - [#"../index_range.rs" 27 20 75 1] _0 <- ([#"../index_range.rs" 27 20 75 1] ()); + [#"../index_range.rs" 27 20 75 1] _0 <- (); goto BB79 } BB78 { @@ -1349,18 +1349,18 @@ module IndexRange_TestRangeTo goto BB1 } BB1 { - [#"../index_range.rs" 85 17 85 20] _5 <- ([#"../index_range.rs" 85 17 85 20] Core_Ops_Range_RangeTo_Type.C_RangeTo (2 : usize)); + [#"../index_range.rs" 85 17 85 20] _5 <- Core_Ops_Range_RangeTo_Type.C_RangeTo (2 : usize); [#"../index_range.rs" 85 16 85 21] _3 <- ([#"../index_range.rs" 85 16 85 21] index0 arr _5); _5 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize; goto BB2 } BB2 { - [#"../index_range.rs" 85 12 85 21] s <- ([#"../index_range.rs" 85 12 85 21] _3); + [#"../index_range.rs" 85 12 85 21] s <- _3; [#"../index_range.rs" 86 12 86 19] _8 <- ([#"../index_range.rs" 86 12 86 19] len0 s); goto BB3 } BB3 { - [#"../index_range.rs" 86 12 86 24] _7 <- ([#"../index_range.rs" 86 12 86 24] _8 = (2 : usize)); + [#"../index_range.rs" 86 12 86 24] _7 <- _8 = (2 : usize); _8 <- any usize; switch (_7) | False -> goto BB11 @@ -1368,35 +1368,35 @@ module IndexRange_TestRangeTo end } BB4 { - [#"../index_range.rs" 86 30 86 31] _12 <- ([#"../index_range.rs" 86 30 86 31] (0 : usize)); - [#"../index_range.rs" 86 28 86 32] _13 <- ([#"../index_range.rs" 86 28 86 32] Slice.length s); - [#"../index_range.rs" 86 28 86 32] _14 <- ([#"../index_range.rs" 86 28 86 32] _12 < _13); + [#"../index_range.rs" 86 30 86 31] _12 <- (0 : usize); + [#"../index_range.rs" 86 28 86 32] _13 <- Slice.length s; + [#"../index_range.rs" 86 28 86 32] _14 <- _12 < _13; assert { [@expl:index in bounds] [#"../index_range.rs" 86 28 86 32] _14 }; goto BB5 } BB5 { - [#"../index_range.rs" 86 28 86 37] _10 <- ([#"../index_range.rs" 86 28 86 37] Slice.get s _12 = (0 : int32)); + [#"../index_range.rs" 86 28 86 37] _10 <- Slice.get s _12 = (0 : int32); switch (_10) | False -> goto BB10 | True -> goto BB6 end } BB6 { - [#"../index_range.rs" 86 43 86 44] _17 <- ([#"../index_range.rs" 86 43 86 44] (1 : usize)); - [#"../index_range.rs" 86 41 86 45] _18 <- ([#"../index_range.rs" 86 41 86 45] Slice.length s); - [#"../index_range.rs" 86 41 86 45] _19 <- ([#"../index_range.rs" 86 41 86 45] _17 < _18); + [#"../index_range.rs" 86 43 86 44] _17 <- (1 : usize); + [#"../index_range.rs" 86 41 86 45] _18 <- Slice.length s; + [#"../index_range.rs" 86 41 86 45] _19 <- _17 < _18; assert { [@expl:index in bounds] [#"../index_range.rs" 86 41 86 45] _19 }; goto BB7 } BB7 { - [#"../index_range.rs" 86 41 86 50] _15 <- ([#"../index_range.rs" 86 41 86 50] Slice.get s _17 = (1 : int32)); + [#"../index_range.rs" 86 41 86 50] _15 <- Slice.get s _17 = (1 : int32); switch (_15) | False -> goto BB9 | True -> goto BB8 end } BB8 { - [#"../index_range.rs" 91 16 91 19] _27 <- ([#"../index_range.rs" 91 16 91 19] Core_Ops_Range_RangeTo_Type.C_RangeTo (0 : usize)); + [#"../index_range.rs" 91 16 91 19] _27 <- Core_Ops_Range_RangeTo_Type.C_RangeTo (0 : usize); [#"../index_range.rs" 91 15 91 20] _25 <- ([#"../index_range.rs" 91 15 91 20] index0 arr _27); _27 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize; goto BB13 @@ -1422,7 +1422,7 @@ module IndexRange_TestRangeTo goto BB14 } BB14 { - [#"../index_range.rs" 91 12 91 31] _22 <- ([#"../index_range.rs" 91 12 91 31] _23 = (0 : usize)); + [#"../index_range.rs" 91 12 91 31] _22 <- _23 = (0 : usize); _23 <- any usize; switch (_22) | False -> goto BB16 @@ -1439,7 +1439,7 @@ module IndexRange_TestRangeTo absurd } BB17 { - [#"../index_range.rs" 96 20 96 23] _36 <- ([#"../index_range.rs" 96 20 96 23] Core_Ops_Range_RangeTo_Type.C_RangeTo (6 : usize)); + [#"../index_range.rs" 96 20 96 23] _36 <- Core_Ops_Range_RangeTo_Type.C_RangeTo (6 : usize); [#"../index_range.rs" 96 12 96 24] _32 <- ([#"../index_range.rs" 96 12 96 24] get0 _34 _36); _36 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize; goto BB18 @@ -1457,7 +1457,7 @@ module IndexRange_TestRangeTo BB20 { [#"../index_range.rs" 99 17 99 20] _40 <- Borrow.borrow_mut arr; [#"../index_range.rs" 99 17 99 20] arr <- ^ _40; - [#"../index_range.rs" 99 21 99 24] _41 <- ([#"../index_range.rs" 99 21 99 24] Core_Ops_Range_RangeTo_Type.C_RangeTo (3 : usize)); + [#"../index_range.rs" 99 21 99 24] _41 <- Core_Ops_Range_RangeTo_Type.C_RangeTo (3 : usize); [#"../index_range.rs" 99 20 99 25] _39 <- ([#"../index_range.rs" 99 20 99 25] index_mut0 _40 _41); _40 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)); _41 <- any Core_Ops_Range_RangeTo_Type.t_rangeto usize; @@ -1475,7 +1475,7 @@ module IndexRange_TestRangeTo goto BB23 } BB23 { - [#"../index_range.rs" 100 12 100 24] _43 <- ([#"../index_range.rs" 100 12 100 24] _44 = (3 : usize)); + [#"../index_range.rs" 100 12 100 24] _43 <- _44 = (3 : usize); _44 <- any usize; switch (_43) | False -> goto BB25 @@ -1483,9 +1483,9 @@ module IndexRange_TestRangeTo end } BB24 { - [#"../index_range.rs" 101 6 101 7] _47 <- ([#"../index_range.rs" 101 6 101 7] (0 : usize)); - [#"../index_range.rs" 101 4 101 8] _48 <- ([#"../index_range.rs" 101 4 101 8] Slice.length ( * s1)); - [#"../index_range.rs" 101 4 101 8] _49 <- ([#"../index_range.rs" 101 4 101 8] _47 < _48); + [#"../index_range.rs" 101 6 101 7] _47 <- (0 : usize); + [#"../index_range.rs" 101 4 101 8] _48 <- Slice.length ( * s1); + [#"../index_range.rs" 101 4 101 8] _49 <- _47 < _48; assert { [@expl:index in bounds] [#"../index_range.rs" 101 4 101 8] _49 }; goto BB26 } @@ -1497,24 +1497,24 @@ module IndexRange_TestRangeTo absurd } BB26 { - [#"../index_range.rs" 101 4 101 13] s1 <- { s1 with current = Slice.set ( * s1) _47 ([#"../index_range.rs" 101 4 101 13] (-1 : int32)) ; }; - [#"../index_range.rs" 102 6 102 7] _50 <- ([#"../index_range.rs" 102 6 102 7] (2 : usize)); - [#"../index_range.rs" 102 4 102 8] _51 <- ([#"../index_range.rs" 102 4 102 8] Slice.length ( * s1)); - [#"../index_range.rs" 102 4 102 8] _52 <- ([#"../index_range.rs" 102 4 102 8] _50 < _51); + [#"../index_range.rs" 101 4 101 13] s1 <- { s1 with current = Slice.set ( * s1) _47 (-1 : int32) ; }; + [#"../index_range.rs" 102 6 102 7] _50 <- (2 : usize); + [#"../index_range.rs" 102 4 102 8] _51 <- Slice.length ( * s1); + [#"../index_range.rs" 102 4 102 8] _52 <- _50 < _51; assert { [@expl:index in bounds] [#"../index_range.rs" 102 4 102 8] _52 }; goto BB27 } BB27 { - [#"../index_range.rs" 102 4 102 13] s1 <- { s1 with current = Slice.set ( * s1) _50 ([#"../index_range.rs" 102 4 102 13] (-1 : int32)) ; }; - [#"../index_range.rs" 104 14 104 15] _56 <- ([#"../index_range.rs" 104 14 104 15] (1 : usize)); - [#"../index_range.rs" 104 12 104 16] _57 <- ([#"../index_range.rs" 104 12 104 16] Slice.length ( * s1)); - [#"../index_range.rs" 104 12 104 16] _58 <- ([#"../index_range.rs" 104 12 104 16] _56 < _57); + [#"../index_range.rs" 102 4 102 13] s1 <- { s1 with current = Slice.set ( * s1) _50 (-1 : int32) ; }; + [#"../index_range.rs" 104 14 104 15] _56 <- (1 : usize); + [#"../index_range.rs" 104 12 104 16] _57 <- Slice.length ( * s1); + [#"../index_range.rs" 104 12 104 16] _58 <- _56 < _57; assert { [@expl:index in bounds] [#"../index_range.rs" 104 12 104 16] _58 }; goto BB28 } BB28 { assume { resolve1 s1 }; - [#"../index_range.rs" 104 12 104 21] _54 <- ([#"../index_range.rs" 104 12 104 21] Slice.get ( * s1) _56 = (1 : int32)); + [#"../index_range.rs" 104 12 104 21] _54 <- Slice.get ( * s1) _56 = (1 : int32); assume { resolve1 _39 }; switch (_54) | False -> goto BB30 @@ -1531,7 +1531,7 @@ module IndexRange_TestRangeTo absurd } BB31 { - [#"../index_range.rs" 106 12 106 26] _61 <- ([#"../index_range.rs" 106 12 106 26] _62 = (5 : usize)); + [#"../index_range.rs" 106 12 106 26] _61 <- _62 = (5 : usize); _62 <- any usize; switch (_61) | False -> goto BB33 @@ -1548,7 +1548,7 @@ module IndexRange_TestRangeTo absurd } BB34 { - [#"../index_range.rs" 107 12 107 24] _66 <- ([#"../index_range.rs" 107 12 107 24] _68 = (-1 : int32)); + [#"../index_range.rs" 107 12 107 24] _66 <- _68 = (-1 : int32); switch (_66) | False -> goto BB36 | True -> goto BB35 @@ -1564,7 +1564,7 @@ module IndexRange_TestRangeTo absurd } BB37 { - [#"../index_range.rs" 108 12 108 23] _72 <- ([#"../index_range.rs" 108 12 108 23] _74 = (1 : int32)); + [#"../index_range.rs" 108 12 108 23] _72 <- _74 = (1 : int32); switch (_72) | False -> goto BB39 | True -> goto BB38 @@ -1580,7 +1580,7 @@ module IndexRange_TestRangeTo absurd } BB40 { - [#"../index_range.rs" 109 12 109 24] _78 <- ([#"../index_range.rs" 109 12 109 24] _80 = (-1 : int32)); + [#"../index_range.rs" 109 12 109 24] _78 <- _80 = (-1 : int32); switch (_78) | False -> goto BB42 | True -> goto BB41 @@ -1596,7 +1596,7 @@ module IndexRange_TestRangeTo absurd } BB43 { - [#"../index_range.rs" 110 12 110 23] _84 <- ([#"../index_range.rs" 110 12 110 23] _86 = (3 : int32)); + [#"../index_range.rs" 110 12 110 23] _84 <- _86 = (3 : int32); switch (_84) | False -> goto BB45 | True -> goto BB44 @@ -1613,14 +1613,14 @@ module IndexRange_TestRangeTo } BB46 { assume { resolve0 arr }; - [#"../index_range.rs" 111 12 111 23] _90 <- ([#"../index_range.rs" 111 12 111 23] _92 = (4 : int32)); + [#"../index_range.rs" 111 12 111 23] _90 <- _92 = (4 : int32); switch (_90) | False -> goto BB48 | True -> goto BB47 end } BB47 { - [#"../index_range.rs" 78 23 112 1] _0 <- ([#"../index_range.rs" 78 23 112 1] ()); + [#"../index_range.rs" 78 23 112 1] _0 <- (); goto BB49 } BB48 { @@ -1977,18 +1977,18 @@ module IndexRange_TestRangeFrom goto BB1 } BB1 { - [#"../index_range.rs" 122 17 122 20] _5 <- ([#"../index_range.rs" 122 17 122 20] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (3 : usize)); + [#"../index_range.rs" 122 17 122 20] _5 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom (3 : usize); [#"../index_range.rs" 122 16 122 21] _3 <- ([#"../index_range.rs" 122 16 122 21] index0 arr _5); _5 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize; goto BB2 } BB2 { - [#"../index_range.rs" 122 12 122 21] s <- ([#"../index_range.rs" 122 12 122 21] _3); + [#"../index_range.rs" 122 12 122 21] s <- _3; [#"../index_range.rs" 123 12 123 19] _8 <- ([#"../index_range.rs" 123 12 123 19] len0 s); goto BB3 } BB3 { - [#"../index_range.rs" 123 12 123 24] _7 <- ([#"../index_range.rs" 123 12 123 24] _8 = (2 : usize)); + [#"../index_range.rs" 123 12 123 24] _7 <- _8 = (2 : usize); _8 <- any usize; switch (_7) | False -> goto BB11 @@ -1996,35 +1996,35 @@ module IndexRange_TestRangeFrom end } BB4 { - [#"../index_range.rs" 123 30 123 31] _12 <- ([#"../index_range.rs" 123 30 123 31] (0 : usize)); - [#"../index_range.rs" 123 28 123 32] _13 <- ([#"../index_range.rs" 123 28 123 32] Slice.length s); - [#"../index_range.rs" 123 28 123 32] _14 <- ([#"../index_range.rs" 123 28 123 32] _12 < _13); + [#"../index_range.rs" 123 30 123 31] _12 <- (0 : usize); + [#"../index_range.rs" 123 28 123 32] _13 <- Slice.length s; + [#"../index_range.rs" 123 28 123 32] _14 <- _12 < _13; assert { [@expl:index in bounds] [#"../index_range.rs" 123 28 123 32] _14 }; goto BB5 } BB5 { - [#"../index_range.rs" 123 28 123 37] _10 <- ([#"../index_range.rs" 123 28 123 37] Slice.get s _12 = (3 : int32)); + [#"../index_range.rs" 123 28 123 37] _10 <- Slice.get s _12 = (3 : int32); switch (_10) | False -> goto BB10 | True -> goto BB6 end } BB6 { - [#"../index_range.rs" 123 43 123 44] _17 <- ([#"../index_range.rs" 123 43 123 44] (1 : usize)); - [#"../index_range.rs" 123 41 123 45] _18 <- ([#"../index_range.rs" 123 41 123 45] Slice.length s); - [#"../index_range.rs" 123 41 123 45] _19 <- ([#"../index_range.rs" 123 41 123 45] _17 < _18); + [#"../index_range.rs" 123 43 123 44] _17 <- (1 : usize); + [#"../index_range.rs" 123 41 123 45] _18 <- Slice.length s; + [#"../index_range.rs" 123 41 123 45] _19 <- _17 < _18; assert { [@expl:index in bounds] [#"../index_range.rs" 123 41 123 45] _19 }; goto BB7 } BB7 { - [#"../index_range.rs" 123 41 123 50] _15 <- ([#"../index_range.rs" 123 41 123 50] Slice.get s _17 = (4 : int32)); + [#"../index_range.rs" 123 41 123 50] _15 <- Slice.get s _17 = (4 : int32); switch (_15) | False -> goto BB9 | True -> goto BB8 end } BB8 { - [#"../index_range.rs" 128 16 128 19] _27 <- ([#"../index_range.rs" 128 16 128 19] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (5 : usize)); + [#"../index_range.rs" 128 16 128 19] _27 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom (5 : usize); [#"../index_range.rs" 128 15 128 20] _25 <- ([#"../index_range.rs" 128 15 128 20] index0 arr _27); _27 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize; goto BB13 @@ -2050,7 +2050,7 @@ module IndexRange_TestRangeFrom goto BB14 } BB14 { - [#"../index_range.rs" 128 12 128 31] _22 <- ([#"../index_range.rs" 128 12 128 31] _23 = (0 : usize)); + [#"../index_range.rs" 128 12 128 31] _22 <- _23 = (0 : usize); _23 <- any usize; switch (_22) | False -> goto BB16 @@ -2067,7 +2067,7 @@ module IndexRange_TestRangeFrom absurd } BB17 { - [#"../index_range.rs" 133 20 133 23] _36 <- ([#"../index_range.rs" 133 20 133 23] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (6 : usize)); + [#"../index_range.rs" 133 20 133 23] _36 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom (6 : usize); [#"../index_range.rs" 133 12 133 24] _32 <- ([#"../index_range.rs" 133 12 133 24] get0 _34 _36); _36 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize; goto BB18 @@ -2092,7 +2092,7 @@ module IndexRange_TestRangeFrom absurd } BB22 { - [#"../index_range.rs" 135 20 135 24] _45 <- ([#"../index_range.rs" 135 20 135 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (10 : usize)); + [#"../index_range.rs" 135 20 135 24] _45 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom (10 : usize); [#"../index_range.rs" 135 12 135 25] _41 <- ([#"../index_range.rs" 135 12 135 25] get0 _43 _45); _45 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize; goto BB23 @@ -2110,7 +2110,7 @@ module IndexRange_TestRangeFrom BB25 { [#"../index_range.rs" 138 17 138 20] _49 <- Borrow.borrow_mut arr; [#"../index_range.rs" 138 17 138 20] arr <- ^ _49; - [#"../index_range.rs" 138 21 138 24] _50 <- ([#"../index_range.rs" 138 21 138 24] Core_Ops_Range_RangeFrom_Type.C_RangeFrom (2 : usize)); + [#"../index_range.rs" 138 21 138 24] _50 <- Core_Ops_Range_RangeFrom_Type.C_RangeFrom (2 : usize); [#"../index_range.rs" 138 20 138 25] _48 <- ([#"../index_range.rs" 138 20 138 25] index_mut0 _49 _50); _49 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)); _50 <- any Core_Ops_Range_RangeFrom_Type.t_rangefrom usize; @@ -2128,7 +2128,7 @@ module IndexRange_TestRangeFrom goto BB28 } BB28 { - [#"../index_range.rs" 139 12 139 24] _52 <- ([#"../index_range.rs" 139 12 139 24] _53 = (3 : usize)); + [#"../index_range.rs" 139 12 139 24] _52 <- _53 = (3 : usize); _53 <- any usize; switch (_52) | False -> goto BB30 @@ -2136,9 +2136,9 @@ module IndexRange_TestRangeFrom end } BB29 { - [#"../index_range.rs" 140 6 140 7] _56 <- ([#"../index_range.rs" 140 6 140 7] (0 : usize)); - [#"../index_range.rs" 140 4 140 8] _57 <- ([#"../index_range.rs" 140 4 140 8] Slice.length ( * s1)); - [#"../index_range.rs" 140 4 140 8] _58 <- ([#"../index_range.rs" 140 4 140 8] _56 < _57); + [#"../index_range.rs" 140 6 140 7] _56 <- (0 : usize); + [#"../index_range.rs" 140 4 140 8] _57 <- Slice.length ( * s1); + [#"../index_range.rs" 140 4 140 8] _58 <- _56 < _57; assert { [@expl:index in bounds] [#"../index_range.rs" 140 4 140 8] _58 }; goto BB31 } @@ -2150,24 +2150,24 @@ module IndexRange_TestRangeFrom absurd } BB31 { - [#"../index_range.rs" 140 4 140 13] s1 <- { s1 with current = Slice.set ( * s1) _56 ([#"../index_range.rs" 140 4 140 13] (-1 : int32)) ; }; - [#"../index_range.rs" 141 6 141 7] _59 <- ([#"../index_range.rs" 141 6 141 7] (1 : usize)); - [#"../index_range.rs" 141 4 141 8] _60 <- ([#"../index_range.rs" 141 4 141 8] Slice.length ( * s1)); - [#"../index_range.rs" 141 4 141 8] _61 <- ([#"../index_range.rs" 141 4 141 8] _59 < _60); + [#"../index_range.rs" 140 4 140 13] s1 <- { s1 with current = Slice.set ( * s1) _56 (-1 : int32) ; }; + [#"../index_range.rs" 141 6 141 7] _59 <- (1 : usize); + [#"../index_range.rs" 141 4 141 8] _60 <- Slice.length ( * s1); + [#"../index_range.rs" 141 4 141 8] _61 <- _59 < _60; assert { [@expl:index in bounds] [#"../index_range.rs" 141 4 141 8] _61 }; goto BB32 } BB32 { - [#"../index_range.rs" 141 4 141 13] s1 <- { s1 with current = Slice.set ( * s1) _59 ([#"../index_range.rs" 141 4 141 13] (-1 : int32)) ; }; - [#"../index_range.rs" 143 14 143 15] _65 <- ([#"../index_range.rs" 143 14 143 15] (2 : usize)); - [#"../index_range.rs" 143 12 143 16] _66 <- ([#"../index_range.rs" 143 12 143 16] Slice.length ( * s1)); - [#"../index_range.rs" 143 12 143 16] _67 <- ([#"../index_range.rs" 143 12 143 16] _65 < _66); + [#"../index_range.rs" 141 4 141 13] s1 <- { s1 with current = Slice.set ( * s1) _59 (-1 : int32) ; }; + [#"../index_range.rs" 143 14 143 15] _65 <- (2 : usize); + [#"../index_range.rs" 143 12 143 16] _66 <- Slice.length ( * s1); + [#"../index_range.rs" 143 12 143 16] _67 <- _65 < _66; assert { [@expl:index in bounds] [#"../index_range.rs" 143 12 143 16] _67 }; goto BB33 } BB33 { assume { resolve1 s1 }; - [#"../index_range.rs" 143 12 143 21] _63 <- ([#"../index_range.rs" 143 12 143 21] Slice.get ( * s1) _65 = (4 : int32)); + [#"../index_range.rs" 143 12 143 21] _63 <- Slice.get ( * s1) _65 = (4 : int32); assume { resolve1 _48 }; switch (_63) | False -> goto BB35 @@ -2184,7 +2184,7 @@ module IndexRange_TestRangeFrom absurd } BB36 { - [#"../index_range.rs" 145 12 145 26] _70 <- ([#"../index_range.rs" 145 12 145 26] _71 = (5 : usize)); + [#"../index_range.rs" 145 12 145 26] _70 <- _71 = (5 : usize); _71 <- any usize; switch (_70) | False -> goto BB38 @@ -2201,7 +2201,7 @@ module IndexRange_TestRangeFrom absurd } BB39 { - [#"../index_range.rs" 146 12 146 23] _75 <- ([#"../index_range.rs" 146 12 146 23] _77 = (0 : int32)); + [#"../index_range.rs" 146 12 146 23] _75 <- _77 = (0 : int32); switch (_75) | False -> goto BB41 | True -> goto BB40 @@ -2217,7 +2217,7 @@ module IndexRange_TestRangeFrom absurd } BB42 { - [#"../index_range.rs" 147 12 147 23] _81 <- ([#"../index_range.rs" 147 12 147 23] _83 = (1 : int32)); + [#"../index_range.rs" 147 12 147 23] _81 <- _83 = (1 : int32); switch (_81) | False -> goto BB44 | True -> goto BB43 @@ -2233,7 +2233,7 @@ module IndexRange_TestRangeFrom absurd } BB45 { - [#"../index_range.rs" 148 12 148 24] _87 <- ([#"../index_range.rs" 148 12 148 24] _89 = (-1 : int32)); + [#"../index_range.rs" 148 12 148 24] _87 <- _89 = (-1 : int32); switch (_87) | False -> goto BB47 | True -> goto BB46 @@ -2249,7 +2249,7 @@ module IndexRange_TestRangeFrom absurd } BB48 { - [#"../index_range.rs" 149 12 149 24] _93 <- ([#"../index_range.rs" 149 12 149 24] _95 = (-1 : int32)); + [#"../index_range.rs" 149 12 149 24] _93 <- _95 = (-1 : int32); switch (_93) | False -> goto BB50 | True -> goto BB49 @@ -2266,14 +2266,14 @@ module IndexRange_TestRangeFrom } BB51 { assume { resolve0 arr }; - [#"../index_range.rs" 150 12 150 23] _99 <- ([#"../index_range.rs" 150 12 150 23] _101 = (4 : int32)); + [#"../index_range.rs" 150 12 150 23] _99 <- _101 = (4 : int32); switch (_99) | False -> goto BB53 | True -> goto BB52 end } BB52 { - [#"../index_range.rs" 115 25 151 1] _0 <- ([#"../index_range.rs" 115 25 151 1] ()); + [#"../index_range.rs" 115 25 151 1] _0 <- (); goto BB54 } BB53 { @@ -2582,18 +2582,18 @@ module IndexRange_TestRangeFull goto BB1 } BB1 { - [#"../index_range.rs" 161 17 161 19] _5 <- ([#"../index_range.rs" 161 17 161 19] Core_Ops_Range_RangeFull_Type.C_RangeFull); + [#"../index_range.rs" 161 17 161 19] _5 <- Core_Ops_Range_RangeFull_Type.C_RangeFull; [#"../index_range.rs" 161 16 161 20] _3 <- ([#"../index_range.rs" 161 16 161 20] index0 arr _5); _5 <- any Core_Ops_Range_RangeFull_Type.t_rangefull; goto BB2 } BB2 { - [#"../index_range.rs" 161 12 161 20] s <- ([#"../index_range.rs" 161 12 161 20] _3); + [#"../index_range.rs" 161 12 161 20] s <- _3; [#"../index_range.rs" 162 12 162 19] _8 <- ([#"../index_range.rs" 162 12 162 19] len0 s); goto BB3 } BB3 { - [#"../index_range.rs" 162 12 162 24] _7 <- ([#"../index_range.rs" 162 12 162 24] _8 = (5 : usize)); + [#"../index_range.rs" 162 12 162 24] _7 <- _8 = (5 : usize); _8 <- any usize; switch (_7) | False -> goto BB20 @@ -2601,70 +2601,70 @@ module IndexRange_TestRangeFull end } BB4 { - [#"../index_range.rs" 162 30 162 31] _12 <- ([#"../index_range.rs" 162 30 162 31] (0 : usize)); - [#"../index_range.rs" 162 28 162 32] _13 <- ([#"../index_range.rs" 162 28 162 32] Slice.length s); - [#"../index_range.rs" 162 28 162 32] _14 <- ([#"../index_range.rs" 162 28 162 32] _12 < _13); + [#"../index_range.rs" 162 30 162 31] _12 <- (0 : usize); + [#"../index_range.rs" 162 28 162 32] _13 <- Slice.length s; + [#"../index_range.rs" 162 28 162 32] _14 <- _12 < _13; assert { [@expl:index in bounds] [#"../index_range.rs" 162 28 162 32] _14 }; goto BB5 } BB5 { - [#"../index_range.rs" 162 28 162 37] _10 <- ([#"../index_range.rs" 162 28 162 37] Slice.get s _12 = (0 : int32)); + [#"../index_range.rs" 162 28 162 37] _10 <- Slice.get s _12 = (0 : int32); switch (_10) | False -> goto BB19 | True -> goto BB6 end } BB6 { - [#"../index_range.rs" 162 43 162 44] _17 <- ([#"../index_range.rs" 162 43 162 44] (1 : usize)); - [#"../index_range.rs" 162 41 162 45] _18 <- ([#"../index_range.rs" 162 41 162 45] Slice.length s); - [#"../index_range.rs" 162 41 162 45] _19 <- ([#"../index_range.rs" 162 41 162 45] _17 < _18); + [#"../index_range.rs" 162 43 162 44] _17 <- (1 : usize); + [#"../index_range.rs" 162 41 162 45] _18 <- Slice.length s; + [#"../index_range.rs" 162 41 162 45] _19 <- _17 < _18; assert { [@expl:index in bounds] [#"../index_range.rs" 162 41 162 45] _19 }; goto BB7 } BB7 { - [#"../index_range.rs" 162 41 162 50] _15 <- ([#"../index_range.rs" 162 41 162 50] Slice.get s _17 = (1 : int32)); + [#"../index_range.rs" 162 41 162 50] _15 <- Slice.get s _17 = (1 : int32); switch (_15) | False -> goto BB18 | True -> goto BB8 end } BB8 { - [#"../index_range.rs" 162 56 162 57] _22 <- ([#"../index_range.rs" 162 56 162 57] (2 : usize)); - [#"../index_range.rs" 162 54 162 58] _23 <- ([#"../index_range.rs" 162 54 162 58] Slice.length s); - [#"../index_range.rs" 162 54 162 58] _24 <- ([#"../index_range.rs" 162 54 162 58] _22 < _23); + [#"../index_range.rs" 162 56 162 57] _22 <- (2 : usize); + [#"../index_range.rs" 162 54 162 58] _23 <- Slice.length s; + [#"../index_range.rs" 162 54 162 58] _24 <- _22 < _23; assert { [@expl:index in bounds] [#"../index_range.rs" 162 54 162 58] _24 }; goto BB9 } BB9 { - [#"../index_range.rs" 162 54 162 63] _20 <- ([#"../index_range.rs" 162 54 162 63] Slice.get s _22 = (2 : int32)); + [#"../index_range.rs" 162 54 162 63] _20 <- Slice.get s _22 = (2 : int32); switch (_20) | False -> goto BB17 | True -> goto BB10 end } BB10 { - [#"../index_range.rs" 162 69 162 70] _27 <- ([#"../index_range.rs" 162 69 162 70] (3 : usize)); - [#"../index_range.rs" 162 67 162 71] _28 <- ([#"../index_range.rs" 162 67 162 71] Slice.length s); - [#"../index_range.rs" 162 67 162 71] _29 <- ([#"../index_range.rs" 162 67 162 71] _27 < _28); + [#"../index_range.rs" 162 69 162 70] _27 <- (3 : usize); + [#"../index_range.rs" 162 67 162 71] _28 <- Slice.length s; + [#"../index_range.rs" 162 67 162 71] _29 <- _27 < _28; assert { [@expl:index in bounds] [#"../index_range.rs" 162 67 162 71] _29 }; goto BB11 } BB11 { - [#"../index_range.rs" 162 67 162 76] _25 <- ([#"../index_range.rs" 162 67 162 76] Slice.get s _27 = (3 : int32)); + [#"../index_range.rs" 162 67 162 76] _25 <- Slice.get s _27 = (3 : int32); switch (_25) | False -> goto BB16 | True -> goto BB12 end } BB12 { - [#"../index_range.rs" 162 82 162 83] _32 <- ([#"../index_range.rs" 162 82 162 83] (4 : usize)); - [#"../index_range.rs" 162 80 162 84] _33 <- ([#"../index_range.rs" 162 80 162 84] Slice.length s); - [#"../index_range.rs" 162 80 162 84] _34 <- ([#"../index_range.rs" 162 80 162 84] _32 < _33); + [#"../index_range.rs" 162 82 162 83] _32 <- (4 : usize); + [#"../index_range.rs" 162 80 162 84] _33 <- Slice.length s; + [#"../index_range.rs" 162 80 162 84] _34 <- _32 < _33; assert { [@expl:index in bounds] [#"../index_range.rs" 162 80 162 84] _34 }; goto BB13 } BB13 { - [#"../index_range.rs" 162 80 162 89] _30 <- ([#"../index_range.rs" 162 80 162 89] Slice.get s _32 = (4 : int32)); + [#"../index_range.rs" 162 80 162 89] _30 <- Slice.get s _32 = (4 : int32); switch (_30) | False -> goto BB15 | True -> goto BB14 @@ -2673,7 +2673,7 @@ module IndexRange_TestRangeFull BB14 { [#"../index_range.rs" 165 17 165 20] _38 <- Borrow.borrow_mut arr; [#"../index_range.rs" 165 17 165 20] arr <- ^ _38; - [#"../index_range.rs" 165 21 165 23] _39 <- ([#"../index_range.rs" 165 21 165 23] Core_Ops_Range_RangeFull_Type.C_RangeFull); + [#"../index_range.rs" 165 21 165 23] _39 <- Core_Ops_Range_RangeFull_Type.C_RangeFull; [#"../index_range.rs" 165 20 165 24] _37 <- ([#"../index_range.rs" 165 20 165 24] index_mut0 _38 _39); _38 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)); _39 <- any Core_Ops_Range_RangeFull_Type.t_rangefull; @@ -2714,7 +2714,7 @@ module IndexRange_TestRangeFull goto BB23 } BB23 { - [#"../index_range.rs" 166 12 166 24] _41 <- ([#"../index_range.rs" 166 12 166 24] _42 = (5 : usize)); + [#"../index_range.rs" 166 12 166 24] _41 <- _42 = (5 : usize); _42 <- any usize; switch (_41) | False -> goto BB25 @@ -2722,9 +2722,9 @@ module IndexRange_TestRangeFull end } BB24 { - [#"../index_range.rs" 167 6 167 7] _45 <- ([#"../index_range.rs" 167 6 167 7] (1 : usize)); - [#"../index_range.rs" 167 4 167 8] _46 <- ([#"../index_range.rs" 167 4 167 8] Slice.length ( * s1)); - [#"../index_range.rs" 167 4 167 8] _47 <- ([#"../index_range.rs" 167 4 167 8] _45 < _46); + [#"../index_range.rs" 167 6 167 7] _45 <- (1 : usize); + [#"../index_range.rs" 167 4 167 8] _46 <- Slice.length ( * s1); + [#"../index_range.rs" 167 4 167 8] _47 <- _45 < _46; assert { [@expl:index in bounds] [#"../index_range.rs" 167 4 167 8] _47 }; goto BB26 } @@ -2736,22 +2736,22 @@ module IndexRange_TestRangeFull absurd } BB26 { - [#"../index_range.rs" 167 4 167 13] s1 <- { s1 with current = Slice.set ( * s1) _45 ([#"../index_range.rs" 167 4 167 13] (-1 : int32)) ; }; - [#"../index_range.rs" 168 6 168 7] _48 <- ([#"../index_range.rs" 168 6 168 7] (3 : usize)); - [#"../index_range.rs" 168 4 168 8] _49 <- ([#"../index_range.rs" 168 4 168 8] Slice.length ( * s1)); - [#"../index_range.rs" 168 4 168 8] _50 <- ([#"../index_range.rs" 168 4 168 8] _48 < _49); + [#"../index_range.rs" 167 4 167 13] s1 <- { s1 with current = Slice.set ( * s1) _45 (-1 : int32) ; }; + [#"../index_range.rs" 168 6 168 7] _48 <- (3 : usize); + [#"../index_range.rs" 168 4 168 8] _49 <- Slice.length ( * s1); + [#"../index_range.rs" 168 4 168 8] _50 <- _48 < _49; assert { [@expl:index in bounds] [#"../index_range.rs" 168 4 168 8] _50 }; goto BB27 } BB27 { - [#"../index_range.rs" 168 4 168 13] s1 <- { s1 with current = Slice.set ( * s1) _48 ([#"../index_range.rs" 168 4 168 13] (-1 : int32)) ; }; + [#"../index_range.rs" 168 4 168 13] s1 <- { s1 with current = Slice.set ( * s1) _48 (-1 : int32) ; }; assume { resolve1 s1 }; assume { resolve1 _37 }; [#"../index_range.rs" 170 12 170 21] _53 <- ([#"../index_range.rs" 170 12 170 21] len1 arr); goto BB28 } BB28 { - [#"../index_range.rs" 170 12 170 26] _52 <- ([#"../index_range.rs" 170 12 170 26] _53 = (5 : usize)); + [#"../index_range.rs" 170 12 170 26] _52 <- _53 = (5 : usize); _53 <- any usize; switch (_52) | False -> goto BB30 @@ -2768,7 +2768,7 @@ module IndexRange_TestRangeFull absurd } BB31 { - [#"../index_range.rs" 171 12 171 23] _57 <- ([#"../index_range.rs" 171 12 171 23] _59 = (0 : int32)); + [#"../index_range.rs" 171 12 171 23] _57 <- _59 = (0 : int32); switch (_57) | False -> goto BB33 | True -> goto BB32 @@ -2784,7 +2784,7 @@ module IndexRange_TestRangeFull absurd } BB34 { - [#"../index_range.rs" 172 12 172 24] _63 <- ([#"../index_range.rs" 172 12 172 24] _65 = (-1 : int32)); + [#"../index_range.rs" 172 12 172 24] _63 <- _65 = (-1 : int32); switch (_63) | False -> goto BB36 | True -> goto BB35 @@ -2800,7 +2800,7 @@ module IndexRange_TestRangeFull absurd } BB37 { - [#"../index_range.rs" 173 12 173 23] _69 <- ([#"../index_range.rs" 173 12 173 23] _71 = (2 : int32)); + [#"../index_range.rs" 173 12 173 23] _69 <- _71 = (2 : int32); switch (_69) | False -> goto BB39 | True -> goto BB38 @@ -2816,7 +2816,7 @@ module IndexRange_TestRangeFull absurd } BB40 { - [#"../index_range.rs" 174 12 174 24] _75 <- ([#"../index_range.rs" 174 12 174 24] _77 = (-1 : int32)); + [#"../index_range.rs" 174 12 174 24] _75 <- _77 = (-1 : int32); switch (_75) | False -> goto BB42 | True -> goto BB41 @@ -2833,14 +2833,14 @@ module IndexRange_TestRangeFull } BB43 { assume { resolve0 arr }; - [#"../index_range.rs" 175 12 175 23] _81 <- ([#"../index_range.rs" 175 12 175 23] _83 = (4 : int32)); + [#"../index_range.rs" 175 12 175 23] _81 <- _83 = (4 : int32); switch (_81) | False -> goto BB45 | True -> goto BB44 end } BB44 { - [#"../index_range.rs" 154 25 176 1] _0 <- ([#"../index_range.rs" 154 25 176 1] ()); + [#"../index_range.rs" 154 25 176 1] _0 <- (); goto BB46 } BB45 { @@ -3189,18 +3189,18 @@ module IndexRange_TestRangeToInclusive goto BB1 } BB1 { - [#"../index_range.rs" 186 17 186 21] _5 <- ([#"../index_range.rs" 186 17 186 21] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (1 : usize)); + [#"../index_range.rs" 186 17 186 21] _5 <- Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (1 : usize); [#"../index_range.rs" 186 16 186 22] _3 <- ([#"../index_range.rs" 186 16 186 22] index0 arr _5); _5 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize; goto BB2 } BB2 { - [#"../index_range.rs" 186 12 186 22] s <- ([#"../index_range.rs" 186 12 186 22] _3); + [#"../index_range.rs" 186 12 186 22] s <- _3; [#"../index_range.rs" 187 12 187 19] _8 <- ([#"../index_range.rs" 187 12 187 19] len0 s); goto BB3 } BB3 { - [#"../index_range.rs" 187 12 187 24] _7 <- ([#"../index_range.rs" 187 12 187 24] _8 = (2 : usize)); + [#"../index_range.rs" 187 12 187 24] _7 <- _8 = (2 : usize); _8 <- any usize; switch (_7) | False -> goto BB11 @@ -3208,28 +3208,28 @@ module IndexRange_TestRangeToInclusive end } BB4 { - [#"../index_range.rs" 187 30 187 31] _12 <- ([#"../index_range.rs" 187 30 187 31] (0 : usize)); - [#"../index_range.rs" 187 28 187 32] _13 <- ([#"../index_range.rs" 187 28 187 32] Slice.length s); - [#"../index_range.rs" 187 28 187 32] _14 <- ([#"../index_range.rs" 187 28 187 32] _12 < _13); + [#"../index_range.rs" 187 30 187 31] _12 <- (0 : usize); + [#"../index_range.rs" 187 28 187 32] _13 <- Slice.length s; + [#"../index_range.rs" 187 28 187 32] _14 <- _12 < _13; assert { [@expl:index in bounds] [#"../index_range.rs" 187 28 187 32] _14 }; goto BB5 } BB5 { - [#"../index_range.rs" 187 28 187 37] _10 <- ([#"../index_range.rs" 187 28 187 37] Slice.get s _12 = (0 : int32)); + [#"../index_range.rs" 187 28 187 37] _10 <- Slice.get s _12 = (0 : int32); switch (_10) | False -> goto BB10 | True -> goto BB6 end } BB6 { - [#"../index_range.rs" 187 43 187 44] _17 <- ([#"../index_range.rs" 187 43 187 44] (1 : usize)); - [#"../index_range.rs" 187 41 187 45] _18 <- ([#"../index_range.rs" 187 41 187 45] Slice.length s); - [#"../index_range.rs" 187 41 187 45] _19 <- ([#"../index_range.rs" 187 41 187 45] _17 < _18); + [#"../index_range.rs" 187 43 187 44] _17 <- (1 : usize); + [#"../index_range.rs" 187 41 187 45] _18 <- Slice.length s; + [#"../index_range.rs" 187 41 187 45] _19 <- _17 < _18; assert { [@expl:index in bounds] [#"../index_range.rs" 187 41 187 45] _19 }; goto BB7 } BB7 { - [#"../index_range.rs" 187 41 187 50] _15 <- ([#"../index_range.rs" 187 41 187 50] Slice.get s _17 = (1 : int32)); + [#"../index_range.rs" 187 41 187 50] _15 <- Slice.get s _17 = (1 : int32); switch (_15) | False -> goto BB9 | True -> goto BB8 @@ -3256,7 +3256,7 @@ module IndexRange_TestRangeToInclusive absurd } BB13 { - [#"../index_range.rs" 192 20 192 24] _28 <- ([#"../index_range.rs" 192 20 192 24] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (5 : usize)); + [#"../index_range.rs" 192 20 192 24] _28 <- Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (5 : usize); [#"../index_range.rs" 192 12 192 25] _24 <- ([#"../index_range.rs" 192 12 192 25] get0 _26 _28); _28 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize; goto BB14 @@ -3274,7 +3274,7 @@ module IndexRange_TestRangeToInclusive BB16 { [#"../index_range.rs" 195 17 195 20] _32 <- Borrow.borrow_mut arr; [#"../index_range.rs" 195 17 195 20] arr <- ^ _32; - [#"../index_range.rs" 195 21 195 25] _33 <- ([#"../index_range.rs" 195 21 195 25] Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (2 : usize)); + [#"../index_range.rs" 195 21 195 25] _33 <- Core_Ops_Range_RangeToInclusive_Type.C_RangeToInclusive (2 : usize); [#"../index_range.rs" 195 20 195 26] _31 <- ([#"../index_range.rs" 195 20 195 26] index_mut0 _32 _33); _32 <- any borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)); _33 <- any Core_Ops_Range_RangeToInclusive_Type.t_rangetoinclusive usize; @@ -3292,7 +3292,7 @@ module IndexRange_TestRangeToInclusive goto BB19 } BB19 { - [#"../index_range.rs" 196 12 196 24] _35 <- ([#"../index_range.rs" 196 12 196 24] _36 = (3 : usize)); + [#"../index_range.rs" 196 12 196 24] _35 <- _36 = (3 : usize); _36 <- any usize; switch (_35) | False -> goto BB21 @@ -3300,9 +3300,9 @@ module IndexRange_TestRangeToInclusive end } BB20 { - [#"../index_range.rs" 197 6 197 7] _39 <- ([#"../index_range.rs" 197 6 197 7] (0 : usize)); - [#"../index_range.rs" 197 4 197 8] _40 <- ([#"../index_range.rs" 197 4 197 8] Slice.length ( * s1)); - [#"../index_range.rs" 197 4 197 8] _41 <- ([#"../index_range.rs" 197 4 197 8] _39 < _40); + [#"../index_range.rs" 197 6 197 7] _39 <- (0 : usize); + [#"../index_range.rs" 197 4 197 8] _40 <- Slice.length ( * s1); + [#"../index_range.rs" 197 4 197 8] _41 <- _39 < _40; assert { [@expl:index in bounds] [#"../index_range.rs" 197 4 197 8] _41 }; goto BB22 } @@ -3314,24 +3314,24 @@ module IndexRange_TestRangeToInclusive absurd } BB22 { - [#"../index_range.rs" 197 4 197 13] s1 <- { s1 with current = Slice.set ( * s1) _39 ([#"../index_range.rs" 197 4 197 13] (-1 : int32)) ; }; - [#"../index_range.rs" 198 6 198 7] _42 <- ([#"../index_range.rs" 198 6 198 7] (2 : usize)); - [#"../index_range.rs" 198 4 198 8] _43 <- ([#"../index_range.rs" 198 4 198 8] Slice.length ( * s1)); - [#"../index_range.rs" 198 4 198 8] _44 <- ([#"../index_range.rs" 198 4 198 8] _42 < _43); + [#"../index_range.rs" 197 4 197 13] s1 <- { s1 with current = Slice.set ( * s1) _39 (-1 : int32) ; }; + [#"../index_range.rs" 198 6 198 7] _42 <- (2 : usize); + [#"../index_range.rs" 198 4 198 8] _43 <- Slice.length ( * s1); + [#"../index_range.rs" 198 4 198 8] _44 <- _42 < _43; assert { [@expl:index in bounds] [#"../index_range.rs" 198 4 198 8] _44 }; goto BB23 } BB23 { - [#"../index_range.rs" 198 4 198 13] s1 <- { s1 with current = Slice.set ( * s1) _42 ([#"../index_range.rs" 198 4 198 13] (-1 : int32)) ; }; - [#"../index_range.rs" 200 14 200 15] _48 <- ([#"../index_range.rs" 200 14 200 15] (1 : usize)); - [#"../index_range.rs" 200 12 200 16] _49 <- ([#"../index_range.rs" 200 12 200 16] Slice.length ( * s1)); - [#"../index_range.rs" 200 12 200 16] _50 <- ([#"../index_range.rs" 200 12 200 16] _48 < _49); + [#"../index_range.rs" 198 4 198 13] s1 <- { s1 with current = Slice.set ( * s1) _42 (-1 : int32) ; }; + [#"../index_range.rs" 200 14 200 15] _48 <- (1 : usize); + [#"../index_range.rs" 200 12 200 16] _49 <- Slice.length ( * s1); + [#"../index_range.rs" 200 12 200 16] _50 <- _48 < _49; assert { [@expl:index in bounds] [#"../index_range.rs" 200 12 200 16] _50 }; goto BB24 } BB24 { assume { resolve1 s1 }; - [#"../index_range.rs" 200 12 200 21] _46 <- ([#"../index_range.rs" 200 12 200 21] Slice.get ( * s1) _48 = (1 : int32)); + [#"../index_range.rs" 200 12 200 21] _46 <- Slice.get ( * s1) _48 = (1 : int32); assume { resolve1 _31 }; switch (_46) | False -> goto BB26 @@ -3348,7 +3348,7 @@ module IndexRange_TestRangeToInclusive absurd } BB27 { - [#"../index_range.rs" 202 12 202 26] _53 <- ([#"../index_range.rs" 202 12 202 26] _54 = (5 : usize)); + [#"../index_range.rs" 202 12 202 26] _53 <- _54 = (5 : usize); _54 <- any usize; switch (_53) | False -> goto BB29 @@ -3365,7 +3365,7 @@ module IndexRange_TestRangeToInclusive absurd } BB30 { - [#"../index_range.rs" 203 12 203 24] _58 <- ([#"../index_range.rs" 203 12 203 24] _60 = (-1 : int32)); + [#"../index_range.rs" 203 12 203 24] _58 <- _60 = (-1 : int32); switch (_58) | False -> goto BB32 | True -> goto BB31 @@ -3381,7 +3381,7 @@ module IndexRange_TestRangeToInclusive absurd } BB33 { - [#"../index_range.rs" 204 12 204 23] _64 <- ([#"../index_range.rs" 204 12 204 23] _66 = (1 : int32)); + [#"../index_range.rs" 204 12 204 23] _64 <- _66 = (1 : int32); switch (_64) | False -> goto BB35 | True -> goto BB34 @@ -3397,7 +3397,7 @@ module IndexRange_TestRangeToInclusive absurd } BB36 { - [#"../index_range.rs" 205 12 205 24] _70 <- ([#"../index_range.rs" 205 12 205 24] _72 = (-1 : int32)); + [#"../index_range.rs" 205 12 205 24] _70 <- _72 = (-1 : int32); switch (_70) | False -> goto BB38 | True -> goto BB37 @@ -3413,7 +3413,7 @@ module IndexRange_TestRangeToInclusive absurd } BB39 { - [#"../index_range.rs" 206 12 206 23] _76 <- ([#"../index_range.rs" 206 12 206 23] _78 = (3 : int32)); + [#"../index_range.rs" 206 12 206 23] _76 <- _78 = (3 : int32); switch (_76) | False -> goto BB41 | True -> goto BB40 @@ -3430,14 +3430,14 @@ module IndexRange_TestRangeToInclusive } BB42 { assume { resolve0 arr }; - [#"../index_range.rs" 207 12 207 23] _82 <- ([#"../index_range.rs" 207 12 207 23] _84 = (4 : int32)); + [#"../index_range.rs" 207 12 207 23] _82 <- _84 = (4 : int32); switch (_82) | False -> goto BB44 | True -> goto BB43 end } BB43 { - [#"../index_range.rs" 179 33 208 1] _0 <- ([#"../index_range.rs" 179 33 208 1] ()); + [#"../index_range.rs" 179 33 208 1] _0 <- (); goto BB45 } BB44 { diff --git a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg index bd092d55a1..ccb010946f 100644 --- a/creusot/tests/should_succeed/inplace_list_reversal.mlcfg +++ b/creusot/tests/should_succeed/inplace_list_reversal.mlcfg @@ -99,11 +99,11 @@ module InplaceListReversal_Rev BB1 { assert { [@expl:type invariant] inv0 old_l }; assume { resolve0 old_l }; - [#"../inplace_list_reversal.rs" 26 19 26 22] prev <- ([#"../inplace_list_reversal.rs" 26 19 26 22] InplaceListReversal_List_Type.C_Nil); + [#"../inplace_list_reversal.rs" 26 19 26 22] prev <- InplaceListReversal_List_Type.C_Nil; [#"../inplace_list_reversal.rs" 27 27 27 28] _7 <- Borrow.borrow_final ( * l) (Borrow.get_id l); [#"../inplace_list_reversal.rs" 27 27 27 28] l <- { l with current = ( ^ _7) ; }; assume { inv1 ( ^ _7) }; - [#"../inplace_list_reversal.rs" 27 30 27 33] _8 <- ([#"../inplace_list_reversal.rs" 27 30 27 33] InplaceListReversal_List_Type.C_Nil); + [#"../inplace_list_reversal.rs" 27 30 27 33] _8 <- InplaceListReversal_List_Type.C_Nil; [#"../inplace_list_reversal.rs" 27 19 27 34] head <- ([#"../inplace_list_reversal.rs" 27 19 27 34] replace0 _7 _8); _7 <- any borrowed (InplaceListReversal_List_Type.t_list t); _8 <- any InplaceListReversal_List_Type.t_list t; @@ -129,21 +129,21 @@ module InplaceListReversal_Rev goto BB7 } BB7 { - [#"../inplace_list_reversal.rs" 29 19 29 27] curr <- ([#"../inplace_list_reversal.rs" 29 19 29 27] InplaceListReversal_List_Type.cons_0 head); + [#"../inplace_list_reversal.rs" 29 19 29 27] curr <- InplaceListReversal_List_Type.cons_0 head; head <- (let InplaceListReversal_List_Type.C_Cons x0 = head in InplaceListReversal_List_Type.C_Cons (any (t, InplaceListReversal_List_Type.t_list t))); assert { [@expl:type invariant] inv1 head }; assume { resolve1 head }; - [#"../inplace_list_reversal.rs" 30 19 30 25] next <- ([#"../inplace_list_reversal.rs" 30 19 30 25] let (_, a) = curr in a); + [#"../inplace_list_reversal.rs" 30 19 30 25] next <- (let (_, a) = curr in a); curr <- (let (x0, x1) = curr in (x0, any InplaceListReversal_List_Type.t_list t)); goto BB8 } BB8 { - [#"../inplace_list_reversal.rs" 31 8 31 14] curr <- (let (x0, x1) = curr in (x0, ([#"../inplace_list_reversal.rs" 31 8 31 14] prev))); + [#"../inplace_list_reversal.rs" 31 8 31 14] curr <- (let (x0, x1) = curr in (x0, prev)); prev <- any InplaceListReversal_List_Type.t_list t; goto BB10 } BB10 { - [#"../inplace_list_reversal.rs" 32 15 32 25] _16 <- ([#"../inplace_list_reversal.rs" 32 15 32 25] InplaceListReversal_List_Type.C_Cons curr); + [#"../inplace_list_reversal.rs" 32 15 32 25] _16 <- InplaceListReversal_List_Type.C_Cons curr; curr <- any (t, InplaceListReversal_List_Type.t_list t); goto BB11 } @@ -151,7 +151,7 @@ module InplaceListReversal_Rev goto BB12 } BB12 { - [#"../inplace_list_reversal.rs" 32 8 32 12] prev <- ([#"../inplace_list_reversal.rs" 32 8 32 12] _16); + [#"../inplace_list_reversal.rs" 32 8 32 12] prev <- _16; _16 <- any InplaceListReversal_List_Type.t_list t; goto BB14 } @@ -159,7 +159,7 @@ module InplaceListReversal_Rev goto BB15 } BB15 { - [#"../inplace_list_reversal.rs" 33 8 33 12] head <- ([#"../inplace_list_reversal.rs" 33 8 33 12] next); + [#"../inplace_list_reversal.rs" 33 8 33 12] head <- next; next <- any InplaceListReversal_List_Type.t_list t; goto BB17 } @@ -178,7 +178,7 @@ module InplaceListReversal_Rev goto BB4 } BB21 { - [#"../inplace_list_reversal.rs" 35 4 35 6] l <- { l with current = ([#"../inplace_list_reversal.rs" 35 4 35 6] prev) ; }; + [#"../inplace_list_reversal.rs" 35 4 35 6] l <- { l with current = prev ; }; prev <- any InplaceListReversal_List_Type.t_list t; assert { [@expl:type invariant] inv1 ( * l) }; assume { resolve1 ( * l) }; @@ -187,7 +187,7 @@ module InplaceListReversal_Rev goto BB23 } BB23 { - [#"../inplace_list_reversal.rs" 24 31 36 1] _0 <- ([#"../inplace_list_reversal.rs" 24 31 36 1] ()); + [#"../inplace_list_reversal.rs" 24 31 36 1] _0 <- (); goto BB24 } BB24 { diff --git a/creusot/tests/should_succeed/instant.mlcfg b/creusot/tests/should_succeed/instant.mlcfg index 86a7c76238..1cfb110068 100644 --- a/creusot/tests/should_succeed/instant.mlcfg +++ b/creusot/tests/should_succeed/instant.mlcfg @@ -748,7 +748,7 @@ module Instant_TestInstant end } BB63 { - [#"../instant.rs" 7 22 34 1] _0 <- ([#"../instant.rs" 7 22 34 1] ()); + [#"../instant.rs" 7 22 34 1] _0 <- (); return _0 } BB64 { diff --git a/creusot/tests/should_succeed/invariant_moves.mlcfg b/creusot/tests/should_succeed/invariant_moves.mlcfg index 17c84d3f3d..1d187d22d6 100644 --- a/creusot/tests/should_succeed/invariant_moves.mlcfg +++ b/creusot/tests/should_succeed/invariant_moves.mlcfg @@ -188,7 +188,7 @@ module InvariantMoves_TestInvariantMove } BB7 { assume { resolve1 x }; - [#"../invariant_moves.rs" 7 4 7 45] _0 <- ([#"../invariant_moves.rs" 7 4 7 45] ()); + [#"../invariant_moves.rs" 7 4 7 45] _0 <- (); goto BB8 } BB8 { diff --git a/creusot/tests/should_succeed/ite_normalize.mlcfg b/creusot/tests/should_succeed/ite_normalize.mlcfg index 783cbb19b4..788ddc330d 100644 --- a/creusot/tests/should_succeed/ite_normalize.mlcfg +++ b/creusot/tests/should_succeed/ite_normalize.mlcfg @@ -153,7 +153,7 @@ module IteNormalize_Impl6_Clone goto BB15 } BB4 { - [#"../ite_normalize.rs" 56 9 60 9] _0 <- ([#"../ite_normalize.rs" 56 9 60 9] IteNormalize_Expr_Type.C_False); + [#"../ite_normalize.rs" 56 9 60 9] _0 <- IteNormalize_Expr_Type.C_False; goto BB16 } BB5 { @@ -161,25 +161,25 @@ module IteNormalize_Impl6_Clone absurd } BB6 { - [#"../ite_normalize.rs" 57 17 57 18] c_1 <- ([#"../ite_normalize.rs" 57 17 57 18] IteNormalize_Expr_Type.ifthenelse_c self); - [#"../ite_normalize.rs" 57 31 57 32] t_1 <- ([#"../ite_normalize.rs" 57 31 57 32] IteNormalize_Expr_Type.ifthenelse_t self); - [#"../ite_normalize.rs" 57 45 57 46] e_1 <- ([#"../ite_normalize.rs" 57 45 57 46] IteNormalize_Expr_Type.ifthenelse_e self); - [#"../ite_normalize.rs" 55 9 55 14] _9 <- ([#"../ite_normalize.rs" 55 9 55 14] c_1); + [#"../ite_normalize.rs" 57 17 57 18] c_1 <- IteNormalize_Expr_Type.ifthenelse_c self; + [#"../ite_normalize.rs" 57 31 57 32] t_1 <- IteNormalize_Expr_Type.ifthenelse_t self; + [#"../ite_normalize.rs" 57 45 57 46] e_1 <- IteNormalize_Expr_Type.ifthenelse_e self; + [#"../ite_normalize.rs" 55 9 55 14] _9 <- c_1; [#"../ite_normalize.rs" 55 9 55 14] _7 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _9); goto BB7 } BB7 { - [#"../ite_normalize.rs" 55 9 55 14] _12 <- ([#"../ite_normalize.rs" 55 9 55 14] t_1); + [#"../ite_normalize.rs" 55 9 55 14] _12 <- t_1; [#"../ite_normalize.rs" 55 9 55 14] _10 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _12); goto BB8 } BB8 { - [#"../ite_normalize.rs" 55 9 55 14] _15 <- ([#"../ite_normalize.rs" 55 9 55 14] e_1); + [#"../ite_normalize.rs" 55 9 55 14] _15 <- e_1; [#"../ite_normalize.rs" 55 9 55 14] _13 <- ([#"../ite_normalize.rs" 55 9 55 14] clone0 _15); goto BB9 } BB9 { - [#"../ite_normalize.rs" 55 9 55 14] _0 <- ([#"../ite_normalize.rs" 55 9 55 14] IteNormalize_Expr_Type.C_IfThenElse _7 _10 _13); + [#"../ite_normalize.rs" 55 9 55 14] _0 <- IteNormalize_Expr_Type.C_IfThenElse _7 _10 _13; _7 <- any IteNormalize_Expr_Type.t_expr; _10 <- any IteNormalize_Expr_Type.t_expr; _13 <- any IteNormalize_Expr_Type.t_expr; @@ -195,18 +195,18 @@ module IteNormalize_Impl6_Clone goto BB16 } BB13 { - [#"../ite_normalize.rs" 58 10 58 11] v_1 <- ([#"../ite_normalize.rs" 58 10 58 11] IteNormalize_Expr_Type.var_v self); - [#"../ite_normalize.rs" 55 9 55 14] _19 <- ([#"../ite_normalize.rs" 55 9 55 14] v_1); + [#"../ite_normalize.rs" 58 10 58 11] v_1 <- IteNormalize_Expr_Type.var_v self; + [#"../ite_normalize.rs" 55 9 55 14] _19 <- v_1; [#"../ite_normalize.rs" 55 9 55 14] _17 <- ([#"../ite_normalize.rs" 55 9 55 14] clone1 _19); goto BB14 } BB14 { - [#"../ite_normalize.rs" 55 9 55 14] _0 <- ([#"../ite_normalize.rs" 55 9 55 14] IteNormalize_Expr_Type.C_Var _17); + [#"../ite_normalize.rs" 55 9 55 14] _0 <- IteNormalize_Expr_Type.C_Var _17; _17 <- any usize; goto BB16 } BB15 { - [#"../ite_normalize.rs" 56 9 59 8] _0 <- ([#"../ite_normalize.rs" 56 9 59 8] IteNormalize_Expr_Type.C_True); + [#"../ite_normalize.rs" 56 9 59 8] _0 <- IteNormalize_Expr_Type.C_True; goto BB16 } BB16 { @@ -230,7 +230,7 @@ module IteNormalize_Impl5_Variable goto BB0 } BB0 { - [#"../ite_normalize.rs" 102 8 102 23] _0 <- ([#"../ite_normalize.rs" 102 8 102 23] IteNormalize_Expr_Type.C_Var v); + [#"../ite_normalize.rs" 102 8 102 23] _0 <- IteNormalize_Expr_Type.C_Var v; return _0 } @@ -274,11 +274,11 @@ module IteNormalize_Impl4_From end } BB1 { - [#"../ite_normalize.rs" 88 12 88 22] _0 <- ([#"../ite_normalize.rs" 88 12 88 22] IteNormalize_Expr_Type.C_True); + [#"../ite_normalize.rs" 88 12 88 22] _0 <- IteNormalize_Expr_Type.C_True; goto BB3 } BB2 { - [#"../ite_normalize.rs" 90 12 90 23] _0 <- ([#"../ite_normalize.rs" 90 12 90 23] IteNormalize_Expr_Type.C_False); + [#"../ite_normalize.rs" 90 12 90 23] _0 <- IteNormalize_Expr_Type.C_False; goto BB3 } BB3 { @@ -312,7 +312,7 @@ module IteNormalize_Impl5_Ite goto BB4 } BB4 { - [#"../ite_normalize.rs" 98 8 98 75] _0 <- ([#"../ite_normalize.rs" 98 8 98 75] IteNormalize_Expr_Type.C_IfThenElse c t e); + [#"../ite_normalize.rs" 98 8 98 75] _0 <- IteNormalize_Expr_Type.C_IfThenElse c t e; c <- any IteNormalize_Expr_Type.t_expr; t <- any IteNormalize_Expr_Type.t_expr; e <- any IteNormalize_Expr_Type.t_expr; @@ -419,7 +419,7 @@ module IteNormalize_Impl5_Transpose goto BB30 } BB8 { - [#"../ite_normalize.rs" 121 27 121 28] _0 <- ([#"../ite_normalize.rs" 121 27 121 28] b); + [#"../ite_normalize.rs" 121 27 121 28] _0 <- b; b <- any IteNormalize_Expr_Type.t_expr; goto BB31 } @@ -428,11 +428,11 @@ module IteNormalize_Impl5_Transpose absurd } BB10 { - [#"../ite_normalize.rs" 112 31 112 32] c <- ([#"../ite_normalize.rs" 112 31 112 32] IteNormalize_Expr_Type.ifthenelse_c self); + [#"../ite_normalize.rs" 112 31 112 32] c <- IteNormalize_Expr_Type.ifthenelse_c self; self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse (any IteNormalize_Expr_Type.t_expr) x1 x2); - [#"../ite_normalize.rs" 112 34 112 35] t <- ([#"../ite_normalize.rs" 112 34 112 35] IteNormalize_Expr_Type.ifthenelse_t self); + [#"../ite_normalize.rs" 112 34 112 35] t <- IteNormalize_Expr_Type.ifthenelse_t self; self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 (any IteNormalize_Expr_Type.t_expr) x2); - [#"../ite_normalize.rs" 112 37 112 38] e <- ([#"../ite_normalize.rs" 112 37 112 38] IteNormalize_Expr_Type.ifthenelse_e self); + [#"../ite_normalize.rs" 112 37 112 38] e <- IteNormalize_Expr_Type.ifthenelse_e self; self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 x1 (any IteNormalize_Expr_Type.t_expr)); assume { resolve0 t }; [#"../ite_normalize.rs" 114 40 114 49] _17 <- ([#"../ite_normalize.rs" 114 40 114 49] clone0 a); @@ -464,7 +464,7 @@ module IteNormalize_Impl5_Transpose goto BB16 } BB16 { - [#"../ite_normalize.rs" 112 44 116 13] _0 <- ([#"../ite_normalize.rs" 112 44 116 13] IteNormalize_Expr_Type.C_IfThenElse c _15 _22); + [#"../ite_normalize.rs" 112 44 116 13] _0 <- IteNormalize_Expr_Type.C_IfThenElse c _15 _22; c <- any IteNormalize_Expr_Type.t_expr; _15 <- any IteNormalize_Expr_Type.t_expr; _22 <- any IteNormalize_Expr_Type.t_expr; @@ -498,7 +498,7 @@ module IteNormalize_Impl5_Transpose goto BB26 } BB26 { - [#"../ite_normalize.rs" 118 16 118 86] _0 <- ([#"../ite_normalize.rs" 118 16 118 86] IteNormalize_Expr_Type.C_IfThenElse self a b); + [#"../ite_normalize.rs" 118 16 118 86] _0 <- IteNormalize_Expr_Type.C_IfThenElse self a b; self <- any IteNormalize_Expr_Type.t_expr; a <- any IteNormalize_Expr_Type.t_expr; b <- any IteNormalize_Expr_Type.t_expr; @@ -514,7 +514,7 @@ module IteNormalize_Impl5_Transpose goto BB31 } BB30 { - [#"../ite_normalize.rs" 120 26 120 27] _0 <- ([#"../ite_normalize.rs" 120 26 120 27] a); + [#"../ite_normalize.rs" 120 26 120 27] _0 <- a; a <- any IteNormalize_Expr_Type.t_expr; goto BB31 } @@ -590,14 +590,14 @@ module IteNormalize_Impl5_Normalize goto BB3 } BB2 { - [#"../ite_normalize.rs" 153 12 153 13] e1 <- ([#"../ite_normalize.rs" 153 12 153 13] self); + [#"../ite_normalize.rs" 153 12 153 13] e1 <- self; [#"../ite_normalize.rs" 153 17 153 26] _0 <- ([#"../ite_normalize.rs" 153 17 153 26] clone0 e1); goto BB11 } BB3 { - [#"../ite_normalize.rs" 147 31 147 32] c <- ([#"../ite_normalize.rs" 147 31 147 32] IteNormalize_Expr_Type.ifthenelse_c self); - [#"../ite_normalize.rs" 147 34 147 35] t <- ([#"../ite_normalize.rs" 147 34 147 35] IteNormalize_Expr_Type.ifthenelse_t self); - [#"../ite_normalize.rs" 147 37 147 38] e <- ([#"../ite_normalize.rs" 147 37 147 38] IteNormalize_Expr_Type.ifthenelse_e self); + [#"../ite_normalize.rs" 147 31 147 32] c <- IteNormalize_Expr_Type.ifthenelse_c self; + [#"../ite_normalize.rs" 147 34 147 35] t <- IteNormalize_Expr_Type.ifthenelse_t self; + [#"../ite_normalize.rs" 147 37 147 38] e <- IteNormalize_Expr_Type.ifthenelse_e self; [#"../ite_normalize.rs" 148 25 148 38] cp <- ([#"../ite_normalize.rs" 148 25 148 38] normalize c); goto BB4 } @@ -866,18 +866,18 @@ module IteNormalize_Impl5_SimplifyHelper goto BB42 } BB6 { - [#"../ite_normalize.rs" 229 12 229 13] c2 <- ([#"../ite_normalize.rs" 229 12 229 13] self); + [#"../ite_normalize.rs" 229 12 229 13] c2 <- self; self <- any IteNormalize_Expr_Type.t_expr; - [#"../ite_normalize.rs" 229 17 229 18] _0 <- ([#"../ite_normalize.rs" 229 17 229 18] c2); + [#"../ite_normalize.rs" 229 17 229 18] _0 <- c2; c2 <- any IteNormalize_Expr_Type.t_expr; goto BB51 } BB7 { - [#"../ite_normalize.rs" 191 31 191 32] c <- ([#"../ite_normalize.rs" 191 31 191 32] IteNormalize_Expr_Type.ifthenelse_c self); + [#"../ite_normalize.rs" 191 31 191 32] c <- IteNormalize_Expr_Type.ifthenelse_c self; self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse (any IteNormalize_Expr_Type.t_expr) x1 x2); - [#"../ite_normalize.rs" 191 34 191 35] t <- ([#"../ite_normalize.rs" 191 34 191 35] IteNormalize_Expr_Type.ifthenelse_t self); + [#"../ite_normalize.rs" 191 34 191 35] t <- IteNormalize_Expr_Type.ifthenelse_t self; self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 (any IteNormalize_Expr_Type.t_expr) x2); - [#"../ite_normalize.rs" 191 37 191 38] e <- ([#"../ite_normalize.rs" 191 37 191 38] IteNormalize_Expr_Type.ifthenelse_e self); + [#"../ite_normalize.rs" 191 37 191 38] e <- IteNormalize_Expr_Type.ifthenelse_e self; self <- (let IteNormalize_Expr_Type.C_IfThenElse x0 x1 x2 = self in IteNormalize_Expr_Type.C_IfThenElse x0 x1 (any IteNormalize_Expr_Type.t_expr)); switch (c) | IteNormalize_Expr_Type.C_Var _ -> goto BB9 @@ -887,7 +887,7 @@ module IteNormalize_Impl5_SimplifyHelper BB8 { assume { resolve0 e }; assume { resolve0 t }; - [#"../ite_normalize.rs" 215 20 215 21] c1 <- ([#"../ite_normalize.rs" 215 20 215 21] c); + [#"../ite_normalize.rs" 215 20 215 21] c1 <- c; c <- any IteNormalize_Expr_Type.t_expr; assume { resolve0 c }; [#"../ite_normalize.rs" 215 25 215 49] _0 <- ([#"../ite_normalize.rs" 215 25 215 49] simplify_helper c1 state); @@ -899,8 +899,8 @@ module IteNormalize_Impl5_SimplifyHelper goto BB10 } BB10 { - [#"../ite_normalize.rs" 193 32 193 33] v <- ([#"../ite_normalize.rs" 193 32 193 33] IteNormalize_Expr_Type.var_v c); - [#"../ite_normalize.rs" 194 51 194 53] _16 <- ([#"../ite_normalize.rs" 194 51 194 53] v); + [#"../ite_normalize.rs" 193 32 193 33] v <- IteNormalize_Expr_Type.var_v c; + [#"../ite_normalize.rs" 194 51 194 53] _16 <- v; [#"../ite_normalize.rs" 194 41 194 54] _13 <- ([#"../ite_normalize.rs" 194 41 194 54] get0 state _16); goto BB11 } @@ -915,7 +915,7 @@ module IteNormalize_Impl5_SimplifyHelper } BB13 { assume { resolve0 c }; - [#"../ite_normalize.rs" 194 36 194 37] b <- ([#"../ite_normalize.rs" 194 36 194 37] Core_Option_Option_Type.some_0 _13); + [#"../ite_normalize.rs" 194 36 194 37] b <- Core_Option_Option_Type.some_0 _13; switch (b) | False -> goto BB16 | True -> goto BB14 @@ -989,7 +989,7 @@ module IteNormalize_Impl5_SimplifyHelper goto BB27 } BB27 { - [#"../ite_normalize.rs" 212 28 212 84] _0 <- ([#"../ite_normalize.rs" 212 28 212 84] IteNormalize_Expr_Type.C_IfThenElse c tp ep); + [#"../ite_normalize.rs" 212 28 212 84] _0 <- IteNormalize_Expr_Type.C_IfThenElse c tp ep; c <- any IteNormalize_Expr_Type.t_expr; tp <- any IteNormalize_Expr_Type.t_expr; ep <- any IteNormalize_Expr_Type.t_expr; @@ -1038,8 +1038,8 @@ module IteNormalize_Impl5_SimplifyHelper goto BB52 } BB42 { - [#"../ite_normalize.rs" 218 24 218 25] v1 <- ([#"../ite_normalize.rs" 218 24 218 25] IteNormalize_Expr_Type.var_v self); - [#"../ite_normalize.rs" 219 43 219 45] _52 <- ([#"../ite_normalize.rs" 219 43 219 45] v1); + [#"../ite_normalize.rs" 218 24 218 25] v1 <- IteNormalize_Expr_Type.var_v self; + [#"../ite_normalize.rs" 219 43 219 45] _52 <- v1; [#"../ite_normalize.rs" 219 33 219 46] _49 <- ([#"../ite_normalize.rs" 219 33 219 46] get0 state _52); goto BB43 } @@ -1053,25 +1053,25 @@ module IteNormalize_Impl5_SimplifyHelper goto BB45 } BB45 { - [#"../ite_normalize.rs" 219 28 219 29] b1 <- ([#"../ite_normalize.rs" 219 28 219 29] Core_Option_Option_Type.some_0 _49); + [#"../ite_normalize.rs" 219 28 219 29] b1 <- Core_Option_Option_Type.some_0 _49; switch (b1) | False -> goto BB47 | True -> goto BB46 end } BB46 { - [#"../ite_normalize.rs" 221 24 221 34] _0 <- ([#"../ite_normalize.rs" 221 24 221 34] IteNormalize_Expr_Type.C_True); + [#"../ite_normalize.rs" 221 24 221 34] _0 <- IteNormalize_Expr_Type.C_True; goto BB48 } BB47 { - [#"../ite_normalize.rs" 223 24 223 35] _0 <- ([#"../ite_normalize.rs" 223 24 223 35] IteNormalize_Expr_Type.C_False); + [#"../ite_normalize.rs" 223 24 223 35] _0 <- IteNormalize_Expr_Type.C_False; goto BB48 } BB48 { goto BB50 } BB49 { - [#"../ite_normalize.rs" 226 20 226 35] _0 <- ([#"../ite_normalize.rs" 226 20 226 35] IteNormalize_Expr_Type.C_Var v1); + [#"../ite_normalize.rs" 226 20 226 35] _0 <- IteNormalize_Expr_Type.C_Var v1; goto BB50 } BB50 { diff --git a/creusot/tests/should_succeed/iterators/01_range.mlcfg b/creusot/tests/should_succeed/iterators/01_range.mlcfg index 7976094f5a..002df98f94 100644 --- a/creusot/tests/should_succeed/iterators/01_range.mlcfg +++ b/creusot/tests/should_succeed/iterators/01_range.mlcfg @@ -113,7 +113,7 @@ module C01Range_Impl0_Next goto BB0 } BB0 { - [#"../01_range.rs" 58 11 58 33] _3 <- ([#"../01_range.rs" 58 11 58 33] C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self)); + [#"../01_range.rs" 58 11 58 33] _3 <- C01Range_Range_Type.range_start ( * self) >= C01Range_Range_Type.range_end ( * self); switch (_3) | False -> goto BB2 | True -> goto BB1 @@ -121,14 +121,14 @@ module C01Range_Impl0_Next } BB1 { assume { resolve0 self }; - [#"../01_range.rs" 59 12 59 16] _0 <- ([#"../01_range.rs" 59 12 59 16] Core_Option_Option_Type.C_None); + [#"../01_range.rs" 59 12 59 16] _0 <- Core_Option_Option_Type.C_None; goto BB3 } BB2 { - [#"../01_range.rs" 61 20 61 30] r <- ([#"../01_range.rs" 61 20 61 30] C01Range_Range_Type.range_start ( * self)); - [#"../01_range.rs" 62 12 62 27] self <- { self with current = (let C01Range_Range_Type.C_Range x0 x1 = * self in C01Range_Range_Type.C_Range ([#"../01_range.rs" 62 12 62 27] C01Range_Range_Type.range_start ( * self) + (1 : isize)) x1) ; }; + [#"../01_range.rs" 61 20 61 30] r <- C01Range_Range_Type.range_start ( * self); + [#"../01_range.rs" 62 12 62 27] self <- { self with current = (let C01Range_Range_Type.C_Range x0 x1 = * self in C01Range_Range_Type.C_Range (C01Range_Range_Type.range_start ( * self) + (1 : isize)) x1) ; }; assume { resolve0 self }; - [#"../01_range.rs" 63 12 63 19] _0 <- ([#"../01_range.rs" 63 12 63 19] Core_Option_Option_Type.C_Some r); + [#"../01_range.rs" 63 12 63 19] _0 <- Core_Option_Option_Type.C_Some r; goto BB3 } BB3 { @@ -148,7 +148,7 @@ module C01Range_Impl1_IntoIter goto BB0 } BB0 { - [#"../01_range.rs" 71 8 71 12] _0 <- ([#"../01_range.rs" 71 8 71 12] self); + [#"../01_range.rs" 71 8 71 12] _0 <- self; self <- any C01Range_Range_Type.t_range; return _0 } @@ -245,8 +245,8 @@ module C01Range_SumRange goto BB0 } BB0 { - [#"../01_range.rs" 78 16 78 17] i <- ([#"../01_range.rs" 78 16 78 17] (0 : isize)); - [#"../01_range.rs" 79 17 79 43] _6 <- ([#"../01_range.rs" 79 17 79 43] C01Range_Range_Type.C_Range (0 : isize) n); + [#"../01_range.rs" 78 16 78 17] i <- (0 : isize); + [#"../01_range.rs" 79 17 79 43] _6 <- C01Range_Range_Type.C_Range (0 : isize) n; [#"../01_range.rs" 79 17 79 55] it <- ([#"../01_range.rs" 79 17 79 55] into_iter0 _6); _6 <- any C01Range_Range_Type.t_range; goto BB1 @@ -282,7 +282,7 @@ module C01Range_SumRange end } BB7 { - [#"../01_range.rs" 94 4 94 5] _0 <- ([#"../01_range.rs" 94 4 94 5] i); + [#"../01_range.rs" 94 4 94 5] _0 <- i; return _0 } BB8 { @@ -293,14 +293,14 @@ module C01Range_SumRange absurd } BB10 { - [#"../01_range.rs" 87 17 87 18] x <- ([#"../01_range.rs" 87 17 87 18] Core_Option_Option_Type.some_0 _17); + [#"../01_range.rs" 87 17 87 18] x <- Core_Option_Option_Type.some_0 _17; [#"../01_range.rs" 88 27 88 75] _21 <- ([#"../01_range.rs" 88 27 88 75] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton x))); goto BB11 } BB11 { - [#"../01_range.rs" 88 16 88 75] produced <- ([#"../01_range.rs" 88 16 88 75] _21); + [#"../01_range.rs" 88 16 88 75] produced <- _21; _21 <- any Snapshot.snap_ty (Seq.seq isize); - [#"../01_range.rs" 89 16 89 22] i <- ([#"../01_range.rs" 89 16 89 22] i + (1 : isize)); + [#"../01_range.rs" 89 16 89 22] i <- i + (1 : isize); goto BB4 } diff --git a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg index 87a643ebf1..2d6666cc87 100644 --- a/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg +++ b/creusot/tests/should_succeed/iterators/02_iter_mut.mlcfg @@ -477,7 +477,7 @@ module C02IterMut_Impl2_IntoIter goto BB0 } BB0 { - [#"../02_iter_mut.rs" 71 8 71 12] _0 <- ([#"../02_iter_mut.rs" 71 8 71 12] self); + [#"../02_iter_mut.rs" 71 8 71 12] _0 <- self; self <- any C02IterMut_IterMut_Type.t_itermut t; return _0 } @@ -691,7 +691,7 @@ module C02IterMut_IterMut [#"../02_iter_mut.rs" 79 26 79 27] _8 <- Borrow.borrow_final ( * v) (Borrow.get_id v); [#"../02_iter_mut.rs" 79 26 79 27] v <- { v with current = ( ^ _8) ; }; assume { inv0 ( ^ _8) }; - [#"../02_iter_mut.rs" 79 28 79 30] _9 <- ([#"../02_iter_mut.rs" 79 28 79 30] Core_Ops_Range_RangeFull_Type.C_RangeFull); + [#"../02_iter_mut.rs" 79 28 79 30] _9 <- Core_Ops_Range_RangeFull_Type.C_RangeFull; [#"../02_iter_mut.rs" 79 27 79 31] _7 <- ([#"../02_iter_mut.rs" 79 27 79 31] index_mut0 _8 _9); _8 <- any borrowed (Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global)); _9 <- any Core_Ops_Range_RangeFull_Type.t_rangefull; @@ -704,7 +704,7 @@ module C02IterMut_IterMut [#"../02_iter_mut.rs" 79 21 79 31] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6); [#"../02_iter_mut.rs" 79 21 79 31] _6 <- { _6 with current = ( ^ _5) ; }; assume { inv1 ( ^ _5) }; - [#"../02_iter_mut.rs" 79 4 79 33] _0 <- ([#"../02_iter_mut.rs" 79 4 79 33] C02IterMut_IterMut_Type.C_IterMut _5); + [#"../02_iter_mut.rs" 79 4 79 33] _0 <- C02IterMut_IterMut_Type.C_IterMut _5; _5 <- any borrowed (slice t); assert { [@expl:type invariant] inv2 _7 }; assume { resolve0 _7 }; @@ -1018,7 +1018,7 @@ module C02IterMut_AllZero end } BB8 { - [#"../02_iter_mut.rs" 97 20 97 25] _0 <- ([#"../02_iter_mut.rs" 97 20 97 25] ()); + [#"../02_iter_mut.rs" 97 20 97 25] _0 <- (); assume { resolve1 v }; return _0 } @@ -1031,15 +1031,15 @@ module C02IterMut_AllZero absurd } BB11 { - [#"../02_iter_mut.rs" 93 17 93 18] x <- ([#"../02_iter_mut.rs" 93 17 93 18] Core_Option_Option_Type.some_0 _15); + [#"../02_iter_mut.rs" 93 17 93 18] x <- Core_Option_Option_Type.some_0 _15; _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any borrowed usize)); [#"../02_iter_mut.rs" 94 27 94 75] _19 <- ([#"../02_iter_mut.rs" 94 27 94 75] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton x))); goto BB12 } BB12 { - [#"../02_iter_mut.rs" 94 16 94 75] produced <- ([#"../02_iter_mut.rs" 94 16 94 75] _19); + [#"../02_iter_mut.rs" 94 16 94 75] produced <- _19; _19 <- any Snapshot.snap_ty (Seq.seq (borrowed usize)); - [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = ([#"../02_iter_mut.rs" 95 16 95 22] (0 : usize)) ; }; + [#"../02_iter_mut.rs" 95 16 95 22] x <- { x with current = (0 : usize) ; }; assume { resolve0 x }; goto BB5 } diff --git a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg index 1ba4247c45..3309549fcb 100644 --- a/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg +++ b/creusot/tests/should_succeed/iterators/03_std_iterators.mlcfg @@ -268,7 +268,7 @@ module C03StdIterators_SliceIter goto BB0 } BB0 { - [#"../03_std_iterators.rs" 7 16 7 17] i <- ([#"../03_std_iterators.rs" 7 16 7 17] (0 : usize)); + [#"../03_std_iterators.rs" 7 16 7 17] i <- (0 : usize); assert { [@expl:type invariant] inv0 slice }; assume { resolve0 slice }; [#"../03_std_iterators.rs" 9 13 9 25] _7 <- ([#"../03_std_iterators.rs" 9 13 9 25] iter0 slice); @@ -319,7 +319,7 @@ module C03StdIterators_SliceIter assert { [@expl:type invariant] inv3 _17 }; assume { resolve4 _17 }; assume { resolve6 iter }; - [#"../03_std_iterators.rs" 12 4 12 5] _0 <- ([#"../03_std_iterators.rs" 12 4 12 5] i); + [#"../03_std_iterators.rs" 12 4 12 5] _0 <- i; return _0 } BB9 { @@ -333,20 +333,20 @@ module C03StdIterators_SliceIter absurd } BB11 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17; assert { [@expl:type invariant] inv3 _17 }; assume { resolve4 _17 }; [#"../03_std_iterators.rs" 8 4 8 38] _22 <- ([#"../03_std_iterators.rs" 8 4 8 38] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB12 } BB12 { - [#"../03_std_iterators.rs" 8 4 8 38] produced <- ([#"../03_std_iterators.rs" 8 4 8 38] _22); + [#"../03_std_iterators.rs" 8 4 8 38] produced <- _22; _22 <- any Snapshot.snap_ty (Seq.seq t); assert { [@expl:type invariant] inv1 produced }; assume { resolve2 produced }; assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem }; assume { resolve5 __creusot_proc_iter_elem }; - [#"../03_std_iterators.rs" 10 8 10 14] i <- ([#"../03_std_iterators.rs" 10 8 10 14] i + (1 : usize)); + [#"../03_std_iterators.rs" 10 8 10 14] i <- i + (1 : usize); goto BB5 } @@ -645,7 +645,7 @@ module C03StdIterators_VecIter goto BB0 } BB0 { - [#"../03_std_iterators.rs" 18 16 18 17] i <- ([#"../03_std_iterators.rs" 18 16 18 17] (0 : usize)); + [#"../03_std_iterators.rs" 18 16 18 17] i <- (0 : usize); assert { [@expl:type invariant] inv0 vec }; assume { resolve0 vec }; [#"../03_std_iterators.rs" 19 4 19 38] iter <- ([#"../03_std_iterators.rs" 19 4 19 38] into_iter0 vec); @@ -691,7 +691,7 @@ module C03StdIterators_VecIter assert { [@expl:type invariant] inv3 _16 }; assume { resolve4 _16 }; assume { resolve6 iter }; - [#"../03_std_iterators.rs" 23 4 23 5] _0 <- ([#"../03_std_iterators.rs" 23 4 23 5] i); + [#"../03_std_iterators.rs" 23 4 23 5] _0 <- i; return _0 } BB8 { @@ -705,20 +705,20 @@ module C03StdIterators_VecIter absurd } BB10 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _16); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _16; assert { [@expl:type invariant] inv3 _16 }; assume { resolve4 _16 }; [#"../03_std_iterators.rs" 19 4 19 38] _21 <- ([#"../03_std_iterators.rs" 19 4 19 38] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB11 } BB11 { - [#"../03_std_iterators.rs" 19 4 19 38] produced <- ([#"../03_std_iterators.rs" 19 4 19 38] _21); + [#"../03_std_iterators.rs" 19 4 19 38] produced <- _21; _21 <- any Snapshot.snap_ty (Seq.seq t); assert { [@expl:type invariant] inv1 produced }; assume { resolve2 produced }; assert { [@expl:type invariant] inv4 __creusot_proc_iter_elem }; assume { resolve5 __creusot_proc_iter_elem }; - [#"../03_std_iterators.rs" 21 8 21 14] i <- ([#"../03_std_iterators.rs" 21 8 21 14] i + (1 : usize)); + [#"../03_std_iterators.rs" 21 8 21 14] i <- i + (1 : usize); goto BB4 } @@ -1067,7 +1067,7 @@ module C03StdIterators_AllZero } BB9 { assume { resolve3 iter }; - [#"../03_std_iterators.rs" 29 4 29 87] _0 <- ([#"../03_std_iterators.rs" 29 4 29 87] ()); + [#"../03_std_iterators.rs" 29 4 29 87] _0 <- (); assume { resolve4 v }; return _0 } @@ -1081,17 +1081,17 @@ module C03StdIterators_AllZero absurd } BB12 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17; _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any borrowed usize)); [#"../03_std_iterators.rs" 29 4 29 87] _22 <- ([#"../03_std_iterators.rs" 29 4 29 87] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB13 } BB13 { - [#"../03_std_iterators.rs" 29 4 29 87] produced <- ([#"../03_std_iterators.rs" 29 4 29 87] _22); + [#"../03_std_iterators.rs" 29 4 29 87] produced <- _22; _22 <- any Snapshot.snap_ty (Seq.seq (borrowed usize)); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- __creusot_proc_iter_elem; __creusot_proc_iter_elem <- any borrowed usize; - [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = ([#"../03_std_iterators.rs" 31 8 31 14] (0 : usize)) ; }; + [#"../03_std_iterators.rs" 31 8 31 14] x <- { x with current = (0 : usize) ; }; assume { resolve2 x }; goto BB6 } @@ -1409,7 +1409,7 @@ module C03StdIterators_SkipTake goto BB5 } BB5 { - [#"../03_std_iterators.rs" 35 49 39 1] _0 <- ([#"../03_std_iterators.rs" 35 49 39 1] ()); + [#"../03_std_iterators.rs" 35 49 39 1] _0 <- (); goto BB6 } BB6 { @@ -1477,11 +1477,11 @@ module C03StdIterators_Counter_Closure0 goto BB0 } BB0 { - [#"../03_std_iterators.rs" 50 16 50 24] _1 <- { _1 with current = (let C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 x0 = * _1 in C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 ({ (field_00 ( * _1)) with current = ([#"../03_std_iterators.rs" 50 16 50 24] * field_00 ( * _1) + (1 : usize)) ; })) ; }; + [#"../03_std_iterators.rs" 50 16 50 24] _1 <- { _1 with current = (let C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 x0 = * _1 in C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 ({ (field_00 ( * _1)) with current = ( * field_00 ( * _1) + (1 : usize)) ; })) ; }; assume { resolve0 _1 }; - [#"../03_std_iterators.rs" 51 16 51 18] res1 <- ([#"../03_std_iterators.rs" 51 16 51 18] x); - [#"../03_std_iterators.rs" 47 12 47 67] res <- ([#"../03_std_iterators.rs" 47 12 47 67] res1); - [#"../03_std_iterators.rs" 48 12 48 91] _0 <- ([#"../03_std_iterators.rs" 48 12 48 91] res); + [#"../03_std_iterators.rs" 51 16 51 18] res1 <- x; + [#"../03_std_iterators.rs" 47 12 47 67] res <- res1; + [#"../03_std_iterators.rs" 48 12 48 91] _0 <- res; return _0 } @@ -1972,7 +1972,7 @@ module C03StdIterators_Counter goto BB0 } BB0 { - [#"../03_std_iterators.rs" 42 18 42 19] cnt <- ([#"../03_std_iterators.rs" 42 18 42 19] (0 : usize)); + [#"../03_std_iterators.rs" 42 18 42 19] cnt <- (0 : usize); [#"../03_std_iterators.rs" 44 22 45 15] _7 <- ([#"../03_std_iterators.rs" 44 22 45 15] deref0 v); goto BB1 } @@ -1983,7 +1983,7 @@ module C03StdIterators_Counter BB2 { [#"../03_std_iterators.rs" 48 12 48 91] _10 <- Borrow.borrow_mut cnt; [#"../03_std_iterators.rs" 48 12 48 91] cnt <- ^ _10; - [#"../03_std_iterators.rs" 48 12 48 91] _9 <- ([#"../03_std_iterators.rs" 48 12 48 91] C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 _10); + [#"../03_std_iterators.rs" 48 12 48 91] _9 <- C03StdIterators_Counter_Closure0.C03StdIterators_Counter_Closure0 _10; _10 <- any borrowed usize; [#"../03_std_iterators.rs" 44 22 53 9] _4 <- ([#"../03_std_iterators.rs" 44 22 53 9] map_inv0 _5 _9); _5 <- any Core_Slice_Iter_Iter_Type.t_iter uint32; @@ -2010,7 +2010,7 @@ module C03StdIterators_Counter goto BB7 } BB7 { - [#"../03_std_iterators.rs" 41 28 59 1] _0 <- ([#"../03_std_iterators.rs" 41 28 59 1] ()); + [#"../03_std_iterators.rs" 41 28 59 1] _0 <- (); goto BB8 } BB8 { @@ -2182,8 +2182,8 @@ module C03StdIterators_SumRange goto BB0 } BB0 { - [#"../03_std_iterators.rs" 64 16 64 17] i <- ([#"../03_std_iterators.rs" 64 16 64 17] (0 : isize)); - [#"../03_std_iterators.rs" 66 13 66 17] _7 <- ([#"../03_std_iterators.rs" 66 13 66 17] Core_Ops_Range_Range_Type.C_Range (0 : isize) n); + [#"../03_std_iterators.rs" 64 16 64 17] i <- (0 : isize); + [#"../03_std_iterators.rs" 66 13 66 17] _7 <- Core_Ops_Range_Range_Type.C_Range (0 : isize) n; [#"../03_std_iterators.rs" 65 4 65 48] iter <- ([#"../03_std_iterators.rs" 65 4 65 48] into_iter0 _7); _7 <- any Core_Ops_Range_Range_Type.t_range isize; goto BB1 @@ -2222,7 +2222,7 @@ module C03StdIterators_SumRange end } BB7 { - [#"../03_std_iterators.rs" 69 4 69 5] _0 <- ([#"../03_std_iterators.rs" 69 4 69 5] i); + [#"../03_std_iterators.rs" 69 4 69 5] _0 <- i; return _0 } BB8 { @@ -2233,14 +2233,14 @@ module C03StdIterators_SumRange absurd } BB10 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17; [#"../03_std_iterators.rs" 65 4 65 48] _22 <- ([#"../03_std_iterators.rs" 65 4 65 48] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB11 } BB11 { - [#"../03_std_iterators.rs" 65 4 65 48] produced <- ([#"../03_std_iterators.rs" 65 4 65 48] _22); + [#"../03_std_iterators.rs" 65 4 65 48] produced <- _22; _22 <- any Snapshot.snap_ty (Seq.seq isize); - [#"../03_std_iterators.rs" 67 8 67 14] i <- ([#"../03_std_iterators.rs" 67 8 67 14] i + (1 : isize)); + [#"../03_std_iterators.rs" 67 8 67 14] i <- i + (1 : isize); goto BB4 } @@ -2529,7 +2529,7 @@ module C03StdIterators_EnumerateRange goto BB0 } BB0 { - [#"../03_std_iterators.rs" 74 19 74 26] _3 <- ([#"../03_std_iterators.rs" 74 19 74 26] Core_Ops_Range_Range_Type.C_Range (0 : usize) (10 : usize)); + [#"../03_std_iterators.rs" 74 19 74 26] _3 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) (10 : usize); [#"../03_std_iterators.rs" 74 19 74 38] _2 <- ([#"../03_std_iterators.rs" 74 19 74 38] enumerate0 _3); _3 <- any Core_Ops_Range_Range_Type.t_range usize; goto BB1 @@ -2578,7 +2578,7 @@ module C03StdIterators_EnumerateRange BB8 { assert { [@expl:type invariant] inv0 iter }; assume { resolve2 iter }; - [#"../03_std_iterators.rs" 73 4 73 96] _0 <- ([#"../03_std_iterators.rs" 73 4 73 96] ()); + [#"../03_std_iterators.rs" 73 4 73 96] _0 <- (); return _0 } BB9 { @@ -2591,17 +2591,17 @@ module C03StdIterators_EnumerateRange absurd } BB11 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _12); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _12; [#"../03_std_iterators.rs" 73 4 73 96] _17 <- ([#"../03_std_iterators.rs" 73 4 73 96] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB12 } BB12 { - [#"../03_std_iterators.rs" 73 4 73 96] produced <- ([#"../03_std_iterators.rs" 73 4 73 96] _17); + [#"../03_std_iterators.rs" 73 4 73 96] produced <- _17; _17 <- any Snapshot.snap_ty (Seq.seq (usize, usize)); - [#"../03_std_iterators.rs" 74 9 74 11] ix <- ([#"../03_std_iterators.rs" 74 9 74 11] let (a, _) = __creusot_proc_iter_elem in a); - [#"../03_std_iterators.rs" 74 13 74 14] x <- ([#"../03_std_iterators.rs" 74 13 74 14] let (_, a) = __creusot_proc_iter_elem in a); + [#"../03_std_iterators.rs" 74 9 74 11] ix <- (let (a, _) = __creusot_proc_iter_elem in a); + [#"../03_std_iterators.rs" 74 13 74 14] x <- (let (_, a) = __creusot_proc_iter_elem in a); assume { resolve1 __creusot_proc_iter_elem }; - [#"../03_std_iterators.rs" 75 16 75 23] _21 <- ([#"../03_std_iterators.rs" 75 16 75 23] (ix, x)); + [#"../03_std_iterators.rs" 75 16 75 23] _21 <- (ix, x); assume { resolve1 _21 }; goto BB5 } @@ -3034,21 +3034,21 @@ module C03StdIterators_MyReverse BB2 { assert { [@expl:type invariant] inv0 old_v }; assume { resolve0 old_v }; - [#"../03_std_iterators.rs" 101 22 101 27] _12 <- ([#"../03_std_iterators.rs" 101 22 101 27] (2 : usize) = (0 : usize)); + [#"../03_std_iterators.rs" 101 22 101 27] _12 <- (2 : usize) = (0 : usize); assert { [@expl:division by zero] [#"../03_std_iterators.rs" 101 22 101 27] not _12 }; goto BB3 } BB3 { - [#"../03_std_iterators.rs" 101 22 101 27] _10 <- ([#"../03_std_iterators.rs" 101 22 101 27] n / (2 : usize)); - [#"../03_std_iterators.rs" 101 18 101 28] _9 <- ([#"../03_std_iterators.rs" 101 18 101 28] Core_Ops_Range_Range_Type.C_Range (0 : usize) _10); + [#"../03_std_iterators.rs" 101 22 101 27] _10 <- n / (2 : usize); + [#"../03_std_iterators.rs" 101 18 101 28] _9 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _10; _10 <- any usize; - [#"../03_std_iterators.rs" 101 36 101 41] _16 <- ([#"../03_std_iterators.rs" 101 36 101 41] (2 : usize) = (0 : usize)); + [#"../03_std_iterators.rs" 101 36 101 41] _16 <- (2 : usize) = (0 : usize); assert { [@expl:division by zero] [#"../03_std_iterators.rs" 101 36 101 41] not _16 }; goto BB4 } BB4 { - [#"../03_std_iterators.rs" 101 36 101 41] _14 <- ([#"../03_std_iterators.rs" 101 36 101 41] n / (2 : usize)); - [#"../03_std_iterators.rs" 101 33 101 41] _13 <- ([#"../03_std_iterators.rs" 101 33 101 41] Core_Ops_Range_Range_Type.C_Range (0 : usize) _14); + [#"../03_std_iterators.rs" 101 36 101 41] _14 <- n / (2 : usize); + [#"../03_std_iterators.rs" 101 33 101 41] _13 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _14; _14 <- any usize; [#"../03_std_iterators.rs" 101 18 101 42] _8 <- ([#"../03_std_iterators.rs" 101 18 101 42] zip0 _9 _13); _9 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -3099,7 +3099,7 @@ module C03StdIterators_MyReverse BB12 { assert { [@expl:type invariant] inv3 slice }; assume { resolve3 slice }; - [#"../03_std_iterators.rs" 97 4 97 36] _0 <- ([#"../03_std_iterators.rs" 97 4 97 36] ()); + [#"../03_std_iterators.rs" 97 4 97 36] _0 <- (); return _0 } BB13 { @@ -3112,21 +3112,21 @@ module C03StdIterators_MyReverse absurd } BB15 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _28); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _28; [#"../03_std_iterators.rs" 97 4 97 36] _33 <- ([#"../03_std_iterators.rs" 97 4 97 36] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB16 } BB16 { - [#"../03_std_iterators.rs" 97 4 97 36] produced <- ([#"../03_std_iterators.rs" 97 4 97 36] _33); + [#"../03_std_iterators.rs" 97 4 97 36] produced <- _33; _33 <- any Snapshot.snap_ty (Seq.seq (usize, usize)); - [#"../03_std_iterators.rs" 101 9 101 10] i <- ([#"../03_std_iterators.rs" 101 9 101 10] let (a, _) = __creusot_proc_iter_elem in a); - [#"../03_std_iterators.rs" 101 12 101 13] j <- ([#"../03_std_iterators.rs" 101 12 101 13] let (_, a) = __creusot_proc_iter_elem in a); + [#"../03_std_iterators.rs" 101 9 101 10] i <- (let (a, _) = __creusot_proc_iter_elem in a); + [#"../03_std_iterators.rs" 101 12 101 13] j <- (let (_, a) = __creusot_proc_iter_elem in a); assume { resolve2 __creusot_proc_iter_elem }; [#"../03_std_iterators.rs" 102 8 102 13] _38 <- Borrow.borrow_mut ( * slice); [#"../03_std_iterators.rs" 102 8 102 13] slice <- { slice with current = ( ^ _38) ; }; assume { inv2 ( ^ _38) }; - [#"../03_std_iterators.rs" 102 22 102 27] _41 <- ([#"../03_std_iterators.rs" 102 22 102 27] n - j); - [#"../03_std_iterators.rs" 102 22 102 31] _40 <- ([#"../03_std_iterators.rs" 102 22 102 31] _41 - (1 : usize)); + [#"../03_std_iterators.rs" 102 22 102 27] _41 <- n - j; + [#"../03_std_iterators.rs" 102 22 102 31] _40 <- _41 - (1 : usize); _41 <- any usize; [#"../03_std_iterators.rs" 102 8 102 32] _37 <- ([#"../03_std_iterators.rs" 102 8 102 32] swap0 _38 i _40); _38 <- any borrowed (slice t); diff --git a/creusot/tests/should_succeed/iterators/04_skip.mlcfg b/creusot/tests/should_succeed/iterators/04_skip.mlcfg index dae14f3d07..5275ddde39 100644 --- a/creusot/tests/should_succeed/iterators/04_skip.mlcfg +++ b/creusot/tests/should_succeed/iterators/04_skip.mlcfg @@ -450,7 +450,7 @@ module C04Skip_Impl0_Next goto BB6 } BB6 { - [#"../04_skip.rs" 74 15 74 21] _20 <- ([#"../04_skip.rs" 74 15 74 21] n = (0 : usize)); + [#"../04_skip.rs" 74 15 74 21] _20 <- n = (0 : usize); switch (_20) | False -> goto BB8 | True -> goto BB7 @@ -459,7 +459,7 @@ module C04Skip_Impl0_Next BB7 { assert { [@expl:type invariant] inv2 self }; assume { resolve5 self }; - [#"../04_skip.rs" 75 23 75 24] _0 <- ([#"../04_skip.rs" 75 23 75 24] r); + [#"../04_skip.rs" 75 23 75 24] _0 <- r; r <- any Core_Option_Option_Type.t_option item0; goto BB15 } @@ -472,7 +472,7 @@ module C04Skip_Impl0_Next BB9 { assert { [@expl:type invariant] inv2 self }; assume { resolve5 self }; - [#"../04_skip.rs" 81 23 81 24] _0 <- ([#"../04_skip.rs" 81 23 81 24] r); + [#"../04_skip.rs" 81 23 81 24] _0 <- r; r <- any Core_Option_Option_Type.t_option item0; goto BB15 } @@ -480,7 +480,7 @@ module C04Skip_Impl0_Next goto BB11 } BB11 { - [#"../04_skip.rs" 77 24 77 25] x <- ([#"../04_skip.rs" 77 24 77 25] Core_Option_Option_Type.some_0 r); + [#"../04_skip.rs" 77 24 77 25] x <- Core_Option_Option_Type.some_0 r; r <- (let Core_Option_Option_Type.C_Some x0 = r in Core_Option_Option_Type.C_Some (any item0)); assert { [@expl:type invariant] inv4 x }; assume { resolve3 x }; @@ -490,11 +490,11 @@ module C04Skip_Impl0_Next goto BB12 } BB12 { - [#"../04_skip.rs" 78 16 78 73] skipped <- ([#"../04_skip.rs" 78 16 78 73] _25); + [#"../04_skip.rs" 78 16 78 73] skipped <- _25; _25 <- any Snapshot.snap_ty (Seq.seq item0); assert { [@expl:type invariant] inv1 skipped }; assume { resolve2 skipped }; - [#"../04_skip.rs" 79 16 79 22] n <- ([#"../04_skip.rs" 79 16 79 22] n - (1 : usize)); + [#"../04_skip.rs" 79 16 79 22] n <- n - (1 : usize); goto BB13 } BB13 { diff --git a/creusot/tests/should_succeed/iterators/05_map.mlcfg b/creusot/tests/should_succeed/iterators/05_map.mlcfg index 9eb4c7f24d..577570543e 100644 --- a/creusot/tests/should_succeed/iterators/05_map.mlcfg +++ b/creusot/tests/should_succeed/iterators/05_map.mlcfg @@ -1289,7 +1289,7 @@ module C05Map_Impl0_Next assume { resolve0 _3 }; assert { [@expl:type invariant] inv3 self }; assume { resolve2 self }; - [#"../05_map.rs" 67 20 67 24] _0 <- ([#"../05_map.rs" 67 20 67 24] Core_Option_Option_Type.C_None); + [#"../05_map.rs" 67 20 67 24] _0 <- Core_Option_Option_Type.C_None; goto BB12 } BB3 { @@ -1304,7 +1304,7 @@ module C05Map_Impl0_Next absurd } BB5 { - [#"../05_map.rs" 62 17 62 18] v <- ([#"../05_map.rs" 62 17 62 18] Core_Option_Option_Type.some_0 _3); + [#"../05_map.rs" 62 17 62 18] v <- Core_Option_Option_Type.some_0 _3; _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0)); assert { [@expl:type invariant] inv1 _3 }; assume { resolve0 _3 }; @@ -1320,7 +1320,7 @@ module C05Map_Impl0_Next [#"../05_map.rs" 65 21 65 32] _12 <- Borrow.borrow_final (C05Map_Map_Type.map_func ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2); [#"../05_map.rs" 65 21 65 32] self <- { self with current = (let C05Map_Map_Type.C_Map x0 x1 = * self in C05Map_Map_Type.C_Map x0 ( ^ _12)) ; }; assume { inv2 ( ^ _12) }; - [#"../05_map.rs" 65 21 65 35] _13 <- ([#"../05_map.rs" 65 21 65 35] (v)); + [#"../05_map.rs" 65 21 65 35] _13 <- (v); v <- any item0; [#"../05_map.rs" 65 21 65 35] _11 <- ([#"../05_map.rs" 65 21 65 35] call_mut0 _12 _13); _12 <- any borrowed f; @@ -1333,7 +1333,7 @@ module C05Map_Impl0_Next BB9 { assert { [@expl:type invariant] inv3 self }; assume { resolve2 self }; - [#"../05_map.rs" 65 16 65 36] _0 <- ([#"../05_map.rs" 65 16 65 36] Core_Option_Option_Type.C_Some _11); + [#"../05_map.rs" 65 16 65 36] _0 <- Core_Option_Option_Type.C_Some _11; _11 <- any b; goto BB10 } @@ -1568,7 +1568,7 @@ module C05Map_Map goto BB3 } BB3 { - [#"../05_map.rs" 145 4 145 22] _0 <- ([#"../05_map.rs" 145 4 145 22] C05Map_Map_Type.C_Map iter func); + [#"../05_map.rs" 145 4 145 22] _0 <- C05Map_Map_Type.C_Map iter func; iter <- any i; func <- any f; goto BB4 diff --git a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg index 7843747f96..913d9d029d 100644 --- a/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg +++ b/creusot/tests/should_succeed/iterators/06_map_precond.mlcfg @@ -1597,7 +1597,7 @@ module C06MapPrecond_Impl0_Next absurd } BB5 { - [#"../06_map_precond.rs" 65 17 65 18] v <- ([#"../06_map_precond.rs" 65 17 65 18] Core_Option_Option_Type.some_0 _3); + [#"../06_map_precond.rs" 65 17 65 18] v <- Core_Option_Option_Type.some_0 _3; _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0)); assert { [@expl:type invariant] inv1 _3 }; assume { resolve0 _3 }; @@ -1612,7 +1612,7 @@ module C06MapPrecond_Impl0_Next [#"../06_map_precond.rs" 68 24 68 35] _12 <- Borrow.borrow_final (C06MapPrecond_Map_Type.map_func ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2); [#"../06_map_precond.rs" 68 24 68 35] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 = * self in C06MapPrecond_Map_Type.C_Map x0 ( ^ _12) x2) ; }; assume { inv2 ( ^ _12) }; - [#"../06_map_precond.rs" 68 24 68 53] _13 <- ([#"../06_map_precond.rs" 68 24 68 53] (v, C06MapPrecond_Map_Type.map_produced ( * self))); + [#"../06_map_precond.rs" 68 24 68 53] _13 <- (v, C06MapPrecond_Map_Type.map_produced ( * self)); v <- any item0; [#"../06_map_precond.rs" 68 24 68 53] r <- ([#"../06_map_precond.rs" 68 24 68 53] call_mut0 _12 _13); _12 <- any borrowed f; @@ -1625,7 +1625,7 @@ module C06MapPrecond_Impl0_Next BB9 { assert { [@expl:type invariant] inv3 produced }; assume { resolve1 produced }; - [#"../06_map_precond.rs" 69 16 69 40] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 = * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 69 16 69 40] produced)) ; }; + [#"../06_map_precond.rs" 69 16 69 40] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 = * self in C06MapPrecond_Map_Type.C_Map x0 x1 produced) ; }; assert { [@expl:type invariant] inv3 (C06MapPrecond_Map_Type.map_produced ( * self)) }; assume { resolve1 (C06MapPrecond_Map_Type.map_produced ( * self)) }; assert { [@expl:type invariant] inv4 self }; @@ -1635,7 +1635,7 @@ module C06MapPrecond_Impl0_Next } BB10 { assume { resolve3 _17 }; - [#"../06_map_precond.rs" 71 16 71 23] _0 <- ([#"../06_map_precond.rs" 71 16 71 23] Core_Option_Option_Type.C_Some r); + [#"../06_map_precond.rs" 71 16 71 23] _0 <- Core_Option_Option_Type.C_Some r; r <- any b; goto BB11 } @@ -1649,13 +1649,13 @@ module C06MapPrecond_Impl0_Next goto BB15 } BB14 { - [#"../06_map_precond.rs" 74 16 74 56] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 = * self in C06MapPrecond_Map_Type.C_Map x0 x1 ([#"../06_map_precond.rs" 74 16 74 56] _20)) ; }; + [#"../06_map_precond.rs" 74 16 74 56] self <- { self with current = (let C06MapPrecond_Map_Type.C_Map x0 x1 x2 = * self in C06MapPrecond_Map_Type.C_Map x0 x1 _20) ; }; _20 <- any Snapshot.snap_ty (Seq.seq item0); assert { [@expl:type invariant] inv3 (C06MapPrecond_Map_Type.map_produced ( * self)) }; assume { resolve1 (C06MapPrecond_Map_Type.map_produced ( * self)) }; assert { [@expl:type invariant] inv4 self }; assume { resolve2 self }; - [#"../06_map_precond.rs" 75 16 75 20] _0 <- ([#"../06_map_precond.rs" 75 16 75 20] Core_Option_Option_Type.C_None); + [#"../06_map_precond.rs" 75 16 75 20] _0 <- Core_Option_Option_Type.C_None; goto BB15 } BB15 { @@ -1910,7 +1910,7 @@ module C06MapPrecond_Map goto BB4 } BB4 { - [#"../06_map_precond.rs" 174 4 174 56] _0 <- ([#"../06_map_precond.rs" 174 4 174 56] C06MapPrecond_Map_Type.C_Map iter func _9); + [#"../06_map_precond.rs" 174 4 174 56] _0 <- C06MapPrecond_Map_Type.C_Map iter func _9; iter <- any i; func <- any f; _9 <- any Snapshot.snap_ty (Seq.seq item0); @@ -2037,7 +2037,7 @@ module C06MapPrecond_Identity_Closure0 goto BB0 } BB0 { - [#"../06_map_precond.rs" 178 21 178 22] _0 <- ([#"../06_map_precond.rs" 178 21 178 22] x); + [#"../06_map_precond.rs" 178 21 178 22] _0 <- x; x <- any item0; assert { [@expl:type invariant] inv0 _3 }; assume { resolve0 _3 }; @@ -2237,7 +2237,7 @@ module C06MapPrecond_Identity goto BB0 } BB0 { - [#"../06_map_precond.rs" 178 14 178 22] _4 <- ([#"../06_map_precond.rs" 178 14 178 22] C06MapPrecond_Identity_Closure0.C06MapPrecond_Identity_Closure0); + [#"../06_map_precond.rs" 178 14 178 22] _4 <- C06MapPrecond_Identity_Closure0.C06MapPrecond_Identity_Closure0; [#"../06_map_precond.rs" 178 4 178 23] _2 <- ([#"../06_map_precond.rs" 178 4 178 23] map0 iter _4); iter <- any i; _4 <- any C06MapPrecond_Identity_Closure0.c06mapprecond_identity_closure0 i; @@ -2249,7 +2249,7 @@ module C06MapPrecond_Identity goto BB2 } BB2 { - [#"../06_map_precond.rs" 177 38 179 1] _0 <- ([#"../06_map_precond.rs" 177 38 179 1] ()); + [#"../06_map_precond.rs" 177 38 179 1] _0 <- (); goto BB3 } BB3 { @@ -2301,9 +2301,9 @@ module C06MapPrecond_Increment_Closure2 } BB0 { assume { resolve0 _1 }; - [#"../06_map_precond.rs" 190 20 190 25] res1 <- ([#"../06_map_precond.rs" 190 20 190 25] x + (1 : uint32)); - [#"../06_map_precond.rs" 188 8 188 29] res <- ([#"../06_map_precond.rs" 188 8 188 29] res1); - [#"../06_map_precond.rs" 189 8 189 35] _0 <- ([#"../06_map_precond.rs" 189 8 189 35] res); + [#"../06_map_precond.rs" 190 20 190 25] res1 <- x + (1 : uint32); + [#"../06_map_precond.rs" 188 8 188 29] res <- res1; + [#"../06_map_precond.rs" 189 8 189 35] _0 <- res; return _0 } @@ -2560,7 +2560,7 @@ module C06MapPrecond_Increment goto BB1 } BB1 { - [#"../06_map_precond.rs" 189 8 189 35] _6 <- ([#"../06_map_precond.rs" 189 8 189 35] C06MapPrecond_Increment_Closure2.C06MapPrecond_Increment_Closure2); + [#"../06_map_precond.rs" 189 8 189 35] _6 <- C06MapPrecond_Increment_Closure2.C06MapPrecond_Increment_Closure2; [#"../06_map_precond.rs" 186 12 191 5] i <- ([#"../06_map_precond.rs" 186 12 191 5] map0 iter _6); iter <- any u; _6 <- any C06MapPrecond_Increment_Closure2.c06mapprecond_increment_closure2 u; @@ -2573,7 +2573,7 @@ module C06MapPrecond_Increment goto BB3 } BB3 { - [#"../06_map_precond.rs" 185 51 197 1] _0 <- ([#"../06_map_precond.rs" 185 51 197 1] ()); + [#"../06_map_precond.rs" 185 51 197 1] _0 <- (); goto BB4 } BB4 { @@ -2642,11 +2642,11 @@ module C06MapPrecond_Counter_Closure2 goto BB0 } BB0 { - [#"../06_map_precond.rs" 208 12 208 20] _1 <- { _1 with current = (let C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 x0 = * _1 in C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 ({ (field_00 ( * _1)) with current = ([#"../06_map_precond.rs" 208 12 208 20] * field_00 ( * _1) + (1 : usize)) ; })) ; }; + [#"../06_map_precond.rs" 208 12 208 20] _1 <- { _1 with current = (let C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 x0 = * _1 in C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 ({ (field_00 ( * _1)) with current = ( * field_00 ( * _1) + (1 : usize)) ; })) ; }; assume { resolve0 _1 }; - [#"../06_map_precond.rs" 209 12 209 13] res1 <- ([#"../06_map_precond.rs" 209 12 209 13] x); - [#"../06_map_precond.rs" 205 8 205 63] res <- ([#"../06_map_precond.rs" 205 8 205 63] res1); - [#"../06_map_precond.rs" 206 8 206 41] _0 <- ([#"../06_map_precond.rs" 206 8 206 41] res); + [#"../06_map_precond.rs" 209 12 209 13] res1 <- x; + [#"../06_map_precond.rs" 205 8 205 63] res <- res1; + [#"../06_map_precond.rs" 206 8 206 41] _0 <- res; return _0 } @@ -2864,10 +2864,10 @@ module C06MapPrecond_Counter goto BB1 } BB1 { - [#"../06_map_precond.rs" 202 18 202 19] cnt <- ([#"../06_map_precond.rs" 202 18 202 19] (0 : usize)); + [#"../06_map_precond.rs" 202 18 202 19] cnt <- (0 : usize); [#"../06_map_precond.rs" 206 8 206 41] _8 <- Borrow.borrow_mut cnt; [#"../06_map_precond.rs" 206 8 206 41] cnt <- ^ _8; - [#"../06_map_precond.rs" 206 8 206 41] _7 <- ([#"../06_map_precond.rs" 206 8 206 41] C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 _8); + [#"../06_map_precond.rs" 206 8 206 41] _7 <- C06MapPrecond_Counter_Closure2.C06MapPrecond_Counter_Closure2 _8; _8 <- any borrowed usize; [#"../06_map_precond.rs" 203 4 211 5] _5 <- ([#"../06_map_precond.rs" 203 4 211 5] map0 iter _7); iter <- any i; @@ -2880,7 +2880,7 @@ module C06MapPrecond_Counter goto BB3 } BB3 { - [#"../06_map_precond.rs" 201 49 212 1] _0 <- ([#"../06_map_precond.rs" 201 49 212 1] ()); + [#"../06_map_precond.rs" 201 49 212 1] _0 <- (); goto BB4 } BB4 { diff --git a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg index fb1ead2e6c..798363be7f 100644 --- a/creusot/tests/should_succeed/iterators/07_fuse.mlcfg +++ b/creusot/tests/should_succeed/iterators/07_fuse.mlcfg @@ -223,7 +223,7 @@ module C07Fuse_Impl0_Next BB4 { assert { [@expl:type invariant] inv1 _3 }; assume { resolve0 _3 }; - [#"../07_fuse.rs" 41 20 41 24] _0 <- ([#"../07_fuse.rs" 41 20 41 24] Core_Option_Option_Type.C_None); + [#"../07_fuse.rs" 41 20 41 24] _0 <- Core_Option_Option_Type.C_None; assert { [@expl:type invariant] inv2 self }; assume { resolve1 self }; goto BB15 @@ -244,20 +244,20 @@ module C07Fuse_Impl0_Next BB7 { assert { [@expl:type invariant] inv2 self }; assume { resolve1 self }; - [#"../07_fuse.rs" 47 16 47 17] x <- ([#"../07_fuse.rs" 47 16 47 17] _6); + [#"../07_fuse.rs" 47 16 47 17] x <- _6; _6 <- any Core_Option_Option_Type.t_option item0; - [#"../07_fuse.rs" 47 21 47 22] _0 <- ([#"../07_fuse.rs" 47 21 47 22] x); + [#"../07_fuse.rs" 47 21 47 22] _0 <- x; x <- any Core_Option_Option_Type.t_option item0; goto BB12 } BB8 { assert { [@expl:type invariant] inv5 _6 }; assume { resolve3 _6 }; - [#"../07_fuse.rs" 44 32 44 36] _9 <- ([#"../07_fuse.rs" 44 32 44 36] Core_Option_Option_Type.C_None); + [#"../07_fuse.rs" 44 32 44 36] _9 <- Core_Option_Option_Type.C_None; goto BB9 } BB9 { - [#"../07_fuse.rs" 44 20 44 29] self <- { self with current = (let C07Fuse_Fuse_Type.C_Fuse x0 = * self in C07Fuse_Fuse_Type.C_Fuse ([#"../07_fuse.rs" 44 20 44 29] _9)) ; }; + [#"../07_fuse.rs" 44 20 44 29] self <- { self with current = (let C07Fuse_Fuse_Type.C_Fuse x0 = * self in C07Fuse_Fuse_Type.C_Fuse _9) ; }; _9 <- any Core_Option_Option_Type.t_option i; assert { [@expl:type invariant] inv0 (C07Fuse_Fuse_Type.fuse_iter ( * self)) }; assume { resolve4 (C07Fuse_Fuse_Type.fuse_iter ( * self)) }; @@ -266,7 +266,7 @@ module C07Fuse_Impl0_Next goto BB11 } BB11 { - [#"../07_fuse.rs" 45 20 45 24] _0 <- ([#"../07_fuse.rs" 45 20 45 24] Core_Option_Option_Type.C_None); + [#"../07_fuse.rs" 45 20 45 24] _0 <- Core_Option_Option_Type.C_None; goto BB13 } BB12 { diff --git a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg index 3c9f7a6ccd..d0429b639d 100644 --- a/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg +++ b/creusot/tests/should_succeed/iterators/08_collect_extend.mlcfg @@ -371,7 +371,7 @@ module C08CollectExtend_Extend assume { resolve5 iter1 }; assert { [@expl:type invariant] inv7 vec }; assume { resolve6 vec }; - [#"../08_collect_extend.rs" 27 4 27 35] _0 <- ([#"../08_collect_extend.rs" 27 4 27 35] ()); + [#"../08_collect_extend.rs" 27 4 27 35] _0 <- (); goto BB20 } BB12 { @@ -388,7 +388,7 @@ module C08CollectExtend_Extend absurd } BB14 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17; _17 <- (let Core_Option_Option_Type.C_Some x0 = _17 in Core_Option_Option_Type.C_Some (any t)); assert { [@expl:type invariant] inv5 _17 }; assume { resolve4 _17 }; @@ -396,11 +396,11 @@ module C08CollectExtend_Extend goto BB15 } BB15 { - [#"../08_collect_extend.rs" 27 4 27 35] produced <- ([#"../08_collect_extend.rs" 27 4 27 35] _22); + [#"../08_collect_extend.rs" 27 4 27 35] produced <- _22; _22 <- any Snapshot.snap_ty (Seq.seq t); assert { [@expl:type invariant] inv2 produced }; assume { resolve2 produced }; - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- __creusot_proc_iter_elem; __creusot_proc_iter_elem <- any t; [#"../08_collect_extend.rs" 30 8 30 11] _26 <- Borrow.borrow_mut ( * vec); [#"../08_collect_extend.rs" 30 8 30 11] vec <- { vec with current = ( ^ _26) ; }; @@ -755,7 +755,7 @@ module C08CollectExtend_Collect absurd } BB15 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _15); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _15; _15 <- (let Core_Option_Option_Type.C_Some x0 = _15 in Core_Option_Option_Type.C_Some (any item0)); assert { [@expl:type invariant] inv4 _15 }; assume { resolve3 _15 }; @@ -763,11 +763,11 @@ module C08CollectExtend_Collect goto BB16 } BB16 { - [#"../08_collect_extend.rs" 45 4 45 40] produced <- ([#"../08_collect_extend.rs" 45 4 45 40] _20); + [#"../08_collect_extend.rs" 45 4 45 40] produced <- _20; _20 <- any Snapshot.snap_ty (Seq.seq item0); assert { [@expl:type invariant] inv1 produced }; assume { resolve1 produced }; - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- __creusot_proc_iter_elem; __creusot_proc_iter_elem <- any item0; [#"../08_collect_extend.rs" 47 8 47 11] _24 <- Borrow.borrow_mut res; [#"../08_collect_extend.rs" 47 8 47 11] res <- ^ _24; @@ -793,7 +793,7 @@ module C08CollectExtend_Collect goto BB22 } BB22 { - [#"../08_collect_extend.rs" 49 4 49 7] _0 <- ([#"../08_collect_extend.rs" 49 4 49 7] res); + [#"../08_collect_extend.rs" 49 4 49 7] _0 <- res; res <- any Alloc_Vec_Vec_Type.t_vec item0 (Alloc_Alloc_Global_Type.t_global); goto BB23 } @@ -1111,7 +1111,7 @@ module C08CollectExtend_ExtendIndex goto BB5 } BB5 { - [#"../08_collect_extend.rs" 52 52 58 1] _0 <- ([#"../08_collect_extend.rs" 52 52 58 1] ()); + [#"../08_collect_extend.rs" 52 52 58 1] _0 <- (); goto BB6 } BB6 { @@ -1256,7 +1256,7 @@ module C08CollectExtend_CollectExample goto BB3 } BB3 { - [#"../08_collect_extend.rs" 61 57 65 1] _0 <- ([#"../08_collect_extend.rs" 61 57 65 1] ()); + [#"../08_collect_extend.rs" 61 57 65 1] _0 <- (); goto BB4 } BB4 { diff --git a/creusot/tests/should_succeed/iterators/09_empty.mlcfg b/creusot/tests/should_succeed/iterators/09_empty.mlcfg index add4799173..00fe07eedd 100644 --- a/creusot/tests/should_succeed/iterators/09_empty.mlcfg +++ b/creusot/tests/should_succeed/iterators/09_empty.mlcfg @@ -112,7 +112,7 @@ module C09Empty_Impl0_Next } BB0 { assume { resolve0 self }; - [#"../09_empty.rs" 42 8 42 12] _0 <- ([#"../09_empty.rs" 42 8 42 12] Core_Option_Option_Type.C_None); + [#"../09_empty.rs" 42 8 42 12] _0 <- Core_Option_Option_Type.C_None; return _0 } diff --git a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg index e18cf52a0c..9ad048d227 100644 --- a/creusot/tests/should_succeed/iterators/11_repeat.mlcfg +++ b/creusot/tests/should_succeed/iterators/11_repeat.mlcfg @@ -174,7 +174,7 @@ module C11Repeat_Impl0_Next BB1 { assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../11_repeat.rs" 47 8 47 34] _0 <- ([#"../11_repeat.rs" 47 8 47 34] Core_Option_Option_Type.C_Some _3); + [#"../11_repeat.rs" 47 8 47 34] _0 <- Core_Option_Option_Type.C_Some _3; _3 <- any a; goto BB2 } diff --git a/creusot/tests/should_succeed/iterators/12_zip.mlcfg b/creusot/tests/should_succeed/iterators/12_zip.mlcfg index b903c0cfd3..d7edd68ccc 100644 --- a/creusot/tests/should_succeed/iterators/12_zip.mlcfg +++ b/creusot/tests/should_succeed/iterators/12_zip.mlcfg @@ -541,11 +541,11 @@ module C12Zip_Impl0_Next goto BB5 } BB3 { - [#"../12_zip.rs" 57 17 57 18] x1 <- ([#"../12_zip.rs" 57 17 57 18] Core_Option_Option_Type.some_0 _4); + [#"../12_zip.rs" 57 17 57 18] x1 <- Core_Option_Option_Type.some_0 _4; _4 <- (let Core_Option_Option_Type.C_Some x0 = _4 in Core_Option_Option_Type.C_Some (any item0)); assert { [@expl:type invariant] inv1 _4 }; assume { resolve0 _4 }; - [#"../12_zip.rs" 57 23 57 24] x <- ([#"../12_zip.rs" 57 23 57 24] x1); + [#"../12_zip.rs" 57 23 57 24] x <- x1; x1 <- any item0; goto BB6 } @@ -558,7 +558,7 @@ module C12Zip_Impl0_Next assume { resolve0 _4 }; assert { [@expl:type invariant] inv2 self }; assume { resolve1 self }; - [#"../12_zip.rs" 56 27 56 31] _0 <- ([#"../12_zip.rs" 56 27 56 31] Core_Option_Option_Type.C_None); + [#"../12_zip.rs" 56 27 56 31] _0 <- Core_Option_Option_Type.C_None; goto BB20 } BB6 { @@ -584,11 +584,11 @@ module C12Zip_Impl0_Next goto BB11 } BB10 { - [#"../12_zip.rs" 61 17 61 18] y1 <- ([#"../12_zip.rs" 61 17 61 18] Core_Option_Option_Type.some_0 _10); + [#"../12_zip.rs" 61 17 61 18] y1 <- Core_Option_Option_Type.some_0 _10; _10 <- (let Core_Option_Option_Type.C_Some x0 = _10 in Core_Option_Option_Type.C_Some (any item1)); assert { [@expl:type invariant] inv4 _10 }; assume { resolve2 _10 }; - [#"../12_zip.rs" 61 23 61 24] y <- ([#"../12_zip.rs" 61 23 61 24] y1); + [#"../12_zip.rs" 61 23 61 24] y <- y1; y1 <- any item1; goto BB12 } @@ -597,14 +597,14 @@ module C12Zip_Impl0_Next assume { resolve2 _10 }; assert { [@expl:type invariant] inv5 x }; assume { resolve3 x }; - [#"../12_zip.rs" 60 27 60 31] _0 <- ([#"../12_zip.rs" 60 27 60 31] Core_Option_Option_Type.C_None); + [#"../12_zip.rs" 60 27 60 31] _0 <- Core_Option_Option_Type.C_None; goto BB19 } BB12 { goto BB13 } BB13 { - [#"../12_zip.rs" 63 13 63 19] _15 <- ([#"../12_zip.rs" 63 13 63 19] (x, y)); + [#"../12_zip.rs" 63 13 63 19] _15 <- (x, y); x <- any item0; y <- any item1; goto BB14 @@ -613,7 +613,7 @@ module C12Zip_Impl0_Next goto BB15 } BB15 { - [#"../12_zip.rs" 63 8 63 20] _0 <- ([#"../12_zip.rs" 63 8 63 20] Core_Option_Option_Type.C_Some _15); + [#"../12_zip.rs" 63 8 63 20] _0 <- Core_Option_Option_Type.C_Some _15; _15 <- any (item0, item1); goto BB16 } diff --git a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg index b2eddf6477..dee0dfbf6c 100644 --- a/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg +++ b/creusot/tests/should_succeed/iterators/15_enumerate.mlcfg @@ -409,15 +409,15 @@ module C15Enumerate_Impl0_Next goto BB5 } BB3 { - [#"../15_enumerate.rs" 56 17 56 18] x <- ([#"../15_enumerate.rs" 56 17 56 18] Core_Option_Option_Type.some_0 _3); + [#"../15_enumerate.rs" 56 17 56 18] x <- Core_Option_Option_Type.some_0 _3; _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (any item0)); assert { [@expl:type invariant] inv1 _3 }; assume { resolve0 _3 }; - [#"../15_enumerate.rs" 57 24 57 34] n <- ([#"../15_enumerate.rs" 57 24 57 34] C15Enumerate_Enumerate_Type.enumerate_count ( * self)); - [#"../15_enumerate.rs" 58 16 58 31] self <- { self with current = (let C15Enumerate_Enumerate_Type.C_Enumerate x0 x1 = * self in C15Enumerate_Enumerate_Type.C_Enumerate x0 ([#"../15_enumerate.rs" 58 16 58 31] C15Enumerate_Enumerate_Type.enumerate_count ( * self) + (1 : usize))) ; }; + [#"../15_enumerate.rs" 57 24 57 34] n <- C15Enumerate_Enumerate_Type.enumerate_count ( * self); + [#"../15_enumerate.rs" 58 16 58 31] self <- { self with current = (let C15Enumerate_Enumerate_Type.C_Enumerate x0 x1 = * self in C15Enumerate_Enumerate_Type.C_Enumerate x0 (C15Enumerate_Enumerate_Type.enumerate_count ( * self) + (1 : usize))) ; }; assert { [@expl:type invariant] inv2 self }; assume { resolve1 self }; - [#"../15_enumerate.rs" 59 21 59 27] _8 <- ([#"../15_enumerate.rs" 59 21 59 27] (n, x)); + [#"../15_enumerate.rs" 59 21 59 27] _8 <- (n, x); x <- any item0; goto BB6 } @@ -434,11 +434,11 @@ module C15Enumerate_Impl0_Next assume { resolve0 _3 }; assert { [@expl:type invariant] inv2 self }; assume { resolve1 self }; - [#"../15_enumerate.rs" 55 20 55 24] _0 <- ([#"../15_enumerate.rs" 55 20 55 24] Core_Option_Option_Type.C_None); + [#"../15_enumerate.rs" 55 20 55 24] _0 <- Core_Option_Option_Type.C_None; goto BB9 } BB6 { - [#"../15_enumerate.rs" 59 16 59 28] _0 <- ([#"../15_enumerate.rs" 59 16 59 28] Core_Option_Option_Type.C_Some _8); + [#"../15_enumerate.rs" 59 16 59 28] _0 <- Core_Option_Option_Type.C_Some _8; _8 <- any (usize, item0); goto BB7 } @@ -552,7 +552,7 @@ module C15Enumerate_Enumerate goto BB1 } BB1 { - [#"../15_enumerate.rs" 82 4 82 32] _0 <- ([#"../15_enumerate.rs" 82 4 82 32] C15Enumerate_Enumerate_Type.C_Enumerate iter (0 : usize)); + [#"../15_enumerate.rs" 82 4 82 32] _0 <- C15Enumerate_Enumerate_Type.C_Enumerate iter (0 : usize); iter <- any i; goto BB2 } diff --git a/creusot/tests/should_succeed/iterators/16_take.mlcfg b/creusot/tests/should_succeed/iterators/16_take.mlcfg index 97d8327966..a6b919ef61 100644 --- a/creusot/tests/should_succeed/iterators/16_take.mlcfg +++ b/creusot/tests/should_succeed/iterators/16_take.mlcfg @@ -295,14 +295,14 @@ module C16Take_Impl0_Next goto BB0 } BB0 { - [#"../16_take.rs" 54 11 54 22] _3 <- ([#"../16_take.rs" 54 11 54 22] C16Take_Take_Type.take_n ( * self) <> (0 : usize)); + [#"../16_take.rs" 54 11 54 22] _3 <- C16Take_Take_Type.take_n ( * self) <> (0 : usize); switch (_3) | False -> goto BB3 | True -> goto BB1 end } BB1 { - [#"../16_take.rs" 55 12 55 23] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 = * self in C16Take_Take_Type.C_Take x0 ([#"../16_take.rs" 55 12 55 23] C16Take_Take_Type.take_n ( * self) - (1 : usize))) ; }; + [#"../16_take.rs" 55 12 55 23] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 = * self in C16Take_Take_Type.C_Take x0 (C16Take_Take_Type.take_n ( * self) - (1 : usize))) ; }; [#"../16_take.rs" 56 12 56 21] _5 <- Borrow.borrow_final (C16Take_Take_Type.take_iter ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1); [#"../16_take.rs" 56 12 56 21] self <- { self with current = (let C16Take_Take_Type.C_Take x0 x1 = * self in C16Take_Take_Type.C_Take ( ^ _5) x1) ; }; assume { inv1 ( ^ _5) }; @@ -318,7 +318,7 @@ module C16Take_Impl0_Next BB3 { assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../16_take.rs" 58 12 58 16] _0 <- ([#"../16_take.rs" 58 12 58 16] Core_Option_Option_Type.C_None); + [#"../16_take.rs" 58 12 58 16] _0 <- Core_Option_Option_Type.C_None; goto BB4 } BB4 { diff --git a/creusot/tests/should_succeed/knapsack.mlcfg b/creusot/tests/should_succeed/knapsack.mlcfg index a5f688504c..fcab7a1b0b 100644 --- a/creusot/tests/should_succeed/knapsack.mlcfg +++ b/creusot/tests/should_succeed/knapsack.mlcfg @@ -17,18 +17,18 @@ module Knapsack_Max goto BB0 } BB0 { - [#"../knapsack.rs" 16 7 16 12] _5 <- ([#"../knapsack.rs" 16 7 16 12] a < b); + [#"../knapsack.rs" 16 7 16 12] _5 <- a < b; switch (_5) | False -> goto BB2 | True -> goto BB1 end } BB1 { - [#"../knapsack.rs" 17 8 17 9] _0 <- ([#"../knapsack.rs" 17 8 17 9] b); + [#"../knapsack.rs" 17 8 17 9] _0 <- b; goto BB3 } BB2 { - [#"../knapsack.rs" 19 8 19 9] _0 <- ([#"../knapsack.rs" 19 8 19 9] a); + [#"../knapsack.rs" 19 8 19 9] _0 <- a; goto BB3 } BB3 { @@ -652,7 +652,7 @@ module Knapsack_Knapsack01Dyn goto BB0 } BB0 { - [#"../knapsack.rs" 49 38 49 52] _8 <- ([#"../knapsack.rs" 49 38 49 52] max_weight + (1 : usize)); + [#"../knapsack.rs" 49 38 49 52] _8 <- max_weight + (1 : usize); [#"../knapsack.rs" 49 30 49 53] _7 <- ([#"../knapsack.rs" 49 30 49 53] from_elem0 (0 : usize) _8); _8 <- any usize; goto BB1 @@ -662,7 +662,7 @@ module Knapsack_Knapsack01Dyn goto BB2 } BB2 { - [#"../knapsack.rs" 49 55 49 70] _10 <- ([#"../knapsack.rs" 49 55 49 70] _11 + (1 : usize)); + [#"../knapsack.rs" 49 55 49 70] _10 <- _11 + (1 : usize); _11 <- any usize; [#"../knapsack.rs" 49 25 49 71] best_value <- ([#"../knapsack.rs" 49 25 49 71] from_elem1 _7 _10); _7 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global); @@ -670,7 +670,7 @@ module Knapsack_Knapsack01Dyn goto BB3 } BB3 { - [#"../knapsack.rs" 50 16 50 17] i <- ([#"../knapsack.rs" 50 16 50 17] (0 : usize)); + [#"../knapsack.rs" 50 16 50 17] i <- (0 : usize); goto BB4 } BB4 { @@ -697,7 +697,7 @@ module Knapsack_Knapsack01Dyn goto BB10 } BB10 { - [#"../knapsack.rs" 59 10 59 25] _20 <- ([#"../knapsack.rs" 59 10 59 25] i < _22); + [#"../knapsack.rs" 59 10 59 25] _20 <- i < _22; _22 <- any usize; switch (_20) | False -> goto BB34 @@ -709,10 +709,10 @@ module Knapsack_Knapsack01Dyn goto BB12 } BB12 { - [#"../knapsack.rs" 60 17 60 26] it <- ([#"../knapsack.rs" 60 17 60 26] _25); + [#"../knapsack.rs" 60 17 60 26] it <- _25; assert { [@expl:type invariant] inv1 _25 }; assume { resolve2 _25 }; - [#"../knapsack.rs" 64 20 64 21] w <- ([#"../knapsack.rs" 64 20 64 21] (0 : usize)); + [#"../knapsack.rs" 64 20 64 21] w <- (0 : usize); goto BB13 } BB13 { @@ -739,14 +739,14 @@ module Knapsack_Knapsack01Dyn goto BB19 } BB19 { - [#"../knapsack.rs" 76 14 76 29] _35 <- ([#"../knapsack.rs" 76 14 76 29] w <= max_weight); + [#"../knapsack.rs" 76 14 76 29] _35 <- w <= max_weight; switch (_35) | False -> goto BB33 | True -> goto BB20 end } BB20 { - [#"../knapsack.rs" 77 38 77 51] _39 <- ([#"../knapsack.rs" 77 38 77 51] Knapsack_Item_Type.item_weight it > w); + [#"../knapsack.rs" 77 38 77 51] _39 <- Knapsack_Item_Type.item_weight it > w; switch (_39) | False -> goto BB24 | True -> goto BB21 @@ -761,7 +761,7 @@ module Knapsack_Knapsack01Dyn goto BB23 } BB23 { - [#"../knapsack.rs" 78 16 78 32] _38 <- ([#"../knapsack.rs" 78 16 78 32] _42); + [#"../knapsack.rs" 78 16 78 32] _38 <- _42; goto BB30 } BB24 { @@ -777,13 +777,13 @@ module Knapsack_Knapsack01Dyn goto BB27 } BB27 { - [#"../knapsack.rs" 80 52 80 65] _62 <- ([#"../knapsack.rs" 80 52 80 65] w - Knapsack_Item_Type.item_weight it); + [#"../knapsack.rs" 80 52 80 65] _62 <- w - Knapsack_Item_Type.item_weight it; [#"../knapsack.rs" 80 51 80 66] _57 <- ([#"../knapsack.rs" 80 51 80 66] index2 _59 _62); _62 <- any usize; goto BB28 } BB28 { - [#"../knapsack.rs" 80 38 80 77] _55 <- ([#"../knapsack.rs" 80 38 80 77] _57 + Knapsack_Item_Type.item_value it); + [#"../knapsack.rs" 80 38 80 77] _55 <- _57 + Knapsack_Item_Type.item_value it; [#"../knapsack.rs" 80 16 80 78] _38 <- ([#"../knapsack.rs" 80 16 80 78] max0 _49 _55); _55 <- any usize; goto BB29 @@ -794,7 +794,7 @@ module Knapsack_Knapsack01Dyn BB30 { [#"../knapsack.rs" 77 12 77 22] _69 <- Borrow.borrow_mut best_value; [#"../knapsack.rs" 77 12 77 22] best_value <- ^ _69; - [#"../knapsack.rs" 77 23 77 28] _70 <- ([#"../knapsack.rs" 77 23 77 28] i + (1 : usize)); + [#"../knapsack.rs" 77 23 77 28] _70 <- i + (1 : usize); [#"../knapsack.rs" 77 22 77 29] _68 <- ([#"../knapsack.rs" 77 22 77 29] index_mut0 _69 _70); _69 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)); _70 <- any usize; @@ -808,19 +808,19 @@ module Knapsack_Knapsack01Dyn goto BB32 } BB32 { - [#"../knapsack.rs" 77 12 81 13] _66 <- { _66 with current = ([#"../knapsack.rs" 77 12 81 13] _38) ; }; + [#"../knapsack.rs" 77 12 81 13] _66 <- { _66 with current = _38 ; }; _38 <- any usize; assume { resolve3 _66 }; assume { resolve4 _68 }; - [#"../knapsack.rs" 82 12 82 18] w <- ([#"../knapsack.rs" 82 12 82 18] w + (1 : usize)); - [#"../knapsack.rs" 82 12 82 18] _19 <- ([#"../knapsack.rs" 82 12 82 18] ()); + [#"../knapsack.rs" 82 12 82 18] w <- w + (1 : usize); + [#"../knapsack.rs" 82 12 82 18] _19 <- (); goto BB18 } BB33 { assert { [@expl:type invariant] inv1 it }; assume { resolve2 it }; - [#"../knapsack.rs" 84 8 84 14] i <- ([#"../knapsack.rs" 84 8 84 14] i + (1 : usize)); - [#"../knapsack.rs" 84 8 84 14] _19 <- ([#"../knapsack.rs" 84 8 84 14] ()); + [#"../knapsack.rs" 84 8 84 14] i <- i + (1 : usize); + [#"../knapsack.rs" 84 8 84 14] _19 <- (); goto BB8 } BB34 { @@ -833,7 +833,7 @@ module Knapsack_Knapsack01Dyn goto BB36 } BB36 { - [#"../knapsack.rs" 88 26 88 36] left_weight <- ([#"../knapsack.rs" 88 26 88 36] max_weight); + [#"../knapsack.rs" 88 26 88 36] left_weight <- max_weight; [#"../knapsack.rs" 90 16 90 27] j <- ([#"../knapsack.rs" 90 16 90 27] len0 items); goto BB37 } @@ -846,22 +846,22 @@ module Knapsack_Knapsack01Dyn goto BB39 } BB39 { - [#"../knapsack.rs" 93 10 93 15] _88 <- ([#"../knapsack.rs" 93 10 93 15] (0 : usize) < j); + [#"../knapsack.rs" 93 10 93 15] _88 <- (0 : usize) < j; switch (_88) | False -> goto BB50 | True -> goto BB40 end } BB40 { - [#"../knapsack.rs" 94 8 94 14] j <- ([#"../knapsack.rs" 94 8 94 14] j - (1 : usize)); + [#"../knapsack.rs" 94 8 94 14] j <- j - (1 : usize); [#"../knapsack.rs" 95 23 95 26] _91 <- ([#"../knapsack.rs" 95 23 95 26] index0 items j); goto BB41 } BB41 { - [#"../knapsack.rs" 95 17 95 26] it1 <- ([#"../knapsack.rs" 95 17 95 26] _91); + [#"../knapsack.rs" 95 17 95 26] it1 <- _91; assert { [@expl:type invariant] inv1 _91 }; assume { resolve2 _91 }; - [#"../knapsack.rs" 96 22 96 27] _100 <- ([#"../knapsack.rs" 96 22 96 27] j + (1 : usize)); + [#"../knapsack.rs" 96 22 96 27] _100 <- j + (1 : usize); [#"../knapsack.rs" 96 21 96 28] _98 <- ([#"../knapsack.rs" 96 21 96 28] index1 best_value _100); _100 <- any usize; goto BB42 @@ -879,7 +879,7 @@ module Knapsack_Knapsack01Dyn goto BB45 } BB45 { - [#"../knapsack.rs" 96 11 96 71] _94 <- ([#"../knapsack.rs" 96 11 96 71] _96 <> _104); + [#"../knapsack.rs" 96 11 96 71] _94 <- _96 <> _104; switch (_94) | False -> goto BB48 | True -> goto BB46 @@ -896,14 +896,14 @@ module Knapsack_Knapsack01Dyn BB47 { assert { [@expl:type invariant] inv1 it1 }; assume { resolve2 it1 }; - [#"../knapsack.rs" 98 12 98 36] left_weight <- ([#"../knapsack.rs" 98 12 98 36] left_weight - Knapsack_Item_Type.item_weight it1); - [#"../knapsack.rs" 96 72 99 9] _19 <- ([#"../knapsack.rs" 96 72 99 9] ()); + [#"../knapsack.rs" 98 12 98 36] left_weight <- left_weight - Knapsack_Item_Type.item_weight it1; + [#"../knapsack.rs" 96 72 99 9] _19 <- (); goto BB49 } BB48 { assert { [@expl:type invariant] inv1 it1 }; assume { resolve2 it1 }; - [#"../knapsack.rs" 99 9 99 9] _19 <- ([#"../knapsack.rs" 99 9 99 9] ()); + [#"../knapsack.rs" 99 9 99 9] _19 <- (); goto BB49 } BB49 { @@ -913,7 +913,7 @@ module Knapsack_Knapsack01Dyn assume { resolve0 best_value }; assert { [@expl:type invariant] inv0 items }; assume { resolve1 items }; - [#"../knapsack.rs" 102 4 102 10] _0 <- ([#"../knapsack.rs" 102 4 102 10] result); + [#"../knapsack.rs" 102 4 102 10] _0 <- result; result <- any Alloc_Vec_Vec_Type.t_vec (Knapsack_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global); goto BB51 } diff --git a/creusot/tests/should_succeed/knapsack_full.mlcfg b/creusot/tests/should_succeed/knapsack_full.mlcfg index 263a186144..5c9294cb20 100644 --- a/creusot/tests/should_succeed/knapsack_full.mlcfg +++ b/creusot/tests/should_succeed/knapsack_full.mlcfg @@ -16,18 +16,18 @@ module KnapsackFull_Max goto BB0 } BB0 { - [#"../knapsack_full.rs" 16 7 16 12] _4 <- ([#"../knapsack_full.rs" 16 7 16 12] a < b); + [#"../knapsack_full.rs" 16 7 16 12] _4 <- a < b; switch (_4) | False -> goto BB2 | True -> goto BB1 end } BB1 { - [#"../knapsack_full.rs" 17 8 17 9] _0 <- ([#"../knapsack_full.rs" 17 8 17 9] b); + [#"../knapsack_full.rs" 17 8 17 9] _0 <- b; goto BB3 } BB2 { - [#"../knapsack_full.rs" 19 8 19 9] _0 <- ([#"../knapsack_full.rs" 19 8 19 9] a); + [#"../knapsack_full.rs" 19 8 19 9] _0 <- a; goto BB3 } BB3 { @@ -1104,7 +1104,7 @@ module KnapsackFull_Knapsack01Dyn goto BB0 } BB0 { - [#"../knapsack_full.rs" 86 38 86 52] _11 <- ([#"../knapsack_full.rs" 86 38 86 52] max_weight + (1 : usize)); + [#"../knapsack_full.rs" 86 38 86 52] _11 <- max_weight + (1 : usize); [#"../knapsack_full.rs" 86 30 86 53] _10 <- ([#"../knapsack_full.rs" 86 30 86 53] from_elem0 (0 : usize) _11); _11 <- any usize; goto BB1 @@ -1114,7 +1114,7 @@ module KnapsackFull_Knapsack01Dyn goto BB2 } BB2 { - [#"../knapsack_full.rs" 86 55 86 70] _13 <- ([#"../knapsack_full.rs" 86 55 86 70] _14 + (1 : usize)); + [#"../knapsack_full.rs" 86 55 86 70] _13 <- _14 + (1 : usize); _14 <- any usize; [#"../knapsack_full.rs" 86 25 86 71] best_value <- ([#"../knapsack_full.rs" 86 25 86 71] from_elem1 _10 _13); _10 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global); @@ -1126,7 +1126,7 @@ module KnapsackFull_Knapsack01Dyn goto BB4 } BB4 { - [#"../knapsack_full.rs" 95 13 95 27] _18 <- ([#"../knapsack_full.rs" 95 13 95 27] Core_Ops_Range_Range_Type.C_Range (0 : usize) _19); + [#"../knapsack_full.rs" 95 13 95 27] _18 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _19; _19 <- any usize; [#"../knapsack_full.rs" 88 4 88 55] iter <- ([#"../knapsack_full.rs" 88 4 88 55] into_iter0 _18); _18 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -1192,19 +1192,19 @@ module KnapsackFull_Knapsack01Dyn absurd } BB18 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _32); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _32; [#"../knapsack_full.rs" 88 4 88 55] _37 <- ([#"../knapsack_full.rs" 88 4 88 55] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB19 } BB19 { - [#"../knapsack_full.rs" 88 4 88 55] produced <- ([#"../knapsack_full.rs" 88 4 88 55] _37); + [#"../knapsack_full.rs" 88 4 88 55] produced <- _37; _37 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem; [#"../knapsack_full.rs" 96 23 96 26] _41 <- ([#"../knapsack_full.rs" 96 23 96 26] index0 items i); goto BB20 } BB20 { - [#"../knapsack_full.rs" 96 17 96 26] it <- ([#"../knapsack_full.rs" 96 17 96 26] _41); + [#"../knapsack_full.rs" 96 17 96 26] it <- _41; assert { [@expl:type invariant] inv1 _41 }; assume { resolve1 _41 }; [#"../knapsack_full.rs" 110 17 110 31] _45 <- ([#"../knapsack_full.rs" 110 17 110 31] new2 (0 : usize) max_weight); @@ -1270,22 +1270,22 @@ module KnapsackFull_Knapsack01Dyn BB33 { assert { [@expl:type invariant] inv1 it }; assume { resolve1 it }; - [#"../knapsack_full.rs" 98 8 98 59] _31 <- ([#"../knapsack_full.rs" 98 8 98 59] ()); + [#"../knapsack_full.rs" 98 8 98 59] _31 <- (); goto BB12 } BB34 { goto BB35 } BB35 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _58); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _58; [#"../knapsack_full.rs" 98 8 98 59] _63 <- ([#"../knapsack_full.rs" 98 8 98 59] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1))); goto BB36 } BB36 { - [#"../knapsack_full.rs" 98 8 98 59] produced1 <- ([#"../knapsack_full.rs" 98 8 98 59] _63); + [#"../knapsack_full.rs" 98 8 98 59] produced1 <- _63; _63 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] w <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1); - [#"../knapsack_full.rs" 111 38 111 51] _67 <- ([#"../knapsack_full.rs" 111 38 111 51] KnapsackFull_Item_Type.item_weight it > w); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] w <- __creusot_proc_iter_elem1; + [#"../knapsack_full.rs" 111 38 111 51] _67 <- KnapsackFull_Item_Type.item_weight it > w; switch (_67) | False -> goto BB40 | True -> goto BB37 @@ -1300,7 +1300,7 @@ module KnapsackFull_Knapsack01Dyn goto BB39 } BB39 { - [#"../knapsack_full.rs" 112 16 112 32] _66 <- ([#"../knapsack_full.rs" 112 16 112 32] _70); + [#"../knapsack_full.rs" 112 16 112 32] _66 <- _70; goto BB46 } BB40 { @@ -1316,13 +1316,13 @@ module KnapsackFull_Knapsack01Dyn goto BB43 } BB43 { - [#"../knapsack_full.rs" 114 52 114 65] _90 <- ([#"../knapsack_full.rs" 114 52 114 65] w - KnapsackFull_Item_Type.item_weight it); + [#"../knapsack_full.rs" 114 52 114 65] _90 <- w - KnapsackFull_Item_Type.item_weight it; [#"../knapsack_full.rs" 114 51 114 66] _85 <- ([#"../knapsack_full.rs" 114 51 114 66] index2 _87 _90); _90 <- any usize; goto BB44 } BB44 { - [#"../knapsack_full.rs" 114 38 114 77] _83 <- ([#"../knapsack_full.rs" 114 38 114 77] _85 + KnapsackFull_Item_Type.item_value it); + [#"../knapsack_full.rs" 114 38 114 77] _83 <- _85 + KnapsackFull_Item_Type.item_value it; [#"../knapsack_full.rs" 114 16 114 78] _66 <- ([#"../knapsack_full.rs" 114 16 114 78] max0 _77 _83); _83 <- any usize; goto BB45 @@ -1333,7 +1333,7 @@ module KnapsackFull_Knapsack01Dyn BB46 { [#"../knapsack_full.rs" 111 12 111 22] _97 <- Borrow.borrow_mut best_value; [#"../knapsack_full.rs" 111 12 111 22] best_value <- ^ _97; - [#"../knapsack_full.rs" 111 23 111 28] _98 <- ([#"../knapsack_full.rs" 111 23 111 28] i + (1 : usize)); + [#"../knapsack_full.rs" 111 23 111 28] _98 <- i + (1 : usize); [#"../knapsack_full.rs" 111 22 111 29] _96 <- ([#"../knapsack_full.rs" 111 22 111 29] index_mut0 _97 _98); _97 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)); _98 <- any usize; @@ -1347,11 +1347,11 @@ module KnapsackFull_Knapsack01Dyn goto BB48 } BB48 { - [#"../knapsack_full.rs" 111 12 115 13] _94 <- { _94 with current = ([#"../knapsack_full.rs" 111 12 115 13] _66) ; }; + [#"../knapsack_full.rs" 111 12 115 13] _94 <- { _94 with current = _66 ; }; _66 <- any usize; assume { resolve3 _94 }; assume { resolve4 _96 }; - [#"../knapsack_full.rs" 110 32 116 9] _31 <- ([#"../knapsack_full.rs" 110 32 116 9] ()); + [#"../knapsack_full.rs" 110 32 116 9] _31 <- (); goto BB30 } BB49 { @@ -1360,7 +1360,7 @@ module KnapsackFull_Knapsack01Dyn goto BB50 } BB50 { - [#"../knapsack_full.rs" 120 26 120 36] left_weight <- ([#"../knapsack_full.rs" 120 26 120 36] max_weight); + [#"../knapsack_full.rs" 120 26 120 36] left_weight <- max_weight; [#"../knapsack_full.rs" 122 16 122 27] j <- ([#"../knapsack_full.rs" 122 16 122 27] len0 items); goto BB51 } @@ -1385,22 +1385,22 @@ module KnapsackFull_Knapsack01Dyn goto BB56 } BB56 { - [#"../knapsack_full.rs" 140 10 140 15] _115 <- ([#"../knapsack_full.rs" 140 10 140 15] (0 : usize) < j); + [#"../knapsack_full.rs" 140 10 140 15] _115 <- (0 : usize) < j; switch (_115) | False -> goto BB67 | True -> goto BB57 end } BB57 { - [#"../knapsack_full.rs" 141 8 141 14] j <- ([#"../knapsack_full.rs" 141 8 141 14] j - (1 : usize)); + [#"../knapsack_full.rs" 141 8 141 14] j <- j - (1 : usize); [#"../knapsack_full.rs" 142 23 142 26] _118 <- ([#"../knapsack_full.rs" 142 23 142 26] index0 items j); goto BB58 } BB58 { - [#"../knapsack_full.rs" 142 17 142 26] it1 <- ([#"../knapsack_full.rs" 142 17 142 26] _118); + [#"../knapsack_full.rs" 142 17 142 26] it1 <- _118; assert { [@expl:type invariant] inv1 _118 }; assume { resolve1 _118 }; - [#"../knapsack_full.rs" 143 22 143 27] _127 <- ([#"../knapsack_full.rs" 143 22 143 27] j + (1 : usize)); + [#"../knapsack_full.rs" 143 22 143 27] _127 <- j + (1 : usize); [#"../knapsack_full.rs" 143 21 143 28] _125 <- ([#"../knapsack_full.rs" 143 21 143 28] index1 best_value _127); _127 <- any usize; goto BB59 @@ -1418,7 +1418,7 @@ module KnapsackFull_Knapsack01Dyn goto BB62 } BB62 { - [#"../knapsack_full.rs" 143 11 143 71] _121 <- ([#"../knapsack_full.rs" 143 11 143 71] _123 <> _131); + [#"../knapsack_full.rs" 143 11 143 71] _121 <- _123 <> _131; switch (_121) | False -> goto BB65 | True -> goto BB63 @@ -1435,14 +1435,14 @@ module KnapsackFull_Knapsack01Dyn BB64 { assert { [@expl:type invariant] inv1 it1 }; assume { resolve1 it1 }; - [#"../knapsack_full.rs" 145 12 145 36] left_weight <- ([#"../knapsack_full.rs" 145 12 145 36] left_weight - KnapsackFull_Item_Type.item_weight it1); - [#"../knapsack_full.rs" 143 72 146 9] _31 <- ([#"../knapsack_full.rs" 143 72 146 9] ()); + [#"../knapsack_full.rs" 145 12 145 36] left_weight <- left_weight - KnapsackFull_Item_Type.item_weight it1; + [#"../knapsack_full.rs" 143 72 146 9] _31 <- (); goto BB66 } BB65 { assert { [@expl:type invariant] inv1 it1 }; assume { resolve1 it1 }; - [#"../knapsack_full.rs" 146 9 146 9] _31 <- ([#"../knapsack_full.rs" 146 9 146 9] ()); + [#"../knapsack_full.rs" 146 9 146 9] _31 <- (); goto BB66 } BB66 { @@ -1452,7 +1452,7 @@ module KnapsackFull_Knapsack01Dyn assume { resolve5 best_value }; assert { [@expl:type invariant] inv4 items }; assume { resolve6 items }; - [#"../knapsack_full.rs" 149 4 149 10] _0 <- ([#"../knapsack_full.rs" 149 4 149 10] result); + [#"../knapsack_full.rs" 149 4 149 10] _0 <- result; result <- any Alloc_Vec_Vec_Type.t_vec (KnapsackFull_Item_Type.t_item name) (Alloc_Alloc_Global_Type.t_global); goto BB68 } diff --git a/creusot/tests/should_succeed/lang/assoc_type.mlcfg b/creusot/tests/should_succeed/lang/assoc_type.mlcfg index f46b83d21a..ee5e7867e0 100644 --- a/creusot/tests/should_succeed/lang/assoc_type.mlcfg +++ b/creusot/tests/should_succeed/lang/assoc_type.mlcfg @@ -38,7 +38,7 @@ module AssocType_Uses3 goto BB0 } BB0 { - [#"../assoc_type.rs" 36 34 36 36] _0 <- ([#"../assoc_type.rs" 36 34 36 36] ()); + [#"../assoc_type.rs" 36 34 36 36] _0 <- (); assert { [@expl:type invariant] inv0 _1 }; assume { resolve0 _1 }; goto BB1 diff --git a/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg b/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg index 93e062ce56..8dc6fd1f7f 100644 --- a/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg +++ b/creusot/tests/should_succeed/lang/branch_borrow_2.mlcfg @@ -26,9 +26,9 @@ module BranchBorrow2_F goto BB0 } BB0 { - [#"../branch_borrow_2.rs" 4 16 4 18] a <- ([#"../branch_borrow_2.rs" 4 16 4 18] (10 : int32)); - [#"../branch_borrow_2.rs" 5 16 5 18] b <- ([#"../branch_borrow_2.rs" 5 16 5 18] (10 : int32)); - [#"../branch_borrow_2.rs" 6 16 6 18] c <- ([#"../branch_borrow_2.rs" 6 16 6 18] (10 : int32)); + [#"../branch_borrow_2.rs" 4 16 4 18] a <- (10 : int32); + [#"../branch_borrow_2.rs" 5 16 5 18] b <- (10 : int32); + [#"../branch_borrow_2.rs" 6 16 6 18] c <- (10 : int32); [#"../branch_borrow_2.rs" 8 12 8 18] x <- Borrow.borrow_mut a; [#"../branch_borrow_2.rs" 8 12 8 18] a <- ^ x; [#"../branch_borrow_2.rs" 9 12 9 18] y <- Borrow.borrow_mut b; @@ -50,46 +50,46 @@ module BranchBorrow2_F goto BB5 } BB3 { - [#"../branch_borrow_2.rs" 23 12 23 18] z <- { z with current = ([#"../branch_borrow_2.rs" 23 12 23 18] (8 : int32)) ; }; + [#"../branch_borrow_2.rs" 23 12 23 18] z <- { z with current = (8 : int32) ; }; [#"../branch_borrow_2.rs" 24 16 24 17] _12 <- Borrow.borrow_final ( * z) (Borrow.get_id z); [#"../branch_borrow_2.rs" 24 16 24 17] z <- { z with current = ( ^ _12) ; }; - [#"../branch_borrow_2.rs" 24 12 24 17] w <- ([#"../branch_borrow_2.rs" 24 12 24 17] _12); + [#"../branch_borrow_2.rs" 24 12 24 17] w <- _12; _12 <- any borrowed int32; - [#"../branch_borrow_2.rs" 22 13 25 9] _8 <- ([#"../branch_borrow_2.rs" 22 13 25 9] ()); + [#"../branch_borrow_2.rs" 22 13 25 9] _8 <- (); goto BB6 } BB4 { assume { resolve0 z }; assume { resolve0 y }; - [#"../branch_borrow_2.rs" 15 12 15 18] x <- { x with current = ([#"../branch_borrow_2.rs" 15 12 15 18] (6 : int32)) ; }; - [#"../branch_borrow_2.rs" 16 12 16 17] w <- ([#"../branch_borrow_2.rs" 16 12 16 17] x); + [#"../branch_borrow_2.rs" 15 12 15 18] x <- { x with current = (6 : int32) ; }; + [#"../branch_borrow_2.rs" 16 12 16 17] w <- x; x <- any borrowed int32; - [#"../branch_borrow_2.rs" 14 13 17 9] _8 <- ([#"../branch_borrow_2.rs" 14 13 17 9] ()); + [#"../branch_borrow_2.rs" 14 13 17 9] _8 <- (); goto BB6 } BB5 { assume { resolve0 z }; - [#"../branch_borrow_2.rs" 19 12 19 18] y <- { y with current = ([#"../branch_borrow_2.rs" 19 12 19 18] (7 : int32)) ; }; + [#"../branch_borrow_2.rs" 19 12 19 18] y <- { y with current = (7 : int32) ; }; [#"../branch_borrow_2.rs" 20 16 20 17] _11 <- Borrow.borrow_final ( * y) (Borrow.get_id y); [#"../branch_borrow_2.rs" 20 16 20 17] y <- { y with current = ( ^ _11) ; }; - [#"../branch_borrow_2.rs" 20 12 20 17] w <- ([#"../branch_borrow_2.rs" 20 12 20 17] _11); + [#"../branch_borrow_2.rs" 20 12 20 17] w <- _11; _11 <- any borrowed int32; - [#"../branch_borrow_2.rs" 18 13 21 9] _8 <- ([#"../branch_borrow_2.rs" 18 13 21 9] ()); + [#"../branch_borrow_2.rs" 18 13 21 9] _8 <- (); goto BB6 } BB6 { - [#"../branch_borrow_2.rs" 28 4 28 10] w <- { w with current = ([#"../branch_borrow_2.rs" 28 4 28 10] (5 : int32)) ; }; + [#"../branch_borrow_2.rs" 28 4 28 10] w <- { w with current = (5 : int32) ; }; assume { resolve0 w }; assume { resolve0 z }; assume { resolve0 y }; - [#"../branch_borrow_2.rs" 30 12 30 18] _14 <- ([#"../branch_borrow_2.rs" 30 12 30 18] c = (5 : int32)); + [#"../branch_borrow_2.rs" 30 12 30 18] _14 <- c = (5 : int32); switch (_14) | False -> goto BB8 | True -> goto BB7 end } BB7 { - [#"../branch_borrow_2.rs" 3 11 31 1] _0 <- ([#"../branch_borrow_2.rs" 3 11 31 1] ()); + [#"../branch_borrow_2.rs" 3 11 31 1] _0 <- (); return _0 } BB8 { @@ -160,9 +160,9 @@ module BranchBorrow2_G goto BB0 } BB0 { - [#"../branch_borrow_2.rs" 36 17 36 26] _2 <- ([#"../branch_borrow_2.rs" 36 17 36 26] BranchBorrow2_MyInt_Type.C_MyInt (10 : usize)); - [#"../branch_borrow_2.rs" 36 28 36 36] _3 <- ([#"../branch_borrow_2.rs" 36 28 36 36] BranchBorrow2_MyInt_Type.C_MyInt (5 : usize)); - [#"../branch_borrow_2.rs" 36 16 36 37] a <- ([#"../branch_borrow_2.rs" 36 16 36 37] (_2, _3)); + [#"../branch_borrow_2.rs" 36 17 36 26] _2 <- BranchBorrow2_MyInt_Type.C_MyInt (10 : usize); + [#"../branch_borrow_2.rs" 36 28 36 36] _3 <- BranchBorrow2_MyInt_Type.C_MyInt (5 : usize); + [#"../branch_borrow_2.rs" 36 16 36 37] a <- (_2, _3); _2 <- any BranchBorrow2_MyInt_Type.t_myint; _3 <- any BranchBorrow2_MyInt_Type.t_myint; [#"../branch_borrow_2.rs" 37 12 37 18] b <- Borrow.borrow_mut a; @@ -175,7 +175,7 @@ module BranchBorrow2_G assume { resolve0 d }; assume { resolve1 b }; assume { resolve2 a }; - [#"../branch_borrow_2.rs" 35 11 43 1] _0 <- ([#"../branch_borrow_2.rs" 35 11 43 1] ()); + [#"../branch_borrow_2.rs" 35 11 43 1] _0 <- (); return _0 } @@ -203,8 +203,8 @@ module BranchBorrow2_H goto BB0 } BB0 { - [#"../branch_borrow_2.rs" 46 16 46 18] a <- ([#"../branch_borrow_2.rs" 46 16 46 18] (10 : int32)); - [#"../branch_borrow_2.rs" 47 16 47 18] b <- ([#"../branch_borrow_2.rs" 47 16 47 18] (10 : int32)); + [#"../branch_borrow_2.rs" 46 16 46 18] a <- (10 : int32); + [#"../branch_borrow_2.rs" 47 16 47 18] b <- (10 : int32); [#"../branch_borrow_2.rs" 49 12 49 18] x <- Borrow.borrow_mut a; [#"../branch_borrow_2.rs" 49 12 49 18] a <- ^ x; [#"../branch_borrow_2.rs" 50 12 50 18] y <- Borrow.borrow_mut b; @@ -216,25 +216,25 @@ module BranchBorrow2_H } BB1 { assume { resolve0 y }; - [#"../branch_borrow_2.rs" 53 8 53 14] x <- { x with current = ([#"../branch_borrow_2.rs" 53 8 53 14] (5 : int32)) ; }; - [#"../branch_borrow_2.rs" 54 8 54 13] w <- ([#"../branch_borrow_2.rs" 54 8 54 13] x); + [#"../branch_borrow_2.rs" 53 8 53 14] x <- { x with current = (5 : int32) ; }; + [#"../branch_borrow_2.rs" 54 8 54 13] w <- x; x <- any borrowed int32; - [#"../branch_borrow_2.rs" 52 12 55 5] _6 <- ([#"../branch_borrow_2.rs" 52 12 55 5] ()); + [#"../branch_borrow_2.rs" 52 12 55 5] _6 <- (); goto BB3 } BB2 { assume { resolve0 x }; - [#"../branch_borrow_2.rs" 56 8 56 14] y <- { y with current = ([#"../branch_borrow_2.rs" 56 8 56 14] (6 : int32)) ; }; + [#"../branch_borrow_2.rs" 56 8 56 14] y <- { y with current = (6 : int32) ; }; [#"../branch_borrow_2.rs" 57 12 57 13] _9 <- Borrow.borrow_final ( * y) (Borrow.get_id y); [#"../branch_borrow_2.rs" 57 12 57 13] y <- { y with current = ( ^ _9) ; }; - [#"../branch_borrow_2.rs" 57 8 57 13] w <- ([#"../branch_borrow_2.rs" 57 8 57 13] _9); + [#"../branch_borrow_2.rs" 57 8 57 13] w <- _9; _9 <- any borrowed int32; - [#"../branch_borrow_2.rs" 55 11 60 5] _6 <- ([#"../branch_borrow_2.rs" 55 11 60 5] ()); + [#"../branch_borrow_2.rs" 55 11 60 5] _6 <- (); goto BB3 } BB3 { assume { resolve0 w }; - [#"../branch_borrow_2.rs" 45 11 68 1] _0 <- ([#"../branch_borrow_2.rs" 45 11 68 1] ()); + [#"../branch_borrow_2.rs" 45 11 68 1] _0 <- (); assume { resolve0 y }; return _0 } diff --git a/creusot/tests/should_succeed/lang/const.mlcfg b/creusot/tests/should_succeed/lang/const.mlcfg index f70cc9cd93..97d10cb1ce 100644 --- a/creusot/tests/should_succeed/lang/const.mlcfg +++ b/creusot/tests/should_succeed/lang/const.mlcfg @@ -11,7 +11,7 @@ module Const_Foo goto BB0 } BB0 { - [#"../const.rs" 9 4 9 7] _0 <- ([#"../const.rs" 9 4 9 7] (42 : usize)); + [#"../const.rs" 9 4 9 7] _0 <- (42 : usize); return _0 } diff --git a/creusot/tests/should_succeed/lang/empty.mlcfg b/creusot/tests/should_succeed/lang/empty.mlcfg index f7c4f28c0a..faef0758e3 100644 --- a/creusot/tests/should_succeed/lang/empty.mlcfg +++ b/creusot/tests/should_succeed/lang/empty.mlcfg @@ -7,7 +7,7 @@ module Empty_F goto BB0 } BB0 { - [#"../empty.rs" 4 4 4 10] _0 <- ([#"../empty.rs" 4 4 4 10] ()); + [#"../empty.rs" 4 4 4 10] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/lang/float_ops.mlcfg b/creusot/tests/should_succeed/lang/float_ops.mlcfg index fb0bf00ad0..eac6341b75 100644 --- a/creusot/tests/should_succeed/lang/float_ops.mlcfg +++ b/creusot/tests/should_succeed/lang/float_ops.mlcfg @@ -10,7 +10,7 @@ module FloatOps_Eq goto BB0 } BB0 { - [#"../float_ops.rs" 6 4 6 14] _0 <- ([#"../float_ops.rs" 6 4 6 14] (1.0 : Float64.t) .= (2.0 : Float64.t)); + [#"../float_ops.rs" 6 4 6 14] _0 <- (1.0 : Float64.t) .= (2.0 : Float64.t); return _0 } @@ -26,7 +26,7 @@ module FloatOps_Lt goto BB0 } BB0 { - [#"../float_ops.rs" 11 4 11 13] _0 <- ([#"../float_ops.rs" 11 4 11 13] (1.0 : Float64.t) .< (2.0 : Float64.t)); + [#"../float_ops.rs" 11 4 11 13] _0 <- (1.0 : Float64.t) .< (2.0 : Float64.t); return _0 } @@ -42,7 +42,7 @@ module FloatOps_Le goto BB0 } BB0 { - [#"../float_ops.rs" 16 4 16 14] _0 <- ([#"../float_ops.rs" 16 4 16 14] (1.0 : Float64.t) .<= (2.0 : Float64.t)); + [#"../float_ops.rs" 16 4 16 14] _0 <- (1.0 : Float64.t) .<= (2.0 : Float64.t); return _0 } @@ -58,7 +58,7 @@ module FloatOps_Gt goto BB0 } BB0 { - [#"../float_ops.rs" 21 4 21 13] _0 <- ([#"../float_ops.rs" 21 4 21 13] (2.0 : Float64.t) .> (1.0 : Float64.t)); + [#"../float_ops.rs" 21 4 21 13] _0 <- (2.0 : Float64.t) .> (1.0 : Float64.t); return _0 } @@ -74,7 +74,7 @@ module FloatOps_Ge goto BB0 } BB0 { - [#"../float_ops.rs" 26 4 26 14] _0 <- ([#"../float_ops.rs" 26 4 26 14] (2.0 : Float64.t) .>= (1.0 : Float64.t)); + [#"../float_ops.rs" 26 4 26 14] _0 <- (2.0 : Float64.t) .>= (1.0 : Float64.t); return _0 } @@ -90,7 +90,7 @@ module FloatOps_Neg goto BB0 } BB0 { - [#"../float_ops.rs" 31 4 31 15] _0 <- ([#"../float_ops.rs" 31 4 31 15] (-2.0 : Float64.t) .<= (1.0 : Float64.t)); + [#"../float_ops.rs" 31 4 31 15] _0 <- (-2.0 : Float64.t) .<= (1.0 : Float64.t); return _0 } diff --git a/creusot/tests/should_succeed/lang/literals.mlcfg b/creusot/tests/should_succeed/lang/literals.mlcfg index 9d41184fea..69ed63d8d3 100644 --- a/creusot/tests/should_succeed/lang/literals.mlcfg +++ b/creusot/tests/should_succeed/lang/literals.mlcfg @@ -12,9 +12,9 @@ module Literals_FloatOperation goto BB0 } BB0 { - [#"../literals.rs" 4 17 4 20] x <- ([#"../literals.rs" 4 17 4 20] (0.0 : Float32.t)); - [#"../literals.rs" 6 7 6 17] _3 <- ([#"../literals.rs" 6 7 6 17] x .+ (0x1.020c40000000p0 : Float32.t)); - [#"../literals.rs" 6 7 6 24] _2 <- ([#"../literals.rs" 6 7 6 24] _3 .= (2.0 : Float32.t)); + [#"../literals.rs" 4 17 4 20] x <- (0.0 : Float32.t); + [#"../literals.rs" 6 7 6 17] _3 <- x .+ (0x1.020c40000000p0 : Float32.t); + [#"../literals.rs" 6 7 6 24] _2 <- _3 .= (2.0 : Float32.t); _3 <- any Float32.t; switch (_2) | False -> goto BB2 @@ -22,11 +22,11 @@ module Literals_FloatOperation end } BB1 { - [#"../literals.rs" 7 8 7 17] _0 <- ([#"../literals.rs" 7 8 7 17] (3.0 : Float32.t) .- (1.0 : Float32.t)); + [#"../literals.rs" 7 8 7 17] _0 <- (3.0 : Float32.t) .- (1.0 : Float32.t); goto BB3 } BB2 { - [#"../literals.rs" 9 8 9 11] _0 <- ([#"../literals.rs" 9 8 9 11] (0.0 : Float32.t)); + [#"../literals.rs" 9 8 9 11] _0 <- (0.0 : Float32.t); goto BB3 } BB3 { diff --git a/creusot/tests/should_succeed/lang/module_paths.mlcfg b/creusot/tests/should_succeed/lang/module_paths.mlcfg index 2fc2f76563..ef53165c94 100644 --- a/creusot/tests/should_succeed/lang/module_paths.mlcfg +++ b/creusot/tests/should_succeed/lang/module_paths.mlcfg @@ -38,7 +38,7 @@ module ModulePaths_Test goto BB0 } BB0 { - [#"../module_paths.rs" 22 52 22 54] _0 <- ([#"../module_paths.rs" 22 52 22 54] ()); + [#"../module_paths.rs" 22 52 22 54] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/lang/modules.mlcfg b/creusot/tests/should_succeed/lang/modules.mlcfg index b99b2775c1..6abb9b5a7a 100644 --- a/creusot/tests/should_succeed/lang/modules.mlcfg +++ b/creusot/tests/should_succeed/lang/modules.mlcfg @@ -23,9 +23,9 @@ module Modules_Nested_InnerFunc goto BB0 } BB0 { - [#"../modules.rs" 14 16 14 28] _2 <- ([#"../modules.rs" 14 16 14 28] Modules_Nested_Nested_Type.C_Test); + [#"../modules.rs" 14 16 14 28] _2 <- Modules_Nested_Nested_Type.C_Test; assume { resolve0 _2 }; - [#"../modules.rs" 15 8 15 12] _0 <- ([#"../modules.rs" 15 8 15 12] true); + [#"../modules.rs" 15 8 15 12] _0 <- true; return _0 } @@ -38,7 +38,7 @@ module Modules_Nested_Further_Another goto BB0 } BB0 { - [#"../modules.rs" 20 12 20 17] _0 <- ([#"../modules.rs" 20 12 20 17] false); + [#"../modules.rs" 20 12 20 17] _0 <- false; return _0 } @@ -65,7 +65,7 @@ module Modules_F goto BB2 } BB2 { - [#"../modules.rs" 25 11 29 1] _0 <- ([#"../modules.rs" 25 11 29 1] ()); + [#"../modules.rs" 25 11 29 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/lang/move_path.mlcfg b/creusot/tests/should_succeed/lang/move_path.mlcfg index 47fdd9eba6..96dd15195d 100644 --- a/creusot/tests/should_succeed/lang/move_path.mlcfg +++ b/creusot/tests/should_succeed/lang/move_path.mlcfg @@ -19,16 +19,16 @@ module MovePath_F goto BB0 } BB0 { - [#"../move_path.rs" 4 16 4 17] x <- ([#"../move_path.rs" 4 16 4 17] (1 : int32)); + [#"../move_path.rs" 4 16 4 17] x <- (1 : int32); [#"../move_path.rs" 6 12 6 18] y <- Borrow.borrow_mut x; [#"../move_path.rs" 6 12 6 18] x <- ^ y; - [#"../move_path.rs" 7 12 7 13] d <- ([#"../move_path.rs" 7 12 7 13] y); + [#"../move_path.rs" 7 12 7 13] d <- y; y <- any borrowed int32; - [#"../move_path.rs" 8 12 8 13] z <- ([#"../move_path.rs" 8 12 8 13] d); + [#"../move_path.rs" 8 12 8 13] z <- d; d <- any borrowed int32; - [#"../move_path.rs" 10 12 10 18] z <- { z with current = ([#"../move_path.rs" 10 12 10 18] (2 : int32)) ; }; + [#"../move_path.rs" 10 12 10 18] z <- { z with current = (2 : int32) ; }; assume { resolve0 z }; - [#"../move_path.rs" 3 11 15 1] _0 <- ([#"../move_path.rs" 3 11 15 1] ()); + [#"../move_path.rs" 3 11 15 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg b/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg index e6ae9886b7..36b7b96263 100644 --- a/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg +++ b/creusot/tests/should_succeed/lang/multiple_scopes.mlcfg @@ -13,11 +13,11 @@ module MultipleScopes_MultipleScopes goto BB0 } BB0 { - [#"../multiple_scopes.rs" 5 17 5 18] _x <- ([#"../multiple_scopes.rs" 5 17 5 18] (1 : int32)); - [#"../multiple_scopes.rs" 6 13 6 14] _y <- ([#"../multiple_scopes.rs" 6 13 6 14] (2 : int32)); - [#"../multiple_scopes.rs" 8 17 8 18] _y1 <- ([#"../multiple_scopes.rs" 8 17 8 18] (3 : int32)); - [#"../multiple_scopes.rs" 9 8 9 15] _x <- ([#"../multiple_scopes.rs" 9 8 9 15] _y1); - [#"../multiple_scopes.rs" 7 4 10 5] _0 <- ([#"../multiple_scopes.rs" 7 4 10 5] ()); + [#"../multiple_scopes.rs" 5 17 5 18] _x <- (1 : int32); + [#"../multiple_scopes.rs" 6 13 6 14] _y <- (2 : int32); + [#"../multiple_scopes.rs" 8 17 8 18] _y1 <- (3 : int32); + [#"../multiple_scopes.rs" 9 8 9 15] _x <- _y1; + [#"../multiple_scopes.rs" 7 4 10 5] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg index d1c5522c1c..720bb20f6e 100644 --- a/creusot/tests/should_succeed/lang/promoted_constants.mlcfg +++ b/creusot/tests/should_succeed/lang/promoted_constants.mlcfg @@ -22,10 +22,10 @@ module PromotedConstants_PromotedNone use prelude.Int let constant promoted0 [#"../promoted_constants.rs" 3 0 3 22] : Core_Option_Option_Type.t_option int32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../promoted_constants.rs" 6 23 6 31] Core_Option_Option_Type.C_Some (43 : int32) in let _0 = [#"../promoted_constants.rs" 6 22 6 31] _1 in _0 + let _1 = Core_Option_Option_Type.C_Some (43 : int32) in let _0 = _1 in _0 let constant promoted1 [#"../promoted_constants.rs" 3 0 3 22] : Core_Option_Option_Type.t_option int32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../promoted_constants.rs" 6 12 6 20] Core_Option_Option_Type.C_Some (42 : int32) in let _0 = [#"../promoted_constants.rs" 6 11 6 20] _1 in _0 + let _1 = Core_Option_Option_Type.C_Some (42 : int32) in let _0 = _1 in _0 let rec cfg promoted_none [#"../promoted_constants.rs" 3 0 3 22] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : () = [@vc:do_not_keep_trace] [@vc:sp] @@ -38,10 +38,10 @@ module PromotedConstants_PromotedNone goto BB0 } BB0 { - [#"../promoted_constants.rs" 4 14 4 21] _ix <- ([#"../promoted_constants.rs" 4 14 4 21] Core_Option_Option_Type.C_Some (0 : int32)); - [#"../promoted_constants.rs" 6 11 6 20] _11 <- ([#"../promoted_constants.rs" 6 11 6 20] promoted1); - [#"../promoted_constants.rs" 6 22 6 31] _10 <- ([#"../promoted_constants.rs" 6 22 6 31] promoted0); - [#"../promoted_constants.rs" 6 10 6 32] _2 <- ([#"../promoted_constants.rs" 6 10 6 32] (_11, _10)); + [#"../promoted_constants.rs" 4 14 4 21] _ix <- Core_Option_Option_Type.C_Some (0 : int32); + [#"../promoted_constants.rs" 6 11 6 20] _11 <- promoted1; + [#"../promoted_constants.rs" 6 22 6 31] _10 <- promoted0; + [#"../promoted_constants.rs" 6 10 6 32] _2 <- (_11, _10); switch (let (a, _) = _2 in a) | Core_Option_Option_Type.C_None -> goto BB1 | _ -> goto BB6 @@ -58,7 +58,7 @@ module PromotedConstants_PromotedNone goto BB4 } BB3 { - [#"../promoted_constants.rs" 8 13 8 15] _0 <- ([#"../promoted_constants.rs" 8 13 8 15] ()); + [#"../promoted_constants.rs" 8 13 8 15] _0 <- (); return _0 } BB4 { @@ -76,7 +76,7 @@ module PromotedConstants_PromotedInt use prelude.Int32 use prelude.Int let constant promoted0 [#"../promoted_constants.rs" 12 0 12 21] : int32 = [@vc:do_not_keep_trace] [@vc:sp] - let _2 = [#"../promoted_constants.rs" 13 15 13 20] (1 : int32) + (5 : int32) in let _1 = [#"../promoted_constants.rs" 13 14 13 26] _2 + (10 : int32) in let _2 = any int32 in let _0 = [#"../promoted_constants.rs" 13 13 13 26] _1 in _0 + let _2 = (1 : int32) + (5 : int32) in let _1 = _2 + (10 : int32) in let _2 = any int32 in let _0 = _1 in _0 let rec cfg promoted_int [#"../promoted_constants.rs" 12 0 12 21] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : () = [@vc:do_not_keep_trace] [@vc:sp] @@ -88,9 +88,9 @@ module PromotedConstants_PromotedInt goto BB0 } BB0 { - [#"../promoted_constants.rs" 13 13 13 26] _9 <- ([#"../promoted_constants.rs" 13 13 13 26] promoted0); - [#"../promoted_constants.rs" 13 13 13 26] ix <- ([#"../promoted_constants.rs" 13 13 13 26] _9); - [#"../promoted_constants.rs" 15 7 15 16] _4 <- ([#"../promoted_constants.rs" 15 7 15 16] ix <> (16 : int32)); + [#"../promoted_constants.rs" 13 13 13 26] _9 <- promoted0; + [#"../promoted_constants.rs" 13 13 13 26] ix <- _9; + [#"../promoted_constants.rs" 15 7 15 16] _4 <- ix <> (16 : int32); switch (_4) | False -> goto BB2 | True -> goto BB1 @@ -101,7 +101,7 @@ module PromotedConstants_PromotedInt absurd } BB2 { - [#"../promoted_constants.rs" 17 5 17 5] _0 <- ([#"../promoted_constants.rs" 17 5 17 5] ()); + [#"../promoted_constants.rs" 17 5 17 5] _0 <- (); return _0 } @@ -164,7 +164,7 @@ module PromotedConstants_String goto BB0 } BB0 { - [#"../promoted_constants.rs" 20 26 20 28] _0 <- ([#"../promoted_constants.rs" 20 26 20 28] ()); + [#"../promoted_constants.rs" 20 26 20 28] _0 <- (); goto BB1 } BB1 { @@ -182,8 +182,8 @@ module PromotedConstants_Str goto BB0 } BB0 { - [#"../promoted_constants.rs" 23 13 23 115] _s <- ([#"../promoted_constants.rs" 23 13 23 115] "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"); - [#"../promoted_constants.rs" 22 13 24 1] _0 <- ([#"../promoted_constants.rs" 22 13 24 1] ()); + [#"../promoted_constants.rs" 23 13 23 115] _s <- "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"; + [#"../promoted_constants.rs" 22 13 24 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/lang/unary_op.mlcfg b/creusot/tests/should_succeed/lang/unary_op.mlcfg index 658fdcaece..02ac2238a9 100644 --- a/creusot/tests/should_succeed/lang/unary_op.mlcfg +++ b/creusot/tests/should_succeed/lang/unary_op.mlcfg @@ -17,7 +17,7 @@ module UnaryOp_F absurd } BB2 { - [#"../unary_op.rs" 4 11 6 1] _0 <- ([#"../unary_op.rs" 4 11 6 1] ()); + [#"../unary_op.rs" 4 11 6 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/lang/unions.mlcfg b/creusot/tests/should_succeed/lang/unions.mlcfg index 55e9d71ede..6a089cc34b 100644 --- a/creusot/tests/should_succeed/lang/unions.mlcfg +++ b/creusot/tests/should_succeed/lang/unions.mlcfg @@ -17,7 +17,7 @@ module Unions_X goto BB0 } BB0 { - [#"../unions.rs" 10 24 10 26] _0 <- ([#"../unions.rs" 10 24 10 26] ()); + [#"../unions.rs" 10 24 10 26] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/lang/while_let.mlcfg b/creusot/tests/should_succeed/lang/while_let.mlcfg index fd16a49e54..f3ca6d2c33 100644 --- a/creusot/tests/should_succeed/lang/while_let.mlcfg +++ b/creusot/tests/should_succeed/lang/while_let.mlcfg @@ -25,7 +25,7 @@ module WhileLet_F goto BB0 } BB0 { - [#"../while_let.rs" 5 16 5 24] a <- ([#"../while_let.rs" 5 16 5 24] Core_Option_Option_Type.C_Some (10 : int32)); + [#"../while_let.rs" 5 16 5 24] a <- Core_Option_Option_Type.C_Some (10 : int32); [#"../while_let.rs" 6 12 6 18] b <- Borrow.borrow_mut a; [#"../while_let.rs" 6 12 6 18] a <- ^ b; goto BB1 @@ -44,14 +44,14 @@ module WhileLet_F goto BB4 } BB4 { - [#"../while_let.rs" 10 13 10 17] _6 <- ([#"../while_let.rs" 10 13 10 17] Core_Option_Option_Type.C_None); - [#"../while_let.rs" 10 8 10 17] b <- { b with current = ([#"../while_let.rs" 10 8 10 17] _6) ; }; + [#"../while_let.rs" 10 13 10 17] _6 <- Core_Option_Option_Type.C_None; + [#"../while_let.rs" 10 8 10 17] b <- { b with current = _6 ; }; _6 <- any Core_Option_Option_Type.t_option int32; goto BB1 } BB5 { assume { resolve0 b }; - [#"../while_let.rs" 9 4 11 5] _0 <- ([#"../while_let.rs" 9 4 11 5] ()); + [#"../while_let.rs" 9 4 11 5] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/list_index_mut.mlcfg b/creusot/tests/should_succeed/list_index_mut.mlcfg index 63d4c7f073..bfae81d368 100644 --- a/creusot/tests/should_succeed/list_index_mut.mlcfg +++ b/creusot/tests/should_succeed/list_index_mut.mlcfg @@ -167,7 +167,7 @@ module ListIndexMut_IndexMut goto BB4 } BB4 { - [#"../list_index_mut.rs" 49 10 49 16] _20 <- ([#"../list_index_mut.rs" 49 10 49 16] ix > (0 : usize)); + [#"../list_index_mut.rs" 49 10 49 16] _20 <- ix > (0 : usize); switch (_20) | False -> goto BB8 | True -> goto BB5 @@ -189,10 +189,10 @@ module ListIndexMut_IndexMut [#"../list_index_mut.rs" 50 12 50 33] _22 <- Borrow.borrow_mut ( * _23); [#"../list_index_mut.rs" 50 12 50 33] _23 <- { _23 with current = ( ^ _22) ; }; assume { resolve1 l }; - [#"../list_index_mut.rs" 50 8 50 33] l <- ([#"../list_index_mut.rs" 50 8 50 33] _22); + [#"../list_index_mut.rs" 50 8 50 33] l <- _22; _22 <- any borrowed (ListIndexMut_List_Type.t_list); assume { resolve2 _23 }; - [#"../list_index_mut.rs" 52 8 52 15] ix <- ([#"../list_index_mut.rs" 52 8 52 15] ix - (1 : usize)); + [#"../list_index_mut.rs" 52 8 52 15] ix <- ix - (1 : usize); goto BB3 } BB8 { @@ -280,10 +280,10 @@ module ListIndexMut_Write goto BB1 } BB1 { - [#"../list_index_mut.rs" 64 4 64 25] _9 <- { _9 with current = ([#"../list_index_mut.rs" 64 4 64 25] v) ; }; + [#"../list_index_mut.rs" 64 4 64 25] _9 <- { _9 with current = v ; }; assume { resolve0 _9 }; assume { resolve1 l }; - [#"../list_index_mut.rs" 63 46 65 1] _0 <- ([#"../list_index_mut.rs" 63 46 65 1] ()); + [#"../list_index_mut.rs" 63 46 65 1] _0 <- (); return _0 } @@ -343,8 +343,8 @@ module ListIndexMut_F goto BB0 } BB0 { - [#"../list_index_mut.rs" 68 47 68 51] _5 <- ([#"../list_index_mut.rs" 68 47 68 51] Core_Option_Option_Type.C_None); - [#"../list_index_mut.rs" 68 38 68 52] _4 <- ([#"../list_index_mut.rs" 68 38 68 52] ListIndexMut_List_Type.C_List (10 : uint32) _5); + [#"../list_index_mut.rs" 68 47 68 51] _5 <- Core_Option_Option_Type.C_None; + [#"../list_index_mut.rs" 68 38 68 52] _4 <- ListIndexMut_List_Type.C_List (10 : uint32) _5; _5 <- any Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list); goto BB1 } @@ -352,12 +352,12 @@ module ListIndexMut_F goto BB2 } BB2 { - [#"../list_index_mut.rs" 68 24 68 54] _2 <- ([#"../list_index_mut.rs" 68 24 68 54] Core_Option_Option_Type.C_Some _4); + [#"../list_index_mut.rs" 68 24 68 54] _2 <- Core_Option_Option_Type.C_Some _4; _4 <- any ListIndexMut_List_Type.t_list; goto BB3 } BB3 { - [#"../list_index_mut.rs" 68 16 68 55] l <- ([#"../list_index_mut.rs" 68 16 68 55] ListIndexMut_List_Type.C_List (1 : uint32) _2); + [#"../list_index_mut.rs" 68 16 68 55] l <- ListIndexMut_List_Type.C_List (1 : uint32) _2; _2 <- any Core_Option_Option_Type.t_option (ListIndexMut_List_Type.t_list); goto BB4 } @@ -372,7 +372,7 @@ module ListIndexMut_F } BB5 { assume { resolve0 _8 }; - [#"../list_index_mut.rs" 67 11 72 1] _0 <- ([#"../list_index_mut.rs" 67 11 72 1] ()); + [#"../list_index_mut.rs" 67 11 72 1] _0 <- (); goto BB6 } BB6 { diff --git a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg index 2ad8c0e9c0..8f0ddd827c 100644 --- a/creusot/tests/should_succeed/list_reversal_lasso.mlcfg +++ b/creusot/tests/should_succeed/list_reversal_lasso.mlcfg @@ -183,8 +183,8 @@ module ListReversalLasso_Impl1_Index goto BB1 } BB1 { - [#"../list_reversal_lasso.rs" 31 8 31 18] _5 <- ([#"../list_reversal_lasso.rs" 31 8 31 18] _6); - [#"../list_reversal_lasso.rs" 31 8 31 18] _0 <- ([#"../list_reversal_lasso.rs" 31 8 31 18] _5); + [#"../list_reversal_lasso.rs" 31 8 31 18] _5 <- _6; + [#"../list_reversal_lasso.rs" 31 8 31 18] _0 <- _5; return _0 } @@ -470,7 +470,7 @@ module ListReversalLasso_Impl4_ListReversalSafe goto BB0 } BB0 { - [#"../list_reversal_lasso.rs" 66 20 66 24] r <- ([#"../list_reversal_lasso.rs" 66 20 66 24] (18446744073709551615 : usize)); + [#"../list_reversal_lasso.rs" 66 20 66 24] r <- (18446744073709551615 : usize); goto BB1 } BB1 { @@ -480,19 +480,19 @@ module ListReversalLasso_Impl4_ListReversalSafe goto BB2 } BB2 { - [#"../list_reversal_lasso.rs" 71 14 71 23] _12 <- ([#"../list_reversal_lasso.rs" 71 14 71 23] l <> (18446744073709551615 : usize)); + [#"../list_reversal_lasso.rs" 71 14 71 23] _12 <- l <> (18446744073709551615 : usize); switch (_12) | False -> goto BB6 | True -> goto BB3 end } BB3 { - [#"../list_reversal_lasso.rs" 72 22 72 23] tmp <- ([#"../list_reversal_lasso.rs" 72 22 72 23] l); + [#"../list_reversal_lasso.rs" 72 22 72 23] tmp <- l; [#"../list_reversal_lasso.rs" 73 20 73 23] _16 <- ([#"../list_reversal_lasso.rs" 73 20 73 23] index0 ( * self) l); goto BB4 } BB4 { - [#"../list_reversal_lasso.rs" 73 12 73 23] l <- ([#"../list_reversal_lasso.rs" 73 12 73 23] _16); + [#"../list_reversal_lasso.rs" 73 12 73 23] l <- _16; [#"../list_reversal_lasso.rs" 74 12 74 16] _21 <- Borrow.borrow_mut ( * self); [#"../list_reversal_lasso.rs" 74 12 74 16] self <- { self with current = ( ^ _21) ; }; [#"../list_reversal_lasso.rs" 74 16 74 21] _20 <- ([#"../list_reversal_lasso.rs" 74 16 74 21] index_mut0 _21 tmp); @@ -500,14 +500,14 @@ module ListReversalLasso_Impl4_ListReversalSafe goto BB5 } BB5 { - [#"../list_reversal_lasso.rs" 74 12 74 25] _20 <- { _20 with current = ([#"../list_reversal_lasso.rs" 74 12 74 25] r) ; }; + [#"../list_reversal_lasso.rs" 74 12 74 25] _20 <- { _20 with current = r ; }; assume { resolve1 _20 }; - [#"../list_reversal_lasso.rs" 75 12 75 19] r <- ([#"../list_reversal_lasso.rs" 75 12 75 19] tmp); + [#"../list_reversal_lasso.rs" 75 12 75 19] r <- tmp; goto BB1 } BB6 { assume { resolve0 self }; - [#"../list_reversal_lasso.rs" 77 15 77 16] _0 <- ([#"../list_reversal_lasso.rs" 77 15 77 16] r); + [#"../list_reversal_lasso.rs" 77 15 77 16] _0 <- r; return _0 } @@ -671,7 +671,7 @@ module ListReversalLasso_Impl4_ListReversalList goto BB0 } BB0 { - [#"../list_reversal_lasso.rs" 100 20 100 24] r <- ([#"../list_reversal_lasso.rs" 100 20 100 24] (18446744073709551615 : usize)); + [#"../list_reversal_lasso.rs" 100 20 100 24] r <- (18446744073709551615 : usize); [#"../list_reversal_lasso.rs" 101 20 101 35] n <- ([#"../list_reversal_lasso.rs" 101 20 101 35] Snapshot.new 0); goto BB1 } @@ -685,7 +685,7 @@ module ListReversalLasso_Impl4_ListReversalList goto BB3 } BB3 { - [#"../list_reversal_lasso.rs" 107 14 107 23] _15 <- ([#"../list_reversal_lasso.rs" 107 14 107 23] l <> (18446744073709551615 : usize)); + [#"../list_reversal_lasso.rs" 107 14 107 23] _15 <- l <> (18446744073709551615 : usize); switch (_15) | False -> goto BB9 | True -> goto BB4 @@ -721,19 +721,19 @@ module ListReversalLasso_Impl4_ListReversalList BB7 { assume { resolve1 _20 }; assume { resolve1 _19 }; - [#"../list_reversal_lasso.rs" 108 12 108 77] l <- ([#"../list_reversal_lasso.rs" 108 12 108 77] _17); + [#"../list_reversal_lasso.rs" 108 12 108 77] l <- _17; _17 <- any usize; [#"../list_reversal_lasso.rs" 109 16 109 36] _27 <- ([#"../list_reversal_lasso.rs" 109 16 109 36] Snapshot.new (Snapshot.inner n + 1)); goto BB8 } BB8 { - [#"../list_reversal_lasso.rs" 109 12 109 36] n <- ([#"../list_reversal_lasso.rs" 109 12 109 36] _27); + [#"../list_reversal_lasso.rs" 109 12 109 36] n <- _27; _27 <- any Snapshot.snap_ty int; goto BB2 } BB9 { assume { resolve0 self }; - [#"../list_reversal_lasso.rs" 111 15 111 16] _0 <- ([#"../list_reversal_lasso.rs" 111 15 111 16] r); + [#"../list_reversal_lasso.rs" 111 15 111 16] _0 <- r; return _0 } @@ -906,7 +906,7 @@ module ListReversalLasso_Impl4_ListReversalLoop goto BB0 } BB0 { - [#"../list_reversal_lasso.rs" 126 20 126 24] r <- ([#"../list_reversal_lasso.rs" 126 20 126 24] (18446744073709551615 : usize)); + [#"../list_reversal_lasso.rs" 126 20 126 24] r <- (18446744073709551615 : usize); [#"../list_reversal_lasso.rs" 127 20 127 35] n <- ([#"../list_reversal_lasso.rs" 127 20 127 35] Snapshot.new 0); goto BB1 } @@ -921,7 +921,7 @@ module ListReversalLasso_Impl4_ListReversalLoop goto BB3 } BB3 { - [#"../list_reversal_lasso.rs" 137 14 137 23] _17 <- ([#"../list_reversal_lasso.rs" 137 14 137 23] l <> (18446744073709551615 : usize)); + [#"../list_reversal_lasso.rs" 137 14 137 23] _17 <- l <> (18446744073709551615 : usize); switch (_17) | False -> goto BB9 | True -> goto BB4 @@ -958,13 +958,13 @@ module ListReversalLasso_Impl4_ListReversalLoop BB7 { assume { resolve1 _24 }; assume { resolve1 _23 }; - [#"../list_reversal_lasso.rs" 139 12 139 77] l <- ([#"../list_reversal_lasso.rs" 139 12 139 77] _21); + [#"../list_reversal_lasso.rs" 139 12 139 77] l <- _21; _21 <- any usize; [#"../list_reversal_lasso.rs" 140 16 140 36] _31 <- ([#"../list_reversal_lasso.rs" 140 16 140 36] Snapshot.new (Snapshot.inner n + 1)); goto BB8 } BB8 { - [#"../list_reversal_lasso.rs" 140 12 140 36] n <- ([#"../list_reversal_lasso.rs" 140 12 140 36] _31); + [#"../list_reversal_lasso.rs" 140 12 140 36] n <- _31; _31 <- any Snapshot.snap_ty int; goto BB2 } @@ -975,7 +975,7 @@ module ListReversalLasso_Impl4_ListReversalLoop else Seq.get (Reverse.reverse (Snapshot.inner s)) (i - 1) ) }; - [#"../list_reversal_lasso.rs" 146 15 146 16] _0 <- ([#"../list_reversal_lasso.rs" 146 15 146 16] r); + [#"../list_reversal_lasso.rs" 146 15 146 16] _0 <- r; return _0 } @@ -1149,7 +1149,7 @@ module ListReversalLasso_Impl4_ListReversalLasso goto BB0 } BB0 { - [#"../list_reversal_lasso.rs" 169 20 169 24] r <- ([#"../list_reversal_lasso.rs" 169 20 169 24] (18446744073709551615 : usize)); + [#"../list_reversal_lasso.rs" 169 20 169 24] r <- (18446744073709551615 : usize); [#"../list_reversal_lasso.rs" 170 20 170 35] n <- ([#"../list_reversal_lasso.rs" 170 20 170 35] Snapshot.new 0); goto BB1 } @@ -1172,7 +1172,7 @@ module ListReversalLasso_Impl4_ListReversalLasso goto BB3 } BB3 { - [#"../list_reversal_lasso.rs" 190 14 190 23] _17 <- ([#"../list_reversal_lasso.rs" 190 14 190 23] l <> (18446744073709551615 : usize)); + [#"../list_reversal_lasso.rs" 190 14 190 23] _17 <- l <> (18446744073709551615 : usize); switch (_17) | False -> goto BB9 | True -> goto BB4 @@ -1208,19 +1208,19 @@ module ListReversalLasso_Impl4_ListReversalLasso BB7 { assume { resolve1 _22 }; assume { resolve1 _21 }; - [#"../list_reversal_lasso.rs" 191 12 191 77] l <- ([#"../list_reversal_lasso.rs" 191 12 191 77] _19); + [#"../list_reversal_lasso.rs" 191 12 191 77] l <- _19; _19 <- any usize; [#"../list_reversal_lasso.rs" 192 16 192 36] _29 <- ([#"../list_reversal_lasso.rs" 192 16 192 36] Snapshot.new (Snapshot.inner n + 1)); goto BB8 } BB8 { - [#"../list_reversal_lasso.rs" 192 12 192 36] n <- ([#"../list_reversal_lasso.rs" 192 12 192 36] _29); + [#"../list_reversal_lasso.rs" 192 12 192 36] n <- _29; _29 <- any Snapshot.snap_ty int; goto BB2 } BB9 { assume { resolve0 self }; - [#"../list_reversal_lasso.rs" 194 15 194 16] _0 <- ([#"../list_reversal_lasso.rs" 194 15 194 16] r); + [#"../list_reversal_lasso.rs" 194 15 194 16] _0 <- r; return _0 } diff --git a/creusot/tests/should_succeed/loop.mlcfg b/creusot/tests/should_succeed/loop.mlcfg index f5384ca1dd..07e781bda2 100644 --- a/creusot/tests/should_succeed/loop.mlcfg +++ b/creusot/tests/should_succeed/loop.mlcfg @@ -17,10 +17,10 @@ module Loop_F goto BB0 } BB0 { - [#"../loop.rs" 4 16 4 18] a <- ([#"../loop.rs" 4 16 4 18] (10 : int32)); + [#"../loop.rs" 4 16 4 18] a <- (10 : int32); [#"../loop.rs" 5 12 5 18] b <- Borrow.borrow_mut a; [#"../loop.rs" 5 12 5 18] a <- ^ b; - [#"../loop.rs" 6 4 6 10] b <- { b with current = ([#"../loop.rs" 6 4 6 10] (5 : int32)) ; }; + [#"../loop.rs" 6 4 6 10] b <- { b with current = (5 : int32) ; }; assume { resolve0 b }; goto BB1 } @@ -34,7 +34,7 @@ module Loop_F end } BB3 { - [#"../loop.rs" 3 11 13 1] _0 <- ([#"../loop.rs" 3 11 13 1] ()); + [#"../loop.rs" 3 11 13 1] _0 <- (); return _0 } BB4 { diff --git a/creusot/tests/should_succeed/mapping_test.mlcfg b/creusot/tests/should_succeed/mapping_test.mlcfg index e754183262..990cb563b3 100644 --- a/creusot/tests/should_succeed/mapping_test.mlcfg +++ b/creusot/tests/should_succeed/mapping_test.mlcfg @@ -69,10 +69,10 @@ module MappingTest_Incr goto BB1 } BB1 { - [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 = * t in MappingTest_T_Type.C_T ([#"../mapping_test.rs" 32 4 32 15] MappingTest_T_Type.t_a ( * t) + (1 : int32))) ; }; + [#"../mapping_test.rs" 32 4 32 15] t <- { t with current = (let MappingTest_T_Type.C_T x0 = * t in MappingTest_T_Type.C_T (MappingTest_T_Type.t_a ( * t) + (1 : int32))) ; }; assume { resolve0 t }; assert { [@expl:assertion] [#"../mapping_test.rs" 35 19 35 50] shallow_model0 ( ^ t) = Map.set (shallow_model1 old_t) (Int32.to_int (MappingTest_T_Type.t_a ( * Snapshot.inner old_t))) 1 }; - [#"../mapping_test.rs" 30 19 36 1] _0 <- ([#"../mapping_test.rs" 30 19 36 1] ()); + [#"../mapping_test.rs" 30 19 36 1] _0 <- (); return _0 } @@ -122,7 +122,7 @@ module MappingTest_F goto BB0 } BB0 { - [#"../mapping_test.rs" 39 16 39 27] x <- ([#"../mapping_test.rs" 39 16 39 27] MappingTest_T_Type.C_T (42 : int32)); + [#"../mapping_test.rs" 39 16 39 27] x <- MappingTest_T_Type.C_T (42 : int32); assert { [@expl:assertion] [#"../mapping_test.rs" 40 19 40 34] Map.get (shallow_model0 x) 13 = 1 }; assert { [@expl:assertion] [#"../mapping_test.rs" 41 19 41 34] Map.get (shallow_model0 x) 42 = 0 }; [#"../mapping_test.rs" 42 9 42 15] _8 <- Borrow.borrow_mut x; @@ -137,7 +137,7 @@ module MappingTest_F assume { resolve0 _8 }; assert { [@expl:assertion] [#"../mapping_test.rs" 43 19 43 34] Map.get (shallow_model0 x) 13 = 1 }; assert { [@expl:assertion] [#"../mapping_test.rs" 44 19 44 34] Map.get (shallow_model0 x) 42 = 1 }; - [#"../mapping_test.rs" 38 11 45 1] _0 <- ([#"../mapping_test.rs" 38 11 45 1] ()); + [#"../mapping_test.rs" 38 11 45 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/match_int.mlcfg b/creusot/tests/should_succeed/match_int.mlcfg index 96b4b86e70..abd988ad83 100644 --- a/creusot/tests/should_succeed/match_int.mlcfg +++ b/creusot/tests/should_succeed/match_int.mlcfg @@ -12,15 +12,15 @@ module MatchInt_F goto BB0 } BB0 { - [#"../match_int.rs" 8 10 8 11] _1 <- ([#"../match_int.rs" 8 10 8 11] (1 : int32)); - [#"../match_int.rs" 9 8 9 13] _2 <- ([#"../match_int.rs" 9 8 9 13] (0 : int32) <= _1); + [#"../match_int.rs" 8 10 8 11] _1 <- (1 : int32); + [#"../match_int.rs" 9 8 9 13] _2 <- (0 : int32) <= _1; switch (_2) | False -> goto BB3 | True -> goto BB1 end } BB1 { - [#"../match_int.rs" 9 8 9 13] _3 <- ([#"../match_int.rs" 9 8 9 13] _1 < (10 : int32)); + [#"../match_int.rs" 9 8 9 13] _3 <- _1 < (10 : int32); switch (_3) | False -> goto BB3 | True -> goto BB2 @@ -61,7 +61,7 @@ module MatchInt_F absurd } BB9 { - [#"../match_int.rs" 10 25 10 25] _0 <- ([#"../match_int.rs" 10 25 10 25] ()); + [#"../match_int.rs" 10 25 10 25] _0 <- (); goto BB15 } BB10 { @@ -75,7 +75,7 @@ module MatchInt_F absurd } BB12 { - [#"../match_int.rs" 13 26 13 26] _0 <- ([#"../match_int.rs" 13 26 13 26] ()); + [#"../match_int.rs" 13 26 13 26] _0 <- (); goto BB15 } BB13 { @@ -83,7 +83,7 @@ module MatchInt_F absurd } BB14 { - [#"../match_int.rs" 16 26 16 26] _0 <- ([#"../match_int.rs" 16 26 16 26] ()); + [#"../match_int.rs" 16 26 16 26] _0 <- (); goto BB15 } BB15 { diff --git a/creusot/tests/should_succeed/mc91.mlcfg b/creusot/tests/should_succeed/mc91.mlcfg index f09ff21c56..d0daf7b68b 100644 --- a/creusot/tests/should_succeed/mc91.mlcfg +++ b/creusot/tests/should_succeed/mc91.mlcfg @@ -15,18 +15,18 @@ module Mc91_Mc91 goto BB0 } BB0 { - [#"../mc91.rs" 8 7 8 14] _3 <- ([#"../mc91.rs" 8 7 8 14] x > (100 : uint32)); + [#"../mc91.rs" 8 7 8 14] _3 <- x > (100 : uint32); switch (_3) | False -> goto BB2 | True -> goto BB1 end } BB1 { - [#"../mc91.rs" 9 8 9 14] _0 <- ([#"../mc91.rs" 9 8 9 14] x - (10 : uint32)); + [#"../mc91.rs" 9 8 9 14] _0 <- x - (10 : uint32); goto BB5 } BB2 { - [#"../mc91.rs" 11 18 11 24] _7 <- ([#"../mc91.rs" 11 18 11 24] x + (11 : uint32)); + [#"../mc91.rs" 11 18 11 24] _7 <- x + (11 : uint32); [#"../mc91.rs" 11 13 11 25] _6 <- ([#"../mc91.rs" 11 13 11 25] mc91 _7); _7 <- any uint32; goto BB3 diff --git a/creusot/tests/should_succeed/mutex.mlcfg b/creusot/tests/should_succeed/mutex.mlcfg index ece0d14179..f209855538 100644 --- a/creusot/tests/should_succeed/mutex.mlcfg +++ b/creusot/tests/should_succeed/mutex.mlcfg @@ -161,8 +161,8 @@ module Mutex_Impl3_Call goto BB2 } BB2 { - [#"../mutex.rs" 102 18 102 28] val' <- ([#"../mutex.rs" 102 18 102 28] _5); - [#"../mutex.rs" 103 11 103 23] _7 <- ([#"../mutex.rs" 103 11 103 23] val' < (100000 : uint32)); + [#"../mutex.rs" 102 18 102 28] val' <- _5; + [#"../mutex.rs" 103 11 103 23] _7 <- val' < (100000 : uint32); switch (_7) | False -> goto BB5 | True -> goto BB3 @@ -171,14 +171,14 @@ module Mutex_Impl3_Call BB3 { [#"../mutex.rs" 104 12 104 13] _10 <- Borrow.borrow_mut v; [#"../mutex.rs" 104 12 104 13] v <- ^ _10; - [#"../mutex.rs" 104 18 104 25] _11 <- ([#"../mutex.rs" 104 18 104 25] val' + (2 : uint32)); + [#"../mutex.rs" 104 18 104 25] _11 <- val' + (2 : uint32); [#"../mutex.rs" 104 12 104 26] _9 <- ([#"../mutex.rs" 104 12 104 26] set0 _10 _11); _10 <- any borrowed (Mutex_MutexGuard_Type.t_mutexguard uint32 (Mutex_Even_Type.t_even)); _11 <- any uint32; goto BB4 } BB4 { - [#"../mutex.rs" 103 24 105 9] _0 <- ([#"../mutex.rs" 103 24 105 9] ()); + [#"../mutex.rs" 103 24 105 9] _0 <- (); goto BB7 } BB5 { @@ -189,7 +189,7 @@ module Mutex_Impl3_Call goto BB6 } BB6 { - [#"../mutex.rs" 105 15 107 9] _0 <- ([#"../mutex.rs" 105 15 107 9] ()); + [#"../mutex.rs" 105 15 107 9] _0 <- (); goto BB7 } BB7 { @@ -423,7 +423,7 @@ module Mutex_Concurrent goto BB0 } BB0 { - [#"../mutex.rs" 164 52 164 56] _5 <- ([#"../mutex.rs" 164 52 164 56] Mutex_Even_Type.C_Even); + [#"../mutex.rs" 164 52 164 56] _5 <- Mutex_Even_Type.C_Even; [#"../mutex.rs" 164 38 164 57] _4 <- ([#"../mutex.rs" 164 38 164 57] new0 (0 : uint32) _5); _5 <- any Mutex_Even_Type.t_even; goto BB1 @@ -437,17 +437,17 @@ module Mutex_Concurrent goto BB3 } BB3 { - [#"../mutex.rs" 164 24 164 59] m <- ([#"../mutex.rs" 164 24 164 59] * _2); + [#"../mutex.rs" 164 24 164 59] m <- * _2; assume { resolve0 _2 }; - [#"../mutex.rs" 165 30 165 32] _8 <- ([#"../mutex.rs" 165 30 165 32] m); - [#"../mutex.rs" 165 13 165 34] t1 <- ([#"../mutex.rs" 165 13 165 34] Mutex_AddsTwo_Type.C_AddsTwo _8); + [#"../mutex.rs" 165 30 165 32] _8 <- m; + [#"../mutex.rs" 165 13 165 34] t1 <- Mutex_AddsTwo_Type.C_AddsTwo _8; [#"../mutex.rs" 166 13 166 22] j1 <- ([#"../mutex.rs" 166 13 166 22] spawn0 t1); t1 <- any Mutex_AddsTwo_Type.t_addstwo; goto BB4 } BB4 { - [#"../mutex.rs" 167 30 167 32] _13 <- ([#"../mutex.rs" 167 30 167 32] m); - [#"../mutex.rs" 167 13 167 34] t2 <- ([#"../mutex.rs" 167 13 167 34] Mutex_AddsTwo_Type.C_AddsTwo _13); + [#"../mutex.rs" 167 30 167 32] _13 <- m; + [#"../mutex.rs" 167 13 167 34] t2 <- Mutex_AddsTwo_Type.C_AddsTwo _13; [#"../mutex.rs" 168 13 168 22] j2 <- ([#"../mutex.rs" 168 13 168 22] spawn0 t2); t2 <- any Mutex_AddsTwo_Type.t_addstwo; goto BB5 @@ -463,7 +463,7 @@ module Mutex_Concurrent goto BB7 } BB7 { - [#"../mutex.rs" 163 20 175 1] _0 <- ([#"../mutex.rs" 163 20 175 1] ()); + [#"../mutex.rs" 163 20 175 1] _0 <- (); goto BB8 } BB8 { diff --git a/creusot/tests/should_succeed/one_side_update.mlcfg b/creusot/tests/should_succeed/one_side_update.mlcfg index 8a9675a0ff..62f6aaa2fd 100644 --- a/creusot/tests/should_succeed/one_side_update.mlcfg +++ b/creusot/tests/should_succeed/one_side_update.mlcfg @@ -26,7 +26,7 @@ module OneSideUpdate_F goto BB0 } BB0 { - [#"../one_side_update.rs" 6 16 6 25] a <- ([#"../one_side_update.rs" 6 16 6 25] OneSideUpdate_MyInt_Type.C_MyInt (10 : usize)); + [#"../one_side_update.rs" 6 16 6 25] a <- OneSideUpdate_MyInt_Type.C_MyInt (10 : usize); [#"../one_side_update.rs" 7 12 7 18] b <- Borrow.borrow_mut a; [#"../one_side_update.rs" 7 12 7 18] a <- ^ b; switch (true) @@ -36,15 +36,15 @@ module OneSideUpdate_F } BB1 { assume { resolve0 b }; - [#"../one_side_update.rs" 8 12 10 5] _0 <- ([#"../one_side_update.rs" 8 12 10 5] ()); + [#"../one_side_update.rs" 8 12 10 5] _0 <- (); goto BB3 } BB2 { - [#"../one_side_update.rs" 11 13 11 21] _6 <- ([#"../one_side_update.rs" 11 13 11 21] OneSideUpdate_MyInt_Type.C_MyInt (5 : usize)); - [#"../one_side_update.rs" 11 8 11 21] b <- { b with current = ([#"../one_side_update.rs" 11 8 11 21] _6) ; }; + [#"../one_side_update.rs" 11 13 11 21] _6 <- OneSideUpdate_MyInt_Type.C_MyInt (5 : usize); + [#"../one_side_update.rs" 11 8 11 21] b <- { b with current = _6 ; }; _6 <- any OneSideUpdate_MyInt_Type.t_myint; assume { resolve0 b }; - [#"../one_side_update.rs" 10 11 12 5] _0 <- ([#"../one_side_update.rs" 10 11 12 5] ()); + [#"../one_side_update.rs" 10 11 12 5] _0 <- (); goto BB3 } BB3 { diff --git a/creusot/tests/should_succeed/option.mlcfg b/creusot/tests/should_succeed/option.mlcfg index 8091735123..42a7a6f222 100644 --- a/creusot/tests/should_succeed/option.mlcfg +++ b/creusot/tests/should_succeed/option.mlcfg @@ -370,8 +370,8 @@ module Option_TestOption goto BB0 } BB0 { - [#"../option.rs" 5 32 5 36] none <- ([#"../option.rs" 5 32 5 36] Core_Option_Option_Type.C_None); - [#"../option.rs" 6 32 6 39] some <- ([#"../option.rs" 6 32 6 39] Core_Option_Option_Type.C_Some (1 : int32)); + [#"../option.rs" 5 32 5 36] none <- Core_Option_Option_Type.C_None; + [#"../option.rs" 6 32 6 39] some <- Core_Option_Option_Type.C_Some (1 : int32); [#"../option.rs" 9 12 9 26] _4 <- ([#"../option.rs" 9 12 9 26] is_some0 some); goto BB1 } @@ -436,7 +436,7 @@ module Option_TestOption absurd } BB15 { - [#"../option.rs" 14 12 14 30] _16 <- ([#"../option.rs" 14 12 14 30] _17 = (1 : int32)); + [#"../option.rs" 14 12 14 30] _16 <- _17 = (1 : int32); _17 <- any int32; switch (_16) | False -> goto BB17 @@ -452,7 +452,7 @@ module Option_TestOption absurd } BB18 { - [#"../option.rs" 19 12 19 34] _21 <- ([#"../option.rs" 19 12 19 34] _22 = (1 : int32)); + [#"../option.rs" 19 12 19 34] _21 <- _22 = (1 : int32); _22 <- any int32; switch (_21) | False -> goto BB20 @@ -468,7 +468,7 @@ module Option_TestOption absurd } BB21 { - [#"../option.rs" 20 12 20 34] _26 <- ([#"../option.rs" 20 12 20 34] _27 = (2 : int32)); + [#"../option.rs" 20 12 20 34] _26 <- _27 = (2 : int32); _27 <- any int32; switch (_26) | False -> goto BB23 @@ -513,13 +513,13 @@ module Option_TestOption goto BB29 } BB29 { - [#"../option.rs" 24 4 24 31] _36 <- { _36 with current = ([#"../option.rs" 24 4 24 31] (2 : int32)) ; }; + [#"../option.rs" 24 4 24 31] _36 <- { _36 with current = (2 : int32) ; }; assume { resolve0 _36 }; [#"../option.rs" 25 12 25 25] _41 <- ([#"../option.rs" 25 12 25 25] unwrap0 some); goto BB30 } BB30 { - [#"../option.rs" 25 12 25 30] _40 <- ([#"../option.rs" 25 12 25 30] _41 = (2 : int32)); + [#"../option.rs" 25 12 25 30] _40 <- _41 = (2 : int32); _41 <- any int32; switch (_40) | False -> goto BB32 @@ -543,13 +543,13 @@ module Option_TestOption goto BB34 } BB34 { - [#"../option.rs" 26 4 26 31] _44 <- { _44 with current = ([#"../option.rs" 26 4 26 31] (1 : int32)) ; }; + [#"../option.rs" 26 4 26 31] _44 <- { _44 with current = (1 : int32) ; }; assume { resolve0 _44 }; [#"../option.rs" 27 12 27 25] _49 <- ([#"../option.rs" 27 12 27 25] unwrap0 some); goto BB35 } BB35 { - [#"../option.rs" 27 12 27 30] _48 <- ([#"../option.rs" 27 12 27 30] _49 = (1 : int32)); + [#"../option.rs" 27 12 27 30] _48 <- _49 = (1 : int32); _49 <- any int32; switch (_48) | False -> goto BB37 @@ -588,7 +588,7 @@ module Option_TestOption goto BB43 } BB43 { - [#"../option.rs" 30 12 30 40] _59 <- ([#"../option.rs" 30 12 30 40] _61 = (1 : int32)); + [#"../option.rs" 30 12 30 40] _59 <- _61 = (1 : int32); switch (_59) | False -> goto BB45 | True -> goto BB44 @@ -613,7 +613,7 @@ module Option_TestOption end } BB48 { - [#"../option.rs" 34 21 34 28] _77 <- ([#"../option.rs" 34 21 34 28] Core_Option_Option_Type.C_Some (2 : int32)); + [#"../option.rs" 34 21 34 28] _77 <- Core_Option_Option_Type.C_Some (2 : int32); [#"../option.rs" 34 12 34 29] _75 <- ([#"../option.rs" 34 12 34 29] and0 none _77); _77 <- any Core_Option_Option_Type.t_option int32; goto BB50 @@ -651,7 +651,7 @@ module Option_TestOption end } BB56 { - [#"../option.rs" 36 21 36 28] _91 <- ([#"../option.rs" 36 21 36 28] Core_Option_Option_Type.C_Some (2 : int32)); + [#"../option.rs" 36 21 36 28] _91 <- Core_Option_Option_Type.C_Some (2 : int32); [#"../option.rs" 36 12 36 29] _89 <- ([#"../option.rs" 36 12 36 29] and0 some _91); _91 <- any Core_Option_Option_Type.t_option int32; goto BB58 @@ -666,7 +666,7 @@ module Option_TestOption goto BB59 } BB59 { - [#"../option.rs" 36 12 36 43] _87 <- ([#"../option.rs" 36 12 36 43] _88 = (2 : int32)); + [#"../option.rs" 36 12 36 43] _87 <- _88 = (2 : int32); _88 <- any int32; switch (_87) | False -> goto BB61 @@ -692,7 +692,7 @@ module Option_TestOption end } BB64 { - [#"../option.rs" 39 20 39 27] _105 <- ([#"../option.rs" 39 20 39 27] Core_Option_Option_Type.C_Some (2 : int32)); + [#"../option.rs" 39 20 39 27] _105 <- Core_Option_Option_Type.C_Some (2 : int32); [#"../option.rs" 39 12 39 28] _103 <- ([#"../option.rs" 39 12 39 28] or0 none _105); _105 <- any Core_Option_Option_Type.t_option int32; goto BB66 @@ -707,7 +707,7 @@ module Option_TestOption goto BB67 } BB67 { - [#"../option.rs" 39 12 39 42] _101 <- ([#"../option.rs" 39 12 39 42] _102 = (2 : int32)); + [#"../option.rs" 39 12 39 42] _101 <- _102 = (2 : int32); _102 <- any int32; switch (_101) | False -> goto BB69 @@ -728,7 +728,7 @@ module Option_TestOption goto BB71 } BB71 { - [#"../option.rs" 40 12 40 39] _108 <- ([#"../option.rs" 40 12 40 39] _109 = (1 : int32)); + [#"../option.rs" 40 12 40 39] _108 <- _109 = (1 : int32); _109 <- any int32; switch (_108) | False -> goto BB73 @@ -736,7 +736,7 @@ module Option_TestOption end } BB72 { - [#"../option.rs" 41 20 41 27] _119 <- ([#"../option.rs" 41 20 41 27] Core_Option_Option_Type.C_Some (2 : int32)); + [#"../option.rs" 41 20 41 27] _119 <- Core_Option_Option_Type.C_Some (2 : int32); [#"../option.rs" 41 12 41 28] _117 <- ([#"../option.rs" 41 12 41 28] or0 some _119); _119 <- any Core_Option_Option_Type.t_option int32; goto BB74 @@ -751,7 +751,7 @@ module Option_TestOption goto BB75 } BB75 { - [#"../option.rs" 41 12 41 42] _115 <- ([#"../option.rs" 41 12 41 42] _116 = (1 : int32)); + [#"../option.rs" 41 12 41 42] _115 <- _116 = (1 : int32); _116 <- any int32; switch (_115) | False -> goto BB77 @@ -810,7 +810,7 @@ module Option_TestOption goto BB86 } BB86 { - [#"../option.rs" 46 12 46 37] _132 <- ([#"../option.rs" 46 12 46 37] _133 = (1 : int32)); + [#"../option.rs" 46 12 46 37] _132 <- _133 = (1 : int32); _133 <- any int32; switch (_132) | False -> goto BB88 @@ -832,8 +832,8 @@ module Option_TestOption end } BB90 { - [#"../option.rs" 48 11 48 18] _141 <- ([#"../option.rs" 48 11 48 18] Core_Option_Option_Type.C_Some (1 : int32)); - [#"../option.rs" 48 4 48 18] some <- ([#"../option.rs" 48 4 48 18] _141); + [#"../option.rs" 48 11 48 18] _141 <- Core_Option_Option_Type.C_Some (1 : int32); + [#"../option.rs" 48 4 48 18] some <- _141; _141 <- any Core_Option_Option_Type.t_option int32; [#"../option.rs" 50 12 50 16] _146 <- Borrow.borrow_mut none; [#"../option.rs" 50 12 50 16] none <- ^ _146; @@ -864,7 +864,7 @@ module Option_TestOption absurd } BB96 { - [#"../option.rs" 51 12 51 30] _149 <- ([#"../option.rs" 51 12 51 30] _150 = (2 : int32)); + [#"../option.rs" 51 12 51 30] _149 <- _150 = (2 : int32); _150 <- any int32; switch (_149) | False -> goto BB98 @@ -872,8 +872,8 @@ module Option_TestOption end } BB97 { - [#"../option.rs" 52 11 52 15] _153 <- ([#"../option.rs" 52 11 52 15] Core_Option_Option_Type.C_None); - [#"../option.rs" 52 4 52 15] none <- ([#"../option.rs" 52 4 52 15] _153); + [#"../option.rs" 52 11 52 15] _153 <- Core_Option_Option_Type.C_None; + [#"../option.rs" 52 4 52 15] none <- _153; _153 <- any Core_Option_Option_Type.t_option int32; [#"../option.rs" 53 12 53 16] _158 <- Borrow.borrow_mut some; [#"../option.rs" 53 12 53 16] some <- ^ _158; @@ -891,7 +891,7 @@ module Option_TestOption goto BB100 } BB100 { - [#"../option.rs" 53 12 53 41] _155 <- ([#"../option.rs" 53 12 53 41] _156 = (1 : int32)); + [#"../option.rs" 53 12 53 41] _155 <- _156 = (1 : int32); _156 <- any int32; switch (_155) | False -> goto BB102 @@ -907,7 +907,7 @@ module Option_TestOption absurd } BB103 { - [#"../option.rs" 54 12 54 30] _161 <- ([#"../option.rs" 54 12 54 30] _162 = (2 : int32)); + [#"../option.rs" 54 12 54 30] _161 <- _162 = (2 : int32); _162 <- any int32; switch (_161) | False -> goto BB105 @@ -931,7 +931,7 @@ module Option_TestOption goto BB107 } BB107 { - [#"../option.rs" 55 12 55 41] _166 <- ([#"../option.rs" 55 12 55 41] _167 = (2 : int32)); + [#"../option.rs" 55 12 55 41] _166 <- _167 = (2 : int32); _167 <- any int32; switch (_166) | False -> goto BB109 @@ -947,7 +947,7 @@ module Option_TestOption absurd } BB110 { - [#"../option.rs" 56 12 56 30] _172 <- ([#"../option.rs" 56 12 56 30] _173 = (1 : int32)); + [#"../option.rs" 56 12 56 30] _172 <- _173 = (1 : int32); _173 <- any int32; switch (_172) | False -> goto BB112 @@ -963,7 +963,7 @@ module Option_TestOption absurd } BB113 { - [#"../option.rs" 59 12 59 41] _177 <- ([#"../option.rs" 59 12 59 41] _178 = (0 : int32)); + [#"../option.rs" 59 12 59 41] _177 <- _178 = (0 : int32); _178 <- any int32; switch (_177) | False -> goto BB115 @@ -979,7 +979,7 @@ module Option_TestOption absurd } BB116 { - [#"../option.rs" 60 12 60 41] _182 <- ([#"../option.rs" 60 12 60 41] _183 = (1 : int32)); + [#"../option.rs" 60 12 60 41] _182 <- _183 = (1 : int32); _183 <- any int32; switch (_182) | False -> goto BB118 @@ -1028,7 +1028,7 @@ module Option_TestOption goto BB126 } BB126 { - [#"../option.rs" 64 12 64 48] _194 <- ([#"../option.rs" 64 12 64 48] _195 = (1 : int32)); + [#"../option.rs" 64 12 64 48] _194 <- _195 = (1 : int32); _195 <- any int32; switch (_194) | False -> goto BB128 @@ -1083,7 +1083,7 @@ module Option_TestOption goto BB136 } BB136 { - [#"../option.rs" 66 12 66 48] _208 <- ([#"../option.rs" 66 12 66 48] _209 = (1 : int32)); + [#"../option.rs" 66 12 66 48] _208 <- _209 = (1 : int32); _209 <- any int32; switch (_208) | False -> goto BB138 @@ -1132,7 +1132,7 @@ module Option_TestOption goto BB146 } BB146 { - [#"../option.rs" 69 12 69 48] _222 <- ([#"../option.rs" 69 12 69 48] _223 = (1 : int32)); + [#"../option.rs" 69 12 69 48] _222 <- _223 = (1 : int32); _223 <- any int32; switch (_222) | False -> goto BB148 @@ -1187,7 +1187,7 @@ module Option_TestOption goto BB156 } BB156 { - [#"../option.rs" 71 12 71 48] _236 <- ([#"../option.rs" 71 12 71 48] _237 = (1 : int32)); + [#"../option.rs" 71 12 71 48] _236 <- _237 = (1 : int32); _237 <- any int32; switch (_236) | False -> goto BB158 @@ -1195,7 +1195,7 @@ module Option_TestOption end } BB157 { - [#"../option.rs" 74 35 74 39] opt <- ([#"../option.rs" 74 35 74 39] Core_Option_Option_Type.C_None); + [#"../option.rs" 74 35 74 39] opt <- Core_Option_Option_Type.C_None; [#"../option.rs" 75 12 75 25] _246 <- ([#"../option.rs" 75 12 75 25] flatten0 opt); goto BB159 } @@ -1214,8 +1214,8 @@ module Option_TestOption end } BB161 { - [#"../option.rs" 76 40 76 44] _250 <- ([#"../option.rs" 76 40 76 44] Core_Option_Option_Type.C_None); - [#"../option.rs" 76 35 76 45] opt1 <- ([#"../option.rs" 76 35 76 45] Core_Option_Option_Type.C_Some _250); + [#"../option.rs" 76 40 76 44] _250 <- Core_Option_Option_Type.C_None; + [#"../option.rs" 76 35 76 45] opt1 <- Core_Option_Option_Type.C_Some _250; _250 <- any Core_Option_Option_Type.t_option int32; [#"../option.rs" 77 12 77 25] _254 <- ([#"../option.rs" 77 12 77 25] flatten0 opt1); goto BB163 @@ -1235,8 +1235,8 @@ module Option_TestOption end } BB165 { - [#"../option.rs" 78 40 78 47] _258 <- ([#"../option.rs" 78 40 78 47] Core_Option_Option_Type.C_Some (1 : int32)); - [#"../option.rs" 78 35 78 48] opt2 <- ([#"../option.rs" 78 35 78 48] Core_Option_Option_Type.C_Some _258); + [#"../option.rs" 78 40 78 47] _258 <- Core_Option_Option_Type.C_Some (1 : int32); + [#"../option.rs" 78 35 78 48] opt2 <- Core_Option_Option_Type.C_Some _258; _258 <- any Core_Option_Option_Type.t_option int32; [#"../option.rs" 79 12 79 25] _262 <- ([#"../option.rs" 79 12 79 25] flatten0 opt2); goto BB167 @@ -1251,7 +1251,7 @@ module Option_TestOption goto BB168 } BB168 { - [#"../option.rs" 79 12 79 39] _260 <- ([#"../option.rs" 79 12 79 39] _261 = (1 : int32)); + [#"../option.rs" 79 12 79 39] _260 <- _261 = (1 : int32); _261 <- any int32; switch (_260) | False -> goto BB170 @@ -1259,7 +1259,7 @@ module Option_TestOption end } BB169 { - [#"../option.rs" 4 21 80 1] _0 <- ([#"../option.rs" 4 21 80 1] ()); + [#"../option.rs" 4 21 80 1] _0 <- (); return _0 } BB170 { diff --git a/creusot/tests/should_succeed/ord_trait.mlcfg b/creusot/tests/should_succeed/ord_trait.mlcfg index af0d60501e..758be6ea98 100644 --- a/creusot/tests/should_succeed/ord_trait.mlcfg +++ b/creusot/tests/should_succeed/ord_trait.mlcfg @@ -161,7 +161,7 @@ module OrdTrait_X goto BB0 } BB0 { - [#"../ord_trait.rs" 9 9 9 10] _5 <- ([#"../ord_trait.rs" 9 9 9 10] x); + [#"../ord_trait.rs" 9 9 9 10] _5 <- x; [#"../ord_trait.rs" 9 4 9 10] _0 <- ([#"../ord_trait.rs" 9 4 9 10] le0 x _5); goto BB1 } @@ -331,7 +331,7 @@ module OrdTrait_GtOrLe goto BB0 } BB0 { - [#"../ord_trait.rs" 17 9 17 10] _6 <- ([#"../ord_trait.rs" 17 9 17 10] y); + [#"../ord_trait.rs" 17 9 17 10] _6 <- y; assert { [@expl:type invariant] inv0 y }; assume { resolve0 y }; [#"../ord_trait.rs" 17 4 17 10] _0 <- ([#"../ord_trait.rs" 17 4 17 10] ge0 x _6); @@ -361,7 +361,7 @@ module OrdTrait_GtOrLeInt goto BB0 } BB0 { - [#"../ord_trait.rs" 22 4 22 10] _0 <- ([#"../ord_trait.rs" 22 4 22 10] x <= y); + [#"../ord_trait.rs" 22 4 22 10] _0 <- x <= y; return _0 } diff --git a/creusot/tests/should_succeed/projection_toggle.mlcfg b/creusot/tests/should_succeed/projection_toggle.mlcfg index 97b3ca30db..d204fb76eb 100644 --- a/creusot/tests/should_succeed/projection_toggle.mlcfg +++ b/creusot/tests/should_succeed/projection_toggle.mlcfg @@ -136,8 +136,8 @@ module ProjectionToggle_F goto BB0 } BB0 { - [#"../projection_toggle.rs" 14 16 14 18] a <- ([#"../projection_toggle.rs" 14 16 14 18] (10 : int32)); - [#"../projection_toggle.rs" 15 16 15 17] b <- ([#"../projection_toggle.rs" 15 16 15 17] (5 : int32)); + [#"../projection_toggle.rs" 14 16 14 18] a <- (10 : int32); + [#"../projection_toggle.rs" 15 16 15 17] b <- (5 : int32); [#"../projection_toggle.rs" 17 30 17 36] _5 <- Borrow.borrow_mut a; [#"../projection_toggle.rs" 17 30 17 36] a <- ^ _5; [#"../projection_toggle.rs" 17 30 17 36] _4 <- Borrow.borrow_final ( * _5) (Borrow.get_id _5); @@ -154,16 +154,16 @@ module ProjectionToggle_F BB1 { assume { resolve0 _7 }; assume { resolve0 _5 }; - [#"../projection_toggle.rs" 19 4 19 11] x <- { x with current = ([#"../projection_toggle.rs" 19 4 19 11] * x + (5 : int32)) ; }; + [#"../projection_toggle.rs" 19 4 19 11] x <- { x with current = ( * x + (5 : int32)) ; }; assume { resolve0 x }; - [#"../projection_toggle.rs" 20 12 20 19] _9 <- ([#"../projection_toggle.rs" 20 12 20 19] a = (15 : int32)); + [#"../projection_toggle.rs" 20 12 20 19] _9 <- a = (15 : int32); switch (_9) | False -> goto BB3 | True -> goto BB2 end } BB2 { - [#"../projection_toggle.rs" 13 11 21 1] _0 <- ([#"../projection_toggle.rs" 13 11 21 1] ()); + [#"../projection_toggle.rs" 13 11 21 1] _0 <- (); return _0 } BB3 { diff --git a/creusot/tests/should_succeed/projections.mlcfg b/creusot/tests/should_succeed/projections.mlcfg index 2c202a2f4b..6ddfc9f6ee 100644 --- a/creusot/tests/should_succeed/projections.mlcfg +++ b/creusot/tests/should_succeed/projections.mlcfg @@ -12,7 +12,7 @@ module Projections_CopyOutOfRef goto BB0 } BB0 { - [#"../projections.rs" 6 4 6 6] _0 <- ([#"../projections.rs" 6 4 6 6] x); + [#"../projections.rs" 6 4 6 6] _0 <- x; return _0 } @@ -63,9 +63,9 @@ module Projections_CopyOutOfSum goto BB4 } BB2 { - [#"../projections.rs" 12 12 12 13] y <- ([#"../projections.rs" 12 12 12 13] Core_Result_Result_Type.err_0 x); + [#"../projections.rs" 12 12 12 13] y <- Core_Result_Result_Type.err_0 x; x <- (let Core_Result_Result_Type.C_Err x0 = x in Core_Result_Result_Type.C_Err (any borrowed uint32)); - [#"../projections.rs" 12 18 12 20] _0 <- ([#"../projections.rs" 12 18 12 20] * y); + [#"../projections.rs" 12 18 12 20] _0 <- * y; assume { resolve0 y }; goto BB5 } @@ -74,9 +74,9 @@ module Projections_CopyOutOfSum absurd } BB4 { - [#"../projections.rs" 11 11 11 12] x1 <- ([#"../projections.rs" 11 11 11 12] Core_Result_Result_Type.ok_0 x); + [#"../projections.rs" 11 11 11 12] x1 <- Core_Result_Result_Type.ok_0 x; x <- (let Core_Result_Result_Type.C_Ok x0 = x in Core_Result_Result_Type.C_Ok (any borrowed uint32)); - [#"../projections.rs" 11 17 11 19] _0 <- ([#"../projections.rs" 11 17 11 19] * x1); + [#"../projections.rs" 11 17 11 19] _0 <- * x1; assume { resolve0 x1 }; goto BB5 } @@ -128,7 +128,7 @@ module Projections_WriteIntoSum } BB1 { assume { resolve1 x }; - [#"../projections.rs" 19 16 19 18] _0 <- ([#"../projections.rs" 19 16 19 18] ()); + [#"../projections.rs" 19 16 19 18] _0 <- (); goto BB5 } BB2 { @@ -142,9 +142,9 @@ module Projections_WriteIntoSum BB4 { [#"../projections.rs" 18 13 18 14] y <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * x)) (Borrow.inherit_id (Borrow.get_id x) 1); [#"../projections.rs" 18 13 18 14] x <- { x with current = (let Core_Option_Option_Type.C_Some x0 = * x in Core_Option_Option_Type.C_Some ( ^ y)) ; }; - [#"../projections.rs" 18 19 18 26] y <- { y with current = ([#"../projections.rs" 18 19 18 26] (10 : uint32)) ; }; + [#"../projections.rs" 18 19 18 26] y <- { y with current = (10 : uint32) ; }; assume { resolve0 y }; - [#"../projections.rs" 18 19 18 26] _0 <- ([#"../projections.rs" 18 19 18 26] ()); + [#"../projections.rs" 18 19 18 26] _0 <- (); assume { resolve1 x }; goto BB5 } @@ -167,14 +167,14 @@ module Projections_F goto BB0 } BB0 { - [#"../projections.rs" 24 10 24 18] _2 <- ([#"../projections.rs" 24 10 24 18] Core_Option_Option_Type.C_Some (10 : int32)); + [#"../projections.rs" 24 10 24 18] _2 <- Core_Option_Option_Type.C_Some (10 : int32); switch (_2) | Core_Option_Option_Type.C_None -> goto BB1 | Core_Option_Option_Type.C_Some _ -> goto BB2 end } BB1 { - [#"../projections.rs" 26 16 26 21] _1 <- ([#"../projections.rs" 26 16 26 21] false); + [#"../projections.rs" 26 16 26 21] _1 <- false; goto BB5 } BB2 { @@ -185,12 +185,12 @@ module Projections_F absurd } BB4 { - [#"../projections.rs" 25 13 25 14] x <- ([#"../projections.rs" 25 13 25 14] Core_Option_Option_Type.some_0 _2); - [#"../projections.rs" 25 19 25 25] _1 <- ([#"../projections.rs" 25 19 25 25] x = (0 : int32)); + [#"../projections.rs" 25 13 25 14] x <- Core_Option_Option_Type.some_0 _2; + [#"../projections.rs" 25 19 25 25] _1 <- x = (0 : int32); goto BB5 } BB5 { - [#"../projections.rs" 23 11 28 1] _0 <- ([#"../projections.rs" 23 11 28 1] ()); + [#"../projections.rs" 23 11 28 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/prophecy.mlcfg b/creusot/tests/should_succeed/prophecy.mlcfg index a25acd9ae6..54e564897f 100644 --- a/creusot/tests/should_succeed/prophecy.mlcfg +++ b/creusot/tests/should_succeed/prophecy.mlcfg @@ -17,12 +17,12 @@ module Prophecy_F goto BB0 } BB0 { - [#"../prophecy.rs" 4 16 4 17] x <- ([#"../prophecy.rs" 4 16 4 17] (0 : int32)); + [#"../prophecy.rs" 4 16 4 17] x <- (0 : int32); [#"../prophecy.rs" 5 12 5 18] y <- Borrow.borrow_mut x; [#"../prophecy.rs" 5 12 5 18] x <- ^ y; - [#"../prophecy.rs" 9 4 9 10] y <- { y with current = ([#"../prophecy.rs" 9 4 9 10] (5 : int32)) ; }; + [#"../prophecy.rs" 9 4 9 10] y <- { y with current = (5 : int32) ; }; assume { resolve0 y }; - [#"../prophecy.rs" 3 11 10 1] _0 <- ([#"../prophecy.rs" 3 11 10 1] ()); + [#"../prophecy.rs" 3 11 10 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/red_black_tree.mlcfg b/creusot/tests/should_succeed/red_black_tree.mlcfg index bc7f67acbf..f1f7ae39ce 100644 --- a/creusot/tests/should_succeed/red_black_tree.mlcfg +++ b/creusot/tests/should_succeed/red_black_tree.mlcfg @@ -27,7 +27,7 @@ module RedBlackTree_Impl16_Clone goto BB4 } BB2 { - [#"../red_black_tree.rs" 9 5 11 9] _0 <- ([#"../red_black_tree.rs" 9 5 11 9] RedBlackTree_Color_Type.C_Black); + [#"../red_black_tree.rs" 9 5 11 9] _0 <- RedBlackTree_Color_Type.C_Black; goto BB5 } BB3 { @@ -35,7 +35,7 @@ module RedBlackTree_Impl16_Clone absurd } BB4 { - [#"../red_black_tree.rs" 9 5 10 7] _0 <- ([#"../red_black_tree.rs" 9 5 10 7] RedBlackTree_Color_Type.C_Red); + [#"../red_black_tree.rs" 9 5 10 7] _0 <- RedBlackTree_Color_Type.C_Red; goto BB5 } BB5 { @@ -1056,7 +1056,7 @@ module RedBlackTree_Impl13_IsRed end } BB1 { - [#"../red_black_tree.rs" 391 17 391 22] _0 <- ([#"../red_black_tree.rs" 391 17 391 22] false); + [#"../red_black_tree.rs" 391 17 391 22] _0 <- false; goto BB5 } BB2 { @@ -1071,7 +1071,7 @@ module RedBlackTree_Impl13_IsRed goto BB4 } BB4 { - [#"../red_black_tree.rs" 390 49 390 53] _0 <- ([#"../red_black_tree.rs" 390 49 390 53] true); + [#"../red_black_tree.rs" 390 49 390 53] _0 <- true; goto BB5 } BB5 { @@ -1590,12 +1590,12 @@ module RedBlackTree_Impl14_RotateRight assume { resolve4 _30 }; assume { resolve4 _28 }; assert { [@expl:assertion] [#"../red_black_tree.rs" 441 8 441 90] has_mapping0 (RedBlackTree_Node_Type.node_left ( * Snapshot.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) }; - [#"../red_black_tree.rs" 442 34 442 41] _34 <- ([#"../red_black_tree.rs" 442 34 442 41] Core_Option_Option_Type.C_Some x); + [#"../red_black_tree.rs" 442 34 442 41] _34 <- Core_Option_Option_Type.C_Some x; x <- any RedBlackTree_Node_Type.t_node k v; goto BB7 } BB7 { - [#"../red_black_tree.rs" 442 21 442 43] _33 <- ([#"../red_black_tree.rs" 442 21 442 43] RedBlackTree_Tree_Type.C_Tree _34); + [#"../red_black_tree.rs" 442 21 442 43] _33 <- RedBlackTree_Tree_Type.C_Tree _34; _34 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v); goto BB8 } @@ -1603,7 +1603,7 @@ module RedBlackTree_Impl14_RotateRight goto BB9 } BB9 { - [#"../red_black_tree.rs" 442 8 442 18] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * self in RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 ([#"../red_black_tree.rs" 442 8 442 18] _33)) ; }; + [#"../red_black_tree.rs" 442 8 442 18] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * self in RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 _33) ; }; _33 <- any RedBlackTree_Tree_Type.t_tree k v; assert { [@expl:type invariant] inv3 (RedBlackTree_Node_Type.node_right ( * self)) }; assume { resolve5 (RedBlackTree_Node_Type.node_right ( * self)) }; @@ -1612,7 +1612,7 @@ module RedBlackTree_Impl14_RotateRight goto BB11 } BB11 { - [#"../red_black_tree.rs" 412 31 448 5] _0 <- ([#"../red_black_tree.rs" 412 31 448 5] ()); + [#"../red_black_tree.rs" 412 31 448 5] _0 <- (); goto BB12 } BB12 { @@ -2126,12 +2126,12 @@ module RedBlackTree_Impl14_RotateLeft assume { resolve4 _30 }; assume { resolve4 _28 }; assert { [@expl:assertion] [#"../red_black_tree.rs" 468 8 468 91] has_mapping0 (RedBlackTree_Node_Type.node_right ( * Snapshot.inner old_self)) (deep_model0 (RedBlackTree_Node_Type.node_key ( * self))) (RedBlackTree_Node_Type.node_val ( * self)) }; - [#"../red_black_tree.rs" 469 33 469 40] _34 <- ([#"../red_black_tree.rs" 469 33 469 40] Core_Option_Option_Type.C_Some x); + [#"../red_black_tree.rs" 469 33 469 40] _34 <- Core_Option_Option_Type.C_Some x; x <- any RedBlackTree_Node_Type.t_node k v; goto BB7 } BB7 { - [#"../red_black_tree.rs" 469 20 469 42] _33 <- ([#"../red_black_tree.rs" 469 20 469 42] RedBlackTree_Tree_Type.C_Tree _34); + [#"../red_black_tree.rs" 469 20 469 42] _33 <- RedBlackTree_Tree_Type.C_Tree _34; _34 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v); goto BB8 } @@ -2139,7 +2139,7 @@ module RedBlackTree_Impl14_RotateLeft goto BB9 } BB9 { - [#"../red_black_tree.rs" 469 8 469 17] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * self in RedBlackTree_Node_Type.C_Node ([#"../red_black_tree.rs" 469 8 469 17] _33) x1 x2 x3 x4) ; }; + [#"../red_black_tree.rs" 469 8 469 17] self <- { self with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * self in RedBlackTree_Node_Type.C_Node _33 x1 x2 x3 x4) ; }; _33 <- any RedBlackTree_Tree_Type.t_tree k v; assert { [@expl:type invariant] inv3 (RedBlackTree_Node_Type.node_left ( * self)) }; assume { resolve5 (RedBlackTree_Node_Type.node_left ( * self)) }; @@ -2148,7 +2148,7 @@ module RedBlackTree_Impl14_RotateLeft goto BB11 } BB11 { - [#"../red_black_tree.rs" 462 30 470 5] _0 <- ([#"../red_black_tree.rs" 462 30 470 5] ()); + [#"../red_black_tree.rs" 462 30 470 5] _0 <- (); goto BB12 } BB12 { @@ -2539,7 +2539,7 @@ module RedBlackTree_Impl14_FlipColors goto BB2 } BB2 { - [#"../red_black_tree.rs" 487 8 487 59] _13 <- { _13 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _13 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 487 8 487 59] RedBlackTree_Node_Type.node_color ( * self)) x2 x3 x4) ; }; + [#"../red_black_tree.rs" 487 8 487 59] _13 <- { _13 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _13 in RedBlackTree_Node_Type.C_Node x0 (RedBlackTree_Node_Type.node_color ( * self)) x2 x3 x4) ; }; assert { [@expl:type invariant] inv1 _13 }; assume { resolve0 _13 }; [#"../red_black_tree.rs" 488 23 488 38] _18 <- Borrow.borrow_final (RedBlackTree_Node_Type.node_color ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2); @@ -2575,7 +2575,7 @@ module RedBlackTree_Impl14_FlipColors assume { resolve1 _18 }; assert { [@expl:type invariant] inv2 self }; assume { resolve2 self }; - [#"../red_black_tree.rs" 486 30 489 5] _0 <- ([#"../red_black_tree.rs" 486 30 489 5] ()); + [#"../red_black_tree.rs" 486 30 489 5] _0 <- (); return _0 } @@ -3053,14 +3053,14 @@ module RedBlackTree_Impl14_Balance goto BB6 } BB6 { - [#"../red_black_tree.rs" 511 54 513 9] _14 <- ([#"../red_black_tree.rs" 511 54 513 9] ()); + [#"../red_black_tree.rs" 511 54 513 9] _14 <- (); goto BB9 } BB7 { goto BB8 } BB8 { - [#"../red_black_tree.rs" 513 9 513 9] _14 <- ([#"../red_black_tree.rs" 513 9 513 9] ()); + [#"../red_black_tree.rs" 513 9 513 9] _14 <- (); goto BB9 } BB9 { @@ -3103,7 +3103,7 @@ module RedBlackTree_Impl14_Balance goto BB16 } BB16 { - [#"../red_black_tree.rs" 515 80 517 9] _21 <- ([#"../red_black_tree.rs" 515 80 517 9] ()); + [#"../red_black_tree.rs" 515 80 517 9] _21 <- (); goto BB20 } BB17 { @@ -3113,7 +3113,7 @@ module RedBlackTree_Impl14_Balance goto BB19 } BB19 { - [#"../red_black_tree.rs" 517 9 517 9] _21 <- ([#"../red_black_tree.rs" 517 9 517 9] ()); + [#"../red_black_tree.rs" 517 9 517 9] _21 <- (); goto BB20 } BB20 { @@ -3147,7 +3147,7 @@ module RedBlackTree_Impl14_Balance BB25 { assert { [@expl:type invariant] inv2 self }; assume { resolve1 self }; - [#"../red_black_tree.rs" 519 53 521 9] _0 <- ([#"../red_black_tree.rs" 519 53 521 9] ()); + [#"../red_black_tree.rs" 519 53 521 9] _0 <- (); goto BB29 } BB26 { @@ -3161,7 +3161,7 @@ module RedBlackTree_Impl14_Balance goto BB28 } BB28 { - [#"../red_black_tree.rs" 521 9 521 9] _0 <- ([#"../red_black_tree.rs" 521 9 521 9] ()); + [#"../red_black_tree.rs" 521 9 521 9] _0 <- (); goto BB29 } BB29 { @@ -3719,7 +3719,7 @@ module RedBlackTree_Impl14_MoveRedLeft BB13 { assert { [@expl:type invariant] inv2 _20 }; assume { resolve0 _20 }; - [#"../red_black_tree.rs" 550 15 550 19] _0 <- ([#"../red_black_tree.rs" 550 15 550 19] self); + [#"../red_black_tree.rs" 550 15 550 19] _0 <- self; self <- any borrowed (RedBlackTree_Node_Type.t_node k v); goto BB14 } @@ -4243,7 +4243,7 @@ module RedBlackTree_Impl14_MoveRedRight BB10 { assert { [@expl:type invariant] inv2 _20 }; assume { resolve0 _20 }; - [#"../red_black_tree.rs" 578 15 578 19] _0 <- ([#"../red_black_tree.rs" 578 15 578 19] self); + [#"../red_black_tree.rs" 578 15 578 19] _0 <- self; self <- any borrowed (RedBlackTree_Node_Type.t_node k v); goto BB11 } @@ -4500,8 +4500,8 @@ module RedBlackTree_Impl15_New goto BB0 } BB0 { - [#"../red_black_tree.rs" 589 21 589 25] _3 <- ([#"../red_black_tree.rs" 589 21 589 25] Core_Option_Option_Type.C_None); - [#"../red_black_tree.rs" 589 8 589 27] _0 <- ([#"../red_black_tree.rs" 589 8 589 27] RedBlackTree_Tree_Type.C_Tree _3); + [#"../red_black_tree.rs" 589 21 589 25] _3 <- Core_Option_Option_Type.C_None; + [#"../red_black_tree.rs" 589 8 589 27] _0 <- RedBlackTree_Tree_Type.C_Tree _3; _3 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v); goto BB1 } @@ -4984,7 +4984,7 @@ module RedBlackTree_Impl15_InsertRec [#"../red_black_tree.rs" 601 20 601 24] node <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * _11)) (Borrow.inherit_id (Borrow.get_id _11) 1); [#"../red_black_tree.rs" 601 20 601 24] _11 <- { _11 with current = (let Core_Option_Option_Type.C_Some x0 = * _11 in Core_Option_Option_Type.C_Some ( ^ node)) ; }; assume { inv1 ( ^ node) }; - [#"../red_black_tree.rs" 602 26 602 35] _18 <- ([#"../red_black_tree.rs" 602 26 602 35] RedBlackTree_Node_Type.node_key ( * node)); + [#"../red_black_tree.rs" 602 26 602 35] _18 <- RedBlackTree_Node_Type.node_key ( * node); assert { [@expl:type invariant] inv2 _18 }; assume { resolve0 _18 }; [#"../red_black_tree.rs" 602 18 602 36] _15 <- ([#"../red_black_tree.rs" 602 18 602 36] cmp0 key _18); @@ -5046,7 +5046,7 @@ module RedBlackTree_Impl15_InsertRec goto BB13 } BB13 { - [#"../red_black_tree.rs" 605 20 605 28] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * node in RedBlackTree_Node_Type.C_Node x0 x1 x2 ([#"../red_black_tree.rs" 605 20 605 28] val') x4) ; }; + [#"../red_black_tree.rs" 605 20 605 28] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * node in RedBlackTree_Node_Type.C_Node x0 x1 x2 val' x4) ; }; val' <- any v; assert { [@expl:type invariant] inv5 (RedBlackTree_Node_Type.node_val ( * node)) }; assume { resolve2 (RedBlackTree_Node_Type.node_val ( * node)) }; @@ -5059,7 +5059,7 @@ module RedBlackTree_Impl15_InsertRec assume { resolve4 _11 }; assert { [@expl:type invariant] inv8 self }; assume { resolve5 self }; - [#"../red_black_tree.rs" 606 20 606 26] _0 <- ([#"../red_black_tree.rs" 606 20 606 26] ()); + [#"../red_black_tree.rs" 606 20 606 26] _0 <- (); goto BB32 } BB16 { @@ -5080,26 +5080,26 @@ module RedBlackTree_Impl15_InsertRec assume { resolve4 _11 }; assert { [@expl:type invariant] inv8 self }; assume { resolve5 self }; - [#"../red_black_tree.rs" 601 43 611 9] _0 <- ([#"../red_black_tree.rs" 601 43 611 9] ()); + [#"../red_black_tree.rs" 601 43 611 9] _0 <- (); goto BB31 } BB19 { assert { [@expl:type invariant] inv7 _11 }; assume { resolve4 _11 }; - [#"../red_black_tree.rs" 613 35 613 39] _35 <- ([#"../red_black_tree.rs" 613 35 613 39] Core_Option_Option_Type.C_None); - [#"../red_black_tree.rs" 613 22 613 41] _34 <- ([#"../red_black_tree.rs" 613 22 613 41] RedBlackTree_Tree_Type.C_Tree _35); + [#"../red_black_tree.rs" 613 35 613 39] _35 <- Core_Option_Option_Type.C_None; + [#"../red_black_tree.rs" 613 22 613 41] _34 <- RedBlackTree_Tree_Type.C_Tree _35; _35 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v); goto BB20 } BB20 { - [#"../red_black_tree.rs" 614 23 614 26] _36 <- ([#"../red_black_tree.rs" 614 23 614 26] RedBlackTree_Color_Type.C_Red); - [#"../red_black_tree.rs" 617 36 617 40] _40 <- ([#"../red_black_tree.rs" 617 36 617 40] Core_Option_Option_Type.C_None); - [#"../red_black_tree.rs" 617 23 617 42] _39 <- ([#"../red_black_tree.rs" 617 23 617 42] RedBlackTree_Tree_Type.C_Tree _40); + [#"../red_black_tree.rs" 614 23 614 26] _36 <- RedBlackTree_Color_Type.C_Red; + [#"../red_black_tree.rs" 617 36 617 40] _40 <- Core_Option_Option_Type.C_None; + [#"../red_black_tree.rs" 617 23 617 42] _39 <- RedBlackTree_Tree_Type.C_Tree _40; _40 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v); goto BB21 } BB21 { - [#"../red_black_tree.rs" 612 38 618 13] _33 <- ([#"../red_black_tree.rs" 612 38 618 13] RedBlackTree_Node_Type.C_Node _34 _36 key val' _39); + [#"../red_black_tree.rs" 612 38 618 13] _33 <- RedBlackTree_Node_Type.C_Node _34 _36 key val' _39; _34 <- any RedBlackTree_Tree_Type.t_tree k v; _36 <- any RedBlackTree_Color_Type.t_color; key <- any k; @@ -5120,7 +5120,7 @@ module RedBlackTree_Impl15_InsertRec goto BB26 } BB26 { - [#"../red_black_tree.rs" 612 24 618 15] _31 <- ([#"../red_black_tree.rs" 612 24 618 15] Core_Option_Option_Type.C_Some _33); + [#"../red_black_tree.rs" 612 24 618 15] _31 <- Core_Option_Option_Type.C_Some _33; _33 <- any RedBlackTree_Node_Type.t_node k v; goto BB27 } @@ -5128,7 +5128,7 @@ module RedBlackTree_Impl15_InsertRec goto BB28 } BB28 { - [#"../red_black_tree.rs" 612 12 612 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 = * self in RedBlackTree_Tree_Type.C_Tree ([#"../red_black_tree.rs" 612 12 612 21] _31)) ; }; + [#"../red_black_tree.rs" 612 12 612 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 = * self in RedBlackTree_Tree_Type.C_Tree _31) ; }; _31 <- any Core_Option_Option_Type.t_option (RedBlackTree_Node_Type.t_node k v); assert { [@expl:type invariant] inv0 (RedBlackTree_Tree_Type.tree_node ( * self)) }; assume { resolve6 (RedBlackTree_Tree_Type.tree_node ( * self)) }; @@ -5137,7 +5137,7 @@ module RedBlackTree_Impl15_InsertRec goto BB30 } BB30 { - [#"../red_black_tree.rs" 619 12 619 18] _0 <- ([#"../red_black_tree.rs" 619 12 619 18] ()); + [#"../red_black_tree.rs" 619 12 619 18] _0 <- (); goto BB32 } BB31 { @@ -5602,7 +5602,7 @@ module RedBlackTree_Impl15_Insert goto BB2 } BB2 { - [#"../red_black_tree.rs" 628 44 628 49] _11 <- ([#"../red_black_tree.rs" 628 44 628 49] RedBlackTree_Color_Type.C_Black); + [#"../red_black_tree.rs" 628 44 628 49] _11 <- RedBlackTree_Color_Type.C_Black; [#"../red_black_tree.rs" 628 8 628 17] _14 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1); [#"../red_black_tree.rs" 628 8 628 17] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 = * self in RedBlackTree_Tree_Type.C_Tree ( ^ _14)) ; }; assume { inv1 ( ^ _14) }; @@ -5616,7 +5616,7 @@ module RedBlackTree_Impl15_Insert goto BB4 } BB4 { - [#"../red_black_tree.rs" 628 8 628 49] _12 <- { _12 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _12 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 628 8 628 49] _11) x2 x3 x4) ; }; + [#"../red_black_tree.rs" 628 8 628 49] _12 <- { _12 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _12 in RedBlackTree_Node_Type.C_Node x0 _11 x2 x3 x4) ; }; _11 <- any RedBlackTree_Color_Type.t_color; assert { [@expl:type invariant] inv2 _12 }; assume { resolve0 _12 }; @@ -5627,7 +5627,7 @@ module RedBlackTree_Impl15_Insert } BB5 { assume { resolve2 _15 }; - [#"../red_black_tree.rs" 626 45 630 5] _0 <- ([#"../red_black_tree.rs" 626 45 630 5] ()); + [#"../red_black_tree.rs" 626 45 630 5] _0 <- (); goto BB6 } BB6 { @@ -6254,7 +6254,7 @@ module RedBlackTree_Impl15_DeleteMaxRec goto BB8 } BB7 { - [#"../red_black_tree.rs" 647 9 647 9] _16 <- ([#"../red_black_tree.rs" 647 9 647 9] ()); + [#"../red_black_tree.rs" 647 9 647 9] _16 <- (); goto BB8 } BB8 { @@ -6291,7 +6291,7 @@ module RedBlackTree_Impl15_DeleteMaxRec BB12 { assert { [@expl:type invariant] inv1 node1 }; assume { resolve4 node1 }; - [#"../red_black_tree.rs" 650 19 650 39] _0 <- ([#"../red_black_tree.rs" 650 19 650 39] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1)); + [#"../red_black_tree.rs" 650 19 650 39] _0 <- (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1); node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4); node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4); goto BB13 @@ -6353,15 +6353,15 @@ module RedBlackTree_Impl15_DeleteMaxRec assume { inv3 ( ^ _37) }; assert { [@expl:type invariant] inv4 node }; assume { resolve1 node }; - [#"../red_black_tree.rs" 653 12 653 40] node <- ([#"../red_black_tree.rs" 653 12 653 40] _37); + [#"../red_black_tree.rs" 653 12 653 40] node <- _37; _37 <- any borrowed (RedBlackTree_Node_Type.t_node k v); assert { [@expl:type invariant] inv4 _38 }; assume { resolve1 _38 }; - [#"../red_black_tree.rs" 652 84 654 9] _29 <- ([#"../red_black_tree.rs" 652 84 654 9] ()); + [#"../red_black_tree.rs" 652 84 654 9] _29 <- (); goto BB26 } BB25 { - [#"../red_black_tree.rs" 654 9 654 9] _29 <- ([#"../red_black_tree.rs" 654 9 654 9] ()); + [#"../red_black_tree.rs" 654 9 654 9] _29 <- (); goto BB26 } BB26 { @@ -6385,7 +6385,7 @@ module RedBlackTree_Impl15_DeleteMaxRec assume { resolve1 node }; assert { [@expl:type invariant] inv6 self }; assume { resolve3 self }; - [#"../red_black_tree.rs" 657 8 657 9] _0 <- ([#"../red_black_tree.rs" 657 8 657 9] r); + [#"../red_black_tree.rs" 657 8 657 9] _0 <- r; r <- any (k, v); goto BB29 } @@ -6928,18 +6928,18 @@ module RedBlackTree_Impl15_DeleteMax assume { resolve1 node }; assert { [@expl:type invariant] inv4 _8 }; assume { resolve2 _8 }; - [#"../red_black_tree.rs" 672 13 672 13] _7 <- ([#"../red_black_tree.rs" 672 13 672 13] ()); + [#"../red_black_tree.rs" 672 13 672 13] _7 <- (); goto BB7 } BB6 { - [#"../red_black_tree.rs" 671 29 671 32] _13 <- ([#"../red_black_tree.rs" 671 29 671 32] RedBlackTree_Color_Type.C_Red); - [#"../red_black_tree.rs" 671 16 671 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 671 16 671 32] _13) x2 x3 x4) ; }; + [#"../red_black_tree.rs" 671 29 671 32] _13 <- RedBlackTree_Color_Type.C_Red; + [#"../red_black_tree.rs" 671 16 671 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * node in RedBlackTree_Node_Type.C_Node x0 _13 x2 x3 x4) ; }; _13 <- any RedBlackTree_Color_Type.t_color; assert { [@expl:type invariant] inv3 node }; assume { resolve1 node }; assert { [@expl:type invariant] inv4 _8 }; assume { resolve2 _8 }; - [#"../red_black_tree.rs" 670 35 672 13] _7 <- ([#"../red_black_tree.rs" 670 35 672 13] ()); + [#"../red_black_tree.rs" 670 35 672 13] _7 <- (); goto BB7 } BB7 { @@ -6954,7 +6954,7 @@ module RedBlackTree_Impl15_DeleteMax BB8 { assert { [@expl:type invariant] inv4 _8 }; assume { resolve2 _8 }; - [#"../red_black_tree.rs" 674 19 674 23] _0 <- ([#"../red_black_tree.rs" 674 19 674 23] Core_Option_Option_Type.C_None); + [#"../red_black_tree.rs" 674 19 674 23] _0 <- Core_Option_Option_Type.C_None; assert { [@expl:type invariant] inv6 self }; assume { resolve3 self }; goto BB19 @@ -6970,7 +6970,7 @@ module RedBlackTree_Impl15_DeleteMax end } BB11 { - [#"../red_black_tree.rs" 679 48 679 53] _22 <- ([#"../red_black_tree.rs" 679 48 679 53] RedBlackTree_Color_Type.C_Black); + [#"../red_black_tree.rs" 679 48 679 53] _22 <- RedBlackTree_Color_Type.C_Black; [#"../red_black_tree.rs" 679 12 679 21] _25 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1); [#"../red_black_tree.rs" 679 12 679 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 = * self in RedBlackTree_Tree_Type.C_Tree ( ^ _25)) ; }; assume { inv1 ( ^ _25) }; @@ -6984,19 +6984,19 @@ module RedBlackTree_Impl15_DeleteMax goto BB13 } BB13 { - [#"../red_black_tree.rs" 679 12 679 53] _23 <- { _23 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _23 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 679 12 679 53] _22) x2 x3 x4) ; }; + [#"../red_black_tree.rs" 679 12 679 53] _23 <- { _23 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _23 in RedBlackTree_Node_Type.C_Node x0 _22 x2 x3 x4) ; }; _22 <- any RedBlackTree_Color_Type.t_color; assert { [@expl:type invariant] inv3 _23 }; assume { resolve1 _23 }; assert { [@expl:type invariant] inv6 self }; assume { resolve3 self }; - [#"../red_black_tree.rs" 678 25 680 9] _19 <- ([#"../red_black_tree.rs" 678 25 680 9] ()); + [#"../red_black_tree.rs" 678 25 680 9] _19 <- (); goto BB15 } BB14 { assert { [@expl:type invariant] inv6 self }; assume { resolve3 self }; - [#"../red_black_tree.rs" 680 9 680 9] _19 <- ([#"../red_black_tree.rs" 680 9 680 9] ()); + [#"../red_black_tree.rs" 680 9 680 9] _19 <- (); goto BB15 } BB15 { @@ -7005,7 +7005,7 @@ module RedBlackTree_Impl15_DeleteMax } BB16 { assume { resolve4 _26 }; - [#"../red_black_tree.rs" 682 8 682 15] _0 <- ([#"../red_black_tree.rs" 682 8 682 15] Core_Option_Option_Type.C_Some r); + [#"../red_black_tree.rs" 682 8 682 15] _0 <- Core_Option_Option_Type.C_Some r; r <- any (k, v); goto BB17 } @@ -7633,7 +7633,7 @@ module RedBlackTree_Impl15_DeleteMinRec BB7 { assert { [@expl:type invariant] inv1 node1 }; assume { resolve4 node1 }; - [#"../red_black_tree.rs" 700 19 700 39] _0 <- ([#"../red_black_tree.rs" 700 19 700 39] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1)); + [#"../red_black_tree.rs" 700 19 700 39] _0 <- (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1); node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4); node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4); goto BB8 @@ -7695,15 +7695,15 @@ module RedBlackTree_Impl15_DeleteMinRec assume { inv7 ( ^ _33) }; assert { [@expl:type invariant] inv3 node }; assume { resolve1 node }; - [#"../red_black_tree.rs" 703 12 703 39] node <- ([#"../red_black_tree.rs" 703 12 703 39] _33); + [#"../red_black_tree.rs" 703 12 703 39] node <- _33; _33 <- any borrowed (RedBlackTree_Node_Type.t_node k v); assert { [@expl:type invariant] inv3 _34 }; assume { resolve1 _34 }; - [#"../red_black_tree.rs" 702 82 704 9] _25 <- ([#"../red_black_tree.rs" 702 82 704 9] ()); + [#"../red_black_tree.rs" 702 82 704 9] _25 <- (); goto BB21 } BB20 { - [#"../red_black_tree.rs" 704 9 704 9] _25 <- ([#"../red_black_tree.rs" 704 9 704 9] ()); + [#"../red_black_tree.rs" 704 9 704 9] _25 <- (); goto BB21 } BB21 { @@ -7727,7 +7727,7 @@ module RedBlackTree_Impl15_DeleteMinRec assume { resolve1 node }; assert { [@expl:type invariant] inv5 self }; assume { resolve3 self }; - [#"../red_black_tree.rs" 707 8 707 9] _0 <- ([#"../red_black_tree.rs" 707 8 707 9] r); + [#"../red_black_tree.rs" 707 8 707 9] _0 <- r; r <- any (k, v); goto BB24 } @@ -8246,18 +8246,18 @@ module RedBlackTree_Impl15_DeleteMin assume { resolve1 node }; assert { [@expl:type invariant] inv3 _8 }; assume { resolve2 _8 }; - [#"../red_black_tree.rs" 725 13 725 13] _7 <- ([#"../red_black_tree.rs" 725 13 725 13] ()); + [#"../red_black_tree.rs" 725 13 725 13] _7 <- (); goto BB7 } BB6 { - [#"../red_black_tree.rs" 724 29 724 32] _13 <- ([#"../red_black_tree.rs" 724 29 724 32] RedBlackTree_Color_Type.C_Red); - [#"../red_black_tree.rs" 724 16 724 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 724 16 724 32] _13) x2 x3 x4) ; }; + [#"../red_black_tree.rs" 724 29 724 32] _13 <- RedBlackTree_Color_Type.C_Red; + [#"../red_black_tree.rs" 724 16 724 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * node in RedBlackTree_Node_Type.C_Node x0 _13 x2 x3 x4) ; }; _13 <- any RedBlackTree_Color_Type.t_color; assert { [@expl:type invariant] inv2 node }; assume { resolve1 node }; assert { [@expl:type invariant] inv3 _8 }; assume { resolve2 _8 }; - [#"../red_black_tree.rs" 723 35 725 13] _7 <- ([#"../red_black_tree.rs" 723 35 725 13] ()); + [#"../red_black_tree.rs" 723 35 725 13] _7 <- (); goto BB7 } BB7 { @@ -8271,7 +8271,7 @@ module RedBlackTree_Impl15_DeleteMin BB8 { assert { [@expl:type invariant] inv3 _8 }; assume { resolve2 _8 }; - [#"../red_black_tree.rs" 727 19 727 23] _0 <- ([#"../red_black_tree.rs" 727 19 727 23] Core_Option_Option_Type.C_None); + [#"../red_black_tree.rs" 727 19 727 23] _0 <- Core_Option_Option_Type.C_None; assert { [@expl:type invariant] inv5 self }; assume { resolve3 self }; goto BB18 @@ -8287,7 +8287,7 @@ module RedBlackTree_Impl15_DeleteMin end } BB11 { - [#"../red_black_tree.rs" 731 48 731 53] _20 <- ([#"../red_black_tree.rs" 731 48 731 53] RedBlackTree_Color_Type.C_Black); + [#"../red_black_tree.rs" 731 48 731 53] _20 <- RedBlackTree_Color_Type.C_Black; [#"../red_black_tree.rs" 731 12 731 21] _23 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1); [#"../red_black_tree.rs" 731 12 731 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 = * self in RedBlackTree_Tree_Type.C_Tree ( ^ _23)) ; }; assume { inv0 ( ^ _23) }; @@ -8301,23 +8301,23 @@ module RedBlackTree_Impl15_DeleteMin goto BB13 } BB13 { - [#"../red_black_tree.rs" 731 12 731 53] _21 <- { _21 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _21 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 731 12 731 53] _20) x2 x3 x4) ; }; + [#"../red_black_tree.rs" 731 12 731 53] _21 <- { _21 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _21 in RedBlackTree_Node_Type.C_Node x0 _20 x2 x3 x4) ; }; _20 <- any RedBlackTree_Color_Type.t_color; assert { [@expl:type invariant] inv2 _21 }; assume { resolve1 _21 }; assert { [@expl:type invariant] inv5 self }; assume { resolve3 self }; - [#"../red_black_tree.rs" 730 25 732 9] _17 <- ([#"../red_black_tree.rs" 730 25 732 9] ()); + [#"../red_black_tree.rs" 730 25 732 9] _17 <- (); goto BB15 } BB14 { assert { [@expl:type invariant] inv5 self }; assume { resolve3 self }; - [#"../red_black_tree.rs" 732 9 732 9] _17 <- ([#"../red_black_tree.rs" 732 9 732 9] ()); + [#"../red_black_tree.rs" 732 9 732 9] _17 <- (); goto BB15 } BB15 { - [#"../red_black_tree.rs" 733 8 733 15] _0 <- ([#"../red_black_tree.rs" 733 8 733 15] Core_Option_Option_Type.C_Some r); + [#"../red_black_tree.rs" 733 8 733 15] _0 <- Core_Option_Option_Type.C_Some r; r <- any (k, v); goto BB16 } @@ -9172,7 +9172,7 @@ module RedBlackTree_Impl15_DeleteRec BB3 { assert { [@expl:type invariant] inv2 _14 }; assume { resolve0 _14 }; - [#"../red_black_tree.rs" 751 22 751 31] _21 <- ([#"../red_black_tree.rs" 751 22 751 31] RedBlackTree_Node_Type.node_key ( * node)); + [#"../red_black_tree.rs" 751 22 751 31] _21 <- RedBlackTree_Node_Type.node_key ( * node); assert { [@expl:type invariant] inv3 _21 }; assume { resolve1 _21 }; [#"../red_black_tree.rs" 751 14 751 32] _18 <- ([#"../red_black_tree.rs" 751 14 751 32] cmp0 key _21); @@ -9188,7 +9188,7 @@ module RedBlackTree_Impl15_DeleteRec goto BB7 } BB6 { - [#"../red_black_tree.rs" 761 12 761 15] ord <- ([#"../red_black_tree.rs" 761 12 761 15] _18); + [#"../red_black_tree.rs" 761 12 761 15] ord <- _18; [#"../red_black_tree.rs" 762 19 762 37] _42 <- ([#"../red_black_tree.rs" 762 19 762 37] is_red0 (RedBlackTree_Node_Type.node_left ( * node))); goto BB26 } @@ -9209,7 +9209,7 @@ module RedBlackTree_Impl15_DeleteRec assume { resolve1 key }; assert { [@expl:type invariant] inv8 self }; assume { resolve4 self }; - [#"../red_black_tree.rs" 754 27 754 31] _0 <- ([#"../red_black_tree.rs" 754 27 754 31] Core_Option_Option_Type.C_None); + [#"../red_black_tree.rs" 754 27 754 31] _0 <- Core_Option_Option_Type.C_None; goto BB74 } BB10 { @@ -9263,15 +9263,15 @@ module RedBlackTree_Impl15_DeleteRec assume { inv5 ( ^ _35) }; assert { [@expl:type invariant] inv6 node }; assume { resolve3 node }; - [#"../red_black_tree.rs" 757 20 757 47] node <- ([#"../red_black_tree.rs" 757 20 757 47] _35); + [#"../red_black_tree.rs" 757 20 757 47] node <- _35; _35 <- any borrowed (RedBlackTree_Node_Type.t_node k v); assert { [@expl:type invariant] inv6 _36 }; assume { resolve3 _36 }; - [#"../red_black_tree.rs" 756 90 758 17] _27 <- ([#"../red_black_tree.rs" 756 90 758 17] ()); + [#"../red_black_tree.rs" 756 90 758 17] _27 <- (); goto BB21 } BB20 { - [#"../red_black_tree.rs" 758 17 758 17] _27 <- ([#"../red_black_tree.rs" 758 17 758 17] ()); + [#"../red_black_tree.rs" 758 17 758 17] _27 <- (); goto BB21 } BB21 { @@ -9288,9 +9288,9 @@ module RedBlackTree_Impl15_DeleteRec goto BB23 } BB23 { - [#"../red_black_tree.rs" 759 16 759 17] r <- ([#"../red_black_tree.rs" 759 16 759 17] _38); + [#"../red_black_tree.rs" 759 16 759 17] r <- _38; _38 <- any Core_Option_Option_Type.t_option (k, v); - [#"../red_black_tree.rs" 759 16 759 45] _17 <- ([#"../red_black_tree.rs" 759 16 759 45] ()); + [#"../red_black_tree.rs" 759 16 759 45] _17 <- (); goto BB25 } BB25 { @@ -9324,9 +9324,9 @@ module RedBlackTree_Impl15_DeleteRec goto BB30 } BB30 { - [#"../red_black_tree.rs" 764 20 764 21] r <- ([#"../red_black_tree.rs" 764 20 764 21] _46); + [#"../red_black_tree.rs" 764 20 764 21] r <- _46; _46 <- any Core_Option_Option_Type.t_option (k, v); - [#"../red_black_tree.rs" 764 20 764 50] _17 <- ([#"../red_black_tree.rs" 764 20 764 50] ()); + [#"../red_black_tree.rs" 764 20 764 50] _17 <- (); goto BB32 } BB32 { @@ -9358,7 +9358,7 @@ module RedBlackTree_Impl15_DeleteRec BB37 { assert { [@expl:type invariant] inv8 self }; assume { resolve4 self }; - [#"../red_black_tree.rs" 768 35 768 39] _0 <- ([#"../red_black_tree.rs" 768 35 768 39] Core_Option_Option_Type.C_None); + [#"../red_black_tree.rs" 768 35 768 39] _0 <- Core_Option_Option_Type.C_None; goto BB73 } BB38 { @@ -9384,7 +9384,7 @@ module RedBlackTree_Impl15_DeleteRec BB40 { assert { [@expl:type invariant] inv1 node1 }; assume { resolve9 node1 }; - [#"../red_black_tree.rs" 771 36 771 56] _60 <- ([#"../red_black_tree.rs" 771 36 771 56] (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1)); + [#"../red_black_tree.rs" 771 36 771 56] _60 <- (RedBlackTree_Node_Type.node_key node1, RedBlackTree_Node_Type.node_val node1); node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 (any k) x3 x4); node1 <- (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = node1 in RedBlackTree_Node_Type.C_Node x0 x1 x2 (any v) x4); goto BB41 @@ -9393,7 +9393,7 @@ module RedBlackTree_Impl15_DeleteRec goto BB42 } BB42 { - [#"../red_black_tree.rs" 771 31 771 57] _0 <- ([#"../red_black_tree.rs" 771 31 771 57] Core_Option_Option_Type.C_Some _60); + [#"../red_black_tree.rs" 771 31 771 57] _0 <- Core_Option_Option_Type.C_Some _60; _60 <- any (k, v); goto BB43 } @@ -9422,7 +9422,7 @@ module RedBlackTree_Impl15_DeleteRec end } BB48 { - [#"../red_black_tree.rs" 775 21 775 21] _63 <- ([#"../red_black_tree.rs" 775 21 775 21] ()); + [#"../red_black_tree.rs" 775 21 775 21] _63 <- (); goto BB51 } BB49 { @@ -9439,11 +9439,11 @@ module RedBlackTree_Impl15_DeleteRec assume { inv5 ( ^ _69) }; assert { [@expl:type invariant] inv6 node }; assume { resolve3 node }; - [#"../red_black_tree.rs" 774 24 774 52] node <- ([#"../red_black_tree.rs" 774 24 774 52] _69); + [#"../red_black_tree.rs" 774 24 774 52] node <- _69; _69 <- any borrowed (RedBlackTree_Node_Type.t_node k v); assert { [@expl:type invariant] inv6 _70 }; assume { resolve3 _70 }; - [#"../red_black_tree.rs" 773 72 775 21] _63 <- ([#"../red_black_tree.rs" 773 72 775 21] ()); + [#"../red_black_tree.rs" 773 72 775 21] _63 <- (); goto BB51 } BB51 { @@ -9515,7 +9515,7 @@ module RedBlackTree_Impl15_DeleteRec assume { resolve7 _86 }; assert { [@expl:type invariant] inv12 _84 }; assume { resolve7 _84 }; - [#"../red_black_tree.rs" 781 28 781 36] _87 <- ([#"../red_black_tree.rs" 781 28 781 36] Core_Option_Option_Type.C_Some kv); + [#"../red_black_tree.rs" 781 28 781 36] _87 <- Core_Option_Option_Type.C_Some kv; kv <- any (k, v); goto BB58 } @@ -9523,9 +9523,9 @@ module RedBlackTree_Impl15_DeleteRec goto BB59 } BB59 { - [#"../red_black_tree.rs" 781 24 781 25] r <- ([#"../red_black_tree.rs" 781 24 781 25] _87); + [#"../red_black_tree.rs" 781 24 781 25] r <- _87; _87 <- any Core_Option_Option_Type.t_option (k, v); - [#"../red_black_tree.rs" 781 24 781 36] _17 <- ([#"../red_black_tree.rs" 781 24 781 36] ()); + [#"../red_black_tree.rs" 781 24 781 36] _17 <- (); goto BB61 } BB61 { @@ -9548,9 +9548,9 @@ module RedBlackTree_Impl15_DeleteRec goto BB65 } BB65 { - [#"../red_black_tree.rs" 783 24 783 25] r <- ([#"../red_black_tree.rs" 783 24 783 25] _89); + [#"../red_black_tree.rs" 783 24 783 25] r <- _89; _89 <- any Core_Option_Option_Type.t_option (k, v); - [#"../red_black_tree.rs" 783 24 783 54] _17 <- ([#"../red_black_tree.rs" 783 24 783 54] ()); + [#"../red_black_tree.rs" 783 24 783 54] _17 <- (); goto BB67 } BB67 { @@ -9572,7 +9572,7 @@ module RedBlackTree_Impl15_DeleteRec assume { resolve3 node }; assert { [@expl:type invariant] inv8 self }; assume { resolve4 self }; - [#"../red_black_tree.rs" 789 8 789 9] _0 <- ([#"../red_black_tree.rs" 789 8 789 9] r); + [#"../red_black_tree.rs" 789 8 789 9] _0 <- r; r <- any Core_Option_Option_Type.t_option (k, v); goto BB71 } @@ -10115,18 +10115,18 @@ module RedBlackTree_Impl15_Delete assume { resolve1 node }; assert { [@expl:type invariant] inv3 _10 }; assume { resolve2 _10 }; - [#"../red_black_tree.rs" 806 13 806 13] _9 <- ([#"../red_black_tree.rs" 806 13 806 13] ()); + [#"../red_black_tree.rs" 806 13 806 13] _9 <- (); goto BB7 } BB6 { - [#"../red_black_tree.rs" 805 29 805 32] _15 <- ([#"../red_black_tree.rs" 805 29 805 32] RedBlackTree_Color_Type.C_Red); - [#"../red_black_tree.rs" 805 16 805 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * node in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 805 16 805 32] _15) x2 x3 x4) ; }; + [#"../red_black_tree.rs" 805 29 805 32] _15 <- RedBlackTree_Color_Type.C_Red; + [#"../red_black_tree.rs" 805 16 805 32] node <- { node with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * node in RedBlackTree_Node_Type.C_Node x0 _15 x2 x3 x4) ; }; _15 <- any RedBlackTree_Color_Type.t_color; assert { [@expl:type invariant] inv2 node }; assume { resolve1 node }; assert { [@expl:type invariant] inv3 _10 }; assume { resolve2 _10 }; - [#"../red_black_tree.rs" 804 35 806 13] _9 <- ([#"../red_black_tree.rs" 804 35 806 13] ()); + [#"../red_black_tree.rs" 804 35 806 13] _9 <- (); goto BB7 } BB7 { @@ -10144,7 +10144,7 @@ module RedBlackTree_Impl15_Delete assume { resolve2 _10 }; assert { [@expl:type invariant] inv5 key }; assume { resolve3 key }; - [#"../red_black_tree.rs" 808 19 808 23] _0 <- ([#"../red_black_tree.rs" 808 19 808 23] Core_Option_Option_Type.C_None); + [#"../red_black_tree.rs" 808 19 808 23] _0 <- Core_Option_Option_Type.C_None; assert { [@expl:type invariant] inv6 self }; assume { resolve4 self }; goto BB17 @@ -10160,7 +10160,7 @@ module RedBlackTree_Impl15_Delete end } BB11 { - [#"../red_black_tree.rs" 812 48 812 53] _23 <- ([#"../red_black_tree.rs" 812 48 812 53] RedBlackTree_Color_Type.C_Black); + [#"../red_black_tree.rs" 812 48 812 53] _23 <- RedBlackTree_Color_Type.C_Black; [#"../red_black_tree.rs" 812 12 812 21] _26 <- Borrow.borrow_final (RedBlackTree_Tree_Type.tree_node ( * self)) (Borrow.inherit_id (Borrow.get_id self) 1); [#"../red_black_tree.rs" 812 12 812 21] self <- { self with current = (let RedBlackTree_Tree_Type.C_Tree x0 = * self in RedBlackTree_Tree_Type.C_Tree ( ^ _26)) ; }; assume { inv0 ( ^ _26) }; @@ -10174,23 +10174,23 @@ module RedBlackTree_Impl15_Delete goto BB13 } BB13 { - [#"../red_black_tree.rs" 812 12 812 53] _24 <- { _24 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _24 in RedBlackTree_Node_Type.C_Node x0 ([#"../red_black_tree.rs" 812 12 812 53] _23) x2 x3 x4) ; }; + [#"../red_black_tree.rs" 812 12 812 53] _24 <- { _24 with current = (let RedBlackTree_Node_Type.C_Node x0 x1 x2 x3 x4 = * _24 in RedBlackTree_Node_Type.C_Node x0 _23 x2 x3 x4) ; }; _23 <- any RedBlackTree_Color_Type.t_color; assert { [@expl:type invariant] inv2 _24 }; assume { resolve1 _24 }; assert { [@expl:type invariant] inv6 self }; assume { resolve4 self }; - [#"../red_black_tree.rs" 811 25 813 9] _20 <- ([#"../red_black_tree.rs" 811 25 813 9] ()); + [#"../red_black_tree.rs" 811 25 813 9] _20 <- (); goto BB15 } BB14 { assert { [@expl:type invariant] inv6 self }; assume { resolve4 self }; - [#"../red_black_tree.rs" 813 9 813 9] _20 <- ([#"../red_black_tree.rs" 813 9 813 9] ()); + [#"../red_black_tree.rs" 813 9 813 9] _20 <- (); goto BB15 } BB15 { - [#"../red_black_tree.rs" 814 8 814 9] _0 <- ([#"../red_black_tree.rs" 814 8 814 9] r); + [#"../red_black_tree.rs" 814 8 814 9] _0 <- r; r <- any Core_Option_Option_Type.t_option (k, v); goto BB16 } @@ -10614,7 +10614,7 @@ module RedBlackTree_Impl15_Get } BB1 { assume { resolve0 _6 }; - [#"../red_black_tree.rs" 825 23 825 27] tree <- ([#"../red_black_tree.rs" 825 23 825 27] self); + [#"../red_black_tree.rs" 825 23 825 27] tree <- self; assert { [@expl:type invariant] inv0 self }; assume { resolve1 self }; goto BB2 @@ -10625,7 +10625,7 @@ module RedBlackTree_Impl15_Get goto BB3 } BB3 { - [#"../red_black_tree.rs" 828 31 828 41] _13 <- ([#"../red_black_tree.rs" 828 31 828 41] RedBlackTree_Tree_Type.tree_node tree); + [#"../red_black_tree.rs" 828 31 828 41] _13 <- RedBlackTree_Tree_Type.tree_node tree; assert { [@expl:type invariant] inv0 tree }; assume { resolve1 tree }; switch (_13) @@ -10637,10 +10637,10 @@ module RedBlackTree_Impl15_Get goto BB5 } BB5 { - [#"../red_black_tree.rs" 828 23 828 27] node <- ([#"../red_black_tree.rs" 828 23 828 27] Core_Option_Option_Type.some_0 _13); + [#"../red_black_tree.rs" 828 23 828 27] node <- Core_Option_Option_Type.some_0 _13; assert { [@expl:type invariant] inv2 _13 }; assume { resolve2 _13 }; - [#"../red_black_tree.rs" 829 26 829 35] _19 <- ([#"../red_black_tree.rs" 829 26 829 35] RedBlackTree_Node_Type.node_key node); + [#"../red_black_tree.rs" 829 26 829 35] _19 <- RedBlackTree_Node_Type.node_key node; assert { [@expl:type invariant] inv3 _19 }; assume { resolve3 _19 }; [#"../red_black_tree.rs" 829 18 829 36] _16 <- ([#"../red_black_tree.rs" 829 18 829 36] cmp0 key _19); @@ -10660,13 +10660,13 @@ module RedBlackTree_Impl15_Get goto BB12 } BB9 { - [#"../red_black_tree.rs" 832 34 832 45] _27 <- ([#"../red_black_tree.rs" 832 34 832 45] RedBlackTree_Node_Type.node_right node); + [#"../red_black_tree.rs" 832 34 832 45] _27 <- RedBlackTree_Node_Type.node_right node; assert { [@expl:type invariant] inv4 node }; assume { resolve4 node }; assert { [@expl:type invariant] inv0 _27 }; assume { resolve1 _27 }; - [#"../red_black_tree.rs" 832 27 832 45] tree <- ([#"../red_black_tree.rs" 832 27 832 45] _27); - [#"../red_black_tree.rs" 832 27 832 45] _12 <- ([#"../red_black_tree.rs" 832 27 832 45] ()); + [#"../red_black_tree.rs" 832 27 832 45] tree <- _27; + [#"../red_black_tree.rs" 832 27 832 45] _12 <- (); goto BB13 } BB10 { @@ -10678,24 +10678,24 @@ module RedBlackTree_Impl15_Get absurd } BB11 { - [#"../red_black_tree.rs" 830 31 830 41] _22 <- ([#"../red_black_tree.rs" 830 31 830 41] RedBlackTree_Node_Type.node_left node); + [#"../red_black_tree.rs" 830 31 830 41] _22 <- RedBlackTree_Node_Type.node_left node; assert { [@expl:type invariant] inv4 node }; assume { resolve4 node }; assert { [@expl:type invariant] inv0 _22 }; assume { resolve1 _22 }; - [#"../red_black_tree.rs" 830 24 830 41] tree <- ([#"../red_black_tree.rs" 830 24 830 41] _22); - [#"../red_black_tree.rs" 830 24 830 41] _12 <- ([#"../red_black_tree.rs" 830 24 830 41] ()); + [#"../red_black_tree.rs" 830 24 830 41] tree <- _22; + [#"../red_black_tree.rs" 830 24 830 41] _12 <- (); goto BB13 } BB12 { assert { [@expl:type invariant] inv3 key }; assume { resolve3 key }; - [#"../red_black_tree.rs" 831 37 831 46] _25 <- ([#"../red_black_tree.rs" 831 37 831 46] RedBlackTree_Node_Type.node_val node); + [#"../red_black_tree.rs" 831 37 831 46] _25 <- RedBlackTree_Node_Type.node_val node; assert { [@expl:type invariant] inv4 node }; assume { resolve4 node }; assert { [@expl:type invariant] inv5 _25 }; assume { resolve5 _25 }; - [#"../red_black_tree.rs" 831 32 831 47] _0 <- ([#"../red_black_tree.rs" 831 32 831 47] Core_Option_Option_Type.C_Some _25); + [#"../red_black_tree.rs" 831 32 831 47] _0 <- Core_Option_Option_Type.C_Some _25; goto BB15 } BB13 { @@ -10706,7 +10706,7 @@ module RedBlackTree_Impl15_Get assume { resolve2 _13 }; assert { [@expl:type invariant] inv3 key }; assume { resolve3 key }; - [#"../red_black_tree.rs" 835 15 835 19] _0 <- ([#"../red_black_tree.rs" 835 15 835 19] Core_Option_Option_Type.C_None); + [#"../red_black_tree.rs" 835 15 835 19] _0 <- Core_Option_Option_Type.C_None; goto BB15 } BB15 { @@ -11186,7 +11186,7 @@ module RedBlackTree_Impl15_GetMut BB2 { assert { [@expl:type invariant] inv0 old_self }; assume { resolve1 old_self }; - [#"../red_black_tree.rs" 848 23 848 27] tree <- ([#"../red_black_tree.rs" 848 23 848 27] self); + [#"../red_black_tree.rs" 848 23 848 27] tree <- self; self <- any borrowed (RedBlackTree_Tree_Type.t_tree k v); goto BB3 } @@ -11218,7 +11218,7 @@ module RedBlackTree_Impl15_GetMut [#"../red_black_tree.rs" 862 23 862 27] node <- Borrow.borrow_final (Core_Option_Option_Type.some_0 ( * _23)) (Borrow.inherit_id (Borrow.get_id _23) 1); [#"../red_black_tree.rs" 862 23 862 27] _23 <- { _23 with current = (let Core_Option_Option_Type.C_Some x0 = * _23 in Core_Option_Option_Type.C_Some ( ^ node)) ; }; assume { inv4 ( ^ node) }; - [#"../red_black_tree.rs" 863 26 863 35] _29 <- ([#"../red_black_tree.rs" 863 26 863 35] RedBlackTree_Node_Type.node_key ( * node)); + [#"../red_black_tree.rs" 863 26 863 35] _29 <- RedBlackTree_Node_Type.node_key ( * node); assert { [@expl:type invariant] inv5 _29 }; assume { resolve2 _29 }; [#"../red_black_tree.rs" 863 18 863 36] _26 <- ([#"../red_black_tree.rs" 863 18 863 36] cmp0 key _29); @@ -11246,9 +11246,9 @@ module RedBlackTree_Impl15_GetMut assume { inv6 ( ^ _36) }; assert { [@expl:type invariant] inv7 tree }; assume { resolve3 tree }; - [#"../red_black_tree.rs" 866 27 866 49] tree <- ([#"../red_black_tree.rs" 866 27 866 49] _36); + [#"../red_black_tree.rs" 866 27 866 49] tree <- _36; _36 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v); - [#"../red_black_tree.rs" 866 27 866 49] _22 <- ([#"../red_black_tree.rs" 866 27 866 49] ()); + [#"../red_black_tree.rs" 866 27 866 49] _22 <- (); assert { [@expl:type invariant] inv7 _37 }; assume { resolve3 _37 }; goto BB14 @@ -11274,9 +11274,9 @@ module RedBlackTree_Impl15_GetMut assume { inv6 ( ^ _31) }; assert { [@expl:type invariant] inv7 tree }; assume { resolve3 tree }; - [#"../red_black_tree.rs" 864 24 864 45] tree <- ([#"../red_black_tree.rs" 864 24 864 45] _31); + [#"../red_black_tree.rs" 864 24 864 45] tree <- _31; _31 <- any borrowed (RedBlackTree_Tree_Type.t_tree k v); - [#"../red_black_tree.rs" 864 24 864 45] _22 <- ([#"../red_black_tree.rs" 864 24 864 45] ()); + [#"../red_black_tree.rs" 864 24 864 45] _22 <- (); assert { [@expl:type invariant] inv7 _32 }; assume { resolve3 _32 }; goto BB14 @@ -11290,7 +11290,7 @@ module RedBlackTree_Impl15_GetMut [#"../red_black_tree.rs" 865 37 865 50] _34 <- Borrow.borrow_final ( * _35) (Borrow.get_id _35); [#"../red_black_tree.rs" 865 37 865 50] _35 <- { _35 with current = ( ^ _34) ; }; assume { inv1 ( ^ _34) }; - [#"../red_black_tree.rs" 865 32 865 51] _0 <- ([#"../red_black_tree.rs" 865 32 865 51] Core_Option_Option_Type.C_Some _34); + [#"../red_black_tree.rs" 865 32 865 51] _0 <- Core_Option_Option_Type.C_Some _34; _34 <- any borrowed v; assert { [@expl:type invariant] inv8 _35 }; assume { resolve4 _35 }; @@ -11312,7 +11312,7 @@ module RedBlackTree_Impl15_GetMut assume { resolve6 _23 }; assert { [@expl:type invariant] inv5 key }; assume { resolve2 key }; - [#"../red_black_tree.rs" 869 15 869 19] _0 <- ([#"../red_black_tree.rs" 869 15 869 19] Core_Option_Option_Type.C_None); + [#"../red_black_tree.rs" 869 15 869 19] _0 <- Core_Option_Option_Type.C_None; goto BB16 } BB16 { diff --git a/creusot/tests/should_succeed/replace.mlcfg b/creusot/tests/should_succeed/replace.mlcfg index f360de269f..0a65696e4f 100644 --- a/creusot/tests/should_succeed/replace.mlcfg +++ b/creusot/tests/should_succeed/replace.mlcfg @@ -28,12 +28,12 @@ module Replace_Test goto BB1 } BB1 { - [#"../replace.rs" 9 4 9 6] _a <- ([#"../replace.rs" 9 4 9 6] b); + [#"../replace.rs" 9 4 9 6] _a <- b; b <- any Replace_Something_Type.t_something; goto BB3 } BB3 { - [#"../replace.rs" 8 45 10 1] _0 <- ([#"../replace.rs" 8 45 10 1] ()); + [#"../replace.rs" 8 45 10 1] _0 <- (); goto BB4 } BB4 { diff --git a/creusot/tests/should_succeed/resolve_uninit.mlcfg b/creusot/tests/should_succeed/resolve_uninit.mlcfg index f4307d233b..1fb541256e 100644 --- a/creusot/tests/should_succeed/resolve_uninit.mlcfg +++ b/creusot/tests/should_succeed/resolve_uninit.mlcfg @@ -50,30 +50,30 @@ module ResolveUninit_MaybeUninit goto BB3 } BB3 { - [#"../resolve_uninit.rs" 8 8 8 9] x <- ([#"../resolve_uninit.rs" 8 8 8 9] _6); + [#"../resolve_uninit.rs" 8 8 8 9] x <- _6; _6 <- any t; assert { [@expl:type invariant] inv0 x }; assume { resolve0 x }; goto BB5 } BB5 { - [#"../resolve_uninit.rs" 7 9 9 5] _4 <- ([#"../resolve_uninit.rs" 7 9 9 5] ()); + [#"../resolve_uninit.rs" 7 9 9 5] _4 <- (); goto BB7 } BB6 { - [#"../resolve_uninit.rs" 9 5 9 5] _4 <- ([#"../resolve_uninit.rs" 9 5 9 5] ()); + [#"../resolve_uninit.rs" 9 5 9 5] _4 <- (); goto BB7 } BB7 { goto BB8 } BB8 { - [#"../resolve_uninit.rs" 11 4 11 5] x <- ([#"../resolve_uninit.rs" 11 4 11 5] y); + [#"../resolve_uninit.rs" 11 4 11 5] x <- y; y <- any t; goto BB10 } BB10 { - [#"../resolve_uninit.rs" 12 4 12 5] _0 <- ([#"../resolve_uninit.rs" 12 4 12 5] x); + [#"../resolve_uninit.rs" 12 4 12 5] _0 <- x; x <- any t; goto BB11 } @@ -124,17 +124,17 @@ module ResolveUninit_InitJoin [#"../resolve_uninit.rs" 20 12 20 18] x <- ^ _8; [#"../resolve_uninit.rs" 20 12 20 18] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8); [#"../resolve_uninit.rs" 20 12 20 18] _8 <- { _8 with current = ( ^ _7) ; }; - [#"../resolve_uninit.rs" 20 8 20 18] z <- ([#"../resolve_uninit.rs" 20 8 20 18] _7); + [#"../resolve_uninit.rs" 20 8 20 18] z <- _7; _7 <- any borrowed int32; assume { resolve0 _8 }; [#"../resolve_uninit.rs" 21 12 21 19] _10 <- Borrow.borrow_final ( * z) (Borrow.get_id z); [#"../resolve_uninit.rs" 21 12 21 19] z <- { z with current = ( ^ _10) ; }; [#"../resolve_uninit.rs" 21 12 21 19] _9 <- Borrow.borrow_final ( * _10) (Borrow.get_id _10); [#"../resolve_uninit.rs" 21 12 21 19] _10 <- { _10 with current = ( ^ _9) ; }; - [#"../resolve_uninit.rs" 21 8 21 19] y <- ([#"../resolve_uninit.rs" 21 8 21 19] _9); + [#"../resolve_uninit.rs" 21 8 21 19] y <- _9; _9 <- any borrowed int32; assume { resolve0 _10 }; - [#"../resolve_uninit.rs" 19 9 23 5] _5 <- ([#"../resolve_uninit.rs" 19 9 23 5] ()); + [#"../resolve_uninit.rs" 19 9 23 5] _5 <- (); goto BB7 } BB2 { @@ -142,23 +142,23 @@ module ResolveUninit_InitJoin [#"../resolve_uninit.rs" 24 12 24 18] x <- ^ _12; [#"../resolve_uninit.rs" 24 12 24 18] _11 <- Borrow.borrow_final ( * _12) (Borrow.get_id _12); [#"../resolve_uninit.rs" 24 12 24 18] _12 <- { _12 with current = ( ^ _11) ; }; - [#"../resolve_uninit.rs" 24 8 24 18] y <- ([#"../resolve_uninit.rs" 24 8 24 18] _11); + [#"../resolve_uninit.rs" 24 8 24 18] y <- _11; _11 <- any borrowed int32; assume { resolve0 _12 }; - [#"../resolve_uninit.rs" 23 11 25 5] _5 <- ([#"../resolve_uninit.rs" 23 11 25 5] ()); + [#"../resolve_uninit.rs" 23 11 25 5] _5 <- (); goto BB3 } BB3 { - [#"../resolve_uninit.rs" 27 4 27 10] y <- { y with current = ([#"../resolve_uninit.rs" 27 4 27 10] (5 : int32)) ; }; + [#"../resolve_uninit.rs" 27 4 27 10] y <- { y with current = (5 : int32) ; }; assume { resolve0 y }; - [#"../resolve_uninit.rs" 28 12 28 18] _14 <- ([#"../resolve_uninit.rs" 28 12 28 18] x = (5 : int32)); + [#"../resolve_uninit.rs" 28 12 28 18] _14 <- x = (5 : int32); switch (_14) | False -> goto BB5 | True -> goto BB4 end } BB4 { - [#"../resolve_uninit.rs" 15 38 29 1] _0 <- ([#"../resolve_uninit.rs" 15 38 29 1] ()); + [#"../resolve_uninit.rs" 15 38 29 1] _0 <- (); return _0 } BB5 { diff --git a/creusot/tests/should_succeed/result/own.mlcfg b/creusot/tests/should_succeed/result/own.mlcfg index 6371b85504..73c88dbc4a 100644 --- a/creusot/tests/should_succeed/result/own.mlcfg +++ b/creusot/tests/should_succeed/result/own.mlcfg @@ -134,7 +134,7 @@ module Own_Impl0_IsErr goto BB1 } BB1 { - [#"../own.rs" 31 8 31 21] _0 <- ([#"../own.rs" 31 8 31 21] not _3); + [#"../own.rs" 31 8 31 21] _0 <- not _3; _3 <- any bool; return _0 } @@ -238,13 +238,13 @@ module Own_Impl0_Ok goto BB6 } BB4 { - [#"../own.rs" 40 27 40 28] x1 <- ([#"../own.rs" 40 27 40 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 40 27 40 28] x1 <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv1 x1 }; assume { resolve1 x1 }; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 40 33 40 37] _0 <- ([#"../own.rs" 40 33 40 37] Core_Option_Option_Type.C_None); + [#"../own.rs" 40 33 40 37] _0 <- Core_Option_Option_Type.C_None; goto BB9 } BB5 { @@ -254,11 +254,11 @@ module Own_Impl0_Ok absurd } BB6 { - [#"../own.rs" 38 26 38 27] x <- ([#"../own.rs" 38 26 38 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 38 26 38 27] x <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 38 32 38 39] _0 <- ([#"../own.rs" 38 32 38 39] Core_Option_Option_Type.C_Some x); + [#"../own.rs" 38 32 38 39] _0 <- Core_Option_Option_Type.C_Some x; x <- any t; goto BB7 } @@ -366,11 +366,11 @@ module Own_Impl0_Err goto BB6 } BB4 { - [#"../own.rs" 50 27 50 28] x1 <- ([#"../own.rs" 50 27 50 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 50 27 50 28] x1 <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 50 33 50 40] _0 <- ([#"../own.rs" 50 33 50 40] Core_Option_Option_Type.C_Some x1); + [#"../own.rs" 50 33 50 40] _0 <- Core_Option_Option_Type.C_Some x1; x1 <- any e; goto BB8 } @@ -381,13 +381,13 @@ module Own_Impl0_Err absurd } BB6 { - [#"../own.rs" 49 26 49 27] x <- ([#"../own.rs" 49 26 49 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 49 26 49 27] x <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv0 x }; assume { resolve0 x }; assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 49 32 49 36] _0 <- ([#"../own.rs" 49 32 49 36] Core_Option_Option_Type.C_None); + [#"../own.rs" 49 32 49 36] _0 <- Core_Option_Option_Type.C_None; goto BB7 } BB7 { @@ -484,12 +484,12 @@ module Own_Impl0_AsRef goto BB4 } BB2 { - [#"../own.rs" 59 27 59 32] x1 <- ([#"../own.rs" 59 27 59 32] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 59 27 59 32] x1 <- Own_OwnResult_Type.err_0 self; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; assert { [@expl:type invariant] inv2 x1 }; assume { resolve2 x1 }; - [#"../own.rs" 59 37 59 54] _0 <- ([#"../own.rs" 59 37 59 54] Own_OwnResult_Type.C_Err x1); + [#"../own.rs" 59 37 59 54] _0 <- Own_OwnResult_Type.C_Err x1; goto BB5 } BB3 { @@ -499,12 +499,12 @@ module Own_Impl0_AsRef absurd } BB4 { - [#"../own.rs" 58 26 58 31] x <- ([#"../own.rs" 58 26 58 31] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 58 26 58 31] x <- Own_OwnResult_Type.ok_0 self; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; assert { [@expl:type invariant] inv1 x }; assume { resolve1 x }; - [#"../own.rs" 58 36 58 52] _0 <- ([#"../own.rs" 58 36 58 52] Own_OwnResult_Type.C_Ok x); + [#"../own.rs" 58 36 58 52] _0 <- Own_OwnResult_Type.C_Ok x; goto BB5 } BB5 { @@ -617,7 +617,7 @@ module Own_Impl0_AsMut [#"../own.rs" 74 56 74 57] _7 <- Borrow.borrow_final ( * x1) (Borrow.get_id x1); [#"../own.rs" 74 56 74 57] x1 <- { x1 with current = ( ^ _7) ; }; assume { inv2 ( ^ _7) }; - [#"../own.rs" 74 41 74 58] _0 <- ([#"../own.rs" 74 41 74 58] Own_OwnResult_Type.C_Err _7); + [#"../own.rs" 74 41 74 58] _0 <- Own_OwnResult_Type.C_Err _7; _7 <- any borrowed e; assert { [@expl:type invariant] inv3 x1 }; assume { resolve1 x1 }; @@ -636,7 +636,7 @@ module Own_Impl0_AsMut [#"../own.rs" 73 54 73 55] _5 <- Borrow.borrow_final ( * x) (Borrow.get_id x); [#"../own.rs" 73 54 73 55] x <- { x with current = ( ^ _5) ; }; assume { inv0 ( ^ _5) }; - [#"../own.rs" 73 40 73 56] _0 <- ([#"../own.rs" 73 40 73 56] Own_OwnResult_Type.C_Ok _5); + [#"../own.rs" 73 40 73 56] _0 <- Own_OwnResult_Type.C_Ok _5; _5 <- any borrowed t; assert { [@expl:type invariant] inv1 x }; assume { resolve0 x }; @@ -726,7 +726,7 @@ module Own_Impl0_Unwrap goto BB6 } BB4 { - [#"../own.rs" 86 27 86 29] _e <- ([#"../own.rs" 86 27 86 29] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 86 27 86 29] _e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv1 _e }; assume { resolve1 _e }; @@ -742,11 +742,11 @@ module Own_Impl0_Unwrap absurd } BB6 { - [#"../own.rs" 85 26 85 27] t <- ([#"../own.rs" 85 26 85 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 85 26 85 27] t <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 85 32 85 33] _0 <- ([#"../own.rs" 85 32 85 33] t); + [#"../own.rs" 85 32 85 33] _0 <- t; t <- any t; goto BB7 } @@ -836,7 +836,7 @@ module Own_Impl0_Expect goto BB6 } BB4 { - [#"../own.rs" 98 27 98 29] _e <- ([#"../own.rs" 98 27 98 29] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 98 27 98 29] _e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv1 _e }; assume { resolve1 _e }; @@ -852,11 +852,11 @@ module Own_Impl0_Expect absurd } BB6 { - [#"../own.rs" 97 26 97 27] t <- ([#"../own.rs" 97 26 97 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 97 26 97 27] t <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 97 32 97 33] _0 <- ([#"../own.rs" 97 32 97 33] t); + [#"../own.rs" 97 32 97 33] _0 <- t; t <- any t; goto BB7 } @@ -945,11 +945,11 @@ module Own_Impl0_UnwrapErr goto BB6 } BB4 { - [#"../own.rs" 110 27 110 28] e <- ([#"../own.rs" 110 27 110 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 110 27 110 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 110 33 110 34] _0 <- ([#"../own.rs" 110 33 110 34] e); + [#"../own.rs" 110 33 110 34] _0 <- e; e <- any e; goto BB7 } @@ -960,7 +960,7 @@ module Own_Impl0_UnwrapErr absurd } BB6 { - [#"../own.rs" 109 26 109 28] _t <- ([#"../own.rs" 109 26 109 28] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 109 26 109 28] _t <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv0 _t }; assume { resolve0 _t }; @@ -1056,13 +1056,13 @@ module Own_Impl0_UnwrapOr goto BB6 } BB4 { - [#"../own.rs" 120 27 120 28] e <- ([#"../own.rs" 120 27 120 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 120 27 120 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv2 e }; assume { resolve2 e }; assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 120 33 120 40] _0 <- ([#"../own.rs" 120 33 120 40] default); + [#"../own.rs" 120 33 120 40] _0 <- default; default <- any t; goto BB8 } @@ -1077,11 +1077,11 @@ module Own_Impl0_UnwrapOr BB6 { assert { [@expl:type invariant] inv0 default }; assume { resolve0 default }; - [#"../own.rs" 118 26 118 27] t <- ([#"../own.rs" 118 26 118 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 118 26 118 27] t <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 118 32 118 33] _0 <- ([#"../own.rs" 118 32 118 33] t); + [#"../own.rs" 118 32 118 33] _0 <- t; t <- any t; goto BB7 } @@ -1198,11 +1198,11 @@ module Own_Impl0_UnwrapOrDefault absurd } BB6 { - [#"../own.rs" 131 26 131 27] x <- ([#"../own.rs" 131 26 131 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 131 26 131 27] x <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 131 32 131 33] _0 <- ([#"../own.rs" 131 32 131 33] x); + [#"../own.rs" 131 32 131 33] _0 <- x; x <- any t; goto BB7 } @@ -1320,11 +1320,11 @@ module Own_Impl0_And BB4 { assert { [@expl:type invariant] inv2 res }; assume { resolve2 res }; - [#"../own.rs" 142 27 142 28] e <- ([#"../own.rs" 142 27 142 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 142 27 142 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 142 33 142 50] _0 <- ([#"../own.rs" 142 33 142 50] Own_OwnResult_Type.C_Err e); + [#"../own.rs" 142 33 142 50] _0 <- Own_OwnResult_Type.C_Err e; e <- any e; goto BB8 } @@ -1337,13 +1337,13 @@ module Own_Impl0_And absurd } BB6 { - [#"../own.rs" 141 26 141 27] x <- ([#"../own.rs" 141 26 141 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 141 26 141 27] x <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv0 x }; assume { resolve0 x }; assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 141 32 141 35] _0 <- ([#"../own.rs" 141 32 141 35] res); + [#"../own.rs" 141 32 141 35] _0 <- res; res <- any Own_OwnResult_Type.t_ownresult u e; goto BB7 } @@ -1468,13 +1468,13 @@ module Own_Impl0_Or goto BB6 } BB4 { - [#"../own.rs" 152 27 152 28] e <- ([#"../own.rs" 152 27 152 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 152 27 152 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv2 e }; assume { resolve2 e }; assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 152 33 152 36] _0 <- ([#"../own.rs" 152 33 152 36] res); + [#"../own.rs" 152 33 152 36] _0 <- res; res <- any Own_OwnResult_Type.t_ownresult t f; goto BB9 } @@ -1489,11 +1489,11 @@ module Own_Impl0_Or BB6 { assert { [@expl:type invariant] inv0 res }; assume { resolve0 res }; - [#"../own.rs" 150 26 150 27] v <- ([#"../own.rs" 150 26 150 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 150 26 150 27] v <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any t)); assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../own.rs" 150 32 150 48] _0 <- ([#"../own.rs" 150 32 150 48] Own_OwnResult_Type.C_Ok v); + [#"../own.rs" 150 32 150 48] _0 <- Own_OwnResult_Type.C_Ok v; v <- any t; goto BB7 } @@ -1604,11 +1604,11 @@ module Own_Impl1_Copied goto BB6 } BB4 { - [#"../own.rs" 167 27 167 28] e <- ([#"../own.rs" 167 27 167 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 167 27 167 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 167 33 167 50] _0 <- ([#"../own.rs" 167 33 167 50] Own_OwnResult_Type.C_Err e); + [#"../own.rs" 167 33 167 50] _0 <- Own_OwnResult_Type.C_Err e; e <- any e; goto BB7 } @@ -1619,12 +1619,12 @@ module Own_Impl1_Copied absurd } BB6 { - [#"../own.rs" 166 26 166 27] t <- ([#"../own.rs" 166 26 166 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 166 26 166 27] t <- Own_OwnResult_Type.ok_0 self; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; assert { [@expl:type invariant] inv1 t }; assume { resolve1 t }; - [#"../own.rs" 166 32 166 49] _0 <- ([#"../own.rs" 166 32 166 49] Own_OwnResult_Type.C_Ok t); + [#"../own.rs" 166 32 166 49] _0 <- Own_OwnResult_Type.C_Ok t; goto BB9 } BB7 { @@ -1743,11 +1743,11 @@ module Own_Impl1_Cloned goto BB6 } BB4 { - [#"../own.rs" 180 27 180 28] e <- ([#"../own.rs" 180 27 180 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 180 27 180 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 180 33 180 50] _0 <- ([#"../own.rs" 180 33 180 50] Own_OwnResult_Type.C_Err e); + [#"../own.rs" 180 33 180 50] _0 <- Own_OwnResult_Type.C_Err e; e <- any e; goto BB9 } @@ -1758,7 +1758,7 @@ module Own_Impl1_Cloned absurd } BB6 { - [#"../own.rs" 179 26 179 27] t <- ([#"../own.rs" 179 26 179 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 179 26 179 27] t <- Own_OwnResult_Type.ok_0 self; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; assert { [@expl:type invariant] inv1 t }; @@ -1767,7 +1767,7 @@ module Own_Impl1_Cloned goto BB7 } BB7 { - [#"../own.rs" 179 32 179 56] _0 <- ([#"../own.rs" 179 32 179 56] Own_OwnResult_Type.C_Ok _6); + [#"../own.rs" 179 32 179 56] _0 <- Own_OwnResult_Type.C_Ok _6; _6 <- any t; goto BB8 } @@ -1876,11 +1876,11 @@ module Own_Impl2_Copied goto BB6 } BB4 { - [#"../own.rs" 195 27 195 28] e <- ([#"../own.rs" 195 27 195 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 195 27 195 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 195 33 195 50] _0 <- ([#"../own.rs" 195 33 195 50] Own_OwnResult_Type.C_Err e); + [#"../own.rs" 195 33 195 50] _0 <- Own_OwnResult_Type.C_Err e; e <- any e; goto BB7 } @@ -1891,13 +1891,13 @@ module Own_Impl2_Copied absurd } BB6 { - [#"../own.rs" 194 26 194 27] t <- ([#"../own.rs" 194 26 194 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 194 26 194 27] t <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any borrowed t)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; assert { [@expl:type invariant] inv1 t }; assume { resolve1 t }; - [#"../own.rs" 194 32 194 49] _0 <- ([#"../own.rs" 194 32 194 49] Own_OwnResult_Type.C_Ok ( * t)); + [#"../own.rs" 194 32 194 49] _0 <- Own_OwnResult_Type.C_Ok ( * t); goto BB9 } BB7 { @@ -2026,11 +2026,11 @@ module Own_Impl2_Cloned goto BB6 } BB4 { - [#"../own.rs" 208 27 208 28] e <- ([#"../own.rs" 208 27 208 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 208 27 208 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 208 33 208 50] _0 <- ([#"../own.rs" 208 33 208 50] Own_OwnResult_Type.C_Err e); + [#"../own.rs" 208 33 208 50] _0 <- Own_OwnResult_Type.C_Err e; e <- any e; goto BB9 } @@ -2041,7 +2041,7 @@ module Own_Impl2_Cloned absurd } BB6 { - [#"../own.rs" 207 26 207 27] t <- ([#"../own.rs" 207 26 207 27] Own_OwnResult_Type.ok_0 self); + [#"../own.rs" 207 26 207 27] t <- Own_OwnResult_Type.ok_0 self; self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (any borrowed t)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; @@ -2051,7 +2051,7 @@ module Own_Impl2_Cloned BB7 { assert { [@expl:type invariant] inv1 t }; assume { resolve1 t }; - [#"../own.rs" 207 32 207 56] _0 <- ([#"../own.rs" 207 32 207 56] Own_OwnResult_Type.C_Ok _6); + [#"../own.rs" 207 32 207 56] _0 <- Own_OwnResult_Type.C_Ok _6; _6 <- any t; goto BB8 } @@ -2182,25 +2182,25 @@ module Own_Impl3_Transpose absurd } BB8 { - [#"../own.rs" 221 27 221 28] e <- ([#"../own.rs" 221 27 221 28] Own_OwnResult_Type.err_0 self); + [#"../own.rs" 221 27 221 28] e <- Own_OwnResult_Type.err_0 self; self <- (let Own_OwnResult_Type.C_Err x0 = self in Own_OwnResult_Type.C_Err (any e)); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 221 38 221 55] _11 <- ([#"../own.rs" 221 38 221 55] Own_OwnResult_Type.C_Err e); + [#"../own.rs" 221 38 221 55] _11 <- Own_OwnResult_Type.C_Err e; e <- any e; goto BB14 } BB9 { - [#"../own.rs" 219 31 219 32] x <- ([#"../own.rs" 219 31 219 32] Core_Option_Option_Type.some_0 (Own_OwnResult_Type.ok_0 self)); + [#"../own.rs" 219 31 219 32] x <- Core_Option_Option_Type.some_0 (Own_OwnResult_Type.ok_0 self); self <- (let Own_OwnResult_Type.C_Ok x0 = self in Own_OwnResult_Type.C_Ok (let Core_Option_Option_Type.C_Some x0 = Own_OwnResult_Type.ok_0 self in Core_Option_Option_Type.C_Some (any t))); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 219 43 219 59] _8 <- ([#"../own.rs" 219 43 219 59] Own_OwnResult_Type.C_Ok x); + [#"../own.rs" 219 43 219 59] _8 <- Own_OwnResult_Type.C_Ok x; x <- any t; goto BB10 } BB10 { - [#"../own.rs" 219 38 219 60] _0 <- ([#"../own.rs" 219 38 219 60] Core_Option_Option_Type.C_Some _8); + [#"../own.rs" 219 38 219 60] _0 <- Core_Option_Option_Type.C_Some _8; _8 <- any Own_OwnResult_Type.t_ownresult t e; goto BB11 } @@ -2213,11 +2213,11 @@ module Own_Impl3_Transpose BB13 { assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../own.rs" 220 35 220 39] _0 <- ([#"../own.rs" 220 35 220 39] Core_Option_Option_Type.C_None); + [#"../own.rs" 220 35 220 39] _0 <- Core_Option_Option_Type.C_None; goto BB17 } BB14 { - [#"../own.rs" 221 33 221 56] _0 <- ([#"../own.rs" 221 33 221 56] Core_Option_Option_Type.C_Some _11); + [#"../own.rs" 221 33 221 56] _0 <- Core_Option_Option_Type.C_Some _11; _11 <- any Own_OwnResult_Type.t_ownresult t e; goto BB15 } diff --git a/creusot/tests/should_succeed/result/result.mlcfg b/creusot/tests/should_succeed/result/result.mlcfg index b01063af64..7b78e425ca 100644 --- a/creusot/tests/should_succeed/result/result.mlcfg +++ b/creusot/tests/should_succeed/result/result.mlcfg @@ -490,8 +490,8 @@ module Result_TestResult goto BB0 } BB0 { - [#"../result.rs" 4 35 4 40] ok <- ([#"../result.rs" 4 35 4 40] Core_Result_Result_Type.C_Ok (1 : int32)); - [#"../result.rs" 5 36 5 43] err <- ([#"../result.rs" 5 36 5 43] Core_Result_Result_Type.C_Err (-1 : int32)); + [#"../result.rs" 4 35 4 40] ok <- Core_Result_Result_Type.C_Ok (1 : int32); + [#"../result.rs" 5 36 5 43] err <- Core_Result_Result_Type.C_Err (-1 : int32); [#"../result.rs" 8 12 8 22] _4 <- ([#"../result.rs" 8 12 8 22] is_ok0 ok); goto BB1 } @@ -561,7 +561,7 @@ module Result_TestResult goto BB16 } BB16 { - [#"../result.rs" 13 12 13 33] _16 <- ([#"../result.rs" 13 12 13 33] _17 = (1 : int32)); + [#"../result.rs" 13 12 13 33] _16 <- _17 = (1 : int32); _17 <- any int32; switch (_16) | False -> goto BB18 @@ -618,7 +618,7 @@ module Result_TestResult goto BB28 } BB28 { - [#"../result.rs" 17 12 17 36] _34 <- ([#"../result.rs" 17 12 17 36] _35 = (-1 : int32)); + [#"../result.rs" 17 12 17 36] _34 <- _35 = (-1 : int32); _35 <- any int32; switch (_34) | False -> goto BB30 @@ -639,7 +639,7 @@ module Result_TestResult goto BB32 } BB32 { - [#"../result.rs" 20 12 20 38] _40 <- ([#"../result.rs" 20 12 20 38] _42 = (1 : int32)); + [#"../result.rs" 20 12 20 38] _40 <- _42 = (1 : int32); switch (_40) | False -> goto BB34 | True -> goto BB33 @@ -659,7 +659,7 @@ module Result_TestResult goto BB36 } BB36 { - [#"../result.rs" 21 12 21 44] _47 <- ([#"../result.rs" 21 12 21 44] _49 = (-1 : int32)); + [#"../result.rs" 21 12 21 44] _47 <- _49 = (-1 : int32); switch (_47) | False -> goto BB38 | True -> goto BB37 @@ -682,13 +682,13 @@ module Result_TestResult goto BB40 } BB40 { - [#"../result.rs" 23 4 23 29] _53 <- { _53 with current = ([#"../result.rs" 23 4 23 29] (0 : int32)) ; }; + [#"../result.rs" 23 4 23 29] _53 <- { _53 with current = (0 : int32) ; }; assume { resolve0 _53 }; [#"../result.rs" 24 12 24 23] _58 <- ([#"../result.rs" 24 12 24 23] unwrap3 ok); goto BB41 } BB41 { - [#"../result.rs" 24 12 24 28] _57 <- ([#"../result.rs" 24 12 24 28] _58 = (0 : int32)); + [#"../result.rs" 24 12 24 28] _57 <- _58 = (0 : int32); _58 <- any int32; switch (_57) | False -> goto BB43 @@ -712,13 +712,13 @@ module Result_TestResult goto BB45 } BB45 { - [#"../result.rs" 25 4 25 29] _61 <- { _61 with current = ([#"../result.rs" 25 4 25 29] (1 : int32)) ; }; + [#"../result.rs" 25 4 25 29] _61 <- { _61 with current = (1 : int32) ; }; assume { resolve0 _61 }; [#"../result.rs" 26 12 26 23] _66 <- ([#"../result.rs" 26 12 26 23] unwrap3 ok); goto BB46 } BB46 { - [#"../result.rs" 26 12 26 28] _65 <- ([#"../result.rs" 26 12 26 28] _66 = (1 : int32)); + [#"../result.rs" 26 12 26 28] _65 <- _66 = (1 : int32); _66 <- any int32; switch (_65) | False -> goto BB48 @@ -742,13 +742,13 @@ module Result_TestResult goto BB50 } BB50 { - [#"../result.rs" 27 4 27 34] _69 <- { _69 with current = ([#"../result.rs" 27 4 27 34] (0 : int32)) ; }; + [#"../result.rs" 27 4 27 34] _69 <- { _69 with current = (0 : int32) ; }; assume { resolve0 _69 }; [#"../result.rs" 28 12 28 28] _74 <- ([#"../result.rs" 28 12 28 28] unwrap_err2 err); goto BB51 } BB51 { - [#"../result.rs" 28 12 28 33] _73 <- ([#"../result.rs" 28 12 28 33] _74 = (0 : int32)); + [#"../result.rs" 28 12 28 33] _73 <- _74 = (0 : int32); _74 <- any int32; switch (_73) | False -> goto BB53 @@ -772,13 +772,13 @@ module Result_TestResult goto BB55 } BB55 { - [#"../result.rs" 29 4 29 35] _77 <- { _77 with current = ([#"../result.rs" 29 4 29 35] (-1 : int32)) ; }; + [#"../result.rs" 29 4 29 35] _77 <- { _77 with current = (-1 : int32) ; }; assume { resolve0 _77 }; [#"../result.rs" 30 12 30 28] _82 <- ([#"../result.rs" 30 12 30 28] unwrap_err2 err); goto BB56 } BB56 { - [#"../result.rs" 30 12 30 34] _81 <- ([#"../result.rs" 30 12 30 34] _82 = (-1 : int32)); + [#"../result.rs" 30 12 30 34] _81 <- _82 = (-1 : int32); _82 <- any int32; switch (_81) | False -> goto BB58 @@ -794,7 +794,7 @@ module Result_TestResult absurd } BB59 { - [#"../result.rs" 33 12 33 28] _86 <- ([#"../result.rs" 33 12 33 28] _87 = (1 : int32)); + [#"../result.rs" 33 12 33 28] _86 <- _87 = (1 : int32); _87 <- any int32; switch (_86) | False -> goto BB61 @@ -810,7 +810,7 @@ module Result_TestResult absurd } BB62 { - [#"../result.rs" 37 12 37 34] _91 <- ([#"../result.rs" 37 12 37 34] _92 = (-1 : int32)); + [#"../result.rs" 37 12 37 34] _91 <- _92 = (-1 : int32); _92 <- any int32; switch (_91) | False -> goto BB64 @@ -826,7 +826,7 @@ module Result_TestResult absurd } BB65 { - [#"../result.rs" 40 12 40 32] _96 <- ([#"../result.rs" 40 12 40 32] _97 = (1 : int32)); + [#"../result.rs" 40 12 40 32] _96 <- _97 = (1 : int32); _97 <- any int32; switch (_96) | False -> goto BB67 @@ -842,7 +842,7 @@ module Result_TestResult absurd } BB68 { - [#"../result.rs" 41 12 41 33] _101 <- ([#"../result.rs" 41 12 41 33] _102 = (0 : int32)); + [#"../result.rs" 41 12 41 33] _101 <- _102 = (0 : int32); _102 <- any int32; switch (_101) | False -> goto BB70 @@ -858,7 +858,7 @@ module Result_TestResult absurd } BB71 { - [#"../result.rs" 43 12 43 39] _106 <- ([#"../result.rs" 43 12 43 39] _107 = (1 : int32)); + [#"../result.rs" 43 12 43 39] _106 <- _107 = (1 : int32); _107 <- any int32; switch (_106) | False -> goto BB73 @@ -874,7 +874,7 @@ module Result_TestResult absurd } BB74 { - [#"../result.rs" 44 12 44 40] _111 <- ([#"../result.rs" 44 12 44 40] _112 = (0 : int32)); + [#"../result.rs" 44 12 44 40] _111 <- _112 = (0 : int32); _112 <- any int32; switch (_111) | False -> goto BB76 @@ -882,7 +882,7 @@ module Result_TestResult end } BB75 { - [#"../result.rs" 47 26 47 33] _120 <- ([#"../result.rs" 47 26 47 33] Core_Result_Result_Type.C_Err (-2 : int32)); + [#"../result.rs" 47 26 47 33] _120 <- Core_Result_Result_Type.C_Err (-2 : int32); [#"../result.rs" 47 12 47 34] _118 <- ([#"../result.rs" 47 12 47 34] and0 ok _120); _120 <- any Core_Result_Result_Type.t_result int32 int32; goto BB77 @@ -897,7 +897,7 @@ module Result_TestResult goto BB78 } BB78 { - [#"../result.rs" 47 12 47 53] _116 <- ([#"../result.rs" 47 12 47 53] _117 = (-2 : int32)); + [#"../result.rs" 47 12 47 53] _116 <- _117 = (-2 : int32); _117 <- any int32; switch (_116) | False -> goto BB80 @@ -905,7 +905,7 @@ module Result_TestResult end } BB79 { - [#"../result.rs" 48 19 48 24] _127 <- ([#"../result.rs" 48 19 48 24] Core_Result_Result_Type.C_Ok (2 : int32)); + [#"../result.rs" 48 19 48 24] _127 <- Core_Result_Result_Type.C_Ok (2 : int32); [#"../result.rs" 48 12 48 25] _125 <- ([#"../result.rs" 48 12 48 25] and0 ok _127); _127 <- any Core_Result_Result_Type.t_result int32 int32; goto BB81 @@ -920,7 +920,7 @@ module Result_TestResult goto BB82 } BB82 { - [#"../result.rs" 48 12 48 39] _123 <- ([#"../result.rs" 48 12 48 39] _124 = (2 : int32)); + [#"../result.rs" 48 12 48 39] _123 <- _124 = (2 : int32); _124 <- any int32; switch (_123) | False -> goto BB84 @@ -928,7 +928,7 @@ module Result_TestResult end } BB83 { - [#"../result.rs" 49 27 49 34] _134 <- ([#"../result.rs" 49 27 49 34] Core_Result_Result_Type.C_Err (-2 : int32)); + [#"../result.rs" 49 27 49 34] _134 <- Core_Result_Result_Type.C_Err (-2 : int32); [#"../result.rs" 49 12 49 35] _132 <- ([#"../result.rs" 49 12 49 35] and0 err _134); _134 <- any Core_Result_Result_Type.t_result int32 int32; goto BB85 @@ -943,7 +943,7 @@ module Result_TestResult goto BB86 } BB86 { - [#"../result.rs" 49 12 49 54] _130 <- ([#"../result.rs" 49 12 49 54] _131 = (-1 : int32)); + [#"../result.rs" 49 12 49 54] _130 <- _131 = (-1 : int32); _131 <- any int32; switch (_130) | False -> goto BB88 @@ -951,7 +951,7 @@ module Result_TestResult end } BB87 { - [#"../result.rs" 50 20 50 25] _141 <- ([#"../result.rs" 50 20 50 25] Core_Result_Result_Type.C_Ok (2 : int32)); + [#"../result.rs" 50 20 50 25] _141 <- Core_Result_Result_Type.C_Ok (2 : int32); [#"../result.rs" 50 12 50 26] _139 <- ([#"../result.rs" 50 12 50 26] and0 err _141); _141 <- any Core_Result_Result_Type.t_result int32 int32; goto BB89 @@ -966,7 +966,7 @@ module Result_TestResult goto BB90 } BB90 { - [#"../result.rs" 50 12 50 45] _137 <- ([#"../result.rs" 50 12 50 45] _138 = (-1 : int32)); + [#"../result.rs" 50 12 50 45] _137 <- _138 = (-1 : int32); _138 <- any int32; switch (_137) | False -> goto BB92 @@ -974,7 +974,7 @@ module Result_TestResult end } BB91 { - [#"../result.rs" 53 18 53 25] _148 <- ([#"../result.rs" 53 18 53 25] Core_Result_Result_Type.C_Err (-2 : int32)); + [#"../result.rs" 53 18 53 25] _148 <- Core_Result_Result_Type.C_Err (-2 : int32); [#"../result.rs" 53 12 53 26] _146 <- ([#"../result.rs" 53 12 53 26] or0 ok _148); _148 <- any Core_Result_Result_Type.t_result int32 int32; goto BB93 @@ -989,7 +989,7 @@ module Result_TestResult goto BB94 } BB94 { - [#"../result.rs" 53 12 53 40] _144 <- ([#"../result.rs" 53 12 53 40] _145 = (1 : int32)); + [#"../result.rs" 53 12 53 40] _144 <- _145 = (1 : int32); _145 <- any int32; switch (_144) | False -> goto BB96 @@ -997,7 +997,7 @@ module Result_TestResult end } BB95 { - [#"../result.rs" 54 25 54 30] _155 <- ([#"../result.rs" 54 25 54 30] Core_Result_Result_Type.C_Ok (2 : int32)); + [#"../result.rs" 54 25 54 30] _155 <- Core_Result_Result_Type.C_Ok (2 : int32); [#"../result.rs" 54 12 54 31] _153 <- ([#"../result.rs" 54 12 54 31] or0 ok _155); _155 <- any Core_Result_Result_Type.t_result int32 int32; goto BB97 @@ -1012,7 +1012,7 @@ module Result_TestResult goto BB98 } BB98 { - [#"../result.rs" 54 12 54 45] _151 <- ([#"../result.rs" 54 12 54 45] _152 = (1 : int32)); + [#"../result.rs" 54 12 54 45] _151 <- _152 = (1 : int32); _152 <- any int32; switch (_151) | False -> goto BB100 @@ -1020,7 +1020,7 @@ module Result_TestResult end } BB99 { - [#"../result.rs" 55 19 55 26] _162 <- ([#"../result.rs" 55 19 55 26] Core_Result_Result_Type.C_Err (-2 : int32)); + [#"../result.rs" 55 19 55 26] _162 <- Core_Result_Result_Type.C_Err (-2 : int32); [#"../result.rs" 55 12 55 27] _160 <- ([#"../result.rs" 55 12 55 27] or0 err _162); _162 <- any Core_Result_Result_Type.t_result int32 int32; goto BB101 @@ -1035,7 +1035,7 @@ module Result_TestResult goto BB102 } BB102 { - [#"../result.rs" 55 12 55 46] _158 <- ([#"../result.rs" 55 12 55 46] _159 = (-2 : int32)); + [#"../result.rs" 55 12 55 46] _158 <- _159 = (-2 : int32); _159 <- any int32; switch (_158) | False -> goto BB104 @@ -1043,7 +1043,7 @@ module Result_TestResult end } BB103 { - [#"../result.rs" 56 26 56 31] _169 <- ([#"../result.rs" 56 26 56 31] Core_Result_Result_Type.C_Ok (2 : int32)); + [#"../result.rs" 56 26 56 31] _169 <- Core_Result_Result_Type.C_Ok (2 : int32); [#"../result.rs" 56 12 56 32] _167 <- ([#"../result.rs" 56 12 56 32] or0 err _169); _169 <- any Core_Result_Result_Type.t_result int32 int32; goto BB105 @@ -1058,7 +1058,7 @@ module Result_TestResult goto BB106 } BB106 { - [#"../result.rs" 56 12 56 46] _165 <- ([#"../result.rs" 56 12 56 46] _166 = (2 : int32)); + [#"../result.rs" 56 12 56 46] _165 <- _166 = (2 : int32); _166 <- any int32; switch (_165) | False -> goto BB108 @@ -1084,7 +1084,7 @@ module Result_TestResult goto BB111 } BB111 { - [#"../result.rs" 59 12 59 46] _172 <- ([#"../result.rs" 59 12 59 46] _173 = (1 : int32)); + [#"../result.rs" 59 12 59 46] _172 <- _173 = (1 : int32); _173 <- any int32; switch (_172) | False -> goto BB113 @@ -1110,7 +1110,7 @@ module Result_TestResult goto BB116 } BB116 { - [#"../result.rs" 60 12 60 53] _179 <- ([#"../result.rs" 60 12 60 53] _181 = (-1 : int32)); + [#"../result.rs" 60 12 60 53] _179 <- _181 = (-1 : int32); switch (_179) | False -> goto BB118 | True -> goto BB117 @@ -1138,7 +1138,7 @@ module Result_TestResult goto BB121 } BB121 { - [#"../result.rs" 61 12 61 46] _187 <- ([#"../result.rs" 61 12 61 46] _188 = (1 : int32)); + [#"../result.rs" 61 12 61 46] _187 <- _188 = (1 : int32); _188 <- any int32; switch (_187) | False -> goto BB123 @@ -1168,7 +1168,7 @@ module Result_TestResult } BB126 { assume { resolve0 _196 }; - [#"../result.rs" 62 12 62 53] _194 <- ([#"../result.rs" 62 12 62 53] * _196 = (-1 : int32)); + [#"../result.rs" 62 12 62 53] _194 <- * _196 = (-1 : int32); switch (_194) | False -> goto BB128 | True -> goto BB127 @@ -1193,7 +1193,7 @@ module Result_TestResult goto BB131 } BB131 { - [#"../result.rs" 64 12 64 46] _202 <- ([#"../result.rs" 64 12 64 46] _203 = (1 : int32)); + [#"../result.rs" 64 12 64 46] _202 <- _203 = (1 : int32); _203 <- any int32; switch (_202) | False -> goto BB133 @@ -1219,7 +1219,7 @@ module Result_TestResult goto BB136 } BB136 { - [#"../result.rs" 65 12 65 53] _209 <- ([#"../result.rs" 65 12 65 53] _211 = (-1 : int32)); + [#"../result.rs" 65 12 65 53] _209 <- _211 = (-1 : int32); switch (_209) | False -> goto BB138 | True -> goto BB137 @@ -1247,7 +1247,7 @@ module Result_TestResult goto BB141 } BB141 { - [#"../result.rs" 66 12 66 46] _217 <- ([#"../result.rs" 66 12 66 46] _218 = (1 : int32)); + [#"../result.rs" 66 12 66 46] _217 <- _218 = (1 : int32); _218 <- any int32; switch (_217) | False -> goto BB143 @@ -1277,15 +1277,15 @@ module Result_TestResult } BB146 { assume { resolve0 _226 }; - [#"../result.rs" 67 12 67 53] _224 <- ([#"../result.rs" 67 12 67 53] * _226 = (-1 : int32)); + [#"../result.rs" 67 12 67 53] _224 <- * _226 = (-1 : int32); switch (_224) | False -> goto BB148 | True -> goto BB147 end } BB147 { - [#"../result.rs" 70 43 70 47] _232 <- ([#"../result.rs" 70 43 70 47] Core_Option_Option_Type.C_None); - [#"../result.rs" 70 40 70 48] res <- ([#"../result.rs" 70 40 70 48] Core_Result_Result_Type.C_Ok _232); + [#"../result.rs" 70 43 70 47] _232 <- Core_Option_Option_Type.C_None; + [#"../result.rs" 70 40 70 48] res <- Core_Result_Result_Type.C_Ok _232; _232 <- any Core_Option_Option_Type.t_option int32; [#"../result.rs" 71 12 71 27] _236 <- ([#"../result.rs" 71 12 71 27] transpose0 res); goto BB149 @@ -1305,8 +1305,8 @@ module Result_TestResult end } BB151 { - [#"../result.rs" 72 43 72 50] _240 <- ([#"../result.rs" 72 43 72 50] Core_Option_Option_Type.C_Some (1 : int32)); - [#"../result.rs" 72 40 72 51] res1 <- ([#"../result.rs" 72 40 72 51] Core_Result_Result_Type.C_Ok _240); + [#"../result.rs" 72 43 72 50] _240 <- Core_Option_Option_Type.C_Some (1 : int32); + [#"../result.rs" 72 40 72 51] res1 <- Core_Result_Result_Type.C_Ok _240; _240 <- any Core_Option_Option_Type.t_option int32; [#"../result.rs" 73 12 73 27] _245 <- ([#"../result.rs" 73 12 73 27] transpose0 res1); goto BB153 @@ -1326,7 +1326,7 @@ module Result_TestResult goto BB155 } BB155 { - [#"../result.rs" 73 12 73 50] _242 <- ([#"../result.rs" 73 12 73 50] _243 = (1 : int32)); + [#"../result.rs" 73 12 73 50] _242 <- _243 = (1 : int32); _243 <- any int32; switch (_242) | False -> goto BB157 @@ -1334,7 +1334,7 @@ module Result_TestResult end } BB156 { - [#"../result.rs" 74 40 74 47] res2 <- ([#"../result.rs" 74 40 74 47] Core_Result_Result_Type.C_Err (-1 : int32)); + [#"../result.rs" 74 40 74 47] res2 <- Core_Result_Result_Type.C_Err (-1 : int32); [#"../result.rs" 75 12 75 27] _253 <- ([#"../result.rs" 75 12 75 27] transpose0 res2); goto BB158 } @@ -1353,7 +1353,7 @@ module Result_TestResult goto BB160 } BB160 { - [#"../result.rs" 75 12 75 55] _250 <- ([#"../result.rs" 75 12 75 55] _251 = (-1 : int32)); + [#"../result.rs" 75 12 75 55] _250 <- _251 = (-1 : int32); _251 <- any int32; switch (_250) | False -> goto BB162 @@ -1361,7 +1361,7 @@ module Result_TestResult end } BB161 { - [#"../result.rs" 3 21 76 1] _0 <- ([#"../result.rs" 3 21 76 1] ()); + [#"../result.rs" 3 21 76 1] _0 <- (); return _0 } BB162 { diff --git a/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg index 6bc1d51054..af750adbf4 100644 --- a/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg +++ b/creusot/tests/should_succeed/rusthorn/inc_max.mlcfg @@ -27,7 +27,7 @@ module IncMax_TakeMax goto BB0 } BB0 { - [#"../inc_max.rs" 7 7 7 17] _6 <- ([#"../inc_max.rs" 7 7 7 17] * ma >= * mb); + [#"../inc_max.rs" 7 7 7 17] _6 <- * ma >= * mb; switch (_6) | False -> goto BB2 | True -> goto BB1 @@ -110,16 +110,16 @@ module IncMax_IncMax BB1 { assume { resolve0 _8 }; assume { resolve0 _6 }; - [#"../inc_max.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max.rs" 17 4 17 12] * mc + (1 : uint32)) ; }; + [#"../inc_max.rs" 17 4 17 12] mc <- { mc with current = ( * mc + (1 : uint32)) ; }; assume { resolve0 mc }; - [#"../inc_max.rs" 18 12 18 18] _10 <- ([#"../inc_max.rs" 18 12 18 18] a <> b); + [#"../inc_max.rs" 18 12 18 18] _10 <- a <> b; switch (_10) | False -> goto BB3 | True -> goto BB2 end } BB2 { - [#"../inc_max.rs" 15 39 19 1] _0 <- ([#"../inc_max.rs" 15 39 19 1] ()); + [#"../inc_max.rs" 15 39 19 1] _0 <- (); return _0 } BB3 { diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg index 426d30ec0c..096dd517e8 100644 --- a/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg +++ b/creusot/tests/should_succeed/rusthorn/inc_max_3.mlcfg @@ -50,7 +50,7 @@ module IncMax3_IncMax3 goto BB0 } BB0 { - [#"../inc_max_3.rs" 13 7 13 16] _7 <- ([#"../inc_max_3.rs" 13 7 13 16] * ma < * mb); + [#"../inc_max_3.rs" 13 7 13 16] _7 <- * ma < * mb; switch (_7) | False -> goto BB3 | True -> goto BB1 @@ -73,15 +73,15 @@ module IncMax3_IncMax3 BB2 { assume { resolve0 _14 }; assume { resolve0 _12 }; - [#"../inc_max_3.rs" 13 17 15 5] _6 <- ([#"../inc_max_3.rs" 13 17 15 5] ()); + [#"../inc_max_3.rs" 13 17 15 5] _6 <- (); goto BB4 } BB3 { - [#"../inc_max_3.rs" 15 5 15 5] _6 <- ([#"../inc_max_3.rs" 15 5 15 5] ()); + [#"../inc_max_3.rs" 15 5 15 5] _6 <- (); goto BB4 } BB4 { - [#"../inc_max_3.rs" 16 7 16 16] _16 <- ([#"../inc_max_3.rs" 16 7 16 16] * mb < * mc); + [#"../inc_max_3.rs" 16 7 16 16] _16 <- * mb < * mc; switch (_16) | False -> goto BB7 | True -> goto BB5 @@ -105,16 +105,16 @@ module IncMax3_IncMax3 assume { resolve0 _23 }; assume { resolve0 _21 }; assume { resolve1 mc }; - [#"../inc_max_3.rs" 16 17 18 5] _15 <- ([#"../inc_max_3.rs" 16 17 18 5] ()); + [#"../inc_max_3.rs" 16 17 18 5] _15 <- (); goto BB8 } BB7 { assume { resolve1 mc }; - [#"../inc_max_3.rs" 18 5 18 5] _15 <- ([#"../inc_max_3.rs" 18 5 18 5] ()); + [#"../inc_max_3.rs" 18 5 18 5] _15 <- (); goto BB8 } BB8 { - [#"../inc_max_3.rs" 19 7 19 16] _25 <- ([#"../inc_max_3.rs" 19 7 19 16] * ma < * mb); + [#"../inc_max_3.rs" 19 7 19 16] _25 <- * ma < * mb; switch (_25) | False -> goto BB11 | True -> goto BB9 @@ -137,19 +137,19 @@ module IncMax3_IncMax3 BB10 { assume { resolve0 _32 }; assume { resolve0 _30 }; - [#"../inc_max_3.rs" 19 17 21 5] _24 <- ([#"../inc_max_3.rs" 19 17 21 5] ()); + [#"../inc_max_3.rs" 19 17 21 5] _24 <- (); goto BB12 } BB11 { - [#"../inc_max_3.rs" 21 5 21 5] _24 <- ([#"../inc_max_3.rs" 21 5 21 5] ()); + [#"../inc_max_3.rs" 21 5 21 5] _24 <- (); goto BB12 } BB12 { - [#"../inc_max_3.rs" 22 4 22 12] ma <- { ma with current = ([#"../inc_max_3.rs" 22 4 22 12] * ma + (2 : uint32)) ; }; + [#"../inc_max_3.rs" 22 4 22 12] ma <- { ma with current = ( * ma + (2 : uint32)) ; }; assume { resolve1 ma }; - [#"../inc_max_3.rs" 23 4 23 12] mb <- { mb with current = ([#"../inc_max_3.rs" 23 4 23 12] * mb + (1 : uint32)) ; }; + [#"../inc_max_3.rs" 23 4 23 12] mb <- { mb with current = ( * mb + (1 : uint32)) ; }; assume { resolve1 mb }; - [#"../inc_max_3.rs" 12 80 24 1] _0 <- ([#"../inc_max_3.rs" 12 80 24 1] ()); + [#"../inc_max_3.rs" 12 80 24 1] _0 <- (); return _0 } @@ -211,28 +211,28 @@ module IncMax3_TestIncMax3 assume { resolve0 _11 }; assume { resolve0 _9 }; assume { resolve0 _7 }; - [#"../inc_max_3.rs" 29 12 29 18] _13 <- ([#"../inc_max_3.rs" 29 12 29 18] a <> b); + [#"../inc_max_3.rs" 29 12 29 18] _13 <- a <> b; switch (_13) | False -> goto BB7 | True -> goto BB2 end } BB2 { - [#"../inc_max_3.rs" 29 22 29 28] _16 <- ([#"../inc_max_3.rs" 29 22 29 28] b <> c); + [#"../inc_max_3.rs" 29 22 29 28] _16 <- b <> c; switch (_16) | False -> goto BB6 | True -> goto BB3 end } BB3 { - [#"../inc_max_3.rs" 29 32 29 38] _19 <- ([#"../inc_max_3.rs" 29 32 29 38] c <> a); + [#"../inc_max_3.rs" 29 32 29 38] _19 <- c <> a; switch (_19) | False -> goto BB5 | True -> goto BB4 end } BB4 { - [#"../inc_max_3.rs" 27 58 30 1] _0 <- ([#"../inc_max_3.rs" 27 58 30 1] ()); + [#"../inc_max_3.rs" 27 58 30 1] _0 <- (); return _0 } BB5 { diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg index 62e0af910a..33068420a1 100644 --- a/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg +++ b/creusot/tests/should_succeed/rusthorn/inc_max_many.mlcfg @@ -27,7 +27,7 @@ module IncMaxMany_TakeMax goto BB0 } BB0 { - [#"../inc_max_many.rs" 7 7 7 17] _6 <- ([#"../inc_max_many.rs" 7 7 7 17] * ma >= * mb); + [#"../inc_max_many.rs" 7 7 7 17] _6 <- * ma >= * mb; switch (_6) | False -> goto BB2 | True -> goto BB1 @@ -114,10 +114,10 @@ module IncMaxMany_IncMaxMany BB1 { assume { resolve0 _9 }; assume { resolve0 _7 }; - [#"../inc_max_many.rs" 17 4 17 12] mc <- { mc with current = ([#"../inc_max_many.rs" 17 4 17 12] * mc + k) ; }; + [#"../inc_max_many.rs" 17 4 17 12] mc <- { mc with current = ( * mc + k) ; }; assume { resolve0 mc }; - [#"../inc_max_many.rs" 18 17 18 22] _14 <- ([#"../inc_max_many.rs" 18 17 18 22] b + k); - [#"../inc_max_many.rs" 18 12 18 22] _12 <- ([#"../inc_max_many.rs" 18 12 18 22] a >= _14); + [#"../inc_max_many.rs" 18 17 18 22] _14 <- b + k; + [#"../inc_max_many.rs" 18 12 18 22] _12 <- a >= _14; _14 <- any uint32; switch (_12) | False -> goto BB3 @@ -128,8 +128,8 @@ module IncMaxMany_IncMaxMany goto BB4 } BB3 { - [#"../inc_max_many.rs" 18 31 18 36] _19 <- ([#"../inc_max_many.rs" 18 31 18 36] a + k); - [#"../inc_max_many.rs" 18 26 18 36] _17 <- ([#"../inc_max_many.rs" 18 26 18 36] b >= _19); + [#"../inc_max_many.rs" 18 31 18 36] _19 <- a + k; + [#"../inc_max_many.rs" 18 26 18 36] _17 <- b >= _19; _19 <- any uint32; switch (_17) | False -> goto BB5 @@ -137,7 +137,7 @@ module IncMaxMany_IncMaxMany end } BB4 { - [#"../inc_max_many.rs" 15 52 19 1] _0 <- ([#"../inc_max_many.rs" 15 52 19 1] ()); + [#"../inc_max_many.rs" 15 52 19 1] _0 <- (); return _0 } BB5 { diff --git a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg index b673e8b19e..a40bed1855 100644 --- a/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg +++ b/creusot/tests/should_succeed/rusthorn/inc_max_repeat.mlcfg @@ -27,7 +27,7 @@ module IncMaxRepeat_TakeMax goto BB0 } BB0 { - [#"../inc_max_repeat.rs" 7 7 7 17] _6 <- ([#"../inc_max_repeat.rs" 7 7 7 17] * ma >= * mb); + [#"../inc_max_repeat.rs" 7 7 7 17] _6 <- * ma >= * mb; switch (_6) | False -> goto BB2 | True -> goto BB1 @@ -254,7 +254,7 @@ module IncMaxRepeat_IncMaxRepeat goto BB0 } BB0 { - [#"../inc_max_repeat.rs" 18 13 18 17] _7 <- ([#"../inc_max_repeat.rs" 18 13 18 17] Core_Ops_Range_Range_Type.C_Range (0 : uint32) n); + [#"../inc_max_repeat.rs" 18 13 18 17] _7 <- Core_Ops_Range_Range_Type.C_Range (0 : uint32) n; [#"../inc_max_repeat.rs" 16 4 16 86] iter <- ([#"../inc_max_repeat.rs" 16 4 16 86] into_iter0 _7); _7 <- any Core_Ops_Range_Range_Type.t_range uint32; goto BB1 @@ -294,8 +294,8 @@ module IncMaxRepeat_IncMaxRepeat end } BB7 { - [#"../inc_max_repeat.rs" 22 17 22 22] _34 <- ([#"../inc_max_repeat.rs" 22 17 22 22] b + n); - [#"../inc_max_repeat.rs" 22 12 22 22] _32 <- ([#"../inc_max_repeat.rs" 22 12 22 22] a >= _34); + [#"../inc_max_repeat.rs" 22 17 22 22] _34 <- b + n; + [#"../inc_max_repeat.rs" 22 12 22 22] _32 <- a >= _34; _34 <- any uint32; switch (_32) | False -> goto BB14 @@ -310,12 +310,12 @@ module IncMaxRepeat_IncMaxRepeat absurd } BB10 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _18); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _18; [#"../inc_max_repeat.rs" 16 4 16 86] _23 <- ([#"../inc_max_repeat.rs" 16 4 16 86] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB11 } BB11 { - [#"../inc_max_repeat.rs" 16 4 16 86] produced <- ([#"../inc_max_repeat.rs" 16 4 16 86] _23); + [#"../inc_max_repeat.rs" 16 4 16 86] produced <- _23; _23 <- any Snapshot.snap_ty (Seq.seq uint32); [#"../inc_max_repeat.rs" 19 26 19 32] _27 <- Borrow.borrow_mut a; [#"../inc_max_repeat.rs" 19 26 19 32] a <- ^ _27; @@ -333,7 +333,7 @@ module IncMaxRepeat_IncMaxRepeat BB12 { assume { resolve1 _29 }; assume { resolve1 _27 }; - [#"../inc_max_repeat.rs" 20 8 20 16] mc <- { mc with current = ([#"../inc_max_repeat.rs" 20 8 20 16] * mc + (1 : uint32)) ; }; + [#"../inc_max_repeat.rs" 20 8 20 16] mc <- { mc with current = ( * mc + (1 : uint32)) ; }; assume { resolve1 mc }; goto BB4 } @@ -341,8 +341,8 @@ module IncMaxRepeat_IncMaxRepeat goto BB15 } BB14 { - [#"../inc_max_repeat.rs" 22 31 22 36] _39 <- ([#"../inc_max_repeat.rs" 22 31 22 36] a + n); - [#"../inc_max_repeat.rs" 22 26 22 36] _37 <- ([#"../inc_max_repeat.rs" 22 26 22 36] b >= _39); + [#"../inc_max_repeat.rs" 22 31 22 36] _39 <- a + n; + [#"../inc_max_repeat.rs" 22 26 22 36] _37 <- b >= _39; _39 <- any uint32; switch (_37) | False -> goto BB16 @@ -350,7 +350,7 @@ module IncMaxRepeat_IncMaxRepeat end } BB15 { - [#"../inc_max_repeat.rs" 15 54 23 1] _0 <- ([#"../inc_max_repeat.rs" 15 54 23 1] ()); + [#"../inc_max_repeat.rs" 15 54 23 1] _0 <- (); return _0 } BB16 { diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg index f91b29fa98..b490b3b583 100644 --- a/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg +++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_list.mlcfg @@ -74,7 +74,7 @@ module IncSome2List_Impl0_SumX goto BB4 } BB2 { - [#"../inc_some_2_list.rs" 46 19 46 20] _0 <- ([#"../inc_some_2_list.rs" 46 19 46 20] (0 : uint32)); + [#"../inc_some_2_list.rs" 46 19 46 20] _0 <- (0 : uint32); goto BB6 } BB3 { @@ -82,13 +82,13 @@ module IncSome2List_Impl0_SumX absurd } BB4 { - [#"../inc_some_2_list.rs" 45 17 45 18] a <- ([#"../inc_some_2_list.rs" 45 17 45 18] IncSome2List_List_Type.cons_0 self); - [#"../inc_some_2_list.rs" 45 20 45 21] l <- ([#"../inc_some_2_list.rs" 45 20 45 21] IncSome2List_List_Type.cons_1 self); + [#"../inc_some_2_list.rs" 45 17 45 18] a <- IncSome2List_List_Type.cons_0 self; + [#"../inc_some_2_list.rs" 45 20 45 21] l <- IncSome2List_List_Type.cons_1 self; [#"../inc_some_2_list.rs" 45 31 45 40] _8 <- ([#"../inc_some_2_list.rs" 45 31 45 40] sum_x l); goto BB5 } BB5 { - [#"../inc_some_2_list.rs" 45 26 45 40] _0 <- ([#"../inc_some_2_list.rs" 45 26 45 40] a + _8); + [#"../inc_some_2_list.rs" 45 26 45 40] _0 <- a + _8; _8 <- any uint32; goto BB6 } @@ -117,7 +117,6 @@ module IncSome2List_Impl0_TakeSomeRest val sum0 [#"../inc_some_2_list.rs" 21 4 21 23] (self : IncSome2List_List_Type.t_list) : int ensures { result = sum0 self } - use prelude.Snapshot predicate resolve2 (self : borrowed (IncSome2List_List_Type.t_list)) = [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34] ^ self = * self val resolve2 (self : borrowed (IncSome2List_List_Type.t_list)) : bool @@ -134,16 +133,6 @@ module IncSome2List_Impl0_TakeSomeRest ensures { result = resolve0 self } val random0 [#"../inc_some_2_list.rs" 15 0 15 19] (_1 : ()) : bool - use prelude.Snapshot - function lemma_sum_nonneg0 [#"../inc_some_2_list.rs" 34 4 34 30] (self : IncSome2List_List_Type.t_list) : () - axiom lemma_sum_nonneg0_def : forall self : IncSome2List_List_Type.t_list . lemma_sum_nonneg0 self = ([#"../inc_some_2_list.rs" 35 8 38 9] match self with - | IncSome2List_List_Type.C_Cons _ l -> lemma_sum_nonneg0 l - | IncSome2List_List_Type.C_Nil -> () - end) - val lemma_sum_nonneg0 [#"../inc_some_2_list.rs" 34 4 34 30] (self : IncSome2List_List_Type.t_list) : () - ensures { result = lemma_sum_nonneg0 self } - - axiom lemma_sum_nonneg0_spec : forall self : IncSome2List_List_Type.t_list . [#"../inc_some_2_list.rs" 33 14 33 29] sum0 self >= 0 let rec cfg take_some_rest [#"../inc_some_2_list.rs" 54 4 54 57] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (IncSome2List_List_Type.t_list)) : (borrowed uint32, borrowed (IncSome2List_List_Type.t_list)) ensures { [#"../inc_some_2_list.rs" 50 14 51 72] sum0 ( ^ self) - sum0 ( * self) = UInt32.to_int ( ^ (let (a, _) = result in a)) + sum0 ( ^ (let (_, a) = result in a)) - shallow_model1 (let (a, _) = result in a) - sum0 ( * (let (_, a) = result in a)) } ensures { [#"../inc_some_2_list.rs" 52 14 52 37] shallow_model1 (let (a, _) = result in a) <= sum0 ( * self) } @@ -154,7 +143,6 @@ module IncSome2List_Impl0_TakeSomeRest var self : borrowed (IncSome2List_List_Type.t_list) = self; var ma : borrowed uint32; var ml : borrowed (IncSome2List_List_Type.t_list); - var _8 : Snapshot.snap_ty (); var _10 : bool; var _11 : borrowed uint32; var _12 : borrowed (IncSome2List_List_Type.t_list); @@ -185,7 +173,6 @@ module IncSome2List_Impl0_TakeSomeRest [#"../inc_some_2_list.rs" 56 17 56 19] self <- { self with current = (let IncSome2List_List_Type.C_Cons x0 x1 = * self in IncSome2List_List_Type.C_Cons ( ^ ma) x1) ; }; [#"../inc_some_2_list.rs" 56 21 56 23] ml <- Borrow.borrow_final (IncSome2List_List_Type.cons_1 ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2); [#"../inc_some_2_list.rs" 56 21 56 23] self <- { self with current = (let IncSome2List_List_Type.C_Cons x0 x1 = * self in IncSome2List_List_Type.C_Cons x0 ( ^ ml)) ; }; - [#"../inc_some_2_list.rs" 57 16 57 51] _8 <- ([#"../inc_some_2_list.rs" 57 16 57 51] Snapshot.new (lemma_sum_nonneg0 ( * ml))); goto BB5 } BB5 { @@ -203,7 +190,7 @@ module IncSome2List_Impl0_TakeSomeRest [#"../inc_some_2_list.rs" 59 21 59 23] ma <- { ma with current = ( ^ _11) ; }; [#"../inc_some_2_list.rs" 59 25 59 27] _12 <- Borrow.borrow_mut ( * ml); [#"../inc_some_2_list.rs" 59 25 59 27] ml <- { ml with current = ( ^ _12) ; }; - [#"../inc_some_2_list.rs" 59 20 59 28] _0 <- ([#"../inc_some_2_list.rs" 59 20 59 28] (_11, _12)); + [#"../inc_some_2_list.rs" 59 20 59 28] _0 <- (_11, _12); _11 <- any borrowed uint32; _12 <- any borrowed (IncSome2List_List_Type.t_list); goto BB10 @@ -315,9 +302,9 @@ module IncSome2List_IncSome2List goto BB3 } BB3 { - [#"../inc_some_2_list.rs" 72 9 72 11] ma <- ([#"../inc_some_2_list.rs" 72 9 72 11] let (a, _) = _9 in a); + [#"../inc_some_2_list.rs" 72 9 72 11] ma <- (let (a, _) = _9 in a); _9 <- (let (x0, x1) = _9 in (any borrowed uint32, x1)); - [#"../inc_some_2_list.rs" 72 13 72 15] ml <- ([#"../inc_some_2_list.rs" 72 13 72 15] let (_, a) = _9 in a); + [#"../inc_some_2_list.rs" 72 13 72 15] ml <- (let (_, a) = _9 in a); _9 <- (let (x0, x1) = _9 in (x0, any borrowed (IncSome2List_List_Type.t_list))); assume { resolve0 _9 }; [#"../inc_some_2_list.rs" 73 18 73 20] _13 <- Borrow.borrow_final ( * ml) (Borrow.get_id ml); @@ -327,22 +314,22 @@ module IncSome2List_IncSome2List goto BB4 } BB4 { - [#"../inc_some_2_list.rs" 73 9 73 11] mb <- ([#"../inc_some_2_list.rs" 73 9 73 11] let (a, _) = _12 in a); + [#"../inc_some_2_list.rs" 73 9 73 11] mb <- (let (a, _) = _12 in a); _12 <- (let (x0, x1) = _12 in (any borrowed uint32, x1)); assume { resolve0 _12 }; - [#"../inc_some_2_list.rs" 74 4 74 12] ma <- { ma with current = ([#"../inc_some_2_list.rs" 74 4 74 12] * ma + j) ; }; + [#"../inc_some_2_list.rs" 74 4 74 12] ma <- { ma with current = ( * ma + j) ; }; assume { resolve1 ma }; - [#"../inc_some_2_list.rs" 75 4 75 12] mb <- { mb with current = ([#"../inc_some_2_list.rs" 75 4 75 12] * mb + k) ; }; + [#"../inc_some_2_list.rs" 75 4 75 12] mb <- { mb with current = ( * mb + k) ; }; assume { resolve1 mb }; assume { resolve2 ml }; [#"../inc_some_2_list.rs" 76 12 76 21] _18 <- ([#"../inc_some_2_list.rs" 76 12 76 21] sum_x0 l); goto BB5 } BB5 { - [#"../inc_some_2_list.rs" 76 25 76 33] _21 <- ([#"../inc_some_2_list.rs" 76 25 76 33] sum0 + j); - [#"../inc_some_2_list.rs" 76 25 76 37] _20 <- ([#"../inc_some_2_list.rs" 76 25 76 37] _21 + k); + [#"../inc_some_2_list.rs" 76 25 76 33] _21 <- sum0 + j; + [#"../inc_some_2_list.rs" 76 25 76 37] _20 <- _21 + k; _21 <- any uint32; - [#"../inc_some_2_list.rs" 76 12 76 37] _17 <- ([#"../inc_some_2_list.rs" 76 12 76 37] _18 = _20); + [#"../inc_some_2_list.rs" 76 12 76 37] _17 <- _18 = _20; _18 <- any uint32; _20 <- any uint32; switch (_17) @@ -351,7 +338,7 @@ module IncSome2List_IncSome2List end } BB6 { - [#"../inc_some_2_list.rs" 70 52 77 1] _0 <- ([#"../inc_some_2_list.rs" 70 52 77 1] ()); + [#"../inc_some_2_list.rs" 70 52 77 1] _0 <- (); goto BB8 } BB7 { diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg index 81af8dc36f..05390969c3 100644 --- a/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg +++ b/creusot/tests/should_succeed/rusthorn/inc_some_2_tree.mlcfg @@ -91,7 +91,7 @@ module IncSome2Tree_Impl0_SumX goto BB4 } BB2 { - [#"../inc_some_2_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_2_tree.rs" 55 20 55 21] (0 : uint32)); + [#"../inc_some_2_tree.rs" 55 20 55 21] _0 <- (0 : uint32); goto BB7 } BB3 { @@ -99,21 +99,21 @@ module IncSome2Tree_Impl0_SumX absurd } BB4 { - [#"../inc_some_2_tree.rs" 47 17 47 19] tl <- ([#"../inc_some_2_tree.rs" 47 17 47 19] IncSome2Tree_Tree_Type.node_0 self); - [#"../inc_some_2_tree.rs" 47 21 47 22] a <- ([#"../inc_some_2_tree.rs" 47 21 47 22] IncSome2Tree_Tree_Type.node_1 self); - [#"../inc_some_2_tree.rs" 47 24 47 26] tr <- ([#"../inc_some_2_tree.rs" 47 24 47 26] IncSome2Tree_Tree_Type.node_2 self); + [#"../inc_some_2_tree.rs" 47 17 47 19] tl <- IncSome2Tree_Tree_Type.node_0 self; + [#"../inc_some_2_tree.rs" 47 21 47 22] a <- IncSome2Tree_Tree_Type.node_1 self; + [#"../inc_some_2_tree.rs" 47 24 47 26] tr <- IncSome2Tree_Tree_Type.node_2 self; assert { [@expl:assertion] [#"../inc_some_2_tree.rs" 49 20 49 41] let _ = lemma_sum_nonneg0 tl in let _ = lemma_sum_nonneg0 tr in true }; [#"../inc_some_2_tree.rs" 53 16 53 26] _11 <- ([#"../inc_some_2_tree.rs" 53 16 53 26] sum_x tl); goto BB5 } BB5 { - [#"../inc_some_2_tree.rs" 53 16 53 31] _10 <- ([#"../inc_some_2_tree.rs" 53 16 53 31] _11 + a); + [#"../inc_some_2_tree.rs" 53 16 53 31] _10 <- _11 + a; _11 <- any uint32; [#"../inc_some_2_tree.rs" 53 34 53 44] _14 <- ([#"../inc_some_2_tree.rs" 53 34 53 44] sum_x tr); goto BB6 } BB6 { - [#"../inc_some_2_tree.rs" 53 16 53 44] _0 <- ([#"../inc_some_2_tree.rs" 53 16 53 44] _10 + _14); + [#"../inc_some_2_tree.rs" 53 16 53 44] _0 <- _10 + _14; _10 <- any uint32; _14 <- any uint32; goto BB7 @@ -256,7 +256,7 @@ module IncSome2Tree_Impl0_TakeSomeRest BB10 { [#"../inc_some_2_tree.rs" 72 25 72 57] _13 <- Borrow.borrow_final ( * _14) (Borrow.get_id _14); [#"../inc_some_2_tree.rs" 72 25 72 57] _14 <- { _14 with current = ( ^ _13) ; }; - [#"../inc_some_2_tree.rs" 72 20 72 58] _0 <- ([#"../inc_some_2_tree.rs" 72 20 72 58] (_12, _13)); + [#"../inc_some_2_tree.rs" 72 20 72 58] _0 <- (_12, _13); _12 <- any borrowed uint32; _13 <- any borrowed (IncSome2Tree_Tree_Type.t_tree); assume { resolve2 _14 }; @@ -395,9 +395,9 @@ module IncSome2Tree_IncSome2Tree goto BB3 } BB3 { - [#"../inc_some_2_tree.rs" 87 9 87 11] ma <- ([#"../inc_some_2_tree.rs" 87 9 87 11] let (a, _) = _9 in a); + [#"../inc_some_2_tree.rs" 87 9 87 11] ma <- (let (a, _) = _9 in a); _9 <- (let (x0, x1) = _9 in (any borrowed uint32, x1)); - [#"../inc_some_2_tree.rs" 87 13 87 15] mt <- ([#"../inc_some_2_tree.rs" 87 13 87 15] let (_, a) = _9 in a); + [#"../inc_some_2_tree.rs" 87 13 87 15] mt <- (let (_, a) = _9 in a); _9 <- (let (x0, x1) = _9 in (x0, any borrowed (IncSome2Tree_Tree_Type.t_tree))); assume { resolve0 _9 }; [#"../inc_some_2_tree.rs" 88 18 88 20] _13 <- Borrow.borrow_final ( * mt) (Borrow.get_id mt); @@ -407,22 +407,22 @@ module IncSome2Tree_IncSome2Tree goto BB4 } BB4 { - [#"../inc_some_2_tree.rs" 88 9 88 11] mb <- ([#"../inc_some_2_tree.rs" 88 9 88 11] let (a, _) = _12 in a); + [#"../inc_some_2_tree.rs" 88 9 88 11] mb <- (let (a, _) = _12 in a); _12 <- (let (x0, x1) = _12 in (any borrowed uint32, x1)); assume { resolve0 _12 }; - [#"../inc_some_2_tree.rs" 89 4 89 12] ma <- { ma with current = ([#"../inc_some_2_tree.rs" 89 4 89 12] * ma + j) ; }; + [#"../inc_some_2_tree.rs" 89 4 89 12] ma <- { ma with current = ( * ma + j) ; }; assume { resolve1 ma }; - [#"../inc_some_2_tree.rs" 90 4 90 12] mb <- { mb with current = ([#"../inc_some_2_tree.rs" 90 4 90 12] * mb + k) ; }; + [#"../inc_some_2_tree.rs" 90 4 90 12] mb <- { mb with current = ( * mb + k) ; }; assume { resolve1 mb }; assume { resolve2 mt }; [#"../inc_some_2_tree.rs" 91 12 91 21] _18 <- ([#"../inc_some_2_tree.rs" 91 12 91 21] sum_x0 t); goto BB5 } BB5 { - [#"../inc_some_2_tree.rs" 91 25 91 33] _21 <- ([#"../inc_some_2_tree.rs" 91 25 91 33] sum0 + j); - [#"../inc_some_2_tree.rs" 91 25 91 37] _20 <- ([#"../inc_some_2_tree.rs" 91 25 91 37] _21 + k); + [#"../inc_some_2_tree.rs" 91 25 91 33] _21 <- sum0 + j; + [#"../inc_some_2_tree.rs" 91 25 91 37] _20 <- _21 + k; _21 <- any uint32; - [#"../inc_some_2_tree.rs" 91 12 91 37] _17 <- ([#"../inc_some_2_tree.rs" 91 12 91 37] _18 = _20); + [#"../inc_some_2_tree.rs" 91 12 91 37] _17 <- _18 = _20; _18 <- any uint32; _20 <- any uint32; switch (_17) @@ -431,7 +431,7 @@ module IncSome2Tree_IncSome2Tree end } BB6 { - [#"../inc_some_2_tree.rs" 85 52 92 1] _0 <- ([#"../inc_some_2_tree.rs" 85 52 92 1] ()); + [#"../inc_some_2_tree.rs" 85 52 92 1] _0 <- (); goto BB8 } BB7 { diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg index 18a224e3c3..b7d26b2807 100644 --- a/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg +++ b/creusot/tests/should_succeed/rusthorn/inc_some_list.mlcfg @@ -74,7 +74,7 @@ module IncSomeList_Impl0_SumX goto BB4 } BB2 { - [#"../inc_some_list.rs" 45 19 45 20] _0 <- ([#"../inc_some_list.rs" 45 19 45 20] (0 : uint32)); + [#"../inc_some_list.rs" 45 19 45 20] _0 <- (0 : uint32); goto BB6 } BB3 { @@ -82,13 +82,13 @@ module IncSomeList_Impl0_SumX absurd } BB4 { - [#"../inc_some_list.rs" 44 17 44 18] a <- ([#"../inc_some_list.rs" 44 17 44 18] IncSomeList_List_Type.cons_0 self); - [#"../inc_some_list.rs" 44 20 44 21] l <- ([#"../inc_some_list.rs" 44 20 44 21] IncSomeList_List_Type.cons_1 self); + [#"../inc_some_list.rs" 44 17 44 18] a <- IncSomeList_List_Type.cons_0 self; + [#"../inc_some_list.rs" 44 20 44 21] l <- IncSomeList_List_Type.cons_1 self; [#"../inc_some_list.rs" 44 31 44 40] _8 <- ([#"../inc_some_list.rs" 44 31 44 40] sum_x l); goto BB5 } BB5 { - [#"../inc_some_list.rs" 44 26 44 40] _0 <- ([#"../inc_some_list.rs" 44 26 44 40] a + _8); + [#"../inc_some_list.rs" 44 26 44 40] _0 <- a + _8; _8 <- any uint32; goto BB6 } @@ -117,7 +117,6 @@ module IncSomeList_Impl0_TakeSome val sum0 [#"../inc_some_list.rs" 21 4 21 23] (self : IncSomeList_List_Type.t_list) : int ensures { result = sum0 self } - use prelude.Snapshot predicate resolve2 (self : borrowed (IncSomeList_List_Type.t_list)) = [#"../../../../../creusot-contracts/src/resolve.rs" 25 20 25 34] ^ self = * self val resolve2 (self : borrowed (IncSomeList_List_Type.t_list)) : bool @@ -134,16 +133,6 @@ module IncSomeList_Impl0_TakeSome ensures { result = resolve0 self } val random0 [#"../inc_some_list.rs" 15 0 15 19] (_1 : ()) : bool - use prelude.Snapshot - function lemma_sum_nonneg0 [#"../inc_some_list.rs" 33 4 33 30] (self : IncSomeList_List_Type.t_list) : () - axiom lemma_sum_nonneg0_def : forall self : IncSomeList_List_Type.t_list . lemma_sum_nonneg0 self = ([#"../inc_some_list.rs" 34 8 37 9] match self with - | IncSomeList_List_Type.C_Cons _ l -> lemma_sum_nonneg0 l - | IncSomeList_List_Type.C_Nil -> () - end) - val lemma_sum_nonneg0 [#"../inc_some_list.rs" 33 4 33 30] (self : IncSomeList_List_Type.t_list) : () - ensures { result = lemma_sum_nonneg0 self } - - axiom lemma_sum_nonneg0_spec : forall self : IncSomeList_List_Type.t_list . [#"../inc_some_list.rs" 32 14 32 29] sum0 self >= 0 let rec cfg take_some [#"../inc_some_list.rs" 51 4 51 39] [@cfg:stackify] [@cfg:subregion_analysis] (self : borrowed (IncSomeList_List_Type.t_list)) : borrowed uint32 ensures { [#"../inc_some_list.rs" 49 14 49 64] sum0 ( ^ self) - sum0 ( * self) = UInt32.to_int ( ^ result) - shallow_model1 result } ensures { [#"../inc_some_list.rs" 50 14 50 35] shallow_model1 result <= sum0 ( * self) } @@ -156,7 +145,6 @@ module IncSomeList_Impl0_TakeSome var ma : borrowed uint32; var ml : borrowed (IncSomeList_List_Type.t_list); var _9 : borrowed uint32; - var _10 : Snapshot.snap_ty (); var _12 : borrowed uint32; var _13 : bool; var _14 : borrowed uint32; @@ -188,7 +176,6 @@ module IncSomeList_Impl0_TakeSome [#"../inc_some_list.rs" 53 17 53 19] self <- { self with current = (let IncSomeList_List_Type.C_Cons x0 x1 = * self in IncSomeList_List_Type.C_Cons ( ^ ma) x1) ; }; [#"../inc_some_list.rs" 53 21 53 23] ml <- Borrow.borrow_final (IncSomeList_List_Type.cons_1 ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2); [#"../inc_some_list.rs" 53 21 53 23] self <- { self with current = (let IncSomeList_List_Type.C_Cons x0 x1 = * self in IncSomeList_List_Type.C_Cons x0 ( ^ ml)) ; }; - [#"../inc_some_list.rs" 54 16 54 51] _10 <- ([#"../inc_some_list.rs" 54 16 54 51] Snapshot.new (lemma_sum_nonneg0 ( * ml))); goto BB5 } BB5 { @@ -314,14 +301,14 @@ module IncSomeList_IncSomeList goto BB3 } BB3 { - [#"../inc_some_list.rs" 70 4 70 12] ma <- { ma with current = ([#"../inc_some_list.rs" 70 4 70 12] * ma + k) ; }; + [#"../inc_some_list.rs" 70 4 70 12] ma <- { ma with current = ( * ma + k) ; }; assume { resolve0 ma }; [#"../inc_some_list.rs" 71 12 71 21] _11 <- ([#"../inc_some_list.rs" 71 12 71 21] sum_x0 l); goto BB4 } BB4 { - [#"../inc_some_list.rs" 71 25 71 33] _13 <- ([#"../inc_some_list.rs" 71 25 71 33] sum0 + k); - [#"../inc_some_list.rs" 71 12 71 33] _10 <- ([#"../inc_some_list.rs" 71 12 71 33] _11 = _13); + [#"../inc_some_list.rs" 71 25 71 33] _13 <- sum0 + k; + [#"../inc_some_list.rs" 71 12 71 33] _10 <- _11 = _13; _11 <- any uint32; _13 <- any uint32; switch (_10) @@ -330,7 +317,7 @@ module IncSomeList_IncSomeList end } BB5 { - [#"../inc_some_list.rs" 67 42 72 1] _0 <- ([#"../inc_some_list.rs" 67 42 72 1] ()); + [#"../inc_some_list.rs" 67 42 72 1] _0 <- (); goto BB7 } BB6 { diff --git a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg index 31f1d09150..538b19e5e8 100644 --- a/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg +++ b/creusot/tests/should_succeed/rusthorn/inc_some_tree.mlcfg @@ -91,7 +91,7 @@ module IncSomeTree_Impl0_SumX goto BB4 } BB2 { - [#"../inc_some_tree.rs" 55 20 55 21] _0 <- ([#"../inc_some_tree.rs" 55 20 55 21] (0 : uint32)); + [#"../inc_some_tree.rs" 55 20 55 21] _0 <- (0 : uint32); goto BB7 } BB3 { @@ -99,21 +99,21 @@ module IncSomeTree_Impl0_SumX absurd } BB4 { - [#"../inc_some_tree.rs" 47 17 47 19] tl <- ([#"../inc_some_tree.rs" 47 17 47 19] IncSomeTree_Tree_Type.node_0 self); - [#"../inc_some_tree.rs" 47 21 47 22] a <- ([#"../inc_some_tree.rs" 47 21 47 22] IncSomeTree_Tree_Type.node_1 self); - [#"../inc_some_tree.rs" 47 24 47 26] tr <- ([#"../inc_some_tree.rs" 47 24 47 26] IncSomeTree_Tree_Type.node_2 self); + [#"../inc_some_tree.rs" 47 17 47 19] tl <- IncSomeTree_Tree_Type.node_0 self; + [#"../inc_some_tree.rs" 47 21 47 22] a <- IncSomeTree_Tree_Type.node_1 self; + [#"../inc_some_tree.rs" 47 24 47 26] tr <- IncSomeTree_Tree_Type.node_2 self; assert { [@expl:assertion] [#"../inc_some_tree.rs" 49 20 49 41] let _ = lemma_sum_nonneg0 tl in let _ = lemma_sum_nonneg0 tr in true }; [#"../inc_some_tree.rs" 53 16 53 26] _11 <- ([#"../inc_some_tree.rs" 53 16 53 26] sum_x tl); goto BB5 } BB5 { - [#"../inc_some_tree.rs" 53 16 53 31] _10 <- ([#"../inc_some_tree.rs" 53 16 53 31] _11 + a); + [#"../inc_some_tree.rs" 53 16 53 31] _10 <- _11 + a; _11 <- any uint32; [#"../inc_some_tree.rs" 53 34 53 44] _14 <- ([#"../inc_some_tree.rs" 53 34 53 44] sum_x tr); goto BB6 } BB6 { - [#"../inc_some_tree.rs" 53 16 53 44] _0 <- ([#"../inc_some_tree.rs" 53 16 53 44] _10 + _14); + [#"../inc_some_tree.rs" 53 16 53 44] _0 <- _10 + _14; _10 <- any uint32; _14 <- any uint32; goto BB7 @@ -374,14 +374,14 @@ module IncSomeTree_IncSomeTree goto BB3 } BB3 { - [#"../inc_some_tree.rs" 86 4 86 12] ma <- { ma with current = ([#"../inc_some_tree.rs" 86 4 86 12] * ma + k) ; }; + [#"../inc_some_tree.rs" 86 4 86 12] ma <- { ma with current = ( * ma + k) ; }; assume { resolve0 ma }; [#"../inc_some_tree.rs" 87 12 87 21] _11 <- ([#"../inc_some_tree.rs" 87 12 87 21] sum_x0 t); goto BB4 } BB4 { - [#"../inc_some_tree.rs" 87 25 87 33] _13 <- ([#"../inc_some_tree.rs" 87 25 87 33] sum0 + k); - [#"../inc_some_tree.rs" 87 12 87 33] _10 <- ([#"../inc_some_tree.rs" 87 12 87 33] _11 = _13); + [#"../inc_some_tree.rs" 87 25 87 33] _13 <- sum0 + k; + [#"../inc_some_tree.rs" 87 12 87 33] _10 <- _11 = _13; _11 <- any uint32; _13 <- any uint32; switch (_10) @@ -390,7 +390,7 @@ module IncSomeTree_IncSomeTree end } BB5 { - [#"../inc_some_tree.rs" 83 42 88 1] _0 <- ([#"../inc_some_tree.rs" 83 42 88 1] ()); + [#"../inc_some_tree.rs" 83 42 88 1] _0 <- (); goto BB7 } BB6 { diff --git a/creusot/tests/should_succeed/selection_sort_generic.mlcfg b/creusot/tests/should_succeed/selection_sort_generic.mlcfg index 561b842d2c..01472c6f22 100644 --- a/creusot/tests/should_succeed/selection_sort_generic.mlcfg +++ b/creusot/tests/should_succeed/selection_sort_generic.mlcfg @@ -606,7 +606,7 @@ module SelectionSortGeneric_SelectionSort goto BB2 } BB2 { - [#"../selection_sort_generic.rs" 38 13 38 23] _7 <- ([#"../selection_sort_generic.rs" 38 13 38 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _8); + [#"../selection_sort_generic.rs" 38 13 38 23] _7 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _8; _8 <- any usize; [#"../selection_sort_generic.rs" 35 4 35 43] iter <- ([#"../selection_sort_generic.rs" 35 4 35 43] into_iter0 _7); _7 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -650,7 +650,7 @@ module SelectionSortGeneric_SelectionSort BB9 { assert { [@expl:type invariant] inv6 v }; assume { resolve4 v }; - [#"../selection_sort_generic.rs" 35 4 35 43] _0 <- ([#"../selection_sort_generic.rs" 35 4 35 43] ()); + [#"../selection_sort_generic.rs" 35 4 35 43] _0 <- (); return _0 } BB10 { @@ -661,21 +661,21 @@ module SelectionSortGeneric_SelectionSort absurd } BB12 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _20); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _20; [#"../selection_sort_generic.rs" 35 4 35 43] _25 <- ([#"../selection_sort_generic.rs" 35 4 35 43] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB13 } BB13 { - [#"../selection_sort_generic.rs" 35 4 35 43] produced <- ([#"../selection_sort_generic.rs" 35 4 35 43] _25); + [#"../selection_sort_generic.rs" 35 4 35 43] produced <- _25; _25 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); - [#"../selection_sort_generic.rs" 39 22 39 23] min <- ([#"../selection_sort_generic.rs" 39 22 39 23] i); - [#"../selection_sort_generic.rs" 43 17 43 24] _32 <- ([#"../selection_sort_generic.rs" 43 17 43 24] i + (1 : usize)); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem; + [#"../selection_sort_generic.rs" 39 22 39 23] min <- i; + [#"../selection_sort_generic.rs" 43 17 43 24] _32 <- i + (1 : usize); [#"../selection_sort_generic.rs" 43 26 43 33] _34 <- ([#"../selection_sort_generic.rs" 43 26 43 33] len0 ( * v)); goto BB14 } BB14 { - [#"../selection_sort_generic.rs" 43 17 43 33] _31 <- ([#"../selection_sort_generic.rs" 43 17 43 33] Core_Ops_Range_Range_Type.C_Range _32 _34); + [#"../selection_sort_generic.rs" 43 17 43 33] _31 <- Core_Ops_Range_Range_Type.C_Range _32 _34; _32 <- any usize; _34 <- any usize; [#"../selection_sort_generic.rs" 41 8 41 121] iter1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] into_iter0 _31); @@ -728,14 +728,14 @@ module SelectionSortGeneric_SelectionSort goto BB23 } BB23 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _44); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _44; [#"../selection_sort_generic.rs" 41 8 41 121] _49 <- ([#"../selection_sort_generic.rs" 41 8 41 121] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1))); goto BB24 } BB24 { - [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- ([#"../selection_sort_generic.rs" 41 8 41 121] _49); + [#"../selection_sort_generic.rs" 41 8 41 121] produced1 <- _49; _49 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- __creusot_proc_iter_elem1; [#"../selection_sort_generic.rs" 44 16 44 19] _54 <- ([#"../selection_sort_generic.rs" 44 16 44 19] index0 ( * v) j); goto BB25 } @@ -758,12 +758,12 @@ module SelectionSortGeneric_SelectionSort end } BB28 { - [#"../selection_sort_generic.rs" 45 16 45 23] min <- ([#"../selection_sort_generic.rs" 45 16 45 23] j); - [#"../selection_sort_generic.rs" 44 29 46 13] _19 <- ([#"../selection_sort_generic.rs" 44 29 46 13] ()); + [#"../selection_sort_generic.rs" 45 16 45 23] min <- j; + [#"../selection_sort_generic.rs" 44 29 46 13] _19 <- (); goto BB30 } BB29 { - [#"../selection_sort_generic.rs" 46 13 46 13] _19 <- ([#"../selection_sort_generic.rs" 46 13 46 13] ()); + [#"../selection_sort_generic.rs" 46 13 46 13] _19 <- (); goto BB30 } BB30 { @@ -781,7 +781,7 @@ module SelectionSortGeneric_SelectionSort assert { [@expl:type invariant] inv5 _65 }; assume { resolve3 _65 }; assert { [@expl:assertion] [#"../selection_sort_generic.rs" 49 8 50 63] let i = Seq.length (Snapshot.inner produced) in forall k2 : int . forall k1 : int . 0 <= k1 /\ k1 < i /\ i <= k2 /\ k2 < Seq.length (deep_model0 v) -> le_log0 (Seq.get (deep_model0 v) k1) (Seq.get (deep_model0 v) k2) }; - [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- ([#"../selection_sort_generic.rs" 38 24 51 5] ()); + [#"../selection_sort_generic.rs" 38 24 51 5] _19 <- (); goto BB6 } BB34 { diff --git a/creusot/tests/should_succeed/slices/01.mlcfg b/creusot/tests/should_succeed/slices/01.mlcfg index 7dcf15e7b8..07606579b7 100644 --- a/creusot/tests/should_succeed/slices/01.mlcfg +++ b/creusot/tests/should_succeed/slices/01.mlcfg @@ -55,14 +55,14 @@ module C01_IndexSlice goto BB0 } BB0 { - [#"../01.rs" 7 6 7 8] _3 <- ([#"../01.rs" 7 6 7 8] (10 : usize)); - [#"../01.rs" 7 4 7 9] _4 <- ([#"../01.rs" 7 4 7 9] Slice.length a); - [#"../01.rs" 7 4 7 9] _5 <- ([#"../01.rs" 7 4 7 9] _3 < _4); + [#"../01.rs" 7 6 7 8] _3 <- (10 : usize); + [#"../01.rs" 7 4 7 9] _4 <- Slice.length a; + [#"../01.rs" 7 4 7 9] _5 <- _3 < _4; assert { [@expl:index in bounds] [#"../01.rs" 7 4 7 9] _5 }; goto BB1 } BB1 { - [#"../01.rs" 7 4 7 9] _0 <- ([#"../01.rs" 7 4 7 9] Slice.get a _3); + [#"../01.rs" 7 4 7 9] _0 <- Slice.get a _3; return _0 } @@ -136,16 +136,16 @@ module C01_IndexMutSlice goto BB0 } BB0 { - [#"../01.rs" 13 6 13 7] _4 <- ([#"../01.rs" 13 6 13 7] (2 : usize)); - [#"../01.rs" 13 4 13 8] _5 <- ([#"../01.rs" 13 4 13 8] Slice.length ( * a)); - [#"../01.rs" 13 4 13 8] _6 <- ([#"../01.rs" 13 4 13 8] _4 < _5); + [#"../01.rs" 13 6 13 7] _4 <- (2 : usize); + [#"../01.rs" 13 4 13 8] _5 <- Slice.length ( * a); + [#"../01.rs" 13 4 13 8] _6 <- _4 < _5; assert { [@expl:index in bounds] [#"../01.rs" 13 4 13 8] _6 }; goto BB1 } BB1 { - [#"../01.rs" 13 4 13 12] a <- { a with current = Slice.set ( * a) _4 ([#"../01.rs" 13 4 13 12] (3 : uint32)) ; }; + [#"../01.rs" 13 4 13 12] a <- { a with current = Slice.set ( * a) _4 (3 : uint32) ; }; assume { resolve0 a }; - [#"../01.rs" 12 38 14 1] _0 <- ([#"../01.rs" 12 38 14 1] ()); + [#"../01.rs" 12 38 14 1] _0 <- (); return _0 } @@ -268,7 +268,7 @@ module C01_SliceFirst goto BB1 } BB1 { - [#"../01.rs" 21 7 21 18] _3 <- ([#"../01.rs" 21 7 21 18] _4 > (0 : usize)); + [#"../01.rs" 21 7 21 18] _3 <- _4 > (0 : usize); _4 <- any usize; switch (_3) | False -> goto BB4 @@ -276,25 +276,25 @@ module C01_SliceFirst end } BB2 { - [#"../01.rs" 22 16 22 17] _8 <- ([#"../01.rs" 22 16 22 17] (0 : usize)); - [#"../01.rs" 22 14 22 18] _9 <- ([#"../01.rs" 22 14 22 18] Slice.length a); - [#"../01.rs" 22 14 22 18] _10 <- ([#"../01.rs" 22 14 22 18] _8 < _9); + [#"../01.rs" 22 16 22 17] _8 <- (0 : usize); + [#"../01.rs" 22 14 22 18] _9 <- Slice.length a; + [#"../01.rs" 22 14 22 18] _10 <- _8 < _9; assert { [@expl:index in bounds] [#"../01.rs" 22 14 22 18] _10 }; goto BB3 } BB3 { - [#"../01.rs" 22 13 22 18] _7 <- ([#"../01.rs" 22 13 22 18] Slice.get a _8); + [#"../01.rs" 22 13 22 18] _7 <- Slice.get a _8; assert { [@expl:type invariant] inv0 a }; assume { resolve0 a }; assert { [@expl:type invariant] inv1 _7 }; assume { resolve1 _7 }; - [#"../01.rs" 22 8 22 19] _0 <- ([#"../01.rs" 22 8 22 19] Core_Option_Option_Type.C_Some _7); + [#"../01.rs" 22 8 22 19] _0 <- Core_Option_Option_Type.C_Some _7; goto BB5 } BB4 { assert { [@expl:type invariant] inv0 a }; assume { resolve0 a }; - [#"../01.rs" 24 8 24 12] _0 <- ([#"../01.rs" 24 8 24 12] Core_Option_Option_Type.C_None); + [#"../01.rs" 24 8 24 12] _0 <- Core_Option_Option_Type.C_None; goto BB5 } BB5 { diff --git a/creusot/tests/should_succeed/slices/02_std.mlcfg b/creusot/tests/should_succeed/slices/02_std.mlcfg index 45e95c27e8..82fb32f960 100644 --- a/creusot/tests/should_succeed/slices/02_std.mlcfg +++ b/creusot/tests/should_succeed/slices/02_std.mlcfg @@ -165,7 +165,7 @@ module C02Std_BinarySearch ensures { [#"../../../../../creusot-contracts/src/std/slice.rs" 309 8 310 99] forall i : usize . result = Core_Result_Result_Type.C_Err i -> (forall j : usize . i <= j /\ UIntSize.to_int j < Seq.length (shallow_model1 self) -> deep_model2 x < Seq.get (deep_model0 self) (UIntSize.to_int j)) } let constant promoted0 [#"../02_std.rs" 8 0 8 40] : uint32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../02_std.rs" 9 30 9 31] (2 : uint32) in let _0 = [#"../02_std.rs" 9 29 9 31] _1 in _0 + let _1 = (2 : uint32) in let _0 = _1 in _0 let rec cfg binary_search [#"../02_std.rs" 8 0 8 40] [@cfg:stackify] [@cfg:subregion_analysis] (s : slice uint32) : usize requires {[#"../02_std.rs" 6 0 6 64] forall i : int . 0 <= i /\ i < Seq.length (shallow_model1 s) -> UInt32.to_int (index_logic0 s i) = i} requires {[#"../02_std.rs" 7 11 7 24] Seq.length (shallow_model1 s) = 5} @@ -181,8 +181,8 @@ module C02Std_BinarySearch goto BB0 } BB0 { - [#"../02_std.rs" 9 29 9 31] _12 <- ([#"../02_std.rs" 9 29 9 31] promoted0); - [#"../02_std.rs" 9 29 9 31] _8 <- ([#"../02_std.rs" 9 29 9 31] _12); + [#"../02_std.rs" 9 29 9 31] _12 <- promoted0; + [#"../02_std.rs" 9 29 9 31] _8 <- _12; [#"../02_std.rs" 9 13 9 32] _5 <- ([#"../02_std.rs" 9 13 9 32] binary_search0 s _8); goto BB1 } @@ -193,7 +193,7 @@ module C02Std_BinarySearch } BB2 { assert { [@expl:assertion] [#"../02_std.rs" 11 20 11 27] UIntSize.to_int ix < 5 }; - [#"../02_std.rs" 12 4 12 6] _0 <- ([#"../02_std.rs" 12 4 12 6] ix); + [#"../02_std.rs" 12 4 12 6] _0 <- ix; return _0 } diff --git a/creusot/tests/should_succeed/sparse_array.mlcfg b/creusot/tests/should_succeed/sparse_array.mlcfg index 8b16048a60..488e04dc3f 100644 --- a/creusot/tests/should_succeed/sparse_array.mlcfg +++ b/creusot/tests/should_succeed/sparse_array.mlcfg @@ -348,8 +348,8 @@ module SparseArray_Impl2_Get goto BB1 } BB1 { - [#"../sparse_array.rs" 90 20 90 31] index <- ([#"../sparse_array.rs" 90 20 90 31] _7); - [#"../sparse_array.rs" 91 11 91 25] _10 <- ([#"../sparse_array.rs" 91 11 91 25] index < SparseArray_Sparse_Type.sparse_n self); + [#"../sparse_array.rs" 90 20 90 31] index <- _7; + [#"../sparse_array.rs" 91 11 91 25] _10 <- index < SparseArray_Sparse_Type.sparse_n self; switch (_10) | False -> goto BB7 | True -> goto BB2 @@ -360,7 +360,7 @@ module SparseArray_Impl2_Get goto BB3 } BB3 { - [#"../sparse_array.rs" 91 29 91 50] _13 <- ([#"../sparse_array.rs" 91 29 91 50] _15 = i); + [#"../sparse_array.rs" 91 29 91 50] _13 <- _15 = i; switch (_13) | False -> goto BB6 | True -> goto BB4 @@ -373,12 +373,12 @@ module SparseArray_Impl2_Get goto BB5 } BB5 { - [#"../sparse_array.rs" 92 17 92 32] _20 <- ([#"../sparse_array.rs" 92 17 92 32] _21); + [#"../sparse_array.rs" 92 17 92 32] _20 <- _21; assert { [@expl:type invariant] inv1 _21 }; assume { resolve1 _21 }; assert { [@expl:type invariant] inv1 _20 }; assume { resolve1 _20 }; - [#"../sparse_array.rs" 92 12 92 33] _0 <- ([#"../sparse_array.rs" 92 12 92 33] Core_Option_Option_Type.C_Some _20); + [#"../sparse_array.rs" 92 12 92 33] _0 <- Core_Option_Option_Type.C_Some _20; goto BB9 } BB6 { @@ -392,7 +392,7 @@ module SparseArray_Impl2_Get goto BB8 } BB8 { - [#"../sparse_array.rs" 94 12 94 16] _0 <- ([#"../sparse_array.rs" 94 12 94 16] Core_Option_Option_Type.C_None); + [#"../sparse_array.rs" 94 12 94 16] _0 <- Core_Option_Option_Type.C_None; goto BB9 } BB9 { @@ -885,7 +885,7 @@ module SparseArray_Impl2_Set goto BB3 } BB3 { - [#"../sparse_array.rs" 113 8 113 22] _9 <- { _9 with current = ([#"../sparse_array.rs" 113 8 113 22] v) ; }; + [#"../sparse_array.rs" 113 8 113 22] _9 <- { _9 with current = v ; }; v <- any t; assert { [@expl:type invariant] inv1 ( * _9) }; assume { resolve0 ( * _9) }; @@ -898,8 +898,8 @@ module SparseArray_Impl2_Set goto BB6 } BB6 { - [#"../sparse_array.rs" 114 20 114 31] index <- ([#"../sparse_array.rs" 114 20 114 31] _13); - [#"../sparse_array.rs" 115 13 115 27] _16 <- ([#"../sparse_array.rs" 115 13 115 27] index < SparseArray_Sparse_Type.sparse_n ( * self)); + [#"../sparse_array.rs" 114 20 114 31] index <- _13; + [#"../sparse_array.rs" 115 13 115 27] _16 <- index < SparseArray_Sparse_Type.sparse_n ( * self); switch (_16) | False -> goto BB11 | True -> goto BB7 @@ -910,7 +910,7 @@ module SparseArray_Impl2_Set goto BB8 } BB8 { - [#"../sparse_array.rs" 115 31 115 52] _19 <- ([#"../sparse_array.rs" 115 31 115 52] _21 = i); + [#"../sparse_array.rs" 115 31 115 52] _19 <- _21 = i; switch (_19) | False -> goto BB10 | True -> goto BB9 @@ -919,7 +919,7 @@ module SparseArray_Impl2_Set BB9 { assert { [@expl:type invariant] inv3 self }; assume { resolve4 self }; - [#"../sparse_array.rs" 123 9 123 9] _0 <- ([#"../sparse_array.rs" 123 9 123 9] ()); + [#"../sparse_array.rs" 123 9 123 9] _0 <- (); goto BB16 } BB10 { @@ -942,7 +942,7 @@ module SparseArray_Impl2_Set goto BB14 } BB14 { - [#"../sparse_array.rs" 120 12 120 32] _30 <- { _30 with current = ([#"../sparse_array.rs" 120 12 120 32] SparseArray_Sparse_Type.sparse_n ( * self)) ; }; + [#"../sparse_array.rs" 120 12 120 32] _30 <- { _30 with current = SparseArray_Sparse_Type.sparse_n ( * self) ; }; assume { resolve3 _30 }; [#"../sparse_array.rs" 121 12 121 21] _35 <- Borrow.borrow_final (SparseArray_Sparse_Type.sparse_back ( * self)) (Borrow.inherit_id (Borrow.get_id self) 5); [#"../sparse_array.rs" 121 12 121 21] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 = * self in SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 ( ^ _35)) ; }; @@ -951,12 +951,12 @@ module SparseArray_Impl2_Set goto BB15 } BB15 { - [#"../sparse_array.rs" 121 12 121 33] _34 <- { _34 with current = ([#"../sparse_array.rs" 121 12 121 33] i) ; }; + [#"../sparse_array.rs" 121 12 121 33] _34 <- { _34 with current = i ; }; assume { resolve3 _34 }; - [#"../sparse_array.rs" 122 12 122 23] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 = * self in SparseArray_Sparse_Type.C_Sparse x0 ([#"../sparse_array.rs" 122 12 122 23] SparseArray_Sparse_Type.sparse_n ( * self) + (1 : usize)) x2 x3 x4) ; }; + [#"../sparse_array.rs" 122 12 122 23] self <- { self with current = (let SparseArray_Sparse_Type.C_Sparse x0 x1 x2 x3 x4 = * self in SparseArray_Sparse_Type.C_Sparse x0 (SparseArray_Sparse_Type.sparse_n ( * self) + (1 : usize)) x2 x3 x4) ; }; assert { [@expl:type invariant] inv3 self }; assume { resolve4 self }; - [#"../sparse_array.rs" 115 54 123 9] _0 <- ([#"../sparse_array.rs" 115 54 123 9] ()); + [#"../sparse_array.rs" 115 54 123 9] _0 <- (); goto BB16 } BB16 { @@ -1149,7 +1149,7 @@ module SparseArray_Create goto BB3 } BB3 { - [#"../sparse_array.rs" 135 4 135 91] _0 <- ([#"../sparse_array.rs" 135 4 135 91] SparseArray_Sparse_Type.C_Sparse sz (0 : usize) _6 _9 _11); + [#"../sparse_array.rs" 135 4 135 91] _0 <- SparseArray_Sparse_Type.C_Sparse sz (0 : usize) _6 _9 _11; _6 <- any Alloc_Vec_Vec_Type.t_vec t (Alloc_Alloc_Global_Type.t_global); _9 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global); _11 <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global); @@ -1395,7 +1395,7 @@ module SparseArray_F goto BB0 } BB0 { - [#"../sparse_array.rs" 141 18 141 19] default <- ([#"../sparse_array.rs" 141 18 141 19] (0 : int32)); + [#"../sparse_array.rs" 141 18 141 19] default <- (0 : int32); [#"../sparse_array.rs" 142 16 142 35] a <- ([#"../sparse_array.rs" 142 16 142 35] create0 (10 : usize) default); goto BB1 } @@ -1433,13 +1433,13 @@ module SparseArray_F goto BB7 } BB7 { - [#"../sparse_array.rs" 150 4 150 16] x <- ([#"../sparse_array.rs" 150 4 150 16] _16); + [#"../sparse_array.rs" 150 4 150 16] x <- _16; _16 <- any Core_Option_Option_Type.t_option int32; [#"../sparse_array.rs" 151 8 151 16] _18 <- ([#"../sparse_array.rs" 151 8 151 16] get0 b (7 : usize)); goto BB8 } BB8 { - [#"../sparse_array.rs" 151 4 151 16] y <- ([#"../sparse_array.rs" 151 4 151 16] _18); + [#"../sparse_array.rs" 151 4 151 16] y <- _18; _18 <- any Core_Option_Option_Type.t_option int32; assert { [@expl:assertion] [#"../sparse_array.rs" 152 18 155 5] match x with | Core_Option_Option_Type.C_None -> false @@ -1453,42 +1453,42 @@ module SparseArray_F goto BB9 } BB9 { - [#"../sparse_array.rs" 161 4 161 16] x <- ([#"../sparse_array.rs" 161 4 161 16] _24); + [#"../sparse_array.rs" 161 4 161 16] x <- _24; _24 <- any Core_Option_Option_Type.t_option int32; [#"../sparse_array.rs" 162 8 162 16] _26 <- ([#"../sparse_array.rs" 162 8 162 16] get0 b (5 : usize)); goto BB10 } BB10 { - [#"../sparse_array.rs" 162 4 162 16] y <- ([#"../sparse_array.rs" 162 4 162 16] _26); + [#"../sparse_array.rs" 162 4 162 16] y <- _26; _26 <- any Core_Option_Option_Type.t_option int32; assert { [@expl:assertion] [#"../sparse_array.rs" 163 18 163 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None }; [#"../sparse_array.rs" 165 8 165 16] _30 <- ([#"../sparse_array.rs" 165 8 165 16] get0 a (0 : usize)); goto BB11 } BB11 { - [#"../sparse_array.rs" 165 4 165 16] x <- ([#"../sparse_array.rs" 165 4 165 16] _30); + [#"../sparse_array.rs" 165 4 165 16] x <- _30; _30 <- any Core_Option_Option_Type.t_option int32; [#"../sparse_array.rs" 166 8 166 16] _32 <- ([#"../sparse_array.rs" 166 8 166 16] get0 b (0 : usize)); goto BB12 } BB12 { - [#"../sparse_array.rs" 166 4 166 16] y <- ([#"../sparse_array.rs" 166 4 166 16] _32); + [#"../sparse_array.rs" 166 4 166 16] y <- _32; _32 <- any Core_Option_Option_Type.t_option int32; assert { [@expl:assertion] [#"../sparse_array.rs" 167 18 167 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None }; [#"../sparse_array.rs" 169 8 169 16] _36 <- ([#"../sparse_array.rs" 169 8 169 16] get0 a (9 : usize)); goto BB13 } BB13 { - [#"../sparse_array.rs" 169 4 169 16] x <- ([#"../sparse_array.rs" 169 4 169 16] _36); + [#"../sparse_array.rs" 169 4 169 16] x <- _36; _36 <- any Core_Option_Option_Type.t_option int32; [#"../sparse_array.rs" 170 8 170 16] _38 <- ([#"../sparse_array.rs" 170 8 170 16] get0 b (9 : usize)); goto BB14 } BB14 { - [#"../sparse_array.rs" 170 4 170 16] y <- ([#"../sparse_array.rs" 170 4 170 16] _38); + [#"../sparse_array.rs" 170 4 170 16] y <- _38; _38 <- any Core_Option_Option_Type.t_option int32; assert { [@expl:assertion] [#"../sparse_array.rs" 171 18 171 40] x = Core_Option_Option_Type.C_None /\ y = Core_Option_Option_Type.C_None }; - [#"../sparse_array.rs" 171 4 171 41] _0 <- ([#"../sparse_array.rs" 171 4 171 41] ()); + [#"../sparse_array.rs" 171 4 171 41] _0 <- (); goto BB15 } BB15 { diff --git a/creusot/tests/should_succeed/spec_tests.mlcfg b/creusot/tests/should_succeed/spec_tests.mlcfg index a662169771..d4cdb3a322 100644 --- a/creusot/tests/should_succeed/spec_tests.mlcfg +++ b/creusot/tests/should_succeed/spec_tests.mlcfg @@ -25,7 +25,7 @@ module SpecTests_TestSpecs goto BB0 } BB0 { - [#"../spec_tests.rs" 18 20 18 22] _0 <- ([#"../spec_tests.rs" 18 20 18 22] ()); + [#"../spec_tests.rs" 18 20 18 22] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/specification/division.mlcfg b/creusot/tests/should_succeed/specification/division.mlcfg index 09d2b1353a..94818de47c 100644 --- a/creusot/tests/should_succeed/specification/division.mlcfg +++ b/creusot/tests/should_succeed/specification/division.mlcfg @@ -15,13 +15,13 @@ module Division_Divide goto BB0 } BB0 { - [#"../division.rs" 7 8 7 9] _5 <- ([#"../division.rs" 7 8 7 9] x); - [#"../division.rs" 7 4 7 9] _6 <- ([#"../division.rs" 7 4 7 9] _5 = (0 : uint32)); + [#"../division.rs" 7 8 7 9] _5 <- x; + [#"../division.rs" 7 4 7 9] _6 <- _5 = (0 : uint32); assert { [@expl:division by zero] [#"../division.rs" 7 4 7 9] not _6 }; goto BB1 } BB1 { - [#"../division.rs" 7 4 7 9] _0 <- ([#"../division.rs" 7 4 7 9] y / _5); + [#"../division.rs" 7 4 7 9] _0 <- y / _5; _5 <- any uint32; return _0 } diff --git a/creusot/tests/should_succeed/specification/forall.mlcfg b/creusot/tests/should_succeed/specification/forall.mlcfg index d2905b36d8..dafb164233 100644 --- a/creusot/tests/should_succeed/specification/forall.mlcfg +++ b/creusot/tests/should_succeed/specification/forall.mlcfg @@ -11,7 +11,7 @@ module Forall_F goto BB0 } BB0 { - [#"../forall.rs" 6 11 6 13] _0 <- ([#"../forall.rs" 6 11 6 13] ()); + [#"../forall.rs" 6 11 6 13] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/specification/logic_call.mlcfg b/creusot/tests/should_succeed/specification/logic_call.mlcfg index 90835dd6b0..421d48fca5 100644 --- a/creusot/tests/should_succeed/specification/logic_call.mlcfg +++ b/creusot/tests/should_succeed/specification/logic_call.mlcfg @@ -16,7 +16,7 @@ module LogicCall_Dummy goto BB0 } BB0 { - [#"../logic_call.rs" 12 4 12 5] _0 <- ([#"../logic_call.rs" 12 4 12 5] (0 : uint32)); + [#"../logic_call.rs" 12 4 12 5] _0 <- (0 : uint32); return _0 } diff --git a/creusot/tests/should_succeed/specification/logic_functions.mlcfg b/creusot/tests/should_succeed/specification/logic_functions.mlcfg index 3be1b9abd5..a11198ee2c 100644 --- a/creusot/tests/should_succeed/specification/logic_functions.mlcfg +++ b/creusot/tests/should_succeed/specification/logic_functions.mlcfg @@ -14,7 +14,7 @@ module LogicFunctions_UseLogic goto BB0 } BB0 { - [#"../logic_functions.rs" 10 19 10 21] _0 <- ([#"../logic_functions.rs" 10 19 10 21] ()); + [#"../logic_functions.rs" 10 19 10 21] _0 <- (); return _0 } @@ -34,7 +34,7 @@ module LogicFunctions_UseLogicPearlite goto BB0 } BB0 { - [#"../logic_functions.rs" 19 28 19 30] _0 <- ([#"../logic_functions.rs" 19 28 19 30] ()); + [#"../logic_functions.rs" 19 28 19 30] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/specification/loops.mlcfg b/creusot/tests/should_succeed/specification/loops.mlcfg index bdf5f2abd2..d847617457 100644 --- a/creusot/tests/should_succeed/specification/loops.mlcfg +++ b/creusot/tests/should_succeed/specification/loops.mlcfg @@ -24,7 +24,7 @@ module Loops_WhileLoopVariant goto BB1 } BB4 { - [#"../loops.rs" 6 4 6 14] _0 <- ([#"../loops.rs" 6 4 6 14] ()); + [#"../loops.rs" 6 4 6 14] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/specification/model.mlcfg b/creusot/tests/should_succeed/specification/model.mlcfg index 59a478c112..1fa8700260 100644 --- a/creusot/tests/should_succeed/specification/model.mlcfg +++ b/creusot/tests/should_succeed/specification/model.mlcfg @@ -74,7 +74,7 @@ module Model_TestArc goto BB1 } BB1 { - [#"../model.rs" 43 42 43 44] _0 <- ([#"../model.rs" 43 42 43 44] ()); + [#"../model.rs" 43 42 43 44] _0 <- (); goto BB2 } BB2 { @@ -126,7 +126,7 @@ module Model_TestRc goto BB1 } BB1 { - [#"../model.rs" 46 38 46 40] _0 <- ([#"../model.rs" 46 38 46 40] ()); + [#"../model.rs" 46 38 46 40] _0 <- (); goto BB2 } BB2 { diff --git a/creusot/tests/should_succeed/specification/opaque.mlcfg b/creusot/tests/should_succeed/specification/opaque.mlcfg index f44067afe1..1fc2649716 100644 --- a/creusot/tests/should_succeed/specification/opaque.mlcfg +++ b/creusot/tests/should_succeed/specification/opaque.mlcfg @@ -19,7 +19,7 @@ module Opaque_Test BB0 { assert { [@expl:assertion] [#"../opaque.rs" 21 18 21 34] transparent0 () }; assert { [@expl:assertion] [#"../opaque.rs" 22 18 22 40] transparent_crate0 () }; - [#"../opaque.rs" 20 14 23 1] _0 <- ([#"../opaque.rs" 20 14 23 1] ()); + [#"../opaque.rs" 20 14 23 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/split_borrow.mlcfg b/creusot/tests/should_succeed/split_borrow.mlcfg index ee3c4ab203..d0c2db1f3d 100644 --- a/creusot/tests/should_succeed/split_borrow.mlcfg +++ b/creusot/tests/should_succeed/split_borrow.mlcfg @@ -7,7 +7,7 @@ module SplitBorrow_Z goto BB0 } BB0 { - [#"../split_borrow.rs" 6 4 6 8] _0 <- ([#"../split_borrow.rs" 6 4 6 8] true); + [#"../split_borrow.rs" 6 4 6 8] _0 <- true; return _0 } @@ -55,9 +55,9 @@ module SplitBorrow_F goto BB0 } BB0 { - [#"../split_borrow.rs" 10 17 10 25] _2 <- ([#"../split_borrow.rs" 10 17 10 25] SplitBorrow_MyInt_Type.C_MyInt (1 : usize)); - [#"../split_borrow.rs" 10 27 10 35] _3 <- ([#"../split_borrow.rs" 10 27 10 35] SplitBorrow_MyInt_Type.C_MyInt (2 : usize)); - [#"../split_borrow.rs" 10 16 10 36] x <- ([#"../split_borrow.rs" 10 16 10 36] (_2, _3)); + [#"../split_borrow.rs" 10 17 10 25] _2 <- SplitBorrow_MyInt_Type.C_MyInt (1 : usize); + [#"../split_borrow.rs" 10 27 10 35] _3 <- SplitBorrow_MyInt_Type.C_MyInt (2 : usize); + [#"../split_borrow.rs" 10 16 10 36] x <- (_2, _3); _2 <- any SplitBorrow_MyInt_Type.t_myint; _3 <- any SplitBorrow_MyInt_Type.t_myint; [#"../split_borrow.rs" 11 12 11 18] y <- Borrow.borrow_mut x; @@ -72,23 +72,23 @@ module SplitBorrow_F end } BB2 { - [#"../split_borrow.rs" 14 17 14 25] _7 <- ([#"../split_borrow.rs" 14 17 14 25] SplitBorrow_MyInt_Type.C_MyInt (4 : usize)); - [#"../split_borrow.rs" 14 8 14 25] y <- { y with current = (let (x0, x1) = * y in (x0, ([#"../split_borrow.rs" 14 8 14 25] _7))) ; }; + [#"../split_borrow.rs" 14 17 14 25] _7 <- SplitBorrow_MyInt_Type.C_MyInt (4 : usize); + [#"../split_borrow.rs" 14 8 14 25] y <- { y with current = (let (x0, x1) = * y in (x0, _7)) ; }; _7 <- any SplitBorrow_MyInt_Type.t_myint; - [#"../split_borrow.rs" 13 11 15 5] _5 <- ([#"../split_borrow.rs" 13 11 15 5] ()); + [#"../split_borrow.rs" 13 11 15 5] _5 <- (); goto BB4 } BB3 { - [#"../split_borrow.rs" 16 17 16 26] _8 <- ([#"../split_borrow.rs" 16 17 16 26] SplitBorrow_MyInt_Type.C_MyInt (10 : usize)); - [#"../split_borrow.rs" 16 8 16 26] y <- { y with current = (let (x0, x1) = * y in (([#"../split_borrow.rs" 16 8 16 26] _8), x1)) ; }; + [#"../split_borrow.rs" 16 17 16 26] _8 <- SplitBorrow_MyInt_Type.C_MyInt (10 : usize); + [#"../split_borrow.rs" 16 8 16 26] y <- { y with current = (let (x0, x1) = * y in (_8, x1)) ; }; _8 <- any SplitBorrow_MyInt_Type.t_myint; - [#"../split_borrow.rs" 15 11 17 5] _5 <- ([#"../split_borrow.rs" 15 11 17 5] ()); + [#"../split_borrow.rs" 15 11 17 5] _5 <- (); goto BB4 } BB4 { assume { resolve0 y }; assume { resolve1 x }; - [#"../split_borrow.rs" 9 11 21 1] _0 <- ([#"../split_borrow.rs" 9 11 21 1] ()); + [#"../split_borrow.rs" 9 11 21 1] _0 <- (); return _0 } @@ -131,9 +131,9 @@ module SplitBorrow_G goto BB0 } BB0 { - [#"../split_borrow.rs" 24 17 24 25] _2 <- ([#"../split_borrow.rs" 24 17 24 25] SplitBorrow_MyInt_Type.C_MyInt (1 : usize)); - [#"../split_borrow.rs" 24 27 24 35] _3 <- ([#"../split_borrow.rs" 24 27 24 35] SplitBorrow_MyInt_Type.C_MyInt (2 : usize)); - [#"../split_borrow.rs" 24 16 24 36] a <- ([#"../split_borrow.rs" 24 16 24 36] (_2, _3)); + [#"../split_borrow.rs" 24 17 24 25] _2 <- SplitBorrow_MyInt_Type.C_MyInt (1 : usize); + [#"../split_borrow.rs" 24 27 24 35] _3 <- SplitBorrow_MyInt_Type.C_MyInt (2 : usize); + [#"../split_borrow.rs" 24 16 24 36] a <- (_2, _3); _2 <- any SplitBorrow_MyInt_Type.t_myint; _3 <- any SplitBorrow_MyInt_Type.t_myint; [#"../split_borrow.rs" 25 12 25 18] x <- Borrow.borrow_mut a; @@ -141,12 +141,12 @@ module SplitBorrow_G [#"../split_borrow.rs" 27 13 27 21] _z <- Borrow.borrow_final (let (_, a) = * x in a) (Borrow.inherit_id (Borrow.get_id x) 2); [#"../split_borrow.rs" 27 13 27 21] x <- { x with current = (let (x0, x1) = * x in (x0, ^ _z)) ; }; assume { resolve0 _z }; - [#"../split_borrow.rs" 29 13 29 21] _6 <- ([#"../split_borrow.rs" 29 13 29 21] SplitBorrow_MyInt_Type.C_MyInt (3 : usize)); - [#"../split_borrow.rs" 29 4 29 21] x <- { x with current = (let (x0, x1) = * x in (([#"../split_borrow.rs" 29 4 29 21] _6), x1)) ; }; + [#"../split_borrow.rs" 29 13 29 21] _6 <- SplitBorrow_MyInt_Type.C_MyInt (3 : usize); + [#"../split_borrow.rs" 29 4 29 21] x <- { x with current = (let (x0, x1) = * x in (_6, x1)) ; }; _6 <- any SplitBorrow_MyInt_Type.t_myint; assume { resolve1 x }; assume { resolve2 a }; - [#"../split_borrow.rs" 23 11 32 1] _0 <- ([#"../split_borrow.rs" 23 11 32 1] ()); + [#"../split_borrow.rs" 23 11 32 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/std_types.mlcfg b/creusot/tests/should_succeed/std_types.mlcfg index 8517de6b44..271519a564 100644 --- a/creusot/tests/should_succeed/std_types.mlcfg +++ b/creusot/tests/should_succeed/std_types.mlcfg @@ -23,7 +23,7 @@ module StdTypes_X goto BB0 } BB0 { - [#"../std_types.rs" 5 21 5 23] _0 <- ([#"../std_types.rs" 5 21 5 23] ()); + [#"../std_types.rs" 5 21 5 23] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/sum.mlcfg b/creusot/tests/should_succeed/sum.mlcfg index b17661743f..c65abe7b18 100644 --- a/creusot/tests/should_succeed/sum.mlcfg +++ b/creusot/tests/should_succeed/sum.mlcfg @@ -218,7 +218,7 @@ module Sum_SumFirstN goto BB0 } BB0 { - [#"../sum.rs" 7 18 7 19] sum <- ([#"../sum.rs" 7 18 7 19] (0 : uint32)); + [#"../sum.rs" 7 18 7 19] sum <- (0 : uint32); [#"../sum.rs" 9 13 9 18] _7 <- ([#"../sum.rs" 9 13 9 18] new0 (1 : uint32) n); goto BB1 } @@ -261,7 +261,7 @@ module Sum_SumFirstN end } BB8 { - [#"../sum.rs" 12 4 12 7] _0 <- ([#"../sum.rs" 12 4 12 7] sum); + [#"../sum.rs" 12 4 12 7] _0 <- sum; return _0 } BB9 { @@ -272,15 +272,15 @@ module Sum_SumFirstN absurd } BB11 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17; [#"../sum.rs" 8 4 8 67] _22 <- ([#"../sum.rs" 8 4 8 67] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB12 } BB12 { - [#"../sum.rs" 8 4 8 67] produced <- ([#"../sum.rs" 8 4 8 67] _22); + [#"../sum.rs" 8 4 8 67] produced <- _22; _22 <- any Snapshot.snap_ty (Seq.seq uint32); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); - [#"../sum.rs" 10 8 10 16] sum <- ([#"../sum.rs" 10 8 10 16] sum + i); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem; + [#"../sum.rs" 10 8 10 16] sum <- sum + i; goto BB5 } diff --git a/creusot/tests/should_succeed/sum_of_odds.mlcfg b/creusot/tests/should_succeed/sum_of_odds.mlcfg index a40475b1ea..e55c53a322 100644 --- a/creusot/tests/should_succeed/sum_of_odds.mlcfg +++ b/creusot/tests/should_succeed/sum_of_odds.mlcfg @@ -231,8 +231,8 @@ module SumOfOdds_ComputeSumOfOdd goto BB0 } BB0 { - [#"../sum_of_odds.rs" 37 21 37 22] s <- ([#"../sum_of_odds.rs" 37 21 37 22] (0 : uint32)); - [#"../sum_of_odds.rs" 39 13 39 17] _8 <- ([#"../sum_of_odds.rs" 39 13 39 17] Core_Ops_Range_Range_Type.C_Range (0 : uint32) x); + [#"../sum_of_odds.rs" 37 21 37 22] s <- (0 : uint32); + [#"../sum_of_odds.rs" 39 13 39 17] _8 <- Core_Ops_Range_Range_Type.C_Range (0 : uint32) x; [#"../sum_of_odds.rs" 38 4 38 50] iter <- ([#"../sum_of_odds.rs" 38 4 38 50] into_iter0 _8); _8 <- any Core_Ops_Range_Range_Type.t_range uint32; goto BB1 @@ -271,7 +271,7 @@ module SumOfOdds_ComputeSumOfOdd end } BB7 { - [#"../sum_of_odds.rs" 46 11 46 12] _0 <- ([#"../sum_of_odds.rs" 46 11 46 12] s); + [#"../sum_of_odds.rs" 46 11 46 12] _0 <- s; return _0 } BB8 { @@ -282,19 +282,19 @@ module SumOfOdds_ComputeSumOfOdd absurd } BB10 { - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _18); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _18; [#"../sum_of_odds.rs" 38 4 38 50] _23 <- ([#"../sum_of_odds.rs" 38 4 38 50] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB11 } BB11 { - [#"../sum_of_odds.rs" 38 4 38 50] produced <- ([#"../sum_of_odds.rs" 38 4 38 50] _23); + [#"../sum_of_odds.rs" 38 4 38 50] produced <- _23; _23 <- any Snapshot.snap_ty (Seq.seq uint32); - [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem; assert { [@expl:assertion] [#"../sum_of_odds.rs" 41 12 41 33] let _ = sum_of_odd_is_sqr0 (UInt32.to_int i) in true }; - [#"../sum_of_odds.rs" 44 13 44 18] _29 <- ([#"../sum_of_odds.rs" 44 13 44 18] (2 : uint32) * i); - [#"../sum_of_odds.rs" 44 13 44 22] _28 <- ([#"../sum_of_odds.rs" 44 13 44 22] _29 + (1 : uint32)); + [#"../sum_of_odds.rs" 44 13 44 18] _29 <- (2 : uint32) * i; + [#"../sum_of_odds.rs" 44 13 44 22] _28 <- _29 + (1 : uint32); _29 <- any uint32; - [#"../sum_of_odds.rs" 44 8 44 22] s <- ([#"../sum_of_odds.rs" 44 8 44 22] s + _28); + [#"../sum_of_odds.rs" 44 8 44 22] s <- s + _28; _28 <- any uint32; goto BB4 } @@ -354,7 +354,7 @@ module SumOfOdds_Test } BB1 { assert { [@expl:assertion] [#"../sum_of_odds.rs" 53 8 53 29] let _ = sum_of_odd_is_sqr0 (UInt32.to_int x) in is_square0 (UInt32.to_int y) }; - [#"../sum_of_odds.rs" 52 4 55 5] _0 <- ([#"../sum_of_odds.rs" 52 4 55 5] ()); + [#"../sum_of_odds.rs" 52 4 55 5] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/swap_borrows.mlcfg b/creusot/tests/should_succeed/swap_borrows.mlcfg index 1dfaf453a0..79e4af1003 100644 --- a/creusot/tests/should_succeed/swap_borrows.mlcfg +++ b/creusot/tests/should_succeed/swap_borrows.mlcfg @@ -36,7 +36,7 @@ module SwapBorrows_Swap BB1 { assert { [@expl:type invariant] inv0 x }; assume { resolve0 x }; - [#"../swap_borrows.rs" 6 4 6 14] _0 <- ([#"../swap_borrows.rs" 6 4 6 14] ((let (_, a) = x in a), (let (a, _) = x in a))); + [#"../swap_borrows.rs" 6 4 6 14] _0 <- ((let (_, a) = x in a), (let (a, _) = x in a)); x <- (let (x0, x1) = x in (x0, any t)); x <- (let (x0, x1) = x in (any t, x1)); goto BB2 @@ -106,9 +106,9 @@ module SwapBorrows_F goto BB0 } BB0 { - [#"../swap_borrows.rs" 11 25 11 31] _3 <- ([#"../swap_borrows.rs" 11 25 11 31] ((0 : uint32), (0 : uint32))); - [#"../swap_borrows.rs" 11 9 11 14] a <- ([#"../swap_borrows.rs" 11 9 11 14] let (a, _) = _3 in a); - [#"../swap_borrows.rs" 11 16 11 21] b <- ([#"../swap_borrows.rs" 11 16 11 21] let (_, a) = _3 in a); + [#"../swap_borrows.rs" 11 25 11 31] _3 <- ((0 : uint32), (0 : uint32)); + [#"../swap_borrows.rs" 11 9 11 14] a <- (let (a, _) = _3 in a); + [#"../swap_borrows.rs" 11 16 11 21] b <- (let (_, a) = _3 in a); assume { resolve0 _3 }; [#"../swap_borrows.rs" 12 18 12 24] _6 <- Borrow.borrow_mut a; [#"../swap_borrows.rs" 12 18 12 24] a <- ^ _6; @@ -116,7 +116,7 @@ module SwapBorrows_F [#"../swap_borrows.rs" 12 26 12 32] b <- ^ _8; [#"../swap_borrows.rs" 12 26 12 32] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8); [#"../swap_borrows.rs" 12 26 12 32] _8 <- { _8 with current = ( ^ _7) ; }; - [#"../swap_borrows.rs" 12 17 12 33] _5 <- ([#"../swap_borrows.rs" 12 17 12 33] (_6, _7)); + [#"../swap_borrows.rs" 12 17 12 33] _5 <- (_6, _7); _6 <- any borrowed uint32; _7 <- any borrowed uint32; [#"../swap_borrows.rs" 12 12 12 34] p <- ([#"../swap_borrows.rs" 12 12 12 34] swap0 _5); @@ -125,11 +125,11 @@ module SwapBorrows_F } BB1 { assume { resolve1 _8 }; - [#"../swap_borrows.rs" 13 4 13 13] p <- (let (x0, x1) = p in ({ (let (a, _) = p in a) with current = ([#"../swap_borrows.rs" 13 4 13 13] (10 : uint32)) ; }, x1)); + [#"../swap_borrows.rs" 13 4 13 13] p <- (let (x0, x1) = p in ({ (let (a, _) = p in a) with current = (10 : uint32) ; }, x1)); assume { resolve2 p }; assert { [@expl:assertion] [#"../swap_borrows.rs" 15 20 15 30] b = (10 : uint32) }; assert { [@expl:assertion] [#"../swap_borrows.rs" 16 20 16 29] a = (0 : uint32) }; - [#"../swap_borrows.rs" 10 11 17 1] _0 <- ([#"../swap_borrows.rs" 10 11 17 1] ()); + [#"../swap_borrows.rs" 10 11 17 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/switch.mlcfg b/creusot/tests/should_succeed/switch.mlcfg index 589df93f59..140b0c94f3 100644 --- a/creusot/tests/should_succeed/switch.mlcfg +++ b/creusot/tests/should_succeed/switch.mlcfg @@ -33,7 +33,7 @@ module Switch_Test goto BB4 } BB2 { - [#"../switch.rs" 12 16 12 21] _0 <- ([#"../switch.rs" 12 16 12 21] false); + [#"../switch.rs" 12 16 12 21] _0 <- false; goto BB5 } BB3 { @@ -41,8 +41,8 @@ module Switch_Test absurd } BB4 { - [#"../switch.rs" 11 13 11 14] x <- ([#"../switch.rs" 11 13 11 14] Switch_Option_Type.some_0 o); - [#"../switch.rs" 11 19 11 24] _0 <- ([#"../switch.rs" 11 19 11 24] x > (0 : uint32)); + [#"../switch.rs" 11 13 11 14] x <- Switch_Option_Type.some_0 o; + [#"../switch.rs" 11 19 11 24] _0 <- x > (0 : uint32); goto BB5 } BB5 { @@ -88,7 +88,7 @@ module Switch_Test2 goto BB4 } BB2 { - [#"../switch.rs" 19 16 19 19] _0 <- ([#"../switch.rs" 19 16 19 19] let (_, a) = o in a); + [#"../switch.rs" 19 16 19 19] _0 <- (let (_, a) = o in a); assume { resolve0 o }; goto BB5 } @@ -98,9 +98,9 @@ module Switch_Test2 absurd } BB4 { - [#"../switch.rs" 18 13 18 14] x <- ([#"../switch.rs" 18 13 18 14] Switch_Option_Type.some_0 (let (a, _) = o in a)); + [#"../switch.rs" 18 13 18 14] x <- Switch_Option_Type.some_0 (let (a, _) = o in a); assume { resolve0 o }; - [#"../switch.rs" 18 19 18 20] _0 <- ([#"../switch.rs" 18 19 18 20] x); + [#"../switch.rs" 18 19 18 20] _0 <- x; goto BB5 } BB5 { diff --git a/creusot/tests/should_succeed/switch_struct.mlcfg b/creusot/tests/should_succeed/switch_struct.mlcfg index dceefd3ca6..e75277f8c2 100644 --- a/creusot/tests/should_succeed/switch_struct.mlcfg +++ b/creusot/tests/should_succeed/switch_struct.mlcfg @@ -41,8 +41,8 @@ module SwitchStruct_Test goto BB4 } BB2 { - [#"../switch_struct.rs" 12 12 12 18] field2 <- ([#"../switch_struct.rs" 12 12 12 18] SwitchStruct_M_Type.g_field2 o); - [#"../switch_struct.rs" 12 24 12 35] _0 <- ([#"../switch_struct.rs" 12 24 12 35] field2 = (0 : uint32)); + [#"../switch_struct.rs" 12 12 12 18] field2 <- SwitchStruct_M_Type.g_field2 o; + [#"../switch_struct.rs" 12 24 12 35] _0 <- field2 = (0 : uint32); goto BB5 } BB3 { @@ -50,8 +50,8 @@ module SwitchStruct_Test absurd } BB4 { - [#"../switch_struct.rs" 11 12 11 18] field1 <- ([#"../switch_struct.rs" 11 12 11 18] SwitchStruct_M_Type.f_field1 o); - [#"../switch_struct.rs" 11 24 11 34] _0 <- ([#"../switch_struct.rs" 11 24 11 34] field1 > (0 : uint32)); + [#"../switch_struct.rs" 11 12 11 18] field1 <- SwitchStruct_M_Type.f_field1 o; + [#"../switch_struct.rs" 11 24 11 34] _0 <- field1 > (0 : uint32); goto BB5 } BB5 { diff --git a/creusot/tests/should_succeed/syntax/01_idents.mlcfg b/creusot/tests/should_succeed/syntax/01_idents.mlcfg index f2db50cf1c..450851630a 100644 --- a/creusot/tests/should_succeed/syntax/01_idents.mlcfg +++ b/creusot/tests/should_succeed/syntax/01_idents.mlcfg @@ -7,7 +7,7 @@ module C01Idents_Clone goto BB0 } BB0 { - [#"../01_idents.rs" 3 15 3 17] _0 <- ([#"../01_idents.rs" 3 15 3 17] ()); + [#"../01_idents.rs" 3 15 3 17] _0 <- (); return _0 } @@ -20,7 +20,7 @@ module C01Idents_Function goto BB0 } BB0 { - [#"../01_idents.rs" 5 18 5 20] _0 <- ([#"../01_idents.rs" 5 18 5 20] ()); + [#"../01_idents.rs" 5 18 5 20] _0 <- (); return _0 } @@ -33,7 +33,7 @@ module C01Idents_Import goto BB0 } BB0 { - [#"../01_idents.rs" 7 16 7 18] _0 <- ([#"../01_idents.rs" 7 16 7 18] ()); + [#"../01_idents.rs" 7 16 7 18] _0 <- (); return _0 } @@ -46,7 +46,7 @@ module C01Idents_Export goto BB0 } BB0 { - [#"../01_idents.rs" 9 16 9 18] _0 <- ([#"../01_idents.rs" 9 16 9 18] ()); + [#"../01_idents.rs" 9 16 9 18] _0 <- (); return _0 } @@ -59,7 +59,7 @@ module C01Idents_Result goto BB0 } BB0 { - [#"../01_idents.rs" 11 16 11 18] _0 <- ([#"../01_idents.rs" 11 16 11 18] ()); + [#"../01_idents.rs" 11 16 11 18] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/syntax/02_operators.mlcfg b/creusot/tests/should_succeed/syntax/02_operators.mlcfg index 52a2159d64..9d4e92c184 100644 --- a/creusot/tests/should_succeed/syntax/02_operators.mlcfg +++ b/creusot/tests/should_succeed/syntax/02_operators.mlcfg @@ -16,13 +16,13 @@ module C02Operators_Division goto BB0 } BB0 { - [#"../02_operators.rs" 9 8 9 9] _5 <- ([#"../02_operators.rs" 9 8 9 9] y); - [#"../02_operators.rs" 9 4 9 9] _6 <- ([#"../02_operators.rs" 9 4 9 9] _5 = (0 : usize)); + [#"../02_operators.rs" 9 8 9 9] _5 <- y; + [#"../02_operators.rs" 9 4 9 9] _6 <- _5 = (0 : usize); assert { [@expl:division by zero] [#"../02_operators.rs" 9 4 9 9] not _6 }; goto BB1 } BB1 { - [#"../02_operators.rs" 9 4 9 9] _0 <- ([#"../02_operators.rs" 9 4 9 9] x / _5); + [#"../02_operators.rs" 9 4 9 9] _0 <- x / _5; _5 <- any usize; return _0 } @@ -45,13 +45,13 @@ module C02Operators_Modulus goto BB0 } BB0 { - [#"../02_operators.rs" 24 8 24 9] _5 <- ([#"../02_operators.rs" 24 8 24 9] y); - [#"../02_operators.rs" 24 4 24 9] _6 <- ([#"../02_operators.rs" 24 4 24 9] _5 = (0 : usize)); + [#"../02_operators.rs" 24 8 24 9] _5 <- y; + [#"../02_operators.rs" 24 4 24 9] _6 <- _5 = (0 : usize); assert { [@expl:remainder by zero] [#"../02_operators.rs" 24 4 24 9] not _6 }; goto BB1 } BB1 { - [#"../02_operators.rs" 24 4 24 9] _0 <- ([#"../02_operators.rs" 24 4 24 9] x % _5); + [#"../02_operators.rs" 24 4 24 9] _0 <- x % _5; _5 <- any usize; return _0 } @@ -74,7 +74,7 @@ module C02Operators_Multiply goto BB0 } BB0 { - [#"../02_operators.rs" 39 4 39 9] _0 <- ([#"../02_operators.rs" 39 4 39 9] x * y); + [#"../02_operators.rs" 39 4 39 9] _0 <- x * y; return _0 } @@ -96,7 +96,7 @@ module C02Operators_Add goto BB0 } BB0 { - [#"../02_operators.rs" 49 4 49 9] _0 <- ([#"../02_operators.rs" 49 4 49 9] x + y); + [#"../02_operators.rs" 49 4 49 9] _0 <- x + y; return _0 } @@ -116,7 +116,7 @@ module C02Operators_Sub goto BB0 } BB0 { - [#"../02_operators.rs" 64 4 64 9] _0 <- ([#"../02_operators.rs" 64 4 64 9] x - y); + [#"../02_operators.rs" 64 4 64 9] _0 <- x - y; return _0 } @@ -149,27 +149,27 @@ module C02Operators_Expression goto BB0 } BB0 { - [#"../02_operators.rs" 78 8 78 9] _10 <- ([#"../02_operators.rs" 78 8 78 9] y); - [#"../02_operators.rs" 78 4 78 9] _11 <- ([#"../02_operators.rs" 78 4 78 9] _10 = (0 : usize)); + [#"../02_operators.rs" 78 8 78 9] _10 <- y; + [#"../02_operators.rs" 78 4 78 9] _11 <- _10 = (0 : usize); assert { [@expl:division by zero] [#"../02_operators.rs" 78 4 78 9] not _11 }; goto BB1 } BB1 { - [#"../02_operators.rs" 78 4 78 9] _8 <- ([#"../02_operators.rs" 78 4 78 9] x / _10); + [#"../02_operators.rs" 78 4 78 9] _8 <- x / _10; _10 <- any usize; - [#"../02_operators.rs" 78 4 78 13] _7 <- ([#"../02_operators.rs" 78 4 78 13] _8 * z); + [#"../02_operators.rs" 78 4 78 13] _7 <- _8 * z; _8 <- any usize; - [#"../02_operators.rs" 78 22 78 23] _16 <- ([#"../02_operators.rs" 78 22 78 23] y); - [#"../02_operators.rs" 78 17 78 24] _17 <- ([#"../02_operators.rs" 78 17 78 24] _16 = (0 : usize)); + [#"../02_operators.rs" 78 22 78 23] _16 <- y; + [#"../02_operators.rs" 78 17 78 24] _17 <- _16 = (0 : usize); assert { [@expl:division by zero] [#"../02_operators.rs" 78 17 78 24] not _17 }; goto BB2 } BB2 { - [#"../02_operators.rs" 78 17 78 24] _14 <- ([#"../02_operators.rs" 78 17 78 24] x / _16); + [#"../02_operators.rs" 78 17 78 24] _14 <- x / _16; _16 <- any usize; - [#"../02_operators.rs" 78 17 78 28] _13 <- ([#"../02_operators.rs" 78 17 78 28] _14 * z); + [#"../02_operators.rs" 78 17 78 28] _13 <- _14 * z; _14 <- any usize; - [#"../02_operators.rs" 78 4 78 28] _0 <- ([#"../02_operators.rs" 78 4 78 28] _7 = _13); + [#"../02_operators.rs" 78 4 78 28] _0 <- _7 = _13; _7 <- any usize; _13 <- any usize; return _0 @@ -208,7 +208,7 @@ module C02Operators_PrimitiveComparison goto BB0 } BB0 { - [#"../02_operators.rs" 92 30 92 32] _0 <- ([#"../02_operators.rs" 92 30 92 32] ()); + [#"../02_operators.rs" 92 30 92 32] _0 <- (); return _0 } @@ -226,7 +226,7 @@ module C02Operators_BoolEq goto BB0 } BB0 { - [#"../02_operators.rs" 96 4 96 10] _0 <- ([#"../02_operators.rs" 96 4 96 10] Bool.eqb a b); + [#"../02_operators.rs" 96 4 96 10] _0 <- Bool.eqb a b; return _0 } @@ -241,7 +241,7 @@ module C02Operators_OldTest goto BB0 } BB0 { - [#"../02_operators.rs" 100 21 100 23] _0 <- ([#"../02_operators.rs" 100 21 100 23] ()); + [#"../02_operators.rs" 100 21 100 23] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg b/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg index c5083b7d7b..783bdf135c 100644 --- a/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg +++ b/creusot/tests/should_succeed/syntax/04_assoc_prec.mlcfg @@ -25,7 +25,7 @@ module C04AssocPrec_RespectPrec } BB0 { assume { resolve0 x }; - [#"../04_assoc_prec.rs" 10 35 10 37] _0 <- ([#"../04_assoc_prec.rs" 10 35 10 37] ()); + [#"../04_assoc_prec.rs" 10 35 10 37] _0 <- (); return _0 } @@ -41,7 +41,7 @@ module C04AssocPrec_RespectAssoc goto BB0 } BB0 { - [#"../04_assoc_prec.rs" 13 23 13 25] _0 <- ([#"../04_assoc_prec.rs" 13 23 13 25] ()); + [#"../04_assoc_prec.rs" 13 23 13 25] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/syntax/05_annotations.mlcfg b/creusot/tests/should_succeed/syntax/05_annotations.mlcfg index 78a410f58d..ecb8a4e9db 100644 --- a/creusot/tests/should_succeed/syntax/05_annotations.mlcfg +++ b/creusot/tests/should_succeed/syntax/05_annotations.mlcfg @@ -30,7 +30,7 @@ module C05Annotations_Assertion goto BB1 } BB1 { - [#"../05_annotations.rs" 5 26 7 1] _0 <- ([#"../05_annotations.rs" 5 26 7 1] ()); + [#"../05_annotations.rs" 5 26 7 1] _0 <- (); goto BB2 } BB2 { diff --git a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg index b2873eb912..3e8ac9db05 100644 --- a/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg +++ b/creusot/tests/should_succeed/syntax/05_pearlite.mlcfg @@ -66,7 +66,7 @@ module C05Pearlite_StructInPearlite goto BB0 } BB0 { - [#"../05_pearlite.rs" 24 32 24 34] _0 <- ([#"../05_pearlite.rs" 24 32 24 34] ()); + [#"../05_pearlite.rs" 24 32 24 34] _0 <- (); return _0 } @@ -91,7 +91,7 @@ module C05Pearlite_StructOrder goto BB0 } BB0 { - [#"../05_pearlite.rs" 32 26 32 28] _0 <- ([#"../05_pearlite.rs" 32 26 32 28] ()); + [#"../05_pearlite.rs" 32 26 32 28] _0 <- (); return _0 } @@ -115,7 +115,7 @@ module C05Pearlite_GhostClosure goto BB1 } BB1 { - [#"../05_pearlite.rs" 48 23 50 1] _0 <- ([#"../05_pearlite.rs" 48 23 50 1] ()); + [#"../05_pearlite.rs" 48 23 50 1] _0 <- (); return _0 } @@ -133,7 +133,7 @@ module C05Pearlite_PearliteClosure goto BB0 } BB0 { - [#"../05_pearlite.rs" 52 58 52 60] _0 <- ([#"../05_pearlite.rs" 52 58 52 60] ()); + [#"../05_pearlite.rs" 52 58 52 60] _0 <- (); return _0 } @@ -164,7 +164,7 @@ module C05Pearlite_Caller goto BB2 } BB2 { - [#"../05_pearlite.rs" 54 16 56 1] _0 <- ([#"../05_pearlite.rs" 54 16 56 1] ()); + [#"../05_pearlite.rs" 54 16 56 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg b/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg index bf420021a7..8cb79fb3a3 100644 --- a/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg +++ b/creusot/tests/should_succeed/syntax/07_extern_spec.mlcfg @@ -9,7 +9,7 @@ module C07ExternSpec_Impl0_Func goto BB0 } BB0 { - [#"../07_extern_spec.rs" 12 8 12 12] _0 <- ([#"../07_extern_spec.rs" 12 8 12 12] true); + [#"../07_extern_spec.rs" 12 8 12 12] _0 <- true; return _0 } diff --git a/creusot/tests/should_succeed/syntax/09_maintains.mlcfg b/creusot/tests/should_succeed/syntax/09_maintains.mlcfg index bf775481c0..63daa2bd34 100644 --- a/creusot/tests/should_succeed/syntax/09_maintains.mlcfg +++ b/creusot/tests/should_succeed/syntax/09_maintains.mlcfg @@ -23,7 +23,7 @@ module C09Maintains_Test1 goto BB0 } BB0 { - [#"../09_maintains.rs" 28 37 28 39] _0 <- ([#"../09_maintains.rs" 28 37 28 39] ()); + [#"../09_maintains.rs" 28 37 28 39] _0 <- (); return _0 } @@ -55,7 +55,7 @@ module C09Maintains_Test2 } BB0 { assume { resolve0 a }; - [#"../09_maintains.rs" 31 42 31 44] _0 <- ([#"../09_maintains.rs" 31 42 31 44] ()); + [#"../09_maintains.rs" 31 42 31 44] _0 <- (); return _0 } @@ -94,7 +94,7 @@ module C09Maintains_Test3 BB0 { assume { resolve0 b }; assume { resolve1 a }; - [#"../09_maintains.rs" 34 47 34 49] _0 <- ([#"../09_maintains.rs" 34 47 34 49] ()); + [#"../09_maintains.rs" 34 47 34 49] _0 <- (); return _0 } @@ -119,7 +119,7 @@ module C09Maintains_Test5 goto BB0 } BB0 { - [#"../09_maintains.rs" 37 30 37 32] _0 <- ([#"../09_maintains.rs" 37 30 37 32] ()); + [#"../09_maintains.rs" 37 30 37 32] _0 <- (); return _0 } @@ -141,7 +141,7 @@ module C09Maintains_Test6 goto BB0 } BB0 { - [#"../09_maintains.rs" 40 29 40 31] _0 <- ([#"../09_maintains.rs" 40 29 40 31] ()); + [#"../09_maintains.rs" 40 29 40 31] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg index d3af288582..2134434395 100644 --- a/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg +++ b/creusot/tests/should_succeed/syntax/10_mutual_rec_types.mlcfg @@ -46,7 +46,7 @@ module C10MutualRecTypes_UseTree goto BB0 } BB0 { - [#"../10_mutual_rec_types.rs" 13 26 13 28] _0 <- ([#"../10_mutual_rec_types.rs" 13 26 13 28] ()); + [#"../10_mutual_rec_types.rs" 13 26 13 28] _0 <- (); return _0 } @@ -117,7 +117,7 @@ module C10MutualRecTypes_Impl0_Height goto BB4 } BB2 { - [#"../10_mutual_rec_types.rs" 19 22 19 23] n <- ([#"../10_mutual_rec_types.rs" 19 22 19 23] Core_Option_Option_Type.some_0 (C10MutualRecTypes_Tree_Type.tree_0 self)); + [#"../10_mutual_rec_types.rs" 19 22 19 23] n <- Core_Option_Option_Type.some_0 (C10MutualRecTypes_Tree_Type.tree_0 self); [#"../10_mutual_rec_types.rs" 19 29 19 44] _5 <- ([#"../10_mutual_rec_types.rs" 19 29 19 44] height (C10MutualRecTypes_Node_Type.node_left n)); goto BB5 } @@ -126,7 +126,7 @@ module C10MutualRecTypes_Impl0_Height absurd } BB4 { - [#"../10_mutual_rec_types.rs" 18 26 18 27] _0 <- ([#"../10_mutual_rec_types.rs" 18 26 18 27] (0 : uint64)); + [#"../10_mutual_rec_types.rs" 18 26 18 27] _0 <- (0 : uint64); goto BB8 } BB5 { @@ -140,7 +140,7 @@ module C10MutualRecTypes_Impl0_Height goto BB7 } BB7 { - [#"../10_mutual_rec_types.rs" 19 29 19 70] _0 <- ([#"../10_mutual_rec_types.rs" 19 29 19 70] _4 + (1 : uint64)); + [#"../10_mutual_rec_types.rs" 19 29 19 70] _0 <- _4 + (1 : uint64); _4 <- any uint64; goto BB8 } diff --git a/creusot/tests/should_succeed/syntax/11_array_types.mlcfg b/creusot/tests/should_succeed/syntax/11_array_types.mlcfg index 1c35d39d16..71deebf0a5 100644 --- a/creusot/tests/should_succeed/syntax/11_array_types.mlcfg +++ b/creusot/tests/should_succeed/syntax/11_array_types.mlcfg @@ -42,16 +42,16 @@ module C11ArrayTypes_Omg goto BB0 } BB0 { - [#"../11_array_types.rs" 9 8 9 9] _3 <- ([#"../11_array_types.rs" 9 8 9 9] (0 : usize)); - [#"../11_array_types.rs" 9 4 9 10] _4 <- ([#"../11_array_types.rs" 9 4 9 10] Slice.length (C11ArrayTypes_UsesArray_Type.usesarray_0 x)); - [#"../11_array_types.rs" 9 4 9 10] _5 <- ([#"../11_array_types.rs" 9 4 9 10] _3 < _4); + [#"../11_array_types.rs" 9 8 9 9] _3 <- (0 : usize); + [#"../11_array_types.rs" 9 4 9 10] _4 <- Slice.length (C11ArrayTypes_UsesArray_Type.usesarray_0 x); + [#"../11_array_types.rs" 9 4 9 10] _5 <- _3 < _4; assert { [@expl:index in bounds] [#"../11_array_types.rs" 9 4 9 10] _5 }; goto BB1 } BB1 { - [#"../11_array_types.rs" 9 4 9 14] x <- (let C11ArrayTypes_UsesArray_Type.C_UsesArray x0 = x in C11ArrayTypes_UsesArray_Type.C_UsesArray (Slice.set (C11ArrayTypes_UsesArray_Type.usesarray_0 x) _3 ([#"../11_array_types.rs" 9 4 9 14] (5 : int64)))); + [#"../11_array_types.rs" 9 4 9 14] x <- (let C11ArrayTypes_UsesArray_Type.C_UsesArray x0 = x in C11ArrayTypes_UsesArray_Type.C_UsesArray (Slice.set (C11ArrayTypes_UsesArray_Type.usesarray_0 x) _3 (5 : int64))); assert { [@expl:assertion] [#"../11_array_types.rs" 11 20 11 32] Int64.to_int (index_logic0 (C11ArrayTypes_UsesArray_Type.usesarray_0 x) 0) = 5 }; - [#"../11_array_types.rs" 8 29 12 1] _0 <- ([#"../11_array_types.rs" 8 29 12 1] ()); + [#"../11_array_types.rs" 8 29 12 1] _0 <- (); return _0 } @@ -79,8 +79,8 @@ module C11ArrayTypes_CallOmg goto BB0 } BB0 { - [#"../11_array_types.rs" 15 14 15 24] arr <- ([#"../11_array_types.rs" 15 14 15 24] Slice.create (5 : usize) (fun _ -> (3 : int64))); - [#"../11_array_types.rs" 16 8 16 22] _2 <- ([#"../11_array_types.rs" 16 8 16 22] C11ArrayTypes_UsesArray_Type.C_UsesArray arr); + [#"../11_array_types.rs" 15 14 15 24] arr <- Slice.create (5 : usize) (fun _ -> (3 : int64)); + [#"../11_array_types.rs" 16 8 16 22] _2 <- C11ArrayTypes_UsesArray_Type.C_UsesArray arr; [#"../11_array_types.rs" 16 4 16 23] _0 <- ([#"../11_array_types.rs" 16 4 16 23] omg0 _2); _2 <- any C11ArrayTypes_UsesArray_Type.t_usesarray; goto BB1 diff --git a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg index 62fe4c7f44..f343d880f0 100644 --- a/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg +++ b/creusot/tests/should_succeed/syntax/12_ghost_code.mlcfg @@ -19,7 +19,7 @@ module C12GhostCode_GhostArg goto BB1 } BB1 { - [#"../12_ghost_code.rs" 4 35 6 1] _0 <- ([#"../12_ghost_code.rs" 4 35 6 1] ()); + [#"../12_ghost_code.rs" 4 35 6 1] _0 <- (); return _0 } @@ -142,7 +142,7 @@ module C12GhostCode_GhostVec goto BB2 } BB2 { - [#"../12_ghost_code.rs" 8 19 11 1] _0 <- ([#"../12_ghost_code.rs" 8 19 11 1] ()); + [#"../12_ghost_code.rs" 8 19 11 1] _0 <- (); goto BB3 } BB3 { @@ -169,7 +169,7 @@ module C12GhostCode_GhostCopy goto BB0 } BB0 { - [#"../12_ghost_code.rs" 18 12 18 13] a <- ([#"../12_ghost_code.rs" 18 12 18 13] (0 : int32)); + [#"../12_ghost_code.rs" 18 12 18 13] a <- (0 : int32); [#"../12_ghost_code.rs" 19 17 19 52] _s <- ([#"../12_ghost_code.rs" 19 17 19 52] Snapshot.new (Seq.snoc (Seq.empty ) (0 : int32))); goto BB1 } @@ -178,9 +178,9 @@ module C12GhostCode_GhostCopy goto BB2 } BB2 { - [#"../12_ghost_code.rs" 20 4 20 33] _s <- ([#"../12_ghost_code.rs" 20 4 20 33] _4); + [#"../12_ghost_code.rs" 20 4 20 33] _s <- _4; _4 <- any Snapshot.snap_ty (Seq.seq int32); - [#"../12_ghost_code.rs" 17 20 21 1] _0 <- ([#"../12_ghost_code.rs" 17 20 21 1] ()); + [#"../12_ghost_code.rs" 17 20 21 1] _0 <- (); return _0 } @@ -208,7 +208,7 @@ module C12GhostCode_GhostIsCopy goto BB0 } BB0 { - [#"../12_ghost_code.rs" 24 16 24 17] x <- ([#"../12_ghost_code.rs" 24 16 24 17] (0 : int32)); + [#"../12_ghost_code.rs" 24 16 24 17] x <- (0 : int32); [#"../12_ghost_code.rs" 25 12 25 18] r <- Borrow.borrow_mut x; [#"../12_ghost_code.rs" 25 12 25 18] x <- ^ r; assume { resolve0 r }; @@ -216,10 +216,10 @@ module C12GhostCode_GhostIsCopy goto BB1 } BB1 { - [#"../12_ghost_code.rs" 27 13 27 14] g1 <- ([#"../12_ghost_code.rs" 27 13 27 14] g); - [#"../12_ghost_code.rs" 28 13 28 14] g2 <- ([#"../12_ghost_code.rs" 28 13 28 14] g); + [#"../12_ghost_code.rs" 27 13 27 14] g1 <- g; + [#"../12_ghost_code.rs" 28 13 28 14] g2 <- g; assert { [@expl:assertion] [#"../12_ghost_code.rs" 29 18 29 26] g1 = g2 }; - [#"../12_ghost_code.rs" 23 23 30 1] _0 <- ([#"../12_ghost_code.rs" 23 23 30 1] ()); + [#"../12_ghost_code.rs" 23 23 30 1] _0 <- (); return _0 } @@ -292,7 +292,6 @@ module C12GhostCode_GhostCheck ensures { result = invariant0 self } axiom inv0 : forall x : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) . inv0 x = true - use prelude.Snapshot predicate resolve1 (self : int32) = [#"../../../../../creusot-contracts/src/resolve.rs" 45 8 45 12] true val resolve1 (self : int32) : bool @@ -333,14 +332,6 @@ module C12GhostCode_GhostCheck requires {inv2 value} ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 78 26 78 51] shallow_model0 ( ^ self) = Seq.snoc (shallow_model1 self) value } - use prelude.Snapshot - function logi_drop0 [#"../12_ghost_code.rs" 33 0 33 21] (_1 : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : () - - = - [#"../12_ghost_code.rs" 32 0 32 8] () - val logi_drop0 [#"../12_ghost_code.rs" 33 0 33 21] (_1 : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)) : () - ensures { result = logi_drop0 _1 } - val new0 (_1 : ()) : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global) ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 68 26 68 44] Seq.length (shallow_model0 result) = 0 } ensures { inv0 result } @@ -349,7 +340,6 @@ module C12GhostCode_GhostCheck = [@vc:do_not_keep_trace] [@vc:sp] var _0 : (); var x : Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global); - var _2 : Snapshot.snap_ty (); var _4 : (); var _5 : borrowed (Alloc_Vec_Vec_Type.t_vec int32 (Alloc_Alloc_Global_Type.t_global)); var _7 : bool; @@ -362,7 +352,6 @@ module C12GhostCode_GhostCheck goto BB1 } BB1 { - [#"../12_ghost_code.rs" 39 4 39 31] _2 <- ([#"../12_ghost_code.rs" 39 4 39 31] Snapshot.new (let _ = logi_drop0 x in ())); goto BB2 } BB2 { @@ -378,7 +367,7 @@ module C12GhostCode_GhostCheck } BB4 { assume { resolve0 x }; - [#"../12_ghost_code.rs" 43 12 43 24] _7 <- ([#"../12_ghost_code.rs" 43 12 43 24] _8 = (1 : usize)); + [#"../12_ghost_code.rs" 43 12 43 24] _7 <- _8 = (1 : usize); _8 <- any usize; switch (_7) | False -> goto BB6 @@ -386,7 +375,7 @@ module C12GhostCode_GhostCheck end } BB5 { - [#"../12_ghost_code.rs" 35 21 44 1] _0 <- ([#"../12_ghost_code.rs" 35 21 44 1] ()); + [#"../12_ghost_code.rs" 35 21 44 1] _0 <- (); goto BB7 } BB6 { @@ -449,9 +438,9 @@ module C12GhostCode_TakesStruct goto BB1 } BB1 { - [#"../12_ghost_code.rs" 53 4 53 27] x <- (let C12GhostCode_MyStruct_Type.C_MyStruct x0 x1 = x in C12GhostCode_MyStruct_Type.C_MyStruct x0 ([#"../12_ghost_code.rs" 53 4 53 27] _3)); + [#"../12_ghost_code.rs" 53 4 53 27] x <- (let C12GhostCode_MyStruct_Type.C_MyStruct x0 x1 = x in C12GhostCode_MyStruct_Type.C_MyStruct x0 _3); _3 <- any Snapshot.snap_ty uint32; - [#"../12_ghost_code.rs" 52 37 54 1] _0 <- ([#"../12_ghost_code.rs" 52 37 54 1] ()); + [#"../12_ghost_code.rs" 52 37 54 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg index d3c48b6e7b..b8feeaad66 100644 --- a/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg +++ b/creusot/tests/should_succeed/syntax/13_vec_macro.mlcfg @@ -232,7 +232,7 @@ module C13VecMacro_X goto BB4 } BB4 { - [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _10 <- ([#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp); + [#"../../../../../creusot-contracts/src/lib.rs" 296 47 296 56] _10 <- (let __arr_temp = any array int32 in assume {Seq.get (__arr_temp.elts) 0 = (1 : int32)}; assume {Seq.get (__arr_temp.elts) 1 = (2 : int32)}; assume {Seq.get (__arr_temp.elts) 2 = (3 : int32)}; assume {Slice.length __arr_temp = 3}; __arr_temp); goto BB5 } BB5 { @@ -249,7 +249,7 @@ module C13VecMacro_X goto BB8 } BB8 { - [#"../13_vec_macro.rs" 5 11 14 1] _0 <- ([#"../13_vec_macro.rs" 5 11 14 1] ()); + [#"../13_vec_macro.rs" 5 11 14 1] _0 <- (); goto BB9 } BB9 { diff --git a/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg b/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg index cf4c6cc585..4c04ffece0 100644 --- a/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg +++ b/creusot/tests/should_succeed/syntax/14_const_fns.mlcfg @@ -13,7 +13,7 @@ module C14ConstFns_Omg goto BB0 } BB0 { - [#"../14_const_fns.rs" 6 4 6 9] _0 <- ([#"../14_const_fns.rs" 6 4 6 9] x - (1 : int32)); + [#"../14_const_fns.rs" 6 4 6 9] _0 <- x - (1 : int32); return _0 } diff --git a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg index 48f558447b..604ef86cce 100644 --- a/creusot/tests/should_succeed/syntax/derive_macros.mlcfg +++ b/creusot/tests/should_succeed/syntax/derive_macros.mlcfg @@ -109,14 +109,14 @@ module DeriveMacros_Impl2_Clone goto BB0 } BB0 { - [#"../derive_macros.rs" 10 4 10 8] _5 <- ([#"../derive_macros.rs" 10 4 10 8] DeriveMacros_Product_Type.product_a self); + [#"../derive_macros.rs" 10 4 10 8] _5 <- DeriveMacros_Product_Type.product_a self; assert { [@expl:type invariant] inv0 _5 }; assume { resolve0 _5 }; [#"../derive_macros.rs" 10 4 10 8] _3 <- ([#"../derive_macros.rs" 10 4 10 8] clone0 _5); goto BB1 } BB1 { - [#"../derive_macros.rs" 11 4 11 8] _8 <- ([#"../derive_macros.rs" 11 4 11 8] DeriveMacros_Product_Type.product_b self); + [#"../derive_macros.rs" 11 4 11 8] _8 <- DeriveMacros_Product_Type.product_b self; assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; assert { [@expl:type invariant] inv2 _8 }; @@ -125,7 +125,7 @@ module DeriveMacros_Impl2_Clone goto BB2 } BB2 { - [#"../derive_macros.rs" 8 9 8 14] _0 <- ([#"../derive_macros.rs" 8 9 8 14] DeriveMacros_Product_Type.C_Product _3 _6); + [#"../derive_macros.rs" 8 9 8 14] _0 <- DeriveMacros_Product_Type.C_Product _3 _6; _3 <- any a; _6 <- any b; goto BB3 @@ -242,7 +242,7 @@ module DeriveMacros_Impl3_Eq goto BB0 } BB0 { - [#"../derive_macros.rs" 10 4 10 8] _7 <- ([#"../derive_macros.rs" 10 4 10 8] DeriveMacros_Product_Type.product_a rhs); + [#"../derive_macros.rs" 10 4 10 8] _7 <- DeriveMacros_Product_Type.product_a rhs; assert { [@expl:type invariant] inv0 _7 }; assume { resolve0 _7 }; [#"../derive_macros.rs" 10 4 10 8] _4 <- ([#"../derive_macros.rs" 10 4 10 8] eq0 (DeriveMacros_Product_Type.product_a self) _7); @@ -257,7 +257,7 @@ module DeriveMacros_Impl3_Eq BB2 { assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../derive_macros.rs" 11 4 11 8] _10 <- ([#"../derive_macros.rs" 11 4 11 8] DeriveMacros_Product_Type.product_b rhs); + [#"../derive_macros.rs" 11 4 11 8] _10 <- DeriveMacros_Product_Type.product_b rhs; assert { [@expl:type invariant] inv1 rhs }; assume { resolve1 rhs }; assert { [@expl:type invariant] inv2 _10 }; @@ -270,7 +270,7 @@ module DeriveMacros_Impl3_Eq assume { resolve1 rhs }; assert { [@expl:type invariant] inv1 self }; assume { resolve1 self }; - [#"../derive_macros.rs" 10 4 11 8] _0 <- ([#"../derive_macros.rs" 10 4 11 8] false); + [#"../derive_macros.rs" 10 4 11 8] _0 <- false; goto BB5 } BB4 { @@ -431,10 +431,10 @@ module DeriveMacros_Impl4_Clone goto BB4 } BB2 { - [#"../derive_macros.rs" 28 9 28 14] v0_11 <- ([#"../derive_macros.rs" 28 9 28 14] DeriveMacros_Sum_Type.b_0 self); + [#"../derive_macros.rs" 28 9 28 14] v0_11 <- DeriveMacros_Sum_Type.b_0 self; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../derive_macros.rs" 28 9 28 14] _11 <- ([#"../derive_macros.rs" 28 9 28 14] v0_11); + [#"../derive_macros.rs" 28 9 28 14] _11 <- v0_11; assert { [@expl:type invariant] inv3 _11 }; assume { resolve3 _11 }; [#"../derive_macros.rs" 28 9 28 14] _9 <- ([#"../derive_macros.rs" 28 9 28 14] clone1 _11); @@ -447,10 +447,10 @@ module DeriveMacros_Impl4_Clone absurd } BB4 { - [#"../derive_macros.rs" 28 9 28 14] v0_1 <- ([#"../derive_macros.rs" 28 9 28 14] DeriveMacros_Sum_Type.a_0 self); + [#"../derive_macros.rs" 28 9 28 14] v0_1 <- DeriveMacros_Sum_Type.a_0 self; assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; - [#"../derive_macros.rs" 28 9 28 14] _7 <- ([#"../derive_macros.rs" 28 9 28 14] v0_1); + [#"../derive_macros.rs" 28 9 28 14] _7 <- v0_1; assert { [@expl:type invariant] inv1 _7 }; assume { resolve1 _7 }; [#"../derive_macros.rs" 28 9 28 14] _5 <- ([#"../derive_macros.rs" 28 9 28 14] clone0 _7); @@ -459,7 +459,7 @@ module DeriveMacros_Impl4_Clone BB5 { assert { [@expl:type invariant] inv2 v0_1 }; assume { resolve2 v0_1 }; - [#"../derive_macros.rs" 28 9 28 14] _0 <- ([#"../derive_macros.rs" 28 9 28 14] DeriveMacros_Sum_Type.C_A _5); + [#"../derive_macros.rs" 28 9 28 14] _0 <- DeriveMacros_Sum_Type.C_A _5; _5 <- any a; goto BB6 } @@ -469,7 +469,7 @@ module DeriveMacros_Impl4_Clone BB7 { assert { [@expl:type invariant] inv4 v0_11 }; assume { resolve4 v0_11 }; - [#"../derive_macros.rs" 28 9 28 14] _0 <- ([#"../derive_macros.rs" 28 9 28 14] DeriveMacros_Sum_Type.C_B _9); + [#"../derive_macros.rs" 28 9 28 14] _0 <- DeriveMacros_Sum_Type.C_B _9; _9 <- any b; goto BB8 } @@ -610,7 +610,7 @@ module DeriveMacros_Impl5_Eq assume { resolve0 self }; assert { [@expl:type invariant] inv0 rhs }; assume { resolve0 rhs }; - [#"../derive_macros.rs" 28 16 28 25] _4 <- ([#"../derive_macros.rs" 28 16 28 25] (self, rhs)); + [#"../derive_macros.rs" 28 16 28 25] _4 <- (self, rhs); switch (let (a, _) = _4 in a) | DeriveMacros_Sum_Type.C_A _ -> goto BB1 | DeriveMacros_Sum_Type.C_B _ -> goto BB4 @@ -628,7 +628,7 @@ module DeriveMacros_Impl5_Eq BB3 { assert { [@expl:type invariant] inv1 _4 }; assume { resolve1 _4 }; - [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false); + [#"../derive_macros.rs" 28 16 28 25] _0 <- false; goto BB16 } BB4 { @@ -641,8 +641,8 @@ module DeriveMacros_Impl5_Eq goto BB11 } BB6 { - [#"../derive_macros.rs" 28 16 28 25] v0_1 <- ([#"../derive_macros.rs" 28 16 28 25] DeriveMacros_Sum_Type.a_0 (let (a, _) = _4 in a)); - [#"../derive_macros.rs" 28 16 28 25] v0_2 <- ([#"../derive_macros.rs" 28 16 28 25] DeriveMacros_Sum_Type.a_0 (let (_, a) = _4 in a)); + [#"../derive_macros.rs" 28 16 28 25] v0_1 <- DeriveMacros_Sum_Type.a_0 (let (a, _) = _4 in a); + [#"../derive_macros.rs" 28 16 28 25] v0_2 <- DeriveMacros_Sum_Type.a_0 (let (_, a) = _4 in a); assert { [@expl:type invariant] inv1 _4 }; assume { resolve1 _4 }; assert { [@expl:type invariant] inv2 v0_1 }; @@ -659,19 +659,19 @@ module DeriveMacros_Impl5_Eq end } BB8 { - [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] true); + [#"../derive_macros.rs" 28 16 28 25] _0 <- true; goto BB10 } BB9 { - [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false); + [#"../derive_macros.rs" 28 16 28 25] _0 <- false; goto BB10 } BB10 { goto BB16 } BB11 { - [#"../derive_macros.rs" 28 16 28 25] v0_11 <- ([#"../derive_macros.rs" 28 16 28 25] DeriveMacros_Sum_Type.b_0 (let (a, _) = _4 in a)); - [#"../derive_macros.rs" 28 16 28 25] v0_21 <- ([#"../derive_macros.rs" 28 16 28 25] DeriveMacros_Sum_Type.b_0 (let (_, a) = _4 in a)); + [#"../derive_macros.rs" 28 16 28 25] v0_11 <- DeriveMacros_Sum_Type.b_0 (let (a, _) = _4 in a); + [#"../derive_macros.rs" 28 16 28 25] v0_21 <- DeriveMacros_Sum_Type.b_0 (let (_, a) = _4 in a); assert { [@expl:type invariant] inv1 _4 }; assume { resolve1 _4 }; assert { [@expl:type invariant] inv3 v0_11 }; @@ -688,11 +688,11 @@ module DeriveMacros_Impl5_Eq end } BB13 { - [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] true); + [#"../derive_macros.rs" 28 16 28 25] _0 <- true; goto BB15 } BB14 { - [#"../derive_macros.rs" 28 16 28 25] _0 <- ([#"../derive_macros.rs" 28 16 28 25] false); + [#"../derive_macros.rs" 28 16 28 25] _0 <- false; goto BB15 } BB15 { diff --git a/creusot/tests/should_succeed/take_first_mut.mlcfg b/creusot/tests/should_succeed/take_first_mut.mlcfg index 8c80823cf2..22a97d95a3 100644 --- a/creusot/tests/should_succeed/take_first_mut.mlcfg +++ b/creusot/tests/should_succeed/take_first_mut.mlcfg @@ -205,16 +205,16 @@ module TakeFirstMut_TakeFirstMut goto BB6 } BB4 { - [#"../take_first_mut.rs" 17 14 17 19] first <- ([#"../take_first_mut.rs" 17 14 17 19] let (a, _) = Core_Option_Option_Type.some_0 _3 in a); + [#"../take_first_mut.rs" 17 14 17 19] first <- (let (a, _) = Core_Option_Option_Type.some_0 _3 in a); _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (let (x0, x1) = Core_Option_Option_Type.some_0 _3 in (any borrowed t, x1))); - [#"../take_first_mut.rs" 17 21 17 24] rem <- ([#"../take_first_mut.rs" 17 21 17 24] let (_, a) = Core_Option_Option_Type.some_0 _3 in a); + [#"../take_first_mut.rs" 17 21 17 24] rem <- (let (_, a) = Core_Option_Option_Type.some_0 _3 in a); _3 <- (let Core_Option_Option_Type.C_Some x0 = _3 in Core_Option_Option_Type.C_Some (let (x0, x1) = Core_Option_Option_Type.some_0 _3 in (x0, any borrowed (slice t)))); assert { [@expl:type invariant] inv2 _3 }; assume { resolve0 _3 }; [#"../take_first_mut.rs" 18 21 18 24] _11 <- Borrow.borrow_final ( * rem) (Borrow.get_id rem); [#"../take_first_mut.rs" 18 21 18 24] rem <- { rem with current = ( ^ _11) ; }; assume { inv1 ( ^ _11) }; - [#"../take_first_mut.rs" 18 12 18 24] self_ <- { self_ with current = ([#"../take_first_mut.rs" 18 12 18 24] _11) ; }; + [#"../take_first_mut.rs" 18 12 18 24] self_ <- { self_ with current = _11 ; }; _11 <- any borrowed (slice t); assert { [@expl:type invariant] inv0 ( * self_) }; assume { resolve2 ( * self_) }; @@ -223,7 +223,7 @@ module TakeFirstMut_TakeFirstMut [#"../take_first_mut.rs" 19 17 19 22] _12 <- Borrow.borrow_final ( * first) (Borrow.get_id first); [#"../take_first_mut.rs" 19 17 19 22] first <- { first with current = ( ^ _12) ; }; assume { inv4 ( ^ _12) }; - [#"../take_first_mut.rs" 19 12 19 23] _0 <- ([#"../take_first_mut.rs" 19 12 19 23] Core_Option_Option_Type.C_Some _12); + [#"../take_first_mut.rs" 19 12 19 23] _0 <- Core_Option_Option_Type.C_Some _12; _12 <- any borrowed t; assert { [@expl:type invariant] inv0 rem }; assume { resolve2 rem }; @@ -248,7 +248,7 @@ module TakeFirstMut_TakeFirstMut assume { resolve0 _3 }; assert { [@expl:type invariant] inv3 self_ }; assume { resolve1 self_ }; - [#"../take_first_mut.rs" 16 23 16 27] _0 <- ([#"../take_first_mut.rs" 16 23 16 27] Core_Option_Option_Type.C_None); + [#"../take_first_mut.rs" 16 23 16 27] _0 <- Core_Option_Option_Type.C_None; assert { [@expl:type invariant] inv0 _5 }; assume { resolve2 _5 }; goto BB7 diff --git a/creusot/tests/should_succeed/trait.mlcfg b/creusot/tests/should_succeed/trait.mlcfg index 37b9f6d5b8..d4f64dd723 100644 --- a/creusot/tests/should_succeed/trait.mlcfg +++ b/creusot/tests/should_succeed/trait.mlcfg @@ -26,7 +26,7 @@ module Trait_UsesCustom goto BB0 } BB0 { - [#"../trait.rs" 9 55 9 57] _0 <- ([#"../trait.rs" 9 55 9 57] ()); + [#"../trait.rs" 9 55 9 57] _0 <- (); assert { [@expl:type invariant] inv0 _t }; assume { resolve0 _t }; goto BB1 @@ -63,7 +63,7 @@ module Trait_UsesCustom2 goto BB0 } BB0 { - [#"../trait.rs" 13 62 13 64] _0 <- ([#"../trait.rs" 13 62 13 64] ()); + [#"../trait.rs" 13 62 13 64] _0 <- (); assert { [@expl:type invariant] inv0 _t }; assume { resolve0 _t }; goto BB1 diff --git a/creusot/tests/should_succeed/trait_impl.mlcfg b/creusot/tests/should_succeed/trait_impl.mlcfg index 72dd32901b..2639dce0ae 100644 --- a/creusot/tests/should_succeed/trait_impl.mlcfg +++ b/creusot/tests/should_succeed/trait_impl.mlcfg @@ -35,7 +35,7 @@ module TraitImpl_Impl0_X goto BB0 } BB0 { - [#"../trait_impl.rs" 25 15 25 17] _0 <- ([#"../trait_impl.rs" 25 15 25 17] ()); + [#"../trait_impl.rs" 25 15 25 17] _0 <- (); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; goto BB1 @@ -56,7 +56,7 @@ module TraitImpl_Impl1_X goto BB0 } BB0 { - [#"../trait_impl.rs" 29 15 29 17] _0 <- ([#"../trait_impl.rs" 29 15 29 17] ()); + [#"../trait_impl.rs" 29 15 29 17] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/traits/03.mlcfg b/creusot/tests/should_succeed/traits/03.mlcfg index 76415daf96..07e48d13b9 100644 --- a/creusot/tests/should_succeed/traits/03.mlcfg +++ b/creusot/tests/should_succeed/traits/03.mlcfg @@ -10,7 +10,7 @@ module C03_Impl0_F goto BB0 } BB0 { - [#"../03.rs" 10 8 10 9] _0 <- ([#"../03.rs" 10 8 10 9] (0 : int32)); + [#"../03.rs" 10 8 10 9] _0 <- (0 : int32); return _0 } @@ -26,7 +26,7 @@ module C03_Impl1_G goto BB0 } BB0 { - [#"../03.rs" 21 8 21 9] _0 <- ([#"../03.rs" 21 8 21 9] (1 : uint32)); + [#"../03.rs" 21 8 21 9] _0 <- (1 : uint32); return _0 } @@ -58,7 +58,7 @@ module C03_Impl2_H goto BB0 } BB0 { - [#"../03.rs" 31 8 31 9] _0 <- ([#"../03.rs" 31 8 31 9] y); + [#"../03.rs" 31 8 31 9] _0 <- y; assert { [@expl:type invariant] inv0 y }; assume { resolve0 y }; return _0 diff --git a/creusot/tests/should_succeed/traits/04.mlcfg b/creusot/tests/should_succeed/traits/04.mlcfg index f29b5ed62e..7c58cb6242 100644 --- a/creusot/tests/should_succeed/traits/04.mlcfg +++ b/creusot/tests/should_succeed/traits/04.mlcfg @@ -84,7 +84,7 @@ module C04_User goto BB7 } BB7 { - [#"../04.rs" 13 4 13 42] _0 <- ([#"../04.rs" 13 4 13 42] false); + [#"../04.rs" 13 4 13 42] _0 <- false; goto BB9 } BB8 { diff --git a/creusot/tests/should_succeed/traits/07.mlcfg b/creusot/tests/should_succeed/traits/07.mlcfg index 5b1ef00955..3746a89b66 100644 --- a/creusot/tests/should_succeed/traits/07.mlcfg +++ b/creusot/tests/should_succeed/traits/07.mlcfg @@ -10,7 +10,7 @@ module C07_Impl0_Ix goto BB0 } BB0 { - [#"../07.rs" 12 8 12 10] _0 <- ([#"../07.rs" 12 8 12 10] ()); + [#"../07.rs" 12 8 12 10] _0 <- (); return _0 } @@ -29,7 +29,7 @@ module C07_Test goto BB0 } BB0 { - [#"../07.rs" 17 4 17 8] _0 <- ([#"../07.rs" 17 4 17 8] true); + [#"../07.rs" 17 4 17 8] _0 <- true; return _0 } diff --git a/creusot/tests/should_succeed/traits/08.mlcfg b/creusot/tests/should_succeed/traits/08.mlcfg index fb7f9560b3..eda53ca724 100644 --- a/creusot/tests/should_succeed/traits/08.mlcfg +++ b/creusot/tests/should_succeed/traits/08.mlcfg @@ -25,7 +25,7 @@ module C08_Tr_Program goto BB0 } BB0 { - [#"../08.rs" 12 22 12 24] _0 <- ([#"../08.rs" 12 22 12 24] ()); + [#"../08.rs" 12 22 12 24] _0 <- (); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; return _0 @@ -57,7 +57,7 @@ module C08_Test goto BB0 } BB0 { - [#"../08.rs" 15 25 15 27] _0 <- ([#"../08.rs" 15 25 15 27] ()); + [#"../08.rs" 15 25 15 27] _0 <- (); assert { [@expl:type invariant] inv0 _1 }; assume { resolve0 _1 }; goto BB1 diff --git a/creusot/tests/should_succeed/traits/09.mlcfg b/creusot/tests/should_succeed/traits/09.mlcfg index df092dc7c1..0f0cf442e6 100644 --- a/creusot/tests/should_succeed/traits/09.mlcfg +++ b/creusot/tests/should_succeed/traits/09.mlcfg @@ -11,7 +11,7 @@ module C09_Test goto BB0 } BB0 { - [#"../09.rs" 8 4 8 9] _0 <- ([#"../09.rs" 8 4 8 9] t + (0 : uint32)); + [#"../09.rs" 8 4 8 9] _0 <- t + (0 : uint32); return _0 } @@ -40,7 +40,7 @@ module C09_Test2 goto BB0 } BB0 { - [#"../09.rs" 12 4 12 5] _0 <- ([#"../09.rs" 12 4 12 5] t); + [#"../09.rs" 12 4 12 5] _0 <- t; t <- any x0; goto BB1 } diff --git a/creusot/tests/should_succeed/traits/11.mlcfg b/creusot/tests/should_succeed/traits/11.mlcfg index 70fb6a02cf..fa3cf848a1 100644 --- a/creusot/tests/should_succeed/traits/11.mlcfg +++ b/creusot/tests/should_succeed/traits/11.mlcfg @@ -24,7 +24,7 @@ module C11_Test goto BB0 } BB0 { - [#"../11.rs" 18 24 18 26] _0 <- ([#"../11.rs" 18 24 18 26] ()); + [#"../11.rs" 18 24 18 26] _0 <- (); assert { [@expl:type invariant] inv0 _1 }; assume { resolve0 _1 }; goto BB1 diff --git a/creusot/tests/should_succeed/traits/12_default_method.mlcfg b/creusot/tests/should_succeed/traits/12_default_method.mlcfg index d57d1dff80..dd6f0a48f9 100644 --- a/creusot/tests/should_succeed/traits/12_default_method.mlcfg +++ b/creusot/tests/should_succeed/traits/12_default_method.mlcfg @@ -27,7 +27,7 @@ module C12DefaultMethod_T_Default goto BB0 } BB0 { - [#"../12_default_method.rs" 7 8 7 9] _0 <- ([#"../12_default_method.rs" 7 8 7 9] (0 : uint32)); + [#"../12_default_method.rs" 7 8 7 9] _0 <- (0 : uint32); assert { [@expl:type invariant] inv0 self }; assume { resolve0 self }; return _0 @@ -71,7 +71,7 @@ module C12DefaultMethod_ShouldUseImpl goto BB1 } BB1 { - [#"../12_default_method.rs" 20 31 22 1] _0 <- ([#"../12_default_method.rs" 20 31 22 1] ()); + [#"../12_default_method.rs" 20 31 22 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg b/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg index caff2ea273..26e88a6625 100644 --- a/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg +++ b/creusot/tests/should_succeed/traits/15_impl_interfaces.mlcfg @@ -13,7 +13,7 @@ module C15ImplInterfaces_Calls goto BB0 } BB0 { - [#"../15_impl_interfaces.rs" 23 37 23 39] _0 <- ([#"../15_impl_interfaces.rs" 23 37 23 39] ()); + [#"../15_impl_interfaces.rs" 23 37 23 39] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg b/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg index 8a88e4f01e..8165df7108 100644 --- a/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg +++ b/creusot/tests/should_succeed/traits/16_impl_cloning.mlcfg @@ -86,7 +86,7 @@ module C16ImplCloning_Test BB0 { assert { [@expl:type invariant] inv0 x }; assume { resolve0 x }; - [#"../16_impl_cloning.rs" 17 31 17 33] _0 <- ([#"../16_impl_cloning.rs" 17 31 17 33] ()); + [#"../16_impl_cloning.rs" 17 31 17 33] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/two_modules.mlcfg b/creusot/tests/should_succeed/two_modules.mlcfg index 3852cf68b6..934e9a68d7 100644 --- a/creusot/tests/should_succeed/two_modules.mlcfg +++ b/creusot/tests/should_succeed/two_modules.mlcfg @@ -16,7 +16,7 @@ module TwoModules_Mod2_X goto BB0 } BB0 { - [#"../two_modules.rs" 16 8 16 12] _0 <- ([#"../two_modules.rs" 16 8 16 12] true); + [#"../two_modules.rs" 16 8 16 12] _0 <- true; return _0 } @@ -33,13 +33,13 @@ module TwoModules_F goto BB0 } BB0 { - [#"../two_modules.rs" 23 12 23 13] _2 <- ([#"../two_modules.rs" 23 12 23 13] TwoModules_Mod1_T_Type.C_B); + [#"../two_modules.rs" 23 12 23 13] _2 <- TwoModules_Mod1_T_Type.C_B; [#"../two_modules.rs" 23 4 23 14] _1 <- ([#"../two_modules.rs" 23 4 23 14] x0 _2); _2 <- any TwoModules_Mod1_T_Type.t_t; goto BB1 } BB1 { - [#"../two_modules.rs" 22 11 24 1] _0 <- ([#"../two_modules.rs" 22 11 24 1] ()); + [#"../two_modules.rs" 22 11 24 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/type_constructors.mlcfg b/creusot/tests/should_succeed/type_constructors.mlcfg index 7951a68f35..689ff08b77 100644 --- a/creusot/tests/should_succeed/type_constructors.mlcfg +++ b/creusot/tests/should_succeed/type_constructors.mlcfg @@ -16,8 +16,8 @@ module TypeConstructors_F goto BB0 } BB0 { - [#"../type_constructors.rs" 18 17 18 24] _3 <- ([#"../type_constructors.rs" 18 17 18 24] TypeConstructors_B_X_Type.C_B); - [#"../type_constructors.rs" 16 11 19 1] _0 <- ([#"../type_constructors.rs" 16 11 19 1] ()); + [#"../type_constructors.rs" 18 17 18 24] _3 <- TypeConstructors_B_X_Type.C_B; + [#"../type_constructors.rs" 16 11 19 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/type_invariants/borrows.mlcfg b/creusot/tests/should_succeed/type_invariants/borrows.mlcfg index 71892e8b47..ca34c32420 100644 --- a/creusot/tests/should_succeed/type_invariants/borrows.mlcfg +++ b/creusot/tests/should_succeed/type_invariants/borrows.mlcfg @@ -39,7 +39,7 @@ module Borrows_Impl1_New goto BB0 } BB0 { - [#"../borrows.rs" 18 8 18 15] _0 <- ([#"../borrows.rs" 18 8 18 15] Borrows_NonZero_Type.C_NonZero n); + [#"../borrows.rs" 18 8 18 15] _0 <- Borrows_NonZero_Type.C_NonZero n; return _0 } @@ -139,9 +139,9 @@ module Borrows_Inc goto BB0 } BB0 { - [#"../borrows.rs" 102 4 102 11] x <- { x with current = ([#"../borrows.rs" 102 4 102 11] * x + (1 : int32)) ; }; + [#"../borrows.rs" 102 4 102 11] x <- { x with current = ( * x + (1 : int32)) ; }; assume { resolve0 x }; - [#"../borrows.rs" 101 24 103 1] _0 <- ([#"../borrows.rs" 101 24 103 1] ()); + [#"../borrows.rs" 101 24 103 1] _0 <- (); return _0 } @@ -223,7 +223,7 @@ module Borrows_Simple assume { resolve0 _6 }; assert { [@expl:type invariant] inv0 x }; assume { resolve1 x }; - [#"../borrows.rs" 31 31 34 1] _0 <- ([#"../borrows.rs" 31 31 34 1] ()); + [#"../borrows.rs" 31 31 34 1] _0 <- (); return _0 } @@ -317,7 +317,7 @@ module Borrows_Hard assume { resolve0 _6 }; assert { [@expl:type invariant] inv1 x }; assume { resolve1 x }; - [#"../borrows.rs" 38 29 41 1] _0 <- ([#"../borrows.rs" 38 29 41 1] ()); + [#"../borrows.rs" 38 29 41 1] _0 <- (); return _0 } @@ -407,7 +407,7 @@ module Borrows_Tuple goto BB0 } BB0 { - [#"../borrows.rs" 46 4 46 14] x <- (let (x0, x1) = x in ((let Borrows_NonZero_Type.C_NonZero x0 = let (a, _) = x in a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 46 4 46 14] (0 : int32))), x1)); + [#"../borrows.rs" 46 4 46 14] x <- (let (x0, x1) = x in ((let Borrows_NonZero_Type.C_NonZero x0 = let (a, _) = x in a in Borrows_NonZero_Type.C_NonZero (0 : int32)), x1)); [#"../borrows.rs" 47 8 47 19] _6 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * (let (_, a) = x in a))) (Borrow.inherit_id (Borrow.get_id (let (_, a) = x in a)) 1); [#"../borrows.rs" 47 8 47 19] x <- (let (x0, x1) = x in (x0, { (let (_, a) = x in a) with current = (let Borrows_NonZero_Type.C_NonZero x0 = * (let (_, a) = x in a) in Borrows_NonZero_Type.C_NonZero ( ^ _6)) ; })); [#"../borrows.rs" 47 8 47 19] _5 <- Borrow.borrow_final ( * _6) (Borrow.get_id _6); @@ -420,7 +420,7 @@ module Borrows_Tuple assume { resolve0 _6 }; assert { [@expl:type invariant] inv0 x }; assume { resolve1 x }; - [#"../borrows.rs" 45 45 49 1] _0 <- ([#"../borrows.rs" 45 45 49 1] ()); + [#"../borrows.rs" 45 45 49 1] _0 <- (); return _0 } @@ -511,7 +511,7 @@ module Borrows_PartialMove goto BB0 } BB0 { - [#"../borrows.rs" 54 16 54 19] a <- ([#"../borrows.rs" 54 16 54 19] let (a, _) = x in a); + [#"../borrows.rs" 54 16 54 19] a <- (let (a, _) = x in a); x <- (let (x0, x1) = x in (any Borrows_NonZero_Type.t_nonzero, x1)); [#"../borrows.rs" 55 8 55 19] _7 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * (let (_, a) = x in a))) (Borrow.inherit_id (Borrow.get_id (let (_, a) = x in a)) 1); [#"../borrows.rs" 55 8 55 19] x <- (let (x0, x1) = x in (x0, { (let (_, a) = x in a) with current = (let Borrows_NonZero_Type.C_NonZero x0 = * (let (_, a) = x in a) in Borrows_NonZero_Type.C_NonZero ( ^ _7)) ; })); @@ -525,8 +525,8 @@ module Borrows_PartialMove assume { resolve0 _7 }; assert { [@expl:type invariant] inv0 x }; assume { resolve1 x }; - [#"../borrows.rs" 56 4 56 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 56 4 56 11] (0 : int32))); - [#"../borrows.rs" 53 48 57 1] _0 <- ([#"../borrows.rs" 53 48 57 1] ()); + [#"../borrows.rs" 56 4 56 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero (0 : int32)); + [#"../borrows.rs" 53 48 57 1] _0 <- (); return _0 } @@ -618,13 +618,13 @@ module Borrows_Destruct goto BB0 } BB0 { - [#"../borrows.rs" 62 9 62 14] a <- ([#"../borrows.rs" 62 9 62 14] let (a, _) = x in a); + [#"../borrows.rs" 62 9 62 14] a <- (let (a, _) = x in a); x <- (let (x0, x1) = x in (any Borrows_NonZero_Type.t_nonzero, x1)); - [#"../borrows.rs" 62 16 62 17] b <- ([#"../borrows.rs" 62 16 62 17] let (_, a) = x in a); + [#"../borrows.rs" 62 16 62 17] b <- (let (_, a) = x in a); x <- (let (x0, x1) = x in (x0, any borrowed (Borrows_NonZero_Type.t_nonzero))); assert { [@expl:type invariant] inv0 x }; assume { resolve0 x }; - [#"../borrows.rs" 63 4 63 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero ([#"../borrows.rs" 63 4 63 11] (0 : int32))); + [#"../borrows.rs" 63 4 63 11] a <- (let Borrows_NonZero_Type.C_NonZero x0 = a in Borrows_NonZero_Type.C_NonZero (0 : int32)); [#"../borrows.rs" 64 8 64 16] _8 <- Borrow.borrow_final (Borrows_NonZero_Type.nonzero_0 ( * b)) (Borrow.inherit_id (Borrow.get_id b) 1); [#"../borrows.rs" 64 8 64 16] b <- { b with current = (let Borrows_NonZero_Type.C_NonZero x0 = * b in Borrows_NonZero_Type.C_NonZero ( ^ _8)) ; }; [#"../borrows.rs" 64 8 64 16] _7 <- Borrow.borrow_final ( * _8) (Borrow.get_id _8); @@ -637,7 +637,7 @@ module Borrows_Destruct assume { resolve1 _8 }; assert { [@expl:type invariant] inv1 b }; assume { resolve2 b }; - [#"../borrows.rs" 61 44 65 1] _0 <- ([#"../borrows.rs" 61 44 65 1] ()); + [#"../borrows.rs" 61 44 65 1] _0 <- (); return _0 } @@ -717,7 +717,7 @@ module Borrows_FrozenDead assume { inv0 ( ^ _6) }; assert { [@expl:type invariant] inv1 x }; assume { resolve0 x }; - [#"../borrows.rs" 73 4 74 9] x <- ([#"../borrows.rs" 73 4 74 9] _6); + [#"../borrows.rs" 73 4 74 9] x <- _6; _6 <- any borrowed (Borrows_NonZero_Type.t_nonzero); assert { [@expl:type invariant] inv1 x }; assume { resolve0 x }; @@ -729,7 +729,7 @@ module Borrows_FrozenDead } BB1 { assume { resolve1 _a }; - [#"../borrows.rs" 69 67 76 1] _0 <- ([#"../borrows.rs" 69 67 76 1] ()); + [#"../borrows.rs" 69 67 76 1] _0 <- (); assert { [@expl:type invariant] inv1 y }; assume { resolve0 y }; return _0 @@ -780,9 +780,9 @@ module Borrows_Dec goto BB0 } BB0 { - [#"../borrows.rs" 108 4 108 11] x <- { x with current = ([#"../borrows.rs" 108 4 108 11] * x - (1 : int32)) ; }; + [#"../borrows.rs" 108 4 108 11] x <- { x with current = ( * x - (1 : int32)) ; }; assume { resolve0 x }; - [#"../borrows.rs" 107 24 109 1] _0 <- ([#"../borrows.rs" 107 24 109 1] ()); + [#"../borrows.rs" 107 24 109 1] _0 <- (); return _0 } @@ -882,7 +882,7 @@ module Borrows_Impl3_Foo assume { resolve0 _8 }; assert { [@expl:type invariant] inv0 self }; assume { resolve1 self }; - [#"../borrows.rs" 93 26 96 5] _0 <- ([#"../borrows.rs" 93 26 96 5] ()); + [#"../borrows.rs" 93 26 96 5] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/type_invariants/generated.mlcfg b/creusot/tests/should_succeed/type_invariants/generated.mlcfg index 679f36dda7..b06e3bca97 100644 --- a/creusot/tests/should_succeed/type_invariants/generated.mlcfg +++ b/creusot/tests/should_succeed/type_invariants/generated.mlcfg @@ -113,7 +113,7 @@ module Generated_UseFoo } BB0 { assert { [@expl:assertion] [#"../generated.rs" 20 18 20 35] inv0 x }; - [#"../generated.rs" 19 62 21 1] _0 <- ([#"../generated.rs" 19 62 21 1] ()); + [#"../generated.rs" 19 62 21 1] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg index bfb1259191..45c035e204 100644 --- a/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg +++ b/creusot/tests/should_succeed/type_invariants/non_zero.mlcfg @@ -38,7 +38,7 @@ module NonZero_Impl1_New goto BB0 } BB0 { - [#"../non_zero.rs" 17 8 17 15] _0 <- ([#"../non_zero.rs" 17 8 17 15] NonZero_NonZeroU32_Type.C_NonZeroU32 n); + [#"../non_zero.rs" 17 8 17 15] _0 <- NonZero_NonZeroU32_Type.C_NonZeroU32 n; return _0 } @@ -77,8 +77,8 @@ module NonZero_Impl1_Add goto BB0 } BB0 { - [#"../non_zero.rs" 22 13 22 27] _4 <- ([#"../non_zero.rs" 22 13 22 27] NonZero_NonZeroU32_Type.nonzerou32_0 self + NonZero_NonZeroU32_Type.nonzerou32_0 rhs); - [#"../non_zero.rs" 22 8 22 28] _0 <- ([#"../non_zero.rs" 22 8 22 28] NonZero_NonZeroU32_Type.C_NonZeroU32 _4); + [#"../non_zero.rs" 22 13 22 27] _4 <- NonZero_NonZeroU32_Type.nonzerou32_0 self + NonZero_NonZeroU32_Type.nonzerou32_0 rhs; + [#"../non_zero.rs" 22 8 22 28] _0 <- NonZero_NonZeroU32_Type.C_NonZeroU32 _4; _4 <- any uint32; return _0 } @@ -153,8 +153,8 @@ module NonZero_Impl1_Sub goto BB0 } BB0 { - [#"../non_zero.rs" 41 13 41 27] _4 <- ([#"../non_zero.rs" 41 13 41 27] NonZero_NonZeroU32_Type.nonzerou32_0 self - NonZero_NonZeroU32_Type.nonzerou32_0 rhs); - [#"../non_zero.rs" 41 8 41 28] _0 <- ([#"../non_zero.rs" 41 8 41 28] NonZero_NonZeroU32_Type.C_NonZeroU32 _4); + [#"../non_zero.rs" 41 13 41 27] _4 <- NonZero_NonZeroU32_Type.nonzerou32_0 self - NonZero_NonZeroU32_Type.nonzerou32_0 rhs; + [#"../non_zero.rs" 41 8 41 28] _0 <- NonZero_NonZeroU32_Type.C_NonZeroU32 _4; _4 <- any uint32; return _0 } diff --git a/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg b/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg index cd9bd4371a..d24fa5afcd 100644 --- a/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg +++ b/creusot/tests/should_succeed/type_invariants/type_invariants.mlcfg @@ -29,7 +29,7 @@ module TypeInvariants_Id goto BB0 } BB0 { - [#"../type_invariants.rs" 15 4 15 5] _0 <- ([#"../type_invariants.rs" 15 4 15 5] x); + [#"../type_invariants.rs" 15 4 15 5] _0 <- x; x <- any TypeInvariants_WithInvariant_Type.t_withinvariant; return _0 } diff --git a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg index e6c042a10c..49605048dd 100644 --- a/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg +++ b/creusot/tests/should_succeed/type_invariants/vec_inv.mlcfg @@ -201,7 +201,7 @@ module VecInv_Vec goto BB2 } BB2 { - [#"../vec_inv.rs" 18 33 20 1] _0 <- ([#"../vec_inv.rs" 18 33 20 1] ()); + [#"../vec_inv.rs" 18 33 20 1] _0 <- (); goto BB3 } BB3 { diff --git a/creusot/tests/should_succeed/unused_in_loop.mlcfg b/creusot/tests/should_succeed/unused_in_loop.mlcfg index c8e939e91a..5f6ccbc6e0 100644 --- a/creusot/tests/should_succeed/unused_in_loop.mlcfg +++ b/creusot/tests/should_succeed/unused_in_loop.mlcfg @@ -13,7 +13,7 @@ module UnusedInLoop_UnusedInLoop goto BB0 } BB0 { - [#"../unused_in_loop.rs" 6 12 6 14] x <- ([#"../unused_in_loop.rs" 6 12 6 14] (10 : uint32)); + [#"../unused_in_loop.rs" 6 12 6 14] x <- (10 : uint32); goto BB1 } BB1 { @@ -27,7 +27,7 @@ module UnusedInLoop_UnusedInLoop end } BB3 { - [#"../unused_in_loop.rs" 13 4 13 5] _0 <- ([#"../unused_in_loop.rs" 13 4 13 5] x); + [#"../unused_in_loop.rs" 13 4 13 5] _0 <- x; return _0 } BB4 { diff --git a/creusot/tests/should_succeed/vecdeque.mlcfg b/creusot/tests/should_succeed/vecdeque.mlcfg index 8405ef2b9c..cff77c8b5d 100644 --- a/creusot/tests/should_succeed/vecdeque.mlcfg +++ b/creusot/tests/should_succeed/vecdeque.mlcfg @@ -231,16 +231,16 @@ module Vecdeque_TestDeque let constant promoted0 [#"../vecdeque.rs" 5 0 5 19] : Core_Option_Option_Type.t_option uint32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../vecdeque.rs" 24 32 24 39] Core_Option_Option_Type.C_Some (3 : uint32) in let _0 = [#"../vecdeque.rs" 24 32 24 39] _1 in _0 + let _1 = Core_Option_Option_Type.C_Some (3 : uint32) in let _0 = _1 in _0 let constant promoted1 [#"../vecdeque.rs" 5 0 5 19] : Core_Option_Option_Type.t_option uint32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../vecdeque.rs" 23 33 23 40] Core_Option_Option_Type.C_Some (2 : uint32) in let _0 = [#"../vecdeque.rs" 23 33 23 40] _1 in _0 + let _1 = Core_Option_Option_Type.C_Some (2 : uint32) in let _0 = _1 in _0 let constant promoted2 [#"../vecdeque.rs" 5 0 5 19] : Core_Option_Option_Type.t_option uint32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../vecdeque.rs" 17 32 17 36] Core_Option_Option_Type.C_None in let _0 = [#"../vecdeque.rs" 17 32 17 36] _1 in _0 + let _1 = Core_Option_Option_Type.C_None in let _0 = _1 in _0 let constant promoted3 [#"../vecdeque.rs" 5 0 5 19] : Core_Option_Option_Type.t_option uint32 = [@vc:do_not_keep_trace] [@vc:sp] - let _1 = [#"../vecdeque.rs" 16 33 16 37] Core_Option_Option_Type.C_None in let _0 = [#"../vecdeque.rs" 16 33 16 37] _1 in _0 + let _1 = Core_Option_Option_Type.C_None in let _0 = _1 in _0 let rec cfg test_deque [#"../vecdeque.rs" 5 0 5 19] [@cfg:stackify] [@cfg:subregion_analysis] (_1 : ()) : () = [@vc:do_not_keep_trace] [@vc:sp] var _0 : (); @@ -303,7 +303,7 @@ module Vecdeque_TestDeque absurd } BB5 { - [#"../vecdeque.rs" 9 12 9 28] _7 <- ([#"../vecdeque.rs" 9 12 9 28] _8 = (0 : usize)); + [#"../vecdeque.rs" 9 12 9 28] _7 <- _8 = (0 : usize); _8 <- any usize; switch (_7) | False -> goto BB7 @@ -337,7 +337,7 @@ module Vecdeque_TestDeque absurd } BB12 { - [#"../vecdeque.rs" 14 12 14 28] _17 <- ([#"../vecdeque.rs" 14 12 14 28] _18 = (0 : usize)); + [#"../vecdeque.rs" 14 12 14 28] _17 <- _18 = (0 : usize); _18 <- any usize; switch (_17) | False -> goto BB14 @@ -356,7 +356,7 @@ module Vecdeque_TestDeque absurd } BB15 { - [#"../vecdeque.rs" 16 33 16 37] _68 <- ([#"../vecdeque.rs" 16 33 16 37] promoted3); + [#"../vecdeque.rs" 16 33 16 37] _68 <- promoted3; [#"../vecdeque.rs" 16 12 16 37] _22 <- ([#"../vecdeque.rs" 16 12 16 37] eq0 _24 _68); goto BB16 } @@ -378,7 +378,7 @@ module Vecdeque_TestDeque absurd } BB19 { - [#"../vecdeque.rs" 17 32 17 36] _67 <- ([#"../vecdeque.rs" 17 32 17 36] promoted2); + [#"../vecdeque.rs" 17 32 17 36] _67 <- promoted2; [#"../vecdeque.rs" 17 12 17 36] _30 <- ([#"../vecdeque.rs" 17 12 17 36] eq0 _32 _67); goto BB20 } @@ -421,7 +421,7 @@ module Vecdeque_TestDeque goto BB26 } BB26 { - [#"../vecdeque.rs" 23 33 23 40] _66 <- ([#"../vecdeque.rs" 23 33 23 40] promoted1); + [#"../vecdeque.rs" 23 33 23 40] _66 <- promoted1; [#"../vecdeque.rs" 23 12 23 40] _44 <- ([#"../vecdeque.rs" 23 12 23 40] eq0 _46 _66); goto BB27 } @@ -443,7 +443,7 @@ module Vecdeque_TestDeque absurd } BB30 { - [#"../vecdeque.rs" 24 32 24 39] _65 <- ([#"../vecdeque.rs" 24 32 24 39] promoted0); + [#"../vecdeque.rs" 24 32 24 39] _65 <- promoted0; [#"../vecdeque.rs" 24 12 24 39] _52 <- ([#"../vecdeque.rs" 24 12 24 39] eq0 _54 _65); goto BB31 } @@ -475,7 +475,7 @@ module Vecdeque_TestDeque end } BB36 { - [#"../vecdeque.rs" 5 20 27 1] _0 <- ([#"../vecdeque.rs" 5 20 27 1] ()); + [#"../vecdeque.rs" 5 20 27 1] _0 <- (); goto BB38 } BB37 { diff --git a/creusot/tests/should_succeed/vector/01.mlcfg b/creusot/tests/should_succeed/vector/01.mlcfg index 3a44f0ec81..ea35bb09b0 100644 --- a/creusot/tests/should_succeed/vector/01.mlcfg +++ b/creusot/tests/should_succeed/vector/01.mlcfg @@ -370,7 +370,7 @@ module C01_AllZero goto BB2 } BB2 { - [#"../01.rs" 11 13 11 23] _7 <- ([#"../01.rs" 11 13 11 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _8); + [#"../01.rs" 11 13 11 23] _7 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _8; _8 <- any usize; [#"../01.rs" 9 4 9 42] iter <- ([#"../01.rs" 9 4 9 42] into_iter0 _7); _7 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -412,7 +412,7 @@ module C01_AllZero } BB9 { assume { resolve2 v }; - [#"../01.rs" 9 4 9 42] _0 <- ([#"../01.rs" 9 4 9 42] ()); + [#"../01.rs" 9 4 9 42] _0 <- (); return _0 } BB10 { @@ -424,14 +424,14 @@ module C01_AllZero absurd } BB12 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _19); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _19; [#"../01.rs" 9 4 9 42] _24 <- ([#"../01.rs" 9 4 9 42] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB13 } BB13 { - [#"../01.rs" 9 4 9 42] produced <- ([#"../01.rs" 9 4 9 42] _24); + [#"../01.rs" 9 4 9 42] produced <- _24; _24 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem; [#"../01.rs" 12 8 12 9] _28 <- Borrow.borrow_mut ( * v); [#"../01.rs" 12 8 12 9] v <- { v with current = ( ^ _28) ; }; [#"../01.rs" 12 9 12 12] _27 <- ([#"../01.rs" 12 9 12 12] index_mut0 _28 i); @@ -439,7 +439,7 @@ module C01_AllZero goto BB14 } BB14 { - [#"../01.rs" 12 8 12 16] _27 <- { _27 with current = ([#"../01.rs" 12 8 12 16] (0 : uint32)) ; }; + [#"../01.rs" 12 8 12 16] _27 <- { _27 with current = (0 : uint32) ; }; assume { resolve1 _27 }; goto BB6 } diff --git a/creusot/tests/should_succeed/vector/02_gnome.mlcfg b/creusot/tests/should_succeed/vector/02_gnome.mlcfg index 1070d41b2e..b99757e368 100644 --- a/creusot/tests/should_succeed/vector/02_gnome.mlcfg +++ b/creusot/tests/should_succeed/vector/02_gnome.mlcfg @@ -435,7 +435,7 @@ module C02Gnome_GnomeSort BB1 { assert { [@expl:type invariant] inv0 old_v }; assume { resolve0 old_v }; - [#"../02_gnome.rs" 27 16 27 17] i <- ([#"../02_gnome.rs" 27 16 27 17] (0 : usize)); + [#"../02_gnome.rs" 27 16 27 17] i <- (0 : usize); goto BB2 } BB2 { @@ -448,7 +448,7 @@ module C02Gnome_GnomeSort goto BB4 } BB4 { - [#"../02_gnome.rs" 30 10 30 21] _10 <- ([#"../02_gnome.rs" 30 10 30 21] i < _12); + [#"../02_gnome.rs" 30 10 30 21] _10 <- i < _12; _12 <- any usize; switch (_10) | False -> goto BB16 @@ -456,7 +456,7 @@ module C02Gnome_GnomeSort end } BB5 { - [#"../02_gnome.rs" 31 11 31 17] _14 <- ([#"../02_gnome.rs" 31 11 31 17] i = (0 : usize)); + [#"../02_gnome.rs" 31 11 31 17] _14 <- i = (0 : usize); switch (_14) | False -> goto BB7 | True -> goto BB6 @@ -466,7 +466,7 @@ module C02Gnome_GnomeSort goto BB11 } BB7 { - [#"../02_gnome.rs" 31 23 31 28] _20 <- ([#"../02_gnome.rs" 31 23 31 28] i - (1 : usize)); + [#"../02_gnome.rs" 31 23 31 28] _20 <- i - (1 : usize); [#"../02_gnome.rs" 31 22 31 29] _18 <- ([#"../02_gnome.rs" 31 22 31 29] index0 ( * v) _20); _20 <- any usize; goto BB8 @@ -478,7 +478,7 @@ module C02Gnome_GnomeSort goto BB9 } BB9 { - [#"../02_gnome.rs" 31 33 31 38] _23 <- ([#"../02_gnome.rs" 31 33 31 38] _24); + [#"../02_gnome.rs" 31 33 31 38] _23 <- _24; assert { [@expl:type invariant] inv2 _24 }; assume { resolve2 _24 }; assert { [@expl:type invariant] inv2 _23 }; @@ -493,8 +493,8 @@ module C02Gnome_GnomeSort end } BB11 { - [#"../02_gnome.rs" 32 12 32 18] i <- ([#"../02_gnome.rs" 32 12 32 18] i + (1 : usize)); - [#"../02_gnome.rs" 31 40 33 9] _9 <- ([#"../02_gnome.rs" 31 40 33 9] ()); + [#"../02_gnome.rs" 32 12 32 18] i <- i + (1 : usize); + [#"../02_gnome.rs" 31 40 33 9] _9 <- (); goto BB15 } BB12 { @@ -509,7 +509,7 @@ module C02Gnome_GnomeSort [#"../02_gnome.rs" 34 12 34 13] _28 <- Borrow.borrow_final ( * _29) (Borrow.get_id _29); [#"../02_gnome.rs" 34 12 34 13] _29 <- { _29 with current = ( ^ _28) ; }; assume { inv4 ( ^ _28) }; - [#"../02_gnome.rs" 34 19 34 24] _31 <- ([#"../02_gnome.rs" 34 19 34 24] i - (1 : usize)); + [#"../02_gnome.rs" 34 19 34 24] _31 <- i - (1 : usize); [#"../02_gnome.rs" 34 12 34 28] _27 <- ([#"../02_gnome.rs" 34 12 34 28] swap0 _28 _31 i); _28 <- any borrowed (slice t); _31 <- any usize; @@ -518,8 +518,8 @@ module C02Gnome_GnomeSort BB14 { assert { [@expl:type invariant] inv5 _29 }; assume { resolve3 _29 }; - [#"../02_gnome.rs" 35 12 35 18] i <- ([#"../02_gnome.rs" 35 12 35 18] i - (1 : usize)); - [#"../02_gnome.rs" 33 15 36 9] _9 <- ([#"../02_gnome.rs" 33 15 36 9] ()); + [#"../02_gnome.rs" 35 12 35 18] i <- i - (1 : usize); + [#"../02_gnome.rs" 33 15 36 9] _9 <- (); goto BB15 } BB15 { @@ -528,7 +528,7 @@ module C02Gnome_GnomeSort BB16 { assert { [@expl:type invariant] inv1 v }; assume { resolve1 v }; - [#"../02_gnome.rs" 30 4 37 5] _0 <- ([#"../02_gnome.rs" 30 4 37 5] ()); + [#"../02_gnome.rs" 30 4 37 5] _0 <- (); return _0 } diff --git a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg index 4ecfba6223..4f4f9c99a0 100644 --- a/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg +++ b/creusot/tests/should_succeed/vector/03_knuth_shuffle.mlcfg @@ -387,7 +387,7 @@ module C03KnuthShuffle_KnuthShuffle goto BB2 } BB2 { - [#"../03_knuth_shuffle.rs" 17 13 17 23] _6 <- ([#"../03_knuth_shuffle.rs" 17 13 17 23] Core_Ops_Range_Range_Type.C_Range (0 : usize) _7); + [#"../03_knuth_shuffle.rs" 17 13 17 23] _6 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _7; _7 <- any usize; [#"../03_knuth_shuffle.rs" 16 4 16 43] iter <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] into_iter0 _6); _6 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -429,7 +429,7 @@ module C03KnuthShuffle_KnuthShuffle BB9 { assert { [@expl:type invariant] inv5 v }; assume { resolve3 v }; - [#"../03_knuth_shuffle.rs" 16 4 16 43] _0 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] ()); + [#"../03_knuth_shuffle.rs" 16 4 16 43] _0 <- (); return _0 } BB10 { @@ -442,19 +442,19 @@ module C03KnuthShuffle_KnuthShuffle absurd } BB12 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17; [#"../03_knuth_shuffle.rs" 16 4 16 43] _22 <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB13 } BB13 { - [#"../03_knuth_shuffle.rs" 16 4 16 43] produced <- ([#"../03_knuth_shuffle.rs" 16 4 16 43] _22); + [#"../03_knuth_shuffle.rs" 16 4 16 43] produced <- _22; _22 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] n <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] n <- __creusot_proc_iter_elem; [#"../03_knuth_shuffle.rs" 20 20 20 27] _26 <- ([#"../03_knuth_shuffle.rs" 20 20 20 27] len0 ( * v)); goto BB14 } BB14 { - [#"../03_knuth_shuffle.rs" 20 20 20 31] upper <- ([#"../03_knuth_shuffle.rs" 20 20 20 31] _26 - n); + [#"../03_knuth_shuffle.rs" 20 20 20 31] upper <- _26 - n; _26 <- any usize; [#"../03_knuth_shuffle.rs" 21 16 21 39] i <- ([#"../03_knuth_shuffle.rs" 21 16 21 39] rand_in_range0 (0 : usize) upper); goto BB15 @@ -471,7 +471,7 @@ module C03KnuthShuffle_KnuthShuffle [#"../03_knuth_shuffle.rs" 22 8 22 9] _32 <- Borrow.borrow_final ( * _33) (Borrow.get_id _33); [#"../03_knuth_shuffle.rs" 22 8 22 9] _33 <- { _33 with current = ( ^ _32) ; }; assume { inv3 ( ^ _32) }; - [#"../03_knuth_shuffle.rs" 22 18 22 27] _36 <- ([#"../03_knuth_shuffle.rs" 22 18 22 27] upper - (1 : usize)); + [#"../03_knuth_shuffle.rs" 22 18 22 27] _36 <- upper - (1 : usize); [#"../03_knuth_shuffle.rs" 22 8 22 28] _31 <- ([#"../03_knuth_shuffle.rs" 22 8 22 28] swap0 _32 i _36); _32 <- any borrowed (slice t); _36 <- any usize; diff --git a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg index 4356c7b205..a8913ad60c 100644 --- a/creusot/tests/should_succeed/vector/04_binary_search.mlcfg +++ b/creusot/tests/should_succeed/vector/04_binary_search.mlcfg @@ -193,7 +193,7 @@ module C04BinarySearch_BinarySearch goto BB1 } BB1 { - [#"../04_binary_search.rs" 27 7 27 21] _9 <- ([#"../04_binary_search.rs" 27 7 27 21] _10 = (0 : usize)); + [#"../04_binary_search.rs" 27 7 27 21] _9 <- _10 = (0 : usize); _10 <- any usize; switch (_9) | False -> goto BB3 @@ -201,7 +201,7 @@ module C04BinarySearch_BinarySearch end } BB2 { - [#"../04_binary_search.rs" 28 15 28 21] _0 <- ([#"../04_binary_search.rs" 28 15 28 21] Core_Result_Result_Type.C_Err (0 : usize)); + [#"../04_binary_search.rs" 28 15 28 21] _0 <- Core_Result_Result_Type.C_Err (0 : usize); goto BB21 } BB3 { @@ -209,7 +209,7 @@ module C04BinarySearch_BinarySearch goto BB4 } BB4 { - [#"../04_binary_search.rs" 31 19 31 20] base <- ([#"../04_binary_search.rs" 31 19 31 20] (0 : usize)); + [#"../04_binary_search.rs" 31 19 31 20] base <- (0 : usize); goto BB5 } BB5 { @@ -219,42 +219,42 @@ module C04BinarySearch_BinarySearch goto BB6 } BB6 { - [#"../04_binary_search.rs" 36 10 36 18] _21 <- ([#"../04_binary_search.rs" 36 10 36 18] size > (1 : usize)); + [#"../04_binary_search.rs" 36 10 36 18] _21 <- size > (1 : usize); switch (_21) | False -> goto BB13 | True -> goto BB7 end } BB7 { - [#"../04_binary_search.rs" 37 19 37 27] _25 <- ([#"../04_binary_search.rs" 37 19 37 27] (2 : usize) = (0 : usize)); + [#"../04_binary_search.rs" 37 19 37 27] _25 <- (2 : usize) = (0 : usize); assert { [@expl:division by zero] [#"../04_binary_search.rs" 37 19 37 27] not _25 }; goto BB8 } BB8 { - [#"../04_binary_search.rs" 37 19 37 27] half <- ([#"../04_binary_search.rs" 37 19 37 27] size / (2 : usize)); - [#"../04_binary_search.rs" 38 18 38 29] mid <- ([#"../04_binary_search.rs" 38 18 38 29] base + half); + [#"../04_binary_search.rs" 37 19 37 27] half <- size / (2 : usize); + [#"../04_binary_search.rs" 38 18 38 29] mid <- base + half; [#"../04_binary_search.rs" 40 21 40 26] _32 <- ([#"../04_binary_search.rs" 40 21 40 26] index0 arr mid); goto BB9 } BB9 { - [#"../04_binary_search.rs" 40 18 40 33] _30 <- ([#"../04_binary_search.rs" 40 18 40 33] _32 > elem); + [#"../04_binary_search.rs" 40 18 40 33] _30 <- _32 > elem; switch (_30) | False -> goto BB11 | True -> goto BB10 end } BB10 { - [#"../04_binary_search.rs" 40 36 40 40] _29 <- ([#"../04_binary_search.rs" 40 36 40 40] base); + [#"../04_binary_search.rs" 40 36 40 40] _29 <- base; goto BB12 } BB11 { - [#"../04_binary_search.rs" 40 50 40 53] _29 <- ([#"../04_binary_search.rs" 40 50 40 53] mid); + [#"../04_binary_search.rs" 40 50 40 53] _29 <- mid; goto BB12 } BB12 { - [#"../04_binary_search.rs" 40 8 40 55] base <- ([#"../04_binary_search.rs" 40 8 40 55] _29); + [#"../04_binary_search.rs" 40 8 40 55] base <- _29; _29 <- any usize; - [#"../04_binary_search.rs" 41 8 41 20] size <- ([#"../04_binary_search.rs" 41 8 41 20] size - half); + [#"../04_binary_search.rs" 41 8 41 20] size <- size - half; goto BB5 } BB13 { @@ -262,32 +262,32 @@ module C04BinarySearch_BinarySearch goto BB14 } BB14 { - [#"../04_binary_search.rs" 44 14 44 23] cmp <- ([#"../04_binary_search.rs" 44 14 44 23] _41); - [#"../04_binary_search.rs" 45 7 45 18] _44 <- ([#"../04_binary_search.rs" 45 7 45 18] cmp = elem); + [#"../04_binary_search.rs" 44 14 44 23] cmp <- _41; + [#"../04_binary_search.rs" 45 7 45 18] _44 <- cmp = elem; switch (_44) | False -> goto BB16 | True -> goto BB15 end } BB15 { - [#"../04_binary_search.rs" 46 8 46 16] _0 <- ([#"../04_binary_search.rs" 46 8 46 16] Core_Result_Result_Type.C_Ok base); + [#"../04_binary_search.rs" 46 8 46 16] _0 <- Core_Result_Result_Type.C_Ok base; goto BB20 } BB16 { - [#"../04_binary_search.rs" 47 14 47 24] _48 <- ([#"../04_binary_search.rs" 47 14 47 24] cmp < elem); + [#"../04_binary_search.rs" 47 14 47 24] _48 <- cmp < elem; switch (_48) | False -> goto BB18 | True -> goto BB17 end } BB17 { - [#"../04_binary_search.rs" 48 12 48 20] _51 <- ([#"../04_binary_search.rs" 48 12 48 20] base + (1 : usize)); - [#"../04_binary_search.rs" 48 8 48 21] _0 <- ([#"../04_binary_search.rs" 48 8 48 21] Core_Result_Result_Type.C_Err _51); + [#"../04_binary_search.rs" 48 12 48 20] _51 <- base + (1 : usize); + [#"../04_binary_search.rs" 48 8 48 21] _0 <- Core_Result_Result_Type.C_Err _51; _51 <- any usize; goto BB19 } BB18 { - [#"../04_binary_search.rs" 50 8 50 17] _0 <- ([#"../04_binary_search.rs" 50 8 50 17] Core_Result_Result_Type.C_Err base); + [#"../04_binary_search.rs" 50 8 50 17] _0 <- Core_Result_Result_Type.C_Err base; goto BB19 } BB19 { diff --git a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg index 1d05338f16..ab64c173d1 100644 --- a/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg +++ b/creusot/tests/should_succeed/vector/05_binary_search_generic.mlcfg @@ -370,7 +370,7 @@ module C05BinarySearchGeneric_BinarySearch goto BB4 } BB4 { - [#"../05_binary_search_generic.rs" 31 7 31 21] _9 <- ([#"../05_binary_search_generic.rs" 31 7 31 21] _10 = (0 : usize)); + [#"../05_binary_search_generic.rs" 31 7 31 21] _9 <- _10 = (0 : usize); _10 <- any usize; switch (_9) | False -> goto BB7 @@ -382,7 +382,7 @@ module C05BinarySearchGeneric_BinarySearch assume { resolve2 elem }; assert { [@expl:type invariant] inv0 arr }; assume { resolve0 arr }; - [#"../05_binary_search_generic.rs" 32 15 32 21] _0 <- ([#"../05_binary_search_generic.rs" 32 15 32 21] Core_Result_Result_Type.C_Err (0 : usize)); + [#"../05_binary_search_generic.rs" 32 15 32 21] _0 <- Core_Result_Result_Type.C_Err (0 : usize); goto BB29 } BB6 { @@ -394,7 +394,7 @@ module C05BinarySearchGeneric_BinarySearch goto BB8 } BB8 { - [#"../05_binary_search_generic.rs" 35 26 35 27] base <- ([#"../05_binary_search_generic.rs" 35 26 35 27] (0 : usize)); + [#"../05_binary_search_generic.rs" 35 26 35 27] base <- (0 : usize); goto BB9 } BB9 { @@ -410,20 +410,20 @@ module C05BinarySearchGeneric_BinarySearch goto BB12 } BB12 { - [#"../05_binary_search_generic.rs" 40 10 40 18] _21 <- ([#"../05_binary_search_generic.rs" 40 10 40 18] size > (1 : usize)); + [#"../05_binary_search_generic.rs" 40 10 40 18] _21 <- size > (1 : usize); switch (_21) | False -> goto BB20 | True -> goto BB13 end } BB13 { - [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- ([#"../05_binary_search_generic.rs" 41 19 41 27] (2 : usize) = (0 : usize)); + [#"../05_binary_search_generic.rs" 41 19 41 27] _25 <- (2 : usize) = (0 : usize); assert { [@expl:division by zero] [#"../05_binary_search_generic.rs" 41 19 41 27] not _25 }; goto BB14 } BB14 { - [#"../05_binary_search_generic.rs" 41 19 41 27] half <- ([#"../05_binary_search_generic.rs" 41 19 41 27] size / (2 : usize)); - [#"../05_binary_search_generic.rs" 42 18 42 29] mid <- ([#"../05_binary_search_generic.rs" 42 18 42 29] base + half); + [#"../05_binary_search_generic.rs" 41 19 41 27] half <- size / (2 : usize); + [#"../05_binary_search_generic.rs" 42 18 42 29] mid <- base + half; [#"../05_binary_search_generic.rs" 44 21 44 26] _32 <- ([#"../05_binary_search_generic.rs" 44 21 44 26] index0 arr mid); goto BB15 } @@ -440,17 +440,17 @@ module C05BinarySearchGeneric_BinarySearch end } BB17 { - [#"../05_binary_search_generic.rs" 44 36 44 40] _29 <- ([#"../05_binary_search_generic.rs" 44 36 44 40] base); + [#"../05_binary_search_generic.rs" 44 36 44 40] _29 <- base; goto BB19 } BB18 { - [#"../05_binary_search_generic.rs" 44 50 44 53] _29 <- ([#"../05_binary_search_generic.rs" 44 50 44 53] mid); + [#"../05_binary_search_generic.rs" 44 50 44 53] _29 <- mid; goto BB19 } BB19 { - [#"../05_binary_search_generic.rs" 44 8 44 55] base <- ([#"../05_binary_search_generic.rs" 44 8 44 55] _29); + [#"../05_binary_search_generic.rs" 44 8 44 55] base <- _29; _29 <- any usize; - [#"../05_binary_search_generic.rs" 46 8 46 20] size <- ([#"../05_binary_search_generic.rs" 46 8 46 20] size - half); + [#"../05_binary_search_generic.rs" 46 8 46 20] size <- size - half; goto BB11 } BB20 { @@ -460,12 +460,12 @@ module C05BinarySearchGeneric_BinarySearch goto BB21 } BB21 { - [#"../05_binary_search_generic.rs" 49 14 49 24] cmp <- ([#"../05_binary_search_generic.rs" 49 14 49 24] _41); + [#"../05_binary_search_generic.rs" 49 14 49 24] cmp <- _41; assert { [@expl:type invariant] inv1 _41 }; assume { resolve1 _41 }; assert { [@expl:type invariant] inv1 cmp }; assume { resolve1 cmp }; - [#"../05_binary_search_generic.rs" 51 18 51 23] _47 <- ([#"../05_binary_search_generic.rs" 51 18 51 23] elem); + [#"../05_binary_search_generic.rs" 51 18 51 23] _47 <- elem; assert { [@expl:type invariant] inv1 _47 }; assume { resolve1 _47 }; [#"../05_binary_search_generic.rs" 51 10 51 24] _44 <- ([#"../05_binary_search_generic.rs" 51 10 51 24] cmp0 cmp _47); @@ -487,16 +487,16 @@ module C05BinarySearchGeneric_BinarySearch goto BB26 } BB25 { - [#"../05_binary_search_generic.rs" 54 29 54 38] _0 <- ([#"../05_binary_search_generic.rs" 54 29 54 38] Core_Result_Result_Type.C_Err base); + [#"../05_binary_search_generic.rs" 54 29 54 38] _0 <- Core_Result_Result_Type.C_Err base; goto BB28 } BB26 { - [#"../05_binary_search_generic.rs" 52 27 52 35] _0 <- ([#"../05_binary_search_generic.rs" 52 27 52 35] Core_Result_Result_Type.C_Ok base); + [#"../05_binary_search_generic.rs" 52 27 52 35] _0 <- Core_Result_Result_Type.C_Ok base; goto BB28 } BB27 { - [#"../05_binary_search_generic.rs" 53 30 53 38] _50 <- ([#"../05_binary_search_generic.rs" 53 30 53 38] base + (1 : usize)); - [#"../05_binary_search_generic.rs" 53 26 53 39] _0 <- ([#"../05_binary_search_generic.rs" 53 26 53 39] Core_Result_Result_Type.C_Err _50); + [#"../05_binary_search_generic.rs" 53 30 53 38] _50 <- base + (1 : usize); + [#"../05_binary_search_generic.rs" 53 26 53 39] _0 <- Core_Result_Result_Type.C_Err _50; _50 <- any usize; goto BB28 } diff --git a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg index cf267cbe28..a195ceef18 100644 --- a/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg +++ b/creusot/tests/should_succeed/vector/06_knights_tour.mlcfg @@ -36,17 +36,17 @@ module C06KnightsTour_Impl3_Clone goto BB0 } BB0 { - [#"../06_knights_tour.rs" 6 4 6 12] _5 <- ([#"../06_knights_tour.rs" 6 4 6 12] C06KnightsTour_Point_Type.point_x self); + [#"../06_knights_tour.rs" 6 4 6 12] _5 <- C06KnightsTour_Point_Type.point_x self; [#"../06_knights_tour.rs" 6 4 6 12] _3 <- ([#"../06_knights_tour.rs" 6 4 6 12] clone0 _5); goto BB1 } BB1 { - [#"../06_knights_tour.rs" 7 4 7 12] _8 <- ([#"../06_knights_tour.rs" 7 4 7 12] C06KnightsTour_Point_Type.point_y self); + [#"../06_knights_tour.rs" 7 4 7 12] _8 <- C06KnightsTour_Point_Type.point_y self; [#"../06_knights_tour.rs" 7 4 7 12] _6 <- ([#"../06_knights_tour.rs" 7 4 7 12] clone0 _8); goto BB2 } BB2 { - [#"../06_knights_tour.rs" 4 15 4 20] _0 <- ([#"../06_knights_tour.rs" 4 15 4 20] C06KnightsTour_Point_Type.C_Point _3 _6); + [#"../06_knights_tour.rs" 4 15 4 20] _0 <- C06KnightsTour_Point_Type.C_Point _3 _6; _3 <- any isize; _6 <- any isize; return _0 @@ -77,9 +77,9 @@ module C06KnightsTour_Impl0_Mov goto BB0 } BB0 { - [#"../06_knights_tour.rs" 19 18 19 32] _9 <- ([#"../06_knights_tour.rs" 19 18 19 32] C06KnightsTour_Point_Type.point_x self + (let (a, _) = p in a)); - [#"../06_knights_tour.rs" 19 37 19 51] _12 <- ([#"../06_knights_tour.rs" 19 37 19 51] C06KnightsTour_Point_Type.point_y self + (let (_, a) = p in a)); - [#"../06_knights_tour.rs" 19 8 19 53] _0 <- ([#"../06_knights_tour.rs" 19 8 19 53] C06KnightsTour_Point_Type.C_Point _9 _12); + [#"../06_knights_tour.rs" 19 18 19 32] _9 <- C06KnightsTour_Point_Type.point_x self + (let (a, _) = p in a); + [#"../06_knights_tour.rs" 19 37 19 51] _12 <- C06KnightsTour_Point_Type.point_y self + (let (_, a) = p in a); + [#"../06_knights_tour.rs" 19 8 19 53] _0 <- C06KnightsTour_Point_Type.C_Point _9 _12; _9 <- any isize; _12 <- any isize; return _0 @@ -270,7 +270,7 @@ module C06KnightsTour_Impl1_New_Closure3 goto BB2 } BB2 { - [#"../06_knights_tour.rs" 43 16 43 50] _0 <- ([#"../06_knights_tour.rs" 43 16 43 50] res); + [#"../06_knights_tour.rs" 43 16 43 50] _0 <- res; res <- any Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global); goto BB3 } @@ -695,8 +695,8 @@ module C06KnightsTour_Impl1_New goto BB0 } BB0 { - [#"../06_knights_tour.rs" 41 19 41 28] _7 <- ([#"../06_knights_tour.rs" 41 19 41 28] Core_Ops_Range_Range_Type.C_Range (0 : usize) size); - [#"../06_knights_tour.rs" 43 16 43 50] _9 <- ([#"../06_knights_tour.rs" 43 16 43 50] C06KnightsTour_Impl1_New_Closure3.C06KnightsTour_Impl1_New_Closure3 size); + [#"../06_knights_tour.rs" 41 19 41 28] _7 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) size; + [#"../06_knights_tour.rs" 43 16 43 50] _9 <- C06KnightsTour_Impl1_New_Closure3.C06KnightsTour_Impl1_New_Closure3 size; [#"../06_knights_tour.rs" 41 19 45 13] _6 <- ([#"../06_knights_tour.rs" 41 19 45 13] map_inv0 _7 _9); _7 <- any Core_Ops_Range_Range_Type.t_range usize; _9 <- any C06KnightsTour_Impl1_New_Closure3.c06knightstour_impl1_new_closure3; @@ -708,7 +708,7 @@ module C06KnightsTour_Impl1_New goto BB2 } BB2 { - [#"../06_knights_tour.rs" 47 8 47 34] _0 <- ([#"../06_knights_tour.rs" 47 8 47 34] C06KnightsTour_Board_Type.C_Board size rows); + [#"../06_knights_tour.rs" 47 8 47 34] _0 <- C06KnightsTour_Board_Type.C_Board size rows; rows <- any Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global); goto BB3 } @@ -929,15 +929,15 @@ module C06KnightsTour_Impl1_Available goto BB0 } BB0 { - [#"../06_knights_tour.rs" 53 8 53 16] _5 <- ([#"../06_knights_tour.rs" 53 8 53 16] (0 : isize) <= C06KnightsTour_Point_Type.point_x p); + [#"../06_knights_tour.rs" 53 8 53 16] _5 <- (0 : isize) <= C06KnightsTour_Point_Type.point_x p; switch (_5) | False -> goto BB8 | True -> goto BB1 end } BB1 { - [#"../06_knights_tour.rs" 54 15 54 29] _8 <- ([#"../06_knights_tour.rs" 54 15 54 29] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p))); - [#"../06_knights_tour.rs" 54 15 54 41] _7 <- ([#"../06_knights_tour.rs" 54 15 54 41] _8 < C06KnightsTour_Board_Type.board_size self); + [#"../06_knights_tour.rs" 54 15 54 29] _8 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)); + [#"../06_knights_tour.rs" 54 15 54 41] _7 <- _8 < C06KnightsTour_Board_Type.board_size self; _8 <- any usize; switch (_7) | False -> goto BB7 @@ -945,15 +945,15 @@ module C06KnightsTour_Impl1_Available end } BB2 { - [#"../06_knights_tour.rs" 55 15 55 23] _11 <- ([#"../06_knights_tour.rs" 55 15 55 23] (0 : isize) <= C06KnightsTour_Point_Type.point_y p); + [#"../06_knights_tour.rs" 55 15 55 23] _11 <- (0 : isize) <= C06KnightsTour_Point_Type.point_y p; switch (_11) | False -> goto BB6 | True -> goto BB3 end } BB3 { - [#"../06_knights_tour.rs" 56 15 56 29] _14 <- ([#"../06_knights_tour.rs" 56 15 56 29] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p))); - [#"../06_knights_tour.rs" 56 15 56 41] _13 <- ([#"../06_knights_tour.rs" 56 15 56 41] _14 < C06KnightsTour_Board_Type.board_size self); + [#"../06_knights_tour.rs" 56 15 56 29] _14 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)); + [#"../06_knights_tour.rs" 56 15 56 41] _13 <- _14 < C06KnightsTour_Board_Type.board_size self; _14 <- any usize; switch (_13) | False -> goto BB5 @@ -961,7 +961,7 @@ module C06KnightsTour_Impl1_Available end } BB4 { - [#"../06_knights_tour.rs" 57 26 57 38] _22 <- ([#"../06_knights_tour.rs" 57 26 57 38] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p))); + [#"../06_knights_tour.rs" 57 26 57 38] _22 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)); [#"../06_knights_tour.rs" 57 25 57 39] _20 <- ([#"../06_knights_tour.rs" 57 25 57 39] index0 (C06KnightsTour_Board_Type.board_field self) _22); _22 <- any usize; goto BB10 @@ -979,17 +979,17 @@ module C06KnightsTour_Impl1_Available goto BB9 } BB9 { - [#"../06_knights_tour.rs" 53 8 57 58] _0 <- ([#"../06_knights_tour.rs" 53 8 57 58] false); + [#"../06_knights_tour.rs" 53 8 57 58] _0 <- false; goto BB12 } BB10 { - [#"../06_knights_tour.rs" 57 40 57 52] _24 <- ([#"../06_knights_tour.rs" 57 40 57 52] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p))); + [#"../06_knights_tour.rs" 57 40 57 52] _24 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)); [#"../06_knights_tour.rs" 57 39 57 53] _18 <- ([#"../06_knights_tour.rs" 57 39 57 53] index1 _20 _24); _24 <- any usize; goto BB11 } BB11 { - [#"../06_knights_tour.rs" 57 15 57 58] _0 <- ([#"../06_knights_tour.rs" 57 15 57 58] _18 = (0 : usize)); + [#"../06_knights_tour.rs" 57 15 57 58] _0 <- _18 = (0 : usize); goto BB12 } BB12 { @@ -1341,7 +1341,7 @@ module C06KnightsTour_Impl1_CountDegree goto BB0 } BB0 { - [#"../06_knights_tour.rs" 71 24 71 25] count <- ([#"../06_knights_tour.rs" 71 24 71 25] (0 : usize)); + [#"../06_knights_tour.rs" 71 24 71 25] count <- (0 : usize); [#"../06_knights_tour.rs" 74 17 74 24] _8 <- ([#"../06_knights_tour.rs" 74 17 74 24] moves0 ()); goto BB1 } @@ -1402,16 +1402,16 @@ module C06KnightsTour_Impl1_CountDegree absurd } BB13 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _17); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _17; [#"../06_knights_tour.rs" 73 8 73 46] _22 <- ([#"../06_knights_tour.rs" 73 8 73 46] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB14 } BB14 { - [#"../06_knights_tour.rs" 73 8 73 46] produced <- ([#"../06_knights_tour.rs" 73 8 73 46] _22); + [#"../06_knights_tour.rs" 73 8 73 46] produced <- _22; _22 <- any Snapshot.snap_ty (Seq.seq (isize, isize)); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- __creusot_proc_iter_elem; assume { resolve1 __creusot_proc_iter_elem }; - [#"../06_knights_tour.rs" 75 29 75 31] _28 <- ([#"../06_knights_tour.rs" 75 29 75 31] m); + [#"../06_knights_tour.rs" 75 29 75 31] _28 <- m; [#"../06_knights_tour.rs" 75 23 75 32] next <- ([#"../06_knights_tour.rs" 75 23 75 32] mov0 p _28); goto BB15 } @@ -1427,19 +1427,19 @@ module C06KnightsTour_Impl1_CountDegree end } BB17 { - [#"../06_knights_tour.rs" 77 16 77 26] count <- ([#"../06_knights_tour.rs" 77 16 77 26] count + (1 : usize)); - [#"../06_knights_tour.rs" 76 36 78 13] _16 <- ([#"../06_knights_tour.rs" 76 36 78 13] ()); + [#"../06_knights_tour.rs" 77 16 77 26] count <- count + (1 : usize); + [#"../06_knights_tour.rs" 76 36 78 13] _16 <- (); goto BB19 } BB18 { - [#"../06_knights_tour.rs" 78 13 78 13] _16 <- ([#"../06_knights_tour.rs" 78 13 78 13] ()); + [#"../06_knights_tour.rs" 78 13 78 13] _16 <- (); goto BB19 } BB19 { goto BB7 } BB20 { - [#"../06_knights_tour.rs" 80 8 80 13] _0 <- ([#"../06_knights_tour.rs" 80 8 80 13] count); + [#"../06_knights_tour.rs" 80 8 80 13] _0 <- count; return _0 } @@ -1689,7 +1689,7 @@ module C06KnightsTour_Impl1_Set BB0 { [#"../06_knights_tour.rs" 88 8 88 18] _12 <- Borrow.borrow_final (C06KnightsTour_Board_Type.board_field ( * self)) (Borrow.inherit_id (Borrow.get_id self) 2); [#"../06_knights_tour.rs" 88 8 88 18] self <- { self with current = (let C06KnightsTour_Board_Type.C_Board x0 x1 = * self in C06KnightsTour_Board_Type.C_Board x0 ( ^ _12)) ; }; - [#"../06_knights_tour.rs" 88 19 88 31] _13 <- ([#"../06_knights_tour.rs" 88 19 88 31] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p))); + [#"../06_knights_tour.rs" 88 19 88 31] _13 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_x p)); [#"../06_knights_tour.rs" 88 18 88 32] _11 <- ([#"../06_knights_tour.rs" 88 18 88 32] index_mut0 _12 _13); _12 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)) (Alloc_Alloc_Global_Type.t_global)); _13 <- any usize; @@ -1698,16 +1698,16 @@ module C06KnightsTour_Impl1_Set BB1 { [#"../06_knights_tour.rs" 88 8 88 32] _10 <- Borrow.borrow_final ( * _11) (Borrow.get_id _11); [#"../06_knights_tour.rs" 88 8 88 32] _11 <- { _11 with current = ( ^ _10) ; }; - [#"../06_knights_tour.rs" 88 33 88 45] _15 <- ([#"../06_knights_tour.rs" 88 33 88 45] UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p))); + [#"../06_knights_tour.rs" 88 33 88 45] _15 <- UIntSize.of_int (IntSize.to_int (C06KnightsTour_Point_Type.point_y p)); [#"../06_knights_tour.rs" 88 32 88 46] _9 <- ([#"../06_knights_tour.rs" 88 32 88 46] index_mut1 _10 _15); _10 <- any borrowed (Alloc_Vec_Vec_Type.t_vec usize (Alloc_Alloc_Global_Type.t_global)); _15 <- any usize; goto BB2 } BB2 { - [#"../06_knights_tour.rs" 88 8 88 50] _9 <- { _9 with current = ([#"../06_knights_tour.rs" 88 8 88 50] v) ; }; + [#"../06_knights_tour.rs" 88 8 88 50] _9 <- { _9 with current = v ; }; assume { resolve0 _9 }; - [#"../06_knights_tour.rs" 88 8 88 50] _0 <- ([#"../06_knights_tour.rs" 88 8 88 50] ()); + [#"../06_knights_tour.rs" 88 8 88 50] _0 <- (); assume { resolve1 _11 }; assume { resolve2 self }; return _0 @@ -1984,7 +1984,7 @@ module C06KnightsTour_Min goto BB0 } BB0 { - [#"../06_knights_tour.rs" 112 18 112 22] min <- ([#"../06_knights_tour.rs" 112 18 112 22] Core_Option_Option_Type.C_None); + [#"../06_knights_tour.rs" 112 18 112 22] min <- Core_Option_Option_Type.C_None; [#"../06_knights_tour.rs" 113 4 114 74] iter <- ([#"../06_knights_tour.rs" 113 4 114 74] into_iter0 v); goto BB1 } @@ -2022,7 +2022,7 @@ module C06KnightsTour_Min end } BB7 { - [#"../06_knights_tour.rs" 125 4 125 7] _0 <- ([#"../06_knights_tour.rs" 125 4 125 7] min); + [#"../06_knights_tour.rs" 125 4 125 7] _0 <- min; return _0 } BB8 { @@ -2033,14 +2033,14 @@ module C06KnightsTour_Min absurd } BB10 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _15); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _15; [#"../06_knights_tour.rs" 113 4 114 74] _20 <- ([#"../06_knights_tour.rs" 113 4 114 74] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB11 } BB11 { - [#"../06_knights_tour.rs" 113 4 114 74] produced <- ([#"../06_knights_tour.rs" 113 4 114 74] _20); + [#"../06_knights_tour.rs" 113 4 114 74] produced <- _20; _20 <- any Snapshot.snap_ty (Seq.seq (usize, C06KnightsTour_Point_Type.t_point)); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] x <- __creusot_proc_iter_elem; switch (min) | Core_Option_Option_Type.C_None -> goto BB12 | Core_Option_Option_Type.C_Some _ -> goto BB13 @@ -2050,29 +2050,29 @@ module C06KnightsTour_Min goto BB14 } BB13 { - [#"../06_knights_tour.rs" 118 17 118 18] m <- ([#"../06_knights_tour.rs" 118 17 118 18] Core_Option_Option_Type.some_0 min); - [#"../06_knights_tour.rs" 119 19 119 28] _28 <- ([#"../06_knights_tour.rs" 119 19 119 28] (let (a, _) = x in a) < (let (a, _) = m in a)); + [#"../06_knights_tour.rs" 118 17 118 18] m <- Core_Option_Option_Type.some_0 min; + [#"../06_knights_tour.rs" 119 19 119 28] _28 <- (let (a, _) = x in a) < (let (a, _) = m in a); switch (_28) | False -> goto BB16 | True -> goto BB15 end } BB14 { - [#"../06_knights_tour.rs" 117 26 117 33] _25 <- ([#"../06_knights_tour.rs" 117 26 117 33] Core_Option_Option_Type.C_Some x); - [#"../06_knights_tour.rs" 117 20 117 33] min <- ([#"../06_knights_tour.rs" 117 20 117 33] _25); + [#"../06_knights_tour.rs" 117 26 117 33] _25 <- Core_Option_Option_Type.C_Some x; + [#"../06_knights_tour.rs" 117 20 117 33] min <- _25; _25 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point); - [#"../06_knights_tour.rs" 117 20 117 33] _23 <- ([#"../06_knights_tour.rs" 117 20 117 33] ()); + [#"../06_knights_tour.rs" 117 20 117 33] _23 <- (); goto BB18 } BB15 { - [#"../06_knights_tour.rs" 120 26 120 33] _31 <- ([#"../06_knights_tour.rs" 120 26 120 33] Core_Option_Option_Type.C_Some x); - [#"../06_knights_tour.rs" 120 20 120 33] min <- ([#"../06_knights_tour.rs" 120 20 120 33] _31); + [#"../06_knights_tour.rs" 120 26 120 33] _31 <- Core_Option_Option_Type.C_Some x; + [#"../06_knights_tour.rs" 120 20 120 33] min <- _31; _31 <- any Core_Option_Option_Type.t_option (usize, C06KnightsTour_Point_Type.t_point); - [#"../06_knights_tour.rs" 120 20 120 33] _23 <- ([#"../06_knights_tour.rs" 120 20 120 33] ()); + [#"../06_knights_tour.rs" 120 20 120 33] _23 <- (); goto BB17 } BB16 { - [#"../06_knights_tour.rs" 121 17 121 17] _23 <- ([#"../06_knights_tour.rs" 121 17 121 17] ()); + [#"../06_knights_tour.rs" 121 17 121 17] _23 <- (); goto BB17 } BB17 { @@ -2563,7 +2563,7 @@ module C06KnightsTour_KnightsTour ensures { [#"../06_knights_tour.rs" 93 10 93 28] Seq.length (shallow_model5 result) = 8 } ensures { [#"../06_knights_tour.rs" 94 0 94 130] forall i : int . 0 <= i /\ i < 8 -> - 2 <= IntSize.to_int (let (a, _) = index_logic3 result i in a) /\ IntSize.to_int (let (a, _) = index_logic3 result i in a) <= 2 /\ - 2 <= IntSize.to_int (let (_, a) = index_logic3 result i in a) /\ IntSize.to_int (let (_, a) = index_logic3 result i in a) <= 2 } - val new4 (_1 : ()) : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global) + val new3 (_1 : ()) : Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global) ensures { [#"../../../../../creusot-contracts/src/std/vec.rs" 68 26 68 44] Seq.length (shallow_model0 result) = 0 } ensures { inv4 result } @@ -2608,14 +2608,6 @@ module C06KnightsTour_KnightsTour ensures { [#"../../../../../creusot-contracts/src/std/iter.rs" 89 0 166 1] into_iter_post0 self result } ensures { inv0 result } - use prelude.Snapshot - function dumb_nonlinear_arith0 [#"../06_knights_tour.rs" 131 0 131 33] (a : usize) : () = - [#"../06_knights_tour.rs" 128 0 128 8] () - val dumb_nonlinear_arith0 [#"../06_knights_tour.rs" 131 0 131 33] (a : usize) : () - requires {[#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000} - ensures { result = dumb_nonlinear_arith0 a } - - axiom dumb_nonlinear_arith0_spec : forall a : usize . ([#"../06_knights_tour.rs" 129 11 129 22] UIntSize.to_int a <= 1000) -> ([#"../06_knights_tour.rs" 130 10 130 30] UIntSize.to_int a * UIntSize.to_int a <= 1000000) val set0 [#"../06_knights_tour.rs" 87 4 87 41] (self : borrowed (C06KnightsTour_Board_Type.t_board)) (p : C06KnightsTour_Point_Type.t_point) (v : usize) : () requires {[#"../06_knights_tour.rs" 83 15 83 24] wf0 ( * self)} requires {[#"../06_knights_tour.rs" 84 15 84 32] in_bounds0 ( * self) p} @@ -2643,7 +2635,6 @@ module C06KnightsTour_KnightsTour var _12 : isize; var _14 : (); var _15 : borrowed (C06KnightsTour_Board_Type.t_board); - var _17 : Snapshot.snap_ty (); var iter : Core_Ops_Range_Range_Type.t_range usize; var _21 : Core_Ops_Range_Range_Type.t_range usize; var _22 : usize; @@ -2687,9 +2678,9 @@ module C06KnightsTour_KnightsTour goto BB1 } BB1 { - [#"../06_knights_tour.rs" 138 27 138 37] _10 <- ([#"../06_knights_tour.rs" 138 27 138 37] IntSize.of_int (UIntSize.to_int x)); - [#"../06_knights_tour.rs" 138 42 138 52] _12 <- ([#"../06_knights_tour.rs" 138 42 138 52] IntSize.of_int (UIntSize.to_int y)); - [#"../06_knights_tour.rs" 138 16 138 54] p <- ([#"../06_knights_tour.rs" 138 16 138 54] C06KnightsTour_Point_Type.C_Point _10 _12); + [#"../06_knights_tour.rs" 138 27 138 37] _10 <- IntSize.of_int (UIntSize.to_int x); + [#"../06_knights_tour.rs" 138 42 138 52] _12 <- IntSize.of_int (UIntSize.to_int y); + [#"../06_knights_tour.rs" 138 16 138 54] p <- C06KnightsTour_Point_Type.C_Point _10 _12; _10 <- any isize; _12 <- any isize; [#"../06_knights_tour.rs" 139 4 139 9] _15 <- Borrow.borrow_mut board; @@ -2699,12 +2690,11 @@ module C06KnightsTour_KnightsTour goto BB2 } BB2 { - [#"../06_knights_tour.rs" 141 4 141 44] _17 <- ([#"../06_knights_tour.rs" 141 4 141 44] Snapshot.new (dumb_nonlinear_arith0 size)); goto BB3 } BB3 { - [#"../06_knights_tour.rs" 145 19 145 32] _22 <- ([#"../06_knights_tour.rs" 145 19 145 32] size * size); - [#"../06_knights_tour.rs" 145 16 145 32] _21 <- ([#"../06_knights_tour.rs" 145 16 145 32] Core_Ops_Range_Range_Type.C_Range (2 : usize) _22); + [#"../06_knights_tour.rs" 145 19 145 32] _22 <- size * size; + [#"../06_knights_tour.rs" 145 16 145 32] _21 <- Core_Ops_Range_Range_Type.C_Range (2 : usize) _22; _22 <- any usize; [#"../06_knights_tour.rs" 142 4 142 36] iter <- ([#"../06_knights_tour.rs" 142 4 142 36] into_iter0 _21); _21 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -2752,7 +2742,7 @@ module C06KnightsTour_KnightsTour end } BB12 { - [#"../06_knights_tour.rs" 163 4 163 15] _0 <- ([#"../06_knights_tour.rs" 163 4 163 15] Core_Option_Option_Type.C_Some board); + [#"../06_knights_tour.rs" 163 4 163 15] _0 <- Core_Option_Option_Type.C_Some board; board <- any C06KnightsTour_Board_Type.t_board; goto BB46 } @@ -2764,15 +2754,15 @@ module C06KnightsTour_KnightsTour absurd } BB15 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _35); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _35; [#"../06_knights_tour.rs" 142 4 142 36] _40 <- ([#"../06_knights_tour.rs" 142 4 142 36] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB16 } BB16 { - [#"../06_knights_tour.rs" 142 4 142 36] produced <- ([#"../06_knights_tour.rs" 142 4 142 36] _40); + [#"../06_knights_tour.rs" 142 4 142 36] produced <- _40; _40 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] step <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); - [#"../06_knights_tour.rs" 147 50 147 60] candidates <- ([#"../06_knights_tour.rs" 147 50 147 60] new4 ()); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] step <- __creusot_proc_iter_elem; + [#"../06_knights_tour.rs" 147 50 147 60] candidates <- ([#"../06_knights_tour.rs" 147 50 147 60] new3 ()); goto BB17 } BB17 { @@ -2834,16 +2824,16 @@ module C06KnightsTour_KnightsTour goto BB30 } BB30 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _54); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _54; [#"../06_knights_tour.rs" 148 8 149 54] _59 <- ([#"../06_knights_tour.rs" 148 8 149 54] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1))); goto BB31 } BB31 { - [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- ([#"../06_knights_tour.rs" 148 8 149 54] _59); + [#"../06_knights_tour.rs" 148 8 149 54] produced1 <- _59; _59 <- any Snapshot.snap_ty (Seq.seq (isize, isize)); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] m <- __creusot_proc_iter_elem1; assume { resolve2 __creusot_proc_iter_elem1 }; - [#"../06_knights_tour.rs" 151 28 151 30] _65 <- ([#"../06_knights_tour.rs" 151 28 151 30] m); + [#"../06_knights_tour.rs" 151 28 151 30] _65 <- m; [#"../06_knights_tour.rs" 151 22 151 31] adj <- ([#"../06_knights_tour.rs" 151 22 151 31] mov0 p _65); goto BB32 } @@ -2865,25 +2855,25 @@ module C06KnightsTour_KnightsTour BB35 { [#"../06_knights_tour.rs" 154 16 154 26] _73 <- Borrow.borrow_mut candidates; [#"../06_knights_tour.rs" 154 16 154 26] candidates <- ^ _73; - [#"../06_knights_tour.rs" 154 32 154 45] _74 <- ([#"../06_knights_tour.rs" 154 32 154 45] (degree, adj)); + [#"../06_knights_tour.rs" 154 32 154 45] _74 <- (degree, adj); [#"../06_knights_tour.rs" 154 16 154 46] _72 <- ([#"../06_knights_tour.rs" 154 16 154 46] push0 _73 _74); _73 <- any borrowed (Alloc_Vec_Vec_Type.t_vec (usize, C06KnightsTour_Point_Type.t_point) (Alloc_Alloc_Global_Type.t_global)); _74 <- any (usize, C06KnightsTour_Point_Type.t_point); goto BB36 } BB36 { - [#"../06_knights_tour.rs" 152 36 155 13] _34 <- ([#"../06_knights_tour.rs" 152 36 155 13] ()); + [#"../06_knights_tour.rs" 152 36 155 13] _34 <- (); goto BB38 } BB37 { - [#"../06_knights_tour.rs" 155 13 155 13] _34 <- ([#"../06_knights_tour.rs" 155 13 155 13] ()); + [#"../06_knights_tour.rs" 155 13 155 13] _34 <- (); goto BB38 } BB38 { goto BB25 } BB39 { - [#"../06_knights_tour.rs" 157 18 157 29] _81 <- ([#"../06_knights_tour.rs" 157 18 157 29] candidates); + [#"../06_knights_tour.rs" 157 18 157 29] _81 <- candidates; [#"../06_knights_tour.rs" 157 14 157 30] _79 <- ([#"../06_knights_tour.rs" 157 14 157 30] min0 _81); goto BB40 } @@ -2894,7 +2884,7 @@ module C06KnightsTour_KnightsTour end } BB41 { - [#"../06_knights_tour.rs" 159 27 159 31] _0 <- ([#"../06_knights_tour.rs" 159 27 159 31] Core_Option_Option_Type.C_None); + [#"../06_knights_tour.rs" 159 27 159 31] _0 <- Core_Option_Option_Type.C_None; assume { resolve4 candidates }; goto BB48 } @@ -2902,9 +2892,9 @@ module C06KnightsTour_KnightsTour goto BB43 } BB43 { - [#"../06_knights_tour.rs" 158 22 158 25] adj1 <- ([#"../06_knights_tour.rs" 158 22 158 25] let (_, a) = Core_Option_Option_Type.some_0 _79 in a); + [#"../06_knights_tour.rs" 158 22 158 25] adj1 <- (let (_, a) = Core_Option_Option_Type.some_0 _79 in a); assume { resolve4 candidates }; - [#"../06_knights_tour.rs" 158 31 158 38] p <- ([#"../06_knights_tour.rs" 158 31 158 38] adj1); + [#"../06_knights_tour.rs" 158 31 158 38] p <- adj1; [#"../06_knights_tour.rs" 161 8 161 13] _87 <- Borrow.borrow_mut board; [#"../06_knights_tour.rs" 161 8 161 13] board <- ^ _87; [#"../06_knights_tour.rs" 161 8 161 26] _86 <- ([#"../06_knights_tour.rs" 161 8 161 26] set0 _87 p step); @@ -2912,7 +2902,7 @@ module C06KnightsTour_KnightsTour goto BB44 } BB44 { - [#"../06_knights_tour.rs" 145 33 162 5] _34 <- ([#"../06_knights_tour.rs" 145 33 162 5] ()); + [#"../06_knights_tour.rs" 145 33 162 5] _34 <- (); goto BB45 } BB45 { diff --git a/creusot/tests/should_succeed/vector/07_read_write.mlcfg b/creusot/tests/should_succeed/vector/07_read_write.mlcfg index 4d411db624..1ec32d23d7 100644 --- a/creusot/tests/should_succeed/vector/07_read_write.mlcfg +++ b/creusot/tests/should_succeed/vector/07_read_write.mlcfg @@ -234,7 +234,7 @@ module C07ReadWrite_ReadWrite goto BB1 } BB1 { - [#"../07_read_write.rs" 7 4 7 12] _6 <- { _6 with current = ([#"../07_read_write.rs" 7 4 7 12] x) ; }; + [#"../07_read_write.rs" 7 4 7 12] _6 <- { _6 with current = x ; }; assert { [@expl:type invariant] inv1 ( * _6) }; assume { resolve0 ( * _6) }; assert { [@expl:type invariant] inv2 _6 }; @@ -259,7 +259,7 @@ module C07ReadWrite_ReadWrite assume { resolve0 x }; assert { [@expl:type invariant] inv4 a }; assume { resolve3 a }; - [#"../07_read_write.rs" 6 76 9 1] _0 <- ([#"../07_read_write.rs" 6 76 9 1] ()); + [#"../07_read_write.rs" 6 76 9 1] _0 <- (); return _0 } BB5 { diff --git a/creusot/tests/should_succeed/vector/08_haystack.mlcfg b/creusot/tests/should_succeed/vector/08_haystack.mlcfg index be73d8e1ee..7180f18811 100644 --- a/creusot/tests/should_succeed/vector/08_haystack.mlcfg +++ b/creusot/tests/should_succeed/vector/08_haystack.mlcfg @@ -477,7 +477,7 @@ module C08Haystack_Search goto BB2 } BB2 { - [#"../08_haystack.rs" 23 21 23 50] _11 <- ([#"../08_haystack.rs" 23 21 23 50] _12 - _14); + [#"../08_haystack.rs" 23 21 23 50] _11 <- _12 - _14; _12 <- any usize; _14 <- any usize; [#"../08_haystack.rs" 23 17 23 50] _10 <- ([#"../08_haystack.rs" 23 17 23 50] new0 (0 : usize) _11); @@ -534,19 +534,19 @@ module C08Haystack_Search absurd } BB13 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _24); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem <- Core_Option_Option_Type.some_0 _24; [#"../08_haystack.rs" 22 4 22 112] _29 <- ([#"../08_haystack.rs" 22 4 22 112] Snapshot.new (Seq.(++) (Snapshot.inner produced) (Seq.singleton __creusot_proc_iter_elem))); goto BB14 } BB14 { - [#"../08_haystack.rs" 22 4 22 112] produced <- ([#"../08_haystack.rs" 22 4 22 112] _29); + [#"../08_haystack.rs" 22 4 22 112] produced <- _29; _29 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] i <- __creusot_proc_iter_elem; [#"../08_haystack.rs" 25 20 25 32] _36 <- ([#"../08_haystack.rs" 25 20 25 32] len0 needle); goto BB15 } BB15 { - [#"../08_haystack.rs" 25 17 25 32] _35 <- ([#"../08_haystack.rs" 25 17 25 32] Core_Ops_Range_Range_Type.C_Range (0 : usize) _36); + [#"../08_haystack.rs" 25 17 25 32] _35 <- Core_Ops_Range_Range_Type.C_Range (0 : usize) _36; _36 <- any usize; [#"../08_haystack.rs" 24 8 24 68] iter1 <- ([#"../08_haystack.rs" 24 8 24 68] into_iter1 _35); _35 <- any Core_Ops_Range_Range_Type.t_range usize; @@ -586,32 +586,32 @@ module C08Haystack_Search end } BB22 { - [#"../08_haystack.rs" 31 15 31 16] _0 <- ([#"../08_haystack.rs" 31 15 31 16] i); + [#"../08_haystack.rs" 31 15 31 16] _0 <- i; goto BB31 } BB23 { goto BB24 } BB24 { - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] Core_Option_Option_Type.some_0 _45); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1 <- Core_Option_Option_Type.some_0 _45; [#"../08_haystack.rs" 24 8 24 68] _50 <- ([#"../08_haystack.rs" 24 8 24 68] Snapshot.new (Seq.(++) (Snapshot.inner produced1) (Seq.singleton __creusot_proc_iter_elem1))); goto BB25 } BB25 { - [#"../08_haystack.rs" 24 8 24 68] produced1 <- ([#"../08_haystack.rs" 24 8 24 68] _50); + [#"../08_haystack.rs" 24 8 24 68] produced1 <- _50; _50 <- any Snapshot.snap_ty (Seq.seq usize); - [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- ([#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] __creusot_proc_iter_elem1); + [#"../../../../../creusot-contracts-proc/src/lib.rs" 654 0 654 51] j <- __creusot_proc_iter_elem1; [#"../08_haystack.rs" 26 21 26 24] _55 <- ([#"../08_haystack.rs" 26 21 26 24] index0 needle j); goto BB26 } BB26 { - [#"../08_haystack.rs" 26 37 26 42] _61 <- ([#"../08_haystack.rs" 26 37 26 42] i + j); + [#"../08_haystack.rs" 26 37 26 42] _61 <- i + j; [#"../08_haystack.rs" 26 36 26 43] _59 <- ([#"../08_haystack.rs" 26 36 26 43] index0 haystack _61); _61 <- any usize; goto BB27 } BB27 { - [#"../08_haystack.rs" 26 15 26 43] _53 <- ([#"../08_haystack.rs" 26 15 26 43] _55 <> _59); + [#"../08_haystack.rs" 26 15 26 43] _53 <- _55 <> _59; switch (_53) | False -> goto BB29 | True -> goto BB28 diff --git a/creusot/tests/should_succeed/vector/09_capacity.mlcfg b/creusot/tests/should_succeed/vector/09_capacity.mlcfg index d4206d382b..ce325c4eb1 100644 --- a/creusot/tests/should_succeed/vector/09_capacity.mlcfg +++ b/creusot/tests/should_succeed/vector/09_capacity.mlcfg @@ -173,7 +173,7 @@ module C09Capacity_ChangeCapacity BB4 { assert { [@expl:type invariant] inv1 v }; assume { resolve0 v }; - [#"../09_capacity.rs" 6 42 11 1] _0 <- ([#"../09_capacity.rs" 6 42 11 1] ()); + [#"../09_capacity.rs" 6 42 11 1] _0 <- (); return _0 } @@ -256,7 +256,7 @@ module C09Capacity_ClearVec BB1 { assert { [@expl:type invariant] inv1 v }; assume { resolve0 v }; - [#"../09_capacity.rs" 14 36 16 1] _0 <- ([#"../09_capacity.rs" 14 36 16 1] ()); + [#"../09_capacity.rs" 14 36 16 1] _0 <- (); return _0 }