diff options
Diffstat (limited to 'stdlib/source/test/lux/data')
18 files changed, 407 insertions, 168 deletions
diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux index 181d6efa4..6d35fd15b 100644 --- a/stdlib/source/test/lux/data/collection/dictionary.lux +++ b/stdlib/source/test/lux/data/collection/dictionary.lux @@ -16,7 +16,7 @@ [number ["n" nat]] [collection - ["." list ("#@." functor)]]] + ["." list ("#\." functor)]]] [math ["." random]]] {1 @@ -58,7 +58,7 @@ (let [merging-with-oneself (let [(^open ".") (/.equivalence n.equivalence)] (= dict (/.merge dict dict))) overwritting-keys (let [dict' (|> dict /.entries - (list@map (function (_ [k v]) [k (inc v)])) + (list\map (function (_ [k v]) [k (inc v)])) (/.from-list n.hash)) (^open ".") (/.equivalence n.equivalence)] (= dict' (/.merge dict' dict)))] diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index 8b32295d9..a1d776d10 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -10,15 +10,15 @@ ["$." equivalence]]}] [data ["." product] - ["." bit ("#@." equivalence)] - ["." maybe ("#@." monad)] + ["." bit ("#\." equivalence)] + ["." maybe ("#\." monad)] [number ["n" nat]] [collection ["." set] - ["." list ("#@." functor)]]] + ["." list ("#\." functor)]]] [math - ["." random (#+ Random) ("#@." monad)]]] + ["." random (#+ Random) ("#\." monad)]]] {1 ["." /]}) @@ -27,7 +27,7 @@ (-> (Order k) (Random k) (Random v) Nat (Random (/.Dictionary k v)))) (case size 0 - (random@wrap (/.new order)) + (random\wrap (/.new order)) _ (do random.monad @@ -56,12 +56,12 @@ sorted-pairs (list.sort (function (_ [left _] [right _]) (n.< left right)) pairs) - sorted-values (list@map product.right sorted-pairs) - (^open "list@.") (list.equivalence (: (Equivalence [Nat Nat]) + sorted-values (list\map product.right sorted-pairs) + (^open "list\.") (list.equivalence (: (Equivalence [Nat Nat]) (function (_ [kr vr] [ks vs]) (and (n.= kr ks) (n.= vr vs))))) - (^open "/@.") (/.equivalence n.equivalence)]] + (^open "/\.") (/.equivalence n.equivalence)]] ($_ _.and (_.with-cover [/.equivalence] ($equivalence.spec (/.equivalence n.equivalence) (..dictionary n.order random.nat random.nat size))) @@ -69,7 +69,7 @@ (_.cover [/.size] (n.= size (/.size sample))) (_.cover [/.empty?] - (bit@= (n.= 0 (/.size sample)) + (bit\= (n.= 0 (/.size sample)) (/.empty? sample))) (_.cover [/.new] (/.empty? (/.new n.order))) @@ -94,15 +94,15 @@ _ #0)) (_.cover [/.entries] - (list@= (/.entries sample) + (list\= (/.entries sample) sorted-pairs)) (_.cover [/.keys /.values] - (list@= (/.entries sample) + (list\= (/.entries sample) (list.zip/2 (/.keys sample) (/.values sample)))) (_.cover [/.from-list] (|> sample /.entries (/.from-list n.order) - (/@= sample))) + (/\= sample))) (_.cover [/.contains?] (and (list.every? (function (_ key) (/.contains? key sample)) (/.keys sample)) @@ -126,12 +126,12 @@ (|> sample (/.put extra-key extra-value) (/.remove extra-key) - (/@= sample))) + (/\= sample))) (_.cover [/.update] (|> sample (/.put extra-key extra-value) (/.update extra-key (n.+ shift)) (/.get extra-key) - (maybe@map (n.= (n.+ shift extra-value))) + (maybe\map (n.= (n.+ shift extra-value))) (maybe.default false))) )))) diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux index cac27e0cf..3ffcc816c 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux @@ -7,8 +7,8 @@ [/ ["$." equivalence]]}] [data - ["." bit ("#@." equivalence)] - ["." maybe ("#@." monad)] + ["." bit ("#\." equivalence)] + ["." maybe ("#\." monad)] ["." text] [number ["n" nat]] @@ -50,7 +50,7 @@ (_.cover [/.size] (n.= size (/.size sample))) (_.cover [/.empty?] - (bit@= (n.= 0 (/.size sample)) + (bit\= (n.= 0 (/.size sample)) (/.empty? sample))) (_.cover [/.empty] (/.empty? /.empty)) @@ -74,14 +74,14 @@ (|> sample (/.put extra-key extra-value) (/.get extra-key) - (maybe@map (n.= extra-value)) + (maybe\map (n.= extra-value)) (maybe.default false))) (_.cover [/.update] (|> sample (/.put extra-key extra-value) (/.update extra-key (n.+ shift)) (/.get extra-key) - (maybe@map (n.= (n.+ shift extra-value))) + (maybe\map (n.= (n.+ shift extra-value))) (maybe.default false))) (_.cover [/.remove] (|> sample diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index 2190c2fe2..ca432bcb4 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -21,7 +21,7 @@ ["." bit] ["." product] ["." maybe] - ["." text ("#@." equivalence)] + ["." text ("#\." equivalence)] [number ["n" nat] ["." int]] @@ -30,7 +30,7 @@ [math ["." random (#+ Random)]]] {1 - ["." / ("#@." monad)]}) + ["." / ("#\." monad)]}) (def: bounded-size (Random Nat) @@ -53,23 +53,23 @@ (_.with-cover [/.monoid] ($monoid.spec (/.equivalence n.equivalence) /.monoid ..random)) (_.with-cover [/.fold] - ($fold.spec /@wrap /.equivalence /.fold)) + ($fold.spec /\wrap /.equivalence /.fold)) (_.with-cover [/.functor] - ($functor.spec /@wrap /.equivalence /.functor)) + ($functor.spec /\wrap /.equivalence /.functor)) (_.with-cover [/.apply] - ($apply.spec /@wrap /.equivalence /.apply)) + ($apply.spec /\wrap /.equivalence /.apply)) (_.with-cover [/.monad] - ($monad.spec /@wrap /.equivalence /.monad)) + ($monad.spec /\wrap /.equivalence /.monad)) (do {! random.monad} [parameter random.nat subject random.nat] (let [lift (/.lift io.monad) - (^open "io@.") io.monad + (^open "io\.") io.monad expected (n.+ parameter subject)] (_.cover [/.with /.lift] (|> (io.run (do (/.with io.monad) - [a (lift (io@wrap parameter)) + [a (lift (io\wrap parameter)) b (wrap subject)] (wrap (n.+ a b)))) (case> (^ (list actual)) @@ -83,7 +83,7 @@ Test (do {! random.monad} [size ..bounded-size - #let [(^open "/@.") (/.equivalence n.equivalence)] + #let [(^open "/\.") (/.equivalence n.equivalence)] sample (:: ! map set.to-list (random.set n.hash size random.nat))] ($_ _.and (_.cover [/.size] @@ -97,11 +97,11 @@ (_.cover [/.reverse] (or (n.< 2 (/.size sample)) (let [not-same! - (not (/@= sample + (not (/\= sample (/.reverse sample))) self-symmetry! - (/@= sample + (/\= sample (/.reverse (/.reverse sample)))] (and not-same! self-symmetry!)))) @@ -117,7 +117,7 @@ (/.size (/.sort <<< sample))) symmetry! - (/@= (/.sort <<< sample) + (/\= (/.sort <<< sample) (/.reverse (/.sort (function.flip <<<) sample)))] (and size-preservation! symmetry!))) @@ -125,8 +125,8 @@ (def: indices Test - (let [(^open "/@.") (/.equivalence n.equivalence) - (^open "/@.") /.functor] + (let [(^open "/\.") (/.equivalence n.equivalence) + (^open "/\.") /.functor] (do {! random.monad} [sample ..random #let [size (/.size sample)]] @@ -138,7 +138,7 @@ (n.= size (/.size indices)) already-sorted! - (/@= indices + (/\= indices (/.sort n.< indices)) expected-numbers! @@ -153,12 +153,12 @@ (let [enumeration (/.enumeration sample) has-correct-indices! - (/@= (/.indices (/.size enumeration)) - (/@map product.left enumeration)) + (/\= (/.indices (/.size enumeration)) + (/\map product.left enumeration)) has-correct-values! - (/@= sample - (/@map product.right enumeration))] + (/\= sample + (/\map product.right enumeration))] (and has-correct-indices! has-correct-values!))) (_.cover [/.nth] @@ -174,8 +174,8 @@ (def: slice Test - (let [(^open "/@.") (/.equivalence n.equivalence) - (^open "/@.") /.monoid] + (let [(^open "/\.") (/.equivalence n.equivalence) + (^open "/\.") /.monoid] (do {! random.monad} [sample (random.filter (|>> /.size (n.> 0)) ..random) @@ -194,36 +194,36 @@ (/.size negatives)))))) (_.cover [/.partition] (let [[positives negatives] (/.partition n.even? sample)] - (and (/@= (/.filter n.even? sample) + (and (/\= (/.filter n.even? sample) positives) - (/@= (/.filter (bit.complement n.even?) sample) + (/\= (/.filter (bit.complement n.even?) sample) negatives)))) (_.cover [/.split] (let [[left right] (/.split idx sample)] - (/@= sample - (/@compose left right)))) + (/\= sample + (/\compose left right)))) (_.cover [/.split-with] (let [[left right] (/.split-with n.even? sample)] - (/@= sample - (/@compose left right)))) + (/\= sample + (/\compose left right)))) (_.cover [/.take /.drop] - (/@= sample - (/@compose (/.take idx sample) + (/\= sample + (/\compose (/.take idx sample) (/.drop idx sample)))) (_.cover [/.take-while /.drop-while] - (/@= sample - (/@compose (/.take-while n.even? sample) + (/\= sample + (/\compose (/.take-while n.even? sample) (/.drop-while n.even? sample)))) (_.cover [/.chunk] (let [chunks (/.chunk chunk-size sample)] (and (/.every? (|>> /.size (n.<= chunk-size)) chunks) - (/@= sample + (/\= sample (/.concat chunks))))) )))) (def: member Test - (let [(^open "/@.") (/.equivalence n.equivalence)] + (let [(^open "/\.") (/.equivalence n.equivalence)] (do {! random.monad} [sample ..random] (`` ($_ _.and @@ -245,7 +245,7 @@ (_.cover [<tail>] (case [(<pre> sample) (<tail> sample)] [(#.Cons _ expected) (#.Some actual)] - (/@= (<pre> expected) actual) + (/\= (<pre> expected) actual) [#.Nil #.None] true @@ -261,9 +261,9 @@ (def: grouping Test - (let [(^open "/@.") (/.equivalence n.equivalence) - (^open "/@.") /.functor - (^open "/@.") /.monoid + (let [(^open "/\.") (/.equivalence n.equivalence) + (^open "/\.") /.functor + (^open "/\.") /.monoid +/2 (: (-> Nat Nat Nat) (function (_ left right) @@ -288,10 +288,10 @@ (n.min (/.size sample/0) (/.size sample/1))) can-extract-values! - (and (/@= (/.take zipped::size sample/0) - (/@map product.left zipped)) - (/@= (/.take zipped::size sample/1) - (/@map product.right zipped)))] + (and (/\= (/.take zipped::size sample/0) + (/\map product.left zipped)) + (/\= (/.take zipped::size sample/1) + (/\map product.right zipped)))] (and size-of-smaller-list! can-extract-values!))) (_.cover [/.zip/3] @@ -306,12 +306,12 @@ (/.size sample/2))) can-extract-values! - (and (/@= (/.take zipped::size sample/0) - (/@map product.left zipped)) - (/@= (/.take zipped::size sample/1) - (/@map (|>> product.right product.left) zipped)) - (/@= (/.take zipped::size sample/2) - (/@map (|>> product.right product.right) zipped)))] + (and (/\= (/.take zipped::size sample/0) + (/\map product.left zipped)) + (/\= (/.take zipped::size sample/1) + (/\map (|>> product.right product.left) zipped)) + (/\= (/.take zipped::size sample/2) + (/\map (|>> product.right product.right) zipped)))] (and size-of-smaller-list! can-extract-values!))) (_.cover [/.zip] @@ -323,30 +323,30 @@ ((/.zip 3) sample/0 sample/1 sample/2)))) (_.cover [/.zip-with/2] - (/@= (/@map (function (_ [left right]) + (/\= (/\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] - (/@= (/@map (function (_ [left mid right]) + (/\= (/\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) + (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) ((/.zip-with 3) +/3 sample/0 sample/1 sample/2)))) (_.cover [/.concat] - (and (/@= (/@compose sample/0 sample/1) + (and (/\= (/\compose sample/0 sample/1) (/.concat (list sample/0 sample/1))) - (/@= ($_ /@compose sample/0 sample/1 sample/2) + (/\= ($_ /\compose sample/0 sample/1 sample/2) (/.concat (list sample/0 sample/1 sample/2))))) )))) (def: search Test - (let [(^open "/@.") /.functor + (let [(^open "/\.") /.functor choose (: (-> Nat (Maybe Text)) (function (_ value) @@ -359,11 +359,11 @@ (_.cover [/.one] (case [(|> sample (/.filter n.even?) - (/@map (:: n.decimal encode)) + (/\map (:: n.decimal encode)) /.head) (/.one choose sample)] [(#.Some expected) (#.Some actual)] - (text@= expected actual) + (text\= expected actual) [#.None #.None] true @@ -374,7 +374,7 @@ (:: (/.equivalence text.equivalence) = (|> sample (/.filter n.even?) - (/@map (:: n.decimal encode))) + (/\map (:: n.decimal encode))) (/.all choose sample))) (_.cover [/.find] (case (/.find n.even? sample) @@ -389,8 +389,8 @@ Test (<| (_.covering /._) (_.with-cover [.List]) - (let [(^open "/@.") (/.equivalence n.equivalence) - (^open "/@.") /.functor] + (let [(^open "/\.") (/.equivalence n.equivalence) + (^open "/\.") /.functor] (do {! random.monad} [sample ..random separator random.nat] @@ -412,14 +412,14 @@ (_.cover [/.iterate] (or (/.empty? sample) (let [size (/.size sample)] - (/@= (/.indices size) + (/\= (/.indices size) (/.iterate (function (_ index) (if (n.< size index) (#.Some (inc index)) #.None)) 0))))) (_.cover [/.folds] - (/@= (/@map (function (_ index) + (/\= (/\map (function (_ index) (:: /.fold fold n.+ 0 (/.take index sample))) (/.indices (inc (/.size sample)))) (/.folds n.+ 0 sample))) diff --git a/stdlib/source/test/lux/data/collection/queue.lux b/stdlib/source/test/lux/data/collection/queue.lux index 9cc7c4500..3cd4d6db2 100644 --- a/stdlib/source/test/lux/data/collection/queue.lux +++ b/stdlib/source/test/lux/data/collection/queue.lux @@ -8,13 +8,13 @@ ["$." equivalence] ["$." functor (#+ Injection)]]}] [data - ["." bit ("#@." equivalence)] + ["." bit ("#\." equivalence)] ["%" text/format (#+ format)] [number ["n" nat]] [collection ["." set] - ["." list ("#@." monoid)]]] + ["." list ("#\." monoid)]]] [math ["." random]]] {1 @@ -47,13 +47,13 @@ (_.cover [/.size] (n.= size (/.size sample))) (_.cover [/.empty?] - (bit@= (n.= 0 size) (/.empty? sample))) + (bit\= (n.= 0 size) (/.empty? sample))) (_.cover [/.empty] (let [empty-is-empty! (/.empty? /.empty) all-empty-queues-look-the-same! - (bit@= (/.empty? sample) + (bit\= (/.empty? sample) (:: (/.equivalence n.equivalence) = sample /.empty))] @@ -89,7 +89,7 @@ has-expected-order! (:: (list.equivalence n.equivalence) = - (list@compose (/.to-list sample) (list non-member)) + (list\compose (/.to-list sample) (list non-member)) (/.to-list pushed))] (and size-increases! new-member-is-identified! diff --git a/stdlib/source/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux index 073ce2c8d..37e52d598 100644 --- a/stdlib/source/test/lux/data/collection/queue/priority.lux +++ b/stdlib/source/test/lux/data/collection/queue/priority.lux @@ -4,8 +4,8 @@ [abstract ["." monad (#+ do)]] [data - ["." maybe ("#@." functor)] - ["." bit ("#@." equivalence)] + ["." maybe ("#\." functor)] + ["." bit ("#\." equivalence)] [number ["n" nat]]] [math @@ -41,7 +41,7 @@ (_.cover [/.size] (n.= size (/.size sample))) (_.cover [/.empty?] - (bit@= (n.= 0 (/.size sample)) + (bit\= (n.= 0 (/.size sample)) (/.empty? sample))) (_.cover [/.empty] (/.empty? /.empty)) @@ -78,7 +78,7 @@ (/.push /.min min-member) (/.push /.max max-member) /.peek - (maybe@map (n.= max-member)) + (maybe\map (n.= max-member)) (maybe.default false))) (_.cover [/.min] (|> /.empty @@ -86,7 +86,7 @@ (/.push /.min min-member) /.pop /.peek - (maybe@map (n.= min-member)) + (maybe\map (n.= min-member)) (maybe.default false))) )) )))) diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux index 716b03168..7a51ff797 100644 --- a/stdlib/source/test/lux/data/collection/row.lux +++ b/stdlib/source/test/lux/data/collection/row.lux @@ -15,16 +15,16 @@ ["." try (#+ Try)] ["." exception]] [data - ["." bit ("#@." equivalence)] + ["." bit ("#\." equivalence)] [number ["n" nat]] [collection - ["." list ("#@." fold)] + ["." list ("#\." fold)] ["." set]]] [math ["." random]]] {1 - ["." / ("#@." monad)]}) + ["." / ("#\." monad)]}) (def: signatures Test @@ -36,13 +36,13 @@ (_.with-cover [/.monoid] ($monoid.spec (/.equivalence n.equivalence) /.monoid (random.row size random.nat))) (_.with-cover [/.fold] - ($fold.spec /@wrap /.equivalence /.fold)) + ($fold.spec /\wrap /.equivalence /.fold)) (_.with-cover [/.functor] - ($functor.spec /@wrap /.equivalence /.functor)) + ($functor.spec /\wrap /.equivalence /.functor)) (_.with-cover [/.apply] - ($apply.spec /@wrap /.equivalence /.apply)) + ($apply.spec /\wrap /.equivalence /.apply)) (_.with-cover [/.monad] - ($monad.spec /@wrap /.equivalence /.monad)) + ($monad.spec /\wrap /.equivalence /.monad)) ))) (def: whole @@ -51,24 +51,24 @@ [size (:: ! map (n.% 100) random.nat) sample (random.set n.hash size random.nat) #let [sample (|> sample set.to-list /.from-list)] - #let [(^open "/@.") (/.equivalence n.equivalence)]] + #let [(^open "/\.") (/.equivalence n.equivalence)]] ($_ _.and (_.cover [/.size] (n.= size (/.size sample))) (_.cover [/.empty?] - (bit@= (/.empty? sample) (n.= 0 (/.size sample)))) + (bit\= (/.empty? sample) (n.= 0 (/.size sample)))) (_.cover [/.empty] (/.empty? /.empty)) (_.cover [/.to-list /.from-list] - (|> sample /.to-list /.from-list (/@= sample))) + (|> sample /.to-list /.from-list (/\= sample))) (_.cover [/.reverse] (or (n.< 2 (/.size sample)) (let [not-same! - (not (/@= sample + (not (/\= sample (/.reverse sample))) self-symmetry! - (/@= sample + (/\= sample (/.reverse (/.reverse sample)))] (and not-same! self-symmetry!)))) @@ -145,14 +145,14 @@ non-member (random.filter (|>> (set.member? sample) not) random.nat) #let [sample (|> sample set.to-list /.from-list)] - #let [(^open "/@.") (/.equivalence n.equivalence)]] + #let [(^open "/\.") (/.equivalence n.equivalence)]] ($_ _.and (do ! [value/0 random.nat value/1 random.nat value/2 random.nat] (_.cover [/.row] - (/@= (/.from-list (list value/0 value/1 value/2)) + (/\= (/.from-list (list value/0 value/1 value/2)) (/.row value/0 value/1 value/2)))) (_.cover [/.member?] (and (list.every? (/.member? n.equivalence sample) @@ -180,7 +180,7 @@ (|> sample (/.add non-member) /.pop - (/@= sample))] + (/\= sample))] (and expected-size! symmetry!)))) )) diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux index ad1dd0448..e255fd5f5 100644 --- a/stdlib/source/test/lux/data/collection/sequence.lux +++ b/stdlib/source/test/lux/data/collection/sequence.lux @@ -17,7 +17,7 @@ ["." text ["%" format (#+ format)]] [collection - ["." list ("#@." functor)]]] + ["." list ("#\." functor)]]] [math ["." random]]] {1 @@ -35,7 +35,7 @@ Test (<| (_.covering /._) (_.with-cover [/.Sequence]) - (let [(^open "list@.") (list.equivalence n.equivalence)]) + (let [(^open "list\.") (list.equivalence n.equivalence)]) (do {! random.monad} [repeated random.nat index (:: ! map (n.% 100) random.nat) @@ -56,38 +56,38 @@ (n.= repeated (/.nth index (/.repeat repeated)))) (_.cover [/.take] - (list@= (enum.range n.enum offset (dec (n.+ size offset))) + (list\= (enum.range n.enum offset (dec (n.+ size offset))) (/.take size (/.iterate inc offset)))) (_.cover [/.drop] - (list@= (enum.range n.enum offset (dec (n.+ size offset))) + (list\= (enum.range n.enum offset (dec (n.+ size offset))) (/.take size (/.drop offset (/.iterate inc 0))))) (_.cover [/.split] (let [[drops takes] (/.split size (/.iterate inc 0))] - (and (list@= (enum.range n.enum 0 (dec size)) + (and (list\= (enum.range n.enum 0 (dec size)) drops) - (list@= (enum.range n.enum size (dec (n.* 2 size))) + (list\= (enum.range n.enum size (dec (n.* 2 size))) (/.take size takes))))) (_.cover [/.take-while] - (list@= (enum.range n.enum 0 (dec size)) + (list\= (enum.range n.enum 0 (dec size)) (/.take-while (n.< size) (/.iterate inc 0)))) (_.cover [/.drop-while] - (list@= (enum.range n.enum offset (dec (n.+ size offset))) + (list\= (enum.range n.enum offset (dec (n.+ size offset))) (/.take-while (n.< (n.+ size offset)) (/.drop-while (n.< offset) (/.iterate inc 0))))) (_.cover [/.split-while] (let [[drops takes] (/.split-while (n.< size) (/.iterate inc 0))] - (and (list@= (enum.range n.enum 0 (dec size)) + (and (list\= (enum.range n.enum 0 (dec size)) drops) - (list@= (enum.range n.enum size (dec (n.* 2 size))) + (list\= (enum.range n.enum size (dec (n.* 2 size))) (/.take-while (n.< (n.* 2 size)) takes))))) (_.cover [/.head] (n.= offset (/.head (/.iterate inc offset)))) (_.cover [/.tail] - (list@= (enum.range n.enum (inc offset) (n.+ size offset)) + (list\= (enum.range n.enum (inc offset) (n.+ size offset)) (/.take size (/.tail (/.iterate inc offset))))) (_.cover [/.filter] - (list@= (list@map (n.* 2) (enum.range n.enum 0 (dec size))) + (list\= (list\map (n.* 2) (enum.range n.enum 0 (dec size))) (/.take size (/.filter n.even? (/.iterate inc 0))))) (_.cover [/.partition] (let [[evens odds] (/.partition n.even? (/.iterate inc 0))] @@ -96,16 +96,16 @@ (n.= (inc (n.* 2 offset)) (/.nth offset odds))))) (_.cover [/.unfold] - (let [(^open "/@.") /.functor - (^open "list@.") (list.equivalence text.equivalence)] - (list@= (/.take size - (/@map %.nat (/.iterate inc offset))) + (let [(^open "/\.") /.functor + (^open "list\.") (list.equivalence text.equivalence)] + (list\= (/.take size + (/\map %.nat (/.iterate inc offset))) (/.take size (/.unfold (function (_ n) [(inc n) (%.nat n)]) offset))))) (_.cover [/.cycle] (let [cycle (list& cycle-start cycle-next)] - (list@= (list.concat (list.repeat size cycle)) + (list\= (list.concat (list.repeat size cycle)) (/.take (n.* size (list.size cycle)) (/.cycle [cycle-start cycle-next]))))) (_.cover [/.^sequence&] diff --git a/stdlib/source/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux index 93549712f..3525a5fc8 100644 --- a/stdlib/source/test/lux/data/collection/set.lux +++ b/stdlib/source/test/lux/data/collection/set.lux @@ -9,7 +9,7 @@ ["$." equivalence] ["$." monoid]]}] [data - ["." bit ("#@." equivalence)] + ["." bit ("#\." equivalence)] [number ["n" nat]] [collection @@ -28,7 +28,7 @@ Test (<| (_.covering /._) (_.with-cover [/.Set]) - (let [(^open "/@.") /.equivalence]) + (let [(^open "/\.") /.equivalence]) (do random.monad [size ..gen-nat] ($_ _.and @@ -48,10 +48,10 @@ (_.cover [/.size] (n.= sizeL (/.size setL))) (_.cover [/.empty?] - (bit@= (/.empty? setL) + (bit\= (/.empty? setL) (n.= 0 (/.size setL)))) (_.cover [/.to-list /.from-list] - (|> setL /.to-list (/.from-list n.hash) (/@= setL))) + (|> setL /.to-list (/.from-list n.hash) (/\= setL))) (_.cover [/.member?] (and (list.every? (/.member? setL) (/.to-list setL)) (not (/.member? setL non-memberL)))) @@ -72,12 +72,12 @@ (|> setL (/.add non-memberL) (/.remove non-memberL) - (/@= setL)) + (/\= setL)) idempotency! (|> setL (/.remove non-memberL) - (/@= setL))] + (/\= setL))] (and symmetry! idempotency!))) (_.cover [/.union /.sub?] @@ -90,7 +90,7 @@ union-with-empty-set! (|> setL (/.union (/.new n.hash)) - (/@= setL))] + (/\= setL))] (and sets-are-subs-of-their-unions! union-with-empty-set!))) (_.cover [/.intersection /.super?] diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux index 039f67200..8e376ba17 100644 --- a/stdlib/source/test/lux/data/collection/set/multi.lux +++ b/stdlib/source/test/lux/data/collection/set/multi.lux @@ -9,12 +9,12 @@ [/ ["$." equivalence]]}] [data - ["." bit ("#@." equivalence)] + ["." bit ("#\." equivalence)] [number ["n" nat]] [collection ["." set] - ["." list ("#@." fold)]]] + ["." list ("#\." fold)]]] [math ["." random (#+ Random)]]] {1 @@ -29,7 +29,7 @@ (do {! random.monad} [elements (random.set hash size element) element-counts (random.list size ..count)] - (wrap (list@fold (function (_ [count element] set) + (wrap (list\fold (function (_ [count element] set) (/.add count element set)) (/.new hash) (list.zip/2 element-counts @@ -60,7 +60,7 @@ (n.= (list.size (/.to-list sample)) (/.size sample))) (_.cover [/.empty?] - (bit@= (/.empty? sample) + (bit\= (/.empty? sample) (n.= 0 (/.size sample)))) (_.cover [/.new] (/.empty? (/.new n.hash))) diff --git a/stdlib/source/test/lux/data/collection/stack.lux b/stdlib/source/test/lux/data/collection/stack.lux index 80b7fce63..bc2082846 100644 --- a/stdlib/source/test/lux/data/collection/stack.lux +++ b/stdlib/source/test/lux/data/collection/stack.lux @@ -9,7 +9,7 @@ ["$." functor (#+ Injection)]]}] [data ["." maybe] - ["." bit ("#@." equivalence)] + ["." bit ("#\." equivalence)] [number ["n" nat]]] [math @@ -38,7 +38,7 @@ (_.cover [/.size] (n.= size (/.size sample))) (_.cover [/.empty?] - (bit@= (n.= 0 (/.size sample)) + (bit\= (n.= 0 (/.size sample)) (/.empty? sample))) (_.cover [/.empty] (/.empty? /.empty)) diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux index ccd4a1d70..9224e5654 100644 --- a/stdlib/source/test/lux/data/collection/tree.lux +++ b/stdlib/source/test/lux/data/collection/tree.lux @@ -13,7 +13,7 @@ [number ["n" nat]] [collection - ["." list ("#@." functor fold)]]] + ["." list ("#\." functor fold)]]] [math ["." random (#+ Random)]]] {1 @@ -26,10 +26,10 @@ 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)) + (list\map product.left) + (list\fold n.+ 1)) {#/.value value - #/.children (list@map product.right children)}]))) + #/.children (list\map product.right children)}]))) (def: #export test Test @@ -63,7 +63,7 @@ (_.cover [/.branch] (:: (list.equivalence n.equivalence) = (list& value children) - (/.flatten (/.branch value (list@map /.leaf children)))))) + (/.flatten (/.branch value (list\map /.leaf children)))))) (do random.monad [expected/0 random.nat expected/1 random.nat diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux index ca84d8b07..d81ff7220 100644 --- a/stdlib/source/test/lux/data/color.lux +++ b/stdlib/source/test/lux/data/color.lux @@ -20,8 +20,7 @@ ["." math ["." random (#+ Random)]]] {1 - ["." / (#+ Color) - ["." named]]}) + ["." / (#+ Color)]}) (def: #export color (Random Color) diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux new file mode 100644 index 000000000..609c847cf --- /dev/null +++ b/stdlib/source/test/lux/data/color/named.lux @@ -0,0 +1,240 @@ +(.module: + [lux #* + ["_" test (#+ Test)] + [abstract + [monad (#+ do)]] + [data + [number + ["n" nat]] + [collection + ["." list] + ["." set]]] + [macro + ["." template]] + [math + ["." random (#+ Random)]]] + {1 + ["." / + ["/#" //]]}) + +(with-expansions [<colors> (as-is [letter/a + [/.alice-blue + /.antique-white + ## /.aqua + /.aquamarine + /.azure]] + + [letter/b + [/.beige + /.bisque + /.black + /.blanched-almond + /.blue + /.blue-violet + /.brown + /.burly-wood]] + + [letter/c + [/.cadet-blue + /.chartreuse + /.chocolate + /.coral + /.cornflower-blue + /.cornsilk + /.crimson + /.cyan]] + + [letter/d + [/.dark-blue + /.dark-cyan + /.dark-goldenrod + /.dark-gray + /.dark-green + /.dark-khaki + /.dark-magenta + /.dark-olive-green + /.dark-orange + /.dark-orchid + /.dark-red + /.dark-salmon + /.dark-sea-green + /.dark-slate-blue + /.dark-slate-gray + /.dark-turquoise + /.dark-violet + /.deep-pink + /.deep-sky-blue + /.dim-gray + /.dodger-blue]] + + [letter/f + [/.fire-brick + /.floral-white + /.forest-green + ## /.fuchsia + ]] + + [letter/g + [/.gainsboro + /.ghost-white + /.gold + /.goldenrod + /.gray + /.green + /.green-yellow]] + + [letter/h + [/.honey-dew + /.hot-pink]] + + [letter/i + [/.indian-red + /.indigo + /.ivory]] + + [letter/k + [/.khaki]] + + [letter/l + [/.lavender + /.lavender-blush + /.lawn-green + /.lemon-chiffon + /.light-blue + /.light-coral + /.light-cyan + /.light-goldenrod-yellow + /.light-gray + /.light-green + /.light-pink + /.light-salmon + /.light-sea-green + /.light-sky-blue + /.light-slate-gray + /.light-steel-blue + /.light-yellow + /.lime + /.lime-green + /.linen]] + + [letter/m + [/.magenta + /.maroon + /.medium-aquamarine + /.medium-blue + /.medium-orchid + /.medium-purple + /.medium-sea-green + /.medium-slate-blue + /.medium-spring-green + /.medium-turquoise + /.medium-violet-red + /.midnight-blue + /.mint-cream + /.misty-rose + /.moccasin]] + + [letter/n + [/.navajo-white + /.navy]] + + [letter/o + [/.old-lace + /.olive + /.olive-drab + /.orange + /.orange-red + /.orchid]] + + [letter/p + [/.pale-goldenrod + /.pale-green + /.pale-turquoise + /.pale-violet-red + /.papaya-whip + /.peach-puff + /.peru + /.pink + /.plum + /.powder-blue + /.purple]] + + [letter/r + [/.rebecca-purple + /.red + /.rosy-brown + /.royal-blue]] + + [letter/s + [/.saddle-brown + /.salmon + /.sandy-brown + /.sea-green + /.sea-shell + /.sienna + /.silver + /.sky-blue + /.slate-blue + /.slate-gray + /.snow + /.spring-green + /.steel-blue]] + + [letter/t + [/.tan + /.teal + /.thistle + /.tomato + /.turquoise]] + + [letter/v + [/.violet]] + + [letter/w + [/.wheat + /.white + /.white-smoke]] + + [letter/y + [/.yellow + /.yellow-green]] + ) + <named> (template [<definition> <by-letter>] + [((: (-> Any (List //.Color)) + (function (_ _) + (`` (list (~~ (template.splice <by-letter>)))))) + 123)] + + <colors>)] + (def: all-colors + (list.concat (list <named>))) + + (def: unique-colors + (set.from-list //.hash ..all-colors)) + + (def: verdict + (n.= (list.size ..all-colors) + (set.size ..unique-colors))) + + (template [<definition> <by-letter>] + [(def: <definition> + Test + (`` (_.cover <by-letter> + ..verdict)))] + + <colors>) + + (def: #export test + Test + (<| (_.covering /._) + (`` ($_ _.and + (~~ (template [<definition> <by-letter>] + [<definition>] + + <colors>)) + (_.cover [/.aqua] + (:: //.equivalence = /.cyan /.aqua)) + (_.cover [/.fuchsia] + (:: //.equivalence = /.magenta /.fuchsia)) + )))) + ) diff --git a/stdlib/source/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux index 24114f6c0..139c63e4c 100644 --- a/stdlib/source/test/lux/data/maybe.lux +++ b/stdlib/source/test/lux/data/maybe.lux @@ -11,7 +11,7 @@ ["$." apply] ["$." monad]]}] [control - ["." io ("#@." monad)] + ["." io ("#\." monad)] pipe] [data ["." text] @@ -22,7 +22,7 @@ [math ["." random (#+ Random)]]] {1 - ["." / ("#@." monoid monad)]}) + ["." / ("#\." monoid monad)]}) (def: #export test Test @@ -34,11 +34,11 @@ (_.with-cover [/.monoid] ($monoid.spec (/.equivalence n.equivalence) /.monoid (random.maybe random.nat))) (_.with-cover [/.functor] - ($functor.spec /@wrap /.equivalence /.functor)) + ($functor.spec /\wrap /.equivalence /.functor)) (_.with-cover [/.apply] - ($apply.spec /@wrap /.equivalence /.apply)) + ($apply.spec /\wrap /.equivalence /.apply)) (_.with-cover [/.monad] - ($monad.spec /@wrap /.equivalence /.monad)) + ($monad.spec /\wrap /.equivalence /.monad)) (do random.monad [left random.nat @@ -47,7 +47,7 @@ (let [lift (/.lift io.monad)] (_.cover [/.with /.lift] (|> (io.run (do (/.with io.monad) - [a (lift (io@wrap left)) + [a (lift (io\wrap left)) b (wrap right)] (wrap (n.+ a b)))) (case> (#.Some actual) diff --git a/stdlib/source/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux index bf5c6e876..e3778202c 100644 --- a/stdlib/source/test/lux/data/name.lux +++ b/stdlib/source/test/lux/data/name.lux @@ -13,7 +13,7 @@ [data [number ["n" nat]] - ["." text ("#@." equivalence)]] + ["." text ("#\." equivalence)]] [math ["." random (#+ Random)]]] {1 @@ -49,10 +49,10 @@ ($order.spec /.order (..name sizeM1 sizeS1))) (_.with-cover [/.codec] (_.and ($codec.spec /.equivalence /.codec (..name sizeM1 sizeS1)) - (let [(^open "/@.") /.codec] + (let [(^open "/\.") /.codec] (_.test "Encoding an name without a module component results in text equal to the short of the name." (if (text.empty? module1) - (text@= short1 (/@encode name1)) + (text\= short1 (/\encode name1)) #1))))) (_.cover [/.module /.short] @@ -60,16 +60,16 @@ (is? short1 (/.short name1)))) (_.with-cover [.name-of] - (let [(^open "/@.") /.equivalence] + (let [(^open "/\.") /.equivalence] ($_ _.and (_.test "Can obtain Name from identifier." - (and (/@= ["lux" "yolo"] (.name-of .yolo)) - (/@= ["test/lux/data/name" "yolo"] (.name-of ..yolo)) - (/@= ["" "yolo"] (.name-of yolo)) - (/@= ["lux/test" "yolo"] (.name-of lux/test.yolo)))) + (and (/\= ["lux" "yolo"] (.name-of .yolo)) + (/\= ["test/lux/data/name" "yolo"] (.name-of ..yolo)) + (/\= ["" "yolo"] (.name-of yolo)) + (/\= ["lux/test" "yolo"] (.name-of lux/test.yolo)))) (_.test "Can obtain Name from tag." - (and (/@= ["lux" "yolo"] (.name-of #.yolo)) - (/@= ["test/lux/data/name" "yolo"] (.name-of #..yolo)) - (/@= ["" "yolo"] (.name-of #yolo)) - (/@= ["lux/test" "yolo"] (.name-of #lux/test.yolo))))))) + (and (/\= ["lux" "yolo"] (.name-of #.yolo)) + (/\= ["test/lux/data/name" "yolo"] (.name-of #..yolo)) + (/\= ["" "yolo"] (.name-of #yolo)) + (/\= ["lux/test" "yolo"] (.name-of #lux/test.yolo))))))) ))))) diff --git a/stdlib/source/test/lux/data/number/complex.lux b/stdlib/source/test/lux/data/number/complex.lux index 091814105..13497bfa5 100644 --- a/stdlib/source/test/lux/data/number/complex.lux +++ b/stdlib/source/test/lux/data/number/complex.lux @@ -15,7 +15,7 @@ ["." int] ["f" frac]] [collection - ["." list ("#@." functor)]]] + ["." list ("#\." functor)]]] ["." math ["r" random (#+ Random)]]] {1 @@ -189,7 +189,7 @@ (_.test "Can calculate the N roots for any complex number." (|> sample (/.roots degree) - (list@map (/.pow' (|> degree .int int.frac))) + (list\map (/.pow' (|> degree .int int.frac))) (list.every? (within? margin-of-error sample)))))) (def: #export test diff --git a/stdlib/source/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux index 6a4130229..3ae126887 100644 --- a/stdlib/source/test/lux/data/sum.lux +++ b/stdlib/source/test/lux/data/sum.lux @@ -13,7 +13,7 @@ [number ["n" nat]] [collection - ["." list ("#@." functor)]]] + ["." list ("#\." functor)]]] [math ["." random]]] {1 @@ -65,7 +65,7 @@ ($_ _.and (_.cover [/.lefts] (let [actual (: (List (| Nat Nat)) - (list@map /.left expected))] + (list\map /.left expected))] (and (:: (list.equivalence n.equivalence) = expected (/.lefts actual)) @@ -74,7 +74,7 @@ (/.rights actual))))) (_.cover [/.rights] (let [actual (: (List (| Nat Nat)) - (list@map /.right expected))] + (list\map /.right expected))] (and (:: (list.equivalence n.equivalence) = expected (/.rights actual)) @@ -83,7 +83,7 @@ (/.lefts actual))))) (_.cover [/.partition] (let [[lefts rights] (|> expected - (list@map (function (_ value) + (list\map (function (_ value) (if (n.even? value) (/.left value) (/.right value)))) |