diff options
| author | Eduardo Julian | 2019-06-20 22:32:59 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2019-06-20 22:32:59 -0400 |
| commit | b71b861008381626633bf28b033cd866d7e4e0b7 (patch) | |
| tree | 3ee21cd21e6dd80f6fcdf90173bbd6162b616d8f /stdlib/source/test | |
| parent | fcee38da766a683ed5569978be153c6e7a8ae0af (diff) | |
Improved the convention for using text formatters.
Diffstat (limited to 'stdlib/source/test')
99 files changed, 249 insertions, 255 deletions
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index b69a6b969..945fd9c54 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -28,7 +28,7 @@ [locale (#+) [language (#+)] [territory (#+)]] - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random (#+ Random) ("#@." functor)] ## TODO: Test these modules [data @@ -322,8 +322,8 @@ (<| (_.context "Conversion.") (`` ($_ _.and (~~ (template [<=> <forward> <backward> <gen>] - [(<| (_.context (format (%name (name-of <forward>)) - " " (%name (name-of <backward>)))) + [(<| (_.context (format (%.name (name-of <forward>)) + " " (%.name (name-of <backward>)))) (..conversion <gen> <forward> <backward> <=>))] [i/= .nat .int (r@map (i/% +1,000,000) r.int)] diff --git a/stdlib/source/test/lux/abstract/apply.lux b/stdlib/source/test/lux/abstract/apply.lux index 6b3ea631f..b2d67d3e9 100644 --- a/stdlib/source/test/lux/abstract/apply.lux +++ b/stdlib/source/test/lux/abstract/apply.lux @@ -3,7 +3,7 @@ [abstract/monad (#+ do)] [data [text - format]] + ["%" format (#+ format)]]] [control ["." function]] [math @@ -63,7 +63,7 @@ (def: #export (spec injection comparison apply) (All [f] (-> (Injection f) (Comparison f) (Apply f) Test)) - (_.context (%name (name-of /.Apply)) + (_.context (%.name (name-of /.Apply)) ($_ _.and (..identity injection comparison apply) (..homomorphism injection comparison apply) diff --git a/stdlib/source/test/lux/abstract/codec.lux b/stdlib/source/test/lux/abstract/codec.lux index 80203c237..99afe290f 100644 --- a/stdlib/source/test/lux/abstract/codec.lux +++ b/stdlib/source/test/lux/abstract/codec.lux @@ -3,7 +3,7 @@ ["_" test (#+ Test)] [abstract/monad (#+ do)] [data - text/format + ["%" text/format (#+ format)] ["." error]] [math ["r" random (#+ Random)]]] @@ -16,7 +16,7 @@ (All [m a] (-> (Equivalence a) (Codec m a) (Random a) Test)) (do r.monad [expected generator] - (<| (_.context (%name (name-of /.Codec))) + (<| (_.context (%.name (name-of /.Codec))) (_.test "Isomorphism." (case (|> expected /@encode /@decode) (#error.Success actual) diff --git a/stdlib/source/test/lux/abstract/enum.lux b/stdlib/source/test/lux/abstract/enum.lux index b0498dc09..926230ce1 100644 --- a/stdlib/source/test/lux/abstract/enum.lux +++ b/stdlib/source/test/lux/abstract/enum.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [control ["." function]] @@ -14,7 +14,7 @@ (All [a] (-> (Enum a) (Random a) Test)) (do r.monad [sample gen-sample] - (<| (_.context (%name (name-of /.Order))) + (<| (_.context (%.name (name-of /.Order))) ($_ _.and (_.test "Successor and predecessor are inverse functions." (and (/@= (|> sample /@succ /@pred) diff --git a/stdlib/source/test/lux/abstract/equivalence.lux b/stdlib/source/test/lux/abstract/equivalence.lux index d9e61131f..ac0084e82 100644 --- a/stdlib/source/test/lux/abstract/equivalence.lux +++ b/stdlib/source/test/lux/abstract/equivalence.lux @@ -4,7 +4,7 @@ [abstract/monad (#+ do)] [data [text - format]] + ["%" format (#+ format)]]] [math ["r" random (#+ Random)]]] {1 @@ -15,7 +15,7 @@ (do r.monad [left generator right generator] - (<| (_.context (%name (name-of /.Equivalence))) + (<| (_.context (%.name (name-of /.Equivalence))) ($_ _.and (_.test "Reflexivity." (_@= left left)) diff --git a/stdlib/source/test/lux/abstract/fold.lux b/stdlib/source/test/lux/abstract/fold.lux index 8dfe7fc4c..99ac25c5b 100644 --- a/stdlib/source/test/lux/abstract/fold.lux +++ b/stdlib/source/test/lux/abstract/fold.lux @@ -1,7 +1,7 @@ (.module: [lux #* ["_" test (#+ Test)] - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random] [abstract/monad (#+ do)]] [// @@ -11,7 +11,7 @@ (def: #export (spec injection comparison (^open "/@.")) (All [f] (-> (Injection f) (Comparison f) (Fold f) Test)) - (_.context (%name (name-of /.Fold)) + (_.context (%.name (name-of /.Fold)) (do r.monad [subject r.nat parameter r.nat] diff --git a/stdlib/source/test/lux/abstract/functor.lux b/stdlib/source/test/lux/abstract/functor.lux index 77a07233b..4c7c87c63 100644 --- a/stdlib/source/test/lux/abstract/functor.lux +++ b/stdlib/source/test/lux/abstract/functor.lux @@ -1,7 +1,7 @@ (.module: [lux #* ["_" test (#+ Test)] - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random] [abstract [equivalence (#+ Equivalence)] @@ -51,7 +51,7 @@ (def: #export (spec injection comparison functor) (All [f] (-> (Injection f) (Comparison f) (Functor f) Test)) - (_.context (%name (name-of /.Functor)) + (_.context (%.name (name-of /.Functor)) ($_ _.and (..identity injection comparison functor) (..homomorphism injection comparison functor) diff --git a/stdlib/source/test/lux/abstract/interval.lux b/stdlib/source/test/lux/abstract/interval.lux index 62b56a5fb..e4a489822 100644 --- a/stdlib/source/test/lux/abstract/interval.lux +++ b/stdlib/source/test/lux/abstract/interval.lux @@ -13,7 +13,7 @@ [number ["." nat]] [text - format] + ["%" format (#+ format)]] [collection ["." set] ["." list]]] @@ -217,7 +217,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Interval))) + (<| (_.context (%.name (name-of /.Interval))) ($_ _.and ($equivalence.spec /.equivalence ..interval) (<| (_.context "Boundaries.") @@ -238,7 +238,7 @@ (def: #export (spec (^open ",@.") gen-sample) (All [a] (-> (Interval a) (Random a) Test)) - (<| (_.context (%name (name-of /.Interval))) + (<| (_.context (%.name (name-of /.Interval))) (do r.monad [sample gen-sample] ($_ _.and diff --git a/stdlib/source/test/lux/abstract/monad.lux b/stdlib/source/test/lux/abstract/monad.lux index 827a1e509..c420d6416 100644 --- a/stdlib/source/test/lux/abstract/monad.lux +++ b/stdlib/source/test/lux/abstract/monad.lux @@ -2,7 +2,7 @@ [lux #* [data [text - format]] + ["%" format (#+ format)]]] [control ["." function]] [math @@ -51,7 +51,7 @@ (def: #export (spec injection comparison monad) (All [f] (-> (Injection f) (Comparison f) (Monad f) Test)) - (_.context (%name (name-of /.Monad)) + (_.context (%.name (name-of /.Monad)) ($_ _.and (..left-identity injection comparison monad) (..right-identity injection comparison monad) diff --git a/stdlib/source/test/lux/abstract/monoid.lux b/stdlib/source/test/lux/abstract/monoid.lux index 3600795ff..b0f89abc7 100644 --- a/stdlib/source/test/lux/abstract/monoid.lux +++ b/stdlib/source/test/lux/abstract/monoid.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract/monad (#+ do)] [math @@ -16,7 +16,7 @@ (All [a] (-> (Equivalence a) (Monoid a) (Random a) Test)) (do r.monad [sample gen-sample] - (<| (_.context (%name (name-of /.Monoid))) + (<| (_.context (%.name (name-of /.Monoid))) ($_ _.and (_.test "Left identity." (/@= sample (/@compose /@identity sample))) diff --git a/stdlib/source/test/lux/abstract/number.lux b/stdlib/source/test/lux/abstract/number.lux index 363621791..e04ad3124 100644 --- a/stdlib/source/test/lux/abstract/number.lux +++ b/stdlib/source/test/lux/abstract/number.lux @@ -4,7 +4,7 @@ [abstract/monad (#+ do)] [data [text - format]] + ["%" format (#+ format)]]] [math ["r" random (#+ Random)]]] {1 @@ -20,7 +20,7 @@ gen-sample)] parameter non-zero subject non-zero] - (<| (_.context (%name (name-of /.Number))) + (<| (_.context (%.name (name-of /.Number))) ($_ _.and (_.test "Addition and subtraction are inverse functions." (|> subject (/@+ parameter) (/@- parameter) (/@= subject))) diff --git a/stdlib/source/test/lux/abstract/order.lux b/stdlib/source/test/lux/abstract/order.lux index 5406a490c..c31ab31e1 100644 --- a/stdlib/source/test/lux/abstract/order.lux +++ b/stdlib/source/test/lux/abstract/order.lux @@ -4,7 +4,7 @@ [abstract/monad (#+ do)] [data [text - format]] + ["%" format (#+ format)]]] [math ["r" random (#+ Random)]]] {1 @@ -15,7 +15,7 @@ (do r.monad [parameter generator subject generator] - (<| (_.context (%name (name-of /.Order))) + (<| (_.context (%.name (name-of /.Order))) ($_ _.and (_.test "Values are either ordered, or they are equal. All options are mutually exclusive." (cond (,@< parameter subject) diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux index a39f7b039..017ee60ef 100644 --- a/stdlib/source/test/lux/control/concurrency/actor.lux +++ b/stdlib/source/test/lux/control/concurrency/actor.lux @@ -8,7 +8,7 @@ [data ["." error] [text - format]] + ["%" format (#+ format)]]] [math ["r" random]]] {1 @@ -28,7 +28,7 @@ ((stop cause state) (promise;wrap (log! (if (ex.match? /.poisoned cause) - (format "Counter was poisoned: " (%n state)) + (format "Counter was poisoned: " (%.nat state)) cause))))) (message: #export Counter @@ -40,7 +40,7 @@ Test (do r.monad [_ (wrap [])] - (<| (_.context (%name (name-of /.Actor))) + (<| (_.context (%.name (name-of /.Actor))) ($_ _.and (_.test "Can check if an actor is alive." (io.run (do io.monad diff --git a/stdlib/source/test/lux/control/concurrency/atom.lux b/stdlib/source/test/lux/control/concurrency/atom.lux index 63f9ec296..15d24b826 100644 --- a/stdlib/source/test/lux/control/concurrency/atom.lux +++ b/stdlib/source/test/lux/control/concurrency/atom.lux @@ -2,7 +2,7 @@ [lux #* ["_" test (#+ Test)] [abstract/monad (#+ do)] - data/text/format + ["%" data/text/format (#+ format)] [math ["r" random]] [control @@ -12,7 +12,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Atom))) + (<| (_.context (%.name (name-of /.Atom))) (do r.monad [value r.nat swap-value r.nat diff --git a/stdlib/source/test/lux/control/concurrency/promise.lux b/stdlib/source/test/lux/control/concurrency/promise.lux index 5a4a41adb..5b412e212 100644 --- a/stdlib/source/test/lux/control/concurrency/promise.lux +++ b/stdlib/source/test/lux/control/concurrency/promise.lux @@ -5,7 +5,7 @@ [control pipe ["." io]] - data/text/format + ["%" data/text/format (#+ format)] [math ["r" random]]] {1 @@ -15,7 +15,7 @@ Test (do r.monad [_ (wrap [])] - (<| (_.context (%name (name-of /.Promise))) + (<| (_.context (%.name (name-of /.Promise))) ($_ _.and (wrap (do /.monad [running? (/.future (io.io #1))] diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux index 369bc8507..05329d9f0 100644 --- a/stdlib/source/test/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux @@ -11,7 +11,7 @@ [data ["." maybe] ["." text ("#;." equivalence monoid) - format] + ["%" format (#+ format)]] [collection ["." list ("#;." functor)]]] [math @@ -119,7 +119,7 @@ ## (-> (Atom Text) /.Barrier Nat (Promise Any)) ## (do promise.monad ## [_ (/.block barrier) -## #let [_ (io.run (atom.update (|>> (format (%n id))) resource))]] +## #let [_ (io.run (atom.update (|>> (format (%.nat id))) resource))]] ## (wrap []))) ## (context: "Barrier." @@ -139,6 +139,6 @@ ## (assert "A barrier can stop all processes from acting, until an amount of waiting processes is reached, and then the barrier is un-blocked for all." ## (and (text.ends-with? "__________" outcome) ## (list.every? (function (_ id) -## (text.contains? (%n id) outcome)) +## (text.contains? (%.nat id) outcome)) ## ids) ## ))))))) diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux index 6b9a65a55..ca9d3c050 100644 --- a/stdlib/source/test/lux/control/concurrency/stm.lux +++ b/stdlib/source/test/lux/control/concurrency/stm.lux @@ -5,7 +5,7 @@ [control ["." io (#+ IO)]] [data - text/format + ["%" text/format (#+ format)] [number ["." nat]] [collection @@ -38,7 +38,7 @@ Test (do r.monad [_ (wrap [])] - (<| (_.context (%name (name-of /.STM))) + (<| (_.context (%.name (name-of /.STM))) ($_ _.and (wrap (do promise.monad [output (/.commit (/.read (/.var 0)))] diff --git a/stdlib/source/test/lux/control/continuation.lux b/stdlib/source/test/lux/control/continuation.lux index 571225ecc..b8d4b96d2 100644 --- a/stdlib/source/test/lux/control/continuation.lux +++ b/stdlib/source/test/lux/control/continuation.lux @@ -12,7 +12,7 @@ [number ["." nat]] [text - format] + ["%" format (#+ format)]] [collection ["." list]]] [math @@ -31,7 +31,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Cont))) + (<| (_.context (%.name (name-of /.Cont))) (do r.monad [sample r.nat #let [(^open "_;.") /.apply diff --git a/stdlib/source/test/lux/control/exception.lux b/stdlib/source/test/lux/control/exception.lux index 7b7d90dbf..46d495a4b 100644 --- a/stdlib/source/test/lux/control/exception.lux +++ b/stdlib/source/test/lux/control/exception.lux @@ -3,7 +3,7 @@ [abstract/monad (#+ do)] [data [text - format]] + ["%" format (#+ format)]]] [math ["r" random]] ["_" test (#+ Test)]] @@ -17,7 +17,7 @@ (do r.monad [right r.nat wrong (r.filter (|>> (n/= right) not) r.nat)] - (<| (_.context (%name (name-of /.Exception))) + (<| (_.context (%.name (name-of /.Exception))) ($_ _.and (_.test "Can catch exceptions." (n/= right diff --git a/stdlib/source/test/lux/control/io.lux b/stdlib/source/test/lux/control/io.lux index 1a14558b2..4e000d39c 100644 --- a/stdlib/source/test/lux/control/io.lux +++ b/stdlib/source/test/lux/control/io.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] ["r" math/random] [abstract @@ -26,7 +26,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.IO))) + (<| (_.context (%.name (name-of /.IO))) (do r.monad [sample r.nat exit-code r.int] diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux index 6e1845d15..d9ea8865b 100644 --- a/stdlib/source/test/lux/control/parser.lux +++ b/stdlib/source/test/lux/control/parser.lux @@ -17,7 +17,7 @@ [number ["." nat]] ["." text ("#;." equivalence) - format] + ["%" format (#+ format)]] [collection ["." list ("#;." functor)]]] [math @@ -226,7 +226,7 @@ Test (do r.monad [assertion (r.ascii 1)] - (<| (_.context (%name (name-of /.Parser))) + (<| (_.context (%.name (name-of /.Parser))) ($_ _.and ($functor.spec ..injection ..comparison /.functor) ($apply.spec ..injection ..comparison /.apply) diff --git a/stdlib/source/test/lux/control/parser/cli.lux b/stdlib/source/test/lux/control/parser/cli.lux index aab4c5158..5c87513d4 100644 --- a/stdlib/source/test/lux/control/parser/cli.lux +++ b/stdlib/source/test/lux/control/parser/cli.lux @@ -1,7 +1,6 @@ (.module: [lux #* [data - text/format ["." name]] ["M" abstract/monad (#+ Monad do)] ["_" test (#+ Test)] diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux index ae2c448c7..b263a20b6 100644 --- a/stdlib/source/test/lux/control/parser/text.lux +++ b/stdlib/source/test/lux/control/parser/text.lux @@ -1,7 +1,6 @@ (.module: [lux #* [data - text/format ["." name]] ["_" test (#+ Test)] [abstract/monad (#+ do)] diff --git a/stdlib/source/test/lux/control/pipe.lux b/stdlib/source/test/lux/control/pipe.lux index 9b4110a39..4d4e03a79 100644 --- a/stdlib/source/test/lux/control/pipe.lux +++ b/stdlib/source/test/lux/control/pipe.lux @@ -7,7 +7,7 @@ ["." identity] ["." name] ["." text ("#@." equivalence) - format]] + ["%" format (#+ format)]]] [math ["r" random]]] {1 @@ -69,16 +69,16 @@ (_.test "Execution." (n/= (n/* 10 sample) (|> sample - (exec> [%n (format "sample = ") log!]) + (exec> [%.nat (format "sample = ") log!]) (n/* 10)))) (_.test "Tuple." (let [[left middle right] (|> sample (tuple> [inc] [dec] - [%n]))] + [%.nat]))] (and (n/= (inc sample) left) (n/= (dec sample) middle) - (text@= (%n sample) right)))) + (text@= (%.nat sample) right)))) (_.test "Pattern-matching." (text@= (case (n/% 10 sample) 0 "zero" diff --git a/stdlib/source/test/lux/control/reader.lux b/stdlib/source/test/lux/control/reader.lux index 94aacdb5d..49cb23a48 100644 --- a/stdlib/source/test/lux/control/reader.lux +++ b/stdlib/source/test/lux/control/reader.lux @@ -10,7 +10,7 @@ ["$." monad]]}] [data [text - format]] + ["%" format (#+ format)]]] [math ["r" random]]] {1 @@ -30,7 +30,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [sample r.nat factor r.nat] diff --git a/stdlib/source/test/lux/control/region.lux b/stdlib/source/test/lux/control/region.lux index 57ed91c1a..25ea20ab3 100644 --- a/stdlib/source/test/lux/control/region.lux +++ b/stdlib/source/test/lux/control/region.lux @@ -6,7 +6,7 @@ [data ["." error (#+ Error)] [text - format] + ["%" format (#+ format)]] [collection ["." list]]] [math @@ -35,7 +35,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [expected-clean-ups (|> r.nat (:: @ map (|>> (n/% 100) (n/max 1))))] ($_ _.and diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux index 6fbcea774..edbacddd6 100644 --- a/stdlib/source/test/lux/control/security/policy.lux +++ b/stdlib/source/test/lux/control/security/policy.lux @@ -15,8 +15,7 @@ ["!" capability]]] [data ["." name] - ["." text ("#@." equivalence) - format]] + ["." text ("#@." equivalence)]] [math ["r" random]]] {1 diff --git a/stdlib/source/test/lux/control/state.lux b/stdlib/source/test/lux/control/state.lux index 96f9e9d34..778162d61 100644 --- a/stdlib/source/test/lux/control/state.lux +++ b/stdlib/source/test/lux/control/state.lux @@ -14,7 +14,7 @@ [data ["." product] [text - format]] + ["%" format (#+ format)]]] [math ["r" random]]] {1 @@ -119,7 +119,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.State))) + (<| (_.context (%.name (name-of /.State))) ($_ _.and (<| (_.context "Basics.") ..basics) diff --git a/stdlib/source/test/lux/control/thread.lux b/stdlib/source/test/lux/control/thread.lux index 56d3a7d5c..84bcfbcd4 100644 --- a/stdlib/source/test/lux/control/thread.lux +++ b/stdlib/source/test/lux/control/thread.lux @@ -10,7 +10,7 @@ ["$." monad]]}] [data [text - format]] + ["%" format (#+ format)]]] [math ["r" random]]] {1 @@ -30,7 +30,7 @@ (do r.monad [original r.nat factor r.nat] - (<| (_.context (%name (name-of /.Thread))) + (<| (_.context (%.name (name-of /.Thread))) ($_ _.and ($functor.spec ..injection ..comparison /.functor) ($apply.spec ..injection ..comparison /.apply) diff --git a/stdlib/source/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux index a95384fef..5f510d6c0 100644 --- a/stdlib/source/test/lux/control/writer.lux +++ b/stdlib/source/test/lux/control/writer.lux @@ -15,7 +15,7 @@ [data ["." product] ["." text ("#;." equivalence) - format]] + ["%" format (#+ format)]]] [math ["r" random]]] {1 @@ -36,7 +36,7 @@ [log (r.ascii 1) left r.nat right r.nat] - (<| (_.context (%name (name-of /.Writer))) + (<| (_.context (%.name (name-of /.Writer))) ($_ _.and ($functor.spec (..injection text.monoid) ..comparison /.functor) ($apply.spec (..injection text.monoid) ..comparison (/.apply text.monoid)) diff --git a/stdlib/source/test/lux/data/bit.lux b/stdlib/source/test/lux/data/bit.lux index eebca5f2a..7dda82016 100644 --- a/stdlib/source/test/lux/data/bit.lux +++ b/stdlib/source/test/lux/data/bit.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] ["r" math/random] [abstract @@ -17,7 +17,7 @@ (def: #export test Test - (<| (_.context (%name (name-of .Bit))) + (<| (_.context (%.name (name-of .Bit))) (do r.monad [value r.bit] ($_ _.and diff --git a/stdlib/source/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux index c210a9163..50b1fcc71 100644 --- a/stdlib/source/test/lux/data/collection/array.lux +++ b/stdlib/source/test/lux/data/collection/array.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do Monad)] @@ -34,7 +34,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Array))) + (<| (_.context (%.name (name-of /.Array))) (do r.monad [size bounded-size] ($_ _.and diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux index 4b9743912..b0f4dec0e 100644 --- a/stdlib/source/test/lux/data/collection/bits.lux +++ b/stdlib/source/test/lux/data/collection/bits.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -27,7 +27,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ($equivalence.spec /.equivalence ..bits) (do r.monad diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux index 863c47973..4512c0bec 100644 --- a/stdlib/source/test/lux/data/collection/dictionary.lux +++ b/stdlib/source/test/lux/data/collection/dictionary.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -26,7 +26,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Dictionary))) + (<| (_.context (%.name (name-of /.Dictionary))) (do r.monad [#let [capped-nat (:: r.monad map (n/% 100) r.nat)] size capped-nat diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index 57dab9884..28119cd93 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -39,7 +39,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Dictionary))) + (<| (_.context (%.name (name-of /.Dictionary))) (do r.monad [size (|> r.nat (:: @ map (n/% 100))) keys (r.set nat.hash size r.nat) diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index fb97c3d32..77d473fd6 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -64,7 +64,7 @@ (def: #export test Test - (<| (_.context (%name (name-of .List))) + (<| (_.context (%.name (name-of .List))) (do r.monad [size bounded-size #let [(^open "/@.") (/.equivalence nat.equivalence) diff --git a/stdlib/source/test/lux/data/collection/queue.lux b/stdlib/source/test/lux/data/collection/queue.lux index 506cf15e3..f9a32c0c8 100644 --- a/stdlib/source/test/lux/data/collection/queue.lux +++ b/stdlib/source/test/lux/data/collection/queue.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -22,7 +22,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Queue))) + (<| (_.context (%.name (name-of /.Queue))) (do r.monad [size (:: @ map (n/% 100) r.nat) sample (r.queue size r.nat) diff --git a/stdlib/source/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux index 4c4f2923a..9464819a3 100644 --- a/stdlib/source/test/lux/data/collection/queue/priority.lux +++ b/stdlib/source/test/lux/data/collection/queue/priority.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract ["." monad (#+ do)]] @@ -26,7 +26,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Queue))) + (<| (_.context (%.name (name-of /.Queue))) (do r.monad [size (|> r.nat (:: @ map (n/% 100))) sample (..queue size) diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux index 15085776b..7afbafd59 100644 --- a/stdlib/source/test/lux/data/collection/row.lux +++ b/stdlib/source/test/lux/data/collection/row.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -25,7 +25,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [size (|> r.nat (:: @ map (|>> (n/% 100) (n/max 10))))] ($_ _.and @@ -43,35 +43,35 @@ non-member (|> r.nat (r.filter (|>> (/.member? nat.equivalence sample) not))) #let [(^open "/@.") (/.equivalence nat.equivalence)]] ($_ _.and - (_.test (format (%name (name-of /.size)) - " " (%name (name-of /.empty?))) + (_.test (format (%.name (name-of /.size)) + " " (%.name (name-of /.empty?))) (if (/.empty? sample) (and (n/= 0 size) (n/= 0 (/.size sample))) (n/= size (/.size sample)))) - (_.test (format (%name (name-of /.add)) - " " (%name (name-of /.pop))) + (_.test (format (%.name (name-of /.add)) + " " (%.name (name-of /.pop))) (and (n/= (inc size) (/.size (/.add non-member sample))) (n/= (dec size) (/.size (/.pop sample))))) - (_.test (format (%name (name-of /.put)) - " " (%name (name-of /.nth))) + (_.test (format (%.name (name-of /.put)) + " " (%.name (name-of /.nth))) (|> sample (/.put idx non-member) (/.nth idx) maybe.assume (is? non-member))) - (_.test (%name (name-of /.update)) + (_.test (%.name (name-of /.update)) (|> sample (/.put idx non-member) (/.update idx inc) (/.nth idx) maybe.assume (n/= (inc non-member)))) - (_.test (format (%name (name-of /.to-list)) - " " (%name (name-of /.from-list))) + (_.test (format (%.name (name-of /.to-list)) + " " (%.name (name-of /.from-list))) (|> sample /.to-list /.from-list (/@= sample))) - (_.test (%name (name-of /.member?)) + (_.test (%.name (name-of /.member?)) (and (not (/.member? nat.equivalence sample non-member)) (/.member? nat.equivalence (/.add non-member sample) non-member))) - (_.test (%name (name-of /.reverse)) + (_.test (%.name (name-of /.reverse)) (and (not (/@= sample (/.reverse sample))) (/@= sample diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux index 19926ca92..2beb3599f 100644 --- a/stdlib/source/test/lux/data/collection/sequence.lux +++ b/stdlib/source/test/lux/data/collection/sequence.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract comonad @@ -20,7 +20,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Sequence))) + (<| (_.context (%.name (name-of /.Sequence))) (do r.monad [size (|> r.nat (:: @ map (|>> (n/% 100) (n/max 2)))) offset (|> r.nat (:: @ map (n/% 100))) diff --git a/stdlib/source/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux index f272cf305..6e668af56 100644 --- a/stdlib/source/test/lux/data/collection/set.lux +++ b/stdlib/source/test/lux/data/collection/set.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -25,7 +25,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Set))) + (<| (_.context (%.name (name-of /.Set))) (do r.monad [size gen-nat] ($_ _.and diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux index 4bddfaf33..fa7c00798 100644 --- a/stdlib/source/test/lux/data/collection/set/ordered.lux +++ b/stdlib/source/test/lux/data/collection/set/ordered.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -39,7 +39,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Set))) + (<| (_.context (%.name (name-of /.Set))) ($_ _.and (do r.monad [size gen-nat] diff --git a/stdlib/source/test/lux/data/collection/stack.lux b/stdlib/source/test/lux/data/collection/stack.lux index 05b8efc47..74ddf6c86 100644 --- a/stdlib/source/test/lux/data/collection/stack.lux +++ b/stdlib/source/test/lux/data/collection/stack.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -28,7 +28,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [size gen-nat sample (r.stack size gen-nat) @@ -37,13 +37,13 @@ ($equivalence.spec (/.equivalence nat.equivalence) (r.stack size r.nat)) ($functor.spec ..injection /.equivalence /.functor) - (_.test (%name (name-of /.size)) + (_.test (%.name (name-of /.size)) (n/= size (/.size sample))) - (_.test (%name (name-of /.peek)) + (_.test (%.name (name-of /.peek)) (case (/.peek sample) #.None (/.empty? sample) (#.Some _) (not (/.empty? sample)))) - (_.test (%name (name-of /.pop)) + (_.test (%.name (name-of /.pop)) (case (/.size sample) 0 (case (/.pop sample) #.None @@ -58,7 +58,7 @@ #.None false))) - (_.test (%name (name-of /.push)) + (_.test (%.name (name-of /.push)) (and (is? sample (|> sample (/.push new-top) /.pop maybe.assume)) (n/= (inc (/.size sample)) diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux index 65b46e382..1506494c8 100644 --- a/stdlib/source/test/lux/data/collection/tree.lux +++ b/stdlib/source/test/lux/data/collection/tree.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -47,7 +47,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Tree))) + (<| (_.context (%.name (name-of /.Tree))) (do r.monad [size (:: @ map (|>> (n/% 100) (n/+ 1)) r.nat)] ($_ _.and diff --git a/stdlib/source/test/lux/data/collection/tree/zipper.lux b/stdlib/source/test/lux/data/collection/tree/zipper.lux index f4b812420..71d5a71cd 100644 --- a/stdlib/source/test/lux/data/collection/tree/zipper.lux +++ b/stdlib/source/test/lux/data/collection/tree/zipper.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract/monad (#+ do Monad)] [control @@ -22,7 +22,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Zipper))) + (<| (_.context (%.name (name-of /.Zipper))) (do r.monad [size (:: @ map (|>> (n/% 90) (n/+ 10)) r.nat) sample (//.tree size r.nat) diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux index a8a61cb46..86abba0a3 100644 --- a/stdlib/source/test/lux/data/color.lux +++ b/stdlib/source/test/lux/data/color.lux @@ -7,7 +7,7 @@ [/ ["$." equivalence]]}] [data - text/format + ["%" text/format (#+ format)] [number ["." frac ("#@." number)]]] ["." math @@ -52,7 +52,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [any ..color colorful (|> color diff --git a/stdlib/source/test/lux/data/error.lux b/stdlib/source/test/lux/data/error.lux index f65128ec3..340b4b73b 100644 --- a/stdlib/source/test/lux/data/error.lux +++ b/stdlib/source/test/lux/data/error.lux @@ -13,7 +13,7 @@ pipe ["." io]] [data - text/format + ["%" text/format (#+ format)] [number ["." nat]]] [math @@ -38,7 +38,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ($equivalence.spec (/.equivalence nat.equivalence) (..error r.nat)) ($functor.spec ..injection ..comparison /.functor) diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index c2826143a..61cf67a6c 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract codec @@ -63,7 +63,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ($equivalence.spec /.equivalence ..json) ($codec.spec /.equivalence /.codec ..json) diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux index 0ad940971..6ca73269a 100644 --- a/stdlib/source/test/lux/data/format/xml.lux +++ b/stdlib/source/test/lux/data/format/xml.lux @@ -1,6 +1,6 @@ (.module: [lux (#- char) - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ Monad do)] @@ -66,7 +66,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.XML))) + (<| (_.context (%.name (name-of /.XML))) ($_ _.and ($equivalence.spec /.equivalence ..xml) ($codec.spec /.equivalence /.codec ..xml) diff --git a/stdlib/source/test/lux/data/identity.lux b/stdlib/source/test/lux/data/identity.lux index 3d0ae44c2..cd9f480fa 100644 --- a/stdlib/source/test/lux/data/identity.lux +++ b/stdlib/source/test/lux/data/identity.lux @@ -13,7 +13,7 @@ ["$." monad]]}] [data ["." text ("#@." monoid equivalence) - format]]] + ["%" format (#+ format)]]]] {1 ["." / (#+ Identity)]}) @@ -28,7 +28,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Identity))) + (<| (_.context (%.name (name-of /.Identity))) ($_ _.and ($functor.spec ..injection ..comparison /.functor) ($apply.spec ..injection ..comparison /.apply) diff --git a/stdlib/source/test/lux/data/lazy.lux b/stdlib/source/test/lux/data/lazy.lux index 62b1273e4..cfc096326 100644 --- a/stdlib/source/test/lux/data/lazy.lux +++ b/stdlib/source/test/lux/data/lazy.lux @@ -10,7 +10,7 @@ ["$." monad] ["$." equivalence]]}] [data - text/format + ["%" text/format (#+ format)] [number ["." nat]]] [math @@ -33,7 +33,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Lazy))) + (<| (_.context (%.name (name-of /.Lazy))) (do r.monad [left r.nat right r.nat diff --git a/stdlib/source/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux index a92141bd9..60d154a7a 100644 --- a/stdlib/source/test/lux/data/maybe.lux +++ b/stdlib/source/test/lux/data/maybe.lux @@ -14,7 +14,7 @@ pipe] [data ["." text - format] + ["%" format (#+ format)]] [number ["." nat]]] [math @@ -28,7 +28,7 @@ (def: #export test Test - (<| (_.context (%name (name-of .Maybe))) + (<| (_.context (%.name (name-of .Maybe))) ($_ _.and ($equivalence.spec (/.equivalence nat.equivalence) (..maybe r.nat)) ($functor.spec /@wrap /.equivalence /.functor) diff --git a/stdlib/source/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux index d9ee517d0..63acad50b 100644 --- a/stdlib/source/test/lux/data/name.lux +++ b/stdlib/source/test/lux/data/name.lux @@ -11,7 +11,7 @@ pipe] [data ["." text ("#@." equivalence) - format]] + ["%" format (#+ format)]]] [math ["r" random (#+ Random)]]] {1 @@ -28,7 +28,7 @@ (def: #export test Test - (<| (_.context (%name (name-of .Name))) + (<| (_.context (%.name (name-of .Name))) (do r.monad [## First Name sizeM1 (|> r.nat (:: @ map (n/% 100))) diff --git a/stdlib/source/test/lux/data/number/complex.lux b/stdlib/source/test/lux/data/number/complex.lux index 644db8e27..6d7689582 100644 --- a/stdlib/source/test/lux/data/number/complex.lux +++ b/stdlib/source/test/lux/data/number/complex.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -193,7 +193,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ..construction ..absolute-value diff --git a/stdlib/source/test/lux/data/number/frac.lux b/stdlib/source/test/lux/data/number/frac.lux index 544ab858c..e683fb134 100644 --- a/stdlib/source/test/lux/data/number/frac.lux +++ b/stdlib/source/test/lux/data/number/frac.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -20,20 +20,20 @@ (def: #export test Test (let [gen-frac (:: r.monad map (|>> (i/% +100) .int-to-frac) r.int)] - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (`` ($_ _.and ($equivalence.spec /.equivalence gen-frac) ($order.spec /.order gen-frac) ($number.spec /.order /.number gen-frac) (~~ (template [<monoid>] - [(<| (_.context (%name (name-of <monoid>))) + [(<| (_.context (%.name (name-of <monoid>))) ($monoid.spec /.equivalence <monoid> gen-frac))] [/.addition] [/.multiplication] [/.minimum] [/.maximum] )) ## TODO: Uncomment ASAP ## (~~ (template [<codec>] - ## [(<| (_.context (%name (name-of /.binary))) + ## [(<| (_.context (%.name (name-of /.binary))) ## ($codec.spec /.equivalence <codec> gen-frac))] ## [/.binary] [/.octal] [/.decimal] [/.hex] @@ -48,6 +48,6 @@ (hex "+dead,BE.EF")))) (do r.monad [sample gen-frac] - (_.test (format (%name (name-of /.frac-to-bits)) " " (%name (name-of /.bits-to-frac))) + (_.test (format (%.name (name-of /.frac-to-bits)) " " (%.name (name-of /.bits-to-frac))) (|> sample /.frac-to-bits /.bits-to-frac (f/= sample)))) ))))) diff --git a/stdlib/source/test/lux/data/number/i64.lux b/stdlib/source/test/lux/data/number/i64.lux index 1519b1e48..c4124669b 100644 --- a/stdlib/source/test/lux/data/number/i64.lux +++ b/stdlib/source/test/lux/data/number/i64.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -16,7 +16,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [pattern r.nat idx (:: @ map (n/% /.width) r.nat)] diff --git a/stdlib/source/test/lux/data/number/int.lux b/stdlib/source/test/lux/data/number/int.lux index 5b0d523ae..4fa93051b 100644 --- a/stdlib/source/test/lux/data/number/int.lux +++ b/stdlib/source/test/lux/data/number/int.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -21,7 +21,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (`` ($_ _.and ($equivalence.spec /.equivalence r.int) ($order.spec /.order r.int) @@ -29,13 +29,13 @@ ($enum.spec /.enum r.int) ($interval.spec /.interval r.int) (~~ (template [<monoid>] - [(<| (_.context (%name (name-of <monoid>))) + [(<| (_.context (%.name (name-of <monoid>))) ($monoid.spec /.equivalence <monoid> r.int))] [/.addition] [/.multiplication] [/.minimum] [/.maximum] )) (~~ (template [<codec>] - [(<| (_.context (%name (name-of /.binary))) + [(<| (_.context (%.name (name-of /.binary))) ($codec.spec /.equivalence <codec> r.int))] [/.binary] [/.octal] [/.decimal] [/.hex] diff --git a/stdlib/source/test/lux/data/number/nat.lux b/stdlib/source/test/lux/data/number/nat.lux index 4c46b4b0c..dda227223 100644 --- a/stdlib/source/test/lux/data/number/nat.lux +++ b/stdlib/source/test/lux/data/number/nat.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -21,7 +21,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (`` ($_ _.and ($equivalence.spec /.equivalence r.nat) ($order.spec /.order r.nat) @@ -29,13 +29,13 @@ ($enum.spec /.enum r.nat) ($interval.spec /.interval r.nat) (~~ (template [<monoid>] - [(<| (_.context (%name (name-of <monoid>))) + [(<| (_.context (%.name (name-of <monoid>))) ($monoid.spec /.equivalence <monoid> r.nat))] [/.addition] [/.multiplication] [/.minimum] [/.maximum] )) (~~ (template [<codec>] - [(<| (_.context (%name (name-of /.binary))) + [(<| (_.context (%.name (name-of /.binary))) ($codec.spec /.equivalence <codec> r.nat))] [/.binary] [/.octal] [/.decimal] [/.hex] diff --git a/stdlib/source/test/lux/data/number/ratio.lux b/stdlib/source/test/lux/data/number/ratio.lux index f0ce55751..160a4fa53 100644 --- a/stdlib/source/test/lux/data/number/ratio.lux +++ b/stdlib/source/test/lux/data/number/ratio.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -29,13 +29,13 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (`` ($_ _.and ($equivalence.spec /.equivalence ..ratio) ($order.spec /.order ..ratio) ($number.spec /.order /.number ..ratio) (~~ (template [<monoid>] - [(<| (_.context (%name (name-of <monoid>))) + [(<| (_.context (%.name (name-of <monoid>))) ($monoid.spec /.equivalence <monoid> ..ratio))] [/.addition] [/.multiplication] diff --git a/stdlib/source/test/lux/data/number/rev.lux b/stdlib/source/test/lux/data/number/rev.lux index 308861368..9b25ae6af 100644 --- a/stdlib/source/test/lux/data/number/rev.lux +++ b/stdlib/source/test/lux/data/number/rev.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -25,20 +25,20 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (`` ($_ _.and ($equivalence.spec /.equivalence r.rev) ($order.spec /.order r.rev) ($enum.spec /.enum r.rev) ($interval.spec /.interval r.rev) (~~ (template [<monoid>] - [(<| (_.context (%name (name-of <monoid>))) + [(<| (_.context (%.name (name-of <monoid>))) ($monoid.spec /.equivalence <monoid> r.rev))] [/.addition] [/.minimum] [/.maximum] )) (~~ (template [<codec>] - [(<| (_.context (%name (name-of /.binary))) + [(<| (_.context (%.name (name-of /.binary))) ($codec.spec /.equivalence <codec> r.rev))] [/.binary] [/.octal] [/.decimal] [/.hex] diff --git a/stdlib/source/test/lux/data/product.lux b/stdlib/source/test/lux/data/product.lux index 5e28aaf5e..b7522077c 100644 --- a/stdlib/source/test/lux/data/product.lux +++ b/stdlib/source/test/lux/data/product.lux @@ -1,13 +1,13 @@ (.module: [lux #* ["_" test (#+ Test)] - data/text/format] + ["%" data/text/format (#+ format)]] {1 ["." /]}) (def: #export test Test - (<| (_.context (%name (name-of .&))) + (<| (_.context (%.name (name-of .&))) ($_ _.and (_.test "Can access the sides of a pair." (and (i/= +1 (/.left [+1 +2])) diff --git a/stdlib/source/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux index 2a7fa889e..29e02de04 100644 --- a/stdlib/source/test/lux/data/sum.lux +++ b/stdlib/source/test/lux/data/sum.lux @@ -1,7 +1,7 @@ (.module: [lux #* ["_" test (#+ Test)] - data/text/format + ["%" data/text/format (#+ format)] [control pipe] [data @@ -13,7 +13,7 @@ (def: #export test Test - (<| (_.context (%name (name-of .|))) + (<| (_.context (%.name (name-of .|))) (let [(^open "list/.") (list.equivalence text.equivalence)] ($_ _.and (_.test "Can inject values into Either." diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux index 20ad838b7..8adabf715 100644 --- a/stdlib/source/test/lux/data/text.lux +++ b/stdlib/source/test/lux/data/text.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do Monad)] @@ -25,7 +25,7 @@ (def: #export test Test - (<| (_.context (%name (name-of .Text))) + (<| (_.context (%.name (name-of .Text))) ($_ _.and ($equivalence.spec /.equivalence (r.ascii 2)) ($order.spec /.order (r.ascii 2)) diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux index 03f1e2f9c..61e1df77a 100644 --- a/stdlib/source/test/lux/data/text/regex.lux +++ b/stdlib/source/test/lux/data/text/regex.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract/monad (#+ do)] [control @@ -292,7 +292,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.regex))) + (<| (_.context (%.name (name-of /.regex))) ($_ _.and ..basics ..system-character-classes diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/macro.lux index acd4bcdac..bc5ed349c 100644 --- a/stdlib/source/test/lux/macro.lux +++ b/stdlib/source/test/lux/macro.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random (#+ Random)] ["_" test (#+ Test)]] @@ -17,7 +17,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and /code.test /syntax.test diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux index c8d0b8077..f395c5509 100644 --- a/stdlib/source/test/lux/macro/code.lux +++ b/stdlib/source/test/lux/macro/code.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] @@ -11,7 +11,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [bit r.bit nat r.nat @@ -35,17 +35,17 @@ (and (text@= <text> (/.to-text code)) (:: /.equivalence = code code))))] - ["bit" (/.bit bit) (%b bit)] - ["nat" (/.nat nat) (%n nat)] - ["int" (/.int int) (%i int)] - ["rev" (/.rev rev) (%r rev)] - ["frac" (/.frac frac) (%f frac)] - ["text" (/.text text) (%t text)] + ["bit" (/.bit bit) (%.bit bit)] + ["nat" (/.nat nat) (%.nat nat)] + ["int" (/.int int) (%.int int)] + ["rev" (/.rev rev) (%.rev rev)] + ["frac" (/.frac frac) (%.frac frac)] + ["text" (/.text text) (%.text text)] ["local-ltag" (/.local-tag short) (format "#" short)] - ["lag" (/.tag [module short]) (format "#" (%name name))] + ["lag" (/.tag [module short]) (format "#" (%.name name))] ["local-identifier" (/.local-identifier short) short] - ["identifier" (/.identifier [module short]) (%name name)] - ["form" (/.form (list (/.bit bit) (/.int int))) (format "(" (%b bit) " " (%i int) ")")] - ["tuple" (/.tuple (list (/.bit bit) (/.int int))) (format "[" (%b bit) " " (%i int) "]")] - ["record" (/.record (list [(/.bit bit) (/.int int)])) (format "{" (%b bit) " " (%i int) "}")] + ["identifier" (/.identifier [module short]) (%.name name)] + ["form" (/.form (list (/.bit bit) (/.int int))) (format "(" (%.bit bit) " " (%.int int) ")")] + ["tuple" (/.tuple (list (/.bit bit) (/.int int))) (format "[" (%.bit bit) " " (%.int int) "]")] + ["record" (/.record (list [(/.bit bit) (/.int int)])) (format "{" (%.bit bit) " " (%.int int) "}")] ))))))) diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux index 4024d0a89..ef46b9063 100644 --- a/stdlib/source/test/lux/macro/poly/equivalence.lux +++ b/stdlib/source/test/lux/macro/poly/equivalence.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] [abstract/monad (#+ do)] @@ -65,7 +65,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [sample gen-record #let [(^open "/@.") ..equivalence]] diff --git a/stdlib/source/test/lux/macro/poly/functor.lux b/stdlib/source/test/lux/macro/poly/functor.lux index 7f47148ab..4eb05af3c 100644 --- a/stdlib/source/test/lux/macro/poly/functor.lux +++ b/stdlib/source/test/lux/macro/poly/functor.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] @@ -20,6 +20,6 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (_.test "Can derive functors automatically." #1))) diff --git a/stdlib/source/test/lux/macro/poly/json.lux b/stdlib/source/test/lux/macro/poly/json.lux index 78ed58a9a..469c2c2f2 100644 --- a/stdlib/source/test/lux/macro/poly/json.lux +++ b/stdlib/source/test/lux/macro/poly/json.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract codec @@ -112,6 +112,6 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (<| (_.seed 14562075782602945288) ($codec.spec ..equivalence ..codec gen-record)))) diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux index 65e0c1280..b09f45b1d 100644 --- a/stdlib/source/test/lux/macro/syntax.lux +++ b/stdlib/source/test/lux/macro/syntax.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux index cee41346a..88dc6d420 100644 --- a/stdlib/source/test/lux/math.lux +++ b/stdlib/source/test/lux/math.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] ["r" math/random (#+ Random)] [abstract/monad (#+ Monad do)] @@ -31,7 +31,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and (<| (_.context "Trigonometry") (do r.monad diff --git a/stdlib/source/test/lux/math/infix.lux b/stdlib/source/test/lux/math/infix.lux index 5224700a5..bbad48621 100644 --- a/stdlib/source/test/lux/math/infix.lux +++ b/stdlib/source/test/lux/math/infix.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random] ["_" test (#+ Test)] @@ -12,7 +12,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [subject r.nat parameter r.nat diff --git a/stdlib/source/test/lux/math/logic/continuous.lux b/stdlib/source/test/lux/math/logic/continuous.lux index 82ad36be0..6895060c1 100644 --- a/stdlib/source/test/lux/math/logic/continuous.lux +++ b/stdlib/source/test/lux/math/logic/continuous.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random] ["_" test (#+ Test)]] @@ -9,7 +9,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [left r.rev right r.rev] diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux index 64051ffd9..3d21a1f21 100644 --- a/stdlib/source/test/lux/math/logic/fuzzy.lux +++ b/stdlib/source/test/lux/math/logic/fuzzy.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] @@ -20,7 +20,7 @@ (template [<name> <desc> <hash> <gen> <triangle> <lt> <lte> <gt> <gte>] [(def: <name> Test - (<| (_.context (%name (name-of <triangle>))) + (<| (_.context (%.name (name-of <triangle>))) (do r.monad [values (r.set <hash> 3 <gen>) #let [[x y z] (case (set.to-list values) @@ -59,7 +59,7 @@ (template [<name> <desc> <hash> <gen> <trapezoid> <lt> <lte> <gt> <gte>] [(def: <name> Test - (<| (_.context (%name (name-of <trapezoid>))) + (<| (_.context (%.name (name-of <trapezoid>))) (do r.monad [values (r.set <hash> 4 <gen>) #let [[w x y z] (case (set.to-list values) @@ -116,24 +116,24 @@ right ..triangle sample r.rev] ($_ _.and - (_.test (%name (name-of /.union)) + (_.test (%.name (name-of /.union)) (let [combined (/.union left right) combined-membership (/.membership sample combined)] (and (r/>= (/.membership sample left) combined-membership) (r/>= (/.membership sample right) combined-membership)))) - (_.test (%name (name-of /.intersection)) + (_.test (%.name (name-of /.intersection)) (let [combined (/.intersection left right) combined-membership (/.membership sample combined)] (and (r/<= (/.membership sample left) combined-membership) (r/<= (/.membership sample right) combined-membership)))) - (_.test (%name (name-of /.complement)) + (_.test (%.name (name-of /.complement)) (r/= (/.membership sample left) (//.not (/.membership sample (/.complement left))))) - (_.test (%name (name-of /.difference)) + (_.test (%.name (name-of /.difference)) (r/<= (/.membership sample right) (/.membership sample (/.difference left right)))) )))) @@ -144,10 +144,10 @@ [#let [set-10 (set.from-list nat.hash (list.n/range 0 10))] sample (|> r.nat (:: @ map (n/% 20)))] ($_ _.and - (_.test (%name (name-of /.from-predicate)) + (_.test (%.name (name-of /.from-predicate)) (bit@= (r/= //.true (/.membership sample (/.from-predicate n/even?))) (n/even? sample))) - (_.test (%name (name-of /.from-set)) + (_.test (%.name (name-of /.from-set)) (bit@= (r/= //.true (/.membership sample (/.from-set set-10))) (set.member? set-10 sample))) ))) @@ -160,7 +160,7 @@ threshold r.rev #let [vip-fuzzy (/.cut threshold fuzzy) member? (/.to-predicate threshold fuzzy)]] - (<| (_.context (%name (name-of /.cut))) + (<| (_.context (%.name (name-of /.cut))) ($_ _.and (_.test "Can increase the threshold of membership of a fuzzy set." (bit@= (r/> //.false (/.membership sample vip-fuzzy)) @@ -172,7 +172,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ..rev-triangles ..rev-trapezoids diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux index 5d929527e..45c1b4b65 100644 --- a/stdlib/source/test/lux/math/modular.lux +++ b/stdlib/source/test/lux/math/modular.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] ["r" math/random] [abstract/monad (#+ do)] @@ -59,7 +59,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /.Mod))) + (<| (_.context (%.name (name-of /.Mod))) (do r.monad [_normalM modulusR _alternativeM (|> modulusR (r.filter (|>> (i/= _normalM) not))) diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux index acef6060f..da8eebbd9 100644 --- a/stdlib/source/test/lux/target/jvm.lux +++ b/stdlib/source/test/lux/target/jvm.lux @@ -10,7 +10,7 @@ [data ["." error (#+ Error)] ["." text - format] + ["%" format (#+ format)]] [format [".F" binary]] [collection @@ -43,7 +43,7 @@ ## (!.use (:: file over-write) bytecode))] ## (wrap (case outcome ## (#error.Success definition) -## (format "Wrote: " (%t file-path)) +## (format "Wrote: " (%.text file-path)) ## (#error.Failure error) ## error))))) diff --git a/stdlib/source/test/lux/time/date.lux b/stdlib/source/test/lux/time/date.lux index cd03bca37..325a5f3f3 100644 --- a/stdlib/source/test/lux/time/date.lux +++ b/stdlib/source/test/lux/time/date.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] [abstract @@ -23,7 +23,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ($equivalence.spec /.equivalence ..date) ($order.spec /.order ..date) diff --git a/stdlib/source/test/lux/time/day.lux b/stdlib/source/test/lux/time/day.lux index 4df0ad30b..ce57fc282 100644 --- a/stdlib/source/test/lux/time/day.lux +++ b/stdlib/source/test/lux/time/day.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract {[0 #test] @@ -25,7 +25,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ($equivalence.spec /.equivalence ..day) ($order.spec /.order ..day) diff --git a/stdlib/source/test/lux/time/duration.lux b/stdlib/source/test/lux/time/duration.lux index e63397b32..851267c59 100644 --- a/stdlib/source/test/lux/time/duration.lux +++ b/stdlib/source/test/lux/time/duration.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do)] @@ -23,7 +23,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ($equivalence.spec /.equivalence ..duration) ($order.spec /.order ..duration) diff --git a/stdlib/source/test/lux/time/instant.lux b/stdlib/source/test/lux/time/instant.lux index 24f7e7962..3e3e2ca8c 100644 --- a/stdlib/source/test/lux/time/instant.lux +++ b/stdlib/source/test/lux/time/instant.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract [monad (#+ do Monad)] @@ -32,7 +32,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ($equivalence.spec /.equivalence ..instant) ($order.spec /.order ..instant) diff --git a/stdlib/source/test/lux/time/month.lux b/stdlib/source/test/lux/time/month.lux index 7b0cb43d2..2c4c1c34f 100644 --- a/stdlib/source/test/lux/time/month.lux +++ b/stdlib/source/test/lux/time/month.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["_" test (#+ Test)] [abstract {[0 #test] @@ -30,7 +30,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and ($equivalence.spec /.equivalence ..month) ($order.spec /.order ..month) diff --git a/stdlib/source/test/lux/tool/compiler/default/syntax.lux b/stdlib/source/test/lux/tool/compiler/default/syntax.lux index d6aee7e37..a9744dfb6 100644 --- a/stdlib/source/test/lux/tool/compiler/default/syntax.lux +++ b/stdlib/source/test/lux/tool/compiler/default/syntax.lux @@ -2,7 +2,7 @@ [lux #* [abstract/monad (#+ do)] [data - text/format + ["%" text/format (#+ format)] ["." name]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] @@ -79,7 +79,7 @@ [sample code^] ($_ _.and (_.test "Can parse Lux code." - (case (let [source-code (%code sample)] + (case (let [source-code (%.code sample)] (/.parse "" (dictionary.new text.hash) (text.size source-code) [default-cursor 0 source-code])) (#.Left error) @@ -90,7 +90,7 @@ (do @ [other code^] (_.test "Can parse Lux multiple code nodes." - (let [source-code (format (%code sample) " " (%code other)) + (let [source-code (format (%.code sample) " " (%.code other)) source-code//size (text.size source-code)] (case (/.parse "" (dictionary.new text.hash) source-code//size [default-cursor 0 source-code]) @@ -128,7 +128,7 @@ comment comment^] ($_ _.and (_.test "Can handle comments." - (case (let [source-code (format comment (%code sample)) + (case (let [source-code (format comment (%.code sample)) source-code//size (text.size source-code)] (/.parse "" (dictionary.new text.hash) source-code//size [default-cursor 0 source-code])) diff --git a/stdlib/source/test/lux/tool/compiler/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/phase/analysis/case.lux index 6f5a324cd..30b446bb5 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/analysis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/analysis/case.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] [data - text/format + ["%" text/format (#+ format)] ["." name ("#@." equivalence)]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] diff --git a/stdlib/source/test/lux/tool/compiler/phase/analysis/function.lux b/stdlib/source/test/lux/tool/compiler/phase/analysis/function.lux index 252344cb6..08346c47b 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/analysis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/analysis/function.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] [data - text/format + ["%" text/format (#+ format)] ["." name ("#@." equivalence)]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] @@ -50,7 +50,7 @@ [outputT outputC] _primitive.primitive [inputT _] _primitive.primitive #let [g!arg (code.local-identifier arg-name)]] - (<| (_.context (%name (name-of /.function))) + (<| (_.context (%.name (name-of /.function))) ($_ _.and (_.test "Can analyse function." (and (|> (//type.with-type (All [a] (-> a outputT)) @@ -97,7 +97,7 @@ (type.function (#.Cons varT partial-poly-inputsT)) varT) dummy-function (#////analysis.Function (list) (#////analysis.Reference (////reference.local 1)))]] - (<| (_.context (%name (name-of /.apply))) + (<| (_.context (%.name (name-of /.apply))) ($_ _.and (_.test "Can analyse monomorphic type application." (|> (/.apply _primitive.phase funcT dummy-function (' []) inputsC) diff --git a/stdlib/source/test/lux/tool/compiler/phase/analysis/primitive.lux b/stdlib/source/test/lux/tool/compiler/phase/analysis/primitive.lux index 0b3990cf0..1a7aec26f 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/analysis/primitive.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/analysis/primitive.lux @@ -3,7 +3,7 @@ ["@" target] [abstract ["." monad (#+ do)]] [data - text/format + ["%" text/format (#+ format)] ["." name]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] @@ -65,8 +65,8 @@ (exception: (wrong-inference {expected Type} {inferred Type}) (exception.report - ["Expected" (%type expected)] - ["Inferred" (%type inferred)])) + ["Expected" (%.type expected)] + ["Inferred" (%.type inferred)])) (def: (infer expected-type analysis) (-> Type (Operation Analysis) (Error Analysis)) @@ -84,7 +84,7 @@ (def: #export test (<| (_.context (name.module (name-of /._))) (`` ($_ _.and - (_.test (%name (name-of #////analysis.Unit)) + (_.test (%.name (name-of #////analysis.Unit)) (|> (infer Any (..phase (' []))) (case> (^ (#error.Success (#////analysis.Primitive (#////analysis.Unit output)))) (is? [] output) @@ -94,7 +94,7 @@ (~~ (template [<type> <tag> <random> <constructor>] [(do r.monad [sample <random>] - (_.test (%name (name-of <tag>)) + (_.test (%.name (name-of <tag>)) (|> (infer <type> (..phase (<constructor> sample))) (case> (#error.Success (#////analysis.Primitive (<tag> output))) (is? sample output) diff --git a/stdlib/source/test/lux/tool/compiler/phase/analysis/reference.lux b/stdlib/source/test/lux/tool/compiler/phase/analysis/reference.lux index 842c23950..427e0dc2c 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/analysis/reference.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/analysis/reference.lux @@ -2,7 +2,6 @@ [lux #* [abstract ["." monad (#+ do)]] [data - text/format ["." name ("#@." equivalence)]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] diff --git a/stdlib/source/test/lux/tool/compiler/phase/analysis/structure.lux b/stdlib/source/test/lux/tool/compiler/phase/analysis/structure.lux index 7c7e9e52c..156965a55 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/analysis/structure.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/analysis/structure.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] [data - text/format + ["%" text/format (#+ format)] ["." name]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] @@ -125,7 +125,7 @@ (list.drop choice primitives))) [+valueT +valueC] (maybe.assume (list.nth +choice +primitives)) +variantT (type.variant (list@map product.left +primitives))]] - (<| (_.context (%name (name-of /.sum))) + (<| (_.context (%.name (name-of /.sum))) ($_ _.and (_.test "Can analyse." (check-sum variantT choice size @@ -174,7 +174,7 @@ (list [(#.Parameter 1) +valueC]) (list.drop choice primitives))) +tupleT (type.tuple (list@map product.left +primitives))]] - (<| (_.context (%name (name-of /.product))) + (<| (_.context (%.name (name-of /.product))) ($_ _.and (_.test "Can analyse." (|> (//type.with-type tupleT @@ -243,7 +243,7 @@ (type.univ-q 1)) choice-tag (maybe.assume (list.nth choice tags)) other-choice-tag (maybe.assume (list.nth other-choice tags))]] - (<| (_.context (%name (name-of /.tagged-sum))) + (<| (_.context (%.name (name-of /.tagged-sum))) ($_ _.and (_.test "Can infer." (|> (/.tagged-sum _primitive.phase [module-name choice-tag] choiceC) @@ -287,7 +287,7 @@ (list.drop (inc choice) primitivesT)))) (type.univ-q 1) (#.Named [module-name type-name]))]] - (<| (_.context (%name (name-of /.record))) + (<| (_.context (%.name (name-of /.record))) (_.test "Can infer." (|> (/.record _primitive.phase recordC) (check-record module-name tags monoT monoT size)))))) diff --git a/stdlib/source/test/lux/tool/compiler/phase/extension/analysis/lux.lux b/stdlib/source/test/lux/tool/compiler/phase/extension/analysis/lux.lux index e45656025..1b89d30d4 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/extension/analysis/lux.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/extension/analysis/lux.lux @@ -2,7 +2,7 @@ [lux (#- i64 int primitive) [abstract ["." monad (#+ do)]] [data - text/format + ["%" text/format (#+ format)] ["." name]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] @@ -117,7 +117,7 @@ (do r.monad [subjectC (|> r.safe-frac (:: @ map code.frac)) paramC (|> r.safe-frac (:: @ map code.frac)) - encodedC (|> r.safe-frac (:: @ map (|>> %f code.text)))] + encodedC (|> r.safe-frac (:: @ map (|>> %.frac code.text)))] ($_ _.and (_.test "Can add frac numbers." (check-success+ "lux f64 +" (list paramC subjectC) Frac)) diff --git a/stdlib/source/test/lux/tool/compiler/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/phase/synthesis/case.lux index ea2114509..b5a03fd9f 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/synthesis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/synthesis/case.lux @@ -2,7 +2,6 @@ [lux #* [abstract ["." monad (#+ do)]] [data - text/format ["." name]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] diff --git a/stdlib/source/test/lux/tool/compiler/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/phase/synthesis/function.lux index 5c6c3f3af..3ca60e77b 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/synthesis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/synthesis/function.lux @@ -2,7 +2,6 @@ [lux #* [abstract ["." monad (#+ do)]] [data - text/format ["." name]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] diff --git a/stdlib/source/test/lux/tool/compiler/phase/synthesis/primitive.lux b/stdlib/source/test/lux/tool/compiler/phase/synthesis/primitive.lux index d5683b14f..f54ace3d5 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/synthesis/primitive.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/synthesis/primitive.lux @@ -2,7 +2,7 @@ [lux (#- primitive) [abstract ["." monad (#+ do)]] [data - text/format + ["%" text/format (#+ format)] ["." name]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] @@ -57,12 +57,12 @@ (def: #export test Test - (<| (_.context (%name (name-of #////synthesis.Primitive))) + (<| (_.context (%.name (name-of #////synthesis.Primitive))) (`` ($_ _.and (~~ (template [<analysis> <synthesis> <generator>] [(do r.monad [expected <generator>] - (_.test (%name (name-of <synthesis>)) + (_.test (%.name (name-of <synthesis>)) (|> (#////analysis.Primitive (<analysis> expected)) //.phase (///.run [///bundle.empty ////synthesis.init]) diff --git a/stdlib/source/test/lux/tool/compiler/phase/synthesis/structure.lux b/stdlib/source/test/lux/tool/compiler/phase/synthesis/structure.lux index 4e7f6c3b5..0ea42a2a9 100644 --- a/stdlib/source/test/lux/tool/compiler/phase/synthesis/structure.lux +++ b/stdlib/source/test/lux/tool/compiler/phase/synthesis/structure.lux @@ -2,7 +2,7 @@ [lux #* [abstract ["." monad (#+ do)]] [data - text/format + ["%" text/format (#+ format)] ["." name]] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] @@ -68,7 +68,7 @@ (def: #export test Test - (<| (_.context (%name (name-of #////synthesis.Structure))) + (<| (_.context (%.name (name-of #////synthesis.Structure))) ($_ _.and ..variant ..tuple diff --git a/stdlib/source/test/lux/type.lux b/stdlib/source/test/lux/type.lux index 6840807f7..c3931c331 100644 --- a/stdlib/source/test/lux/type.lux +++ b/stdlib/source/test/lux/type.lux @@ -1,6 +1,6 @@ (.module: [lux (#- type) - data/text/format + ["%" data/text/format (#+ format)] ["M" abstract/monad (#+ do)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] @@ -51,7 +51,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and (do r.monad [sample ..type] @@ -152,7 +152,7 @@ ["existentially-quantified" /.ex-q /.flatten-ex-q] )) ))) - (_.test (%name (name-of /.:by-example)) + (_.test (%.name (name-of /.:by-example)) (let [example (: (Maybe Nat) #.None)] (/@= (.type (List Nat)) diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux index 9d511d5ae..d3d0570a1 100644 --- a/stdlib/source/test/lux/type/check.lux +++ b/stdlib/source/test/lux/type/check.lux @@ -1,6 +1,6 @@ (.module: [lux (#- type) - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] [abstract @@ -94,7 +94,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and (do r.monad [sample (|> ..type (r.filter valid-type?))] diff --git a/stdlib/source/test/lux/type/dynamic.lux b/stdlib/source/test/lux/type/dynamic.lux index 4e1bea6a8..5baccd9dc 100644 --- a/stdlib/source/test/lux/type/dynamic.lux +++ b/stdlib/source/test/lux/type/dynamic.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] [abstract/monad (#+ do)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] @@ -11,7 +11,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [expected r.nat #let [value (:dynamic expected)]] diff --git a/stdlib/source/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux index 372f544f7..34b8b68c9 100644 --- a/stdlib/source/test/lux/type/implicit.lux +++ b/stdlib/source/test/lux/type/implicit.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] [abstract/monad (#+ do)] @@ -18,7 +18,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [x r.nat y r.nat] diff --git a/stdlib/source/test/lux/type/resource.lux b/stdlib/source/test/lux/type/resource.lux index 92b085e6a..637f0a564 100644 --- a/stdlib/source/test/lux/type/resource.lux +++ b/stdlib/source/test/lux/type/resource.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] [abstract @@ -13,7 +13,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) ($_ _.and (_.test "Can produce and consume keys in an ordered manner." (<| (n/= (n/+ 123 456)) diff --git a/stdlib/source/test/lux/world/binary.lux b/stdlib/source/test/lux/world/binary.lux index a9817115d..8fb17114e 100644 --- a/stdlib/source/test/lux/world/binary.lux +++ b/stdlib/source/test/lux/world/binary.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random (#+ Random)] ["_" test (#+ Test)] [abstract @@ -53,7 +53,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [#let [gen-size (|> r.nat (:: @ map (|>> (n/% 100) (n/max 8))))] binary-size gen-size diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux index b72e8be82..c0c3f7d18 100644 --- a/stdlib/source/test/lux/world/file.lux +++ b/stdlib/source/test/lux/world/file.lux @@ -1,6 +1,6 @@ (.module: [lux #* - data/text/format + ["%" data/text/format (#+ format)] ["r" math/random (#+ Random) ("#@." monad)] ["_" test (#+ Test)] [abstract/monad (#+ do)] @@ -34,7 +34,7 @@ (def: (creation-and-deletion number) (-> Nat Test) (r@wrap (do promise.monad - [#let [path (format "temp_file_" (%n number))] + [#let [path (format "temp_file_" (%.nat number))] result (promise.future (do (error.with io.monad) [#let [check-existence! (: (IO (Error Bit)) @@ -53,7 +53,7 @@ (def: (read-and-write number data) (-> Nat Binary Test) (r@wrap (do promise.monad - [#let [path (format "temp_file_" (%n number))] + [#let [path (format "temp_file_" (%.nat number))] result (promise.future (do (error.with io.monad) [file (!.use (:: /.system create-file) path) @@ -66,7 +66,7 @@ (def: #export test Test - (<| (_.context (%name (name-of /._))) + (<| (_.context (%.name (name-of /._))) (do r.monad [file-size (|> r.nat (:: @ map (|>> (n/% 100) (n/max 10)))) dataL (_binary.binary file-size) |