diff options
Diffstat (limited to '')
6 files changed, 34 insertions, 34 deletions
diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux index fb82ed6c9..d51067799 100644 --- a/stdlib/source/test/lux/data/collection/dictionary.lux +++ b/stdlib/source/test/lux/data/collection/dictionary.lux @@ -121,8 +121,8 @@ (_.cover [/.merge_with] (list.every? (function (_ [x x*2]) (n.= (n.* 2 x) x*2)) - (list.zip/2 (/.values dict) - (/.values (/.merge_with n.+ dict dict))))) + (list.zipped/2 (/.values dict) + (/.values (/.merge_with n.+ dict dict))))) (_.cover [/.of_list] (let [(^open ".") (/.equivalence n.equivalence)] diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index 6884c0e28..19c6bfde6 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -49,8 +49,8 @@ random.nat) extra_value random.nat shift random.nat - #let [pairs (list.zip/2 (set.to_list keys) - (set.to_list values)) + #let [pairs (list.zipped/2 (set.to_list keys) + (set.to_list values)) sample (/.of_list n.order pairs) sorted_pairs (list.sort (function (_ [left _] [right _]) (n.< left right)) @@ -97,7 +97,7 @@ sorted_pairs)) (_.cover [/.keys /.values] (list\= (/.entries sample) - (list.zip/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 f86f4c13c..f7450e3d1 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.zip/2 (set.to_list keys) values)))) + (wrap (list.zipped/2 (set.to_list keys) values)))) (def: #export test Test @@ -57,8 +57,8 @@ (_.cover [/.keys /.values] (\ (/.equivalence n.equivalence) = sample - (list.zip/2 (/.keys sample) - (/.values sample)))) + (list.zipped/2 (/.keys sample) + (/.values sample)))) (_.cover [/.contains?] (and (list.every? (function (_ key) (/.contains? key sample)) diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index a19738802..f3175fbb5 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -147,9 +147,9 @@ expected_numbers! (/.every? (n.= (dec size)) - (/.zip_with/2 n.+ - indices - (/.sort n.> indices)))] + (/.zipped_with/2 n.+ + indices + (/.sort n.> indices)))] (and expected_amount! already_sorted! expected_numbers!))) @@ -283,8 +283,8 @@ (_.cover [/.as_pairs] (n.= (n./ 2 (/.size sample/0)) (/.size (/.as_pairs sample/0)))) - (_.cover [/.zip/2] - (let [zipped (/.zip/2 sample/0 sample/1) + (_.cover [/.zipped/2] + (let [zipped (/.zipped/2 sample/0 sample/1) zipped::size (/.size zipped) size_of_smaller_list! @@ -298,8 +298,8 @@ (/\map product.right zipped)))] (and size_of_smaller_list! can_extract_values!))) - (_.cover [/.zip/3] - (let [zipped (/.zip/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! @@ -318,29 +318,29 @@ (/\map (|>> product.right product.right) zipped)))] (and size_of_smaller_list! can_extract_values!))) - (_.cover [/.zip] + (_.cover [/.zipped] (and (\ (/.equivalence (product.equivalence n.equivalence n.equivalence)) = - (/.zip/2 sample/0 sample/1) - ((/.zip 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)) = - (/.zip/3 sample/0 sample/1 sample/2) - ((/.zip 3) sample/0 sample/1 sample/2)))) + (/.zipped/3 sample/0 sample/1 sample/2) + ((/.zipped 3) sample/0 sample/1 sample/2)))) - (_.cover [/.zip_with/2] + (_.cover [/.zipped_with/2] (/\= (/\map (function (_ [left right]) (+/2 left right)) - (/.zip/2 sample/0 sample/1)) - (/.zip_with/2 +/2 sample/0 sample/1))) - (_.cover [/.zip_with/3] + (/.zipped/2 sample/0 sample/1)) + (/.zipped_with/2 +/2 sample/0 sample/1))) + (_.cover [/.zipped_with/3] (/\= (/\map (function (_ [left mid right]) (+/3 left mid right)) - (/.zip/3 sample/0 sample/1 sample/2)) - (/.zip_with/3 +/3 sample/0 sample/1 sample/2))) - (_.cover [/.zip_with] - (and (/\= (/.zip_with/2 +/2 sample/0 sample/1) - ((/.zip_with 2) +/2 sample/0 sample/1)) - (/\= (/.zip_with/3 +/3 sample/0 sample/1 sample/2) - ((/.zip_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) + ((/.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)))) (_.cover [/.concat] (and (/\= (/\compose sample/0 sample/1) (/.concat (list 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 aa85116f6..05752d6fa 100644 --- a/stdlib/source/test/lux/data/collection/set/multi.lux +++ b/stdlib/source/test/lux/data/collection/set/multi.lux @@ -33,8 +33,8 @@ (wrap (list\fold (function (_ [count element] set) (/.add count element set)) (/.new hash) - (list.zip/2 element_counts - (set.to_list elements)))))) + (list.zipped/2 element_counts + (set.to_list elements)))))) (def: signature Test diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux index f92d75440..d14c4d27f 100644 --- a/stdlib/source/test/lux/data/collection/tree/finger.lux +++ b/stdlib/source/test/lux/data/collection/tree/finger.lux @@ -88,7 +88,7 @@ (let [tree (list\fold (function (_ [tag value] tree) (\ builder branch tree (\ builder leaf tag value))) (\ builder leaf tags/H values/H) - (list.zip/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] |