diff options
Diffstat (limited to '')
10 files changed, 52 insertions, 52 deletions
diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux index 3e8b89d2a..402f52379 100644 --- a/stdlib/source/test/lux/data/collection/bits.lux +++ b/stdlib/source/test/lux/data/collection/bits.lux @@ -24,10 +24,10 @@ (do {! random.monad} [size (\ ! map (n.% 1,000) random.nat)] (case size - 0 (wrap /.empty) + 0 (in /.empty) _ (do {! random.monad} [idx (|> random.nat (\ ! map (n.% size)))] - (wrap (/.set idx /.empty)))))) + (in (/.set idx /.empty)))))) (def: #export test Test @@ -63,8 +63,8 @@ (and (n.= 0 (/.capacity /.empty)) (|> /.empty (/.set idx) /.capacity (n.- idx) - (predicate.unite (n.>= 0) - (n.< /.chunk_size))) + (predicate.or (n.>= 0) + (n.< /.chunk_size))) (let [grown (/.flip idx /.empty)] (and (n.> 0 (/.capacity grown)) (is? /.empty (/.flip idx grown)))))) diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index 19c6bfde6..0b98204a9 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -27,7 +27,7 @@ (-> (Order k) (Random k) (Random v) Nat (Random (/.Dictionary k v)))) (case size 0 - (random\wrap (/.new order)) + (random\in (/.new order)) _ (do random.monad @@ -35,7 +35,7 @@ key (random.only (|>> (/.key? partial) not) gen_key) value gen_value] - (wrap (/.put key value partial))))) + (in (/.put key value partial))))) (def: #export test Test diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux index f7450e3d1..7916da3eb 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux @@ -26,7 +26,7 @@ (do random.monad [keys (random.set text.hash size gen_key) values (random.list size gen_value)] - (wrap (list.zipped/2 (set.to_list keys) values)))) + (in (list.zipped/2 (set.to_list keys) values)))) (def: #export test Test diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index f3175fbb5..207ba73d9 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -57,13 +57,13 @@ (_.for [/.monoid] ($monoid.spec (/.equivalence n.equivalence) /.monoid ..random)) (_.for [/.fold] - ($fold.spec /\wrap /.equivalence /.fold)) + ($fold.spec /\in /.equivalence /.fold)) (_.for [/.functor] - ($functor.spec /\wrap /.equivalence /.functor)) + ($functor.spec /\in /.equivalence /.functor)) (_.for [/.apply] - ($apply.spec /\wrap /.equivalence /.apply)) + ($apply.spec /\in /.equivalence /.apply)) (_.for [/.monad] - ($monad.spec /\wrap /.equivalence /.monad)) + ($monad.spec /\in /.equivalence /.monad)) (do {! random.monad} [parameter random.nat @@ -73,9 +73,9 @@ expected (n.+ parameter subject)] (_.cover [/.with /.lift] (|> (io.run (do (/.with io.monad) - [a (lift (io\wrap parameter)) - b (wrap subject)] - (wrap (n.+ a b)))) + [a (lift (io\in parameter)) + b (in subject)] + (in (n.+ a b)))) (case> (^ (list actual)) (n.= expected actual) diff --git a/stdlib/source/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux index a43b0e278..06238c4c8 100644 --- a/stdlib/source/test/lux/data/collection/queue/priority.lux +++ b/stdlib/source/test/lux/data/collection/queue/priority.lux @@ -21,7 +21,7 @@ (monad.fold ! (function (_ head tail) (do ! [priority random.nat] - (wrap (/.push priority head tail)))) + (in (/.push priority head tail)))) /.empty inputs))) diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux index fdd2c6276..407fcde8e 100644 --- a/stdlib/source/test/lux/data/collection/row.lux +++ b/stdlib/source/test/lux/data/collection/row.lux @@ -36,13 +36,13 @@ (_.for [/.monoid] ($monoid.spec (/.equivalence n.equivalence) /.monoid (random.row size random.nat))) (_.for [/.fold] - ($fold.spec /\wrap /.equivalence /.fold)) + ($fold.spec /\in /.equivalence /.fold)) (_.for [/.functor] - ($functor.spec /\wrap /.equivalence /.functor)) + ($functor.spec /\in /.equivalence /.functor)) (_.for [/.apply] - ($apply.spec /\wrap /.equivalence /.apply)) + ($apply.spec /\in /.equivalence /.apply)) (_.for [/.monad] - ($monad.spec /\wrap /.equivalence /.monad)) + ($monad.spec /\in /.equivalence /.monad)) ))) (def: whole @@ -103,14 +103,14 @@ (do try.monad [sample (/.put good_index non_member sample) actual (/.nth good_index sample)] - (wrap (is? non_member actual))))) + (in (is? non_member actual))))) (_.cover [/.update] (<| (try.default false) (do try.monad [sample (/.put good_index non_member sample) sample (/.update good_index inc sample) actual (/.nth good_index sample)] - (wrap (n.= (inc non_member) actual))))) + (in (n.= (inc non_member) actual))))) (_.cover [/.within_bounds?] (and (/.within_bounds? sample good_index) (not (/.within_bounds? sample bad_index)))) diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux index 05752d6fa..197f35e93 100644 --- a/stdlib/source/test/lux/data/collection/set/multi.lux +++ b/stdlib/source/test/lux/data/collection/set/multi.lux @@ -30,11 +30,11 @@ (do {! random.monad} [elements (random.set hash size element) element_counts (random.list size ..count)] - (wrap (list\fold (function (_ [count element] set) - (/.add count element set)) - (/.new hash) - (list.zipped/2 element_counts - (set.to_list elements)))))) + (in (list\fold (function (_ [count element] set) + (/.add count element set)) + (/.new hash) + (list.zipped/2 element_counts + (set.to_list elements)))))) (def: signature Test diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux index 260ab946f..0614a1938 100644 --- a/stdlib/source/test/lux/data/collection/set/ordered.lux +++ b/stdlib/source/test/lux/data/collection/set/ordered.lux @@ -27,14 +27,14 @@ (All [a] (-> Nat (Order a) (Random a) (Random (Set a)))) (case size 0 - (random\wrap (/.new &order)) + (random\in (/.new &order)) _ (do random.monad [partial (random (dec size) &order gen_value) value (random.only (|>> (/.member? partial) not) gen_value)] - (wrap (/.add value partial))))) + (in (/.add value partial))))) (def: #export test Test diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux index a610fdef5..a263b2451 100644 --- a/stdlib/source/test/lux/data/collection/tree.lux +++ b/stdlib/source/test/lux/data/collection/tree.lux @@ -25,11 +25,11 @@ [value gen_value num_children (\ ! map (n.% 2) random.nat) children (random.list num_children (tree gen_value))] - (wrap [(|> children - (list\map product.left) - (list\fold n.+ 1)) - {#/.value value - #/.children (list\map product.right children)}]))) + (in [(|> children + (list\map product.left) + (list\fold n.+ 1)) + {#/.value value + #/.children (list\map product.right children)}]))) (def: #export test Test diff --git a/stdlib/source/test/lux/data/collection/tree/zipper.lux b/stdlib/source/test/lux/data/collection/tree/zipper.lux index 6487e5685..35b55f4bf 100644 --- a/stdlib/source/test/lux/data/collection/tree/zipper.lux +++ b/stdlib/source/test/lux/data/collection/tree/zipper.lux @@ -36,7 +36,7 @@ /.zip (do> maybe.monad [/.down] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.up] (|> (tree.branch expected (list (tree.leaf dummy))) @@ -44,7 +44,7 @@ (do> maybe.monad [/.down] [/.up] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.right] (|> (tree.branch dummy (list (tree.leaf dummy) (tree.leaf expected))) @@ -52,7 +52,7 @@ (do> maybe.monad [/.down] [/.right] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.rightmost] (|> (tree.branch dummy @@ -64,7 +64,7 @@ (do> maybe.monad [/.down] [/.rightmost] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.left] (|> (tree.branch dummy (list (tree.leaf expected) (tree.leaf dummy))) @@ -73,7 +73,7 @@ [/.down] [/.right] [/.left] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.leftmost] (|> (tree.branch dummy @@ -86,7 +86,7 @@ [/.down] [/.rightmost] [/.leftmost] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.next] (and (|> (tree.branch dummy @@ -95,7 +95,7 @@ /.zip (do> maybe.monad [/.next] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false)) (|> (tree.branch dummy (list (tree.leaf dummy) @@ -104,7 +104,7 @@ (do> maybe.monad [/.next] [/.next] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false)))) (_.cover [/.end] (|> (tree.branch dummy @@ -115,7 +115,7 @@ /.zip (do> maybe.monad [/.end] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.start] (|> (tree.branch expected @@ -127,7 +127,7 @@ (do> maybe.monad [/.end] [/.start] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.previous] (and (|> (tree.branch expected @@ -137,7 +137,7 @@ (do> maybe.monad [/.next] [/.previous] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false)) (|> (tree.branch dummy (list (tree.leaf expected) @@ -147,7 +147,7 @@ [/.next] [/.next] [/.previous] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false)))) ))) @@ -207,13 +207,13 @@ (|> cursor (do> maybe.monad [/.down] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false)) (|> cursor (do> maybe.monad [/.down] [/.down] - [/.value (n.= dummy) wrap]) + [/.value (n.= dummy) in]) (maybe.default false))))) (_.cover [/.adopt] (let [cursor (|> (tree.branch dummy (list (tree.leaf dummy))) @@ -223,13 +223,13 @@ (|> cursor (do> maybe.monad [/.down] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false)) (|> cursor (do> maybe.monad [/.down] [/.right] - [/.value (n.= dummy) wrap]) + [/.value (n.= dummy) in]) (maybe.default false))))) (_.cover [/.insert_left] (|> (tree.branch dummy (list (tree.leaf dummy))) @@ -238,7 +238,7 @@ [/.down] [(/.insert_left expected)] [/.left] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.insert_right] (|> (tree.branch dummy (list (tree.leaf dummy))) @@ -247,7 +247,7 @@ [/.down] [(/.insert_right expected)] [/.right] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) (_.cover [/.remove] (|> (tree.branch dummy (list (tree.leaf dummy))) @@ -256,6 +256,6 @@ [/.down] [(/.insert_left expected)] [/.remove] - [/.value (n.= expected) wrap]) + [/.value (n.= expected) in]) (maybe.default false))) )))) |