diff options
author | Eduardo Julian | 2021-09-05 22:52:26 -0400 |
---|---|---|
committer | Eduardo Julian | 2021-09-05 22:52:26 -0400 |
commit | 132ffdae1add622c8a3c6065d7730a8fe8ea5e78 (patch) | |
tree | 540310f190007d192b892db2d0a520d17b73ad48 /stdlib/source/test/aedifex | |
parent | 09e2747bf8c6dcdc1d7318f2490f0de37d77b39f (diff) |
Changed the syntax of do/be's (co)monad bindings.
Diffstat (limited to '')
20 files changed, 42 insertions, 42 deletions
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux index 748af575a..7bd36499b 100644 --- a/stdlib/source/test/aedifex/cache.lux +++ b/stdlib/source/test/aedifex/cache.lux @@ -63,13 +63,13 @@ (def: content (Random Binary) - (do {! random.monad} + (do [! random.monad] [content_size (\ ! each (n.% 100) random.nat)] (_binary.random content_size))) (def: package (Random [Dependency Package]) - (do {! random.monad} + (do [! random.monad] [[identity profile pom] ..profile type ..type content ..content] @@ -79,7 +79,7 @@ (def: resolution (Random Resolution) - (do {! random.monad} + (do [! random.monad] [[main_dependency main_package] ..package dependencies (|> (//package.dependencies main_package) (\ try.monad each set.list) @@ -100,7 +100,7 @@ (def: singular Test - (do {! random.monad} + (do [! random.monad] [[dependency expected_package] ..package home (random.ascii/alpha 5) working_directory (random.ascii/alpha 5) @@ -121,7 +121,7 @@ (def: plural Test - (do {! random.monad} + (do [! random.monad] [expected ..resolution home (random.ascii/alpha 5) working_directory (random.ascii/alpha 5) diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux index 894e647be..71608e83d 100644 --- a/stdlib/source/test/aedifex/command/auto.lux +++ b/stdlib/source/test/aedifex/command/auto.lux @@ -52,7 +52,7 @@ (atom.atom 0))] [@runs (function (_ console program fs shell resolution profile) - (do {! async.monad} + (do [! async.monad] [[_ actual_runs] (async.future (atom.update! ++ @runs))] (if (n.= expected_runs actual_runs) (in (#try.Failure end_signal)) @@ -66,7 +66,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [end_signal (random.ascii/alpha 5) .let [/ (\ file.default separator) [fs watcher] (watch.mock /)] @@ -101,7 +101,7 @@ _ (\ fs write (binary.empty 0) dummy_path) .let [[@runs command] (..command expected_runs end_signal fs dummy_path)] _ (\ watcher poll [])] - (do {! async.monad} + (do [! async.monad] [no_dangling_process! (|> profile (with@ #///.compiler compiler) ((/.do! 1 watcher command) diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux index 3009e5011..cbdfdc929 100644 --- a/stdlib/source/test/aedifex/command/build.lux +++ b/stdlib/source/test/aedifex/command/build.lux @@ -139,7 +139,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [last_read (random.ascii/alpha 5) last_error (random.ascii/alpha 5) .let [fs (file.mock (\ file.default separator)) @@ -224,7 +224,7 @@ shell (|> (list expected/0 expected/1 expected/2) (..reader_shell <error?>) shell.async)] - (in (do {! async.monad} + (in (do [! async.monad] [verdict (do ///action.monad [process (shell [environment.empty working_directory "" (list "")]) _ (<log!> console process) diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux index 7d7e613fe..c59b75719 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} + (do [! random.monad] [count (\ ! each (n.% 10) random.nat) names (random.set text.hash count ..node_name) contents (random.list count ($binary.random 100))] @@ -55,7 +55,7 @@ (def: (create_directory! fs path files) (-> (file.System Async) Path (List [Path Binary]) (Async (Try Any))) - (do {! (try.with async.monad)} + (do [! (try.with async.monad)] [_ (: (Async (Try Any)) (file.make_directories async.monad fs path)) _ (monad.each ! (..create_file! fs) files)] @@ -71,7 +71,7 @@ (def: (assets_exist? fs directory_path files) (-> (file.System Async) Path (List [Path Binary]) (Async (Try Bit))) - (do {! (try.with async.monad)} + (do [! (try.with async.monad)] [directory_exists? (..directory_exists? fs directory_path) files_exist? (: (Action (List Bit)) (|> files @@ -83,7 +83,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [context ..node_name target ..node_name sub ..node_name @@ -97,7 +97,7 @@ dummy @profile.random] (in (do async.monad [.let [console (@version.echo "")] - verdict (do {! (try.with async.monad)} + verdict (do [! (try.with async.monad)] [_ (..create_directory! fs target_path direct_files) _ (..create_directory! fs sub_path sub_files) context_exists!/pre (..directory_exists? fs context) diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux index 77af48126..93bf3de79 100644 --- a/stdlib/source/test/aedifex/command/deploy.lux +++ b/stdlib/source/test/aedifex/command/deploy.lux @@ -62,7 +62,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [[artifact expected_pom profile] (random.one (function (_ profile) (do maybe.monad @@ -77,8 +77,8 @@ $repository.empty) fs (file.mock (\ file.default separator)) program (program.async (program.mock environment.empty home working_directory))]] - (in (do {! async.monad} - [verdict (do {! ///action.monad} + (in (do [! async.monad] + [verdict (do [! ///action.monad] [logging (..execute! program repository fs artifact profile) expected_library (|> profile (value@ #///.sources) diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux index 76f8cf768..3fe787e35 100644 --- a/stdlib/source/test/aedifex/command/install.lux +++ b/stdlib/source/test/aedifex/command/install.lux @@ -63,7 +63,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [identity $artifact.random sample (\ ! each (with@ #///.identity (#.Some identity)) $profile.random) @@ -71,14 +71,14 @@ working_directory (random.ascii/alpha 5) .let [/ (\ file.default separator)]] ($_ _.and - (in (do {! async.monad} + (in (do [! async.monad] [.let [fs (file.mock /) program (program.async (program.mock environment.empty home working_directory)) artifact_path (///local.uri (value@ #///artifact.version identity) identity) library_path (format artifact_path ///artifact/extension.lux_library) pom_path (format artifact_path ///artifact/extension.pom)] - verdict (do {! ///action.monad} + verdict (do [! ///action.monad] [succeeded! (\ ! each (text\= /.success) (..execute! program fs sample)) library_exists! (|> library_path @@ -94,7 +94,7 @@ pom_exists!)))] (_.cover' [/.do! /.success] (try.else false verdict)))) - (in (do {! async.monad} + (in (do [! async.monad] [.let [fs (file.mock /) program (program.async (program.mock environment.empty home working_directory))] logging (..execute! program fs (with@ #///.identity #.None sample))] diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux index 1bac5cf69..be5c60598 100644 --- a/stdlib/source/test/aedifex/command/pom.lux +++ b/stdlib/source/test/aedifex/command/pom.lux @@ -36,7 +36,7 @@ (do random.monad [sample @profile.random .let [fs (file.mock (\ file.default separator))]] - (in (do {! async.monad} + (in (do [! async.monad] [.let [console (@version.echo "")] outcome (/.do! console fs sample)] (case outcome diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux index 0496428a6..6f04ef653 100644 --- a/stdlib/source/test/aedifex/command/test.lux +++ b/stdlib/source/test/aedifex/command/test.lux @@ -42,7 +42,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [test (random.ascii/alpha 5) target (random.ascii/alpha 5) home (random.ascii/alpha 5) diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux index e9bcc67a4..8dfa5a853 100644 --- a/stdlib/source/test/aedifex/dependency/deployment.lux +++ b/stdlib/source/test/aedifex/dependency/deployment.lux @@ -146,11 +146,11 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [address (\ ! each (text.suffix uri.separator) (random.ascii/upper 10))] ($_ _.and - (do {! random.monad} + (do [! random.monad] [[dependency expected_artifact package] ..bundle .let [cache (: Cache (atom.atom (dictionary.empty text.hash))) @@ -163,7 +163,7 @@ (|> ?outcome (try\each (verify_one 1 address package cache expected_artifact)) (try.else false)))))) - (do {! random.monad} + (do [! random.monad] [.let [hash (: (Hash [Dependency Artifact Package]) (\ hash.functor each (|>> product.right product.left product.left) text.hash))] diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux index 79e0bde5b..7297b99ee 100644 --- a/stdlib/source/test/aedifex/dependency/resolution.lux +++ b/stdlib/source/test/aedifex/dependency/resolution.lux @@ -50,7 +50,7 @@ (def: random (Random /.Resolution) - (do {! random.monad} + (do [! random.monad] [artifact $///artifact.random [_ package] $///package.random] (in (dictionary.has [#///dependency.artifact artifact @@ -246,7 +246,7 @@ (def: one Test - (do {! random.monad} + (do [! random.monad] [expected_artifact $///artifact.random [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right @@ -291,7 +291,7 @@ (def: any Test - (do {! random.monad} + (do [! random.monad] [expected_artifact $///artifact.random [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right @@ -399,7 +399,7 @@ (def: all Test - (do {! random.monad} + (do [! random.monad] [[dependee_artifact depender_artifact ignored_artifact] ..artifacts [[dependee depender ignored] diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux index 45e693c07..94608cf7b 100644 --- a/stdlib/source/test/aedifex/hash.lux +++ b/stdlib/source/test/aedifex/hash.lux @@ -29,7 +29,7 @@ (All (_ h) (-> (-> Binary (/.Hash h)) (Random (/.Hash h)))) - (do {! random.monad} + (do [! random.monad] [size (\ ! each (n.% 100) random.nat)] (\ ! each hash (_binary.random size)))) diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux index eef2673f8..b725272e9 100644 --- a/stdlib/source/test/aedifex/input.lux +++ b/stdlib/source/test/aedifex/input.lux @@ -44,7 +44,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [expected (\ ! each (with@ #//.parents (list)) $profile.random) .let [fs (: (file.System Async) (file.mock (\ file.default separator)))]] diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux index 33c27fba7..8a6de8dcd 100644 --- a/stdlib/source/test/aedifex/local.lux +++ b/stdlib/source/test/aedifex/local.lux @@ -18,7 +18,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [sample @artifact.random] ($_ _.and (_.cover [/.repository /.uri] diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux index 1d6aae530..544da4d3c 100644 --- a/stdlib/source/test/aedifex/metadata/artifact.lux +++ b/stdlib/source/test/aedifex/metadata/artifact.lux @@ -47,7 +47,7 @@ (random.ascii/alpha 5) (random.ascii/alpha 5) (random.list 5 (random.ascii/alpha 5)) - (do {! random.monad} + (do [! random.monad] [year (\ ! each (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat) month (\ ! each (|>> (n.% 12) (n.+ 1)) random.nat) day_of_month (\ ! each (|>> (n.% 28) (n.+ 1)) random.nat) diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux index a8d518aac..2c4866c2c 100644 --- a/stdlib/source/test/aedifex/metadata/snapshot.lux +++ b/stdlib/source/test/aedifex/metadata/snapshot.lux @@ -51,7 +51,7 @@ (def: random_instant (Random Instant) - (do {! random.monad} + (do [! random.monad] [year (\ ! each (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat) month (\ ! each (|>> (n.% 12) (n.+ 1)) random.nat) day_of_month (\ ! each (|>> (n.% 28) (n.+ 1)) random.nat) diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux index 8bd1d6fde..a7bc7d00a 100644 --- a/stdlib/source/test/aedifex/package.lux +++ b/stdlib/source/test/aedifex/package.lux @@ -42,7 +42,7 @@ (def: .public random (Random [//.Profile /.Package]) - (do {! random.monad} + (do [! random.monad] [content_size (\ ! each (n.% 100) random.nat) content ($binary.random content_size) [profile pom] (random.one (function (_ profile) @@ -57,7 +57,7 @@ Test (<| (_.covering /._) (_.for [/.Package]) - (do {! random.monad} + (do [! random.monad] [[profile package] ..random] ($_ _.and (_.for [/.equivalence] diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux index cb72c3726..1d8c6c1b4 100644 --- a/stdlib/source/test/aedifex/parser.lux +++ b/stdlib/source/test/aedifex/parser.lux @@ -39,7 +39,7 @@ (def: (list_of random) (All (_ a) (-> (Random a) (Random (List a)))) - (do {! random.monad} + (do [! random.monad] [size (\ ! each (n.% 5) random.nat)] (random.list size random))) diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index 48f28903e..728971bbf 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -73,7 +73,7 @@ (def: (list_of random) (All (_ a) (-> (Random a) (Random (List a)))) - (do {! random.monad} + (do [! random.monad] [size (\ ! each (n.% 5) random.nat)] (random.list size random))) diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux index eb7b9777d..135e10867 100644 --- a/stdlib/source/test/aedifex/repository/local.lux +++ b/stdlib/source/test/aedifex/repository/local.lux @@ -26,7 +26,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [/ (random.ascii/upper 1) home (random.ascii/lower 10) working_directory (random.ascii/lower 10) diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux index a38e68104..dfdbe03c5 100644 --- a/stdlib/source/test/aedifex/repository/remote.lux +++ b/stdlib/source/test/aedifex/repository/remote.lux @@ -83,7 +83,7 @@ (def: .public test Test (<| (_.covering /._) - (do {! random.monad} + (do [! random.monad] [address (random.ascii/upper 10) uri (random.ascii/lower 10) |