diff options
author | Eduardo Julian | 2021-08-07 02:20:09 -0400 |
---|---|---|
committer | Eduardo Julian | 2021-08-07 02:20:09 -0400 |
commit | 17e7566be51df5e428a6b10e6469201a8a9468da (patch) | |
tree | 0d4ed80c9c9d846784b5bf460f6e6f5fc5b96663 /stdlib/source/program/aedifex/command | |
parent | eff4c59794868b89d60fdc411f9b544a270b817e (diff) |
Made the be/de macros for (co)monadic expression extensible.
Diffstat (limited to 'stdlib/source/program/aedifex/command')
-rw-r--r-- | stdlib/source/program/aedifex/command/auto.lux | 2 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/build.lux | 8 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/clean.lux | 2 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/deploy.lux | 2 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/deps.lux | 6 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/install.lux | 2 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/test.lux | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index 975ee26ba..f4e2ab18f 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -54,7 +54,7 @@ (do {! async.monad} [targets (|> profile (get@ #///.sources) - set.to_list + set.list (monad.map ! (..targets fs)) (\ ! map list.concat))] (do {! ///action.monad} diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 00791f787..23429f123 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -271,11 +271,11 @@ (#.Some program_module) (do async.monad [environment (program.environment async.monad program) - #let [home (\ program home) + .let [home (\ program home) working_directory (\ program directory)]] (do ///action.monad [[resolution compiler] (async\in (..compiler resolution (get@ #///.compiler profile))) - #let [host_dependencies (..host_dependencies fs home resolution) + .let [host_dependencies (..host_dependencies fs home resolution) [[command compiler_params] output] (case compiler (#JVM dependency) [(|> (..path fs home dependency) @@ -295,11 +295,11 @@ / (\ fs separator) cache_directory (format working_directory / target)] _ (console.write_line ..start console) - #let [full_parameters (list.concat (list compiler_params + .let [full_parameters (list.concat (list compiler_params (list "build") (..plural "--library" (..libraries fs home resolution)) (..plural "--host_dependency" host_dependencies) - (..plural "--source" (set.to_list (get@ #///.sources profile))) + (..plural "--source" (set.list (get@ #///.sources profile))) (..singular "--target" cache_directory) (..singular "--module" program_module)))] process (\ shell execute [environment diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux index c7443beb6..c03a09b49 100644 --- a/stdlib/source/program/aedifex/command/clean.lux +++ b/stdlib/source/program/aedifex/command/clean.lux @@ -33,7 +33,7 @@ (def: #export (do! console fs profile) (-> (Console Async) (file.System Async) (Command Any)) (do {! async.monad} - [#let [target (get@ #///.target profile)] + [.let [target (get@ #///.target profile)] ? (\ fs directory? target) _ (let [! ///action.monad] (if ? diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux index 9e74a53a5..b7b08f517 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -61,7 +61,7 @@ (do {! ///action.monad} [library (|> profile (get@ #/.sources) - set.to_list + set.list (export.library fs) (\ ! map (binary.run tar.writer))) pom (\ async.monad in (///pom.write profile)) diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index 3d26a042b..342c9c0bc 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -40,8 +40,8 @@ (def: #export (do! console local remotes new_repository profile) (-> (Console Async) (Repository Async) (List (Repository Async)) (-> URL (Repository Async)) (Command Resolution)) (do async.monad - [#let [dependencies (|> (get@ #///.dependencies profile) - set.to_list + [.let [dependencies (|> (get@ #///.dependencies profile) + set.list (#.Item (get@ #///.compiler profile)))] [local_successes local_failures cache] (///dependency/resolution.all console (list local) @@ -67,7 +67,7 @@ ["Remote successes" (|> remote_successes (set.of_list ///dependency.hash) (set.difference (set.of_list ///dependency.hash local_successes)) - set.to_list + set.list (list.sort (\ ///dependency.order <)) (exception.listing ..format))] ["Remote failures" (|> remote_failures diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index ddc73ca36..b39b30f85 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -56,7 +56,7 @@ (do ///action.monad [package (|> profile (get@ #/.sources) - set.to_list + set.list (export.library fs)) pom (|> profile ///pom.write diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux index 7af6a4351..78859819d 100644 --- a/stdlib/source/program/aedifex/command/test.lux +++ b/stdlib/source/program/aedifex/command/test.lux @@ -32,15 +32,15 @@ (-> (Console Async) (Program Async) (file.System Async) (Shell Async) Resolution (Command [Exit Any])) (do async.monad [environment (program.environment async.monad program) - #let [working_directory (\ program directory)]] + .let [working_directory (\ program directory)]] (do {! ///action.monad} - [#let [home (\ program home)] + [.let [home (\ program home)] [build_exit compiler program] (//build.do! console program fs shell resolution (set@ #///.program (get@ #///.test profile) profile))] (if (i.= shell.normal build_exit) (do ! [_ (console.write_line ..start console) - #let [host_dependencies (//build.host_dependencies fs home resolution) + .let [host_dependencies (//build.host_dependencies fs home resolution) [test_command test_parameters] (case compiler (#//build.JVM dependency) (|> program |