diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/test/lux/data/collection/list.lux | 16 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/collection/row.lux | 10 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/collection/sequence.lux | 34 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/format/json.lux | 4 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/format/xml.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/text.lux | 4 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/text/encoding.lux | 2 | ||||
-rw-r--r-- | stdlib/source/test/lux/data/text/escape.lux | 2 |
8 files changed, 37 insertions, 37 deletions
diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index 872c21e2d..209dfe143 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -165,9 +165,9 @@ (/\map product.right enumeration))] (and has_correct_indices! has_correct_values!))) - (_.cover [/.nth] + (_.cover [/.item] (/.every? (function (_ [index expected]) - (case (/.nth index sample) + (case (/.item index sample) (#.Some actual) (n.= expected actual) @@ -413,15 +413,15 @@ (and (n.= (|> (/.size sample) (n.* 2) dec) (/.size sample+)) (|> sample+ /.pairs (/.every? (|>> product.right (n.= separator)))))))) - (_.cover [/.iterate] + (_.cover [/.iterations] (or (/.empty? sample) (let [size (/.size sample)] (/\= (/.indices size) - (/.iterate (function (_ index) - (if (n.< size index) - (#.Some (inc index)) - #.None)) - 0))))) + (/.iterations (function (_ index) + (if (n.< size index) + (#.Some (inc index)) + #.None)) + 0))))) (_.cover [/.folds] (/\= (/\map (function (_ index) (\ /.fold fold n.+ 0 (/.take index sample))) diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux index 902fec0d8..4eda82b14 100644 --- a/stdlib/source/test/lux/data/collection/row.lux +++ b/stdlib/source/test/lux/data/collection/row.lux @@ -91,8 +91,8 @@ random.nat) #let [sample (|> sample set.to_list /.of_list)]] ($_ _.and - (_.cover [/.nth] - (case (/.nth good_index sample) + (_.cover [/.item] + (case (/.item good_index sample) (#try.Success member) (/.member? n.equivalence sample member) @@ -102,14 +102,14 @@ (<| (try.else false) (do try.monad [sample (/.put good_index non_member sample) - actual (/.nth good_index sample)] + actual (/.item good_index sample)] (in (is? non_member actual))))) (_.cover [/.update] (<| (try.else false) (do try.monad [sample (/.put good_index non_member sample) sample (/.update good_index inc sample) - actual (/.nth good_index sample)] + actual (/.item good_index sample)] (in (n.= (inc non_member) actual))))) (_.cover [/.within_bounds?] (and (/.within_bounds? sample good_index) @@ -123,7 +123,7 @@ (#try.Failure error) (exception.match? /.index_out_of_bounds error))))] - (and (fails! (/.nth bad_index sample)) + (and (fails! (/.item bad_index sample)) (fails! (/.put bad_index non_member sample)) (fails! (/.update bad_index inc sample))))) )) diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux index 5058fae08..a5ba1f1bc 100644 --- a/stdlib/source/test/lux/data/collection/sequence.lux +++ b/stdlib/source/test/lux/data/collection/sequence.lux @@ -47,57 +47,57 @@ (_.for [/.comonad] ($comonad.spec /.repeat ..equivalence /.comonad)) - (_.cover [/.iterate /.nth] + (_.cover [/.iterations /.item] (n.= (n.+ offset index) - (/.nth index (/.iterate inc offset)))) + (/.item index (/.iterations inc offset)))) (_.cover [/.repeat] (n.= repeated - (/.nth index (/.repeat repeated)))) + (/.item index (/.repeat repeated)))) (_.cover [/.take] (list\= (enum.range n.enum offset (dec (n.+ size offset))) - (/.take size (/.iterate inc offset)))) + (/.take size (/.iterations inc offset)))) (_.cover [/.drop] (list\= (enum.range n.enum offset (dec (n.+ size offset))) - (/.take size (/.drop offset (/.iterate inc 0))))) + (/.take size (/.drop offset (/.iterations inc 0))))) (_.cover [/.split] - (let [[drops takes] (/.split size (/.iterate inc 0))] + (let [[drops takes] (/.split size (/.iterations inc 0))] (and (list\= (enum.range n.enum 0 (dec size)) drops) (list\= (enum.range n.enum size (dec (n.* 2 size))) (/.take size takes))))) (_.cover [/.take_while] (list\= (enum.range n.enum 0 (dec size)) - (/.take_while (n.< size) (/.iterate inc 0)))) + (/.take_while (n.< size) (/.iterations inc 0)))) (_.cover [/.drop_while] (list\= (enum.range n.enum offset (dec (n.+ size offset))) (/.take_while (n.< (n.+ size offset)) - (/.drop_while (n.< offset) (/.iterate inc 0))))) + (/.drop_while (n.< offset) (/.iterations inc 0))))) (_.cover [/.split_while] - (let [[drops takes] (/.split_while (n.< size) (/.iterate inc 0))] + (let [[drops takes] (/.split_while (n.< size) (/.iterations inc 0))] (and (list\= (enum.range n.enum 0 (dec size)) drops) (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)))) + (/.head (/.iterations inc offset)))) (_.cover [/.tail] (list\= (enum.range n.enum (inc offset) (n.+ size offset)) - (/.take size (/.tail (/.iterate inc offset))))) + (/.take size (/.tail (/.iterations inc offset))))) (_.cover [/.only] (list\= (list\map (n.* 2) (enum.range n.enum 0 (dec size))) - (/.take size (/.only n.even? (/.iterate inc 0))))) + (/.take size (/.only n.even? (/.iterations inc 0))))) (_.cover [/.partition] - (let [[evens odds] (/.partition n.even? (/.iterate inc 0))] + (let [[evens odds] (/.partition n.even? (/.iterations inc 0))] (and (n.= (n.* 2 offset) - (/.nth offset evens)) + (/.item offset evens)) (n.= (inc (n.* 2 offset)) - (/.nth offset odds))))) + (/.item offset odds))))) (_.cover [/.unfold] (let [(^open "/\.") /.functor (^open "list\.") (list.equivalence text.equivalence)] (list\= (/.take size - (/\map %.nat (/.iterate inc offset))) + (/\map %.nat (/.iterations inc offset))) (/.take size (/.unfold (function (_ n) [(inc n) (%.nat n)]) offset))))) @@ -107,7 +107,7 @@ (/.take (n.* size (list.size cycle)) (/.cycle [cycle_start cycle_next]))))) (_.cover [/.^sequence&] - (let [(/.^sequence& first second third next) (/.iterate inc offset)] + (let [(/.^sequence& first second third next) (/.iterations inc offset)] (and (n.= offset first) (n.= (n.+ 1 offset) second) (n.= (n.+ 2 offset) third)))) diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index 063d3ef2f..940f22cd8 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -48,12 +48,12 @@ (syntax: (boolean) (do meta.monad - [value meta.count] + [value meta.seed] (in (list (code.bit (n.even? value)))))) (syntax: (number) (do meta.monad - [value meta.count] + [value meta.seed] (in (list (code.frac (n.frac value)))))) (syntax: (string) diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux index e73e4960a..1fec8a797 100644 --- a/stdlib/source/test/lux/data/format/xml.lux +++ b/stdlib/source/test/lux/data/format/xml.lux @@ -37,7 +37,7 @@ (Random Nat) (do {! random.monad} [idx (|> random.nat (\ ! map (n.% (text.size char_range))))] - (in (maybe.assume (text.nth idx char_range))))) + (in (maybe.assume (text.char idx char_range))))) (def: (size bottom top) (-> Nat Nat (Random Nat)) diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux index 82a364120..3e063f73a 100644 --- a/stdlib/source/test/lux/data/text.lux +++ b/stdlib/source/test/lux/data/text.lux @@ -168,8 +168,8 @@ characters (random.set /.hash size (random.ascii/alpha 1)) #let [sample (|> characters set.to_list /.concat)] expected (\ ! map (n.% size) random.nat)] - (_.cover [/.nth] - (case (/.nth expected sample) + (_.cover [/.char] + (case (/.char expected sample) (#.Some char) (case (/.index_of (/.of_char char) sample) (#.Some actual) diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux index f5670b35f..4cdf461b7 100644 --- a/stdlib/source/test/lux/data/text/encoding.lux +++ b/stdlib/source/test/lux/data/text/encoding.lux @@ -215,7 +215,7 @@ (let [options (list.size ..all_encodings)] (do {! random.monad} [choice (\ ! map (n.% options) random.nat)] - (in (maybe.assume (list.nth choice ..all_encodings)))))) + (in (maybe.assume (list.item choice ..all_encodings)))))) (def: #export test Test diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux index 6899c6f62..34f37de58 100644 --- a/stdlib/source/test/lux/data/text/escape.lux +++ b/stdlib/source/test/lux/data/text/escape.lux @@ -71,7 +71,7 @@ (syntax: (static_sample) (do meta.monad - [seed meta.count + [seed meta.seed #let [[_ expected] (random.run (random.pcg32 [seed seed]) (random.ascii 10))]] (in (list (code.text expected))))) |