diff options
Diffstat (limited to 'tests/lean')
28 files changed, 280 insertions, 175 deletions
diff --git a/tests/lean/Arrays.lean b/tests/lean/Arrays.lean index 9748919e..bb97d5c4 100644 --- a/tests/lean/Arrays.lean +++ b/tests/lean/Arrays.lean @@ -2,6 +2,9 @@ -- [arrays] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace arrays diff --git a/tests/lean/Betree/Funs.lean b/tests/lean/Betree/Funs.lean index 7d8b4714..4592e91c 100644 --- a/tests/lean/Betree/Funs.lean +++ b/tests/lean/Betree/Funs.lean @@ -4,6 +4,9 @@ import Base import Betree.Types import Betree.FunsExternal open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace betree @@ -248,6 +251,7 @@ divergent def betree.Node.lookup_first_message_for_key_loop /- [betree::betree::{betree::betree::Node#5}::lookup_first_message_for_key]: Source: 'src/betree.rs', lines 792:4-795:34 -/ +@[reducible] def betree.Node.lookup_first_message_for_key (key : U64) (msgs : betree.List (U64 × betree.Message)) : Result ((betree.List (U64 × betree.Message)) × (betree.List (U64 × @@ -272,6 +276,7 @@ divergent def betree.Node.lookup_in_bindings_loop /- [betree::betree::{betree::betree::Node#5}::lookup_in_bindings]: Source: 'src/betree.rs', lines 649:4-649:84 -/ +@[reducible] def betree.Node.lookup_in_bindings (key : U64) (bindings : betree.List (U64 × U64)) : Result (Option U64) := betree.Node.lookup_in_bindings_loop key bindings @@ -307,6 +312,7 @@ divergent def betree.Node.apply_upserts_loop /- [betree::betree::{betree::betree::Node#5}::apply_upserts]: Source: 'src/betree.rs', lines 820:4-820:94 -/ +@[reducible] def betree.Node.apply_upserts (msgs : betree.List (U64 × betree.Message)) (prev : Option U64) (key : U64) : @@ -411,6 +417,7 @@ divergent def betree.Node.filter_messages_for_key_loop /- [betree::betree::{betree::betree::Node#5}::filter_messages_for_key]: Source: 'src/betree.rs', lines 683:4-683:77 -/ +@[reducible] def betree.Node.filter_messages_for_key (key : U64) (msgs : betree.List (U64 × betree.Message)) : Result (betree.List (U64 × betree.Message)) @@ -443,6 +450,7 @@ divergent def betree.Node.lookup_first_message_after_key_loop /- [betree::betree::{betree::betree::Node#5}::lookup_first_message_after_key]: Source: 'src/betree.rs', lines 694:4-697:34 -/ +@[reducible] def betree.Node.lookup_first_message_after_key (key : U64) (msgs : betree.List (U64 × betree.Message)) : Result ((betree.List (U64 × betree.Message)) × (betree.List (U64 × @@ -531,6 +539,7 @@ divergent def betree.Node.apply_messages_to_internal_loop /- [betree::betree::{betree::betree::Node#5}::apply_messages_to_internal]: Source: 'src/betree.rs', lines 518:4-521:5 -/ +@[reducible] def betree.Node.apply_messages_to_internal (msgs : betree.List (U64 × betree.Message)) (new_msgs : betree.List (U64 × betree.Message)) : @@ -563,6 +572,7 @@ divergent def betree.Node.lookup_mut_in_bindings_loop /- [betree::betree::{betree::betree::Node#5}::lookup_mut_in_bindings]: Source: 'src/betree.rs', lines 664:4-667:32 -/ +@[reducible] def betree.Node.lookup_mut_in_bindings (key : U64) (bindings : betree.List (U64 × U64)) : Result ((betree.List (U64 × U64)) × (betree.List (U64 × U64) → Result @@ -627,6 +637,7 @@ divergent def betree.Node.apply_messages_to_leaf_loop /- [betree::betree::{betree::betree::Node#5}::apply_messages_to_leaf]: Source: 'src/betree.rs', lines 463:4-466:5 -/ +@[reducible] def betree.Node.apply_messages_to_leaf (bindings : betree.List (U64 × U64)) (new_msgs : betree.List (U64 × betree.Message)) : diff --git a/tests/lean/Betree/FunsExternal_Template.lean b/tests/lean/Betree/FunsExternal_Template.lean index 014f0d83..2fb40ebc 100644 --- a/tests/lean/Betree/FunsExternal_Template.lean +++ b/tests/lean/Betree/FunsExternal_Template.lean @@ -4,6 +4,9 @@ import Base import Betree.Types open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false open betree /- [betree::betree_utils::load_internal_node]: diff --git a/tests/lean/Betree/Types.lean b/tests/lean/Betree/Types.lean index 3b46c00c..9e7c505b 100644 --- a/tests/lean/Betree/Types.lean +++ b/tests/lean/Betree/Types.lean @@ -3,6 +3,9 @@ import Base import Betree.TypesExternal open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace betree diff --git a/tests/lean/Betree/TypesExternal_Template.lean b/tests/lean/Betree/TypesExternal_Template.lean index 12fce657..f97517a6 100644 --- a/tests/lean/Betree/TypesExternal_Template.lean +++ b/tests/lean/Betree/TypesExternal_Template.lean @@ -3,6 +3,9 @@ -- This is a template file: rename it to "TypesExternal.lean" and fill the holes. import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false /- The state type used in the state-error monad -/ axiom State : Type diff --git a/tests/lean/Bitwise.lean b/tests/lean/Bitwise.lean index 23ec66b4..7f347661 100644 --- a/tests/lean/Bitwise.lean +++ b/tests/lean/Bitwise.lean @@ -2,6 +2,9 @@ -- [bitwise] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace bitwise diff --git a/tests/lean/Constants.lean b/tests/lean/Constants.lean index ecb91c16..fff74646 100644 --- a/tests/lean/Constants.lean +++ b/tests/lean/Constants.lean @@ -2,6 +2,9 @@ -- [constants] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace constants diff --git a/tests/lean/Demo/Demo.lean b/tests/lean/Demo/Demo.lean index 48ac2062..a557cf73 100644 --- a/tests/lean/Demo/Demo.lean +++ b/tests/lean/Demo/Demo.lean @@ -2,6 +2,9 @@ -- [demo] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace demo @@ -112,6 +115,7 @@ divergent def list_nth_mut1_loop /- [demo::list_nth_mut1]: Source: 'tests/src/demo.rs', lines 71:0-71:77 -/ +@[reducible] def list_nth_mut1 (T : Type) (l : CList T) (i : U32) : Result (T × (T → Result (CList T))) diff --git a/tests/lean/External/Funs.lean b/tests/lean/External/Funs.lean index 1b1d5cdf..cd1883e5 100644 --- a/tests/lean/External/Funs.lean +++ b/tests/lean/External/Funs.lean @@ -4,6 +4,9 @@ import Base import External.Types import External.FunsExternal open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace external diff --git a/tests/lean/External/FunsExternal_Template.lean b/tests/lean/External/FunsExternal_Template.lean index 870a79c0..51050b21 100644 --- a/tests/lean/External/FunsExternal_Template.lean +++ b/tests/lean/External/FunsExternal_Template.lean @@ -4,6 +4,9 @@ import Base import External.Types open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false open external /- [core::cell::{core::cell::Cell<T>#10}::get]: diff --git a/tests/lean/External/Types.lean b/tests/lean/External/Types.lean index 836ddff0..50446e1c 100644 --- a/tests/lean/External/Types.lean +++ b/tests/lean/External/Types.lean @@ -3,6 +3,9 @@ import Base import External.TypesExternal open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace external diff --git a/tests/lean/External/TypesExternal_Template.lean b/tests/lean/External/TypesExternal_Template.lean index 24687d83..2cfbcc80 100644 --- a/tests/lean/External/TypesExternal_Template.lean +++ b/tests/lean/External/TypesExternal_Template.lean @@ -3,6 +3,9 @@ -- This is a template file: rename it to "TypesExternal.lean" and fill the holes. import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false /- [core::cell::Cell] Source: '/rustc/65ea825f4021eaf77f1b25139969712d65b435a4/library/core/src/cell.rs', lines 294:0-294:26 diff --git a/tests/lean/Hashmap/Funs.lean b/tests/lean/Hashmap/Funs.lean index 612e1848..7972b715 100644 --- a/tests/lean/Hashmap/Funs.lean +++ b/tests/lean/Hashmap/Funs.lean @@ -4,45 +4,49 @@ import Base import Hashmap.Types import Hashmap.FunsExternal open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace hashmap /- [hashmap::hash_key]: - Source: 'tests/src/hashmap.rs', lines 37:0-37:32 -/ + Source: 'tests/src/hashmap.rs', lines 38:0-38:32 -/ def hash_key (k : Usize) : Result Usize := Result.ok k /- [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0: - Source: 'tests/src/hashmap.rs', lines 60:4-66:5 -/ + Source: 'tests/src/hashmap.rs', lines 61:4-67:5 -/ divergent def HashMap.allocate_slots_loop - (T : Type) (slots : alloc.vec.Vec (List T)) (n : Usize) : - Result (alloc.vec.Vec (List T)) + (T : Type) (slots : alloc.vec.Vec (AList T)) (n : Usize) : + Result (alloc.vec.Vec (AList T)) := if n > 0#usize then do - let slots1 ← alloc.vec.Vec.push (List T) slots List.Nil + let slots1 ← alloc.vec.Vec.push (AList T) slots AList.Nil let n1 ← n - 1#usize HashMap.allocate_slots_loop T slots1 n1 else Result.ok slots /- [hashmap::{hashmap::HashMap<T>}::allocate_slots]: - Source: 'tests/src/hashmap.rs', lines 60:4-60:76 -/ + Source: 'tests/src/hashmap.rs', lines 61:4-61:78 -/ +@[reducible] def HashMap.allocate_slots - (T : Type) (slots : alloc.vec.Vec (List T)) (n : Usize) : - Result (alloc.vec.Vec (List T)) + (T : Type) (slots : alloc.vec.Vec (AList T)) (n : Usize) : + Result (alloc.vec.Vec (AList T)) := HashMap.allocate_slots_loop T slots n /- [hashmap::{hashmap::HashMap<T>}::new_with_capacity]: - Source: 'tests/src/hashmap.rs', lines 69:4-73:13 -/ + Source: 'tests/src/hashmap.rs', lines 70:4-74:13 -/ def HashMap.new_with_capacity (T : Type) (capacity : Usize) (max_load_dividend : Usize) (max_load_divisor : Usize) : Result (HashMap T) := do - let slots ← HashMap.allocate_slots T (alloc.vec.Vec.new (List T)) capacity + let slots ← HashMap.allocate_slots T (alloc.vec.Vec.new (AList T)) capacity let i ← capacity * max_load_dividend let i1 ← i / max_load_divisor Result.ok @@ -54,141 +58,145 @@ def HashMap.new_with_capacity } /- [hashmap::{hashmap::HashMap<T>}::new]: - Source: 'tests/src/hashmap.rs', lines 85:4-85:24 -/ + Source: 'tests/src/hashmap.rs', lines 86:4-86:24 -/ def HashMap.new (T : Type) : Result (HashMap T) := HashMap.new_with_capacity T 32#usize 4#usize 5#usize /- [hashmap::{hashmap::HashMap<T>}::clear]: loop 0: - Source: 'tests/src/hashmap.rs', lines 90:4-98:5 -/ + Source: 'tests/src/hashmap.rs', lines 91:4-99:5 -/ divergent def HashMap.clear_loop - (T : Type) (slots : alloc.vec.Vec (List T)) (i : Usize) : - Result (alloc.vec.Vec (List T)) + (T : Type) (slots : alloc.vec.Vec (AList T)) (i : Usize) : + Result (alloc.vec.Vec (AList T)) := - let i1 := alloc.vec.Vec.len (List T) slots + let i1 := alloc.vec.Vec.len (AList T) slots if i < i1 then do let (_, index_mut_back) ← - alloc.vec.Vec.index_mut (List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (List T)) slots i + alloc.vec.Vec.index_mut (AList T) Usize + (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) slots i let i2 ← i + 1#usize - let slots1 ← index_mut_back List.Nil + let slots1 ← index_mut_back AList.Nil HashMap.clear_loop T slots1 i2 else Result.ok slots /- [hashmap::{hashmap::HashMap<T>}::clear]: - Source: 'tests/src/hashmap.rs', lines 90:4-90:27 -/ + Source: 'tests/src/hashmap.rs', lines 91:4-91:27 -/ def HashMap.clear (T : Type) (self : HashMap T) : Result (HashMap T) := do let hm ← HashMap.clear_loop T self.slots 0#usize Result.ok { self with num_entries := 0#usize, slots := hm } /- [hashmap::{hashmap::HashMap<T>}::len]: - Source: 'tests/src/hashmap.rs', lines 100:4-100:30 -/ + Source: 'tests/src/hashmap.rs', lines 101:4-101:30 -/ def HashMap.len (T : Type) (self : HashMap T) : Result Usize := Result.ok self.num_entries /- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 107:4-124:5 -/ + Source: 'tests/src/hashmap.rs', lines 108:4-125:5 -/ divergent def HashMap.insert_in_list_loop - (T : Type) (key : Usize) (value : T) (ls : List T) : - Result (Bool × (List T)) + (T : Type) (key : Usize) (value : T) (ls : AList T) : + Result (Bool × (AList T)) := match ls with - | List.Cons ckey cvalue tl => + | AList.Cons ckey cvalue tl => if ckey = key - then Result.ok (false, List.Cons ckey value tl) + then Result.ok (false, AList.Cons ckey value tl) else do let (b, tl1) ← HashMap.insert_in_list_loop T key value tl - Result.ok (b, List.Cons ckey cvalue tl1) - | List.Nil => Result.ok (true, List.Cons key value List.Nil) + Result.ok (b, AList.Cons ckey cvalue tl1) + | AList.Nil => Result.ok (true, AList.Cons key value AList.Nil) /- [hashmap::{hashmap::HashMap<T>}::insert_in_list]: - Source: 'tests/src/hashmap.rs', lines 107:4-107:71 -/ + Source: 'tests/src/hashmap.rs', lines 108:4-108:72 -/ +@[reducible] def HashMap.insert_in_list - (T : Type) (key : Usize) (value : T) (ls : List T) : - Result (Bool × (List T)) + (T : Type) (key : Usize) (value : T) (ls : AList T) : + Result (Bool × (AList T)) := HashMap.insert_in_list_loop T key value ls /- [hashmap::{hashmap::HashMap<T>}::insert_no_resize]: - Source: 'tests/src/hashmap.rs', lines 127:4-127:54 -/ + Source: 'tests/src/hashmap.rs', lines 128:4-128:54 -/ def HashMap.insert_no_resize (T : Type) (self : HashMap T) (key : Usize) (value : T) : Result (HashMap T) := do let hash ← hash_key key - let i := alloc.vec.Vec.len (List T) self.slots + let i := alloc.vec.Vec.len (AList T) self.slots let hash_mod ← hash % i - let (l, index_mut_back) ← - alloc.vec.Vec.index_mut (List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod - let (inserted, l1) ← HashMap.insert_in_list T key value l + let (a, index_mut_back) ← + alloc.vec.Vec.index_mut (AList T) Usize + (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots + hash_mod + let (inserted, a1) ← HashMap.insert_in_list T key value a if inserted then do let i1 ← self.num_entries + 1#usize - let v ← index_mut_back l1 + let v ← index_mut_back a1 Result.ok { self with num_entries := i1, slots := v } else do - let v ← index_mut_back l1 + let v ← index_mut_back a1 Result.ok { self with slots := v } /- [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 193:4-206:5 -/ + Source: 'tests/src/hashmap.rs', lines 194:4-207:5 -/ divergent def HashMap.move_elements_from_list_loop - (T : Type) (ntable : HashMap T) (ls : List T) : Result (HashMap T) := + (T : Type) (ntable : HashMap T) (ls : AList T) : Result (HashMap T) := match ls with - | List.Cons k v tl => + | AList.Cons k v tl => do let ntable1 ← HashMap.insert_no_resize T ntable k v HashMap.move_elements_from_list_loop T ntable1 tl - | List.Nil => Result.ok ntable + | AList.Nil => Result.ok ntable /- [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: - Source: 'tests/src/hashmap.rs', lines 193:4-193:72 -/ + Source: 'tests/src/hashmap.rs', lines 194:4-194:73 -/ +@[reducible] def HashMap.move_elements_from_list - (T : Type) (ntable : HashMap T) (ls : List T) : Result (HashMap T) := + (T : Type) (ntable : HashMap T) (ls : AList T) : Result (HashMap T) := HashMap.move_elements_from_list_loop T ntable ls /- [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0: - Source: 'tests/src/hashmap.rs', lines 181:4-190:5 -/ + Source: 'tests/src/hashmap.rs', lines 182:4-191:5 -/ divergent def HashMap.move_elements_loop - (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (List T)) (i : Usize) + (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (AList T)) (i : Usize) : - Result ((HashMap T) × (alloc.vec.Vec (List T))) + Result ((HashMap T) × (alloc.vec.Vec (AList T))) := - let i1 := alloc.vec.Vec.len (List T) slots + let i1 := alloc.vec.Vec.len (AList T) slots if i < i1 then do - let (l, index_mut_back) ← - alloc.vec.Vec.index_mut (List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (List T)) slots i - let (ls, l1) := core.mem.replace (List T) l List.Nil + let (a, index_mut_back) ← + alloc.vec.Vec.index_mut (AList T) Usize + (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) slots i + let (ls, a1) := core.mem.replace (AList T) a AList.Nil let ntable1 ← HashMap.move_elements_from_list T ntable ls let i2 ← i + 1#usize - let slots1 ← index_mut_back l1 + let slots1 ← index_mut_back a1 HashMap.move_elements_loop T ntable1 slots1 i2 else Result.ok (ntable, slots) /- [hashmap::{hashmap::HashMap<T>}::move_elements]: - Source: 'tests/src/hashmap.rs', lines 181:4-181:95 -/ + Source: 'tests/src/hashmap.rs', lines 182:4-182:96 -/ +@[reducible] def HashMap.move_elements - (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (List T)) (i : Usize) + (T : Type) (ntable : HashMap T) (slots : alloc.vec.Vec (AList T)) (i : Usize) : - Result ((HashMap T) × (alloc.vec.Vec (List T))) + Result ((HashMap T) × (alloc.vec.Vec (AList T))) := HashMap.move_elements_loop T ntable slots i /- [hashmap::{hashmap::HashMap<T>}::try_resize]: - Source: 'tests/src/hashmap.rs', lines 150:4-150:28 -/ + Source: 'tests/src/hashmap.rs', lines 151:4-151:28 -/ def HashMap.try_resize (T : Type) (self : HashMap T) : Result (HashMap T) := do let max_usize ← Scalar.cast .Usize core_u32_max - let capacity := alloc.vec.Vec.len (List T) self.slots + let capacity := alloc.vec.Vec.len (AList T) self.slots let n1 ← max_usize / 2#usize let (i, i1) := self.max_load_factor let i2 ← n1 / i @@ -208,7 +216,7 @@ def HashMap.try_resize (T : Type) (self : HashMap T) : Result (HashMap T) := else Result.ok { self with max_load_factor := (i, i1) } /- [hashmap::{hashmap::HashMap<T>}::insert]: - Source: 'tests/src/hashmap.rs', lines 139:4-139:48 -/ + Source: 'tests/src/hashmap.rs', lines 140:4-140:48 -/ def HashMap.insert (T : Type) (self : HashMap T) (key : Usize) (value : T) : Result (HashMap T) @@ -221,74 +229,78 @@ def HashMap.insert else Result.ok self1 /- [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 216:4-229:5 -/ + Source: 'tests/src/hashmap.rs', lines 217:4-230:5 -/ divergent def HashMap.contains_key_in_list_loop - (T : Type) (key : Usize) (ls : List T) : Result Bool := + (T : Type) (key : Usize) (ls : AList T) : Result Bool := match ls with - | List.Cons ckey _ tl => + | AList.Cons ckey _ tl => if ckey = key then Result.ok true else HashMap.contains_key_in_list_loop T key tl - | List.Nil => Result.ok false + | AList.Nil => Result.ok false /- [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: - Source: 'tests/src/hashmap.rs', lines 216:4-216:68 -/ + Source: 'tests/src/hashmap.rs', lines 217:4-217:69 -/ +@[reducible] def HashMap.contains_key_in_list - (T : Type) (key : Usize) (ls : List T) : Result Bool := + (T : Type) (key : Usize) (ls : AList T) : Result Bool := HashMap.contains_key_in_list_loop T key ls /- [hashmap::{hashmap::HashMap<T>}::contains_key]: - Source: 'tests/src/hashmap.rs', lines 209:4-209:49 -/ + Source: 'tests/src/hashmap.rs', lines 210:4-210:49 -/ def HashMap.contains_key (T : Type) (self : HashMap T) (key : Usize) : Result Bool := do let hash ← hash_key key - let i := alloc.vec.Vec.len (List T) self.slots + let i := alloc.vec.Vec.len (AList T) self.slots let hash_mod ← hash % i - let l ← - alloc.vec.Vec.index (List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod - HashMap.contains_key_in_list T key l + let a ← + alloc.vec.Vec.index (AList T) Usize + (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots + hash_mod + HashMap.contains_key_in_list T key a /- [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 234:4-247:5 -/ + Source: 'tests/src/hashmap.rs', lines 235:4-248:5 -/ divergent def HashMap.get_in_list_loop - (T : Type) (key : Usize) (ls : List T) : Result T := + (T : Type) (key : Usize) (ls : AList T) : Result T := match ls with - | List.Cons ckey cvalue tl => + | AList.Cons ckey cvalue tl => if ckey = key then Result.ok cvalue else HashMap.get_in_list_loop T key tl - | List.Nil => Result.fail .panic + | AList.Nil => Result.fail .panic /- [hashmap::{hashmap::HashMap<T>}::get_in_list]: - Source: 'tests/src/hashmap.rs', lines 234:4-234:70 -/ -def HashMap.get_in_list (T : Type) (key : Usize) (ls : List T) : Result T := + Source: 'tests/src/hashmap.rs', lines 235:4-235:71 -/ +@[reducible] +def HashMap.get_in_list (T : Type) (key : Usize) (ls : AList T) : Result T := HashMap.get_in_list_loop T key ls /- [hashmap::{hashmap::HashMap<T>}::get]: - Source: 'tests/src/hashmap.rs', lines 249:4-249:55 -/ + Source: 'tests/src/hashmap.rs', lines 250:4-250:55 -/ def HashMap.get (T : Type) (self : HashMap T) (key : Usize) : Result T := do let hash ← hash_key key - let i := alloc.vec.Vec.len (List T) self.slots + let i := alloc.vec.Vec.len (AList T) self.slots let hash_mod ← hash % i - let l ← - alloc.vec.Vec.index (List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod - HashMap.get_in_list T key l + let a ← + alloc.vec.Vec.index (AList T) Usize + (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots + hash_mod + HashMap.get_in_list T key a /- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 255:4-264:5 -/ + Source: 'tests/src/hashmap.rs', lines 256:4-265:5 -/ divergent def HashMap.get_mut_in_list_loop - (T : Type) (ls : List T) (key : Usize) : - Result (T × (T → Result (List T))) + (T : Type) (ls : AList T) (key : Usize) : + Result (T × (T → Result (AList T))) := match ls with - | List.Cons ckey cvalue tl => + | AList.Cons ckey cvalue tl => if ckey = key then - let back := fun ret => Result.ok (List.Cons ckey ret tl) + let back := fun ret => Result.ok (AList.Cons ckey ret tl) Result.ok (cvalue, back) else do @@ -297,92 +309,96 @@ divergent def HashMap.get_mut_in_list_loop fun ret => do let tl1 ← back ret - Result.ok (List.Cons ckey cvalue tl1) + Result.ok (AList.Cons ckey cvalue tl1) Result.ok (t, back1) - | List.Nil => Result.fail .panic + | AList.Nil => Result.fail .panic /- [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: - Source: 'tests/src/hashmap.rs', lines 255:4-255:86 -/ + Source: 'tests/src/hashmap.rs', lines 256:4-256:87 -/ +@[reducible] def HashMap.get_mut_in_list - (T : Type) (ls : List T) (key : Usize) : - Result (T × (T → Result (List T))) + (T : Type) (ls : AList T) (key : Usize) : + Result (T × (T → Result (AList T))) := HashMap.get_mut_in_list_loop T ls key /- [hashmap::{hashmap::HashMap<T>}::get_mut]: - Source: 'tests/src/hashmap.rs', lines 267:4-267:67 -/ + Source: 'tests/src/hashmap.rs', lines 268:4-268:67 -/ def HashMap.get_mut (T : Type) (self : HashMap T) (key : Usize) : Result (T × (T → Result (HashMap T))) := do let hash ← hash_key key - let i := alloc.vec.Vec.len (List T) self.slots + let i := alloc.vec.Vec.len (AList T) self.slots let hash_mod ← hash % i - let (l, index_mut_back) ← - alloc.vec.Vec.index_mut (List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod - let (t, get_mut_in_list_back) ← HashMap.get_mut_in_list T l key + let (a, index_mut_back) ← + alloc.vec.Vec.index_mut (AList T) Usize + (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots + hash_mod + let (t, get_mut_in_list_back) ← HashMap.get_mut_in_list T a key let back := fun ret => do - let l1 ← get_mut_in_list_back ret - let v ← index_mut_back l1 + let a1 ← get_mut_in_list_back ret + let v ← index_mut_back a1 Result.ok { self with slots := v } Result.ok (t, back) /- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0: - Source: 'tests/src/hashmap.rs', lines 275:4-301:5 -/ + Source: 'tests/src/hashmap.rs', lines 276:4-302:5 -/ divergent def HashMap.remove_from_list_loop - (T : Type) (key : Usize) (ls : List T) : Result ((Option T) × (List T)) := + (T : Type) (key : Usize) (ls : AList T) : Result ((Option T) × (AList T)) := match ls with - | List.Cons ckey t tl => + | AList.Cons ckey t tl => if ckey = key then let (mv_ls, _) := - core.mem.replace (List T) (List.Cons ckey t tl) List.Nil + core.mem.replace (AList T) (AList.Cons ckey t tl) AList.Nil match mv_ls with - | List.Cons _ cvalue tl1 => Result.ok (some cvalue, tl1) - | List.Nil => Result.fail .panic + | AList.Cons _ cvalue tl1 => Result.ok (some cvalue, tl1) + | AList.Nil => Result.fail .panic else do let (o, tl1) ← HashMap.remove_from_list_loop T key tl - Result.ok (o, List.Cons ckey t tl1) - | List.Nil => Result.ok (none, List.Nil) + Result.ok (o, AList.Cons ckey t tl1) + | AList.Nil => Result.ok (none, AList.Nil) /- [hashmap::{hashmap::HashMap<T>}::remove_from_list]: - Source: 'tests/src/hashmap.rs', lines 275:4-275:69 -/ + Source: 'tests/src/hashmap.rs', lines 276:4-276:70 -/ +@[reducible] def HashMap.remove_from_list - (T : Type) (key : Usize) (ls : List T) : Result ((Option T) × (List T)) := + (T : Type) (key : Usize) (ls : AList T) : Result ((Option T) × (AList T)) := HashMap.remove_from_list_loop T key ls /- [hashmap::{hashmap::HashMap<T>}::remove]: - Source: 'tests/src/hashmap.rs', lines 304:4-304:52 -/ + Source: 'tests/src/hashmap.rs', lines 305:4-305:52 -/ def HashMap.remove (T : Type) (self : HashMap T) (key : Usize) : Result ((Option T) × (HashMap T)) := do let hash ← hash_key key - let i := alloc.vec.Vec.len (List T) self.slots + let i := alloc.vec.Vec.len (AList T) self.slots let hash_mod ← hash % i - let (l, index_mut_back) ← - alloc.vec.Vec.index_mut (List T) Usize - (core.slice.index.SliceIndexUsizeSliceTInst (List T)) self.slots hash_mod - let (x, l1) ← HashMap.remove_from_list T key l + let (a, index_mut_back) ← + alloc.vec.Vec.index_mut (AList T) Usize + (core.slice.index.SliceIndexUsizeSliceTInst (AList T)) self.slots + hash_mod + let (x, a1) ← HashMap.remove_from_list T key a match x with | none => do - let v ← index_mut_back l1 + let v ← index_mut_back a1 Result.ok (none, { self with slots := v }) | some x1 => do let i1 ← self.num_entries - 1#usize - let v ← index_mut_back l1 + let v ← index_mut_back a1 Result.ok (some x1, { self with num_entries := i1, slots := v }) /- [hashmap::insert_on_disk]: - Source: 'tests/src/hashmap.rs', lines 335:0-335:43 -/ + Source: 'tests/src/hashmap.rs', lines 336:0-336:43 -/ def insert_on_disk (key : Usize) (value : U64) (st : State) : Result (State × Unit) := do @@ -391,7 +407,7 @@ def insert_on_disk utils.serialize hm1 st1 /- [hashmap::test1]: - Source: 'tests/src/hashmap.rs', lines 350:0-350:10 -/ + Source: 'tests/src/hashmap.rs', lines 351:0-351:10 -/ def test1 : Result Unit := do let hm ← HashMap.new U64 diff --git a/tests/lean/Hashmap/FunsExternal_Template.lean b/tests/lean/Hashmap/FunsExternal_Template.lean index 2af57d10..ea5ceed3 100644 --- a/tests/lean/Hashmap/FunsExternal_Template.lean +++ b/tests/lean/Hashmap/FunsExternal_Template.lean @@ -4,13 +4,16 @@ import Base import Hashmap.Types open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false open hashmap /- [hashmap::utils::deserialize]: - Source: 'tests/src/hashmap.rs', lines 330:4-330:47 -/ + Source: 'tests/src/hashmap.rs', lines 331:4-331:47 -/ axiom utils.deserialize : State → Result (State × (HashMap U64)) /- [hashmap::utils::serialize]: - Source: 'tests/src/hashmap.rs', lines 325:4-325:46 -/ + Source: 'tests/src/hashmap.rs', lines 326:4-326:46 -/ axiom utils.serialize : HashMap U64 → State → Result (State × Unit) diff --git a/tests/lean/Hashmap/Properties.lean b/tests/lean/Hashmap/Properties.lean index 5be778e7..29b5834b 100644 --- a/tests/lean/Hashmap/Properties.lean +++ b/tests/lean/Hashmap/Properties.lean @@ -9,7 +9,7 @@ namespace List -- TODO: rewrite rule: match x == y with ... -> if x = y then ... else ... ? (actually doesn't work because of sugar) -- TODO: move? @[simp] -def lookup' {α : Type} (ls: _root_.List (Usize × α)) (key: Usize) : Option α := +def lookup' {α : Type} (ls: List (Usize × α)) (key: Usize) : Option α := match ls with | [] => none | (k, x) :: tl => if k = key then some x else lookup' tl key @@ -18,29 +18,27 @@ end List namespace hashmap -namespace List +namespace AList -def v {α : Type} (ls: List α) : _root_.List (Usize × α) := +def v {α : Type} (ls: AList α) : List (Usize × α) := match ls with | Nil => [] | Cons k x tl => (k, x) :: v tl -@[simp] theorem v_nil (α : Type) : (Nil : List α).v = [] := by rfl -@[simp] theorem v_cons {α : Type} k x (tl: List α) : (Cons k x tl).v = (k, x) :: v tl := by rfl +@[simp] theorem v_nil (α : Type) : (Nil : AList α).v = [] := by rfl +@[simp] theorem v_cons {α : Type} k x (tl: AList α) : (Cons k x tl).v = (k, x) :: v tl := by rfl @[simp] -abbrev lookup {α : Type} (ls: List α) (key: Usize) : Option α := +abbrev lookup {α : Type} (ls: AList α) (key: Usize) : Option α := ls.v.lookup' key @[simp] -abbrev len {α : Type} (ls : List α) : Int := ls.v.len +abbrev len {α : Type} (ls : AList α) : Int := ls.v.len -end List +end AList namespace HashMap -abbrev Core.List := _root_.List - namespace List end List @@ -55,7 +53,7 @@ theorem match_lawful_beq [BEq α] [LawfulBEq α] [DecidableEq α] (x y : α) : (x == y) = (if x = y then true else false) := by split <;> simp_all -def distinct_keys (ls : Core.List (Usize × α)) := ls.pairwise_rel (λ x y => x.fst ≠ y.fst) +def distinct_keys (ls : List (Usize × α)) := ls.pairwise_rel (λ x y => x.fst ≠ y.fst) def hash_mod_key (k : Usize) (l : Int) : Int := match hash_key k with @@ -66,33 +64,33 @@ def hash_mod_key (k : Usize) (l : Int) : Int := theorem hash_mod_key_eq : hash_mod_key k l = k.val % l := by simp [hash_mod_key, hash_key] -def slot_s_inv_hash (l i : Int) (ls : Core.List (Usize × α)) : Prop := +def slot_s_inv_hash (l i : Int) (ls : List (Usize × α)) : Prop := ls.allP (λ (k, _) => hash_mod_key k l = i) @[simp] -def slot_s_inv (l i : Int) (ls : Core.List (Usize × α)) : Prop := +def slot_s_inv (l i : Int) (ls : List (Usize × α)) : Prop := distinct_keys ls ∧ slot_s_inv_hash l i ls -def slot_t_inv (l i : Int) (s : List α) : Prop := slot_s_inv l i s.v +def slot_t_inv (l i : Int) (s : AList α) : Prop := slot_s_inv l i s.v -- Interpret the hashmap as a list of lists -def v (hm : HashMap α) : Core.List (Core.List (Usize × α)) := - hm.slots.val.map List.v +def v (hm : HashMap α) : List (List (Usize × α)) := + hm.slots.val.map AList.v -- Interpret the hashmap as an associative list -def al_v (hm : HashMap α) : Core.List (Usize × α) := +def al_v (hm : HashMap α) : List (Usize × α) := hm.v.flatten -- TODO: automatic derivation -instance : Inhabited (List α) where +instance : Inhabited (AList α) where default := .Nil @[simp] -def slots_s_inv (s : Core.List (List α)) : Prop := +def slots_s_inv (s : List (AList α)) : Prop := ∀ (i : Int), 0 ≤ i → i < s.len → slot_t_inv s.len i (s.index i) -def slots_t_inv (s : alloc.vec.Vec (List α)) : Prop := +def slots_t_inv (s : alloc.vec.Vec (AList α)) : Prop := slots_s_inv s.v @[simp] @@ -117,7 +115,7 @@ attribute [-simp] Bool.exists_bool -- of heart beats set_option maxHeartbeats 1000000 -theorem insert_in_list_spec_aux {α : Type} (l : Int) (key: Usize) (value: α) (l0: List α) +theorem insert_in_list_spec_aux {α : Type} (l : Int) (key: Usize) (value: α) (l0: AList α) (hinv : slot_s_inv_hash l (hash_mod_key key l) l0.v) (hdk : distinct_keys l0.v) : ∃ b l1, @@ -144,7 +142,7 @@ theorem insert_in_list_spec_aux {α : Type} (l : Int) (key: Usize) (value: α) ( simp [insert_in_list] rw [insert_in_list_loop] simp (config := {contextual := true}) - [List.v, slot_s_inv_hash, distinct_keys, List.pairwise_rel] + [AList.v, slot_s_inv_hash, distinct_keys, List.pairwise_rel] | Cons k v tl0 => if h: k = key then rw [insert_in_list] @@ -153,7 +151,7 @@ theorem insert_in_list_spec_aux {α : Type} (l : Int) (key: Usize) (value: α) ( exists false; simp -- TODO: why do we need to do this? split_conjs . intros; simp [*] - . simp [List.v, slot_s_inv_hash] at * + . simp [AList.v, slot_s_inv_hash] at * simp [*] . simp [*, distinct_keys] at * apply hdk @@ -162,17 +160,16 @@ theorem insert_in_list_spec_aux {α : Type} (l : Int) (key: Usize) (value: α) ( rw [insert_in_list] rw [insert_in_list_loop] simp [h] - have : slot_s_inv_hash l (hash_mod_key key l) (List.v tl0) := by - simp_all [List.v, slot_s_inv_hash] - have : distinct_keys (List.v tl0) := by + have : slot_s_inv_hash l (hash_mod_key key l) (AList.v tl0) := by + simp_all [AList.v, slot_s_inv_hash] + have : distinct_keys (AList.v tl0) := by simp [distinct_keys] at hdk simp [hdk, distinct_keys] - progress keep heq as ⟨ b, tl1 .. ⟩ - simp only [insert_in_list] at heq - have : slot_s_inv_hash l (hash_mod_key key l) (List.v (List.Cons k v tl1)) := by - simp [List.v, slot_s_inv_hash] at * + progress as ⟨ b, tl1 .. ⟩ + have : slot_s_inv_hash l (hash_mod_key key l) (AList.v (AList.Cons k v tl1)) := by + simp [AList.v, slot_s_inv_hash] at * simp [*] - have : distinct_keys ((k, v) :: List.v tl1) := by + have : distinct_keys ((k, v) :: AList.v tl1) := by simp [distinct_keys] at * simp [*] -- TODO: canonize addition by default? @@ -180,7 +177,7 @@ theorem insert_in_list_spec_aux {α : Type} (l : Int) (key: Usize) (value: α) ( simp_all [Int.add_assoc, Int.add_comm, Int.add_left_comm] @[pspec] -theorem insert_in_list_spec {α : Type} (l : Int) (key: Usize) (value: α) (l0: List α) +theorem insert_in_list_spec {α : Type} (l : Int) (key: Usize) (value: α) (l0: AList α) (hinv : slot_s_inv_hash l (hash_mod_key key l) l0.v) (hdk : distinct_keys l0.v) : ∃ b l1, @@ -203,7 +200,7 @@ theorem insert_in_list_spec {α : Type} (l : Int) (key: Usize) (value: α) (l0: exists l1 @[simp] -def slots_t_lookup (s : Core.List (List α)) (k : Usize) : Option α := +def slots_t_lookup (s : List (AList α)) (k : Usize) : Option α := let i := hash_mod_key k s.len let slot := s.index i slot.lookup k @@ -254,7 +251,7 @@ theorem insert_no_resize_spec {α : Type} (hm : HashMap α) (key : Usize) (value rw [insert_no_resize] -- Simplify. Note that this also simplifies some function calls, like array index simp [hash_key, bind_tc_ok] - have _ : (alloc.vec.Vec.len (List α) hm.slots).val ≠ 0 := by + have _ : (alloc.vec.Vec.len (AList α) hm.slots).val ≠ 0 := by intro simp_all [inv] progress as ⟨ hash_mod, hhm ⟩ @@ -344,11 +341,11 @@ theorem insert_no_resize_spec {α : Type} (hm : HashMap α) (key : Usize) (value simp only [lookup, List.lookup, len_s, al_v, HashMap.v, slots_t_lookup] at * -- We have to do a case disjunction simp_all - simp [_root_.List.update_map_eq] + simp [List.update_map_eq] -- TODO: dependent rewrites - have _ : key.val % hm.slots.val.len < (List.map List.v hm.slots.val).len := by + have _ : key.val % hm.slots.val.len < (List.map AList.v hm.slots.val).len := by simp [*] - simp [_root_.List.len_flatten_update_eq, *] + simp [List.len_flatten_update_eq, *] split <;> rename_i heq <;> simp [heq] at hlen <;> @@ -371,7 +368,7 @@ theorem insert_no_resize_spec {α : Type} (hm : HashMap α) (key : Usize) (value have _ := hinv.right.left i hipos (by simp_all) simp [hhm, h_veq, nhm_eq] at * -- TODO: annoying, we do that because simp_all fails below -- We need a case disjunction - if h_ieq : i = key.val % _root_.List.len hm.slots.val then + if h_ieq : i = key.val % List.len hm.slots.val then -- TODO: simp_all fails: "(deterministic) timeout at 'whnf'" -- Also, it is annoying to do this kind -- of rewritings by hand. We could have a different simp diff --git a/tests/lean/Hashmap/Types.lean b/tests/lean/Hashmap/Types.lean index b4301106..6f5d99a5 100644 --- a/tests/lean/Hashmap/Types.lean +++ b/tests/lean/Hashmap/Types.lean @@ -3,21 +3,24 @@ import Base import Hashmap.TypesExternal open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace hashmap -/- [hashmap::List] - Source: 'tests/src/hashmap.rs', lines 29:0-29:16 -/ -inductive List (T : Type) := -| Cons : Usize → T → List T → List T -| Nil : List T +/- [hashmap::AList] + Source: 'tests/src/hashmap.rs', lines 30:0-30:17 -/ +inductive AList (T : Type) := +| Cons : Usize → T → AList T → AList T +| Nil : AList T /- [hashmap::HashMap] - Source: 'tests/src/hashmap.rs', lines 45:0-45:21 -/ + Source: 'tests/src/hashmap.rs', lines 46:0-46:21 -/ structure HashMap (T : Type) where num_entries : Usize max_load_factor : (Usize × Usize) max_load : Usize - slots : alloc.vec.Vec (List T) + slots : alloc.vec.Vec (AList T) end hashmap diff --git a/tests/lean/Hashmap/TypesExternal_Template.lean b/tests/lean/Hashmap/TypesExternal_Template.lean index 03c3d157..b6f24513 100644 --- a/tests/lean/Hashmap/TypesExternal_Template.lean +++ b/tests/lean/Hashmap/TypesExternal_Template.lean @@ -3,6 +3,9 @@ -- This is a template file: rename it to "TypesExternal.lean" and fill the holes. import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false /- The state type used in the state-error monad -/ axiom State : Type diff --git a/tests/lean/InfiniteLoop.lean b/tests/lean/InfiniteLoop.lean index 9eb8e22c..b5986ed8 100644 --- a/tests/lean/InfiniteLoop.lean +++ b/tests/lean/InfiniteLoop.lean @@ -2,6 +2,9 @@ -- [infinite_loop] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace infinite_loop @@ -19,7 +22,7 @@ divergent def foo_loop : Result Unit := /- [infinite_loop::foo]: Source: 'tests/src/infinite-loop.rs', lines 6:0-6:8 -/ -def foo : Result Unit := - foo_loop +@[reducible] def foo : Result Unit := + foo_loop end infinite_loop diff --git a/tests/lean/Issue194RecursiveStructProjector.lean b/tests/lean/Issue194RecursiveStructProjector.lean index 4eb23934..730d1aa6 100644 --- a/tests/lean/Issue194RecursiveStructProjector.lean +++ b/tests/lean/Issue194RecursiveStructProjector.lean @@ -2,6 +2,9 @@ -- [issue_194_recursive_struct_projector] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace issue_194_recursive_struct_projector diff --git a/tests/lean/Loops.lean b/tests/lean/Loops.lean index 199605d5..e676336e 100644 --- a/tests/lean/Loops.lean +++ b/tests/lean/Loops.lean @@ -2,6 +2,9 @@ -- [loops] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace loops @@ -110,6 +113,7 @@ divergent def list_mem_loop (x : U32) (ls : List U32) : Result Bool := /- [loops::list_mem]: Source: 'tests/src/loops.rs', lines 80:0-80:52 -/ +@[reducible] def list_mem (x : U32) (ls : List U32) : Result Bool := list_mem_loop x ls @@ -136,6 +140,7 @@ divergent def list_nth_mut_loop_loop /- [loops::list_nth_mut_loop]: Source: 'tests/src/loops.rs', lines 92:0-92:71 -/ +@[reducible] def list_nth_mut_loop (T : Type) (ls : List T) (i : U32) : Result (T × (T → Result (List T))) := list_nth_mut_loop_loop T ls i @@ -155,6 +160,7 @@ divergent def list_nth_shared_loop_loop /- [loops::list_nth_shared_loop]: Source: 'tests/src/loops.rs', lines 105:0-105:66 -/ +@[reducible] def list_nth_shared_loop (T : Type) (ls : List T) (i : U32) : Result T := list_nth_shared_loop_loop T ls i @@ -316,6 +322,7 @@ divergent def list_nth_mut_loop_pair_loop /- [loops::list_nth_mut_loop_pair]: Source: 'tests/src/loops.rs', lines 188:0-192:27 -/ +@[reducible] def list_nth_mut_loop_pair (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result ((T × T) × (T → Result (List T)) × (T → Result (List T))) @@ -340,6 +347,7 @@ divergent def list_nth_shared_loop_pair_loop /- [loops::list_nth_shared_loop_pair]: Source: 'tests/src/loops.rs', lines 212:0-216:19 -/ +@[reducible] def list_nth_shared_loop_pair (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) := list_nth_shared_loop_pair_loop T ls0 ls1 i @@ -376,6 +384,7 @@ divergent def list_nth_mut_loop_pair_merge_loop /- [loops::list_nth_mut_loop_pair_merge]: Source: 'tests/src/loops.rs', lines 237:0-241:27 -/ +@[reducible] def list_nth_mut_loop_pair_merge (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result ((T × T) × ((T × T) → Result ((List T) × (List T)))) @@ -401,6 +410,7 @@ divergent def list_nth_shared_loop_pair_merge_loop /- [loops::list_nth_shared_loop_pair_merge]: Source: 'tests/src/loops.rs', lines 255:0-259:19 -/ +@[reducible] def list_nth_shared_loop_pair_merge (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result (T × T) := list_nth_shared_loop_pair_merge_loop T ls0 ls1 i @@ -433,6 +443,7 @@ divergent def list_nth_mut_shared_loop_pair_loop /- [loops::list_nth_mut_shared_loop_pair]: Source: 'tests/src/loops.rs', lines 273:0-277:23 -/ +@[reducible] def list_nth_mut_shared_loop_pair (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result ((T × T) × (T → Result (List T))) @@ -467,6 +478,7 @@ divergent def list_nth_mut_shared_loop_pair_merge_loop /- [loops::list_nth_mut_shared_loop_pair_merge]: Source: 'tests/src/loops.rs', lines 292:0-296:23 -/ +@[reducible] def list_nth_mut_shared_loop_pair_merge (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result ((T × T) × (T → Result (List T))) @@ -501,6 +513,7 @@ divergent def list_nth_shared_mut_loop_pair_loop /- [loops::list_nth_shared_mut_loop_pair]: Source: 'tests/src/loops.rs', lines 311:0-315:23 -/ +@[reducible] def list_nth_shared_mut_loop_pair (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result ((T × T) × (T → Result (List T))) @@ -535,6 +548,7 @@ divergent def list_nth_shared_mut_loop_pair_merge_loop /- [loops::list_nth_shared_mut_loop_pair_merge]: Source: 'tests/src/loops.rs', lines 330:0-334:23 -/ +@[reducible] def list_nth_shared_mut_loop_pair_merge (T : Type) (ls0 : List T) (ls1 : List T) (i : U32) : Result ((T × T) × (T → Result (List T))) diff --git a/tests/lean/Matches.lean b/tests/lean/Matches.lean index 9233841b..8d592a85 100644 --- a/tests/lean/Matches.lean +++ b/tests/lean/Matches.lean @@ -2,6 +2,9 @@ -- [matches] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace matches diff --git a/tests/lean/NoNestedBorrows.lean b/tests/lean/NoNestedBorrows.lean index f0438050..090ca2b2 100644 --- a/tests/lean/NoNestedBorrows.lean +++ b/tests/lean/NoNestedBorrows.lean @@ -2,6 +2,9 @@ -- [no_nested_borrows] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace no_nested_borrows diff --git a/tests/lean/Paper.lean b/tests/lean/Paper.lean index 03b96903..b1aef703 100644 --- a/tests/lean/Paper.lean +++ b/tests/lean/Paper.lean @@ -2,6 +2,9 @@ -- [paper] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace paper diff --git a/tests/lean/PoloniusList.lean b/tests/lean/PoloniusList.lean index ed279d58..489871ba 100644 --- a/tests/lean/PoloniusList.lean +++ b/tests/lean/PoloniusList.lean @@ -2,6 +2,9 @@ -- [polonius_list] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace polonius_list diff --git a/tests/lean/Traits.lean b/tests/lean/Traits.lean index 0dd692fe..51aba5bf 100644 --- a/tests/lean/Traits.lean +++ b/tests/lean/Traits.lean @@ -2,6 +2,9 @@ -- [traits] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace traits diff --git a/tests/lean/lake-manifest.json b/tests/lean/lake-manifest.json index b1c3c9dc..94b2f080 100644 --- a/tests/lean/lake-manifest.json +++ b/tests/lean/lake-manifest.json @@ -4,7 +4,7 @@ [{"url": "https://github.com/leanprover-community/batteries", "type": "git", "subDir": null, - "rev": "f96a34401de084c73c787ecb45b85d4fb47bb981", + "rev": "47e4cc5c5800c07d9bf232173c9941fa5bf68589", "name": "batteries", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -22,7 +22,7 @@ {"url": "https://github.com/leanprover-community/aesop", "type": "git", "subDir": null, - "rev": "7e3bd939c6badfcb1e607c0fddb509548baafd05", + "rev": "882561b77bd2aaa98bd8665a56821062bdb3034c", "name": "aesop", "manifestFile": "lake-manifest.json", "inputRev": "master", @@ -49,7 +49,7 @@ {"url": "https://github.com/leanprover-community/import-graph.git", "type": "git", "subDir": null, - "rev": "7983e959f8f4a79313215720de3ef1eca2d6d474", + "rev": "1588be870b9c76fe62286e8f42f0b4dafa154c96", "name": "importGraph", "manifestFile": "lake-manifest.json", "inputRev": "main", @@ -58,7 +58,7 @@ {"url": "https://github.com/leanprover-community/mathlib4.git", "type": "git", "subDir": null, - "rev": "c9f95f42b82684937a26ba395ebf7f25a81734ca", + "rev": "77e1ea0a339a4663eced9cacc3a46eb45f967b51", "name": "mathlib", "manifestFile": "lake-manifest.json", "inputRev": null, diff --git a/tests/lean/lean-toolchain b/tests/lean/lean-toolchain index 0ba3faf8..29c0cea4 100644 --- a/tests/lean/lean-toolchain +++ b/tests/lean/lean-toolchain @@ -1 +1 @@ -leanprover/lean4:v4.9.0-rc1 +leanprover/lean4:v4.9.0-rc2 diff --git a/tests/lean/misc/MutuallyRecursiveTraits.lean b/tests/lean/misc/MutuallyRecursiveTraits.lean index b0fcb9e9..05871009 100644 --- a/tests/lean/misc/MutuallyRecursiveTraits.lean +++ b/tests/lean/misc/MutuallyRecursiveTraits.lean @@ -2,5 +2,8 @@ -- [mutually_recursive_traits] import Base open Primitives +set_option linter.dupNamespace false +set_option linter.hashCommand false +set_option linter.unusedVariables false namespace mutually_recursive_traits |