diff options
| author | Eduardo Julian | 2020-12-02 06:42:20 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2020-12-02 06:42:20 -0400 |
| commit | 34e310622bdeb1d0588c0664c0e78cbaa84f837c (patch) | |
| tree | eb7c04185b57c781f45d0ccdb955bc9afc2aa8dc /stdlib/source/test | |
| parent | 982a19e0c5d57b53f9726b780fec4c18f0787b4f (diff) | |
Re-named "::" and ":::" macros to "\" and "\\", to be consistent with the convention that only macros that deal with types may start with a colon.
Diffstat (limited to 'stdlib/source/test')
136 files changed, 1137 insertions, 1137 deletions
diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux index 94fd9a5f0..6ba31f9b7 100644 --- a/stdlib/source/test/aedifex/artifact.lux +++ b/stdlib/source/test/aedifex/artifact.lux @@ -43,10 +43,10 @@ (do random.monad [sample ..random #let [fs (: (file.System Promise) - (file.mock (:: file.default separator)))]] + (file.mock (\ file.default separator)))]] (_.cover [/.uri /.path] (|> (/.path fs sample) - (text.replace-all uri.separator (:: fs separator)) + (text.replace-all uri.separator (\ fs separator)) (text\= (/.uri sample))))) /type.test diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux index 81d5fe136..7923eb8c5 100644 --- a/stdlib/source/test/aedifex/cache.lux +++ b/stdlib/source/test/aedifex/cache.lux @@ -58,7 +58,7 @@ (def: content (Random Binary) (do {! random.monad} - [content-size (:: ! map (n.% 100) random.nat)] + [content-size (\ ! map (n.% 100) random.nat)] (_binary.random content-size))) (def: package @@ -76,7 +76,7 @@ (do {! random.monad} [[main-dependency main-package] ..package dependencies (|> (//package.dependencies main-package) - (:: try.monad map set.to-list) + (\ try.monad map set.to-list) (try.default (list)) (monad.map ! (function (_ dependency) (do ! @@ -97,7 +97,7 @@ (do {! random.monad} [[dependency expected-package] ..package #let [fs (: (file.System Promise) - (file.mock (:: file.default separator)))]] + (file.mock (\ file.default separator)))]] (wrap (do promise.monad [wrote! (/.write-one fs dependency expected-package) read! (/.read-one fs dependency)] @@ -106,16 +106,16 @@ (do try.monad [_ wrote! actual-package read!] - (wrap (:: //package.equivalence = - (set@ #//package.origin #//package.Local expected-package) - actual-package))))))))) + (wrap (\ //package.equivalence = + (set@ #//package.origin #//package.Local expected-package) + actual-package))))))))) (def: plural Test (do {! random.monad} [expected ..resolution #let [fs (: (file.System Promise) - (file.mock (:: file.default separator)))]] + (file.mock (\ file.default separator)))]] (wrap (do promise.monad [wrote! (/.write-all fs expected) read! (/.read-all fs (dictionary.keys expected) //dependency/resolution.empty)] @@ -124,11 +124,11 @@ (do try.monad [_ wrote! actual read!] - (wrap (:: //dependency/resolution.equivalence = - (:: dictionary.functor map - (set@ #//package.origin #//package.Local) - expected) - actual))))))))) + (wrap (\ //dependency/resolution.equivalence = + (\ dictionary.functor map + (set@ #//package.origin #//package.Local) + expected) + actual))))))))) (def: #export test Test diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux index 5dacd4f16..805ccee03 100644 --- a/stdlib/source/test/aedifex/cli.lux +++ b/stdlib/source/test/aedifex/cli.lux @@ -74,7 +74,7 @@ (cli.run /.command) (case> (#try.Success [name actual]) (and (text\= //.default name) - (:: /.equivalence = expected actual)) + (\ /.equivalence = expected actual)) (#try.Failure error) false))))) @@ -91,7 +91,7 @@ (cli.run /.command) (case> (#try.Success [actual-profile actual-command]) (and (text\= expected-profile actual-profile) - (:: /.equivalence = expected-command actual-command)) + (\ /.equivalence = expected-command actual-command)) (#try.Failure error) false))))) diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux index 13039d9d3..5fad232b1 100644 --- a/stdlib/source/test/aedifex/command/auto.lux +++ b/stdlib/source/test/aedifex/command/auto.lux @@ -62,7 +62,7 @@ (#.Cons head tail) (do (try.with !) - [_ (!.use (:: fs create-file) [head])] + [_ (!.use (\ fs create-file) [head])] (do ! [_ (promise.future (atom.write [runs tail] @runs))] (wrap (#try.Success [])))))))])) @@ -71,7 +71,7 @@ Test (<| (_.covering /._) (do {! random.monad} - [#let [/ (:: file.default separator) + [#let [/ (\ file.default separator) [fs watcher] (watch.mock /) shell (shell.mock (function (_ [actual-environment actual-working-directory actual-command actual-arguments]) @@ -93,13 +93,13 @@ program (random.ascii/alpha 5) target (random.ascii/alpha 5) working-directory (random.ascii/alpha 5) - expected-runs (:: ! map (|>> (n.% 10) (n.max 2)) random.nat) + expected-runs (\ ! map (|>> (n.% 10) (n.max 2)) random.nat) source (random.ascii/alpha 5) dummy-files (|> (random.ascii/alpha 5) (random.set text.hash (dec expected-runs)) - (:: ! map (|>> set.to-list (list\map (|>> (format source /)))))) + (\ ! map (|>> set.to-list (list\map (|>> (format source /)))))) #let [empty-profile (: Profile - (:: ///.monoid identity)) + (\ ///.monoid identity)) with-target (: (-> Profile Profile) (set@ #///.target (#.Some target))) with-program (: (-> Profile Profile) @@ -128,8 +128,8 @@ #let [[@runs command] (..command end-signal dummy-files)]] (wrap (do promise.monad [verdict (do ///action.monad - [_ (!.use (:: fs create-directory) [source]) - _ (:: watcher poll []) + [_ (!.use (\ fs create-directory) [source]) + _ (\ watcher poll []) #let [resolution (|> ///dependency/resolution.empty (dictionary.put compiler-dependency compiler-package))]] (do promise.monad diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux index ad72b47c4..3b1802440 100644 --- a/stdlib/source/test/aedifex/command/build.lux +++ b/stdlib/source/test/aedifex/command/build.lux @@ -34,7 +34,7 @@ Test (<| (_.covering /._) (do {! random.monad} - [#let [fs (file.mock (:: file.default separator)) + [#let [fs (file.mock (\ file.default separator)) shell (shell.mock (function (_ [actual-environment actual-working-directory actual-command actual-arguments]) (#try.Success @@ -55,7 +55,7 @@ target (random.ascii/alpha 5) working-directory (random.ascii/alpha 5) #let [empty-profile (: Profile - (:: ///.monoid identity)) + (\ ///.monoid identity)) with-target (: (-> Profile Profile) (set@ #///.target (#.Some target))) with-program (: (-> Profile Profile) diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux index 7246d38a7..11570d034 100644 --- a/stdlib/source/test/aedifex/command/clean.lux +++ b/stdlib/source/test/aedifex/command/clean.lux @@ -42,7 +42,7 @@ (def: (files prefix) (-> Path (Random (List [Path Binary]))) (do {! random.monad} - [count (:: ! map (n.% 10) random.nat) + [count (\ ! map (n.% 10) random.nat) names (random.set text.hash count ..node-name) contents (random.list count (_binary.random 100))] (wrap (list.zip/2 (list\map (|>> (format prefix)) (set.to-list names)) @@ -53,7 +53,7 @@ (do {! (try.with promise.monad)} [file (: (Promise (Try (File Promise))) (file.get-file promise.monad fs path))] - (!.use (:: file over-write) content))) + (!.use (\ file over-write) content))) (def: (create-directory! fs path files) (-> (file.System Promise) Path (List [Path Binary]) (Promise (Try Any))) @@ -89,8 +89,8 @@ [context ..node-name target ..node-name sub ..node-name - #let [fs (file.mock (:: file.default separator)) - / (:: fs separator) + #let [fs (file.mock (\ file.default separator)) + / (\ fs separator) target-path (format context / target) sub-path (format target-path / sub)] direct-files (..files (format target-path /)) diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux index 52b995f6f..5e4f6615b 100644 --- a/stdlib/source/test/aedifex/command/deploy.lux +++ b/stdlib/source/test/aedifex/command/deploy.lux @@ -51,15 +51,15 @@ (case sources #.Nil (|> [] - (:: try.monad wrap) - (:: promise.monad wrap)) + (\ try.monad wrap) + (\ promise.monad wrap)) (#.Cons head tail) (do (try.with promise.monad) [_ (: (Promise (Try Path)) (file.make-directories promise.monad fs head)) _ (: (Promise (Try (File Promise))) - (file.get-file promise.monad fs (format head (:: fs separator) head ".lux")))] + (file.get-file promise.monad fs (format head (\ fs separator) head ".lux")))] (recur tail))))) (def: (execute! repository fs identity artifact profile) @@ -87,7 +87,7 @@ identity @repository.identity #let [repository (///repository.mock (@repository.simulation identity) @repository.empty) - fs (file.mock (:: file.default separator))]] + fs (file.mock (\ file.default separator))]] (wrap (do {! promise.monad} [verdict (do {! ///action.monad} [_ (..execute! repository fs identity artifact profile) @@ -95,32 +95,32 @@ (get@ #///.sources) set.to-list (export.library fs) - (:: ! map (format.run tar.writer))) + (\ ! map (format.run tar.writer))) - actual-pom (:: repository download artifact ///artifact/extension.pom) - actual-library (:: repository download artifact ///artifact/extension.lux-library) - actual-sha-1 (:: repository download artifact ///artifact/extension.sha-1) - actual-md5 (:: repository download artifact ///artifact/extension.md5) + actual-pom (\ repository download artifact ///artifact/extension.pom) + actual-library (\ repository download artifact ///artifact/extension.lux-library) + actual-sha-1 (\ repository download artifact ///artifact/extension.sha-1) + actual-md5 (\ repository download artifact ///artifact/extension.md5) #let [deployed-library! - (:: binary.equivalence = - expected-library - actual-library) + (\ binary.equivalence = + expected-library + actual-library) deployed-pom! - (:: binary.equivalence = - (|> expected-pom (:: xml.codec encode) encoding.to-utf8) - actual-pom) + (\ binary.equivalence = + (|> expected-pom (\ xml.codec encode) encoding.to-utf8) + actual-pom) deployed-sha-1! - (:: binary.equivalence = - (///hash.data (///hash.sha-1 expected-library)) - actual-sha-1) + (\ binary.equivalence = + (///hash.data (///hash.sha-1 expected-library)) + actual-sha-1) deployed-md5! - (:: binary.equivalence = - (///hash.data (///hash.md5 expected-library)) - actual-md5)]] + (\ binary.equivalence = + (///hash.data (///hash.md5 expected-library)) + actual-md5)]] (wrap (and deployed-library! deployed-pom! deployed-sha-1! diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux index 8c19df87f..42739a5ff 100644 --- a/stdlib/source/test/aedifex/command/deps.lux +++ b/stdlib/source/test/aedifex/command/deps.lux @@ -43,7 +43,7 @@ (do random.monad [dependee-artifact $///artifact.random depender-artifact (random.filter (predicate.complement - (:: ///artifact.equivalence = dependee-artifact)) + (\ ///artifact.equivalence = dependee-artifact)) $///artifact.random) [_ dependee-package] $///package.random @@ -54,11 +54,11 @@ depender {#///dependency.artifact depender-artifact #///dependency.type ///artifact/type.lux-library} - dependee-pom (|> (:: ///.monoid identity) + dependee-pom (|> (\ ///.monoid identity) (set@ #///.identity (#.Some dependee-artifact)) ///pom.write try.assume) - depender-pom (|> (:: ///.monoid identity) + depender-pom (|> (\ ///.monoid identity) (set@ #///.identity (#.Some depender-artifact)) (set@ #///.dependencies (set.from-list ///dependency.hash (list dependee))) ///pom.write @@ -71,13 +71,13 @@ (set@ #///package.origin #///package.Remote) (set@ #///package.pom depender-pom)) - fs (file.mock (:: file.default separator))]] + fs (file.mock (\ file.default separator))]] (wrap (do promise.monad [verdict (do ///action.monad [pre (|> ///dependency/resolution.empty (dictionary.put dependee dependee-package) (///cache.write-all fs)) - post (|> (:: ///.monoid identity) + post (|> (\ ///.monoid identity) (set@ #///.dependencies (set.from-list ///dependency.hash (list dependee depender))) (/.do! fs (list (///repository.mock ($///dependency/resolution.single depender-artifact depender-package) []))))] (wrap (and (and (set.member? pre dependee-artifact) diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux index 8982bc941..e858d46d2 100644 --- a/stdlib/source/test/aedifex/command/install.lux +++ b/stdlib/source/test/aedifex/command/install.lux @@ -42,15 +42,15 @@ (case sources #.Nil (|> [] - (:: try.monad wrap) - (:: promise.monad wrap)) + (\ try.monad wrap) + (\ promise.monad wrap)) (#.Cons head tail) (do (try.with promise.monad) [_ (: (Promise (Try Path)) (file.make-directories promise.monad fs head)) _ (: (Promise (Try (File Promise))) - (file.get-file promise.monad fs (format head (:: fs separator) head ".lux")))] + (file.get-file promise.monad fs (format head (\ fs separator) head ".lux")))] (recur tail))))) (def: (execute! fs sample) @@ -66,24 +66,24 @@ (<| (_.covering /._) (do random.monad [sample @profile.random - #let [fs (file.mock (:: file.default separator))]] + #let [fs (file.mock (\ file.default separator))]] (wrap (case (get@ #///.identity sample) (#.Some identity) (do {! promise.monad} [verdict (do ///action.monad [_ (..execute! fs sample) #let [artifact-path (format (///local.path fs identity) - (:: fs separator) + (\ fs separator) (///artifact.identity identity)) library-path (format artifact-path ///artifact/extension.lux-library) pom-path (format artifact-path ///artifact/extension.pom)] - library-exists! (:: promise.monad map - exception.return - (file.file-exists? promise.monad fs library-path)) - pom-exists! (:: promise.monad map - exception.return - (file.file-exists? promise.monad fs pom-path))] + library-exists! (\ promise.monad map + exception.return + (file.file-exists? promise.monad fs library-path)) + pom-exists! (\ promise.monad map + exception.return + (file.file-exists? promise.monad fs pom-path))] (wrap (and library-exists! pom-exists!)))] (_.cover' [/.do!] diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux index 169318589..408debea6 100644 --- a/stdlib/source/test/aedifex/command/pom.lux +++ b/stdlib/source/test/aedifex/command/pom.lux @@ -33,7 +33,7 @@ (<| (_.covering /._) (do random.monad [sample @profile.random - #let [fs (file.mock (:: file.default separator))]] + #let [fs (file.mock (\ file.default separator))]] (wrap (do {! promise.monad} [outcome (/.do! fs sample)] (case outcome @@ -41,17 +41,17 @@ (do ! [verdict (do ///action.monad [expected (|> (///pom.write sample) - (try\map (|>> (:: xml.codec encode) encoding.to-utf8)) - (:: ! wrap)) + (try\map (|>> (\ xml.codec encode) encoding.to-utf8)) + (\ ! wrap)) file (: (Promise (Try (File Promise))) (file.get-file promise.monad fs path)) - actual (!.use (:: file content) []) + actual (!.use (\ file content) []) #let [expected-path! (text\= ///pom.file path) expected-content! - (:: binary.equivalence = expected actual)]] + (\ binary.equivalence = expected actual)]] (wrap (and expected-path! expected-content!)))] (_.cover' [/.do!] diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux index be1a89c83..3a4bf9d79 100644 --- a/stdlib/source/test/aedifex/command/test.lux +++ b/stdlib/source/test/aedifex/command/test.lux @@ -35,7 +35,7 @@ Test (<| (_.covering /._) (do {! random.monad} - [#let [fs (file.mock (:: file.default separator)) + [#let [fs (file.mock (\ file.default separator)) shell (shell.mock (function (_ [actual-environment actual-working-directory actual-command actual-arguments]) (#try.Success @@ -56,7 +56,7 @@ target (random.ascii/alpha 5) working-directory (random.ascii/alpha 5) #let [empty-profile (: Profile - (:: ///.monoid identity)) + (\ ///.monoid identity)) with-target (: (-> Profile Profile) (set@ #///.target (#.Some target))) with-program (: (-> Profile Profile) diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux index 8bd013125..b426a100d 100644 --- a/stdlib/source/test/aedifex/dependency/resolution.lux +++ b/stdlib/source/test/aedifex/dependency/resolution.lux @@ -59,26 +59,26 @@ (-> Artifact Package (Simulation Any)) (structure (def: (on-download request extension state) - (if (:: ///artifact.equivalence = artifact request) + (if (\ ///artifact.equivalence = artifact request) (cond (text\= extension ///artifact/extension.lux-library) (#try.Success [state (get@ #///package.library package)]) (text\= extension ///artifact/extension.pom) (#try.Success [state (|> package (get@ #///package.pom) - (:: xml.codec encode) + (\ xml.codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.sha-1) (#try.Success [state (|> package (get@ #///package.sha-1) - (:: ///hash.sha-1-codec encode) + (\ ///hash.sha-1-codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.md5) (#try.Success [state (|> package (get@ #///package.md5) - (:: ///hash.md5-codec encode) + (\ ///hash.md5-codec encode) encoding.to-utf8)]) ## else @@ -94,33 +94,33 @@ [_ expected-package] $///package.random [_ dummy-package] (random.filter (|>> product.right (set@ #///package.pom (get@ #///package.pom expected-package)) - (:: ///package.equivalence = expected-package) + (\ ///package.equivalence = expected-package) not) $///package.random) #let [good (..single expected-artifact expected-package) bad-sha-1 (: (Simulation Any) (structure (def: (on-download actual-artifact extension state) - (if (:: ///artifact.equivalence = expected-artifact actual-artifact) + (if (\ ///artifact.equivalence = expected-artifact actual-artifact) (cond (text\= extension ///artifact/extension.lux-library) (#try.Success [state (get@ #///package.library expected-package)]) (text\= extension ///artifact/extension.pom) (#try.Success [state (|> expected-package (get@ #///package.pom) - (:: xml.codec encode) + (\ xml.codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.sha-1) (#try.Success [state (|> dummy-package (get@ #///package.sha-1) - (:: ///hash.sha-1-codec encode) + (\ ///hash.sha-1-codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.md5) (#try.Success [state (|> expected-package (get@ #///package.md5) - (:: ///hash.md5-codec encode) + (\ ///hash.md5-codec encode) encoding.to-utf8)]) ## else @@ -131,26 +131,26 @@ bad-md5 (: (Simulation Any) (structure (def: (on-download actual-artifact extension state) - (if (:: ///artifact.equivalence = expected-artifact actual-artifact) + (if (\ ///artifact.equivalence = expected-artifact actual-artifact) (cond (text\= extension ///artifact/extension.lux-library) (#try.Success [state (get@ #///package.library expected-package)]) (text\= extension ///artifact/extension.pom) (#try.Success [state (|> expected-package (get@ #///package.pom) - (:: xml.codec encode) + (\ xml.codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.sha-1) (#try.Success [state (|> expected-package (get@ #///package.sha-1) - (:: ///hash.sha-1-codec encode) + (\ ///hash.sha-1-codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.md5) (#try.Success [state (|> dummy-package (get@ #///package.md5) - (:: ///hash.md5-codec encode) + (\ ///hash.md5-codec encode) encoding.to-utf8)]) ## else @@ -167,9 +167,9 @@ (_.cover' [/.one] (case actual-package (#try.Success actual-package) - (:: ///package.equivalence = - (set@ #///package.origin #///package.Remote expected-package) - actual-package) + (\ ///package.equivalence = + (set@ #///package.origin #///package.Remote expected-package) + actual-package) (#try.Failure _) false)))) @@ -199,33 +199,33 @@ [_ expected-package] $///package.random [_ dummy-package] (random.filter (|>> product.right (set@ #///package.pom (get@ #///package.pom expected-package)) - (:: ///package.equivalence = expected-package) + (\ ///package.equivalence = expected-package) not) $///package.random) #let [good (..single expected-artifact expected-package) bad-sha-1 (: (Simulation Any) (structure (def: (on-download actual-artifact extension state) - (if (:: ///artifact.equivalence = expected-artifact actual-artifact) + (if (\ ///artifact.equivalence = expected-artifact actual-artifact) (cond (text\= extension ///artifact/extension.lux-library) (#try.Success [state (get@ #///package.library expected-package)]) (text\= extension ///artifact/extension.pom) (#try.Success [state (|> expected-package (get@ #///package.pom) - (:: xml.codec encode) + (\ xml.codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.sha-1) (#try.Success [state (|> dummy-package (get@ #///package.sha-1) - (:: ///hash.sha-1-codec encode) + (\ ///hash.sha-1-codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.md5) (#try.Success [state (|> expected-package (get@ #///package.md5) - (:: ///hash.md5-codec encode) + (\ ///hash.md5-codec encode) encoding.to-utf8)]) ## else @@ -236,26 +236,26 @@ bad-md5 (: (Simulation Any) (structure (def: (on-download actual-artifact extension state) - (if (:: ///artifact.equivalence = expected-artifact actual-artifact) + (if (\ ///artifact.equivalence = expected-artifact actual-artifact) (cond (text\= extension ///artifact/extension.lux-library) (#try.Success [state (get@ #///package.library expected-package)]) (text\= extension ///artifact/extension.pom) (#try.Success [state (|> expected-package (get@ #///package.pom) - (:: xml.codec encode) + (\ xml.codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.sha-1) (#try.Success [state (|> expected-package (get@ #///package.sha-1) - (:: ///hash.sha-1-codec encode) + (\ ///hash.sha-1-codec encode) encoding.to-utf8)]) (text\= extension ///artifact/extension.md5) (#try.Success [state (|> dummy-package (get@ #///package.md5) - (:: ///hash.md5-codec encode) + (\ ///hash.md5-codec encode) encoding.to-utf8)]) ## else @@ -274,9 +274,9 @@ (_.cover' [/.any] (case actual-package (#try.Success actual-package) - (:: ///package.equivalence = - (set@ #///package.origin #///package.Remote expected-package) - actual-package) + (\ ///package.equivalence = + (set@ #///package.origin #///package.Remote expected-package) + actual-package) (#try.Failure _) false)))) @@ -300,11 +300,11 @@ (do {! random.monad} [dependee-artifact $///artifact.random depender-artifact (random.filter (predicate.complement - (:: ///artifact.equivalence = dependee-artifact)) + (\ ///artifact.equivalence = dependee-artifact)) $///artifact.random) ignored-artifact (random.filter (predicate.complement - (predicate.unite (:: ///artifact.equivalence = dependee-artifact) - (:: ///artifact.equivalence = depender-artifact))) + (predicate.unite (\ ///artifact.equivalence = dependee-artifact) + (\ ///artifact.equivalence = depender-artifact))) $///artifact.random) [_ dependee-package] $///package.random @@ -318,16 +318,16 @@ ignored {#///dependency.artifact ignored-artifact #///dependency.type ///artifact/type.lux-library} - dependee-pom (|> (:: ///.monoid identity) + dependee-pom (|> (\ ///.monoid identity) (set@ #///.identity (#.Some dependee-artifact)) ///pom.write try.assume) - depender-pom (|> (:: ///.monoid identity) + depender-pom (|> (\ ///.monoid identity) (set@ #///.identity (#.Some depender-artifact)) (set@ #///.dependencies (set.from-list ///dependency.hash (list dependee))) ///pom.write try.assume) - ignored-pom (|> (:: ///.monoid identity) + ignored-pom (|> (\ ///.monoid identity) (set@ #///.identity (#.Some ignored-artifact)) ///pom.write try.assume) diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux index 745ec0910..472342c70 100644 --- a/stdlib/source/test/aedifex/hash.lux +++ b/stdlib/source/test/aedifex/hash.lux @@ -30,8 +30,8 @@ (-> (-> Binary (/.Hash h)) (Random (/.Hash h)))) (do {! random.monad} - [size (:: ! map (n.% 100) random.nat)] - (:: ! map hash (_binary.random size)))) + [size (\ ! map (n.% 100) random.nat)] + (\ ! map hash (_binary.random size)))) (def: #export test Test @@ -51,13 +51,13 @@ (_.cover [<hash> <constructor> <exception>] (and (case (<constructor> (/.data expected)) (#try.Success actual) - (:: /.equivalence = expected actual) + (\ /.equivalence = expected actual) (#try.Failure error) false) - (case (<constructor> (:: binary.monoid compose - (/.data expected) - (/.data expected))) + (case (<constructor> (\ binary.monoid compose + (/.data expected) + (/.data expected))) (#try.Success actual) false @@ -80,9 +80,9 @@ [(do random.monad [expected (..random <hash>)] (_.cover [<codec>] - (case (:: <codec> decode - (format (:: <codec> encode expected) - "AABBCC")) + (case (\ <codec> decode + (format (\ <codec> encode expected) + "AABBCC")) (#try.Success actual) false diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux index 9f85ea5af..dc424afc8 100644 --- a/stdlib/source/test/aedifex/input.lux +++ b/stdlib/source/test/aedifex/input.lux @@ -40,9 +40,9 @@ Test (<| (_.covering /._) (do {! random.monad} - [expected (:: ! map (set@ #//.parents (list)) @profile.random) + [expected (\ ! map (set@ #//.parents (list)) @profile.random) #let [fs (: (file.System Promise) - (file.mock (:: file.default separator)))]] + (file.mock (\ file.default separator)))]] (wrap (do promise.monad [verdict (do //action.monad [file (: (Promise (Try (File Promise))) @@ -51,11 +51,11 @@ //format.profile %.code encoding.to-utf8 - (!.use (:: file over-write))) + (!.use (\ file over-write))) actual (: (Promise (Try Profile)) (/.read promise.monad fs //.default))] - (wrap (:: //.equivalence = - (update@ #//.sources ..with-default-source expected) - actual)))] + (wrap (\ //.equivalence = + (update@ #//.sources ..with-default-source expected) + actual)))] (_.cover' [/.read] (try.default false verdict))))))) diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux index 1c713684c..1d90ff905 100644 --- a/stdlib/source/test/aedifex/local.lux +++ b/stdlib/source/test/aedifex/local.lux @@ -25,7 +25,7 @@ (do {! random.monad} [sample @artifact.random #let [fs (: (file.System Promise) - (file.mock (:: file.default separator)))]] + (file.mock (\ file.default separator)))]] ($_ _.and (_.cover [/.repository /.path] (let [path (/.path fs sample)] diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux index 5400d4953..c1add80d3 100644 --- a/stdlib/source/test/aedifex/package.lux +++ b/stdlib/source/test/aedifex/package.lux @@ -34,7 +34,7 @@ (def: #export random (Random [//.Profile /.Package]) (do {! random.monad} - [content-size (:: ! map (n.% 100) random.nat) + [content-size (\ ! map (n.% 100) random.nat) content (_binary.random content-size) [profile pom] (random.one (function (_ profile) (try.to-maybe @@ -52,17 +52,17 @@ [[profile package] ..random] ($_ _.and (_.cover [/.local] - (and (:: //hash.equivalence = - (//hash.sha-1 (get@ #/.library package)) - (get@ #/.sha-1 package)) - (:: //hash.equivalence = - (//hash.md5 (get@ #/.library package)) - (get@ #/.md5 package)))) + (and (\ //hash.equivalence = + (//hash.sha-1 (get@ #/.library package)) + (get@ #/.sha-1 package)) + (\ //hash.equivalence = + (//hash.md5 (get@ #/.library package)) + (get@ #/.md5 package)))) (_.cover [/.dependencies] (let [expected (get@ #//.dependencies profile)] (case (/.dependencies package) (#try.Success actual) - (:: set.equivalence = expected actual) + (\ set.equivalence = expected actual) (#try.Failure error) false))) diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux index 394f93977..248023e80 100644 --- a/stdlib/source/test/aedifex/parser.lux +++ b/stdlib/source/test/aedifex/parser.lux @@ -39,14 +39,14 @@ (def: (list-of random) (All [a] (-> (Random a) (Random (List a)))) (do {! random.monad} - [size (:: ! map (n.% 5) random.nat)] + [size (\ ! map (n.% 5) random.nat)] (random.list size random))) (def: (dictionary-of key-hash key-random value-random) (All [k v] (-> (Hash k) (Random k) (Random v) (Random (Dictionary k v)))) - (:: random.functor map - (dictionary.from-list key-hash) - (..list-of (random.and key-random value-random)))) + (\ random.functor map + (dictionary.from-list key-hash) + (..list-of (random.and key-random value-random)))) (def: random (Random Project) @@ -74,7 +74,7 @@ (|> expected ..with-default-sources (//project.project //.default) - (:: //project.equivalence = actual)) + (\ //project.equivalence = actual)) (#try.Failure error) false))))) @@ -82,7 +82,7 @@ (def: (with-empty-profile project) (-> Project Project) (if (dictionary.empty? project) - (//project.project //.default (:: //.monoid identity)) + (//project.project //.default (\ //.monoid identity)) project)) (def: multiple-profiles @@ -101,7 +101,7 @@ (list\map (function (_ [name profile]) [name (..with-default-sources profile)])) (dictionary.from-list text.hash) - (:: //project.equivalence = actual)) + (\ //project.equivalence = actual)) (#try.Failure error) false))))) diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux index d1f278da7..fefdfb7bb 100644 --- a/stdlib/source/test/aedifex/pom.lux +++ b/stdlib/source/test/aedifex/pom.lux @@ -32,10 +32,10 @@ (#.Some _)] (case (<xml>.run /.parser pom) (#try.Success actual) - (:: //.equivalence = - (|> (:: //.monoid identity) - (set@ #//.dependencies (get@ #//.dependencies expected))) - actual) + (\ //.equivalence = + (|> (\ //.monoid identity) + (set@ #//.dependencies (get@ #//.dependencies expected))) + actual) (#try.Failure error) false) diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index b49bd7f36..7f95c07c2 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -72,20 +72,20 @@ (def: (list-of random) (All [a] (-> (Random a) (Random (List a)))) (do {! random.monad} - [size (:: ! map (n.% 5) random.nat)] + [size (\ ! map (n.% 5) random.nat)] (random.list size random))) (def: (set-of hash random) (All [a] (-> (Hash a) (Random a) (Random (Set a)))) - (:: random.functor map - (set.from-list hash) - (..list-of random))) + (\ random.functor map + (set.from-list hash) + (..list-of random))) (def: (dictionary-of key-hash key-random value-random) (All [k v] (-> (Hash k) (Random k) (Random v) (Random (Dictionary k v)))) - (:: random.functor map - (dictionary.from-list key-hash) - (..list-of (random.and key-random value-random)))) + (\ random.functor map + (dictionary.from-list key-hash) + (..list-of (random.and key-random value-random)))) (def: info (Random /.Info) diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux index ab8cc438f..ec6849e4e 100644 --- a/stdlib/source/test/aedifex/project.lux +++ b/stdlib/source/test/aedifex/project.lux @@ -59,24 +59,24 @@ (not (text\= dummy-name name)) (not (text\= sub-name name)))) (random.ascii/alpha 1)) - #let [project ($_ (:: /.monoid compose) + #let [project ($_ (\ /.monoid compose) (/.project super-name super-profile) (/.project dummy-name dummy-profile) (/.project sub-name (set@ #//.parents (list super-name) sub-profile))) - circular ($_ (:: /.monoid compose) + circular ($_ (\ /.monoid compose) (/.project super-name (set@ #//.parents (list sub-name) super-profile)) (/.project dummy-name dummy-profile) (/.project sub-name (set@ #//.parents (list super-name) sub-profile)))]] ($_ _.and (_.cover [/.profile] (and (|> (/.profile super-name project) - (try\map (:: //.equivalence = super-profile)) + (try\map (\ //.equivalence = super-profile)) (try.default false)) (|> (/.profile dummy-name project) - (try\map (:: //.equivalence = dummy-profile)) + (try\map (\ //.equivalence = dummy-profile)) (try.default false)) (|> (/.profile sub-name project) - (try\map (:: //.equivalence = (:: //.monoid compose sub-profile super-profile))) + (try\map (\ //.equivalence = (\ //.monoid compose sub-profile super-profile))) (try.default false)))) (_.cover [/.unknown-profile] (case (/.profile fake-name project) diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux index 5f05d342e..55bd3af19 100644 --- a/stdlib/source/test/aedifex/repository.lux +++ b/stdlib/source/test/aedifex/repository.lux @@ -74,7 +74,7 @@ #.None (exception.throw ..not-found [artifact extension]))) (def: (on-upload requester artifact extension content state) - (if (:: identity-equivalence = identity requester) + (if (\ identity-equivalence = identity requester) (exception.return (dictionary.put [artifact extension] content state)) (exception.throw ..invalid-identity [requester])))) @@ -83,7 +83,7 @@ (<| (_.covering /._) (do {! random.monad} [valid ..identity - invalid (random.filter (|>> (:: identity-equivalence = valid) not) + invalid (random.filter (|>> (\ identity-equivalence = valid) not) ..identity)] ($_ _.and (_.with-cover [/.mock /.Simulation] diff --git a/stdlib/source/test/licentia.lux b/stdlib/source/test/licentia.lux index 506a61c61..92b43b20c 100644 --- a/stdlib/source/test/licentia.lux +++ b/stdlib/source/test/licentia.lux @@ -46,9 +46,9 @@ [start (r.filter (|>> (n.= n\top) not) r.nat) #let [wiggle-room (n.- start n\top)] - end (:: ! map - (|>> (n.% wiggle-room) (n.max 1)) - r.nat)] + end (\ ! map + (|>> (n.% wiggle-room) (n.max 1)) + r.nat)] (wrap {#time.start start #time.end end}))) @@ -105,8 +105,8 @@ (def: (variable-list max-size gen-element) (All [a] (-> Nat (Random a) (Random (List a)))) (do {! r.monad} - [amount (:: ! map (n.% (n.max 1 max-size)) - r.nat)] + [amount (\ ! map (n.% (n.max 1 max-size)) + r.nat)] (r.list amount gen-element))) (def: black-list diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index 61e4489f3..7e138d33b 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -233,7 +233,7 @@ (def: frac-rev (Random Rev) (let [bits-to-ignore 11] - (:: random.functor map (i64.left-shift bits-to-ignore) random.rev))) + (\ random.functor map (i64.left-shift bits-to-ignore) random.rev))) (def: prelude-macros Test diff --git a/stdlib/source/test/lux/abstract/apply.lux b/stdlib/source/test/lux/abstract/apply.lux index 998c0b91c..d56860291 100644 --- a/stdlib/source/test/lux/abstract/apply.lux +++ b/stdlib/source/test/lux/abstract/apply.lux @@ -23,9 +23,9 @@ ($_ _.and (_.cover [/.compose] (let [expected (n.+ left right)] - (case (:: (/.compose maybe.monad maybe.apply list.apply) apply - (#.Some (list (n.+ left))) - (#.Some (list right))) + (case (\ (/.compose maybe.monad maybe.apply list.apply) apply + (#.Some (list (n.+ left))) + (#.Some (list right))) (^ (#.Some (list actual))) (n.= expected actual) diff --git a/stdlib/source/test/lux/abstract/codec.lux b/stdlib/source/test/lux/abstract/codec.lux index ca45c3c25..da9a7b438 100644 --- a/stdlib/source/test/lux/abstract/codec.lux +++ b/stdlib/source/test/lux/abstract/codec.lux @@ -38,7 +38,7 @@ [expected random.bit] (<| (_.covering /._) (_.cover [/.compose] - (case (|> expected (:: ..codec encode) (:: ..codec decode)) + (case (|> expected (\ ..codec encode) (\ ..codec decode)) (#try.Success actual) (bit\= expected actual) diff --git a/stdlib/source/test/lux/abstract/comonad/cofree.lux b/stdlib/source/test/lux/abstract/comonad/cofree.lux index 0c75e9f74..9fc2df11b 100644 --- a/stdlib/source/test/lux/abstract/comonad/cofree.lux +++ b/stdlib/source/test/lux/abstract/comonad/cofree.lux @@ -26,16 +26,16 @@ (def: (interpret [head tail]) (All [a] (-> (/.CoFree Sequence a) (Sequence a))) (|> tail - (sequence\map (:: (/.comonad sequence.functor) unwrap)) + (sequence\map (\ (/.comonad sequence.functor) unwrap)) [head] //.pending)) (def: comparison (Comparison (/.CoFree Sequence)) (function (_ == left right) - (:: (list.equivalence ==) = - (sequence.take 100 (..interpret left)) - (sequence.take 100 (..interpret right))))) + (\ (list.equivalence ==) = + (sequence.take 100 (..interpret left)) + (sequence.take 100 (..interpret right))))) (def: #export test Test diff --git a/stdlib/source/test/lux/abstract/enum.lux b/stdlib/source/test/lux/abstract/enum.lux index c79a7e4c0..4446d958c 100644 --- a/stdlib/source/test/lux/abstract/enum.lux +++ b/stdlib/source/test/lux/abstract/enum.lux @@ -18,7 +18,7 @@ (def: #export test Test (let [limit (: (Random Nat) - (:: random.monad map (n.% 20) random.nat))] + (\ random.monad map (n.% 20) random.nat))] (do random.monad [start limit end limit @@ -32,14 +32,14 @@ (let [expected-size (|> end (n.- start) inc) expected-start? (|> range list.head (maybe\map (n.= start)) (maybe.default false)) expected-end? (|> range list.last (maybe\map (n.= end)) (maybe.default false)) - can-be-backwards? (:: (list.equivalence n.equivalence) = - (/.range n.enum start end) - (list.reverse (/.range n.enum end start))) + can-be-backwards? (\ (list.equivalence n.equivalence) = + (/.range n.enum start end) + (list.reverse (/.range n.enum end start))) every-element-is-a-successor? (case range (#.Cons head tail) (|> (list\fold (function (_ next [verdict prev]) [(and verdict - (n.= next (:: n.enum succ prev))) + (n.= next (\ n.enum succ prev))) next]) [true head] tail) diff --git a/stdlib/source/test/lux/abstract/equivalence.lux b/stdlib/source/test/lux/abstract/equivalence.lux index ae065c031..0193773eb 100644 --- a/stdlib/source/test/lux/abstract/equivalence.lux +++ b/stdlib/source/test/lux/abstract/equivalence.lux @@ -29,34 +29,34 @@ #let [equivalence (: (Equivalence (Equivalence Nat)) (structure (def: (= left right) - (and (bit\= (:: left = leftN leftN) - (:: right = leftN leftN)) - (bit\= (:: left = rightN rightN) - (:: right = rightN rightN)) - (bit\= (:: left = leftN rightN) - (:: right = leftN rightN))))))]] + (and (bit\= (\ left = leftN leftN) + (\ right = leftN leftN)) + (bit\= (\ left = rightN rightN) + (\ right = rightN rightN)) + (bit\= (\ left = leftN rightN) + (\ right = leftN rightN))))))]] (<| (_.covering /._) ($_ _.and (_.with-cover [/.functor] ($contravariant.spec equivalence n.equivalence /.functor)) (_.cover [/.sum] (let [equivalence (/.sum n.equivalence i.equivalence)] - (and (bit\= (:: n.equivalence = leftN leftN) - (:: equivalence = (#.Left leftN) (#.Left leftN))) - (bit\= (:: n.equivalence = leftN rightN) - (:: equivalence = (#.Left leftN) (#.Left rightN))) - (bit\= (:: i.equivalence = leftI leftI) - (:: equivalence = (#.Right leftI) (#.Right leftI))) - (bit\= (:: i.equivalence = leftI rightI) - (:: equivalence = (#.Right leftI) (#.Right rightI)))))) + (and (bit\= (\ n.equivalence = leftN leftN) + (\ equivalence = (#.Left leftN) (#.Left leftN))) + (bit\= (\ n.equivalence = leftN rightN) + (\ equivalence = (#.Left leftN) (#.Left rightN))) + (bit\= (\ i.equivalence = leftI leftI) + (\ equivalence = (#.Right leftI) (#.Right leftI))) + (bit\= (\ i.equivalence = leftI rightI) + (\ equivalence = (#.Right leftI) (#.Right rightI)))))) (_.cover [/.product] (let [equivalence (/.product n.equivalence i.equivalence)] - (and (bit\= (and (:: n.equivalence = leftN leftN) - (:: i.equivalence = leftI leftI)) - (:: equivalence = [leftN leftI] [leftN leftI])) - (bit\= (and (:: n.equivalence = leftN rightN) - (:: i.equivalence = leftI rightI)) - (:: equivalence = [leftN leftI] [rightN rightI]))))) + (and (bit\= (and (\ n.equivalence = leftN leftN) + (\ i.equivalence = leftI leftI)) + (\ equivalence = [leftN leftI] [leftN leftI])) + (bit\= (and (\ n.equivalence = leftN rightN) + (\ i.equivalence = leftI rightI)) + (\ equivalence = [leftN leftI] [rightN rightI]))))) (_.cover [/.rec] (let [equivalence (: (Equivalence (List Nat)) (/.rec (function (_ equivalence) @@ -68,11 +68,11 @@ [(#.Cons leftH lefT) (#.Cons rightH rightT)] (and (n.= leftH rightH) - (:: equivalence = lefT rightT)) + (\ equivalence = lefT rightT)) _ false))))))] - (and (:: equivalence = (list sample sample) (list sample sample)) - (not (:: equivalence = (list sample sample) (list sample))) - (not (:: equivalence = (list sample sample) (list different different)))))) + (and (\ equivalence = (list sample sample) (list sample sample)) + (not (\ equivalence = (list sample sample) (list sample))) + (not (\ equivalence = (list sample sample) (list different different)))))) )))) diff --git a/stdlib/source/test/lux/abstract/fold.lux b/stdlib/source/test/lux/abstract/fold.lux index b2939f8c7..66f7a6e48 100644 --- a/stdlib/source/test/lux/abstract/fold.lux +++ b/stdlib/source/test/lux/abstract/fold.lux @@ -20,6 +20,6 @@ (<| (_.covering /._) ($_ _.and (_.cover [/.with-monoid] - (n.= (:: list.fold fold (:: n.addition compose) (:: n.addition identity) samples) + (n.= (\ list.fold fold (\ n.addition compose) (\ n.addition identity) samples) (/.with-monoid n.addition list.fold samples))) )))) diff --git a/stdlib/source/test/lux/abstract/functor.lux b/stdlib/source/test/lux/abstract/functor.lux index a900f9fd9..593400eb5 100644 --- a/stdlib/source/test/lux/abstract/functor.lux +++ b/stdlib/source/test/lux/abstract/functor.lux @@ -23,26 +23,26 @@ (<| (_.covering /._) ($_ _.and (_.cover [/.Or /.sum] - (and (case (:: (/.sum maybe.functor list.functor) map - (n.+ shift) - (#.Left (#.Some left))) + (and (case (\ (/.sum maybe.functor list.functor) map + (n.+ shift) + (#.Left (#.Some left))) (#.Left (#.Some actual)) (n.= (n.+ shift left) actual) _ false) - (case (:: (/.sum maybe.functor list.functor) map - (n.+ shift) - (#.Right (list right))) + (case (\ (/.sum maybe.functor list.functor) map + (n.+ shift) + (#.Right (list right))) (^ (#.Right (list actual))) (n.= (n.+ shift right) actual) _ false))) (_.cover [/.And /.product] - (case (:: (/.product maybe.functor list.functor) map - (n.+ shift) - [(#.Some left) (list right)]) + (case (\ (/.product maybe.functor list.functor) map + (n.+ shift) + [(#.Some left) (list right)]) (^ [(#.Some actualL) (list actualR)]) (and (n.= (n.+ shift left) actualL) (n.= (n.+ shift right) actualR)) @@ -50,9 +50,9 @@ _ false)) (_.cover [/.Then /.compose] - (case (:: (/.compose maybe.functor list.functor) map - (n.+ shift) - (#.Some (list left))) + (case (\ (/.compose maybe.functor list.functor) map + (n.+ shift) + (#.Some (list left))) (^ (#.Some (list actual))) (n.= (n.+ shift left) actual) diff --git a/stdlib/source/test/lux/abstract/interval.lux b/stdlib/source/test/lux/abstract/interval.lux index 0c8355a49..55ad4111d 100644 --- a/stdlib/source/test/lux/abstract/interval.lux +++ b/stdlib/source/test/lux/abstract/interval.lux @@ -139,13 +139,13 @@ Test (do {! random.monad} [[l m r] (|> (random.set n.hash 3 random.nat) - (:: ! map (|>> set.to-list - (list.sort n.<) - (case> (^ (list b t1 t2)) - [b t1 t2] + (\ ! map (|>> set.to-list + (list.sort n.<) + (case> (^ (list b t1 t2)) + [b t1 t2] - _ - (undefined))))) + _ + (undefined))))) #let [left (/.singleton n.enum l) right (/.singleton n.enum r)]] ($_ _.and @@ -161,13 +161,13 @@ Test (do {! random.monad} [[b t1 t2] (|> (random.set n.hash 3 random.nat) - (:: ! map (|>> set.to-list - (list.sort n.<) - (case> (^ (list b t1 t2)) - [b t1 t2] + (\ ! map (|>> set.to-list + (list.sort n.<) + (case> (^ (list b t1 t2)) + [b t1 t2] - _ - (undefined))))) + _ + (undefined))))) #let [int-left (/.between n.enum t1 t2) int-right (/.between n.enum b t1)]] ($_ _.and @@ -188,13 +188,13 @@ (do {! random.monad} [some-interval ..interval [x0 x1 x2 x3] (|> (random.set n.hash 4 random.nat) - (:: ! map (|>> set.to-list - (list.sort n.<) - (case> (^ (list x0 x1 x2 x3)) - [x0 x1 x2 x3] + (\ ! map (|>> set.to-list + (list.sort n.<) + (case> (^ (list x0 x1 x2 x3)) + [x0 x1 x2 x3] - _ - (undefined)))))] + _ + (undefined)))))] ($_ _.and (_.test "Every interval is nested into itself." (/.nested? some-interval some-interval)) @@ -221,13 +221,13 @@ (do {! random.monad} [some-interval ..interval [x0 x1 x2 x3] (|> (random.set n.hash 4 random.nat) - (:: ! map (|>> set.to-list - (list.sort n.<) - (case> (^ (list x0 x1 x2 x3)) - [x0 x1 x2 x3] + (\ ! map (|>> set.to-list + (list.sort n.<) + (case> (^ (list x0 x1 x2 x3)) + [x0 x1 x2 x3] - _ - (undefined)))))] + _ + (undefined)))))] ($_ _.and (_.test "No interval overlaps with itself." (not (/.overlaps? some-interval some-interval))) diff --git a/stdlib/source/test/lux/abstract/monad.lux b/stdlib/source/test/lux/abstract/monad.lux index 14529fdc5..19e5bb342 100644 --- a/stdlib/source/test/lux/abstract/monad.lux +++ b/stdlib/source/test/lux/abstract/monad.lux @@ -29,35 +29,35 @@ (n.= (inc mono) (: (Identity Nat) (/.bind identity.monad - (|>> inc (:: identity.monad wrap)) - (:: identity.monad wrap mono))))) + (|>> inc (\ identity.monad wrap)) + (\ identity.monad wrap mono))))) (_.cover [/.seq] - (:: (list.equivalence n.equivalence) = - (list\map inc poly) - (|> poly - (list\map (|>> inc (:: identity.monad wrap))) - (: (List (Identity Nat))) - (/.seq identity.monad) - (: (Identity (List Nat)))))) + (\ (list.equivalence n.equivalence) = + (list\map inc poly) + (|> poly + (list\map (|>> inc (\ identity.monad wrap))) + (: (List (Identity Nat))) + (/.seq identity.monad) + (: (Identity (List Nat)))))) (_.cover [/.map] - (:: (list.equivalence n.equivalence) = - (list\map inc poly) - (|> poly - (/.map identity.monad (|>> inc (:: identity.monad wrap))) - (: (Identity (List Nat)))))) + (\ (list.equivalence n.equivalence) = + (list\map inc poly) + (|> poly + (/.map identity.monad (|>> inc (\ identity.monad wrap))) + (: (Identity (List Nat)))))) (_.cover [/.filter] - (:: (list.equivalence n.equivalence) = - (list.filter n.even? poly) - (|> poly - (/.filter identity.monad (|>> n.even? (:: identity.monad wrap))) - (: (Identity (List Nat)))))) + (\ (list.equivalence n.equivalence) = + (list.filter n.even? poly) + (|> poly + (/.filter identity.monad (|>> n.even? (\ identity.monad wrap))) + (: (Identity (List Nat)))))) (_.cover [/.fold] (n.= (list\fold n.+ 0 poly) (|> poly (/.fold identity.monad (function (_ part whole) - (:: identity.monad wrap - (n.+ part whole))) + (\ identity.monad wrap + (n.+ part whole))) 0) (: (Identity Nat))))) )))) diff --git a/stdlib/source/test/lux/abstract/monad/free.lux b/stdlib/source/test/lux/abstract/monad/free.lux index 48c960d19..5cae8ef16 100644 --- a/stdlib/source/test/lux/abstract/monad/free.lux +++ b/stdlib/source/test/lux/abstract/monad/free.lux @@ -36,9 +36,9 @@ (def: comparison (Comparison (/.Free List)) (function (_ == left right) - (:: (list.equivalence ==) = - (..interpret left) - (..interpret right)))) + (\ (list.equivalence ==) = + (..interpret left) + (..interpret right)))) (def: #export test Test diff --git a/stdlib/source/test/lux/abstract/monoid.lux b/stdlib/source/test/lux/abstract/monoid.lux index e987e8fb3..2037adeea 100644 --- a/stdlib/source/test/lux/abstract/monoid.lux +++ b/stdlib/source/test/lux/abstract/monoid.lux @@ -24,10 +24,10 @@ (<| (_.covering /._) ($_ _.and (_.cover [/.compose] - (let [[natLR intLR] (:: (/.compose nat.addition int.multiplication) compose - [natL intL] [natR intR])] - (and (nat.= (:: nat.addition compose natL natR) + (let [[natLR intLR] (\ (/.compose nat.addition int.multiplication) compose + [natL intL] [natR intR])] + (and (nat.= (\ nat.addition compose natL natR) natLR) - (int.= (:: int.multiplication compose intL intR) + (int.= (\ int.multiplication compose intL intR) intLR)))) )))) diff --git a/stdlib/source/test/lux/abstract/order.lux b/stdlib/source/test/lux/abstract/order.lux index f330d88ae..38479a79f 100644 --- a/stdlib/source/test/lux/abstract/order.lux +++ b/stdlib/source/test/lux/abstract/order.lux @@ -27,12 +27,12 @@ #let [equivalence (: (Equivalence (/.Order Nat)) (structure (def: (= leftO rightO) - (and (bit\= (:: leftO < left left) - (:: rightO < left left)) - (bit\= (:: leftO < right right) - (:: rightO < right right)) - (bit\= (:: leftO < left right) - (:: rightO < left right))))))]]) + (and (bit\= (\ leftO < left left) + (\ rightO < left left)) + (bit\= (\ leftO < right right) + (\ rightO < right right)) + (bit\= (\ leftO < left right) + (\ rightO < left right))))))]]) ($_ _.and (_.with-cover [/.functor] ($contravariant.spec equivalence n.order /.functor)) @@ -45,7 +45,7 @@ (_.cover [/.<=] (and (/.<= n.order left left) (/.<= n.order right right) - (bit\= (:: n.order < left right) + (bit\= (\ n.order < left right) (/.<= n.order left right)))) (_.cover [/.>=] (and (/.>= n.order left left) diff --git a/stdlib/source/test/lux/abstract/predicate.lux b/stdlib/source/test/lux/abstract/predicate.lux index 8bf5c05f0..502e1c845 100644 --- a/stdlib/source/test/lux/abstract/predicate.lux +++ b/stdlib/source/test/lux/abstract/predicate.lux @@ -46,7 +46,7 @@ (let [generator (: (Random (/.Predicate Nat)) (|> random.nat (random.filter (|>> (n.= 0) not)) - (:: ! map multiple?)))] + (\ ! map multiple?)))] ($_ _.and (_.with-cover [/.union] ($monoid.spec equivalence /.union generator)) diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux index 0932fba3d..0f98a0b77 100644 --- a/stdlib/source/test/lux/control/concurrency/actor.lux +++ b/stdlib/source/test/lux/control/concurrency/actor.lux @@ -195,9 +195,9 @@ (_.cover' [/.actor] verdict))) (do ! - [num-events (:: ! map (|>> (n.% 10) inc) random.nat) + [num-events (\ ! map (|>> (n.% 10) inc) random.nat) events (random.list num-events random.nat) - num-observations (:: ! map (n.% num-events) random.nat) + num-observations (\ ! map (n.% num-events) random.nat) #let [expected (list.take num-observations events) sink (: (Atom (Row Nat)) (atom.atom row.empty)) @@ -235,6 +235,6 @@ #.None false)]] (_.cover' [/.observe] - (and (:: (list.equivalence n.equivalence) = expected (row.to-list actual)) + (and (\ (list.equivalence n.equivalence) = expected (row.to-list actual)) (not died?)))))) )))) diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux index fd5e7be02..6b10df1d8 100644 --- a/stdlib/source/test/lux/control/concurrency/frp.lux +++ b/stdlib/source/test/lux/control/concurrency/frp.lux @@ -71,8 +71,8 @@ (case (io.run (do (try.with io.monad) [#let [[channel sink] (/.channel [])] - _ (:: sink feed sample) - _ (:: sink close)] + _ (\ sink feed sample) + _ (\ sink close)] (wrap channel))) (#try.Success channel) (io.run @@ -91,8 +91,8 @@ (case (io.run (do (try.with io.monad) [#let [[channel sink] (/.channel [])] - _ (:: sink close)] - (:: sink feed sample))) + _ (\ sink close)] + (\ sink feed sample))) (#try.Success _) false @@ -139,7 +139,7 @@ listened (|> sink atom.read promise.future - (:: ! map row.to-list))] + (\ ! map row.to-list))] (_.cover' [/.Subscriber /.subscribe] (and (list\= inputs output) @@ -183,7 +183,7 @@ (wrap (do promise.monad [#let [[channel sink] (/.poll polling-delay (: (IO Nat) (io.io sample)))] _ (promise.schedule total-delay (io.io [])) - _ (promise.future (:: sink close)) + _ (promise.future (\ sink close)) actual (/.consume channel)] (_.cover' [/.poll] (and (list.every? (n.= sample) actual) @@ -191,7 +191,7 @@ (wrap (do promise.monad [#let [[channel sink] (/.periodic polling-delay)] _ (promise.schedule total-delay (io.io [])) - _ (promise.future (:: sink close)) + _ (promise.future (\ sink close)) actual (/.consume channel)] (_.cover' [/.periodic] (n.>= amount-of-polls (list.size actual))))))) diff --git a/stdlib/source/test/lux/control/concurrency/promise.lux b/stdlib/source/test/lux/control/concurrency/promise.lux index 852dca607..bd980cd55 100644 --- a/stdlib/source/test/lux/control/concurrency/promise.lux +++ b/stdlib/source/test/lux/control/concurrency/promise.lux @@ -48,7 +48,7 @@ Test (<| (_.covering /._) (do {! random.monad} - [to-wait (|> random.nat (:: ! map (|>> (n.% 100) (n.max 10)))) + [to-wait (|> random.nat (\ ! map (|>> (n.% 100) (n.max 10)))) #let [extra-time (n.* 2 to-wait)] expected random.nat dummy random.nat diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux index d1c6ac1e4..8c31b9796 100644 --- a/stdlib/source/test/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux @@ -31,7 +31,7 @@ (_.with-cover [/.Semaphore] ($_ _.and (do {! random.monad} - [initial-open-positions (|> random.nat (:: ! map (|>> (n.% 10) (n.max 1)))) + [initial-open-positions (|> random.nat (\ ! map (|>> (n.% 10) (n.max 1)))) #let [semaphore (/.semaphore initial-open-positions)]] (wrap (do promise.monad [result (promise.time-out 10 (/.wait semaphore))] @@ -43,7 +43,7 @@ #.None false))))) (do {! random.monad} - [initial-open-positions (|> random.nat (:: ! map (|>> (n.% 10) (n.max 1)))) + [initial-open-positions (|> random.nat (\ ! map (|>> (n.% 10) (n.max 1)))) #let [semaphore (/.semaphore initial-open-positions)]] (wrap (do {! promise.monad} [_ (monad.map ! /.wait (list.repeat initial-open-positions semaphore)) @@ -56,7 +56,7 @@ #.None true))))) (do {! random.monad} - [initial-open-positions (|> random.nat (:: ! map (|>> (n.% 10) (n.max 1)))) + [initial-open-positions (|> random.nat (\ ! map (|>> (n.% 10) (n.max 1)))) #let [semaphore (/.semaphore initial-open-positions)]] (wrap (do {! promise.monad} [_ (monad.map ! /.wait (list.repeat initial-open-positions semaphore)) @@ -72,7 +72,7 @@ _ false))))) (do {! random.monad} - [initial-open-positions (|> random.nat (:: ! map (|>> (n.% 10) (n.max 1)))) + [initial-open-positions (|> random.nat (\ ! map (|>> (n.% 10) (n.max 1)))) #let [semaphore (/.semaphore initial-open-positions)]] (wrap (do promise.monad [outcome (/.signal semaphore)] @@ -90,7 +90,7 @@ (_.with-cover [/.Mutex] ($_ _.and (do {! random.monad} - [repetitions (|> random.nat (:: ! map (|>> (n.% 100) (n.max 10)))) + [repetitions (|> random.nat (\ ! map (|>> (n.% 100) (n.max 10)))) #let [resource (atom.atom "") expected-As (text.join-with "" (list.repeat repetitions "A")) expected-Bs (text.join-with "" (list.repeat repetitions "B")) @@ -147,7 +147,7 @@ _ false))) (do {! random.monad} - [limit (|> random.nat (:: ! map (|>> (n.% 10) (n.max 1)))) + [limit (|> random.nat (\ ! map (|>> (n.% 10) (n.max 1)))) #let [barrier (/.barrier (maybe.assume (/.limit limit))) resource (atom.atom "")]] (wrap (do {! promise.monad} diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux index 234c9a64e..1e7dee4e4 100644 --- a/stdlib/source/test/lux/control/concurrency/stm.lux +++ b/stdlib/source/test/lux/control/concurrency/stm.lux @@ -27,7 +27,7 @@ (def: injection (Injection /.STM) - (:: /.monad wrap)) + (\ /.monad wrap)) (def: comparison (Comparison /.STM) @@ -41,7 +41,7 @@ (do {! random.monad} [dummy random.nat expected random.nat - iterations-per-process (|> random.nat (:: ! map (n.% 100)))] + iterations-per-process (|> random.nat (\ ! map (n.% 100)))] ($_ _.and (_.with-cover [/.functor] ($functor.spec ..injection ..comparison /.functor)) @@ -51,7 +51,7 @@ ($monad.spec ..injection ..comparison /.monad)) (wrap (do promise.monad - [actual (/.commit (:: /.monad wrap expected))] + [actual (/.commit (\ /.monad wrap expected))] (_.cover' [/.commit] (n.= expected actual)))) (wrap (do promise.monad @@ -84,13 +84,13 @@ [follower sink] (io.run (/.follow box))] _ (/.commit (/.write expected box)) _ (/.commit (/.update (n.* 2) box)) - _ (promise.future (:: sink close)) + _ (promise.future (\ sink close)) _ (/.commit (/.update (n.* 3) box)) changes (frp.consume follower)] (_.cover' [/.follow] - (:: (list.equivalence n.equivalence) = - (list expected (n.* 2 expected)) - changes)))) + (\ (list.equivalence n.equivalence) = + (list expected (n.* 2 expected)) + changes)))) (wrap (let [var (/.var 0)] (do {! promise.monad} [_ (|> (list.repeat iterations-per-process []) diff --git a/stdlib/source/test/lux/control/concurrency/thread.lux b/stdlib/source/test/lux/control/concurrency/thread.lux index 7794be1b9..210ff4b1d 100644 --- a/stdlib/source/test/lux/control/concurrency/thread.lux +++ b/stdlib/source/test/lux/control/concurrency/thread.lux @@ -26,7 +26,7 @@ (do {! random.monad} [dummy random.nat expected random.nat - delay (|> random.nat (:: ! map (n.% 100)))] + delay (|> random.nat (\ ! map (n.% 100)))] ($_ _.and (_.cover [/.parallelism] (n.> 0 /.parallelism)) diff --git a/stdlib/source/test/lux/control/exception.lux b/stdlib/source/test/lux/control/exception.lux index 2075913a5..7f0578c5d 100644 --- a/stdlib/source/test/lux/control/exception.lux +++ b/stdlib/source/test/lux/control/exception.lux @@ -28,7 +28,7 @@ [expected random.nat wrong (|> random.nat (random.filter (|>> (n.= expected) not))) assertion-succeeded? random.bit - #let [report-element (:: ! map %.nat random.nat)] + #let [report-element (\ ! map %.nat random.nat)] field0 report-element value0 report-element field1 report-element diff --git a/stdlib/source/test/lux/control/function.lux b/stdlib/source/test/lux/control/function.lux index 6e9fc74ac..5775b9085 100644 --- a/stdlib/source/test/lux/control/function.lux +++ b/stdlib/source/test/lux/control/function.lux @@ -20,8 +20,8 @@ Test (do {! random.monad} [expected random.nat - f0 (:: ! map n.+ random.nat) - f1 (:: ! map n.* random.nat) + f0 (\ ! map n.+ random.nat) + f1 (\ ! map n.* random.nat) dummy random.nat extra (|> random.nat (random.filter (|>> (n.= expected) not)))] (<| (_.covering /._) @@ -32,7 +32,7 @@ (n.= (left extra) (right extra))))) generator (: (Random (-> Nat Nat)) - (:: ! map n.- random.nat))] + (\ ! map n.- random.nat))] (_.with-cover [/.monoid] ($monoid.spec equivalence /.monoid generator))) diff --git a/stdlib/source/test/lux/control/function/memo.lux b/stdlib/source/test/lux/control/function/memo.lux index a19b9e6f9..6350320b5 100644 --- a/stdlib/source/test/lux/control/function/memo.lux +++ b/stdlib/source/test/lux/control/function/memo.lux @@ -50,7 +50,7 @@ Test (<| (_.covering /._) (do {! random.monad} - [input (|> random.nat (:: ! map (|>> (n.% 5) (n.+ 23))))]) + [input (|> random.nat (\ ! map (|>> (n.% 5) (n.+ 23))))]) (_.with-cover [/.Memo]) ($_ _.and (_.cover [/.closed /.none] @@ -85,7 +85,7 @@ (: (//.Mixin Nat (State (Dictionary Nat Nat) Nat)) (function (factorial delegate recur input) (case input - (^or 0 1) (:: state.monad wrap 1) + (^or 0 1) (\ state.monad wrap 1) _ (do state.monad [output' (recur (dec input))] (wrap (n.* input output'))))))) diff --git a/stdlib/source/test/lux/control/function/mixin.lux b/stdlib/source/test/lux/control/function/mixin.lux index c4d6040cd..e9308e5bb 100644 --- a/stdlib/source/test/lux/control/function/mixin.lux +++ b/stdlib/source/test/lux/control/function/mixin.lux @@ -25,7 +25,7 @@ Test (<| (_.covering /._) (do {! random.monad} - [input (|> random.nat (:: ! map (|>> (n.% 6) (n.+ 20)))) + [input (|> random.nat (\ ! map (|>> (n.% 6) (n.+ 20)))) dummy random.nat shift (|> random.nat (random.filter (|>> (n.= dummy) not))) #let [equivalence (: (Equivalence (/.Mixin Nat Nat)) diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux index 569e32621..6710faaab 100644 --- a/stdlib/source/test/lux/control/parser.lux +++ b/stdlib/source/test/lux/control/parser.lux @@ -88,7 +88,7 @@ Test (do {! random.monad} [expected0 random.nat - variadic (:: ! map (|>> (n.max 1) (n.min 20)) random.nat) + variadic (\ ! map (|>> (n.max 1) (n.min 20)) random.nat) expected+ (random.list variadic random.nat) even0 (random.filter n.even? random.nat) odd0 (random.filter n.odd? random.nat) @@ -107,7 +107,7 @@ (and (|> (list\map code.nat expected+) (/.run (/.some s.nat)) (match actual - (:: (list.equivalence n.equivalence) = expected+ actual))) + (\ (list.equivalence n.equivalence) = expected+ actual))) (|> (list\map (|>> .int code.int) expected+) (/.run (/.some s.nat)) (match #.Nil @@ -116,7 +116,7 @@ (and (|> (list\map code.nat expected+) (/.run (/.many s.nat)) (match actual - (:: (list.equivalence n.equivalence) = expected+ actual))) + (\ (list.equivalence n.equivalence) = expected+ actual))) (|> (list (code.nat expected0)) (/.run (/.many s.nat)) (match (list actual) @@ -178,8 +178,8 @@ (def: combinators-1 Test (do {! random.monad} - [variadic (:: ! map (|>> (n.max 1) (n.min 20)) random.nat) - times (:: ! map (n.% variadic) random.nat) + [variadic (\ ! map (|>> (n.max 1) (n.min 20)) random.nat) + times (\ ! map (n.% variadic) random.nat) expected random.nat wrong (|> random.nat (random.filter (|>> (n.= expected) not))) expected+ (random.list variadic random.nat) @@ -189,9 +189,9 @@ (and (|> (list\map code.nat expected+) (/.run (/.exactly times s.nat)) (match actual - (:: (list.equivalence n.equivalence) = - (list.take times expected+) - actual))) + (\ (list.equivalence n.equivalence) = + (list.take times expected+) + actual))) (|> (list\map code.nat expected+) (/.run (/.exactly (inc variadic) s.nat)) fails?))) @@ -199,9 +199,9 @@ (and (|> (list\map code.nat expected+) (/.run (/.at-least times s.nat)) (match actual - (:: (list.equivalence n.equivalence) = - expected+ - actual))) + (\ (list.equivalence n.equivalence) = + expected+ + actual))) (|> (list\map code.nat expected+) (/.run (/.at-least (inc variadic) s.nat)) fails?))) @@ -209,44 +209,44 @@ (and (|> (list\map code.nat expected+) (/.run (/.at-most times s.nat)) (match actual - (:: (list.equivalence n.equivalence) = - (list.take times expected+) - actual))) + (\ (list.equivalence n.equivalence) = + (list.take times expected+) + actual))) (|> (list\map code.nat expected+) (/.run (/.at-most (inc variadic) s.nat)) (match actual - (:: (list.equivalence n.equivalence) = - expected+ - actual))))) + (\ (list.equivalence n.equivalence) = + expected+ + actual))))) (_.cover [/.between] (and (|> (list\map code.nat expected+) (/.run (/.between times variadic s.nat)) (match actual - (:: (list.equivalence n.equivalence) = - expected+ - actual))) + (\ (list.equivalence n.equivalence) = + expected+ + actual))) (|> (list\map code.nat (list.take times expected+)) (/.run (/.between times variadic s.nat)) (match actual - (:: (list.equivalence n.equivalence) = - (list.take times expected+) - actual))))) + (\ (list.equivalence n.equivalence) = + (list.take times expected+) + actual))))) (_.cover [/.sep-by] (|> (list.interpose (code.text separator) (list\map code.nat expected+)) (/.run (/.sep-by (s.this! (code.text separator)) s.nat)) (match actual - (:: (list.equivalence n.equivalence) = - expected+ - actual)))) + (\ (list.equivalence n.equivalence) = + expected+ + actual)))) (_.cover [/.remaining] (|> (list\map code.nat expected+) (/.run /.remaining) (match actual - (:: (list.equivalence code.equivalence) = - (list\map code.nat expected+) - actual)))) + (\ (list.equivalence code.equivalence) = + (list\map code.nat expected+) + actual)))) (_.cover [/.default] - (and (|> (/.run (/.default wrong (:: /.monad wrap expected)) (list)) + (and (|> (/.run (/.default wrong (\ /.monad wrap expected)) (list)) (match actual (n.= expected actual))) (|> (/.run (/.default expected (: (Parser (List Code) Nat) (/.fail "yolo"))) @@ -331,7 +331,7 @@ (def: injection (Injection (All [a i] (Parser i a))) - (:: /.monad wrap)) + (\ /.monad wrap)) (def: comparison (Comparison (All [a i] (Parser i a))) @@ -360,7 +360,7 @@ ($monad.spec ..injection ..comparison /.monad)) (_.cover [/.run] - (|> (/.run (:: /.monad wrap expected) (list)) + (|> (/.run (\ /.monad wrap expected) (list)) (match actual (n.= expected actual)))) (_.cover [/.fail] (|> (list) diff --git a/stdlib/source/test/lux/control/parser/analysis.lux b/stdlib/source/test/lux/control/parser/analysis.lux index f09967760..d4b4e533f 100644 --- a/stdlib/source/test/lux/control/parser/analysis.lux +++ b/stdlib/source/test/lux/control/parser/analysis.lux @@ -52,12 +52,12 @@ [] (`` ($_ _.and (do {! random.monad} - [expected (:: ! map (|>> analysis.bit) random.bit)] + [expected (\ ! map (|>> analysis.bit) random.bit)] (_.cover [/.run /.any] (|> (list expected) (/.run /.any) (case> (#try.Success actual) - (:: analysis.equivalence = expected actual) + (\ analysis.equivalence = expected actual) (#try.Failure _) false)))) diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux index 9e4c06f18..94225be79 100644 --- a/stdlib/source/test/lux/control/parser/binary.lux +++ b/stdlib/source/test/lux/control/parser/binary.lux @@ -90,7 +90,7 @@ (random.rec (function (_ recur) (let [random-sequence (do {! random.monad} - [size (:: ! map (n.% 2) random.nat)] + [size (\ ! map (n.% 2) random.nat)] (random.list size recur))] ($_ random.and ..random-location @@ -107,7 +107,7 @@ random-sequence random-sequence (do {! random.monad} - [size (:: ! map (n.% 2) random.nat)] + [size (\ ! map (n.% 2) random.nat)] (random.list size (random.and recur recur))) ))))))) @@ -126,8 +126,8 @@ (`` ($_ _.and (~~ (template [<size> <parser> <format>] [(do {! random.monad} - [expected (:: ! map (i64.and (i64.mask <size>)) - random.nat)] + [expected (\ ! map (i64.and (i64.mask <size>)) + random.nat)] (_.cover [<size> <parser> <format>] (|> (format.run <format> expected) (/.run <parser>) @@ -146,12 +146,12 @@ (`` ($_ _.and (~~ (template [<parser> <format>] [(do {! random.monad} - [expected (:: ! map encoding.to-utf8 (random.ascii ..segment-size))] + [expected (\ ! map encoding.to-utf8 (random.ascii ..segment-size))] (_.cover [<parser> <format>] (|> (format.run <format> expected) (/.run <parser>) (!expect (^multi (#try.Success actual) - (:: binary.equivalence = expected actual))))))] + (\ binary.equivalence = expected actual))))))] [/.binary/8 format.binary/8] [/.binary/16 format.binary/16] @@ -169,7 +169,7 @@ (|> (format.run <format> expected) (/.run <parser>) (!expect (^multi (#try.Success actual) - (:: text.equivalence = expected actual))))))] + (\ text.equivalence = expected actual))))))] [/.utf8/8 format.utf8/8] [/.utf8/16 format.utf8/16] @@ -189,7 +189,7 @@ (format.run (<format> format.nat)) (/.run (<parser> /.nat)) (!expect (^multi (#try.Success actual) - (:: (row.equivalence n.equivalence) = expected actual))))))] + (\ (row.equivalence n.equivalence) = expected actual))))))] [/.row/8 format.row/8] [/.row/16 format.row/16] @@ -208,7 +208,7 @@ (format.run <format>) (/.run <parser>) (!expect (^multi (#try.Success actual) - (:: <equivalence> = expected actual))))))] + (\ <equivalence> = expected actual))))))] [/.bit format.bit random.bit bit.equivalence] [/.nat format.nat random.nat n.equivalence] @@ -221,13 +221,13 @@ (format.run format.frac) (/.run /.frac) (!expect (^multi (#try.Success actual) - (or (:: frac.equivalence = expected actual) + (or (\ frac.equivalence = expected actual) (and (frac.not-a-number? expected) (frac.not-a-number? actual)))))))) (do {! random.monad} - [expected (:: ! map (|>> (i64.and (i64.mask /.size/8)) - (n.max 2)) - random.nat)] + [expected (\ ! map (|>> (i64.and (i64.mask /.size/8)) + (n.max 2)) + random.nat)] (_.cover [/.not-a-bit] (|> expected (format.run format.bits/8) @@ -247,7 +247,7 @@ (format.run <format>) (/.run <parser>) (!expect (^multi (#try.Success actual) - (:: <equivalence> = expected actual))))))] + (\ <equivalence> = expected actual))))))] [/.location format.location random-location location-equivalence] [/.code format.code random-code code.equivalence] @@ -261,14 +261,14 @@ (format.run <format>) (/.run <parser>) (!expect (^multi (#try.Success actual) - (:: <equivalence> = expected actual))))))] + (\ <equivalence> = expected actual))))))] [/.maybe (/.maybe /.nat) format.maybe (format.maybe format.nat) (random.maybe random.nat) (maybe.equivalence n.equivalence)] [/.list (/.list /.nat) format.list (format.list format.nat) (random.list ..segment-size random.nat) (list.equivalence n.equivalence)] [/.set (/.set n.hash /.nat) format.set (format.set format.nat) (random.set n.hash ..segment-size random.nat) set.equivalence] [/.name /.name format.name format.name ..random-name name.equivalence])) (do {! random.monad} - [expected (:: ! map (list.repeat ..segment-size) random.nat)] + [expected (\ ! map (list.repeat ..segment-size) random.nat)] (_.cover [/.set-elements-are-not-unique] (|> expected (format.run (format.list format.nat)) @@ -283,13 +283,13 @@ (/.run (: (/.Parser (Either Bit Nat)) (/.or /.bit /.nat))) (!expect (^multi (#try.Success actual) - (:: (sum.equivalence bit.equivalence n.equivalence) = - expected - actual)))))) + (\ (sum.equivalence bit.equivalence n.equivalence) = + expected + actual)))))) (do {! random.monad} - [tag (:: ! map (|>> (i64.and (i64.mask /.size/8)) - (n.max 2)) - random.nat) + [tag (\ ! map (|>> (i64.and (i64.mask /.size/8)) + (n.max 2)) + random.nat) value random.bit] (_.cover [/.invalid-tag] (|> [tag value] @@ -311,9 +311,9 @@ (<>.and /.nat recur)))))) (!expect (^multi (#try.Success actual) - (:: (list.equivalence n.equivalence) = - expected - actual)))))) + (\ (list.equivalence n.equivalence) = + expected + actual)))))) ))) (def: #export test @@ -327,22 +327,22 @@ (/.run /.any) (!expect (#try.Success _)))) (do {! random.monad} - [data (:: ! map encoding.to-utf8 (random.ascii ..segment-size))] + [data (\ ! map encoding.to-utf8 (random.ascii ..segment-size))] (_.cover [/.binary-was-not-fully-read] (|> data (/.run /.any) (!expect (^multi (#try.Failure error) (exception.match? /.binary-was-not-fully-read error)))))) (do {! random.monad} - [expected (:: ! map encoding.to-utf8 (random.ascii ..segment-size))] + [expected (\ ! map encoding.to-utf8 (random.ascii ..segment-size))] (_.cover [/.segment format.segment format.run] (|> expected (format.run (format.segment ..segment-size)) (/.run (/.segment ..segment-size)) (!expect (^multi (#try.Success actual) - (:: binary.equivalence = expected actual)))))) + (\ binary.equivalence = expected actual)))))) (do {! random.monad} - [data (:: ! map encoding.to-utf8 (random.ascii ..segment-size))] + [data (\ ! map encoding.to-utf8 (random.ascii ..segment-size))] (_.cover [/.end?] (|> data (/.run (do <>.monad @@ -353,8 +353,8 @@ post)))) (!expect (#try.Success #1))))) (do {! random.monad} - [to-read (:: ! map (n.% (inc ..segment-size)) random.nat) - data (:: ! map encoding.to-utf8 (random.ascii ..segment-size))] + [to-read (\ ! map (n.% (inc ..segment-size)) random.nat) + data (\ ! map encoding.to-utf8 (random.ascii ..segment-size))] (_.cover [/.Offset /.offset] (|> data (/.run (do <>.monad @@ -368,8 +368,8 @@ (n.= ..segment-size nothing-left))))) (!expect (#try.Success #1))))) (do {! random.monad} - [to-read (:: ! map (n.% (inc ..segment-size)) random.nat) - data (:: ! map encoding.to-utf8 (random.ascii ..segment-size))] + [to-read (\ ! map (n.% (inc ..segment-size)) random.nat) + data (\ ! map encoding.to-utf8 (random.ascii ..segment-size))] (_.cover [/.remaining] (|> data (/.run (do <>.monad diff --git a/stdlib/source/test/lux/control/parser/cli.lux b/stdlib/source/test/lux/control/parser/cli.lux index 1222b9de1..6be78b640 100644 --- a/stdlib/source/test/lux/control/parser/cli.lux +++ b/stdlib/source/test/lux/control/parser/cli.lux @@ -30,7 +30,7 @@ (<| (_.covering /._) (_.with-cover [/.Parser]) (do {! random.monad} - [expected (:: ! map n\encode random.nat) + [expected (\ ! map n\encode random.nat) #let [random-dummy (random.filter (|>> (text\= expected) not) (random.unicode 5))] dummy random-dummy diff --git a/stdlib/source/test/lux/control/parser/code.lux b/stdlib/source/test/lux/control/parser/code.lux index 521704dec..3955d760f 100644 --- a/stdlib/source/test/lux/control/parser/code.lux +++ b/stdlib/source/test/lux/control/parser/code.lux @@ -44,7 +44,7 @@ (_.with-cover [/.Parser]) (`` ($_ _.and (do {! random.monad} - [expected (:: ! map code.bit random.bit)] + [expected (\ ! map code.bit random.bit)] (_.cover [/.run] (and (|> (/.run /.any (list expected)) (!expect (#try.Success _))) @@ -53,12 +53,12 @@ (~~ (template [<query> <check> <random> <code> <equivalence>] [(do {! random.monad} [expected <random> - dummy (|> <random> (random.filter (|>> (:: <equivalence> = expected) not)))] + dummy (|> <random> (random.filter (|>> (\ <equivalence> = expected) not)))] ($_ _.and (_.cover [<query>] (|> (/.run <query> (list (<code> expected))) (!expect (^multi (#try.Success actual) - (:: <equivalence> = expected actual))))) + (\ <equivalence> = expected actual))))) (_.cover [<check>] (and (|> (/.run (<check> expected) (list (<code> expected))) (!expect (#try.Success []))) @@ -66,7 +66,7 @@ (!expect (#try.Failure _))))) ))] - [/.any /.this! (:: ! map code.bit random.bit) function.identity code.equivalence] + [/.any /.this! (\ ! map code.bit random.bit) function.identity code.equivalence] [/.bit /.bit! random.bit code.bit bit.equivalence] [/.nat /.nat! random.nat code.nat nat.equivalence] [/.int /.int! random.int code.int int.equivalence] @@ -87,8 +87,8 @@ (list (<code> (list (code.nat expected-left) (code.int expected-right))))) (!expect (^multi (#try.Success [actual-left actual-right]) - (and (:: nat.equivalence = expected-left actual-left) - (:: int.equivalence = expected-right actual-right)))))))] + (and (\ nat.equivalence = expected-left actual-left) + (\ int.equivalence = expected-right actual-right)))))))] [/.form code.form] [/.tuple code.tuple] @@ -101,8 +101,8 @@ (list (code.record (list [(code.nat expected-left) (code.int expected-right)])))) (!expect (^multi (#try.Success [actual-left actual-right]) - (and (:: nat.equivalence = expected-left actual-left) - (:: int.equivalence = expected-right actual-right))))))) + (and (\ nat.equivalence = expected-left actual-left) + (\ int.equivalence = expected-right actual-right))))))) (do {! random.monad} [expected-local random.nat expected-global random.int] @@ -111,10 +111,10 @@ /.int) (list (code.int expected-global))) (!expect (^multi (#try.Success [actual-local actual-global]) - (and (:: nat.equivalence = expected-local actual-local) - (:: int.equivalence = expected-global actual-global))))))) + (and (\ nat.equivalence = expected-local actual-local) + (\ int.equivalence = expected-global actual-global))))))) (do {! random.monad} - [dummy (:: ! map code.bit random.bit)] + [dummy (\ ! map code.bit random.bit)] (_.cover [/.end?] (|> (/.run (do <>.monad [pre /.end? @@ -126,7 +126,7 @@ (!expect (^multi (#try.Success verdict) verdict))))) (do {! random.monad} - [dummy (:: ! map code.bit random.bit)] + [dummy (\ ! map code.bit random.bit)] (_.cover [/.end!] (and (|> (/.run /.end! (list)) (!expect (#try.Success []))) diff --git a/stdlib/source/test/lux/control/parser/environment.lux b/stdlib/source/test/lux/control/parser/environment.lux index 89b174b47..2c2263862 100644 --- a/stdlib/source/test/lux/control/parser/environment.lux +++ b/stdlib/source/test/lux/control/parser/environment.lux @@ -29,7 +29,7 @@ [expected random.nat] (_.cover [/.run] (|> (/.run (//\wrap expected) /.empty) - (:: try.functor map (n.= expected)) + (\ try.functor map (n.= expected)) (try.default false)))) (do random.monad [property (random.ascii/alpha 1) @@ -38,7 +38,7 @@ (|> /.empty (dictionary.put property expected) (/.run (/.property property)) - (:: try.functor map (text\= expected)) + (\ try.functor map (text\= expected)) (try.default false)))) (do random.monad [property (random.ascii/alpha 1)] diff --git a/stdlib/source/test/lux/control/parser/json.lux b/stdlib/source/test/lux/control/parser/json.lux index 27c508bd5..e9bd03ef6 100644 --- a/stdlib/source/test/lux/control/parser/json.lux +++ b/stdlib/source/test/lux/control/parser/json.lux @@ -45,23 +45,23 @@ (_.with-cover [/.Parser]) (`` ($_ _.and (do {! random.monad} - [expected (:: ! map (|>> #json.String) (random.unicode 1))] + [expected (\ ! map (|>> #json.String) (random.unicode 1))] (_.cover [/.run /.any] (|> (/.run /.any expected) (!expect (^multi (#try.Success actual) - (:: json.equivalence = expected actual)))))) + (\ json.equivalence = expected actual)))))) (_.cover [/.null] (|> (/.run /.null #json.Null) (!expect (#try.Success _)))) (~~ (template [<query> <test> <check> <random> <json> <equivalence>] [(do {! random.monad} [expected <random> - dummy (|> <random> (random.filter (|>> (:: <equivalence> = expected) not)))] + dummy (|> <random> (random.filter (|>> (\ <equivalence> = expected) not)))] ($_ _.and (_.cover [<query>] (|> (/.run <query> (<json> expected)) (!expect (^multi (#try.Success actual) - (:: <equivalence> = expected actual))))) + (\ <equivalence> = expected actual))))) (_.cover [<test>] (and (|> (/.run (<test> expected) (<json> expected)) (!expect (#try.Success #1))) @@ -86,7 +86,7 @@ (exception.match? /.unexpected-value error)))))) (do {! random.monad} [expected (random.unicode 1) - dummy (|> (random.unicode 1) (random.filter (|>> (:: text.equivalence = expected) not)))] + dummy (|> (random.unicode 1) (random.filter (|>> (\ text.equivalence = expected) not)))] (_.cover [/.value-mismatch] (|> (/.run (/.string! expected) (#json.String dummy)) (!expect (^multi (#try.Failure error) @@ -96,22 +96,22 @@ (_.cover [/.nullable] (and (|> (/.run (/.nullable /.string) #json.Null) (!expect (^multi (#try.Success actual) - (:: (maybe.equivalence text.equivalence) = #.None actual)))) + (\ (maybe.equivalence text.equivalence) = #.None actual)))) (|> (/.run (/.nullable /.string) (#json.String expected)) (!expect (^multi (#try.Success actual) - (:: (maybe.equivalence text.equivalence) = (#.Some expected) actual))))))) + (\ (maybe.equivalence text.equivalence) = (#.Some expected) actual))))))) (do {! random.monad} - [size (:: ! map (n.% 10) random.nat) + [size (\ ! map (n.% 10) random.nat) expected (|> (random.unicode 1) (random.list size) - (:: ! map row.from-list))] + (\ ! map row.from-list))] (_.cover [/.array] (|> (/.run (/.array (<>.some /.string)) (#json.Array (row\map (|>> #json.String) expected))) (!expect (^multi (#try.Success actual) - (:: (row.equivalence text.equivalence) = expected (row.from-list actual))))))) + (\ (row.equivalence text.equivalence) = expected (row.from-list actual))))))) (do {! random.monad} - [expected (:: ! map (|>> #json.String) (random.unicode 1))] + [expected (\ ! map (|>> #json.String) (random.unicode 1))] (_.cover [/.unconsumed-input] (|> (/.run (/.array /.any) (#json.Array (row expected expected))) (!expect (^multi (#try.Failure error) @@ -125,12 +125,12 @@ expected-number ..safe-frac expected-string (random.unicode 1) [boolean-field number-field string-field] (|> (random.set text.hash 3 (random.unicode 3)) - (:: ! map (|>> set.to-list - (case> (^ (list boolean-field number-field string-field)) - [boolean-field number-field string-field] + (\ ! map (|>> set.to-list + (case> (^ (list boolean-field number-field string-field)) + [boolean-field number-field string-field] - _ - (undefined)))))] + _ + (undefined)))))] (_.cover [/.object /.field] (|> (/.run (/.object ($_ <>.and (/.field boolean-field /.boolean) @@ -142,11 +142,11 @@ [number-field (#json.Number expected-number)] [string-field (#json.String expected-string)])))) (!expect (^multi (#try.Success [actual-boolean actual-number actual-string]) - (and (:: bit.equivalence = expected-boolean actual-boolean) - (:: frac.equivalence = expected-number actual-number) - (:: text.equivalence = expected-string actual-string))))))) + (and (\ bit.equivalence = expected-boolean actual-boolean) + (\ frac.equivalence = expected-number actual-number) + (\ text.equivalence = expected-string actual-string))))))) (do {! random.monad} - [size (:: ! map (n.% 10) random.nat) + [size (\ ! map (n.% 10) random.nat) keys (random.list size (random.unicode 1)) values (random.list size (random.unicode 1)) #let [expected (dictionary.from-list text.hash (list.zip/2 keys values))]] @@ -158,5 +158,5 @@ (list.zip/2 keys) (dictionary.from-list text.hash)))) (!expect (^multi (#try.Success actual) - (:: (dictionary.equivalence text.equivalence) = expected actual)))))) + (\ (dictionary.equivalence text.equivalence) = expected actual)))))) )))) diff --git a/stdlib/source/test/lux/control/parser/synthesis.lux b/stdlib/source/test/lux/control/parser/synthesis.lux index da6e3247f..d7709687f 100644 --- a/stdlib/source/test/lux/control/parser/synthesis.lux +++ b/stdlib/source/test/lux/control/parser/synthesis.lux @@ -52,9 +52,9 @@ (def: random-environment (Random (Environment Synthesis)) (do {! random.monad} - [size (:: ! map (n.% 5) random.nat)] + [size (\ ! map (n.% 5) random.nat)] (|> ..random-variable - (:: ! map (|>> synthesis.variable)) + (\ ! map (|>> synthesis.variable)) (random.list size)))) (def: simple @@ -63,12 +63,12 @@ (~~ (template [<query> <check> <random> <synthesis> <equivalence>] [(do {! random.monad} [expected <random> - dummy (|> <random> (random.filter (|>> (:: <equivalence> = expected) not)))] + dummy (|> <random> (random.filter (|>> (\ <equivalence> = expected) not)))] ($_ _.and (_.cover [<query>] (|> (/.run <query> (list (<synthesis> expected))) (!expect (^multi (#try.Success actual) - (:: <equivalence> = expected actual))))) + (\ <equivalence> = expected actual))))) (_.cover [<check>] (and (|> (/.run (<check> expected) (list (<synthesis> expected))) (!expect (#try.Success _))) @@ -77,7 +77,7 @@ (exception.match? /.cannot-parse error))))))))] [/.bit /.bit! random.bit synthesis.bit bit.equivalence] - [/.i64 /.i64! (:: ! map .i64 random.nat) synthesis.i64 i64.equivalence] + [/.i64 /.i64! (\ ! map .i64 random.nat) synthesis.i64 i64.equivalence] [/.f64 /.f64! random.safe-frac synthesis.f64 frac.equivalence] [/.text /.text! (random.unicode 1) synthesis.text text.equivalence] [/.local /.local! random.nat synthesis.variable/local n.equivalence] @@ -91,7 +91,7 @@ ($_ _.and (do {! random.monad} [expected-bit random.bit - expected-i64 (:: ! map .i64 random.nat) + expected-i64 (\ ! map .i64 random.nat) expected-f64 random.safe-frac expected-text (random.unicode 1)] (_.cover [/.tuple] @@ -101,10 +101,10 @@ (synthesis.f64 expected-f64) (synthesis.text expected-text))))) (!expect (^multi (#try.Success [actual-bit actual-i64 actual-f64 actual-text]) - (and (:: bit.equivalence = expected-bit actual-bit) - (:: i64.equivalence = expected-i64 actual-i64) - (:: frac.equivalence = expected-f64 actual-f64) - (:: text.equivalence = expected-text actual-text))))) + (and (\ bit.equivalence = expected-bit actual-bit) + (\ i64.equivalence = expected-i64 actual-i64) + (\ frac.equivalence = expected-f64 actual-f64) + (\ text.equivalence = expected-text actual-text))))) (|> (/.run (/.tuple ($_ <>.and /.bit /.i64 /.f64 /.text)) (list (synthesis.text expected-text))) (!expect (^multi (#try.Failure error) @@ -117,10 +117,10 @@ (and (|> (/.run (/.function arity /.text) (list (synthesis.function/abstraction [expected-environment arity (synthesis.text expected-body)]))) (!expect (^multi (#try.Success [actual-environment actual-body]) - (and (:: (list.equivalence synthesis.equivalence) = - expected-environment - actual-environment) - (:: text.equivalence = expected-body actual-body))))) + (and (\ (list.equivalence synthesis.equivalence) = + expected-environment + actual-environment) + (\ text.equivalence = expected-body actual-body))))) (|> (/.run (/.function arity /.text) (list (synthesis.text expected-body))) (!expect (^multi (#try.Failure error) @@ -135,7 +135,7 @@ (!expect (^multi (#try.Failure error) (exception.match? /.wrong-arity error)))))) (do {! random.monad} - [arity (:: ! map (|>> (n.% 10) inc) random.nat) + [arity (\ ! map (|>> (n.% 10) inc) random.nat) expected-offset random.nat expected-inits (random.list arity random.bit) expected-body (random.unicode 1)] @@ -145,11 +145,11 @@ (list\map (|>> synthesis.bit) expected-inits) (synthesis.text expected-body)]))) (!expect (^multi (#try.Success [actual-offset actual-inits actual-body]) - (and (:: n.equivalence = expected-offset actual-offset) - (:: (list.equivalence bit.equivalence) = - expected-inits - actual-inits) - (:: text.equivalence = expected-body actual-body))))) + (and (\ n.equivalence = expected-offset actual-offset) + (\ (list.equivalence bit.equivalence) = + expected-inits + actual-inits) + (\ text.equivalence = expected-body actual-body))))) (|> (/.run (/.loop (<>.many /.bit) /.text) (list (synthesis.text expected-body))) (!expect (^multi (#try.Failure error) @@ -162,23 +162,23 @@ (_.with-cover [/.Parser]) ($_ _.and (do {! random.monad} - [expected (:: ! map (|>> synthesis.i64) random.nat)] + [expected (\ ! map (|>> synthesis.i64) random.nat)] (_.cover [/.run /.any] (|> (/.run /.any (list expected)) (!expect (^multi (#try.Success actual) - (:: synthesis.equivalence = expected actual)))))) + (\ synthesis.equivalence = expected actual)))))) (_.cover [/.empty-input] (|> (/.run /.any (list)) (!expect (^multi (#try.Failure error) (exception.match? /.empty-input error))))) (do {! random.monad} - [expected (:: ! map (|>> synthesis.i64) random.nat)] + [expected (\ ! map (|>> synthesis.i64) random.nat)] (_.cover [/.unconsumed-input] (|> (/.run /.any (list expected expected)) (!expect (^multi (#try.Failure error) (exception.match? /.unconsumed-input error)))))) (do {! random.monad} - [dummy (:: ! map (|>> synthesis.i64) random.nat)] + [dummy (\ ! map (|>> synthesis.i64) random.nat)] (_.cover [/.end! /.expected-empty-input] (and (|> (/.run /.end! (list)) (!expect (#try.Success _))) @@ -186,7 +186,7 @@ (!expect (^multi (#try.Failure error) (exception.match? /.expected-empty-input error))))))) (do {! random.monad} - [dummy (:: ! map (|>> synthesis.i64) random.nat)] + [dummy (\ ! map (|>> synthesis.i64) random.nat)] (_.cover [/.end?] (and (|> (/.run /.end? (list)) (!expect (#try.Success #1))) diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux index 2575509de..74fc6a8fd 100644 --- a/stdlib/source/test/lux/control/parser/text.lux +++ b/stdlib/source/test/lux/control/parser/text.lux @@ -58,7 +58,7 @@ (-> Text (/.Parser Text) Bit) (|> expected (/.run parser) - (:: try.functor map (text\= expected)) + (\ try.functor map (text\= expected)) (try.default false))) (def: (should-pass! expected parser) @@ -69,13 +69,13 @@ Test ($_ _.and (do {! random.monad} - [offset (:: ! map (n.% 50) random.nat) - range (:: ! map (|>> (n.% 50) (n.+ 10)) random.nat) + [offset (\ ! map (n.% 50) random.nat) + range (\ ! map (|>> (n.% 50) (n.+ 10)) random.nat) #let [limit (n.+ offset range)] - expected (:: ! map (|>> (n.% range) (n.+ offset) text.from-code) random.nat) + expected (\ ! map (|>> (n.% range) (n.+ offset) text.from-code) random.nat) out-of-range (case offset - 0 (:: ! map (|>> (n.% 10) inc (n.+ limit) text.from-code) random.nat) - _ (:: ! map (|>> (n.% offset) text.from-code) random.nat))] + 0 (\ ! map (|>> (n.% 10) inc (n.+ limit) text.from-code) random.nat) + _ (\ ! map (|>> (n.% offset) text.from-code) random.nat))] (_.cover [/.range] (and (..should-pass expected (/.range offset limit)) (..should-fail out-of-range (/.range offset limit))))) @@ -94,22 +94,22 @@ (and (..should-pass (text.from-code expected) /.lower) (..should-fail (text.from-code invalid) /.lower)))) (do {! random.monad} - [expected (:: ! map (n.% 10) random.nat) + [expected (\ ! map (n.% 10) random.nat) invalid (random.char (unicode.set [unicode.number-forms (list)]))] (_.cover [/.decimal] - (and (..should-pass (:: n.decimal encode expected) /.decimal) + (and (..should-pass (\ n.decimal encode expected) /.decimal) (..should-fail (text.from-code invalid) /.decimal)))) (do {! random.monad} - [expected (:: ! map (n.% 8) random.nat) + [expected (\ ! map (n.% 8) random.nat) invalid (random.char (unicode.set [unicode.number-forms (list)]))] (_.cover [/.octal] - (and (..should-pass (:: n.octal encode expected) /.octal) + (and (..should-pass (\ n.octal encode expected) /.octal) (..should-fail (text.from-code invalid) /.octal)))) (do {! random.monad} - [expected (:: ! map (n.% 16) random.nat) + [expected (\ ! map (n.% 16) random.nat) invalid (random.char (unicode.set [unicode.number-forms (list)]))] (_.cover [/.hexadecimal] - (and (..should-pass (:: n.hex encode expected) /.hexadecimal) + (and (..should-pass (\ n.hex encode expected) /.hexadecimal) (..should-fail (text.from-code invalid) /.hexadecimal)))) (do {! random.monad} [expected (random.char unicode.ascii/alpha) @@ -152,14 +152,14 @@ [#let [num-options 3] options (|> (random.char unicode.full) (random.set n.hash num-options) - (:: ! map (|>> set.to-list - (list\map text.from-code) - (text.join-with "")))) - expected (:: ! map (function (_ value) - (|> options - (text.nth (n.% num-options value)) - maybe.assume)) - random.nat) + (\ ! map (|>> set.to-list + (list\map text.from-code) + (text.join-with "")))) + expected (\ ! map (function (_ value) + (|> options + (text.nth (n.% num-options value)) + maybe.assume)) + random.nat) invalid (random.filter (|>> text.from-code (text.contains? options) not) @@ -178,14 +178,14 @@ [#let [num-options 3] options (|> (random.char unicode.full) (random.set n.hash num-options) - (:: ! map (|>> set.to-list - (list\map text.from-code) - (text.join-with "")))) - invalid (:: ! map (function (_ value) - (|> options - (text.nth (n.% num-options value)) - maybe.assume)) - random.nat) + (\ ! map (|>> set.to-list + (list\map text.from-code) + (text.join-with "")))) + invalid (\ ! map (function (_ value) + (|> options + (text.nth (n.% num-options value)) + maybe.assume)) + random.nat) expected (random.filter (|>> text.from-code (text.contains? options) not) @@ -207,26 +207,26 @@ (let [octal! (/.one-of! "01234567")] ($_ _.and (do {! random.monad} - [left (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat) - right (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat) + [left (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat) + right (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat) #let [expected (format left right)] invalid (|> random.nat - (:: ! map (n.% 16)) + (\ ! map (n.% 16)) (random.filter (n.>= 8)) - (:: ! map (:: n.hex encode)))] + (\ ! map (\ n.hex encode)))] (_.cover [/.many /.many!] (and (..should-pass expected (/.many /.octal)) (..should-fail invalid (/.many /.octal)) (..should-pass! expected (/.many! octal!))))) (do {! random.monad} - [left (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat) - right (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat) + [left (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat) + right (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat) #let [expected (format left right)] invalid (|> random.nat - (:: ! map (n.% 16)) + (\ ! map (n.% 16)) (random.filter (n.>= 8)) - (:: ! map (:: n.hex encode)))] + (\ ! map (\ n.hex encode)))] (_.cover [/.some /.some!] (and (..should-pass expected (/.some /.octal)) (..should-pass "" (/.some /.octal)) @@ -235,7 +235,7 @@ (..should-pass! expected (/.some! octal!)) (..should-pass! "" (/.some! octal!))))) (do {! random.monad} - [#let [octal (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat)] + [#let [octal (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat)] first octal second octal third octal] @@ -248,7 +248,7 @@ (..should-fail (format first second third) (/.exactly! 2 octal!)) (..should-fail (format first) (/.exactly! 2 octal!))))) (do {! random.monad} - [#let [octal (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat)] + [#let [octal (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat)] first octal second octal third octal] @@ -261,7 +261,7 @@ (..should-pass! (format first) (/.at-most! 2 octal!)) (..should-fail (format first second third) (/.at-most! 2 octal!))))) (do {! random.monad} - [#let [octal (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat)] + [#let [octal (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat)] first octal second octal third octal] @@ -274,7 +274,7 @@ (..should-pass! (format first second third) (/.at-least! 2 octal!)) (..should-fail (format first) (/.at-least! 2 octal!))))) (do {! random.monad} - [#let [octal (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat)] + [#let [octal (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat)] first octal second octal third octal] @@ -386,7 +386,7 @@ (/.this out))) (!expect (#try.Success _))))) (do {! random.monad} - [expected (:: ! map (|>> (n.% 8) (:: n.octal encode)) random.nat)] + [expected (\ ! map (|>> (n.% 8) (\ n.octal encode)) random.nat)] (_.cover [/.embed] (|> (list (code.text expected)) (<c>.run (/.embed /.octal <c>.text)) diff --git a/stdlib/source/test/lux/control/parser/type.lux b/stdlib/source/test/lux/control/parser/type.lux index 729551843..705c9ef24 100644 --- a/stdlib/source/test/lux/control/parser/type.lux +++ b/stdlib/source/test/lux/control/parser/type.lux @@ -28,8 +28,8 @@ (def: primitive (Random Type) (|> (random.ascii/alpha-num 1) - (:: random.monad map (function (_ name) - (#.Primitive name (list)))))) + (\ random.monad map (function (_ name) + (#.Primitive name (list)))))) (def: matches Test diff --git a/stdlib/source/test/lux/control/region.lux b/stdlib/source/test/lux/control/region.lux index d9f28e5db..088f3dc7c 100644 --- a/stdlib/source/test/lux/control/region.lux +++ b/stdlib/source/test/lux/control/region.lux @@ -79,7 +79,7 @@ (<| (_.covering /._) (_.with-cover [/.Region]) (do {! random.monad} - [expected-clean-ups (|> random.nat (:: ! map (|>> (n.% 100) (n.max 1))))] + [expected-clean-ups (|> random.nat (\ ! map (|>> (n.% 100) (n.max 1))))] ($_ _.and (_.with-cover [/.functor] ($functor.spec ..injection ..comparison (: (All [! r] diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux index 6206206e3..bb5144fd1 100644 --- a/stdlib/source/test/lux/control/security/policy.lux +++ b/stdlib/source/test/lux/control/security/policy.lux @@ -60,7 +60,7 @@ (!.use %\can-downgrade sample))))) (def: hash (|>> (!.use %\can-downgrade) - (:: text.hash hash))))) + (\ text.hash hash))))) (def: password (!.use %\can-upgrade)) @@ -76,24 +76,24 @@ (do random.monad [#let [policy-0 (policy [])] raw-password (random.ascii 10) - #let [password (:: policy-0 password raw-password)]] + #let [password (\ policy-0 password raw-password)]] ($_ _.and (_.with-cover [/.Privacy /.Private /.Can-Conceal /.Can-Reveal /.Safety /.Safe /.Can-Trust /.Can-Distrust] ($_ _.and (_.with-cover [/.functor] - ($functor.spec (..injection (:: policy-0 can-upgrade)) (..comparison (:: policy-0 can-downgrade)) /.functor)) + ($functor.spec (..injection (\ policy-0 can-upgrade)) (..comparison (\ policy-0 can-downgrade)) /.functor)) (_.with-cover [/.apply] - ($apply.spec (..injection (:: policy-0 can-upgrade)) (..comparison (:: policy-0 can-downgrade)) /.apply)) + ($apply.spec (..injection (\ policy-0 can-upgrade)) (..comparison (\ policy-0 can-downgrade)) /.apply)) (_.with-cover [/.monad] - ($monad.spec (..injection (:: policy-0 can-upgrade)) (..comparison (:: policy-0 can-downgrade)) /.monad)))) + ($monad.spec (..injection (\ policy-0 can-upgrade)) (..comparison (\ policy-0 can-downgrade)) /.monad)))) (_.cover [/.Privilege /.Context /.with-policy] - (and (:: policy-0 = password password) - (n.= (:: text.hash hash raw-password) - (:: policy-0 hash password)))) + (and (\ policy-0 = password password) + (n.= (\ text.hash hash raw-password) + (\ policy-0 hash password)))) (let [policy-1 (policy []) - delegate (/.delegation (:: policy-0 can-downgrade) (:: policy-1 can-upgrade))] + delegate (/.delegation (\ policy-0 can-downgrade) (\ policy-1 can-upgrade))] (_.cover [/.Delegation /.delegation] - (:: policy-1 = (delegate password) (delegate password)))) + (\ policy-1 = (delegate password) (delegate password)))) )))) diff --git a/stdlib/source/test/lux/control/state.lux b/stdlib/source/test/lux/control/state.lux index 3e30afab0..60f06dbef 100644 --- a/stdlib/source/test/lux/control/state.lux +++ b/stdlib/source/test/lux/control/state.lux @@ -84,7 +84,7 @@ (def: loops Test (do {! random.monad} - [limit (|> random.nat (:: ! map (n.% 10))) + [limit (|> random.nat (\ ! map (n.% 10))) #let [condition (do /.monad [state /.get] (wrap (n.< limit state)))]] diff --git a/stdlib/source/test/lux/control/thread.lux b/stdlib/source/test/lux/control/thread.lux index aac2059f8..dfc5e7306 100644 --- a/stdlib/source/test/lux/control/thread.lux +++ b/stdlib/source/test/lux/control/thread.lux @@ -20,7 +20,7 @@ (def: (injection value) (Injection (All [a !] (Thread ! a))) - (:: /.monad wrap value)) + (\ /.monad wrap value)) (def: comparison (Comparison (All [a !] (Thread ! a))) @@ -39,12 +39,12 @@ (_.cover [/.run] (n.= sample (|> sample - (:: /.monad wrap) + (\ /.monad wrap) /.run))) (_.cover [/.io] (n.= sample (|> sample - (:: /.monad wrap) + (\ /.monad wrap) /.io io.run))) diff --git a/stdlib/source/test/lux/control/try.lux b/stdlib/source/test/lux/control/try.lux index f4eaec656..cc01b7337 100644 --- a/stdlib/source/test/lux/control/try.lux +++ b/stdlib/source/test/lux/control/try.lux @@ -28,7 +28,7 @@ (def: comparison (Comparison Try) (function (_ ==) - (:: (/.equivalence ==) =))) + (\ (/.equivalence ==) =))) (def: #export (try element) (All [a] (-> (Random a) (Random (Try a)))) diff --git a/stdlib/source/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux index 070d51888..9bb471bf5 100644 --- a/stdlib/source/test/lux/control/writer.lux +++ b/stdlib/source/test/lux/control/writer.lux @@ -25,7 +25,7 @@ (def: (injection monoid value) (All [w] (-> (Monoid w) (Injection (Writer w)))) - [(:: monoid identity) value]) + [(\ monoid identity) value]) (def: comparison (All [w] (Comparison (Writer w))) diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux index d3bd06b58..b9fe6c207 100644 --- a/stdlib/source/test/lux/data/binary.lux +++ b/stdlib/source/test/lux/data/binary.lux @@ -40,7 +40,7 @@ [byte random.nat] (exec (try.assume (/.write/8 idx byte output)) (recur (inc idx)))) - (:: random.monad wrap output))))) + (\ random.monad wrap output))))) (def: (throws? exception try) (All [e a] (-> (Exception e) (Try a) Bit)) @@ -78,11 +78,11 @@ Test (<| (_.covering /._) (do {! random.monad} - [#let [gen-size (|> random.nat (:: ! map (|>> (n.% 100) (n.max 8))))] + [#let [gen-size (|> random.nat (\ ! map (|>> (n.% 100) (n.max 8))))] size gen-size sample (..random size) value random.nat - #let [gen-idx (|> random.nat (:: ! map (n.% size)))] + #let [gen-idx (|> random.nat (\ ! map (n.% size)))] [from to] (random.and gen-idx gen-idx) #let [[from to] [(n.min from to) (n.max from to)]]] (_.with-cover [/.Binary] @@ -92,13 +92,13 @@ (_.with-cover [/.monoid] ($monoid.spec /.equivalence /.monoid (..random size))) (_.cover [/.fold] - (n.= (:: list.fold fold n.+ 0 (..as-list sample)) + (n.= (\ list.fold fold n.+ 0 (..as-list sample)) (/.fold n.+ 0 sample))) (_.cover [/.create] - (:: /.equivalence = - (/.create size) - (/.create size))) + (\ /.equivalence = + (/.create size) + (/.create size))) (_.cover [/.size] (|> (/.create size) /.size (n.= size))) (_.with-cover [/.index-out-of-bounds] @@ -120,7 +120,7 @@ (case [(monad.map try.monad (reader random-slice) idxs) (monad.map try.monad (|>> (n.+ from) (reader sample)) idxs)] [(#try.Success slice-vals) (#try.Success binary-vals)] - (:: (list.equivalence n.equivalence) = slice-vals binary-vals) + (\ (list.equivalence n.equivalence) = slice-vals binary-vals) _ #0)))) @@ -131,8 +131,8 @@ (or (throws? /.inverted-slice (/.slice to from sample)) (n.= to from))) (_.cover [/.drop] - (and (:: /.equivalence = sample (/.drop 0 sample)) - (:: /.equivalence = (/.create 0) (/.drop size sample)) + (and (\ /.equivalence = sample (/.drop 0 sample)) + (\ /.equivalence = (/.create 0) (/.drop size sample)) (case (list.reverse (..as-list sample)) #.Nil false @@ -144,7 +144,7 @@ (and (case (/.copy size 0 sample 0 (/.create size)) (#try.Success output) (and (not (is? sample output)) - (:: /.equivalence = sample output)) + (\ /.equivalence = sample output)) (#try.Failure _) false) diff --git a/stdlib/source/test/lux/data/bit.lux b/stdlib/source/test/lux/data/bit.lux index 0be42e466..0b3eab351 100644 --- a/stdlib/source/test/lux/data/bit.lux +++ b/stdlib/source/test/lux/data/bit.lux @@ -31,6 +31,6 @@ ($codec.spec /.equivalence /.codec random.bit)) (_.cover [/.complement] - (and (not (:: /.equivalence = value ((/.complement function.identity) value))) - (:: /.equivalence = value ((/.complement not) value)))) + (and (not (\ /.equivalence = value ((/.complement function.identity) value))) + (\ /.equivalence = value ((/.complement not) value)))) )))) diff --git a/stdlib/source/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux index 5a94f13b7..99ae8e06d 100644 --- a/stdlib/source/test/lux/data/collection/array.lux +++ b/stdlib/source/test/lux/data/collection/array.lux @@ -30,8 +30,8 @@ (def: bounded-size (Random Nat) - (:: random.monad map (|>> (n.% 100) (n.+ 1)) - random.nat)) + (\ random.monad map (|>> (n.% 100) (n.+ 1)) + random.nat)) (def: structures Test @@ -58,9 +58,9 @@ the-array (random.array size random.nat)] ($_ _.and (_.cover [/.find] - (:: (maybe.equivalence n.equivalence) = - (/.find n.even? the-array) - (list.find n.even? (/.to-list the-array)))) + (\ (maybe.equivalence n.equivalence) = + (/.find n.even? the-array) + (list.find n.even? (/.to-list the-array)))) (_.cover [/.find+] (case [(/.find n.even? the-array) (/.find+ (function (_ idx member) @@ -78,13 +78,13 @@ [#.None #.None] true)) (_.cover [/.every?] - (:: bit.equivalence = - (list.every? n.even? (/.to-list the-array)) - (/.every? n.even? the-array))) + (\ bit.equivalence = + (list.every? n.even? (/.to-list the-array)) + (/.every? n.even? the-array))) (_.cover [/.any?] - (:: bit.equivalence = - (list.any? n.even? (/.to-list the-array)) - (/.any? n.even? the-array))) + (\ bit.equivalence = + (list.any? n.even? (/.to-list the-array)) + (/.any? n.even? the-array))) ))) (def: #export test @@ -167,7 +167,7 @@ _ false))) (do ! - [occupancy (:: ! map (n.% (inc size)) random.nat)] + [occupancy (\ ! map (n.% (inc size)) random.nat)] (_.cover [/.occupancy /.vacancy] (let [the-array (loop [output (: (Array Nat) (/.new size)) @@ -183,22 +183,22 @@ [the-list (random.list size random.nat)] (_.cover [/.from-list /.to-list] (and (|> the-list /.from-list /.to-list - (:: (list.equivalence n.equivalence) = the-list)) + (\ (list.equivalence n.equivalence) = the-list)) (|> the-array /.to-list /.from-list - (:: (/.equivalence n.equivalence) = the-array))))) + (\ (/.equivalence n.equivalence) = the-array))))) (do ! - [amount (:: ! map (n.% (inc size)) random.nat)] + [amount (\ ! map (n.% (inc size)) random.nat)] (_.cover [/.copy!] (let [copy (: (Array Nat) (/.new size))] (exec (/.copy! amount 0 the-array 0 copy) - (:: (list.equivalence n.equivalence) = - (list.take amount (/.to-list the-array)) - (/.to-list copy)))))) + (\ (list.equivalence n.equivalence) = + (list.take amount (/.to-list the-array)) + (/.to-list copy)))))) (_.cover [/.clone] (let [clone (/.clone the-array)] (and (not (is? the-array clone)) - (:: (/.equivalence n.equivalence) = the-array clone)))) + (\ (/.equivalence n.equivalence) = the-array clone)))) (let [the-array (/.clone the-array) evens (|> the-array /.to-list (list.filter n.even?)) odds (|> the-array /.to-list (list.filter n.odd?))] @@ -206,7 +206,7 @@ (exec (/.filter! n.even? the-array) (and (n.= (list.size evens) (/.occupancy the-array)) (n.= (list.size odds) (/.vacancy the-array)) - (|> the-array /.to-list (:: (list.equivalence n.equivalence) = evens)))))) + (|> the-array /.to-list (\ (list.equivalence n.equivalence) = evens)))))) (do ! [#let [the-array (/.clone the-array) members (|> the-array /.to-list (set.from-list n.hash))] diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux index a31fec37c..cb5ecf681 100644 --- a/stdlib/source/test/lux/data/collection/bits.lux +++ b/stdlib/source/test/lux/data/collection/bits.lux @@ -18,16 +18,16 @@ (def: (size min max) (-> Nat Nat (Random Nat)) (|> random.nat - (:: random.monad map (|>> (n.% (inc max)) (n.max min))))) + (\ random.monad map (|>> (n.% (inc max)) (n.max min))))) (def: #export random (Random Bits) (do {! random.monad} - [size (:: ! map (n.% 1,000) random.nat)] + [size (\ ! map (n.% 1,000) random.nat)] (case size 0 (wrap /.empty) _ (do {! random.monad} - [idx (|> random.nat (:: ! map (n.% size)))] + [idx (|> random.nat (\ ! map (n.% size)))] (wrap (/.set idx /.empty)))))) (def: #export test @@ -48,8 +48,8 @@ (/.empty? /.empty)) (do {! random.monad} - [size (:: ! map (|>> (n.% 1,000) inc) random.nat) - idx (:: ! map (n.% size) random.nat) + [size (\ ! map (|>> (n.% 1,000) inc) random.nat) + idx (\ ! map (n.% size) random.nat) sample ..random] ($_ _.and (_.cover [/.get /.set] @@ -80,17 +80,17 @@ (_.cover [/.not] (and (is? /.empty (/.not /.empty)) (or (is? /.empty sample) - (and (not (:: /.equivalence = sample (/.not sample))) - (:: /.equivalence = sample (/.not (/.not sample))))))) + (and (not (\ /.equivalence = sample (/.not sample))) + (\ /.equivalence = sample (/.not (/.not sample))))))) (_.cover [/.xor] (and (is? /.empty (/.xor sample sample)) (n.= (/.size (/.xor sample (/.not sample))) (/.capacity sample)))) (_.cover [/.or] - (and (:: /.equivalence = sample (/.or sample sample)) + (and (\ /.equivalence = sample (/.or sample sample)) (n.= (/.size (/.or sample (/.not sample))) (/.capacity sample)))) (_.cover [/.and] - (and (:: /.equivalence = sample (/.and sample sample)) + (and (\ /.equivalence = sample (/.and sample sample)) (is? /.empty (/.and sample (/.not sample))))) ))))) diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux index 6d35fd15b..718c9f0c9 100644 --- a/stdlib/source/test/lux/data/collection/dictionary.lux +++ b/stdlib/source/test/lux/data/collection/dictionary.lux @@ -29,7 +29,7 @@ (def: for-dictionaries Test (do random.monad - [#let [capped-nat (:: random.monad map (n.% 100) random.nat)] + [#let [capped-nat (\ random.monad map (n.% 100) random.nat)] size capped-nat dict (random.dictionary n.hash size random.nat capped-nat) non-key (|> random.nat (random.filter (function (_ key) (not (/.contains? key dict))))) @@ -49,10 +49,10 @@ (/.empty? sample)))) (_.cover [/.entries /.keys /.values] - (:: (list.equivalence (equivalence.product n.equivalence n.equivalence)) = - (/.entries dict) - (list.zip/2 (/.keys dict) - (/.values dict)))) + (\ (list.equivalence (equivalence.product n.equivalence n.equivalence)) = + (/.entries dict) + (list.zip/2 (/.keys dict) + (/.values dict)))) (_.cover [/.merge] (let [merging-with-oneself (let [(^open ".") (/.equivalence n.equivalence)] @@ -79,7 +79,7 @@ (def: for-entries Test (do random.monad - [#let [capped-nat (:: random.monad map (n.% 100) random.nat)] + [#let [capped-nat (\ random.monad map (n.% 100) random.nat)] size capped-nat dict (random.dictionary n.hash size random.nat capped-nat) non-key (|> random.nat (random.filter (function (_ key) (not (/.contains? key dict))))) @@ -197,7 +197,7 @@ (<| (_.covering /._) (_.with-cover [/.Dictionary]) (do random.monad - [#let [capped-nat (:: random.monad map (n.% 100) random.nat)] + [#let [capped-nat (\ random.monad map (n.% 100) random.nat)] size capped-nat dict (random.dictionary n.hash size random.nat capped-nat) non-key (|> random.nat (random.filter (function (_ key) (not (/.contains? key dict))))) diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index a1d776d10..c34f3e3cf 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -43,7 +43,7 @@ (<| (_.covering /._) (_.with-cover [/.Dictionary]) (do {! random.monad} - [size (:: ! map (n.% 100) random.nat) + [size (\ ! map (n.% 100) random.nat) keys (random.set n.hash size random.nat) values (random.set n.hash size random.nat) extra-key (random.filter (|>> (set.member? keys) not) diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux index 3ffcc816c..7d8d3a662 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux @@ -34,7 +34,7 @@ (_.with-cover [/.PList]) (do {! random.monad} [#let [gen-key (random.ascii/alpha 10)] - size (:: ! map (n.% 100) random.nat) + size (\ ! map (n.% 100) random.nat) sample (..random size gen-key random.nat) #let [keys (|> sample /.keys (set.from-list text.hash))] @@ -55,10 +55,10 @@ (_.cover [/.empty] (/.empty? /.empty)) (_.cover [/.keys /.values] - (:: (/.equivalence n.equivalence) = - sample - (list.zip/2 (/.keys sample) - (/.values sample)))) + (\ (/.equivalence n.equivalence) = + sample + (list.zip/2 (/.keys sample) + (/.values sample)))) (_.cover [/.contains?] (and (list.every? (function (_ key) (/.contains? key sample)) @@ -87,5 +87,5 @@ (|> sample (/.put extra-key extra-value) (/.remove extra-key) - (:: (/.equivalence n.equivalence) = sample))) + (\ (/.equivalence n.equivalence) = sample))) )))) diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index ca432bcb4..7f3ed62e6 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -34,8 +34,8 @@ (def: bounded-size (Random Nat) - (:: random.monad map (n.% 100) - random.nat)) + (\ random.monad map (n.% 100) + random.nat)) (def: random (Random (List Nat)) @@ -43,7 +43,7 @@ [size ..bounded-size] (|> random.nat (random.set n.hash size) - (:: ! map set.to-list)))) + (\ ! map set.to-list)))) (def: signatures Test @@ -84,14 +84,14 @@ (do {! random.monad} [size ..bounded-size #let [(^open "/\.") (/.equivalence n.equivalence)] - sample (:: ! map set.to-list (random.set n.hash size random.nat))] + sample (\ ! map set.to-list (random.set n.hash size random.nat))] ($_ _.and (_.cover [/.size] (n.= size (/.size sample))) (_.cover [/.empty?] - (:: bit.equivalence = - (/.empty? sample) - (n.= 0 (/.size sample)))) + (\ bit.equivalence = + (/.empty? sample) + (n.= 0 (/.size sample)))) (_.cover [/.repeat] (n.= size (/.size (/.repeat size [])))) (_.cover [/.reverse] @@ -180,8 +180,8 @@ [sample (random.filter (|>> /.size (n.> 0)) ..random) #let [size (/.size sample)] - idx (:: ! map (n.% size) random.nat) - chunk-size (:: ! map (|>> (n.% size) inc) random.nat)] + idx (\ ! map (n.% size) random.nat) + chunk-size (\ ! map (|>> (n.% size) inc) random.nat)] ($_ _.and (_.cover [/.filter] (let [positives (/.filter n.even? sample) @@ -315,12 +315,12 @@ (and size-of-smaller-list! can-extract-values!))) (_.cover [/.zip] - (and (:: (/.equivalence (equivalence.product n.equivalence n.equivalence)) = - (/.zip/2 sample/0 sample/1) - ((/.zip 2) sample/0 sample/1)) - (:: (/.equivalence ($_ equivalence.product n.equivalence n.equivalence n.equivalence)) = - (/.zip/3 sample/0 sample/1 sample/2) - ((/.zip 3) sample/0 sample/1 sample/2)))) + (and (\ (/.equivalence (equivalence.product n.equivalence n.equivalence)) = + (/.zip/2 sample/0 sample/1) + ((/.zip 2) sample/0 sample/1)) + (\ (/.equivalence ($_ equivalence.product n.equivalence n.equivalence n.equivalence)) = + (/.zip/3 sample/0 sample/1 sample/2) + ((/.zip 3) sample/0 sample/1 sample/2)))) (_.cover [/.zip-with/2] (/\= (/\map (function (_ [left right]) @@ -351,7 +351,7 @@ choose (: (-> Nat (Maybe Text)) (function (_ value) (if (n.even? value) - (#.Some (:: n.decimal encode value)) + (#.Some (\ n.decimal encode value)) #.None)))] (do {! random.monad} [sample ..random] @@ -359,7 +359,7 @@ (_.cover [/.one] (case [(|> sample (/.filter n.even?) - (/\map (:: n.decimal encode)) + (/\map (\ n.decimal encode)) /.head) (/.one choose sample)] [(#.Some expected) (#.Some actual)] @@ -371,11 +371,11 @@ _ false)) (_.cover [/.all] - (:: (/.equivalence text.equivalence) = - (|> sample - (/.filter n.even?) - (/\map (:: n.decimal encode))) - (/.all choose sample))) + (\ (/.equivalence text.equivalence) = + (|> sample + (/.filter n.even?) + (/\map (\ n.decimal encode))) + (/.all choose sample))) (_.cover [/.find] (case (/.find n.even? sample) (#.Some found) @@ -420,7 +420,7 @@ 0))))) (_.cover [/.folds] (/\= (/\map (function (_ index) - (:: /.fold fold n.+ 0 (/.take index sample))) + (\ /.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 3cd4d6db2..1eb6efe1b 100644 --- a/stdlib/source/test/lux/data/collection/queue.lux +++ b/stdlib/source/test/lux/data/collection/queue.lux @@ -29,7 +29,7 @@ (<| (_.covering /._) (_.with-cover [/.Queue]) (do {! random.monad} - [size (:: ! map (n.% 100) random.nat) + [size (\ ! map (n.% 100) random.nat) members (random.set n.hash size random.nat) non-member (random.filter (|>> (set.member? members) not) random.nat) @@ -43,7 +43,7 @@ (_.cover [/.from-list /.to-list] (|> members /.from-list /.to-list - (:: (list.equivalence n.equivalence) = members))) + (\ (list.equivalence n.equivalence) = members))) (_.cover [/.size] (n.= size (/.size sample))) (_.cover [/.empty?] @@ -54,9 +54,9 @@ all-empty-queues-look-the-same! (bit\= (/.empty? sample) - (:: (/.equivalence n.equivalence) = - sample - /.empty))] + (\ (/.equivalence n.equivalence) = + sample + /.empty))] (and empty-is-empty! all-empty-queues-look-the-same!))) (_.cover [/.peek] @@ -88,9 +88,9 @@ (/.member? n.equivalence pushed non-member) has-expected-order! - (:: (list.equivalence n.equivalence) = - (list\compose (/.to-list sample) (list non-member)) - (/.to-list pushed))] + (\ (list.equivalence n.equivalence) = + (list\compose (/.to-list sample) (list non-member)) + (/.to-list pushed))] (and size-increases! new-member-is-identified! has-expected-order!))) @@ -107,9 +107,9 @@ (not (/.member? n.equivalence popped target)) has-expected-order! - (:: (list.equivalence n.equivalence) = - expected - (/.to-list popped))] + (\ (list.equivalence n.equivalence) = + expected + (/.to-list popped))] (and size-decreases! popped-member-is-not-identified! has-expected-order!)) diff --git a/stdlib/source/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux index 37e52d598..545c1e2a1 100644 --- a/stdlib/source/test/lux/data/collection/queue/priority.lux +++ b/stdlib/source/test/lux/data/collection/queue/priority.lux @@ -29,7 +29,7 @@ (<| (_.covering /._) (_.with-cover [/.Queue]) (do {! random.monad} - [size (:: ! map (n.% 100) random.nat) + [size (\ ! map (n.% 100) random.nat) sample (..random size) non-member-priority random.nat non-member (random.filter (|>> (/.member? n.equivalence sample) not) diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux index 7a51ff797..17dae6904 100644 --- a/stdlib/source/test/lux/data/collection/row.lux +++ b/stdlib/source/test/lux/data/collection/row.lux @@ -29,7 +29,7 @@ (def: signatures Test (do {! random.monad} - [size (:: ! map (n.% 100) random.nat)] + [size (\ ! map (n.% 100) random.nat)] ($_ _.and (_.with-cover [/.equivalence] ($equivalence.spec (/.equivalence n.equivalence) (random.row size random.nat))) @@ -48,7 +48,7 @@ (def: whole Test (do {! random.monad} - [size (:: ! map (n.% 100) random.nat) + [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)]] @@ -81,10 +81,10 @@ (def: index-based Test (do {! random.monad} - [size (:: ! map (|>> (n.% 100) inc) random.nat)] + [size (\ ! map (|>> (n.% 100) inc) random.nat)] ($_ _.and (do ! - [good-index (|> random.nat (:: ! map (n.% size))) + [good-index (|> random.nat (\ ! map (n.% size))) #let [bad-index (n.+ size good-index)] sample (random.set n.hash size random.nat) non-member (random.filter (|>> (set.member? sample) not) @@ -134,7 +134,7 @@ (<| (_.covering /._) (_.with-cover [/.Row]) (do {! random.monad} - [size (:: ! map (|>> (n.% 100) inc) random.nat)] + [size (\ ! map (|>> (n.% 100) inc) random.nat)] ($_ _.and ..signatures ..whole diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux index e255fd5f5..7ffadccad 100644 --- a/stdlib/source/test/lux/data/collection/sequence.lux +++ b/stdlib/source/test/lux/data/collection/sequence.lux @@ -27,9 +27,9 @@ (All [a] (-> (Equivalence a) (Equivalence (/.Sequence a)))) (def: (= reference subject) - (:: (list.equivalence super) = - (/.take 100 reference) - (/.take 100 subject)))) + (\ (list.equivalence super) = + (/.take 100 reference) + (/.take 100 subject)))) (def: #export test Test @@ -38,9 +38,9 @@ (let [(^open "list\.") (list.equivalence n.equivalence)]) (do {! random.monad} [repeated random.nat - index (:: ! map (n.% 100) random.nat) - size (:: ! map (|>> (n.% 10) inc) random.nat) - offset (:: ! map (n.% 100) random.nat) + index (\ ! map (n.% 100) random.nat) + size (\ ! map (|>> (n.% 10) inc) random.nat) + offset (\ ! map (n.% 100) random.nat) cycle-start random.nat cycle-next (random.list size random.nat)] ($_ _.and diff --git a/stdlib/source/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux index 83cfe60fb..147fe6beb 100644 --- a/stdlib/source/test/lux/data/collection/set.lux +++ b/stdlib/source/test/lux/data/collection/set.lux @@ -21,8 +21,8 @@ (def: gen-nat (Random Nat) - (:: random.monad map (n.% 100) - random.nat)) + (\ random.monad map (n.% 100) + random.nat)) (def: #export test Test @@ -47,14 +47,14 @@ (_.cover [/.new] (/.empty? (/.new n.hash))) (do ! - [hash (:: ! map (function (_ constant) - (: (Hash Nat) - (structure - (def: &equivalence n.equivalence) - - (def: (hash _) - constant)))) - random.nat)] + [hash (\ ! map (function (_ constant) + (: (Hash Nat) + (structure + (def: &equivalence n.equivalence) + + (def: (hash _) + constant)))) + random.nat)] (_.cover [/.member-hash] (is? hash (/.member-hash (/.new hash))))) (_.cover [/.size] diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux index 8e376ba17..e49c325ba 100644 --- a/stdlib/source/test/lux/data/collection/set/multi.lux +++ b/stdlib/source/test/lux/data/collection/set/multi.lux @@ -22,7 +22,7 @@ (def: count (Random Nat) - (:: random.monad map (|>> (n.% 10) inc) random.nat)) + (\ random.monad map (|>> (n.% 10) inc) random.nat)) (def: #export (random size hash count element) (All [a] (-> Nat (Hash a) (Random Nat) (Random a) (Random (/.Set a)))) @@ -40,12 +40,12 @@ (<| (_.covering /._) (_.with-cover [/.Set]) (do {! random.monad} - [diversity (:: ! map (n.% 10) random.nat) + [diversity (\ ! map (n.% 10) random.nat) sample (..random diversity n.hash ..count random.nat) non-member (random.filter (predicate.complement (set.member? (/.support sample))) random.nat) addition-count ..count - partial-removal-count (:: ! map (n.% addition-count) random.nat) + partial-removal-count (\ ! map (n.% addition-count) random.nat) another (..random diversity n.hash ..count random.nat)] (`` ($_ _.and (_.with-cover [/.equivalence] @@ -55,7 +55,7 @@ (|> sample /.to-list (/.from-list n.hash) - (:: /.equivalence = sample))) + (\ /.equivalence = sample))) (_.cover [/.size] (n.= (list.size (/.to-list sample)) (/.size sample))) @@ -89,7 +89,7 @@ (let [null-scenario! (|> sample (/.add 0 non-member) - (:: /.equivalence = sample)) + (\ /.equivalence = sample)) normal-scenario! (let [sample+ (/.add addition-count non-member sample)] @@ -100,12 +100,12 @@ normal-scenario!))) (_.cover [/.remove] (let [null-scenario! - (:: /.equivalence = - (|> sample - (/.add addition-count non-member)) - (|> sample - (/.add addition-count non-member) - (/.remove 0 non-member))) + (\ /.equivalence = + (|> sample + (/.add addition-count non-member)) + (|> sample + (/.add addition-count non-member) + (/.remove 0 non-member))) partial-scenario! (let [sample* (|> sample @@ -120,7 +120,7 @@ (|> sample (/.add addition-count non-member) (/.remove addition-count non-member) - (:: /.equivalence = sample))] + (\ /.equivalence = sample))] (and null-scenario! partial-scenario! total-scenario!))) @@ -132,12 +132,12 @@ (let [unary (|> sample /.support /.from-set)] (and (/.sub? sample unary) (or (not (/.sub? unary sample)) - (:: /.equivalence = sample unary))))) + (\ /.equivalence = sample unary))))) (_.cover [/.super?] (let [unary (|> sample /.support /.from-set)] (and (/.super? unary sample) (or (not (/.super? sample unary)) - (:: /.equivalence = sample unary))))) + (\ /.equivalence = sample unary))))) (~~ (template [<name> <composition>] [(_.cover [<name>] (let [|sample| (/.support sample) diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux index 1734d80c4..eaa8bab4b 100644 --- a/stdlib/source/test/lux/data/collection/set/ordered.lux +++ b/stdlib/source/test/lux/data/collection/set/ordered.lux @@ -21,7 +21,7 @@ (def: size (random.Random Nat) - (:: random.monad map (n.% 100) random.nat)) + (\ random.monad map (n.% 100) random.nat)) (def: #export (random size &order gen-value) (All [a] (-> Nat (Order a) (Random a) (Random (Set a)))) @@ -47,7 +47,7 @@ non-memberL (random.filter (|>> (//.member? usetL) not) random.nat) #let [listL (//.to-list usetL)] - listR (|> (random.set n.hash sizeR random.nat) (:: ! map //.to-list)) + listR (|> (random.set n.hash sizeR random.nat) (\ ! map //.to-list)) #let [(^open "/\.") /.equivalence setL (/.from-list n.order listL) setR (/.from-list n.order listR) @@ -64,9 +64,9 @@ (_.cover [/.new] (/.empty? (/.new n.order))) (_.cover [/.to-list] - (:: (list.equivalence n.equivalence) = - (/.to-list (/.from-list n.order listL)) - (list.sort (:: n.order <) listL))) + (\ (list.equivalence n.equivalence) = + (/.to-list (/.from-list n.order listL)) + (list.sort (\ n.order <) listL))) (_.cover [/.from-list] (|> setL /.to-list (/.from-list n.order) @@ -101,7 +101,7 @@ (|> setL (/.add non-memberL) (/.remove non-memberL) - (:: /.equivalence = setL))) + (\ /.equivalence = setL))) (_.cover [/.sub?] (let [self! (/.sub? setL setL) @@ -126,23 +126,23 @@ (~~ (template [<coverage> <relation> <empty?>] [(_.cover [<coverage>] (let [self! - (:: /.equivalence = - setL - (<coverage> setL setL)) + (\ /.equivalence = + setL + (<coverage> setL setL)) super! (and (<relation> (<coverage> setL setR) setL) (<relation> (<coverage> setL setR) setR)) empty! - (:: /.equivalence = - (if <empty?> empty setL) - (<coverage> setL empty)) + (\ /.equivalence = + (if <empty?> empty setL) + (<coverage> setL empty)) idempotence! - (:: /.equivalence = - (<coverage> setL (<coverage> setL setR)) - (<coverage> setR (<coverage> setL setR)))] + (\ /.equivalence = + (<coverage> setL (<coverage> setL setR)) + (<coverage> setR (<coverage> setL setR)))] (and self! super! empty! @@ -155,21 +155,21 @@ (let [self! (|> setL (/.difference setL) - (:: /.equivalence = empty)) + (\ /.equivalence = empty)) empty! (|> setL (/.difference empty) - (:: /.equivalence = setL)) + (\ /.equivalence = setL)) difference! (not (list.any? (/.member? (/.difference setL setR)) (/.to-list setL))) idempotence! - (:: /.equivalence = - (/.difference setL setR) - (/.difference setL (/.difference setL setR)))] + (\ /.equivalence = + (/.difference setL setR) + (/.difference setL (/.difference setL setR)))] (and self! empty! difference! diff --git a/stdlib/source/test/lux/data/collection/stack.lux b/stdlib/source/test/lux/data/collection/stack.lux index bc2082846..6cc4c5b10 100644 --- a/stdlib/source/test/lux/data/collection/stack.lux +++ b/stdlib/source/test/lux/data/collection/stack.lux @@ -26,7 +26,7 @@ (<| (_.covering /._) (_.with-cover [/.Stack]) (do random.monad - [size (:: random.monad map (n.% 100) random.nat) + [size (\ random.monad map (n.% 100) random.nat) sample (random.stack size random.nat) expected-top random.nat] ($_ _.and @@ -55,9 +55,9 @@ (/.empty? sample) (#.Some [top remaining]) - (:: (/.equivalence n.equivalence) = - sample - (/.push top remaining)))) + (\ (/.equivalence n.equivalence) = + sample + (/.push top remaining)))) (_.cover [/.push] (case (/.pop (/.push expected-top sample)) (#.Some [actual-top actual-sample]) diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux index 9224e5654..ad5766525 100644 --- a/stdlib/source/test/lux/data/collection/tree.lux +++ b/stdlib/source/test/lux/data/collection/tree.lux @@ -23,7 +23,7 @@ (All [a] (-> (Random a) (Random [Nat (Tree a)]))) (do {! random.monad} [value gen-value - num-children (:: ! map (n.% 2) random.nat) + num-children (\ ! map (n.% 2) random.nat) children (random.list num-children (tree gen-value))] (wrap [(|> children (list\map product.left) @@ -38,7 +38,7 @@ ($_ _.and (_.with-cover [/.equivalence] (|> (..tree random.nat) - (:: random.monad map product.right) + (\ random.monad map product.right) ($equivalence.spec (/.equivalence n.equivalence)))) (_.with-cover [/.fold] ($fold.spec /.leaf /.equivalence /.fold)) @@ -53,17 +53,17 @@ (do random.monad [expected random.nat] (_.cover [/.leaf] - (:: (list.equivalence n.equivalence) = - (list expected) - (/.flatten (/.leaf expected))))) + (\ (list.equivalence n.equivalence) = + (list expected) + (/.flatten (/.leaf expected))))) (do {! random.monad} [value random.nat - num-children (:: ! map (n.% 3) random.nat) + num-children (\ ! map (n.% 3) random.nat) children (random.list num-children random.nat)] (_.cover [/.branch] - (:: (list.equivalence n.equivalence) = - (list& value children) - (/.flatten (/.branch value (list\map /.leaf children)))))) + (\ (list.equivalence n.equivalence) = + (list& value children) + (/.flatten (/.branch value (list\map /.leaf children)))))) (do random.monad [expected/0 random.nat expected/1 random.nat @@ -72,20 +72,20 @@ expected/4 random.nat expected/5 random.nat] (_.cover [/.tree] - (and (:: (list.equivalence n.equivalence) = - (list expected/0) - (/.flatten (/.tree expected/0))) - (:: (list.equivalence n.equivalence) = - (list expected/0 expected/1 expected/2) - (/.flatten (/.tree expected/0 - {expected/1 {} - expected/2 {}}))) - (:: (list.equivalence n.equivalence) = - (list expected/0 expected/1 expected/2 - expected/3 expected/4 expected/5) - (/.flatten (/.tree expected/0 - {expected/1 {} - expected/2 {expected/3 {} - expected/4 {expected/5 {}}}}))) + (and (\ (list.equivalence n.equivalence) = + (list expected/0) + (/.flatten (/.tree expected/0))) + (\ (list.equivalence n.equivalence) = + (list expected/0 expected/1 expected/2) + (/.flatten (/.tree expected/0 + {expected/1 {} + expected/2 {}}))) + (\ (list.equivalence n.equivalence) = + (list expected/0 expected/1 expected/2 + expected/3 expected/4 expected/5) + (/.flatten (/.tree expected/0 + {expected/1 {} + expected/2 {expected/3 {} + expected/4 {expected/5 {}}}}))) ))) ))) diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux index 7c93fb0c1..d5f4dba52 100644 --- a/stdlib/source/test/lux/data/collection/tree/finger.lux +++ b/stdlib/source/test/lux/data/collection/tree/finger.lux @@ -39,21 +39,21 @@ true)) (_.cover [/.tag] (and (text\= tag-left - (/.tag (:: ..builder leaf tag-left expected-left))) + (/.tag (\ ..builder leaf tag-left expected-left))) (text\= (text\compose tag-left tag-right) - (/.tag (:: ..builder branch - (:: ..builder leaf tag-left expected-left) - (:: ..builder leaf tag-right expected-right)))))) + (/.tag (\ ..builder branch + (\ ..builder leaf tag-left expected-left) + (\ ..builder leaf tag-right expected-right)))))) (_.cover [/.root] - (and (case (/.root (:: ..builder leaf tag-left expected-left)) + (and (case (/.root (\ ..builder leaf tag-left expected-left)) (#.Left actual) (n.= expected-left actual) (#.Right _) false) - (case (/.root (:: ..builder branch - (:: ..builder leaf tag-left expected-left) - (:: ..builder leaf tag-right expected-right))) + (case (/.root (\ ..builder branch + (\ ..builder leaf tag-left expected-left) + (\ ..builder leaf tag-right expected-right))) (#.Left _) false @@ -68,37 +68,37 @@ false)))) (_.cover [/.value] (and (n.= expected-left - (/.value (:: ..builder leaf tag-left expected-left))) + (/.value (\ ..builder leaf tag-left expected-left))) (n.= expected-left - (/.value (:: ..builder branch - (:: ..builder leaf tag-left expected-left) - (:: ..builder leaf tag-right expected-right)))))) + (/.value (\ ..builder branch + (\ ..builder leaf tag-left expected-left) + (\ ..builder leaf tag-right expected-right)))))) (_.cover [/.search] (let [can-find-correct-one! - (|> (:: ..builder leaf tag-left expected-left) + (|> (\ ..builder leaf tag-left expected-left) (/.search (text.contains? tag-left)) (maybe\map (n.= expected-left)) (maybe.default false)) cannot-find-incorrect-one! - (|> (:: ..builder leaf tag-right expected-right) + (|> (\ ..builder leaf tag-right expected-right) (/.search (text.contains? tag-left)) (maybe\map (n.= expected-left)) (maybe.default false) not) can-find-left! - (|> (:: ..builder branch - (:: ..builder leaf tag-left expected-left) - (:: ..builder leaf tag-right expected-right)) + (|> (\ ..builder branch + (\ ..builder leaf tag-left expected-left) + (\ ..builder leaf tag-right expected-right)) (/.search (text.contains? tag-left)) (maybe\map (n.= expected-left)) (maybe.default false)) can-find-right! - (|> (:: ..builder branch - (:: ..builder leaf tag-left expected-left) - (:: ..builder leaf tag-right expected-right)) + (|> (\ ..builder branch + (\ ..builder leaf tag-left expected-left) + (\ ..builder leaf tag-right expected-right)) (/.search (text.contains? tag-right)) (maybe\map (n.= expected-right)) (maybe.default false))] @@ -109,23 +109,23 @@ (_.cover [/.found?] (let [can-find-correct-one! (/.found? (text.contains? tag-left) - (:: ..builder leaf tag-left expected-left)) + (\ ..builder leaf tag-left expected-left)) cannot-find-incorrect-one! (not (/.found? (text.contains? tag-left) - (:: ..builder leaf tag-right expected-right))) + (\ ..builder leaf tag-right expected-right))) can-find-left! (/.found? (text.contains? tag-left) - (:: ..builder branch - (:: ..builder leaf tag-left expected-left) - (:: ..builder leaf tag-right expected-right))) + (\ ..builder branch + (\ ..builder leaf tag-left expected-left) + (\ ..builder leaf tag-right expected-right))) can-find-right! (/.found? (text.contains? tag-right) - (:: ..builder branch - (:: ..builder leaf tag-left expected-left) - (:: ..builder leaf tag-right expected-right)))] + (\ ..builder branch + (\ ..builder leaf tag-left expected-left) + (\ ..builder leaf tag-right expected-right)))] (and can-find-correct-one! cannot-find-incorrect-one! can-find-left! diff --git a/stdlib/source/test/lux/data/collection/tree/zipper.lux b/stdlib/source/test/lux/data/collection/tree/zipper.lux index f934879ee..b32ddecc2 100644 --- a/stdlib/source/test/lux/data/collection/tree/zipper.lux +++ b/stdlib/source/test/lux/data/collection/tree/zipper.lux @@ -163,7 +163,7 @@ (^open "list\.") (list.equivalence n.equivalence)]] ($_ _.and (_.with-cover [/.equivalence] - ($equivalence.spec (/.equivalence n.equivalence) (:: ! map (|>> product.right /.zip) (//.tree random.nat)))) + ($equivalence.spec (/.equivalence n.equivalence) (\ ! map (|>> product.right /.zip) (//.tree random.nat)))) (_.with-cover [/.functor] ($functor.spec (|>> tree.leaf /.zip) /.equivalence /.functor)) (_.with-cover [/.comonad] diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux index 77b3652a1..3b84f1b68 100644 --- a/stdlib/source/test/lux/data/color.lux +++ b/stdlib/source/test/lux/data/color.lux @@ -25,7 +25,7 @@ (def: #export color (Random Color) (|> ($_ random.and random.nat random.nat random.nat) - (:: random.monad map /.from-rgb))) + (\ random.monad map /.from-rgb))) (def: scale (-> Nat Frac) @@ -67,7 +67,7 @@ ($_ _.and (_.cover [/.RGB /.to-rgb /.from-rgb] (|> expected /.to-rgb /.from-rgb - (:: /.equivalence = expected))) + (\ /.equivalence = expected))) (_.cover [/.HSL /.to-hsl /.from-hsl] (|> expected /.to-hsl /.from-hsl (distance/3 expected) @@ -125,16 +125,16 @@ Test (_.with-cover [/.Spread /.Palette] (do {! random.monad} - [eH (:: ! map (|>> f.abs (f.% +0.9) (f.+ +0.05)) - random.safe-frac) + [eH (\ ! map (|>> f.abs (f.% +0.9) (f.+ +0.05)) + random.safe-frac) #let [eS +0.5] - variations (:: ! map (|>> (n.% 3) (n.+ 2)) random.nat) + variations (\ ! map (|>> (n.% 3) (n.+ 2)) random.nat) #let [max-spread (f./ (|> variations inc .int int.frac) +1.0) min-spread (f./ +2.0 max-spread) spread-space (f.- min-spread max-spread)] - spread (:: ! map (|>> f.abs (f.% spread-space) (f.+ min-spread)) - random.safe-frac)] + spread (\ ! map (|>> f.abs (f.% spread-space) (f.+ min-spread)) + random.safe-frac)] (`` ($_ _.and (~~ (template [<brightness> <palette>] [(_.cover [<palette>] @@ -142,7 +142,7 @@ expected (/.from-hsb [eH eS eB]) palette (<palette> spread variations expected)] (and (n.= variations (list.size palette)) - (not (list.any? (:: /.equivalence = expected) palette)))))] + (not (list.any? (\ /.equivalence = expected) palette)))))] [+1.0 /.analogous] [+0.5 /.monochromatic] )) @@ -150,9 +150,9 @@ [(_.cover [<palette>] (let [expected (/.from-hsb [eH eS +0.5]) [c0 c1 c2] (<palette> expected)] - (and (:: /.equivalence = expected c0) - (not (:: /.equivalence = expected c1)) - (not (:: /.equivalence = expected c2)))))] + (and (\ /.equivalence = expected c0) + (not (\ /.equivalence = expected c1)) + (not (\ /.equivalence = expected c2)))))] [/.triad] [/.clash] @@ -161,10 +161,10 @@ [(_.cover [<palette>] (let [expected (/.from-hsb [eH eS +0.5]) [c0 c1 c2 c3] (<palette> expected)] - (and (:: /.equivalence = expected c0) - (not (:: /.equivalence = expected c1)) - (not (:: /.equivalence = expected c2)) - (not (:: /.equivalence = expected c3)))))] + (and (\ /.equivalence = expected c0) + (not (\ /.equivalence = expected c1)) + (not (\ /.equivalence = expected c2)) + (not (\ /.equivalence = expected c3)))))] [/.square] [/.tetradic])) @@ -191,8 +191,8 @@ (and (not (/\= expected ~expected)) (/\= expected (/.complement ~expected))))) (_.cover [/.black /.white] - (and (:: /.equivalence = /.white (/.complement /.black)) - (:: /.equivalence = /.black (/.complement /.white)))) + (and (\ /.equivalence = /.white (/.complement /.black)) + (\ /.equivalence = /.black (/.complement /.white)))) ..transformation ..palette (_.with-cover [/.Alpha /.Pigment] diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux index 609c847cf..fce2e0d90 100644 --- a/stdlib/source/test/lux/data/color/named.lux +++ b/stdlib/source/test/lux/data/color/named.lux @@ -233,8 +233,8 @@ <colors>)) (_.cover [/.aqua] - (:: //.equivalence = /.cyan /.aqua)) + (\ //.equivalence = /.cyan /.aqua)) (_.cover [/.fuchsia] - (:: //.equivalence = /.magenta /.fuchsia)) + (\ //.equivalence = /.magenta /.fuchsia)) )))) ) diff --git a/stdlib/source/test/lux/data/format/binary.lux b/stdlib/source/test/lux/data/format/binary.lux index 9b00113f0..5c819299f 100644 --- a/stdlib/source/test/lux/data/format/binary.lux +++ b/stdlib/source/test/lux/data/format/binary.lux @@ -23,7 +23,7 @@ (def: random (Random /.Specification) - (:: random.monad map /.nat random.nat)) + (\ random.monad map /.nat random.nat)) (def: #export test Test diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index 22834745d..ebfc6a4d5 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -36,9 +36,9 @@ (random.rec (function (_ recur) (do {! random.monad} - [size (:: ! map (n.% 2) random.nat)] + [size (\ ! map (n.% 2) random.nat)] ($_ random.or - (:: ! wrap []) + (\ ! wrap []) random.bit random.safe-frac (random.unicode size) @@ -74,17 +74,17 @@ (do random.monad [sample ..json] (_.cover [/.Null /.null?] - (:: bit.equivalence = - (/.null? sample) - (case sample - #/.Null true - _ false)))) + (\ bit.equivalence = + (/.null? sample) + (case sample + #/.Null true + _ false)))) (do random.monad [expected ..json] (_.cover [/.format] (|> expected /.format - (:: /.codec decode) + (\ /.codec decode) (try\map (\= expected)) (try.default false)))) (do random.monad @@ -97,9 +97,9 @@ (_.cover [/.object /.fields] (case (/.fields object) (#try.Success actual) - (:: (list.equivalence text.equivalence) = - (list\map product.left expected) - actual) + (\ (list.equivalence text.equivalence) = + (list\map product.left expected) + actual) (#try.Failure error) false)) @@ -112,7 +112,7 @@ )) (do random.monad [key (random.ascii/alpha 1) - unknown (random.filter (|>> (:: text.equivalence = key) not) + unknown (random.filter (|>> (\ text.equivalence = key) not) (random.ascii/alpha 1)) expected random.safe-frac] (_.cover [/.set] @@ -141,7 +141,7 @@ (_.cover [<type> <get>] (|> (/.object (list [key (<tag> value)])) (<get> key) - (try\map (:: <equivalence> = value)) + (try\map (\ <equivalence> = value)) (try.default false))))] [/.Boolean /.get-boolean #/.Boolean random.bit bit.equivalence] diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux index 9c83040fa..374c068a8 100644 --- a/stdlib/source/test/lux/data/format/tar.lux +++ b/stdlib/source/test/lux/data/format/tar.lux @@ -102,8 +102,8 @@ Test (_.with-cover [/.Small] (do {! random.monad} - [expected (|> random.nat (:: ! map (n.% /.small-limit))) - invalid (|> random.nat (:: ! map (n.max /.small-limit)))] + [expected (|> random.nat (\ ! map (n.% /.small-limit))) + invalid (|> random.nat (\ ! map (n.max /.small-limit)))] (`` ($_ _.and (_.cover [/.small /.from-small] (case (/.small expected) @@ -126,8 +126,8 @@ Test (_.with-cover [/.Big] (do {! random.monad} - [expected (|> random.nat (:: ! map (n.% /.big-limit))) - invalid (|> random.nat (:: ! map (n.max /.big-limit)))] + [expected (|> random.nat (\ ! map (n.% /.big-limit))) + invalid (|> random.nat (\ ! map (n.max /.big-limit)))] (`` ($_ _.and (_.cover [/.big /.from-big] (case (/.big expected) @@ -152,10 +152,10 @@ Test (do {! random.monad} [expected-path (random.ascii/lower-alpha (dec /.path-size)) - expected-moment (:: ! map (|>> (n.% 1,0,00,00,00,00,000) .int instant.from-millis) - random.nat) + expected-moment (\ ! map (|>> (n.% 1,0,00,00,00,00,000) .int instant.from-millis) + random.nat) chunk (random.ascii/lower-alpha chunk-size) - chunks (:: ! map (n.% 100) random.nat) + chunks (\ ! map (n.% 100) random.nat) #let [content (|> chunk (list.repeat chunks) (text.join-with "") @@ -394,7 +394,7 @@ (|> row.empty (format.run /.writer) (<b>.run /.parser) - (:: try.monad map row.empty?) + (\ try.monad map row.empty?) (try.default false))) ..path ..name diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux index 9798625d5..7ac52ef02 100644 --- a/stdlib/source/test/lux/data/format/xml.lux +++ b/stdlib/source/test/lux/data/format/xml.lux @@ -36,7 +36,7 @@ (def: char (Random Nat) (do {! random.monad} - [idx (|> random.nat (:: ! map (n.% (text.size char-range))))] + [idx (|> random.nat (\ ! map (n.% (text.size char-range))))] (wrap (maybe.assume (text.nth idx char-range))))) (def: (size bottom top) diff --git a/stdlib/source/test/lux/data/lazy.lux b/stdlib/source/test/lux/data/lazy.lux index 440aa0316..dc305ae33 100644 --- a/stdlib/source/test/lux/data/lazy.lux +++ b/stdlib/source/test/lux/data/lazy.lux @@ -24,11 +24,11 @@ (def: comparison (Comparison Lazy) (function (_ ==) - (:: (/.equivalence ==) =))) + (\ (/.equivalence ==) =))) (def: #export lazy (All [a] (-> (Random a) (Random (Lazy a)))) - (:: random.functor map (|>> /.freeze))) + (\ random.functor map (|>> /.freeze))) (def: #export test Test diff --git a/stdlib/source/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux index 139c63e4c..fa863cdae 100644 --- a/stdlib/source/test/lux/data/maybe.lux +++ b/stdlib/source/test/lux/data/maybe.lux @@ -71,7 +71,7 @@ (do random.monad [value random.nat] (_.cover [/.to-list] - (:: (list.equivalence n.equivalence) = - (list value) - (/.to-list (#.Some value))))) + (\ (list.equivalence n.equivalence) = + (list value) + (/.to-list (#.Some value))))) )))) diff --git a/stdlib/source/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux index e3778202c..fd6f5b546 100644 --- a/stdlib/source/test/lux/data/name.lux +++ b/stdlib/source/test/lux/data/name.lux @@ -34,12 +34,12 @@ (<| (_.covering /._) (do {! random.monad} [## First Name - sizeM1 (|> random.nat (:: ! map (n.% 100))) - sizeS1 (|> random.nat (:: ! map (|>> (n.% 100) (n.max 1)))) + sizeM1 (|> random.nat (\ ! map (n.% 100))) + sizeS1 (|> random.nat (\ ! map (|>> (n.% 100) (n.max 1)))) (^@ name1 [module1 short1]) (..name sizeM1 sizeS1) ## Second Name - sizeM2 (|> random.nat (:: ! map (n.% 100))) - sizeS2 (|> random.nat (:: ! map (|>> (n.% 100) (n.max 1)))) + sizeM2 (|> random.nat (\ ! map (n.% 100))) + sizeS2 (|> random.nat (\ ! map (|>> (n.% 100) (n.max 1)))) (^@ name2 [module2 short2]) (..name sizeM2 sizeS2)] (_.with-cover [.Name] ($_ _.and diff --git a/stdlib/source/test/lux/data/number.lux b/stdlib/source/test/lux/data/number.lux index 9458bb12c..d1d812aa9 100644 --- a/stdlib/source/test/lux/data/number.lux +++ b/stdlib/source/test/lux/data/number.lux @@ -35,7 +35,7 @@ ($_ _.and (_.cover [/.bin] (`` (and (~~ (template [<=> <codec> <number>] - [(case (:: <codec> decode (..clean-commas <number>)) + [(case (\ <codec> decode (..clean-commas <number>)) (#try.Success actual) (<=> (/.bin <number>) actual) @@ -56,7 +56,7 @@ ))))) (_.cover [/.oct] (`` (and (~~ (template [<=> <codec> <number>] - [(case (:: <codec> decode (..clean-commas <number>)) + [(case (\ <codec> decode (..clean-commas <number>)) (#try.Success actual) (<=> (/.oct <number>) actual) @@ -77,7 +77,7 @@ ))))) (_.cover [/.hex] (`` (and (~~ (template [<=> <codec> <number>] - [(case (:: <codec> decode (..clean-commas <number>)) + [(case (\ <codec> decode (..clean-commas <number>)) (#try.Success actual) (<=> (/.hex <number>) actual) diff --git a/stdlib/source/test/lux/data/number/complex.lux b/stdlib/source/test/lux/data/number/complex.lux index 6b623388c..0a3866371 100644 --- a/stdlib/source/test/lux/data/number/complex.lux +++ b/stdlib/source/test/lux/data/number/complex.lux @@ -27,7 +27,7 @@ (def: dimension (Random Frac) (do {! random.monad} - [factor (|> random.nat (:: ! map (|>> (n.% 1000) (n.max 1)))) + [factor (|> random.nat (\ ! map (|>> (n.% 1000) (n.max 1)))) measure (|> random.safe-frac (random.filter (f.> +0.0)))] (wrap (f.* (|> factor .int int.frac) measure)))) @@ -41,10 +41,10 @@ (def: angle (Random /.Complex) - (:: random.monad map - (|>> (update@ #/.real (f.% +1.0)) - (update@ #/.imaginary (f.% +1.0))) - ..random)) + (\ random.monad map + (|>> (update@ #/.real (f.% +1.0)) + (update@ #/.imaginary (f.% +1.0))) + ..random)) (def: construction Test @@ -259,7 +259,7 @@ Test (do {! random.monad} [sample ..random - degree (|> random.nat (:: ! map (|>> (n.max 1) (n.% 5))))] + degree (|> random.nat (\ ! map (|>> (n.max 1) (n.% 5))))] (_.cover [/.roots] (|> sample (/.roots degree) diff --git a/stdlib/source/test/lux/data/number/frac.lux b/stdlib/source/test/lux/data/number/frac.lux index fcffb7c45..ca3d4d21c 100644 --- a/stdlib/source/test/lux/data/number/frac.lux +++ b/stdlib/source/test/lux/data/number/frac.lux @@ -23,7 +23,7 @@ (def: random (Random Frac) - (:: random.monad map (|>> (i.% +1,000,000) i.frac) random.int)) + (\ random.monad map (|>> (i.% +1,000,000) i.frac) random.int)) (def: signature Test @@ -73,7 +73,7 @@ Test (do {! random.monad} [sample ..random - shift (:: ! map /.abs ..random)] + shift (\ ! map /.abs ..random)] ($_ _.and (_.cover [/.negative?] (bit\= (/.negative? sample) @@ -98,16 +98,16 @@ Test ($_ _.and (do {! random.monad} - [expected (:: ! map (n.% 1,000,000) random.nat)] + [expected (\ ! map (n.% 1,000,000) random.nat)] (_.cover [/.nat] (|> expected n.frac /.nat (n.= expected)))) (do {! random.monad} - [expected (:: ! map (i.% +1,000,000) random.int)] + [expected (\ ! map (i.% +1,000,000) random.int)] (_.cover [/.int] (|> expected i.frac /.int (i.= expected)))) (do {! random.monad} - [expected (:: ! map (|>> (i64.left-shift 32) .rev) - random.nat)] + [expected (\ ! map (|>> (i64.left-shift 32) .rev) + random.nat)] (_.cover [/.rev] (|> expected r.frac /.rev (r.= expected)))) )) diff --git a/stdlib/source/test/lux/data/number/i16.lux b/stdlib/source/test/lux/data/number/i16.lux index edfadf62d..f3d8030c0 100644 --- a/stdlib/source/test/lux/data/number/i16.lux +++ b/stdlib/source/test/lux/data/number/i16.lux @@ -18,7 +18,7 @@ (def: #export i16 (Random /.I16) - (:: r.functor map /.i16 r.i64)) + (\ r.functor map /.i16 r.i64)) (def: mask Mask @@ -29,11 +29,11 @@ Test (<| (_.context (name.module (name-of /._))) (do {! r.monad} - [expected (:: ! map (|>> (//i64.and ..mask) (: I64)) r.i64)] + [expected (\ ! map (|>> (//i64.and ..mask) (: I64)) r.i64)] ($_ _.and ($equivalence.spec /.equivalence ..i16) (_.test "Can convert between I64 and I16" (let [actual (|> expected /.i16 /.i64)] - (:: //i64.equivalence = expected actual))) + (\ //i64.equivalence = expected actual))) )))) diff --git a/stdlib/source/test/lux/data/number/i32.lux b/stdlib/source/test/lux/data/number/i32.lux index f5d32ba21..1bf6bfee7 100644 --- a/stdlib/source/test/lux/data/number/i32.lux +++ b/stdlib/source/test/lux/data/number/i32.lux @@ -18,7 +18,7 @@ (def: #export i32 (Random /.I32) - (:: r.functor map /.i32 r.i64)) + (\ r.functor map /.i32 r.i64)) (def: mask Mask @@ -29,11 +29,11 @@ Test (<| (_.context (name.module (name-of /._))) (do {! r.monad} - [expected (:: ! map (|>> (//i64.and ..mask) (: I64)) r.i64)] + [expected (\ ! map (|>> (//i64.and ..mask) (: I64)) r.i64)] ($_ _.and ($equivalence.spec /.equivalence ..i32) (_.test "Can convert between I64 and I32" (let [actual (|> expected /.i32 /.i64)] - (:: //i64.equivalence = expected actual))) + (\ //i64.equivalence = expected actual))) )))) diff --git a/stdlib/source/test/lux/data/number/i64.lux b/stdlib/source/test/lux/data/number/i64.lux index 6834f6276..4d9b9f468 100644 --- a/stdlib/source/test/lux/data/number/i64.lux +++ b/stdlib/source/test/lux/data/number/i64.lux @@ -24,7 +24,7 @@ (<| (_.context (name.module (name-of /._))) (do {! r.monad} [pattern r.nat - idx (:: ! map (//nat.% /.width) r.nat)] + idx (\ ! map (//nat.% /.width) r.nat)] ($_ _.and ($equivalence.spec /.equivalence r.i64) ($monoid.spec //nat.equivalence /.disjunction r.nat) @@ -89,9 +89,9 @@ (i.>= +0 (/.arithmetic-right-shift idx value))))) (_.cover [/.mask] (let [mask (/.mask idx) - idempotent? (:: /.equivalence = - (/.and mask pattern) - (/.and mask (/.and mask pattern))) + idempotent? (\ /.equivalence = + (/.and mask pattern) + (/.and mask (/.and mask pattern))) limit (inc (.nat mask)) below-limit? (if (//nat.< limit pattern) diff --git a/stdlib/source/test/lux/data/number/i8.lux b/stdlib/source/test/lux/data/number/i8.lux index 53b196e41..88f456bca 100644 --- a/stdlib/source/test/lux/data/number/i8.lux +++ b/stdlib/source/test/lux/data/number/i8.lux @@ -18,7 +18,7 @@ (def: #export i8 (Random /.I8) - (:: r.functor map /.i8 r.i64)) + (\ r.functor map /.i8 r.i64)) (def: mask Mask @@ -29,11 +29,11 @@ Test (<| (_.context (name.module (name-of /._))) (do {! r.monad} - [expected (:: ! map (|>> (//i64.and ..mask) (: I64)) r.i64)] + [expected (\ ! map (|>> (//i64.and ..mask) (: I64)) r.i64)] ($_ _.and ($equivalence.spec /.equivalence ..i8) (_.test "Can convert between I64 and I8" (let [actual (|> expected /.i8 /.i64)] - (:: //i64.equivalence = expected actual))) + (\ //i64.equivalence = expected actual))) )))) diff --git a/stdlib/source/test/lux/data/number/ratio.lux b/stdlib/source/test/lux/data/number/ratio.lux index a774b5e81..38a3ab9f3 100644 --- a/stdlib/source/test/lux/data/number/ratio.lux +++ b/stdlib/source/test/lux/data/number/ratio.lux @@ -20,7 +20,7 @@ (def: part (Random Nat) - (|> r.nat (:: r.monad map (|>> (n.% 1,000,000) (n.max 1))))) + (|> r.nat (\ r.monad map (|>> (n.% 1,000,000) (n.max 1))))) (def: #export ratio (Random Ratio) diff --git a/stdlib/source/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux index 3ae126887..7484eac15 100644 --- a/stdlib/source/test/lux/data/sum.lux +++ b/stdlib/source/test/lux/data/sum.lux @@ -60,27 +60,27 @@ (/.each (n.+ shift) (n.- shift)) (case> (0 #1 actual) (n.= (n.- shift expected) actual) _ false)))) (do ! - [size (:: ! map (n.% 5) random.nat) + [size (\ ! map (n.% 5) random.nat) expected (random.list size random.nat)] ($_ _.and (_.cover [/.lefts] (let [actual (: (List (| Nat Nat)) (list\map /.left expected))] - (and (:: (list.equivalence n.equivalence) = - expected - (/.lefts actual)) - (:: (list.equivalence n.equivalence) = - (list) - (/.rights actual))))) + (and (\ (list.equivalence n.equivalence) = + expected + (/.lefts actual)) + (\ (list.equivalence n.equivalence) = + (list) + (/.rights actual))))) (_.cover [/.rights] (let [actual (: (List (| Nat Nat)) (list\map /.right expected))] - (and (:: (list.equivalence n.equivalence) = - expected - (/.rights actual)) - (:: (list.equivalence n.equivalence) = - (list) - (/.lefts actual))))) + (and (\ (list.equivalence n.equivalence) = + expected + (/.rights actual)) + (\ (list.equivalence n.equivalence) = + (list) + (/.lefts actual))))) (_.cover [/.partition] (let [[lefts rights] (|> expected (list\map (function (_ value) @@ -89,11 +89,11 @@ (/.right value)))) (: (List (| Nat Nat))) /.partition)] - (and (:: (list.equivalence n.equivalence) = - (list.filter n.even? expected) - lefts) - (:: (list.equivalence n.equivalence) = - (list.filter (|>> n.even? not) expected) - rights)))) + (and (\ (list.equivalence n.equivalence) = + (list.filter n.even? expected) + lefts) + (\ (list.equivalence n.equivalence) = + (list.filter (|>> n.even? not) expected) + rights)))) )) ))) diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux index 7849ee04a..ce645f46e 100644 --- a/stdlib/source/test/lux/data/text.lux +++ b/stdlib/source/test/lux/data/text.lux @@ -25,12 +25,12 @@ (def: bounded-size (random.Random Nat) (|> random.nat - (:: random.monad map (|>> (n.% 20) (n.+ 1))))) + (\ random.monad map (|>> (n.% 20) (n.+ 1))))) (def: size Test (do {! random.monad} - [size (:: ! map (n.% 10) random.nat) + [size (\ ! map (n.% 10) random.nat) sample (random.unicode size)] ($_ _.and (_.cover [/.size] @@ -43,11 +43,11 @@ Test (do {! random.monad} [inner (random.unicode 1) - outer (random.filter (|>> (:: /.equivalence = inner) not) + outer (random.filter (|>> (\ /.equivalence = inner) not) (random.unicode 1)) left (random.unicode 1) right (random.unicode 1) - #let [full (:: /.monoid compose inner outer) + #let [full (\ /.monoid compose inner outer) fake-index (.nat -1)]] (`` ($_ _.and (~~ (template [<affix> <predicate>] @@ -72,23 +72,23 @@ Test (do {! random.monad} [inner (random.unicode 1) - outer (random.filter (|>> (:: /.equivalence = inner) not) + outer (random.filter (|>> (\ /.equivalence = inner) not) (random.unicode 1)) #let [fake-index (.nat -1)]] ($_ _.and (_.cover [/.contains?] - (let [full (:: /.monoid compose inner outer)] + (let [full (\ /.monoid compose inner outer)] (and (/.contains? inner full) (/.contains? outer full)))) (_.cover [/.index-of] - (and (|> (/.index-of inner (:: /.monoid compose inner outer)) + (and (|> (/.index-of inner (\ /.monoid compose inner outer)) (maybe.default fake-index) (n.= 0)) - (|> (/.index-of outer (:: /.monoid compose inner outer)) + (|> (/.index-of outer (\ /.monoid compose inner outer)) (maybe.default fake-index) (n.= 1)))) (_.cover [/.index-of'] - (let [full (:: /.monoid compose inner outer)] + (let [full (\ /.monoid compose inner outer)] (and (|> (/.index-of' inner 0 full) (maybe.default fake-index) (n.= 0)) @@ -106,7 +106,7 @@ (maybe.default fake-index) (n.= fake-index))))) (_.cover [/.last-index-of] - (let [full ($_ (:: /.monoid compose) outer inner outer)] + (let [full ($_ (\ /.monoid compose) outer inner outer)] (and (|> (/.last-index-of inner full) (maybe.default fake-index) (n.= 1)) @@ -114,7 +114,7 @@ (maybe.default fake-index) (n.= 2))))) (_.cover [/.last-index-of'] - (let [full ($_ (:: /.monoid compose) outer inner outer)] + (let [full ($_ (\ /.monoid compose) outer inner outer)] (and (|> (/.last-index-of' inner 0 full) (maybe.default fake-index) (n.= 1)) @@ -140,7 +140,7 @@ (`` ($_ _.and (~~ (template [<short> <long>] [(_.cover [<short> <long>] - (:: /.equivalence = <short> <long>))] + (\ /.equivalence = <short> <long>))] [/.\0 /.null] [/.\a /.alarm] @@ -152,13 +152,13 @@ [/.\r /.carriage-return] [/.\'' /.double-quote])) (_.cover [/.line-feed] - (:: /.equivalence = /.new-line /.line-feed)) + (\ /.equivalence = /.new-line /.line-feed)) ))) (do {! random.monad} - [size (:: ! map (|>> (n.% 10) inc) random.nat) + [size (\ ! map (|>> (n.% 10) inc) random.nat) characters (random.set /.hash size (random.ascii/alpha 1)) #let [sample (|> characters set.to-list /.concat)] - expected (:: ! map (n.% size) random.nat)] + expected (\ ! map (n.% size) random.nat)] (_.cover [/.nth] (case (/.nth expected sample) (#.Some char) @@ -187,13 +187,13 @@ (def: manipulation Test (do {! random.monad} - [size (:: ! map (|>> (n.% 10) (n.+ 2)) random.nat) + [size (\ ! map (|>> (n.% 10) (n.+ 2)) random.nat) characters (random.set /.hash size (random.ascii/alpha 1)) separator (random.filter (|>> (set.member? characters) not) (random.ascii/alpha 1)) #let [with-no-separator (|> characters set.to-list /.concat)] static (random.ascii/alpha 1) - #let [dynamic (random.filter (|>> (:: /.equivalence = static) not) + #let [dynamic (random.filter (|>> (\ /.equivalence = static) not) (random.ascii/alpha 1))] pre dynamic post dynamic] @@ -206,19 +206,19 @@ (/.join-with separator) (/.split-all-with separator) (set.from-list /.hash) - (:: set.equivalence = characters)) - (:: /.equivalence = - (/.concat (set.to-list characters)) - (/.join-with "" (set.to-list characters))))) + (\ set.equivalence = characters)) + (\ /.equivalence = + (/.concat (set.to-list characters)) + (/.join-with "" (set.to-list characters))))) (_.cover [/.replace-once] - (:: /.equivalence = - (:: /.monoid compose post static) - (/.replace-once pre post (:: /.monoid compose pre static)))) + (\ /.equivalence = + (\ /.monoid compose post static) + (/.replace-once pre post (\ /.monoid compose pre static)))) (_.cover [/.split-with] - (case (/.split-with static ($_ (:: /.monoid compose) pre static post)) + (case (/.split-with static ($_ (\ /.monoid compose) pre static post)) (#.Some [left right]) - (and (:: /.equivalence = pre left) - (:: /.equivalence = post right)) + (and (\ /.equivalence = pre left) + (\ /.equivalence = post right)) #.None false)) @@ -280,7 +280,7 @@ #let [## The wider unicode charset includes control characters that ## can make text replacement work improperly. ## Because of that, I restrict the charset. - normal-char-gen (|> random.nat (:: ! map (|>> (n.% 128) (n.max 1))))] + normal-char-gen (|> random.nat (\ ! map (|>> (n.% 128) (n.max 1))))] sep1 (random.text normal-char-gen 1) sep2 (random.text normal-char-gen 1) #let [part-gen (|> (random.text normal-char-gen sizeP) diff --git a/stdlib/source/test/lux/host.js.lux b/stdlib/source/test/lux/host.js.lux index 6e42fc363..f27b9554c 100644 --- a/stdlib/source/test/lux/host.js.lux +++ b/stdlib/source/test/lux/host.js.lux @@ -40,12 +40,12 @@ Test (do {! random.monad} [boolean random.bit - number (:: ! map (|>> (nat.% 100) nat.frac) random.nat) + number (\ ! map (|>> (nat.% 100) nat.frac) random.nat) string (random.ascii 5) - function (:: ! map (function (_ shift) - (: (-> Nat Nat) - (nat.+ shift))) - random.nat) + function (\ ! map (function (_ shift) + (: (-> Nat Nat) + (nat.+ shift))) + random.nat) ## I64s get compiled as JavaScript objects with a specific structure. object random.nat] (<| (_.covering /._) diff --git a/stdlib/source/test/lux/host.jvm.lux b/stdlib/source/test/lux/host.jvm.lux index bda13403b..3a55a232d 100644 --- a/stdlib/source/test/lux/host.jvm.lux +++ b/stdlib/source/test/lux/host.jvm.lux @@ -94,8 +94,8 @@ (def: miscellaneous Test (do {! r.monad} - [sample (:: ! map (|>> (:coerce java/lang/Object)) - (r.ascii 1))] + [sample (\ ! map (|>> (:coerce java/lang/Object)) + (r.ascii 1))] ($_ _.and (_.test "Can check if an object is of a certain class." (and (case (/.check java/lang/String sample) (#.Some _) true #.None false) @@ -125,9 +125,9 @@ (def: arrays Test (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 100) (n.max 1)))) - idx (|> r.nat (:: ! map (n.% size))) - value (:: ! map (|>> (:coerce java/lang/Long)) r.int)] + [size (|> r.nat (\ ! map (|>> (n.% 100) (n.max 1)))) + idx (|> r.nat (\ ! map (n.% size))) + value (\ ! map (|>> (:coerce java/lang/Long)) r.int)] ($_ _.and (_.test "Can create arrays of some length." (n.= size (/.array-length (/.array java/lang/Long size)))) diff --git a/stdlib/source/test/lux/host.old.lux b/stdlib/source/test/lux/host.old.lux index fa0ad409e..179a8a3b7 100644 --- a/stdlib/source/test/lux/host.old.lux +++ b/stdlib/source/test/lux/host.old.lux @@ -121,8 +121,8 @@ (def: arrays Test (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 100) (n.max 1)))) - idx (|> r.nat (:: ! map (n.% size))) + [size (|> r.nat (\ ! map (|>> (n.% 100) (n.max 1)))) + idx (|> r.nat (\ ! map (n.% size))) value r.int] ($_ _.and (_.test "Can create arrays of some length." diff --git a/stdlib/source/test/lux/locale/language.lux b/stdlib/source/test/lux/locale/language.lux index 9ffff2f1f..3ba8e7567 100644 --- a/stdlib/source/test/lux/locale/language.lux +++ b/stdlib/source/test/lux/locale/language.lux @@ -207,7 +207,7 @@ (template: (!aliases <reference> <aliases>) (_.cover <aliases> - (list.every? (:: /.equivalence = <reference>) + (list.every? (\ /.equivalence = <reference>) (`` (list (~~ (template.splice <aliases>))))))) (def: aliases-test diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/locale/territory.lux index 12fa402af..485cd7efc 100644 --- a/stdlib/source/test/lux/locale/territory.lux +++ b/stdlib/source/test/lux/locale/territory.lux @@ -166,7 +166,7 @@ (template: (!aliases <reference> <aliases>) (_.cover <aliases> - (list.every? (:: /.equivalence = <reference>) + (list.every? (\ /.equivalence = <reference>) (`` (list (~~ (template.splice <aliases>))))))) (def: aliases-test diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux index 96f653a11..8ba65a181 100644 --- a/stdlib/source/test/lux/macro/code.lux +++ b/stdlib/source/test/lux/macro/code.lux @@ -38,13 +38,13 @@ (def: (random-sequence random) (All [a] (-> (Random a) (Random (List a)))) (do {! random.monad} - [size (|> random.nat (:: ! map (n.% 3)))] + [size (|> random.nat (\ ! map (n.% 3)))] (random.list size random))) (def: (random-record random) (All [a] (-> (Random a) (Random (List [a a])))) (do {! random.monad} - [size (|> random.nat (:: ! map (n.% 3)))] + [size (|> random.nat (\ ! map (n.% 3)))] (random.list size (random.and random random)))) (def: #export random @@ -92,7 +92,7 @@ ($_ random.either (random\wrap [original substitute]) (do {! random.monad} - [sample (random.filter (|>> (:: /.equivalence = original) not) + [sample (random.filter (|>> (\ /.equivalence = original) not) ($_ random.either (random\map /.bit random.bit) (random\map /.nat random.nat) @@ -127,15 +127,15 @@ (_.cover [<coverage>] (and (case (..read (/.format (<coverage> expected))) (#try.Success actual) - (:: /.equivalence = - actual - (<coverage> expected)) + (\ /.equivalence = + actual + (<coverage> expected)) (#try.Failure error) false) - (:: /.equivalence = - [location.dummy (<tag> expected)] - (<coverage> expected)))))] + (\ /.equivalence = + [location.dummy (<tag> expected)] + (<coverage> expected)))))] [/.bit random.bit #.Bit] [/.nat random.nat #.Nat] @@ -154,15 +154,15 @@ (_.cover [<coverage>] (and (case (..read (/.format (<coverage> expected))) (#try.Success actual) - (:: /.equivalence = - actual - (<coverage> expected)) + (\ /.equivalence = + actual + (<coverage> expected)) (#try.Failure error) false) - (:: /.equivalence = - [location.dummy (<tag> ["" expected])] - (<coverage> expected))) + (\ /.equivalence = + [location.dummy (<tag> ["" expected])] + (<coverage> expected))) ))] [/.local-tag ..random-text #.Tag] @@ -172,7 +172,7 @@ [[original substitute] (random.and ..random ..random) [sample expected] (..replace-simulation [original substitute])] (_.cover [/.replace] - (:: /.equivalence = - expected - (/.replace original substitute sample)))) + (\ /.equivalence = + expected + (/.replace original substitute sample)))) ))) diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux index fcc12c61b..16903ebc2 100644 --- a/stdlib/source/test/lux/macro/poly/equivalence.lux +++ b/stdlib/source/test/lux/macro/poly/equivalence.lux @@ -51,8 +51,8 @@ (def: gen-record (Random Record) (do {! random.monad} - [size (:: ! map (n.% 2) random.nat) - #let [gen-int (|> random.int (:: ! map (|>> i.abs (i.% +1,000,000))))]] + [size (\ ! map (n.% 2) random.nat) + #let [gen-int (|> random.int (\ ! map (|>> i.abs (i.% +1,000,000))))]] ($_ random.and random.bit gen-int diff --git a/stdlib/source/test/lux/macro/poly/json.lux b/stdlib/source/test/lux/macro/poly/json.lux index f052cdf0f..6988adb4a 100644 --- a/stdlib/source/test/lux/macro/poly/json.lux +++ b/stdlib/source/test/lux/macro/poly/json.lux @@ -85,12 +85,12 @@ (def: qty (All [unit] (Random (unit.Qty unit))) - (|> random.int (:: random.monad map unit.in))) + (|> random.int (\ random.monad map unit.in))) (def: gen-record (Random Record) (do {! random.monad} - [size (:: ! map (n.% 2) random.nat)] + [size (\ ! map (n.% 2) random.nat)] ($_ random.and random.bit random.safe-frac diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux index 77ede35f3..90efa671f 100644 --- a/stdlib/source/test/lux/macro/syntax.lux +++ b/stdlib/source/test/lux/macro/syntax.lux @@ -46,7 +46,7 @@ (All [a] (-> (Equivalence a) a (Parser a) (List Code) Bit)) (case (p.run parser input) (#.Right [_ output]) - (:: Equivalence<a> = reference output) + (\ Equivalence<a> = reference output) _ #0)) diff --git a/stdlib/source/test/lux/macro/syntax/common.lux b/stdlib/source/test/lux/macro/syntax/common.lux index b470ca574..ab29448d7 100644 --- a/stdlib/source/test/lux/macro/syntax/common.lux +++ b/stdlib/source/test/lux/macro/syntax/common.lux @@ -45,7 +45,7 @@ (def: random-annotations (Random /.Annotations) (do {! random.monad} - [size (:: ! map (|>> (n.% 3)) random.nat)] + [size (\ ! map (|>> (n.% 3)) random.nat)] (random.list size (random.and random-name ///code.random)))) @@ -75,7 +75,7 @@ /writer.annotations list (<c>.run /reader.annotations) (case> (#try.Success actual) - (:: ..annotations-equivalence = expected actual) + (\ ..annotations-equivalence = expected actual) (#try.Failure error) false)))) @@ -84,25 +84,25 @@ /writer.annotations list (<c>.run /reader.annotations) (case> (#try.Success actual) - (:: ..annotations-equivalence = /.empty-annotations actual) + (\ ..annotations-equivalence = /.empty-annotations actual) (#try.Failure error) false))) )) (do {! random.monad} - [size (:: ! map (|>> (n.% 3)) random.nat) + [size (\ ! map (|>> (n.% 3)) random.nat) expected (random.list size ..random-text)] (_.cover [/.Type-Var /reader.type-variables /writer.type-variables] (|> expected /writer.type-variables (<c>.run /reader.type-variables) (case> (#try.Success actual) - (:: (list.equivalence text.equivalence) = expected actual) + (\ (list.equivalence text.equivalence) = expected actual) (#try.Failure error) false)))) (do {! random.monad} - [size (:: ! map (|>> (n.% 3)) random.nat) + [size (\ ! map (|>> (n.% 3)) random.nat) expected (: (Random /.Declaration) (random.and ..random-text (random.list size ..random-text)))] @@ -113,7 +113,7 @@ (case> (#try.Success actual) (let [equivalence (equivalence.product text.equivalence (list.equivalence text.equivalence))] - (:: equivalence = expected actual)) + (\ equivalence = expected actual)) (#try.Failure error) false)))) @@ -127,7 +127,7 @@ (<c>.run /reader.typed-input) (case> (#try.Success actual) (let [equivalence (equivalence.product code.equivalence code.equivalence)] - (:: equivalence = expected actual)) + (\ equivalence = expected actual)) (#try.Failure error) false)))) diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/macro/template.lux index 8dff75251..8fa6a00ca 100644 --- a/stdlib/source/test/lux/macro/template.lux +++ b/stdlib/source/test/lux/macro/template.lux @@ -26,9 +26,9 @@ <short>' "abc#0#12+3-4.5+6.7-8.9"] ($_ _.and (_.cover [/.splice] - (:: (list.equivalence nat.equivalence) = - (list left mid right) - (`` (list (~~ (/.splice [left mid right])))))) + (\ (list.equivalence nat.equivalence) = + (list left mid right) + (`` (list (~~ (/.splice [left mid right])))))) (_.cover [/.count] (case (/.count [left mid right]) 3 true diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux index 2c34e8ed5..11f826ce4 100644 --- a/stdlib/source/test/lux/math.lux +++ b/stdlib/source/test/lux/math.lux @@ -36,7 +36,7 @@ ($_ _.and (<| (_.context "Trigonometry") (do {! r.monad} - [angle (|> r.safe-frac (:: ! map (f.* /.tau)))] + [angle (|> r.safe-frac (\ ! map (f.* /.tau)))] ($_ _.and (_.test "Sine and arc-sine are inverse functions." (trigonometric-symmetry /.sin /.asin angle)) @@ -47,7 +47,7 @@ ))) (<| (_.context "Rounding") (do {! r.monad} - [sample (|> r.safe-frac (:: ! map (f.* +1000.0)))] + [sample (|> r.safe-frac (\ ! map (f.* +1000.0)))] ($_ _.and (_.test "The ceiling will be an integer value, and will be >= the original." (let [ceil'd (/.ceil sample)] @@ -66,12 +66,12 @@ ))) (<| (_.context "Exponentials and logarithms") (do {! r.monad} - [sample (|> r.safe-frac (:: ! map (f.* +10.0)))] + [sample (|> r.safe-frac (\ ! map (f.* +10.0)))] (_.test "Logarithm is the inverse of exponential." (|> sample /.exp /.log (within? +0.000000000000001 sample))))) (<| (_.context "Greatest-Common-Divisor and Least-Common-Multiple") (do {! r.monad} - [#let [gen-nat (|> r.nat (:: ! map (|>> (n.% 1000) (n.max 1))))] + [#let [gen-nat (|> r.nat (\ ! map (|>> (n.% 1000) (n.max 1))))] x gen-nat y gen-nat] ($_ _.and diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux index 56e03277a..731ee6865 100644 --- a/stdlib/source/test/lux/math/logic/fuzzy.lux +++ b/stdlib/source/test/lux/math/logic/fuzzy.lux @@ -145,7 +145,7 @@ Test (do {! random.monad} [#let [set-10 (set.from-list n.hash (enum.range n.enum 0 10))] - sample (|> random.nat (:: ! map (n.% 20)))] + sample (|> random.nat (\ ! map (n.% 20)))] ($_ _.and (_.test (%.name (name-of /.from-predicate)) (bit\= (r.= //.true (/.membership sample (/.from-predicate n.even?))) diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux index 27cb63f68..283acdddd 100644 --- a/stdlib/source/test/lux/math/modular.lux +++ b/stdlib/source/test/lux/math/modular.lux @@ -21,12 +21,12 @@ (def: modulusR (r.Random Int) (|> r.int - (:: r.monad map (i.% +1000)) + (\ r.monad map (i.% +1000)) (r.filter (|>> (i.= +0) not)))) (def: valueR (r.Random Int) - (|> r.int (:: r.monad map (i.% +1000)))) + (|> r.int (\ r.monad map (i.% +1000)))) (def: (modR modulus) (All [m] (-> (/.Modulus m) (r.Random [Int (/.Mod m)]))) diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux index 0f6b13629..25e3b3f94 100644 --- a/stdlib/source/test/lux/meta.lux +++ b/stdlib/source/test/lux/meta.lux @@ -63,12 +63,12 @@ #.host []}]] ($_ _.and (_.cover [/.run] - (|> (:: /.monad wrap expected) + (|> (\ /.monad wrap expected) (/.run expected-lux) (!expect (^multi (#try.Success actual) (n.= expected actual))))) (_.cover [/.run'] - (|> (:: /.monad wrap expected) + (|> (\ /.monad wrap expected) (/.run' expected-lux) (!expect (^multi (#try.Success [actual-lux actual]) (and (is? expected-lux actual-lux) @@ -125,7 +125,7 @@ (!expect (^multi (#try.Failure actual-error) (text\= expected-error actual-error)))))) (_.cover [/.either] - (and (|> (/.either (:: /.monad wrap expected) + (and (|> (/.either (\ /.monad wrap expected) (: (Meta Nat) (/.fail expected-error))) (/.run expected-lux) @@ -133,7 +133,7 @@ (n.= expected actual)))) (|> (/.either (: (Meta Nat) (/.fail expected-error)) - (:: /.monad wrap expected)) + (\ /.monad wrap expected)) (/.run expected-lux) (!expect (^multi (#try.Success actual) (n.= expected actual)))) @@ -144,8 +144,8 @@ (/.run expected-lux) (!expect (^multi (#try.Failure actual-error) (text\= expected-error actual-error)))) - (|> (/.either (:: /.monad wrap expected) - (:: /.monad wrap dummy)) + (|> (/.either (\ /.monad wrap expected) + (\ /.monad wrap dummy)) (/.run expected-lux) (!expect (^multi (#try.Success actual) (n.= expected actual)))))) @@ -210,7 +210,7 @@ (def: injection (Injection Meta) - (:: /.monad wrap)) + (\ /.monad wrap)) (def: (comparison init) (-> Lux (Comparison Meta)) @@ -232,9 +232,9 @@ version (random.ascii/upper-alpha 1) source-code (random.ascii/upper-alpha 1) expected-current-module (random.ascii/upper-alpha 1) - expected-type (:: ! map (function (_ name) - (#.Primitive name (list))) - (random.ascii/upper-alpha 1)) + expected-type (\ ! map (function (_ name) + (#.Primitive name (list))) + (random.ascii/upper-alpha 1)) expected-seed random.nat expected random.nat dummy (random.filter (|>> (n.= expected) not) random.nat) @@ -282,7 +282,7 @@ (n.= (inc expected-seed) actual-post)))))) (_.cover [/.gensym] (|> (/.gensym expected-gensym) - (:: /.monad map %.code) + (\ /.monad map %.code) (/.run expected-lux) (!expect (^multi (#try.Success actual-gensym) (and (text.contains? expected-gensym actual-gensym) diff --git a/stdlib/source/test/lux/meta/annotation.lux b/stdlib/source/test/lux/meta/annotation.lux index 8ed76090c..3b5b4d635 100644 --- a/stdlib/source/test/lux/meta/annotation.lux +++ b/stdlib/source/test/lux/meta/annotation.lux @@ -36,13 +36,13 @@ (def: (random-sequence random) (All [a] (-> (Random a) (Random (List a)))) (do {! random.monad} - [size (|> random.nat (:: ! map (nat.% 3)))] + [size (|> random.nat (\ ! map (nat.% 3)))] (random.list size random))) (def: (random-record random) (All [a] (-> (Random a) (Random (List [a a])))) (do {! random.monad} - [size (|> random.nat (:: ! map (nat.% 3)))] + [size (|> random.nat (\ ! map (nat.% 3)))] (random.list size (random.and random random)))) (template: (!expect <pattern> <value>) @@ -68,7 +68,7 @@ (..annotation key) (<definition> key) (!expect (^multi (#.Some actual) - (:: <equivalence> = expected actual))))))] + (\ <equivalence> = expected actual))))))] [/.bit random.bit code.bit bit.equivalence] [/.nat random.nat code.nat nat.equivalence] @@ -97,7 +97,7 @@ (and (|> expected code.bit (..annotation key) (/.flagged? key) - (:: bit.equivalence = expected)) + (\ bit.equivalence = expected)) (not (|> expected code.bit (..annotation dummy) (/.flagged? key)))))) @@ -108,7 +108,7 @@ (and (|> expected code.bit (..annotation (name-of <tag>)) <definition> - (:: bit.equivalence = expected)) + (\ bit.equivalence = expected)) (not (|> expected code.bit (..annotation key) <definition>)))))] @@ -131,11 +131,11 @@ (and (|> expected (list\map code.text) code.tuple (..annotation (name-of <tag>)) <definition> - (:: (list.equivalence text.equivalence) = expected)) + (\ (list.equivalence text.equivalence) = expected)) (|> expected (list\map code.text) code.tuple (..annotation key) <definition> - (:: (list.equivalence text.equivalence) = (list))))))] + (\ (list.equivalence text.equivalence) = (list))))))] [/.function-arguments #.func-args] [/.type-arguments #.type-args] @@ -167,12 +167,12 @@ (..annotation key) /.documentation (!expect (^multi (#.Some actual) - (:: text.equivalence = expected actual))))) + (\ text.equivalence = expected actual))))) (|> expected code.text (..annotation (name-of #.doc)) /.documentation (!expect (^multi (#.Some actual) - (:: text.equivalence = expected actual))))))) + (\ text.equivalence = expected actual))))))) ..flag ..arguments diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux index be11f3f6e..cb3398720 100644 --- a/stdlib/source/test/lux/target/jvm.lux +++ b/stdlib/source/test/lux/target/jvm.lux @@ -165,7 +165,7 @@ (/.invokestatic ..$Byte "valueOf" (/type.method [(list /type.byte) ..$Byte (list)]))) (def: $Byte::random (Random java/lang/Byte) - (:: random.monad map (|>> (:coerce java/lang/Long) host.long-to-byte) random.int)) + (\ random.monad map (|>> (:coerce java/lang/Long) host.long-to-byte) random.int)) (def: $Byte::literal (-> java/lang/Byte (Bytecode Any)) (|>> host.byte-to-long (:coerce I64) i32.i32 /.int)) @@ -183,7 +183,7 @@ (/.invokestatic ..$Short "valueOf" (/type.method [(list /type.short) ..$Short (list)]))) (def: $Short::random (Random java/lang/Short) - (:: random.monad map (|>> (:coerce java/lang/Long) host.long-to-short) random.int)) + (\ random.monad map (|>> (:coerce java/lang/Long) host.long-to-short) random.int)) (def: $Short::literal (-> java/lang/Short (Bytecode Any)) (|>> host.short-to-long (:coerce I64) i32.i32 /.int)) @@ -201,7 +201,7 @@ (/.invokestatic ..$Integer "valueOf" (/type.method [(list /type.int) ..$Integer (list)]))) (def: $Integer::random (Random java/lang/Integer) - (:: random.monad map (|>> (:coerce java/lang/Long) host.long-to-int) random.int)) + (\ random.monad map (|>> (:coerce java/lang/Long) host.long-to-int) random.int)) (def: $Integer::literal (-> java/lang/Integer (Bytecode Any)) (|>> host.int-to-long (:coerce I64) i32.i32 /.int)) @@ -229,9 +229,9 @@ (def: $Float::wrap (/.invokestatic ..$Float "valueOf" (/type.method [(list /type.float) ..$Float (list)]))) (def: $Float::random (Random java/lang/Float) - (:: random.monad map - (|>> (:coerce java/lang/Double) host.double-to-float) - random.frac)) + (\ random.monad map + (|>> (:coerce java/lang/Double) host.double-to-float) + random.frac)) (def: $Float::literal /.float) (def: valid-float (Random java/lang/Float) @@ -269,7 +269,7 @@ (/.invokestatic ..$Character "valueOf" (/type.method [(list /type.char) ..$Character (list)]))) (def: $Character::random (Random java/lang/Character) - (:: random.monad map (|>> (:coerce java/lang/Long) host.long-to-int host.int-to-char) random.int)) + (\ random.monad map (|>> (:coerce java/lang/Long) host.long-to-int host.int-to-char) random.int)) (def: $Character::literal (-> java/lang/Character (Bytecode Any)) (|>> host.char-to-long (:coerce I64) i32.i32 /.int)) @@ -304,7 +304,7 @@ [(def: <name> Test (do {! random.monad} - [expected (:: ! map (i64.and (i64.mask <bits>)) random.nat)] + [expected (\ ! map (i64.and (i64.mask <bits>)) random.nat)] (<| (_.lift <message>) (..bytecode (for {@.old (|>> (:coerce <type>) <to-long> ("jvm leq" expected)) @@ -382,7 +382,7 @@ shift (: (-> (-> java/lang/Integer java/lang/Integer java/lang/Integer) (Bytecode Any) (Random Bit)) (function (_ reference instruction) (do {! random.monad} - [parameter (:: ! map (|>> (n.% 32) .int (:coerce java/lang/Long) host.long-to-int) random.nat) + [parameter (\ ! map (|>> (n.% 32) .int (:coerce java/lang/Long) host.long-to-int) random.nat) subject ..$Integer::random] (int (reference parameter subject) (do /.monad @@ -461,7 +461,7 @@ shift (: (-> (-> java/lang/Integer java/lang/Long java/lang/Long) (Bytecode Any) (Random Bit)) (function (_ reference instruction) (do {! random.monad} - [parameter (:: ! map (|>> (n.% 64) (:coerce java/lang/Long)) random.nat) + [parameter (\ ! map (|>> (n.% 64) (:coerce java/lang/Long)) random.nat) subject ..$Long::random] (long (reference (host.long-to-int parameter) subject) (do /.monad @@ -942,7 +942,7 @@ Test)) (function (_ constructor random literal [*store *load *wrap] test) (do {! random.monad} - [size (:: ! map (|>> (n.% 1024) (n.max 1)) random.nat) + [size (\ ! map (|>> (n.% 1024) (n.max 1)) random.nat) value random] ($_ _.and (<| (_.lift "length") @@ -1014,8 +1014,8 @@ (function (_ expected) (|>> (:coerce Text) (text\= (:coerce Text expected)))))) (<| (_.context "multi") (do {! random.monad} - [#let [size (:: ! map (|>> (n.% 5) (n.+ 1)) - random.nat)] + [#let [size (\ ! map (|>> (n.% 5) (n.+ 1)) + random.nat)] dimensions size sizesH size sizesT (random.list (dec dimensions) size) @@ -1127,7 +1127,7 @@ (function (_ random-value literal *wrap [store load] test) (do {! random.monad} [expected random-value - register (:: ! map (n.% 128) random.nat)] + register (\ ! map (n.% 128) random.nat)] (<| (..bytecode (test expected)) (do /.monad [_ (literal expected) @@ -1151,8 +1151,8 @@ (_.lift "IINC" (do {! random.monad} [base ..$Byte::random - increment (:: ! map (|>> (n.% 100) /unsigned.u1 try.assume) - random.nat) + increment (\ ! map (|>> (n.% 100) /unsigned.u1 try.assume) + random.nat) #let [expected (: java/lang/Long (for {@.old ("jvm ladd" @@ -1475,9 +1475,9 @@ (do {! random.monad} [expected ..$Long::random dummy ..$Long::random - minimum (:: ! map (|>> (n.% 100) .int /signed.s4 try.assume) - random.nat) - afterwards (:: ! map (n.% 10) random.nat)]) + minimum (\ ! map (|>> (n.% 100) .int /signed.s4 try.assume) + random.nat) + afterwards (\ ! map (n.% 10) random.nat)]) (..bytecode ((!::= java/lang/Long "jvm leq" "jvm long =") expected)) (do /.monad [@right /.new-label @@ -1494,13 +1494,13 @@ ..$Long::wrap)) (<| (_.lift "LOOKUPSWITCH") (do {! random.monad} - [options (:: ! map (|>> (n.% 10) (n.+ 1)) - random.nat) - choice (:: ! map (n.% options) random.nat) + [options (\ ! map (|>> (n.% 10) (n.+ 1)) + random.nat) + choice (\ ! map (n.% options) random.nat) options (|> random.int - (:: ! map (|>> (:coerce java/lang/Long) host.long-to-int host.int-to-long (:coerce Int))) + (\ ! map (|>> (:coerce java/lang/Long) host.long-to-int host.int-to-long (:coerce Int))) (random.set i.hash options) - (:: ! map set.to-list)) + (\ ! map set.to-list)) #let [choice (maybe.assume (list.nth choice options))] expected ..$Long::random dummy ..$Long::random]) diff --git a/stdlib/source/test/lux/time/date.lux b/stdlib/source/test/lux/time/date.lux index fd17f3075..574bed8d6 100644 --- a/stdlib/source/test/lux/time/date.lux +++ b/stdlib/source/test/lux/time/date.lux @@ -22,8 +22,8 @@ (def: #export date (Random Date) - (:: random.monad map //instant.date - _instant.instant)) + (\ random.monad map //instant.date + _instant.instant)) (def: #export test Test diff --git a/stdlib/source/test/lux/time/duration.lux b/stdlib/source/test/lux/time/duration.lux index 52454eae6..bd7756f06 100644 --- a/stdlib/source/test/lux/time/duration.lux +++ b/stdlib/source/test/lux/time/duration.lux @@ -21,7 +21,7 @@ (def: #export duration (Random Duration) - (:: random.monad map /.from-millis random.int)) + (\ random.monad map /.from-millis random.int)) (def: #export test Test @@ -37,9 +37,9 @@ (_.test "Can convert from/to milliseconds." (|> millis /.from-millis /.to-millis (i.= millis)))) (do {! random.monad} - [sample (|> duration (:: ! map (/.frame /.day))) + [sample (|> duration (\ ! map (/.frame /.day))) frame duration - factor (|> random.nat (:: ! map (|>> (n.% 10) (n.max 1)))) + factor (|> random.nat (\ ! map (|>> (n.% 10) (n.max 1)))) #let [(^open "/\.") /.order]] ($_ _.and (_.test "Can scale a duration." diff --git a/stdlib/source/test/lux/time/instant.lux b/stdlib/source/test/lux/time/instant.lux index 3849c7b67..d24a4438d 100644 --- a/stdlib/source/test/lux/time/instant.lux +++ b/stdlib/source/test/lux/time/instant.lux @@ -28,7 +28,7 @@ (def: #export instant (Random Instant) - (:: random.monad map /.from-millis random.int)) + (\ random.monad map /.from-millis random.int)) (def: #export test Test diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux index c866acf41..b280591fe 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux @@ -122,12 +122,12 @@ ($_ r.either (r\map product.right _primitive.primitive) (do {! r.monad} - [choice (|> r.nat (:: ! map (n.% (list.size variant-tags)))) + [choice (|> r.nat (\ ! map (n.% (list.size variant-tags)))) #let [choiceT (maybe.assume (list.nth choice variant-tags)) choiceC (maybe.assume (list.nth choice primitivesC))]] (wrap (` ((~ choiceT) (~ choiceC))))) (do {! r.monad} - [size (|> r.nat (:: ! map (n.% 3))) + [size (|> r.nat (\ ! map (n.% 3))) elems (r.list size input)] (wrap (code.tuple elems))) (r\wrap (code.record (list.zip/2 record-tags primitivesC))) @@ -143,9 +143,9 @@ [module-name (r.unicode 5) variant-name (r.unicode 5) record-name (|> (r.unicode 5) (r.filter (|>> (text\= variant-name) not))) - size (|> r.nat (:: ! map (|>> (n.% 10) (n.max 2)))) - variant-tags (|> (r.set text.hash size (r.unicode 5)) (:: ! map set.to-list)) - record-tags (|> (r.set text.hash size (r.unicode 5)) (:: ! map set.to-list)) + size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2)))) + variant-tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to-list)) + record-tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to-list)) primitivesTC (r.list size _primitive.primitive) #let [primitivesT (list\map product.left primitivesTC) primitivesC (list\map product.right primitivesTC) @@ -185,7 +185,7 @@ _structure.check-fails))) (do ! [redundant-patterns (exhaustive-branches false variantTC inputC) - redundancy-idx (|> r.nat (:: ! map (n.% (list.size redundant-patterns)))) + redundancy-idx (|> r.nat (\ ! map (n.% (list.size redundant-patterns)))) #let [redundant-branchesC (<| (list!map (branch outputC)) list.concat (list (list.take redundancy-idx redundant-patterns) @@ -197,7 +197,7 @@ (do ! [[heterogeneousT heterogeneousC] (r.filter (|>> product.left (check.checks? outputT) not) _primitive.primitive) - heterogeneous-idx (|> r.nat (:: ! map (n.% (list.size exhaustive-patterns)))) + heterogeneous-idx (|> r.nat (\ ! map (n.% (list.size exhaustive-patterns)))) #let [heterogeneous-branchesC (list.concat (list (list.take heterogeneous-idx exhaustive-branchesC) (list (let [[_pattern _body] (maybe.assume (list.nth heterogeneous-idx exhaustive-branchesC))] [_pattern heterogeneousC])) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux index 67c02f142..8bc1173f6 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux @@ -81,9 +81,9 @@ (def: apply (do {! r.monad} - [full-args (|> r.nat (:: ! map (|>> (n.% 10) (n.max 2)))) - partial-args (|> r.nat (:: ! map (n.% full-args))) - var-idx (|> r.nat (:: ! map (|>> (n.% full-args) (n.max 1)))) + [full-args (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2)))) + partial-args (|> r.nat (\ ! map (n.% full-args))) + var-idx (|> r.nat (\ ! map (|>> (n.% full-args) (n.max 1)))) inputsTC (r.list full-args _primitive.primitive) #let [inputsT (list\map product.left inputsTC) inputsC (list\map product.right inputsTC)] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux index 5ef40f052..f96c8045a 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux @@ -118,10 +118,10 @@ (def: sum (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 10) (n.max 2)))) - choice (|> r.nat (:: ! map (n.% size))) + [size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2)))) + choice (|> r.nat (\ ! map (n.% size))) primitives (r.list size _primitive.primitive) - +choice (|> r.nat (:: ! map (n.% (inc size)))) + +choice (|> r.nat (\ ! map (n.% (inc size)))) [_ +valueC] _primitive.primitive #let [variantT (type.variant (list\map product.left primitives)) [valueT valueC] (maybe.assume (list.nth choice primitives)) @@ -170,9 +170,9 @@ (def: product (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 10) (n.max 2)))) + [size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2)))) primitives (r.list size _primitive.primitive) - choice (|> r.nat (:: ! map (n.% size))) + choice (|> r.nat (\ ! map (n.% size))) [_ +valueC] _primitive.primitive #let [tupleT (type.tuple (list\map product.left primitives)) [singletonT singletonC] (|> primitives (list.nth choice) maybe.assume) @@ -230,10 +230,10 @@ (def: variant (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 10) (n.max 2)))) - tags (|> (r.set text.hash size (r.unicode 5)) (:: ! map set.to-list)) - choice (|> r.nat (:: ! map (n.% size))) - other-choice (|> r.nat (:: ! map (n.% size)) (r.filter (|>> (n.= choice) not))) + [size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2)))) + tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to-list)) + choice (|> r.nat (\ ! map (n.% size))) + other-choice (|> r.nat (\ ! map (n.% size)) (r.filter (|>> (n.= choice) not))) primitives (r.list size _primitive.primitive) module-name (r.unicode 5) type-name (r.unicode 5) @@ -276,12 +276,12 @@ (def: record (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 10) (n.max 2)))) - tags (|> (r.set text.hash size (r.unicode 5)) (:: ! map set.to-list)) + [size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2)))) + tags (|> (r.set text.hash size (r.unicode 5)) (\ ! map set.to-list)) primitives (r.list size _primitive.primitive) module-name (r.unicode 5) type-name (r.unicode 5) - choice (|> r.nat (:: ! map (n.% size))) + choice (|> r.nat (\ ! map (n.% size))) #let [varT (#.Parameter 1) tagsC (list\map (|>> [module-name] code.tag) tags) primitivesT (list\map product.left primitives) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux index b479b523a..dccabcea7 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux @@ -73,9 +73,9 @@ (def: i64 Test (do {! r.monad} - [subjectC (|> r.nat (:: ! map code.nat)) - signedC (|> r.int (:: ! map code.int)) - paramC (|> r.nat (:: ! map code.nat))] + [subjectC (|> r.nat (\ ! map code.nat)) + signedC (|> r.int (\ ! map code.int)) + paramC (|> r.nat (\ ! map code.nat))] ($_ _.and (_.test "i64 'and'." (check-success+ "lux i64 and" (list paramC subjectC) Nat)) @@ -100,8 +100,8 @@ (def: int Test (do {! r.monad} - [subjectC (|> r.int (:: ! map code.int)) - paramC (|> r.int (:: ! map code.int))] + [subjectC (|> r.int (\ ! map code.int)) + paramC (|> r.int (\ ! map code.int))] ($_ _.and (_.test "Can multiply integers." (check-success+ "lux i64 *" (list paramC subjectC) Int)) @@ -120,9 +120,9 @@ (def: frac Test (do {! r.monad} - [subjectC (|> r.safe-frac (:: ! map code.frac)) - paramC (|> r.safe-frac (:: ! map code.frac)) - encodedC (|> r.safe-frac (:: ! map (|>> %.frac code.text)))] + [subjectC (|> r.safe-frac (\ ! map code.frac)) + paramC (|> r.safe-frac (\ ! map code.frac)) + encodedC (|> r.safe-frac (\ ! map (|>> %.frac code.text)))] ($_ _.and (_.test "Can add frac numbers." (check-success+ "lux f64 +" (list paramC subjectC) Frac)) @@ -155,11 +155,11 @@ (def: text Test (do {! r.monad} - [subjectC (|> (r.unicode 5) (:: ! map code.text)) - paramC (|> (r.unicode 5) (:: ! map code.text)) - replacementC (|> (r.unicode 5) (:: ! map code.text)) - fromC (|> r.nat (:: ! map code.nat)) - toC (|> r.nat (:: ! map code.nat))] + [subjectC (|> (r.unicode 5) (\ ! map code.text)) + paramC (|> (r.unicode 5) (\ ! map code.text)) + replacementC (|> (r.unicode 5) (\ ! map code.text)) + fromC (|> r.nat (\ ! map code.nat)) + toC (|> r.nat (\ ! map code.nat))] ($_ _.and (_.test "Can test text equivalence." (check-success+ "lux text =" (list paramC subjectC) Bit)) @@ -180,8 +180,8 @@ (def: io Test (do {! r.monad} - [logC (|> (r.unicode 5) (:: ! map code.text)) - exitC (|> r.int (:: ! map code.int))] + [logC (|> (r.unicode 5) (\ ! map code.text)) + exitC (|> r.int (\ ! map code.int))] ($_ _.and (_.test "Can log messages to standard output." (check-success+ "lux io log" (list logC) Any)) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux index 16ef89258..9735eda42 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux @@ -43,7 +43,7 @@ Test (do {! random.monad} [maskedA //primitive.primitive - temp (|> random.nat (:: ! map (n.% 100))) + temp (|> random.nat (\ ! map (n.% 100))) #let [maskA (analysis.control/case [maskedA [[(#analysis.Bind temp) @@ -110,7 +110,7 @@ (def: random-member (Random synthesis.Member) (do {! random.monad} - [lefts (|> random.nat (:: ! map (n.% 10))) + [lefts (|> random.nat (\ ! map (n.% 10))) right? random.bit] (wrap (if right? (#.Right lefts) @@ -119,7 +119,7 @@ (def: random-path (Random (analysis.Tuple synthesis.Member)) (do {! random.monad} - [size-1 (|> random.nat (:: ! map (|>> (n.% 10) inc)))] + [size-1 (|> random.nat (\ ! map (|>> (n.% 10) inc)))] (random.list size-1 ..random-member))) (def: (get-pattern path) @@ -146,9 +146,9 @@ Test (do {! random.monad} [recordA (|> random.nat - (:: ! map (|>> analysis.nat)) + (\ ! map (|>> analysis.nat)) (random.list 10) - (:: ! map (|>> analysis.tuple))) + (\ ! map (|>> analysis.tuple))) pathA ..random-path [pattern @member] (get-pattern pathA) #let [getA (analysis.control/case [recordA [[pattern @@ -159,7 +159,7 @@ (//.phase archive.empty) (phase.run [///bundle.empty synthesis.init]) (case> (^ (#try.Success (synthesis.branch/get [pathS recordS]))) - (and (:: (list.equivalence (sum.equivalence n.= n.=)) = pathA pathS) + (and (\ (list.equivalence (sum.equivalence n.= n.=)) = pathA pathS) (//primitive.corresponds? recordA recordS)) _ @@ -184,12 +184,12 @@ (All [a] (-> (Hash a) (Random a) (Random [a a a a a]))) (|> random-element (random.set hash 5) - (:: random.monad map (|>> set.to-list - (case> (^ (list s0 s1 s2 s3 s4)) - [s0 s1 s2 s3 s4] + (\ random.monad map (|>> set.to-list + (case> (^ (list s0 s1 s2 s3 s4)) + [s0 s1 s2 s3 s4] - _ - (undefined)))))) + _ + (undefined)))))) (template [<name> <hash> <random> <path> <synthesis> <pattern> <analysis>] [(def: <name> @@ -262,7 +262,7 @@ (def: random-tuple (Random [Path Match]) (do {! random.monad} - [mid-size (:: ! map (n.% 4) random.nat) + [mid-size (\ ! map (n.% 4) random.nat) value/first (random.unicode 1) value/mid (random.list mid-size (random.unicode 1)) @@ -328,14 +328,14 @@ (def: case-test Test (do {! random.monad} - [expected-input (:: ! map (|>> .i64 synthesis.i64) random.nat) + [expected-input (\ ! map (|>> .i64 synthesis.i64) random.nat) [expected-path match] ..random-case] (_.cover [/.synthesize-case] (|> (/.synthesize-case //.phase archive.empty expected-input match) (phase.run [///bundle.empty synthesis.init]) (case> (^ (#try.Success (synthesis.branch/case [actual-input actual-path]))) - (and (:: synthesis.equivalence = expected-input actual-input) - (:: synthesis.path-equivalence = expected-path actual-path)) + (and (\ synthesis.equivalence = expected-input actual-input) + (\ synthesis.path-equivalence = expected-path actual-path)) _ false))))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux index ffb04e31b..d5bffc3c1 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux @@ -80,10 +80,10 @@ (def: (random-unit output?) Scenario - (:: random.monad wrap - [true - (synthesis.text synthesis.unit) - (analysis.unit)])) + (\ random.monad wrap + [true + (synthesis.text synthesis.unit) + (analysis.unit)])) (template [<name> <random> <synthesis> <analysis>] [(def: (<name> output?) @@ -147,7 +147,7 @@ (def: (random-variable arity output?) (-> Arity Scenario) (do {! random.monad} - [register (:: ! map (|>> (n.% arity) inc) random.nat)] + [register (\ ! map (|>> (n.% arity) inc) random.nat)] (wrap [(not (n.= 0 register)) (synthesis.variable/local register) (if (n.= arity register) @@ -177,7 +177,7 @@ text-test (random.unicode 1) [loop?-input expected-input actual-input] (random-value false) [loop?-output expected-output actual-output] (random-value output?) - lefts (|> random.nat (:: ! map (n.% 10))) + lefts (|> random.nat (\ ! map (n.% 10))) right? random.bit #let [side|member (if right? (#.Right lefts) @@ -279,7 +279,7 @@ (def: (random-get random-value output?) (-> Scenario Scenario) (do {! random.monad} - [lefts (|> random.nat (:: ! map (n.% 10))) + [lefts (|> random.nat (\ ! map (n.% 10))) right? random.bit [loop?-record expected-record actual-record] (random-value false)] (wrap [loop?-record @@ -343,7 +343,7 @@ Scenario (do {! random.monad} [[loop?-output expected-output actual-output] (..random-nat output?) - arity (|> random.nat (:: ! map (|>> (n.% 5) inc))) + arity (|> random.nat (\ ! map (|>> (n.% 5) inc))) #let [environment ($_ list\compose (list\map (|>> #variable.Foreign) (list.indices arity)) @@ -363,7 +363,7 @@ (-> Scenario Scenario) (do {! random.monad} [[loop?-abstraction expected-abstraction actual-abstraction] (..random-nat output?) - arity (|> random.nat (:: ! map (|>> (n.% 5) inc))) + arity (|> random.nat (\ ! map (|>> (n.% 5) inc))) inputs (random.list arity (random-value false))] (wrap [(list\fold (function (_ new old) (and new old)) @@ -419,7 +419,7 @@ (def: random-abstraction (Random [Synthesis Analysis]) (do {! random.monad} - [arity (|> random.nat (:: ! map (|>> (n.% 5) inc))) + [arity (|> random.nat (\ ! map (|>> (n.% 5) inc))) [loop? expected-body actual-body] (random-body arity true)] (wrap [(..n-function loop? arity expected-body) (..n-abstraction arity actual-body)]))) @@ -433,12 +433,12 @@ (//.phase archive.empty) (phase.run [///bundle.empty synthesis.init]) (!expect (^multi (#try.Success actual) - (:: synthesis.equivalence = expected actual))))))) + (\ synthesis.equivalence = expected actual))))))) (def: application Test (do {! random.monad} - [arity (|> random.nat (:: ! map (|>> (n.% 10) (n.max 1)))) + [arity (|> random.nat (\ ! map (|>> (n.% 10) (n.max 1)))) funcA //primitive.primitive argsA (random.list arity //primitive.primitive)] (_.cover [/.apply] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux index 05a6095bb..edf3e6fcb 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux @@ -31,13 +31,13 @@ (`` ($_ random.either (~~ (template [<synthesis> <random>] [(do {! random.monad} - [example (:: ! map (|>> <synthesis>) <random>)] + [example (\ ! map (|>> <synthesis>) <random>)] (wrap [next [example example]]))] [//.bit random.bit] - [//.i64 (:: ! map .i64 random.nat)] + [//.i64 (\ ! map .i64 random.nat)] [//.f64 random.frac] [//.text (random.unicode 1)] )) @@ -55,7 +55,7 @@ (def: (variable offset arity next) (Scenario Variable) (let [local (do {! random.monad} - [register (:: ! map (|>> (n.% arity) inc) random.nat)] + [register (\ ! map (|>> (n.% arity) inc) random.nat)] (wrap [next [(#variable.Local (/.register-optimization offset register)) (#variable.Local register)]]))] @@ -64,7 +64,7 @@ _ ($_ random.either local (do {! random.monad} - [foreign (:: ! map (n.% offset) random.nat)] + [foreign (\ ! map (n.% offset) random.nat)] (wrap [next [(#variable.Local foreign) (#variable.Foreign foreign)]])))))) @@ -117,21 +117,21 @@ //.path/pop]]) (~~ (template [<path> <random>] [(do {! random.monad} - [example (:: ! map (|>> <path>) <random>)] + [example (\ ! map (|>> <path>) <random>)] (wrap [next [example example]]))] [//.path/bit random.bit] - [//.path/i64 (:: ! map .i64 random.nat)] + [//.path/i64 (\ ! map .i64 random.nat)] [//.path/f64 random.frac] [//.path/text (random.unicode 1)] )) (~~ (template [<path>] [(do {! random.monad} - [example (:: ! map (|>> <path>) - (random.or random.nat - random.nat))] + [example (\ ! map (|>> <path>) + (random.or random.nat + random.nat))] (wrap [next [example example]]))] @@ -182,7 +182,7 @@ ($_ random.either (do {! random.monad} [[next [recordE recordA]] (..reference offset arity next) - path-length (:: ! map (|>> (n.% 5) inc) random.nat) + path-length (\ ! map (|>> (n.% 5) inc) random.nat) path (random.list path-length random-member)] (wrap [next [(//.branch/get [path recordE]) @@ -219,7 +219,7 @@ (do {! random.monad} [[next [firstE firstA]] (..variable offset arity next) [next [secondE secondA]] (..variable offset arity next) - arity (:: ! map (n.max 1) random.nat) + arity (\ ! map (n.max 1) random.nat) [next [bodyE bodyA]] (..primitive 0 arity next)] (wrap [next [(//.function/abstraction @@ -266,10 +266,10 @@ (<| (_.covering /._) ($_ _.and (do {! random.monad} - [expected-offset (:: ! map (|>> (n.% 5) (n.+ 2)) random.nat) - arity (:: ! map (|>> (n.% 5) inc) random.nat) + [expected-offset (\ ! map (|>> (n.% 5) (n.+ 2)) random.nat) + arity (\ ! map (|>> (n.% 5) inc) random.nat) expected-inits (|> random.nat - (:: ! map (|>> .i64 //.i64)) + (\ ! map (|>> .i64 //.i64)) (random.list arity)) [_ [expected iteration]] (..scenario expected-offset arity 0)] (_.cover [/.Transform /.optimization /.register-optimization] @@ -283,10 +283,10 @@ actual]))) (and (n.= expected-offset actual-offset) - (:: (list.equivalence //.equivalence) = - expected-inits - actual-inits) - (:: //.equivalence = expected actual)) + (\ (list.equivalence //.equivalence) = + expected-inits + actual-inits) + (\ //.equivalence = expected actual)) _ false))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux index b51a196f0..f109acd9c 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux @@ -35,8 +35,8 @@ (def: variant Test (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 10) (n.+ 2)))) - tagA (|> r.nat (:: ! map (n.% size))) + [size (|> r.nat (\ ! map (|>> (n.% 10) (n.+ 2)))) + tagA (|> r.nat (\ ! map (n.% size))) #let [right? (n.= (dec size) tagA) lefts (if right? (dec tagA) @@ -58,7 +58,7 @@ (def: tuple Test (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 10) (n.max 2)))) + [size (|> r.nat (\ ! map (|>> (n.% 10) (n.max 2)))) membersA (r.list size //primitive.primitive)] (_.test "Can synthesize tuple." (|> (////analysis.tuple membersA) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux index 437d721cd..225578071 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux @@ -50,7 +50,7 @@ (<synthesis> value)])))] [bit-scenario synthesis.bit random.bit] - [i64-scenario synthesis.i64 (:: ! map .i64 random.nat)] + [i64-scenario synthesis.i64 (\ ! map .i64 random.nat)] [f64-scenario synthesis.f64 random.frac] [text-scenario synthesis.text (random.unicode 1)] ) @@ -96,9 +96,9 @@ (def: (tuple-scenario context) (Scenario Synthesis) (let [registers (dictionary.entries (get@ #necessary context))] - (:: random.monad wrap - [(synthesis.tuple (list\map (|>> product.left synthesis.variable/local) registers)) - (synthesis.tuple (list\map (|>> product.right synthesis.variable/local) registers))]))) + (\ random.monad wrap + [(synthesis.tuple (list\map (|>> product.left synthesis.variable/local) registers)) + (synthesis.tuple (list\map (|>> product.right synthesis.variable/local) registers))]))) (def: (structure-scenario context) (Scenario Synthesis) @@ -143,7 +143,7 @@ (def: (get-scenario scenario context) (-> (Scenario Synthesis) (Scenario Synthesis)) (do {! random.monad} - [length (:: ! map (|>> (n.% 5) inc) random.nat) + [length (\ ! map (|>> (n.% 5) inc) random.nat) path (random.list length ..random-member) [expected-record actual-record] (scenario context)] (wrap [(synthesis.branch/get [path expected-record]) @@ -187,7 +187,7 @@ (#synthesis.Then actual-then))]))] [#synthesis.Bit random.bit] - [#synthesis.I64 (:: ! map .i64 random.nat)] + [#synthesis.I64 (\ ! map .i64 random.nat)] [#synthesis.F64 random.frac] [#synthesis.Text (random.unicode 1)] ))) @@ -283,9 +283,9 @@ (def: (apply-scenario scenario context) (-> (Scenario Synthesis) (Scenario Synthesis)) (do {! random.monad} - [abstraction (:: ! map (|>> synthesis.constant) - (random.and (random.unicode 1) - (random.unicode 1))) + [abstraction (\ ! map (|>> synthesis.constant) + (random.and (random.unicode 1) + (random.unicode 1))) inputs (random.list ..scope-arity (scenario context))] (wrap [(synthesis.function/apply [abstraction (list\map product.left inputs)]) (synthesis.function/apply [abstraction (list\map product.right inputs)])]))) @@ -331,5 +331,5 @@ (_.cover [/.optimization] (|> (/.optimization input) (!expect (^multi (#try.Success actual) - (:: synthesis.equivalence = expected actual)))))) + (\ synthesis.equivalence = expected actual)))))) ))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux index c93eae5f9..a95bb9292 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux @@ -27,7 +27,7 @@ (def: name-part^ (Random Text) (do {! r.monad} - [size (|> r.nat (:: ! map (|>> (n.% 20) (n.max 1))))] + [size (|> r.nat (\ ! map (|>> (n.% 20) (n.max 1))))] (r.ascii/lower-alpha size))) (def: name^ @@ -84,7 +84,7 @@ false (#.Right [_ parsed]) - (:: code.equivalence = parsed sample))) + (\ code.equivalence = parsed sample))) (do ! [other code^] (_.test "Can parse multiple Lux code nodes." @@ -102,8 +102,8 @@ false (#.Right [_ =other]) - (and (:: code.equivalence = sample =sample) - (:: code.equivalence = other =other))))))) + (and (\ code.equivalence = sample =sample) + (\ code.equivalence = other =other))))))) ))) (def: comment-text^ @@ -134,7 +134,7 @@ false (#.Right [_ parsed]) - (:: code.equivalence = parsed sample))) + (\ code.equivalence = parsed sample))) ))) (def: #export test diff --git a/stdlib/source/test/lux/type.lux b/stdlib/source/test/lux/type.lux index c6a141be8..08a4033c5 100644 --- a/stdlib/source/test/lux/type.lux +++ b/stdlib/source/test/lux/type.lux @@ -23,7 +23,7 @@ (def: short (r.Random Text) (do {! r.monad} - [size (|> r.nat (:: ! map (n.% 10)))] + [size (|> r.nat (\ ! map (n.% 10)))] (r.unicode size))) (def: name @@ -58,13 +58,13 @@ (do r.monad [sample ..type] (_.test "Every type is equal to itself." - (:: /.equivalence = sample sample))) + (\ /.equivalence = sample sample))) (_.test "Can apply quantified types (universal and existential quantification)." (and (maybe.default #0 (do maybe.monad [partial (/.apply (list Bit) Ann) full (/.apply (list Int) partial)] - (wrap (:: /.equivalence = full (#.Product Bit Int))))) + (wrap (\ /.equivalence = full (#.Product Bit Int))))) (|> (/.apply (list Bit) Text) (case> #.None #1 _ #0)))) (let [base (#.Named ["" "a"] (#.Product Bit Int)) @@ -73,18 +73,18 @@ base))] ($_ _.and (_.test "Can remove aliases from an already-named type." - (:: /.equivalence = - base - (/.un-alias aliased))) + (\ /.equivalence = + base + (/.un-alias aliased))) (_.test "Can remove all names from a type." - (and (not (:: /.equivalence = - base - (/.un-name aliased))) - (:: /.equivalence = - (/.un-name base) - (/.un-name aliased)))))) + (and (not (\ /.equivalence = + base + (/.un-name aliased))) + (\ /.equivalence = + (/.un-name base) + (/.un-name aliased)))))) (do {! r.monad} - [size (|> r.nat (:: ! map (n.% 3))) + [size (|> r.nat (\ ! map (n.% 3))) members (|> ..type (r.filter (function (_ type) (case type @@ -110,7 +110,7 @@ )) ))) (do {! r.monad} - [size (|> r.nat (:: ! map (n.% 3))) + [size (|> r.nat (\ ! map (n.% 3))) members (M.seq ! (list.repeat size ..type)) extra (|> ..type (r.filter (function (_ type) @@ -133,7 +133,7 @@ (n.= (list.size members) (list.size tparams)))) )) (do {! r.monad} - [size (|> r.nat (:: ! map (n.% 3))) + [size (|> r.nat (\ ! map (n.% 3))) extra (|> ..type (r.filter (function (_ type) (case type diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux index 46749652e..dad107b5e 100644 --- a/stdlib/source/test/lux/type/check.lux +++ b/stdlib/source/test/lux/type/check.lux @@ -199,7 +199,7 @@ (/.check .Bit var)))) ) (do {! r.monad} - [num-connections (|> r.nat (:: ! map (n.% 100))) + [num-connections (|> r.nat (\ ! map (n.% 100))) boundT (|> ..type (r.filter (|>> (case> (#.Var _) #0 _ #1)))) pick-pcg (r.and r.nat r.nat)] ($_ _.and @@ -210,11 +210,11 @@ headR (/.ring head-id) tailR (/.ring tail-id)] (/.assert "" - (let [same-rings? (:: set.equivalence = headR tailR) + (let [same-rings? (\ set.equivalence = headR tailR) expected-size? (n.= (inc num-connections) (set.size headR)) same-vars? (|> (set.to-list headR) (list.sort n.<) - (:: (list.equivalence n.equivalence) = (list.sort n.< (#.Cons head-id ids))))] + (\ (list.equivalence n.equivalence) = (list.sort n.< (#.Cons head-id ids))))] (and same-rings? expected-size? same-vars?)))))) @@ -246,10 +246,10 @@ headRL-post (/.ring head-idL) headRR-post (/.ring head-idR)] (/.assert "" - (let [same-rings? (:: set.equivalence = headRL-post headRR-post) + (let [same-rings? (\ set.equivalence = headRL-post headRR-post) expected-size? (n.= (n.* 2 (inc num-connections)) (set.size headRL-post)) - union? (:: set.equivalence = headRL-post (set.union headRL-pre headRR-pre))] + union? (\ set.equivalence = headRL-post (set.union headRL-pre headRR-pre))] (and same-rings? expected-size? union?)))))) diff --git a/stdlib/source/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux index 203aad478..99e0c64ae 100644 --- a/stdlib/source/test/lux/type/implicit.lux +++ b/stdlib/source/test/lux/type/implicit.lux @@ -22,7 +22,7 @@ Test (<| (_.context (%.name (name-of /._))) (do {! random.monad} - [#let [digit (:: ! map (n.% 10) random.nat)] + [#let [digit (\ ! map (n.% 10) random.nat)] left digit right digit #let [start (n.min left right) @@ -30,16 +30,16 @@ ($_ _.and (_.test "Can automatically select first-order structures." (let [(^open "list\.") (list.equivalence n.equivalence)] - (and (bit\= (:: n.equivalence = left right) - (/.::: = left right)) - (list\= (:: list.functor map inc (enum.range n.enum start end)) - (/.::: map inc (enum.range n.enum start end)))))) + (and (bit\= (\ n.equivalence = left right) + (/.\\ = left right)) + (list\= (\ list.functor map inc (enum.range n.enum start end)) + (/.\\ map inc (enum.range n.enum start end)))))) (_.test "Can automatically select second-order structures." - (/.::: = - (enum.range n.enum start end) - (enum.range n.enum start end))) + (/.\\ = + (enum.range n.enum start end) + (enum.range n.enum start end))) (_.test "Can automatically select third-order structures." - (let [lln (/.::: map (enum.range n.enum start) - (enum.range n.enum start end))] - (/.::: = lln lln))) + (let [lln (/.\\ map (enum.range n.enum start) + (enum.range n.enum start end))] + (/.\\ = lln lln))) )))) diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux index 5c633a048..d1d1d175b 100644 --- a/stdlib/source/test/lux/world/file.lux +++ b/stdlib/source/test/lux/world/file.lux @@ -43,9 +43,9 @@ [#let [check-existence! (: (IO (Try Bit)) (try.lift io.monad (/.exists? io.monad /.default path)))] pre! check-existence! - file (!.use (:: /.default create-file) path) + file (!.use (\ /.default create-file) path) post! check-existence! - _ (!.use (:: file delete) []) + _ (!.use (\ file delete) []) remains? check-existence!] (wrap (and (not pre!) post! @@ -59,11 +59,11 @@ [#let [path (format "temp_file_" (%.nat number))] result (promise.future (do (try.with io.monad) - [file (!.use (:: /.default create-file) path) - _ (!.use (:: file over-write) data) - content (!.use (:: file content) []) - _ (!.use (:: file delete) [])] - (wrap (:: binary.equivalence = data content))))] + [file (!.use (\ /.default create-file) path) + _ (!.use (\ file over-write) data) + content (!.use (\ file content) []) + _ (!.use (\ file delete) [])] + (wrap (\ binary.equivalence = data content))))] (_.assert "Can write/read files." (try.default #0 result))))) @@ -71,14 +71,14 @@ Test (<| (_.context (%.name (name-of /._))) (do {! r.monad} - [file-size (|> r.nat (:: ! map (|>> (n.% 100) (n.max 10)))) + [file-size (|> r.nat (\ ! map (|>> (n.% 100) (n.max 10)))) dataL (_binary.random file-size) dataR (_binary.random file-size) - new-modified (|> r.int (:: ! map (|>> i.abs - (i.% +10,000,000,000,000) - truncate-millis - duration.from-millis - instant.absolute)))] + new-modified (|> r.int (\ ! map (|>> i.abs + (i.% +10,000,000,000,000) + truncate-millis + duration.from-millis + instant.absolute)))] ($_ _.and (..creation-and-deletion 0) (..read-and-write 1 dataL) @@ -87,10 +87,10 @@ [#let [path "temp_file_2"] result (promise.future (do (try.with io.monad) - [file (!.use (:: /.default create-file) path) - _ (!.use (:: file over-write) dataL) - read-size (!.use (:: file size) []) - _ (!.use (:: file delete) [])] + [file (!.use (\ /.default create-file) path) + _ (!.use (\ file over-write) dataL) + read-size (!.use (\ file size) []) + _ (!.use (\ file delete) [])] (wrap (n.= file-size read-size))))] (_.assert "Can read file size." (try.default #0 result)))) @@ -98,19 +98,19 @@ [#let [path "temp_file_3"] result (promise.future (do (try.with io.monad) - [file (!.use (:: /.default create-file) path) - _ (!.use (:: file over-write) dataL) - _ (!.use (:: file append) dataR) - content (!.use (:: file content) []) - read-size (!.use (:: file size) []) - _ (!.use (:: file delete) [])] + [file (!.use (\ /.default create-file) path) + _ (!.use (\ file over-write) dataL) + _ (!.use (\ file append) dataR) + content (!.use (\ file content) []) + read-size (!.use (\ file size) []) + _ (!.use (\ file delete) [])] (wrap (and (n.= (n.* 2 file-size) read-size) - (:: binary.equivalence = - dataL - (try.assume (binary.slice 0 (dec file-size) content))) - (:: binary.equivalence = - dataR - (try.assume (binary.slice file-size (dec read-size) content)))))))] + (\ binary.equivalence = + dataL + (try.assume (binary.slice 0 (dec file-size) content))) + (\ binary.equivalence = + dataR + (try.assume (binary.slice file-size (dec read-size) content)))))))] (_.assert "Can append to files." (try.default #0 result)))) (wrap (do promise.monad @@ -120,9 +120,9 @@ [#let [check-existence! (: (IO (Try Bit)) (try.lift io.monad (/.exists? io.monad /.default path)))] pre! check-existence! - dir (!.use (:: /.default create-directory) path) + dir (!.use (\ /.default create-directory) path) post! check-existence! - _ (!.use (:: dir discard) []) + _ (!.use (\ dir discard) []) remains? check-existence!] (wrap (and (not pre!) post! @@ -134,12 +134,12 @@ dir-path "temp_dir_5"] result (promise.future (do (try.with io.monad) - [dir (!.use (:: /.default create-directory) dir-path) - file (!.use (:: /.default create-file) (format dir-path "/" file-path)) - _ (!.use (:: file over-write) dataL) - read-size (!.use (:: file size) []) - _ (!.use (:: file delete) []) - _ (!.use (:: dir discard) [])] + [dir (!.use (\ /.default create-directory) dir-path) + file (!.use (\ /.default create-file) (format dir-path "/" file-path)) + _ (!.use (\ file over-write) dataL) + read-size (!.use (\ file size) []) + _ (!.use (\ file delete) []) + _ (!.use (\ dir discard) [])] (wrap (n.= file-size read-size))))] (_.assert "Can create files inside of directories." (try.default #0 result)))) @@ -149,18 +149,18 @@ inner-dir-path "inner_temp_dir_6"] result (promise.future (do (try.with io.monad) - [dir (!.use (:: /.default create-directory) dir-path) - pre-files (!.use (:: dir files) []) - pre-directories (!.use (:: dir directories) []) + [dir (!.use (\ /.default create-directory) dir-path) + pre-files (!.use (\ dir files) []) + pre-directories (!.use (\ dir directories) []) - file (!.use (:: /.default create-file) (format dir-path "/" file-path)) - inner-dir (!.use (:: /.default create-directory) (format dir-path "/" inner-dir-path)) - post-files (!.use (:: dir files) []) - post-directories (!.use (:: dir directories) []) + file (!.use (\ /.default create-file) (format dir-path "/" file-path)) + inner-dir (!.use (\ /.default create-directory) (format dir-path "/" inner-dir-path)) + post-files (!.use (\ dir files) []) + post-directories (!.use (\ dir directories) []) - _ (!.use (:: file delete) []) - _ (!.use (:: inner-dir discard) []) - _ (!.use (:: dir discard) [])] + _ (!.use (\ file delete) []) + _ (!.use (\ inner-dir discard) []) + _ (!.use (\ dir discard) [])] (wrap (and (and (n.= 0 (list.size pre-files)) (n.= 0 (list.size pre-directories))) (and (n.= 1 (list.size post-files)) @@ -171,12 +171,12 @@ [#let [path "temp_file_7"] result (promise.future (do (try.with io.monad) - [file (!.use (:: /.default create-file) path) - _ (!.use (:: file over-write) dataL) - _ (!.use (:: file modify) new-modified) - current-modified (!.use (:: file last-modified) []) - _ (!.use (:: file delete) [])] - (wrap (:: instant.equivalence = new-modified current-modified))))] + [file (!.use (\ /.default create-file) path) + _ (!.use (\ file over-write) dataL) + _ (!.use (\ file modify) new-modified) + current-modified (!.use (\ file last-modified) []) + _ (!.use (\ file delete) [])] + (wrap (\ instant.equivalence = new-modified current-modified))))] (_.assert "Can change the time of last modification." (try.default #0 result)))) (wrap (do promise.monad @@ -187,14 +187,14 @@ [#let [check-existence! (: (-> Path (IO (Try Bit))) (|>> (/.exists? io.monad /.default) (try.lift io.monad)))] - file0 (!.use (:: /.default create-file) path0) - _ (!.use (:: file0 over-write) dataL) + file0 (!.use (\ /.default create-file) path0) + _ (!.use (\ file0 over-write) dataL) pre! (check-existence! path0) file1 (: (IO (Try (File IO))) ## TODO: Remove : - (!.use (:: file0 move) path1)) + (!.use (\ file0 move) path1)) post! (check-existence! path0) confirmed? (check-existence! path1) - _ (!.use (:: file1 delete) [])] + _ (!.use (\ file1 delete) [])] (wrap (and pre! (not post!) confirmed?))))] diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux index 5f55825e4..8b1c22697 100644 --- a/stdlib/source/test/lux/world/file/watch.lux +++ b/stdlib/source/test/lux/world/file/watch.lux @@ -72,8 +72,8 @@ #let [[fs watcher] (/.mock "/")]] ($_ _.and (wrap (do promise.monad - [?concern (:: watcher concern directory) - ?stop (:: watcher stop directory)] + [?concern (\ watcher concern directory) + ?stop (\ watcher stop directory)] (_.cover' [/.not-being-watched] (and (case ?concern (#try.Failure error) @@ -101,19 +101,19 @@ [directory (random.ascii/alpha 5) #let [/ "/" [fs watcher] (/.mock /)] - expected-path (:: ! map (|>> (format directory /)) - (random.ascii/alpha 5)) + expected-path (\ ! map (|>> (format directory /)) + (random.ascii/alpha 5)) data (_binary.random 10)] (wrap (do {! promise.monad} [verdict (do (try.with !) - [_ (!.use (:: fs create-directory) [directory]) - _ (:: watcher start /.all directory) - poll/0 (:: watcher poll []) + [_ (!.use (\ fs create-directory) [directory]) + _ (\ watcher start /.all directory) + poll/0 (\ watcher poll []) #let [no-events-prior-to-creation! (list.empty? poll/0)] - file (!.use (:: fs create-file) [expected-path]) - poll/1 (:: watcher poll []) - poll/1' (:: watcher poll []) + file (!.use (\ fs create-file) [expected-path]) + poll/1 (\ watcher poll []) + poll/1' (\ watcher poll []) #let [after-creation! (and (case poll/1 (^ (list [actual-path concern])) @@ -126,9 +126,9 @@ false) (list.empty? poll/1'))] _ (promise.delay 1 (#try.Success "Delay to make sure the over-write time-stamp always changes.")) - _ (!.use (:: file over-write) data) - poll/2 (:: watcher poll []) - poll/2' (:: watcher poll []) + _ (!.use (\ file over-write) data) + poll/2 (\ watcher poll []) + poll/2' (\ watcher poll []) #let [after-modification! (and (case poll/2 (^ (list [actual-path concern])) @@ -140,9 +140,9 @@ _ false) (list.empty? poll/2'))] - _ (!.use (:: file delete) []) - poll/3 (:: watcher poll []) - poll/3' (:: watcher poll []) + _ (!.use (\ file delete) []) + poll/3 (\ watcher poll []) + poll/3' (\ watcher poll []) #let [after-deletion! (and (case poll/3 (^ (list [actual-path concern])) diff --git a/stdlib/source/test/lux/world/shell.lux b/stdlib/source/test/lux/world/shell.lux index b7848cba4..e9d844141 100644 --- a/stdlib/source/test/lux/world/shell.lux +++ b/stdlib/source/test/lux/world/shell.lux @@ -113,11 +113,11 @@ #let [shell (/.async (..io-shell command oops input destruction exit))]] (wrap (do {! promise.monad} [verdict (do (try.with !) - [process (!.use (:: shell execute) [environment.empty "~" command (list)]) - read (!.use (:: process read) []) - error (!.use (:: process error) []) + [process (!.use (\ shell execute) [environment.empty "~" command (list)]) + read (!.use (\ process read) []) + error (!.use (\ process error) []) wrote! (do ! - [write (!.use (:: process write) [input])] + [write (!.use (\ process write) [input])] (wrap (#try.Success (case write (#try.Success _) false @@ -125,14 +125,14 @@ (#try.Failure write) (text\= input write))))) destroyed! (do ! - [destroy (!.use (:: process destroy) [])] + [destroy (!.use (\ process destroy) [])] (wrap (#try.Success (case destroy (#try.Success _) false (#try.Failure destroy) (text\= destruction destroy))))) - await (!.use (:: process await) [])] + await (!.use (\ process await) [])] (wrap (and (text\= command read) (text\= oops error) wrote! |