From 34e310622bdeb1d0588c0664c0e78cbaa84f837c Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 2 Dec 2020 06:42:20 -0400 Subject: Re-named "::" and ":::" macros to "\" and "\\", to be consistent with the convention that only macros that deal with types may start with a colon. --- stdlib/source/test/aedifex/artifact.lux | 4 +- stdlib/source/test/aedifex/cache.lux | 24 ++++---- stdlib/source/test/aedifex/cli.lux | 4 +- stdlib/source/test/aedifex/command/auto.lux | 14 ++--- stdlib/source/test/aedifex/command/build.lux | 4 +- stdlib/source/test/aedifex/command/clean.lux | 8 +-- stdlib/source/test/aedifex/command/deploy.lux | 42 ++++++------- stdlib/source/test/aedifex/command/deps.lux | 10 ++-- stdlib/source/test/aedifex/command/install.lux | 22 +++---- stdlib/source/test/aedifex/command/pom.lux | 10 ++-- stdlib/source/test/aedifex/command/test.lux | 4 +- .../source/test/aedifex/dependency/resolution.lux | 68 +++++++++++----------- stdlib/source/test/aedifex/hash.lux | 18 +++--- stdlib/source/test/aedifex/input.lux | 12 ++-- stdlib/source/test/aedifex/local.lux | 2 +- stdlib/source/test/aedifex/package.lux | 16 ++--- stdlib/source/test/aedifex/parser.lux | 14 ++--- stdlib/source/test/aedifex/pom.lux | 8 +-- stdlib/source/test/aedifex/profile.lux | 14 ++--- stdlib/source/test/aedifex/project.lux | 10 ++-- stdlib/source/test/aedifex/repository.lux | 4 +- 21 files changed, 156 insertions(+), 156 deletions(-) (limited to 'stdlib/source/test/aedifex') 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 [ ] (and (case ( (/.data expected)) (#try.Success actual) - (:: /.equivalence = expected actual) + (\ /.equivalence = expected actual) (#try.Failure error) false) - (case ( (:: binary.monoid compose - (/.data expected) - (/.data expected))) + (case ( (\ binary.monoid compose + (/.data expected) + (/.data expected))) (#try.Success actual) false @@ -80,9 +80,9 @@ [(do random.monad [expected (..random )] (_.cover [] - (case (:: decode - (format (:: encode expected) - "AABBCC")) + (case (\ decode + (format (\ 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 (.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] -- cgit v1.2.3