diff options
Diffstat (limited to 'stdlib/source/test')
29 files changed, 357 insertions, 357 deletions
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux index 21372ef80..411504a35 100644 --- a/stdlib/source/test/aedifex/command/clean.lux +++ b/stdlib/source/test/aedifex/command/clean.lux @@ -46,7 +46,7 @@ [count (# ! each (n.% 10) random.nat) names (random.set text.hash count ..node_name) contents (random.list count ($binary.random 100))] - (in (list.zipped/2 (list#each (|>> (format prefix)) (set.list names)) + (in (list.zipped_2 (list#each (|>> (format prefix)) (set.list names)) contents)))) (def: (create_file! fs [path content]) diff --git a/stdlib/source/test/lux/control/concatenative.lux b/stdlib/source/test/lux/control/concatenative.lux index f6c5cb00f..f4fe24af4 100644 --- a/stdlib/source/test/lux/control/concatenative.lux +++ b/stdlib/source/test/lux/control/concatenative.lux @@ -78,16 +78,16 @@ (n.= (++ sample) (||> (/.push sample) (/.push dummy) - (/.push (/.apply/1 ++)) + (/.push (/.apply_1 ++)) /.dip /.drop))) - (_.cover [/.dip/2] + (_.cover [/.dip_2] (n.= (++ sample) (||> (/.push sample) (/.push dummy) (/.push dummy) - (/.push (/.apply/1 ++)) - /.dip/2 + (/.push (/.apply_1 ++)) + /.dip_2 /.drop /.drop))) )))) @@ -142,49 +142,49 @@ start random.nat .let [distance 10 |++| (is (/.=> [Nat] [Nat]) - (/.apply/1 ++)) + (/.apply_1 ++)) |test| (is (/.=> [Nat] [Bit]) - (/.apply/1 (|>> (n.- start) (n.< distance))))]] + (/.apply_1 (|>> (n.- start) (n.< distance))))]] ($_ _.and - (_.cover [/.call /.apply/1] + (_.cover [/.call /.apply_1] (n.= (++ sample) (||> (/.push sample) - (/.push (/.apply/1 ++)) + (/.push (/.apply_1 ++)) /.call))) - (_.cover [/.apply/2] + (_.cover [/.apply_2] (n.= (n.+ sample sample) (||> (/.push sample) (/.push sample) - (/.push (/.apply/2 n.+)) + (/.push (/.apply_2 n.+)) /.call))) - (_.cover [/.apply/3] + (_.cover [/.apply_3] (n.= ($_ n.+ sample sample sample) (||> (/.push sample) (/.push sample) (/.push sample) - (/.push (/.apply/3 (function (_ i0 i1 i2) + (/.push (/.apply_3 (function (_ i0 i1 i2) ($_ n.+ i0 i1 i2)))) /.call))) - (_.cover [/.apply/4] + (_.cover [/.apply_4] (n.= ($_ n.+ sample sample sample sample) (||> (/.push sample) (/.push sample) (/.push sample) (/.push sample) - (/.push (/.apply/4 (function (_ i0 i1 i2 i3) + (/.push (/.apply_4 (function (_ i0 i1 i2 i3) ($_ n.+ i0 i1 i2 i3)))) /.call))) - (_.cover [/.apply/5] + (_.cover [/.apply_5] (n.= ($_ n.+ sample sample sample sample sample) (||> (/.push sample) (/.push sample) (/.push sample) (/.push sample) (/.push sample) - (/.push (/.apply/5 (function (_ i0 i1 i2 i3 i4) + (/.push (/.apply_5 (function (_ i0 i1 i2 i3 i4) ($_ n.+ i0 i1 i2 i3 i4)))) /.call))) - (_.cover [/.apply/6] + (_.cover [/.apply_6] (n.= ($_ n.+ sample sample sample sample sample sample) (||> (/.push sample) (/.push sample) @@ -192,10 +192,10 @@ (/.push sample) (/.push sample) (/.push sample) - (/.push (/.apply/6 (function (_ i0 i1 i2 i3 i4 i5) + (/.push (/.apply_6 (function (_ i0 i1 i2 i3 i4 i5) ($_ n.+ i0 i1 i2 i3 i4 i5)))) /.call))) - (_.cover [/.apply/7] + (_.cover [/.apply_7] (n.= ($_ n.+ sample sample sample sample sample sample sample) (||> (/.push sample) (/.push sample) @@ -204,10 +204,10 @@ (/.push sample) (/.push sample) (/.push sample) - (/.push (/.apply/7 (function (_ i0 i1 i2 i3 i4 i5 i6) + (/.push (/.apply_7 (function (_ i0 i1 i2 i3 i4 i5 i6) ($_ n.+ i0 i1 i2 i3 i4 i5 i6)))) /.call))) - (_.cover [/.apply/8] + (_.cover [/.apply_8] (n.= ($_ n.+ sample sample sample sample sample sample sample sample) (||> (/.push sample) (/.push sample) @@ -217,7 +217,7 @@ (/.push sample) (/.push sample) (/.push sample) - (/.push (/.apply/8 (function (_ i0 i1 i2 i3 i4 i5 i6 i7) + (/.push (/.apply_8 (function (_ i0 i1 i2 i3 i4 i5 i6 i7) ($_ n.+ i0 i1 i2 i3 i4 i5 i6 i7)))) /.call))) (_.cover [/.apply] @@ -240,8 +240,8 @@ (-- sample)) (||> (/.push sample) (/.push choice) - (/.push (/.apply/1 ++)) - (/.push (/.apply/1 --)) + (/.push (/.apply_1 ++)) + (/.push (/.apply_1 --)) /.if))) (_.cover [/.loop] (n.= (n.+ distance start) @@ -274,7 +274,7 @@ (n.= (n.+ sample sample) (||> (/.push sample) (/.push sample) - (/.push (/.apply/2 n.+)) + (/.push (/.apply_2 n.+)) /.partial /.call))) (_.cover [/.when] @@ -283,7 +283,7 @@ sample) (||> (/.push sample) (/.push choice) - (/.push (/.apply/1 ++)) + (/.push (/.apply_1 ++)) /.when))) (_.cover [/.?] (n.= (if choice @@ -299,7 +299,7 @@ (=> [Nat] [Nat]) /.dup - (/.apply/2 n.*)) + (/.apply_2 n.*)) (def: definition Test diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux index 7eb54cf9a..3c804559e 100644 --- a/stdlib/source/test/lux/control/concurrency/frp.lux +++ b/stdlib/source/test/lux/control/concurrency/frp.lux @@ -69,11 +69,11 @@ (do [! random.monad] [inputs (random.list 5 random.nat) sample random.nat - distint/0 random.nat - distint/1 (|> random.nat (random.only (|>> (n.= distint/0) not))) - distint/2 (|> random.nat (random.only (function (_ value) - (not (or (n.= distint/0 value) - (n.= distint/1 value)))))) + distinct/0 random.nat + distinct/1 (|> random.nat (random.only (|>> (n.= distinct/0) not))) + distinct/2 (|> random.nat (random.only (function (_ value) + (not (or (n.= distinct/0 value) + (n.= distinct/1 value)))))) shift random.nat] ($_ _.and (_.for [/.functor] @@ -181,14 +181,14 @@ (list#= (list.mixes n.+ 0 inputs) actual)))) (in (do async.monad - [actual (|> (list distint/0 distint/0 distint/0 - distint/1 - distint/2 distint/2) + [actual (|> (list distinct/0 distinct/0 distinct/0 + distinct/1 + distinct/2 distinct/2) (/.sequential 0) (/.distinct n.equivalence) /.list)] (_.cover' [/.distinct] - (list#= (list distint/0 distint/1 distint/2) + (list#= (list distinct/0 distinct/1 distinct/2) actual)))) (do ! [polling_delay (# ! each (|>> (n.% 10) ++) random.nat) diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux index 330349078..7546bcf81 100644 --- a/stdlib/source/test/lux/control/parser/binary.lux +++ b/stdlib/source/test/lux/control/parser/binary.lux @@ -137,10 +137,10 @@ (n.= (.nat expected) (.nat actual)))))))] - [/.size/8 /.bits/8 format.bits/8] - [/.size/16 /.bits/16 format.bits/16] - [/.size/32 /.bits/32 format.bits/32] - [/.size/64 /.bits/64 format.bits/64] + [/.size_8 /.bits_8 format.bits_8] + [/.size_16 /.bits_16 format.bits_16] + [/.size_32 /.bits_32 format.bits_32] + [/.size_64 /.bits_64 format.bits_64] )))))) (def: binary @@ -155,10 +155,10 @@ (!expect (^.multi {try.#Success actual} (# binary.equivalence = expected actual))))))] - [/.binary/8 format.binary/8] - [/.binary/16 format.binary/16] - [/.binary/32 format.binary/32] - [/.binary/64 format.binary/64] + [/.binary_8 format.binary_8] + [/.binary_16 format.binary_16] + [/.binary_32 format.binary_32] + [/.binary_64 format.binary_64] ))))) (def: utf8 @@ -173,10 +173,10 @@ (!expect (^.multi {try.#Success actual} (# text.equivalence = expected actual))))))] - [/.utf8/8 format.utf8/8] - [/.utf8/16 format.utf8/16] - [/.utf8/32 format.utf8/32] - [/.utf8/64 format.utf8/64] + [/.utf8_8 format.utf8_8] + [/.utf8_16 format.utf8_16] + [/.utf8_32 format.utf8_32] + [/.utf8_64 format.utf8_64] [/.text format.text] ))))) @@ -193,10 +193,10 @@ (!expect (^.multi {try.#Success actual} (# (sequence.equivalence n.equivalence) = expected actual))))))] - [/.sequence/8 format.sequence/8] - [/.sequence/16 format.sequence/16] - [/.sequence/32 format.sequence/32] - [/.sequence/64 format.sequence/64] + [/.sequence_8 format.sequence_8] + [/.sequence_16 format.sequence_16] + [/.sequence_32 format.sequence_32] + [/.sequence_64 format.sequence_64] ))))) (def: simple @@ -227,12 +227,12 @@ (and (frac.not_a_number? expected) (frac.not_a_number? actual)))))))) (do [! random.monad] - [expected (# ! each (|>> (i64.and (i64.mask /.size/8)) + [expected (# ! each (|>> (i64.and (i64.mask /.size_8)) (n.max 2)) random.nat)] (_.cover [/.not_a_bit] (|> expected - (format.result format.bits/8) + (format.result format.bits_8) (/.result /.bit) (!expect (^.multi {try.#Failure error} (exception.match? /.not_a_bit error)))))) @@ -289,13 +289,13 @@ expected actual)))))) (do [! random.monad] - [tag (# ! each (|>> (i64.and (i64.mask /.size/8)) + [tag (# ! each (|>> (i64.and (i64.mask /.size_8)) (n.max 2)) random.nat) value random.bit] (_.cover [/.invalid_tag] (|> [tag value] - (format.result (format.and format.bits/8 format.bit)) + (format.result (format.and format.bits_8 format.bit)) (/.result (is (/.Parser (Either Bit Nat)) (/.or /.bit /.nat))) (!expect (^.multi {try.#Failure error} diff --git a/stdlib/source/test/lux/control/parser/json.lux b/stdlib/source/test/lux/control/parser/json.lux index 873001415..43d184bc3 100644 --- a/stdlib/source/test/lux/control/parser/json.lux +++ b/stdlib/source/test/lux/control/parser/json.lux @@ -153,13 +153,13 @@ [size (# ! each (n.% 10) random.nat) keys (random.list size (random.unicode 1)) values (random.list size (random.unicode 1)) - .let [expected (dictionary.of_list text.hash (list.zipped/2 keys values))]] + .let [expected (dictionary.of_list text.hash (list.zipped_2 keys values))]] (_.cover [/.dictionary] (|> (/.result (/.dictionary /.string) {json.#Object (|> values (list#each (|>> {json.#String})) - (list.zipped/2 keys) + (list.zipped_2 keys) (dictionary.of_list text.hash))}) (!expect (^.multi {try.#Success actual} (# (dictionary.equivalence text.equivalence) = expected actual)))))) diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux index 25877dfd7..656dbf9bf 100644 --- a/stdlib/source/test/lux/data/binary.lux +++ b/stdlib/source/test/lux/data/binary.lux @@ -42,7 +42,7 @@ (if (n.< size idx) (do random.monad [byte random.nat] - (exec (try.trusted (/.has/1! idx byte output)) + (exec (try.trusted (/.has_8! idx byte output)) (again (++ idx)))) (# random.monad in output))))) @@ -115,10 +115,10 @@ (and (n.= 0 pre) (n.= capped_value post))))] - [0 !.bytes/1 !.has/1!] - [1 !.bytes/2 !.has/2!] - [2 !.bytes/4 !.has/4!] - [3 !.bytes/8 !.has/8!])) + [0 !.bits_8 !.has_8!] + [1 !.bits_16 !.has_16!] + [2 !.bits_32 !.has_32!] + [3 !.bits_64 !.has_64!])) (_.cover [!.slice] (let [random_slice (!.slice offset length sample) idxs (is (List Nat) @@ -126,7 +126,7 @@ 0 (list) _ (enum.range n.enum 0 (-- length)))) reader (function (_ binary idx) - (!.bytes/1 idx binary))] + (!.bits_8 idx binary))] (and (n.= length (!.size random_slice)) (# (list.equivalence n.equivalence) = (list#each (|>> (n.+ offset) (reader sample)) idxs) @@ -135,10 +135,10 @@ (and (let [it (!.copy! size 0 sample 0 (!.empty size))] (and (not (same? sample it)) (!.= sample it))) - (let [sample/0 (!.bytes/1 0 sample) + (let [sample/0 (!.bits_8 0 sample) copy (!.copy! 1 0 sample 0 (!.empty 2)) - copy/0 (!.bytes/1 0 copy) - copy/1 (!.bytes/1 1 copy)] + copy/0 (!.bits_8 0 copy) + copy/1 (!.bits_8 1 copy)] (and (n.= sample/0 copy/0) (n.= 0 copy/1))))) ))))) @@ -172,14 +172,14 @@ (|> (/.empty size) /.size (n.= size))) (_.for [/.index_out_of_bounds] ($_ _.and - (_.cover [/.bytes/1 /.has/1!] - (..binary_io 0 /.bytes/1 /.has/1! value)) - (_.cover [/.bytes/2 /.has/2!] - (..binary_io 1 /.bytes/2 /.has/2! value)) - (_.cover [/.bytes/4 /.has/4!] - (..binary_io 2 /.bytes/4 /.has/4! value)) - (_.cover [/.bytes/8 /.has/8!] - (..binary_io 3 /.bytes/8 /.has/8! value)))) + (_.cover [/.bits_8 /.has_8!] + (..binary_io 0 /.bits_8 /.has_8! value)) + (_.cover [/.bits_16 /.has_16!] + (..binary_io 1 /.bits_16 /.has_16! value)) + (_.cover [/.bits_32 /.has_32!] + (..binary_io 2 /.bits_32 /.has_32! value)) + (_.cover [/.bits_64 /.has_64!] + (..binary_io 3 /.bits_64 /.has_64! value)))) (_.cover [/.slice] (let [random_slice (try.trusted (/.slice offset length sample)) idxs (is (List Nat) @@ -187,7 +187,7 @@ 0 (list) _ (enum.range n.enum 0 (-- length)))) reader (function (_ binary idx) - (/.bytes/1 idx binary))] + (/.bits_8 idx binary))] (and (n.= length (/.size random_slice)) (case [(monad.each try.monad (|>> (n.+ offset) (reader sample)) idxs) (monad.each try.monad (reader random_slice) idxs)] @@ -223,10 +223,10 @@ false) (succeed (do try.monad - [sample/0 (/.bytes/1 0 sample) + [sample/0 (/.bits_8 0 sample) copy (/.copy! 1 0 sample 0 (/.empty 2)) - copy/0 (/.bytes/1 0 copy) - copy/1 (/.bytes/1 1 copy)] + copy/0 (/.bits_8 0 copy) + copy/1 (/.bits_8 1 copy)] (in (and (n.= sample/0 copy/0) (n.= 0 copy/1))))))) (_.cover [/.cannot_copy] 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] diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index 08e87df0f..3d10458af 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -1,35 +1,35 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - ["[0]" meta] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence] - ["$[0]" codec]]] - [control - ["[0]" try ("[1]#[0]" functor)]] - [data - ["[0]" product] - ["[0]" bit] - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" sequence] - ["[0]" dictionary] - ["[0]" set] - ["[0]" list ("[1]#[0]" functor)]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat] - ["[0]" frac]]] - ["[0]" macro - ["[0]" syntax {"+" syntax:}] - ["[0]" code]]]] - [\\library - ["[0]" / {"+" JSON} ("#[0]" equivalence)]]) + [library + [lux "*" + ["_" test {"+" Test}] + ["[0]" meta] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence] + ["$[0]" codec]]] + [control + ["[0]" try ("[1]#[0]" functor)]] + [data + ["[0]" product] + ["[0]" bit] + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" sequence] + ["[0]" dictionary] + ["[0]" set] + ["[0]" list ("[1]#[0]" functor)]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat] + ["[0]" frac]]] + ["[0]" macro + ["[0]" syntax {"+" syntax:}] + ["[0]" code]]]] + [\\library + ["[0]" / {"+" JSON} ("#[0]" equivalence)]]) (def: .public random (Random /.JSON) @@ -90,7 +90,7 @@ (do random.monad [keys (random.set text.hash 3 (random.ascii/alpha 1)) values (random.set frac.hash 3 random.safe_frac) - .let [expected (list.zipped/2 (set.list keys) + .let [expected (list.zipped_2 (set.list keys) (list#each (|>> {/.#Number}) (set.list values))) object (/.object expected)]] ($_ _.and diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux index 8503e08ac..8825bc192 100644 --- a/stdlib/source/test/lux/data/text.lux +++ b/stdlib/source/test/lux/data/text.lux @@ -204,10 +204,10 @@ (# /.equivalence = (/.together (set.list characters)) (/.interposed "" (set.list characters))))) - (_.cover [/.replaced/1] + (_.cover [/.replaced_once] (# /.equivalence = (# /.monoid composite post static) - (/.replaced/1 pre post (# /.monoid composite pre static)))) + (/.replaced_once pre post (# /.monoid composite pre static)))) (_.cover [/.split_by] (case (/.split_by static ($_ (# /.monoid composite) pre static post)) {.#Some [left right]} diff --git a/stdlib/source/test/lux/data/text/format.lux b/stdlib/source/test/lux/data/text/format.lux index b8ebe1d7f..62dfcd17d 100644 --- a/stdlib/source/test/lux/data/text/format.lux +++ b/stdlib/source/test/lux/data/text/format.lux @@ -1,57 +1,57 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [equivalence {"+" Equivalence}] - [functor - [\\specification - ["$[0]" contravariant]]]] - [control - ["[0]" try]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - ["[0]" bit] - [format - ["[0]" xml] - ["[0]" json]] - [collection - ["[0]" list ("[1]#[0]" functor)]]] - ["[0]" time - ["[0]" day] - ["[0]" month] - ["[0]" instant] - ["[0]" duration] - ["[0]" date]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - ["[0]" modulus] - ["[0]" modular] - [number - ["[0]" nat] - ["[0]" int] - ["[0]" rev] - ["[0]" frac] - ["[0]" ratio]]] - [macro - ["[0]" code]] - [meta - ["[0]" location] - ["[0]" symbol]] - ["[0]" type]]] - ["$[0]" /// "_" - [format - ["[1][0]" xml] - ["[1][0]" json]] - [// - ["[1][0]" type] - [macro - ["[1][0]" code]] - [meta - ["[1][0]" symbol]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [equivalence {"+" Equivalence}] + [functor + [\\specification + ["$[0]" contravariant]]]] + [control + ["[0]" try]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + ["[0]" bit] + [format + ["[0]" xml] + ["[0]" json]] + [collection + ["[0]" list ("[1]#[0]" functor)]]] + ["[0]" time + ["[0]" day] + ["[0]" month] + ["[0]" instant] + ["[0]" duration] + ["[0]" date]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + ["[0]" modulus] + ["[0]" modular] + [number + ["[0]" nat] + ["[0]" int] + ["[0]" rev] + ["[0]" frac] + ["[0]" ratio]]] + [macro + ["[0]" code]] + [meta + ["[0]" location] + ["[0]" symbol]] + ["[0]" type]]] + ["$[0]" /// "_" + [format + ["[1][0]" xml] + ["[1][0]" json]] + [// + ["[1][0]" type] + [macro + ["[1][0]" code]] + [meta + ["[1][0]" symbol]]]] + [\\library + ["[0]" /]]) (implementation: (equivalence example) (All (_ a) (-> a (Equivalence (/.Format a)))) @@ -96,25 +96,25 @@ [/.date date.codec random.date] [/.time time.codec random.time] - [/.nat/2 nat.binary random.nat] - [/.nat/8 nat.octal random.nat] - [/.nat/10 nat.decimal random.nat] - [/.nat/16 nat.hex random.nat] + [/.nat_2 nat.binary random.nat] + [/.nat_8 nat.octal random.nat] + [/.nat_10 nat.decimal random.nat] + [/.nat_16 nat.hex random.nat] - [/.int/2 int.binary random.int] - [/.int/8 int.octal random.int] - [/.int/10 int.decimal random.int] - [/.int/16 int.hex random.int] + [/.int_2 int.binary random.int] + [/.int_8 int.octal random.int] + [/.int_10 int.decimal random.int] + [/.int_16 int.hex random.int] - [/.rev/2 rev.binary random.rev] - [/.rev/8 rev.octal random.rev] - [/.rev/10 rev.decimal random.rev] - [/.rev/16 rev.hex random.rev] + [/.rev_2 rev.binary random.rev] + [/.rev_8 rev.octal random.rev] + [/.rev_10 rev.decimal random.rev] + [/.rev_16 rev.hex random.rev] - [/.frac/2 frac.binary random.frac] - [/.frac/8 frac.octal random.frac] - [/.frac/10 frac.decimal random.frac] - [/.frac/16 frac.hex random.frac] + [/.frac_2 frac.binary random.frac] + [/.frac_8 frac.octal random.frac] + [/.frac_10 frac.decimal random.frac] + [/.frac_16 frac.hex random.frac] )) ))) diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 2db7c0bc3..6169ba219 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -578,11 +578,11 @@ (n.= expected (.nat (/.of_long (test/TestClass6::actual6 (/.as_long (.int expected)) object/7)))) - example/8! + example_8! (let [expected (i.+ left right) - object/8 (test/TestClass8::new)] + object_8 (test/TestClass8::new)] (i.= expected - (/.of_long (test/TestInterface4::actual4 (/.as_long left) (/.as_long right) object/8))))] + (/.of_long (test/TestInterface4::actual4 (/.as_long left) (/.as_long right) object_8))))] .let [random_long (is (Random java/lang/Long) (# ! each (|>> /.as_long) @@ -609,7 +609,7 @@ example/4! example/5! example/7! - example/8!)) + example_8!)) (_.cover [/.do_to] example/9!) ))) diff --git a/stdlib/source/test/lux/math/number/complex.lux b/stdlib/source/test/lux/math/number/complex.lux index bfee3adcc..7bdc17274 100644 --- a/stdlib/source/test/lux/math/number/complex.lux +++ b/stdlib/source/test/lux/math/number/complex.lux @@ -185,7 +185,7 @@ (and reciprocal! own_inverse!))) (_.cover [/.signum] - ... Absolute value of signum is always root/2(2), 1 or 0. + ... Absolute value of signum is always root_2(2), 1 or 0. (let [signum_abs (|> x /.signum /.abs)] (or (f.= +0.0 signum_abs) (f.= +1.0 signum_abs) @@ -245,8 +245,8 @@ (do random.monad [x ..random] ($_ _.and - (_.cover [/.pow /.root/2] - (|> x (/.pow (/.complex +2.0)) /.root/2 (/.approximately? ..margin_of_error x))) + (_.cover [/.pow /.root_2] + (|> x (/.pow (/.complex +2.0)) /.root_2 (/.approximately? ..margin_of_error x))) (_.cover [/.pow'] (|> x (/.pow' +2.0) (/.pow' +0.5) (/.approximately? ..margin_of_error x))) (_.cover [/.log /.exp] diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux index 4aec70f14..22f56af05 100644 --- a/stdlib/source/test/lux/math/number/frac.lux +++ b/stdlib/source/test/lux/math/number/frac.lux @@ -181,15 +181,15 @@ (let [round'd (/.round sample)] (and (|> round'd /.int i.frac (/.= round'd)) (/.<= +1.0 (/.abs (/.- sample round'd)))))) - (_.cover [/.root/2] + (_.cover [/.root_2] (let [sample (/.abs sample)] (|> sample - /.root/2 + /.root_2 (/.pow +2.0) (/.approximately? ..margin_of_error sample)))) - (_.cover [/.root/3] + (_.cover [/.root_3] (|> sample - /.root/3 + /.root_3 (/.pow +3.0) (/.approximately? ..margin_of_error sample))) )) @@ -252,17 +252,17 @@ tau/4 (/./ +4.0 /.tau)] x (# ! each (/.* tau/4) random.safe_frac) y (# ! each (/.* tau/4) random.safe_frac)] - (_.cover [/.atan/2] - (let [expected (/.atan/2 x y) + (_.cover [/.atan_2] + (let [expected (/.atan_2 x y) actual (if (/.> +0.0 x) (/.atan (/./ x y)) (if (/.< +0.0 y) (/.- /.pi (/.atan (/./ x y))) (/.+ /.pi (/.atan (/./ x y)))))] (and (~= expected actual) - (~= tau/4 (/.atan/2 +0.0 (/.abs y))) - (~= (/.opposite tau/4) (/.atan/2 +0.0 (/.opposite (/.abs y)))) - (/.not_a_number? (/.atan/2 +0.0 +0.0)))))) + (~= tau/4 (/.atan_2 +0.0 (/.abs y))) + (~= (/.opposite tau/4) (/.atan_2 +0.0 (/.opposite (/.abs y)))) + (/.not_a_number? (/.atan_2 +0.0 +0.0)))))) (do [! random.monad] [of (# ! each (|>> (n.% 10) ++) random.nat)] (_.cover [/.factorial] diff --git a/stdlib/source/test/lux/target/js.lux b/stdlib/source/test/lux/target/js.lux index 7d6ef0284..df2857108 100644 --- a/stdlib/source/test/lux/target/js.lux +++ b/stdlib/source/test/lux/target/js.lux @@ -48,10 +48,10 @@ (try.else false))) (template [<range>] - [(`` (def: (~~ (template.symbol ["as_int/" <range>])) + [(`` (def: (~~ (template.symbol ["as_int_" <range>])) (-> Int Int) (|>> (i64.and (static.nat (-- (i64.left_shifted <range> 1))))))) - (`` (def: (~~ (template.symbol ["int/" <range>])) + (`` (def: (~~ (template.symbol ["int_" <range>])) (Random Int) (do [! random.monad] [negative? random.bit @@ -71,7 +71,7 @@ (do [! random.monad] [boolean random.bit number random.frac - int ..int/32 + int ..int_32 string (random.ascii/upper 5)] ($_ _.and (_.cover [/.null] @@ -152,11 +152,11 @@ (def: test|i32 Test (do [! random.monad] - [left ..int/32 - right ..int/32 + [left ..int_32 + right ..int_32 - i32 ..int/32 - i16 ..int/16 + i32 ..int_32 + i16 ..int_16 shift (# ! each (n.% 16) random.nat)] (`` ($_ _.and (~~ (template [<js> <lux>] @@ -185,7 +185,7 @@ (/.left_shift (/.int (.int shift)) (/.i32 i16))))) (_.cover [/.logic_right_shift] - (let [expected (i64.right_shifted shift (as_int/32 i16))] + (let [expected (i64.right_shifted shift (as_int_32 i16))] (expression (|>> (as Frac) f.int (i.= expected)) (/.logic_right_shift (/.int (.int shift)) (/.i32 i16))))) @@ -196,8 +196,8 @@ (/.i32 i16))))) (_.cover [/.bit_not] (let [expected (if (i.< +0 i32) - (as_int/32 (i64.not i32)) - (i64.not (as_int/32 i32)))] + (as_int_32 (i64.not i32)) + (i64.not (as_int_32 i32)))] (expression (|>> (as Frac) f.int (i.= expected)) (/.bit_not (/.i32 i32))))) )))) @@ -332,18 +332,18 @@ ($_ _.and (_.cover [/.var] (expression (|>> (as Frac) (f.= number/0)) - (/.apply/* (/.closure (list $foreign) (/.return $foreign)) + (/.apply_* (/.closure (list $foreign) (/.return $foreign)) (list (/.number number/0))))) (_.cover [/.define] (expression (|>> (as Frac) (f.= number/1)) - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.define $local (/.number number/1)) (/.return $local))) (list (/.number number/0))))) (_.cover [/.declare] (expression (|>> (as Frac) (f.= number/1)) - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.declare $local) (/.set $local (/.number number/1)) @@ -355,20 +355,20 @@ Test (do [! random.monad] [number/0 random.safe_frac - int/0 ..int/16 + int/0 ..int_16 $foreign (# ! each /.var (random.ascii/lower 10)) field (random.ascii/upper 10)] ($_ _.and (_.cover [/.set] (and (expression (|>> (as Frac) (f.= (f.+ number/0 number/0))) - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.set $foreign (/.+ $foreign $foreign)) (/.return $foreign))) (list (/.number number/0)))) (expression (|>> (as Frac) (f.= (f.+ number/0 number/0))) (let [@ (/.at (/.int +0) $foreign)] - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.set $foreign (/.array (list $foreign))) (/.set @ (/.+ @ @)) @@ -376,7 +376,7 @@ (list (/.number number/0))))) (expression (|>> (as Frac) (f.= (f.+ number/0 number/0))) (let [@ (/.the field $foreign)] - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.set $foreign (/.object (list [field $foreign]))) (/.set @ (/.+ @ @)) @@ -384,18 +384,18 @@ (list (/.number number/0))))))) (_.cover [/.delete] (and (and (expression (|>> (as Bit)) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) ($_ /.then (/.set $foreign (/.number number/0)) (/.return (/.delete $foreign)))) (list))) (expression (|>> (as Bit) not) - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) (/.return (/.delete $foreign))) (list (/.number number/0))))) (expression (|>> (as Bit)) (let [@ (/.at (/.int +0) $foreign)] - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.set $foreign (/.array (list $foreign))) (/.return (|> (/.= (/.boolean true) (/.delete @)) @@ -403,7 +403,7 @@ (list (/.number number/0))))) (expression (|>> (as Bit)) (let [@ (/.the field $foreign)] - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.set $foreign (/.object (list [field $foreign]))) (/.return (|> (/.= (/.boolean true) (/.delete @)) @@ -413,14 +413,14 @@ (_.cover [/.Access] (`` (and (~~ (template [<js> <lux>] [(expression (|>> (as Frac) f.int (i.= (<lux> int/0))) - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.statement (<js> $foreign)) (/.return $foreign))) (list (/.int int/0)))) (expression (|>> (as Frac) f.int (i.= (<lux> int/0))) (let [@ (/.at (/.int +0) $foreign)] - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.set $foreign (/.array (list $foreign))) (/.statement (<js> @)) @@ -428,7 +428,7 @@ (list (/.int int/0))))) (expression (|>> (as Frac) f.int (i.= (<lux> int/0))) (let [@ (/.the field $foreign)] - (/.apply/* (/.closure (list $foreign) + (/.apply_* (/.closure (list $foreign) ($_ /.then (/.set $foreign (/.object (list [field $foreign]))) (/.statement (<js> @)) @@ -445,7 +445,7 @@ (def: test|label Test (do [! random.monad] - [input ..int/16 + [input ..int_16 full_inner_iterations (# ! each (|>> (n.% 20) ++) random.nat) expected_inner_iterations (# ! each (n.% full_inner_iterations) random.nat) @@ -462,7 +462,7 @@ (_.cover [/.break] (let [expected (i.* (.int expected_inner_iterations) input)] (expression (|>> (as Frac) f.int (i.= expected)) - (/.apply/* (/.closure (list $input) + (/.apply_* (/.closure (list $input) ($_ /.then (/.define $inner_index (/.int +0)) (/.define $output (/.int +0)) @@ -478,7 +478,7 @@ (_.cover [/.continue] (let [expected (i.* (.int (n.- expected_inner_iterations full_inner_iterations)) input)] (expression (|>> (as Frac) f.int (i.= expected)) - (/.apply/* (/.closure (list $input) + (/.apply_* (/.closure (list $input) ($_ /.then (/.define $inner_index (/.int +0)) (/.define $output (/.int +0)) @@ -498,7 +498,7 @@ expected_inner_iterations)) input)] (expression (|>> (as Frac) f.int (i.= expected)) - (/.apply/* (/.closure (list $input) + (/.apply_* (/.closure (list $input) ($_ /.then (/.define $output (/.int +0)) (/.define $outer_index (/.int +0)) @@ -524,7 +524,7 @@ (n.- expected_inner_iterations full_inner_iterations))) input)] (expression (|>> (as Frac) f.int (i.= expected)) - (/.apply/* (/.closure (list $input) + (/.apply_* (/.closure (list $input) ($_ /.then (/.define $output (/.int +0)) (/.define $outer_index (/.int +0)) @@ -552,7 +552,7 @@ (def: test|loop Test (do [! random.monad] - [input ..int/16 + [input ..int_16 iterations (# ! each (n.% 10) random.nat) .let [$input (/.var "input") $output (/.var "output") @@ -562,7 +562,7 @@ ($_ _.and (_.cover [/.while] (expression (|>> (as Frac) f.int (i.= expected|while)) - (/.apply/* (/.closure (list $input) + (/.apply_* (/.closure (list $input) ($_ /.then (/.define $index (/.int +0)) (/.define $output (/.int +0)) @@ -575,7 +575,7 @@ (list (/.int input))))) (_.cover [/.do_while] (expression (|>> (as Frac) f.int (i.= expected|do_while)) - (/.apply/* (/.closure (list $input) + (/.apply_* (/.closure (list $input) ($_ /.then (/.define $index (/.int +0)) (/.define $output (/.int +0)) @@ -588,7 +588,7 @@ (list (/.int input))))) (_.cover [/.for] (expression (|>> (as Frac) f.int (i.= expected|while)) - (/.apply/* (/.closure (list $input) + (/.apply_* (/.closure (list $input) ($_ /.then (/.define $output (/.int +0)) (/.for $index (/.int +0) @@ -611,13 +611,13 @@ ($_ _.and (_.cover [/.try] (expression (|>> (as Frac) (f.= expected)) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) (/.try (/.return (/.number expected)) [$ex (/.return (/.number dummy))])) (list)))) (_.cover [/.throw] (expression (|>> (as Frac) (f.= expected)) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) (/.try ($_ /.then (/.throw (/.number expected)) (/.return (/.number dummy))) @@ -635,24 +635,24 @@ $arg/1 (# ! each /.var (random.ascii/lower 11)) $arg/2 (# ! each /.var (random.ascii/lower 12))] (`` ($_ _.and - (_.cover [/.apply/1] + (_.cover [/.apply_1] (expression (|>> (as Frac) (f.= number/0)) - (/.apply/1 (/.closure (list $arg/0) (/.return $arg/0)) + (/.apply_1 (/.closure (list $arg/0) (/.return $arg/0)) (/.number number/0)))) - (_.cover [/.apply/2] + (_.cover [/.apply_2] (expression (|>> (as Frac) (f.= ($_ f.+ number/0 number/1))) - (/.apply/2 (/.closure (list $arg/0 $arg/1) (/.return ($_ /.+ $arg/0 $arg/1))) + (/.apply_2 (/.closure (list $arg/0 $arg/1) (/.return ($_ /.+ $arg/0 $arg/1))) (/.number number/0) (/.number number/1)))) - (_.cover [/.apply/3] + (_.cover [/.apply_3] (expression (|>> (as Frac) (f.= ($_ f.+ number/0 number/1 number/2))) - (/.apply/3 (/.closure (list $arg/0 $arg/1 $arg/2) (/.return ($_ /.+ $arg/0 $arg/1 $arg/2))) + (/.apply_3 (/.closure (list $arg/0 $arg/1 $arg/2) (/.return ($_ /.+ $arg/0 $arg/1 $arg/2))) (/.number number/0) (/.number number/1) (/.number number/2)))) - (_.cover [/.apply/*] + (_.cover [/.apply_*] (expression (|>> (as Frac) (f.= ($_ f.+ number/0 number/1 number/2))) - (/.apply/* (/.closure (list $arg/0 $arg/1 $arg/2) (/.return ($_ /.+ $arg/0 $arg/1 $arg/2))) + (/.apply_* (/.closure (list $arg/0 $arg/1 $arg/2) (/.return ($_ /.+ $arg/0 $arg/1 $arg/2))) (list (/.number number/0) (/.number number/1) (/.number number/2))))) @@ -670,29 +670,29 @@ ($_ _.and (_.cover [/.closure /.return] (expression (|>> (as Frac) (f.= number/0)) - (/.apply/* (/.closure (list) (/.return (/.number number/0))) + (/.apply_* (/.closure (list) (/.return (/.number number/0))) (list)))) (_.cover [/.function] (expression (|>> (as Frac) f.nat (n.= iterations)) - (/.apply/1 (/.function $self (list $arg/0) + (/.apply_1 (/.function $self (list $arg/0) (/.return (/.? (/.< (/.int (.int iterations)) $arg/0) - (/.apply/1 $self (/.+ (/.int +1) $arg/0)) + (/.apply_1 $self (/.+ (/.int +1) $arg/0)) $arg/0))) (/.int +0)))) (_.cover [/.function_definition] (expression (|>> (as Frac) f.nat (n.= iterations)) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) ($_ /.then (/.function_definition $self (list $arg/0) (/.return (/.? (/.< (/.int (.int iterations)) $arg/0) - (/.apply/1 $self (/.+ (/.int +1) $arg/0)) + (/.apply_1 $self (/.+ (/.int +1) $arg/0)) $arg/0))) - (/.return (/.apply/1 $self (/.int +0))))) + (/.return (/.apply_1 $self (/.int +0))))) (list)))) (_.cover [/.new] (let [$this (/.var "this")] (expression (|>> (as Frac) (f.= number/0)) - (/.apply/1 (/.closure (list $arg/0) + (/.apply_1 (/.closure (list $arg/0) ($_ /.then (/.function_definition $class (list) (/.set (/.the field $this) $arg/0)) @@ -717,18 +717,18 @@ $arg/1 (/.var arg/1) $arg/2 (/.var arg/2)] ??? random.bit - int ..int/16] + int ..int_16] ($_ _.and (_.cover [/.if] (expression (|>> (as Frac) (f.= (if ??? number/0 number/1))) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) (/.if (/.boolean ???) (/.return (/.number number/0)) (/.return (/.number number/1)))) (list)))) (_.cover [/.when] (expression (|>> (as Frac) (f.= (if ??? number/0 number/1))) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) ($_ /.then (/.when (/.boolean ???) (/.return (/.number number/0))) @@ -739,21 +739,21 @@ number/1' (%.frac number/1) number/2' (%.frac number/2)] (and (expression (|>> (as Text) (text#= number/0')) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) (/.switch (/.number number/0) (list [(list (/.number number/0)) (/.return (/.string number/0'))] [(list (/.number number/1)) (/.return (/.string number/1'))]) {.#None})) (list))) (expression (|>> (as Text) (text#= number/1')) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) (/.switch (/.number number/1) (list [(list (/.number number/0)) (/.return (/.string number/0'))] [(list (/.number number/1)) (/.return (/.string number/1'))]) {.#Some (/.return (/.string number/2'))})) (list))) (expression (|>> (as Text) (text#= number/2')) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) (/.switch (/.number number/2) (list [(list (/.number number/0)) (/.return (/.string number/0'))] [(list (/.number number/1)) (/.return (/.string number/1'))]) @@ -772,11 +772,11 @@ $arg/1 (# ! each /.var (random.ascii/lower 11)) $arg/2 (# ! each /.var (random.ascii/lower 12)) ??? random.bit - int ..int/16] + int ..int_16] (`` ($_ _.and (_.cover [/.statement] (expression (|>> (as Frac) (f.= number/0)) - (/.apply/1 (/.closure (list $arg/0) + (/.apply_1 (/.closure (list $arg/0) ($_ /.then (/.statement (/.+ $arg/0 $arg/0)) (/.return $arg/0))) @@ -784,7 +784,7 @@ (~~ (template [<js> <lux>] [(_.cover [<js>] (expression (|>> (as Frac) f.int (i.= (<lux> int))) - (/.apply/1 (/.closure (list $arg/0) + (/.apply_1 (/.closure (list $arg/0) (/.return (/., (<js> $arg/0) $arg/0))) (/.int int))))] @@ -794,7 +794,7 @@ )) (_.cover [/.then] (expression (|>> (as Frac) (f.= number/0)) - (/.apply/2 (/.closure (list $arg/0 $arg/1) + (/.apply_2 (/.closure (list $arg/0 $arg/1) ($_ /.then (/.return $arg/0) (/.return $arg/1))) @@ -802,14 +802,14 @@ (/.number number/1)))) (_.cover [/.use_strict] (and (expression (|>> (as Frac) (f.= number/0)) - (/.apply/* (/.closure (list) + (/.apply_* (/.closure (list) ($_ /.then /.use_strict (/.declare $arg/0) (/.set $arg/0 (/.number number/0)) (/.return $arg/0))) (list))) - (|> (/.apply/* (/.closure (list) + (|> (/.apply_* (/.closure (list) ($_ /.then /.use_strict ... (/.declare $arg/0) diff --git a/stdlib/source/test/lux/target/lua.lux b/stdlib/source/test/lux/target/lua.lux index 471aeb03a..3068a6e18 100644 --- a/stdlib/source/test/lux/target/lua.lux +++ b/stdlib/source/test/lux/target/lua.lux @@ -359,7 +359,7 @@ (do [! random.monad] [float/0 random.safe_frac float/1 random.safe_frac - int/0 ..int/16 + int/0 ..int_16 $foreign (# ! each /.var (random.ascii/lower 10)) $arg/0 (# ! each /.var (random.ascii/lower 11)) $arg/1 (# ! each /.var (random.ascii/lower 12)) @@ -409,7 +409,7 @@ (def: test|label Test (do [! random.monad] - [input ..int/16 + [input ..int_16 full_iterations (# ! each (|>> (n.% 20) ++) random.nat) expected_iterations (# ! each (|>> (n.% full_iterations) .int) random.nat) @@ -499,7 +499,7 @@ (def: test|loop Test (do [! random.monad] - [input ..int/16 + [input ..int_16 iterations (# ! each (n.% 10) random.nat) .let [$input (/.var "input") $output (/.var "output") diff --git a/stdlib/source/test/lux/target/python.lux b/stdlib/source/test/lux/target/python.lux index bca258d5e..1f53986c0 100644 --- a/stdlib/source/test/lux/target/python.lux +++ b/stdlib/source/test/lux/target/python.lux @@ -147,7 +147,7 @@ (/.the "major") (/.= (/.int +3)))) -(def: int/16 +(def: int_16 (-> Int Int) (i64.and (-- (i64.left_shifted 15 1)))) @@ -157,7 +157,7 @@ [left random.int right random.int - i16 (# ! each ..int/16 random.int) + i16 (# ! each ..int_16 random.int) shift (# ! each (n.% 16) random.nat)] (`` ($_ _.and (~~ (template [</> <lux>] diff --git a/stdlib/source/test/lux/target/ruby.lux b/stdlib/source/test/lux/target/ruby.lux index 603cded95..968d3c7bd 100644 --- a/stdlib/source/test/lux/target/ruby.lux +++ b/stdlib/source/test/lux/target/ruby.lux @@ -138,7 +138,7 @@ )) )))) -(def: int/16 +(def: int_16 (-> Int Int) (i64.and (-- (i64.left_shifted 15 1)))) @@ -148,7 +148,7 @@ [left random.int right random.int - i16 (# ! each ..int/16 random.int) + i16 (# ! each ..int_16 random.int) shift (# ! each (n.% 16) random.nat)] (`` ($_ _.and (~~ (template [</> <lux>] @@ -630,7 +630,7 @@ (expression (|>> (as Int) .nat (n.= arity)) (|> (/.return (/.the "length" $inputs)) [(list (/.variadic_kv $inputs))] (/.lambda {.#None}) - (/.apply_lambda/* (list (/.double_splat (/.hash (list.zipped/2 keys vals))))))))) + (/.apply_lambda/* (list (/.double_splat (/.hash (list.zipped_2 keys vals))))))))) ))) (def: test|var @@ -716,7 +716,7 @@ (def: test|label Test (do [! random.monad] - [input (# ! each ..int/16 random.int) + [input (# ! each ..int_16 random.int) full_inner_iterations (# ! each (|>> (n.% 20) ++) random.nat) expected_inner_iterations (# ! each (n.% full_inner_iterations) random.nat) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux index aa0a98c6b..7750db2ed 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux @@ -113,7 +113,7 @@ (list.size actual)) (list.every? (function (_ [expected actual]) (analysed? expected actual)) - (list.zipped/2 expected actual))) + (list.zipped_2 expected actual))) (^.template [<expected> <actual>] [(pattern [[_ {<expected> expected}] (<actual> actual)]) @@ -312,7 +312,7 @@ (list.size actual)) (list.every? (function (_ [expected actual]) (..analysed? expected actual)) - (list.zipped/2 expected actual))) + (list.zipped_2 expected actual))) _ false))) @@ -337,7 +337,7 @@ (list.size actual)) (list.every? (function (_ [expected actual]) (..analysed? expected actual)) - (list.zipped/2 expected actual))) + (list.zipped_2 expected actual))) _ false))) @@ -355,7 +355,7 @@ (list.size actual)) (list.every? (function (_ [expected actual]) (..analysed? expected actual)) - (list.zipped/2 expected actual)) + (list.zipped_2 expected actual)) (type#= productT :inferred:)) _ @@ -450,16 +450,16 @@ :record: {.#Named name (type.tuple (list#each product.left types/*,terms/*))} tuple (list#each product.right types/*,terms/*) local_record (|> tuple - (list.zipped/2 (list#each (|>> [""] code.symbol) slots/0)) + (list.zipped_2 (list#each (|>> [""] code.symbol) slots/0)) (list#each (function (_ [slot value]) (list slot value))) list#conjoint) global_record (|> tuple - (list.zipped/2 (list#each (|>> [module] code.symbol) slots/0)) + (list.zipped_2 (list#each (|>> [module] code.symbol) slots/0)) (list#each (function (_ [slot value]) (list slot value))) list#conjoint) - expected_record (list.zipped/2 (list#each (|>> [module]) slots/0) + expected_record (list.zipped_2 (list#each (|>> [module]) slots/0) tuple) head_slot/0 (|> slots/0 list.head maybe.trusted) head_term/0 (|> types/*,terms/* list.head maybe.trusted product.right) @@ -499,8 +499,8 @@ _ false))))) (_.cover [/.order] - (let [local_record (list.zipped/2 (list#each (|>> [""]) slots/0) tuple) - global_record (list.zipped/2 (list#each (|>> [module]) slots/0) tuple) + (let [local_record (list.zipped_2 (list#each (|>> [""]) slots/0) tuple) + global_record (list.zipped_2 (list#each (|>> [module]) slots/0) tuple) ordered? (is (-> Bit (List [Symbol Code]) Bit) (function (_ pattern_matching? input) (|> (do //phase.monad @@ -556,8 +556,8 @@ (and (repeated? false) (repeated? true)))) (_.cover [/.record_size_mismatch] - (let [local_record (list.zipped/2 (list#each (|>> [""]) slots/0) tuple) - global_record (list.zipped/2 (list#each (|>> [module]) slots/0) tuple) + (let [local_record (list.zipped_2 (list#each (|>> [""]) slots/0) tuple) + global_record (list.zipped_2 (list#each (|>> [module]) slots/0) tuple) mismatched? (is (-> Bit (List [Symbol Code]) Bit) (function (_ pattern_matching? input) (|> (do //phase.monad @@ -575,8 +575,8 @@ (mismatched? false (list#composite global_record (list.first slice global_record))) (mismatched? true (list#composite global_record (list.first slice global_record)))))) (_.cover [/.slot_does_not_belong_to_record] - (let [local_record (list.zipped/2 (list#each (|>> [""]) slots/01) tuple) - global_record (list.zipped/2 (list#each (|>> [module]) slots/01) tuple) + (let [local_record (list.zipped_2 (list#each (|>> [""]) slots/01) tuple) + global_record (list.zipped_2 (list#each (|>> [module]) slots/01) tuple) mismatched? (is (-> Bit (List [Symbol Code]) Bit) (function (_ pattern_matching? input) (|> (do //phase.monad diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux index aaa52ad0f..b65c3fa9d 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux @@ -304,14 +304,14 @@ (in [(list#mix (function (_ left right) {synthesis.#Alt left right}) (path (++ mid_size) true value/last body/last) - (|> (list.zipped/2 value/mid body/mid) + (|> (list.zipped_2 value/mid body/mid) {.#Item [value/first body/first]} list.enumeration (list#each (function (_ [lefts' [value body]]) (path lefts' false value body))) list.reversed)) [(branch 0 false value/first body/first) - (list#composite (|> (list.zipped/2 value/mid body/mid) + (list#composite (|> (list.zipped_2 value/mid body/mid) list.enumeration (list#each (function (_ [lefts' [value body]]) (branch (++ lefts') false value body)))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux index ba3f7dc86..01ebdec3f 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux @@ -450,7 +450,7 @@ (!expect (^.multi (pattern {try.#Success (synthesis.function/apply [funcS argsS])}) (and (//primitive.corresponds? funcA funcS) (list.every? (product.uncurried //primitive.corresponds?) - (list.zipped/2 argsA argsS)))))) + (list.zipped_2 argsA argsS)))))) (|> (analysis.apply [funcA (list)]) (//.phase archive.empty) (phase.result [///bundle.empty synthesis.init]) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux index 2de99cd64..33f3378a1 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux @@ -66,7 +66,7 @@ (list.size actual)) (list.every? (function (_ [expected actual]) (corresponds? expected actual)) - (list.zipped/2 expected actual))) + (list.zipped_2 expected actual))) _ false))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux index 6adfb95b2..d0383c9a7 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux @@ -71,7 +71,7 @@ (pattern {try.#Success (////synthesis.tuple membersS)}) (and (n.= size (list.size membersS)) (list.every? (product.uncurried //primitive.corresponds?) - (list.zipped/2 membersA membersS))) + (list.zipped_2 membersA membersS))) _ false))))) diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux index d012390fc..595123f7f 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux @@ -146,7 +146,7 @@ (and (n.= expected_amount (sequence.size it)) (list.every? (function (_ [@it [it dependencies]]) (same? @it (the artifact.#id it))) - (list.zipped/2 (sequence.list ids) (sequence.list it))) + (list.zipped_2 (sequence.list ids) (sequence.list it))) (# (list.equivalence <equivalence>) = expected/* (<query> registry))))] [/.definition /.definitions category.definition_equivalence (is (-> Text category.Definition) diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux index 9e2ac6c29..9b385af95 100644 --- a/stdlib/source/test/lux/world/output/video/resolution.lux +++ b/stdlib/source/test/lux/world/output/video/resolution.lux @@ -24,9 +24,9 @@ /.wsvga /.xga /.xga+ - /.wxga/16:9 - /.wxga/5:3 - /.wxga/16:10 + /.wxga_16:9 + /.wxga_5:3 + /.wxga_16:10 /.sxga /.wxga+ /.hd+ |