diff options
Diffstat (limited to '')
6 files changed, 65 insertions, 65 deletions
diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux index 0a1f9d295..95f2bed9e 100644 --- a/stdlib/source/test/lux/data/collection/dictionary.lux +++ b/stdlib/source/test/lux/data/collection/dictionary.lux @@ -121,7 +121,7 @@ (_.cover [/.merged_with] (list.every? (function (_ [x x*2]) (n.= (n.* 2 x) x*2)) - (list.zipped/2 (/.values dict) + (list.zipped_2 (/.values dict) (/.values (/.merged_with n.+ dict dict))))) (_.cover [/.of_list] diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index c20a3b480..471565d52 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -50,7 +50,7 @@ random.nat) extra_value random.nat shift random.nat - .let [pairs (list.zipped/2 (set.list keys) + .let [pairs (list.zipped_2 (set.list keys) (set.list values)) sample (/.of_list n.order pairs) sorted_pairs (list.sorted (function (_ [left _] [right _]) @@ -98,7 +98,7 @@ sorted_pairs)) (_.cover [/.keys /.values] (list#= (/.entries sample) - (list.zipped/2 (/.keys sample) (/.values sample)))) + (list.zipped_2 (/.keys sample) (/.values sample)))) (_.cover [/.of_list] (|> sample /.entries (/.of_list n.order) diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux index 346dc5d77..fa4e221cd 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence] - ["$[0]" monoid]]] - [control - ["[0]" maybe ("[1]#[0]" monad)]] - [data - ["[0]" bit ("[1]#[0]" equivalence)] - ["[0]" text] - [collection - ["[0]" set] - ["[0]" list]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence] + ["$[0]" monoid]]] + [control + ["[0]" maybe ("[1]#[0]" monad)]] + [data + ["[0]" bit ("[1]#[0]" equivalence)] + ["[0]" text] + [collection + ["[0]" set] + ["[0]" list]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) (def: .public (random size gen_key gen_value) (All (_ v) @@ -28,7 +28,7 @@ (do random.monad [keys (random.set text.hash size gen_key) values (random.list size gen_value)] - (in (list.zipped/2 (set.list keys) values)))) + (in (list.zipped_2 (set.list keys) values)))) (def: .public test Test @@ -63,7 +63,7 @@ (_.cover [/.keys /.values] (# (/.equivalence n.equivalence) = sample - (list.zipped/2 (/.keys sample) + (list.zipped_2 (/.keys sample) (/.values sample)))) (_.cover [/.contains?] (and (list.every? (function (_ key) diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index c1440d110..5fe98b03c 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -148,7 +148,7 @@ expected_numbers! (/.every? (n.= (-- size)) - (/.zipped_with/2 n.+ + (/.zipped_with_2 n.+ indices (/.sorted n.> indices)))] (and expected_amount! @@ -305,8 +305,8 @@ {.#None} (not even_sized?)))) - (_.cover [/.zipped/2] - (let [zipped (/.zipped/2 sample/0 sample/1) + (_.cover [/.zipped_2] + (let [zipped (/.zipped_2 sample/0 sample/1) zipped::size (/.size zipped) size_of_smaller_list! @@ -320,8 +320,8 @@ (/#each product.right zipped)))] (and size_of_smaller_list! can_extract_values!))) - (_.cover [/.zipped/3] - (let [zipped (/.zipped/3 sample/0 sample/1 sample/2) + (_.cover [/.zipped_3] + (let [zipped (/.zipped_3 sample/0 sample/1 sample/2) zipped::size (/.size zipped) size_of_smaller_list! @@ -342,26 +342,26 @@ can_extract_values!))) (_.cover [/.zipped] (and (# (/.equivalence (product.equivalence n.equivalence n.equivalence)) = - (/.zipped/2 sample/0 sample/1) + (/.zipped_2 sample/0 sample/1) ((/.zipped 2) sample/0 sample/1)) (# (/.equivalence ($_ product.equivalence n.equivalence n.equivalence n.equivalence)) = - (/.zipped/3 sample/0 sample/1 sample/2) + (/.zipped_3 sample/0 sample/1 sample/2) ((/.zipped 3) sample/0 sample/1 sample/2)))) - (_.cover [/.zipped_with/2] + (_.cover [/.zipped_with_2] (/#= (/#each (function (_ [left right]) (+/2 left right)) - (/.zipped/2 sample/0 sample/1)) - (/.zipped_with/2 +/2 sample/0 sample/1))) - (_.cover [/.zipped_with/3] + (/.zipped_2 sample/0 sample/1)) + (/.zipped_with_2 +/2 sample/0 sample/1))) + (_.cover [/.zipped_with_3] (/#= (/#each (function (_ [left mid right]) (+/3 left mid right)) - (/.zipped/3 sample/0 sample/1 sample/2)) - (/.zipped_with/3 +/3 sample/0 sample/1 sample/2))) + (/.zipped_3 sample/0 sample/1 sample/2)) + (/.zipped_with_3 +/3 sample/0 sample/1 sample/2))) (_.cover [/.zipped_with] - (and (/#= (/.zipped_with/2 +/2 sample/0 sample/1) + (and (/#= (/.zipped_with_2 +/2 sample/0 sample/1) ((/.zipped_with 2) +/2 sample/0 sample/1)) - (/#= (/.zipped_with/3 +/3 sample/0 sample/1 sample/2) + (/#= (/.zipped_with_3 +/3 sample/0 sample/1 sample/2) ((/.zipped_with 3) +/3 sample/0 sample/1 sample/2)))) (_.cover [/.together] (and (/#= (/#composite sample/0 sample/1) diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux index 73dba4b3e..755efb685 100644 --- a/stdlib/source/test/lux/data/collection/set/multi.lux +++ b/stdlib/source/test/lux/data/collection/set/multi.lux @@ -1,25 +1,25 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [hash {"+" Hash}] - [monad {"+" do}] - ["[0]" predicate] - [\\specification - ["$[0]" equivalence] - ["$[0]" hash]]] - [data - ["[0]" bit ("[1]#[0]" equivalence)] - [collection - ["[0]" set] - ["[0]" list ("[1]#[0]" mix)]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [hash {"+" Hash}] + [monad {"+" do}] + ["[0]" predicate] + [\\specification + ["$[0]" equivalence] + ["$[0]" hash]]] + [data + ["[0]" bit ("[1]#[0]" equivalence)] + [collection + ["[0]" set] + ["[0]" list ("[1]#[0]" mix)]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) (def: count (Random Nat) @@ -33,7 +33,7 @@ (in (list#mix (function (_ [count element] set) (/.has count element set)) (/.empty hash) - (list.zipped/2 element_counts + (list.zipped_2 element_counts (set.list elements)))))) (def: signature diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux index 06c77591e..85c5ec037 100644 --- a/stdlib/source/test/lux/data/collection/tree/finger.lux +++ b/stdlib/source/test/lux/data/collection/tree/finger.lux @@ -89,7 +89,7 @@ (let [tree (list#mix (function (_ [tag value] tree) (# builder branch tree (# builder leaf tag value))) (# builder leaf tags/H values/H) - (list.zipped/2 tags/T values/T))] + (list.zipped_2 tags/T values/T))] (and (# tags_equivalence = (list& tags/H tags/T) (/.tags tree)) (# values_equivalence = (list& values/H values/T) (/.values tree)))))) (_.cover [/.one] |