aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/program/aedifex/command
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source/program/aedifex/command')
-rw-r--r--stdlib/source/program/aedifex/command/auto.lux8
-rw-r--r--stdlib/source/program/aedifex/command/build.lux86
-rw-r--r--stdlib/source/program/aedifex/command/clean.lux2
-rw-r--r--stdlib/source/program/aedifex/command/deploy.lux8
-rw-r--r--stdlib/source/program/aedifex/command/deps.lux6
-rw-r--r--stdlib/source/program/aedifex/command/install.lux12
-rw-r--r--stdlib/source/program/aedifex/command/test.lux14
7 files changed, 68 insertions, 68 deletions
diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux
index 0b82f4d81..2160398eb 100644
--- a/stdlib/source/program/aedifex/command/auto.lux
+++ b/stdlib/source/program/aedifex/command/auto.lux
@@ -41,7 +41,7 @@
(def: (pause delay)
(-> Nat (Async (Try Any)))
- (async.after delay {#try.Success []}))
+ (async.after delay {try.#Success []}))
(def: .public (do! delay watcher command)
(All (_ a)
@@ -53,7 +53,7 @@
(with_expansions [<call> ((command console program fs shell resolution) profile)]
(do [! async.monad]
[targets (|> profile
- (value@ #///.sources)
+ (value@ ///.#sources)
set.list
(monad.each ! (..targets fs))
(\ ! each list.together))]
@@ -65,10 +65,10 @@
[_ (..pause delay)
events (\ watcher poll [])]
(case events
- {#.Item _}
+ {.#Item _}
(do !
[_ <call>]
(recur []))
- #.End
+ {.#End}
(recur []))))))))))
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index 63d2affb7..c16f7c9ef 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -49,10 +49,10 @@
(-> Group Name Finder)
(|>> dictionary.entries
(list.one (function (_ [dependency package])
- (if (and (text\= group (value@ [#///dependency.artifact #///artifact.group] dependency))
- (text\= name (value@ [#///dependency.artifact #///artifact.name] dependency)))
- {#.Some dependency}
- #.None)))))
+ (if (and (text\= group (value@ [///dependency.#artifact ///artifact.#group] dependency))
+ (text\= name (value@ [///dependency.#artifact ///artifact.#name] dependency)))
+ {.#Some dependency}
+ {.#None})))))
(def: .public lux_group
Group
@@ -91,11 +91,11 @@
(-> Resolution Dependency (Try [Resolution Compiler]))
(let [[[compiler_group compiler_name compiler_version] compiler_type] compiler_dependency]
(case (..dependency_finder compiler_group compiler_name resolution)
- {#.Some dependency}
+ {.#Some dependency}
(case compiler_name
(^template [<tag> <name>]
[(^ (static <name>))
- {#try.Success [(..remove_dependency dependency resolution)
+ {try.#Success [(..remove_dependency dependency resolution)
{<tag> dependency}]}])
([#JVM ..jvm_compiler_name]
[#JS ..js_compiler_name]
@@ -112,17 +112,17 @@
(def: (path fs home dependency)
(All (_ !) (-> (file.System !) Path Dependency Path))
(let [/ (\ fs separator)
- artifact (value@ #///dependency.artifact dependency)]
+ artifact (value@ ///dependency.#artifact dependency)]
(|> artifact
- (///local.uri (value@ #///artifact.version artifact))
+ (///local.uri (value@ ///artifact.#version artifact))
(text.replaced uri.separator /)
(format home /)
- (text.suffix (format "." (value@ #///dependency.type dependency))))))
+ (text.suffix (format "." (value@ ///dependency.#type dependency))))))
(def: (libraries fs home)
(All (_ !) (-> (file.System !) Path Resolution (List Path)))
(|>> dictionary.keys
- (list.only (|>> (value@ #///dependency.type)
+ (list.only (|>> (value@ ///dependency.#type)
(text\= ///artifact/type.lux_library)))
(list\each (..path fs home))))
@@ -139,39 +139,39 @@
(loop [left (text.all_split_by ..version_separator left)
right (text.all_split_by ..version_separator right)]
(case [left right]
- [{#.Item leftH leftT} {#.Item rightH rightT}]
+ [{.#Item leftH leftT} {.#Item rightH rightT}]
(if (text\= leftH rightH)
(recur leftT rightT)
(or (n.< (text.size leftH) (text.size rightH))
(text\< leftH rightH)))
- [{#.Item leftH leftT} #.End]
+ [{.#Item leftH leftT} {.#End}]
false
- [#.End {#.Item rightH rightT}]
+ [{.#End} {.#Item rightH rightT}]
true
- [#.End #.End]
+ [{.#End} {.#End}]
false))))
(def: .public (host_dependencies fs home)
(All (_ !) (-> (file.System !) Path Resolution (List Path)))
(|>> dictionary.keys
- (list.only (|>> (value@ #///dependency.type)
+ (list.only (|>> (value@ ///dependency.#type)
(text\= ///artifact/type.lux_library)
not))
(list\mix (function (_ dependency uniques)
- (let [artifact (value@ #///dependency.artifact dependency)
- identity [(value@ #///artifact.group artifact)
- (value@ #///artifact.name artifact)]
- version (value@ #///artifact.version artifact)]
+ (let [artifact (value@ ///dependency.#artifact dependency)
+ identity [(value@ ///artifact.#group artifact)
+ (value@ ///artifact.#name artifact)]
+ version (value@ ///artifact.#version artifact)]
(case (dictionary.value identity uniques)
- {#.Some [current_version current_path]}
+ {.#Some [current_version current_path]}
(if (\ version_order < version current_version)
(dictionary.has identity [version dependency] uniques)
uniques)
- #.None
+ {.#None}
(dictionary.has identity [version dependency] uniques))))
(: (Dictionary [Group Name] [Version Dependency])
(dictionary.empty (product.hash text.hash text.hash))))
@@ -203,18 +203,18 @@
_ (|> (\ process <capability> [])
(async.upon! (function (recur ?line)
(case ?line
- {#try.Failure error}
+ {try.#Failure error}
(if (exception.match? shell.no_more_output error)
- (write! {#try.Success []})
+ (write! {try.#Success []})
(async.upon! write! (console.write_line error console)))
- {#try.Success line}
+ {try.#Success line}
(async.upon! (function (_ outcome)
(case outcome
- {#try.Failure error}
- (write! {#try.Failure error})
+ {try.#Failure error}
+ (write! {try.#Failure error})
- {#try.Success _}
+ {try.#Success _}
(async.upon! recur
(\ process <capability> []))))
(console.write_line line console)))))
@@ -245,41 +245,41 @@
(def: (jvm_class_path host_dependencies)
(-> (List Path) Text)
(|> host_dependencies
- {#.Item "."}
+ {.#Item "."}
(text.interposed ..jvm_class_path_separator)))
(def: .public (with_jvm_class_path host_dependencies runtime)
(-> (List Path) ///runtime.Runtime ///runtime.Runtime)
(case host_dependencies
- #.End
+ {.#End}
runtime
_
- (revised@ #///runtime.parameters
+ (revised@ ///runtime.#parameters
(|>> (list& "-cp" (..jvm_class_path host_dependencies)))
runtime)))
(def: .public (do! console program fs shell resolution)
(-> (Console Async) (Program Async) (file.System Async) (Shell Async) Resolution (Command [Exit Compiler Path]))
(function (_ profile)
- (let [target (value@ #///.target profile)]
- (case (value@ #///.program profile)
- #.None
+ (let [target (value@ ///.#target profile)]
+ (case (value@ ///.#program profile)
+ {.#None}
(async\in (exception.except ..no_specified_program []))
- {#.Some program_module}
+ {.#Some program_module}
(do async.monad
[environment (program.environment async.monad program)
.let [home (\ program home)
working_directory (\ program directory)]]
(do ///action.monad
- [[resolution compiler] (async\in (..compiler resolution (value@ #///.compiler profile)))
+ [[resolution compiler] (async\in (..compiler resolution (value@ ///.#compiler profile)))
.let [host_dependencies (..host_dependencies fs home resolution)
[[command compiler_params] output] (case compiler
{#JVM dependency}
- [(|> (value@ #///.java profile)
- (with@ #///runtime.parameters (list "program._"))
- (with_jvm_class_path {#.Item (..path fs home dependency) host_dependencies}))
+ [(|> (value@ ///.#java profile)
+ (with@ ///runtime.#parameters (list "program._"))
+ (with_jvm_class_path {.#Item (..path fs home dependency) host_dependencies}))
"program.jar"]
(^template [<tag> <runtime> <program>]
@@ -288,10 +288,10 @@
(..path fs home)
(///runtime.for (value@ <runtime> profile)))
<program>]])
- ([#JS #///.js "program.js"]
- [#Python #///.java "program.py"]
- [#Lua #///.java "program.lua"]
- [#Ruby #///.java "program.rb"]))
+ ([#JS ///.#js "program.js"]
+ [#Python ///.#java "program.py"]
+ [#Lua ///.#java "program.lua"]
+ [#Ruby ///.#java "program.rb"]))
/ (\ fs separator)
cache_directory (format working_directory / target)]
_ (console.write_line ..start console)
@@ -299,7 +299,7 @@
(list "build")
(..plural "--library" (..libraries fs home resolution))
(..plural "--host_dependency" host_dependencies)
- (..plural "--source" (set.list (value@ #///.sources profile)))
+ (..plural "--source" (set.list (value@ ///.#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 232bde793..d175ae291 100644
--- a/stdlib/source/program/aedifex/command/clean.lux
+++ b/stdlib/source/program/aedifex/command/clean.lux
@@ -33,7 +33,7 @@
(def: .public (do! console fs profile)
(-> (Console Async) (file.System Async) (Command Any))
(do [! async.monad]
- [.let [target (value@ #///.target profile)]
+ [.let [target (value@ ///.#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 4d18f1b18..7210e9a30 100644
--- a/stdlib/source/program/aedifex/command/deploy.lux
+++ b/stdlib/source/program/aedifex/command/deploy.lux
@@ -60,7 +60,7 @@
(-> (Console Async) (Repository Async) (file.System Async) Artifact (Command Any))
(do [! ///action.monad]
[library (|> profile
- (value@ #/.sources)
+ (value@ /.#sources)
set.list
(export.library fs)
(\ ! each (binary.result tar.writer)))
@@ -71,10 +71,10 @@
(let [pom_data (|> pom
(\ xml.codec encoded)
(\ utf8.codec encoded))]
- [#///package.origin {#///repository/origin.Remote ""}
- #///package.library [library
+ [///package.#origin {///repository/origin.#Remote ""}
+ ///package.#library [library
(///dependency/status.verified library)]
- #///package.pom [pom
+ ///package.#pom [pom
pom_data
(///dependency/status.verified pom_data)]]))]
(console.write_line ..success console)))
diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index f26a76211..ed636efeb 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -33,16 +33,16 @@
(def: format
(%.Format Dependency)
- (|>> (value@ #///dependency.artifact)
+ (|>> (value@ ///dependency.#artifact)
///artifact.format
%.text))
(def: .public (do! console local remotes new_repository profile)
(-> (Console Async) (Repository Async) (List (Repository Async)) (-> URL (Repository Async)) (Command Resolution))
(do async.monad
- [.let [dependencies (|> (value@ #///.dependencies profile)
+ [.let [dependencies (|> (value@ ///.#dependencies profile)
set.list
- {#.Item (value@ #///.compiler profile)})]
+ {.#Item (value@ ///.#compiler profile)})]
[local_successes local_failures cache] (///dependency/resolution.all console
(list local)
new_repository
diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux
index 65575f63f..4b413faa5 100644
--- a/stdlib/source/program/aedifex/command/install.lux
+++ b/stdlib/source/program/aedifex/command/install.lux
@@ -51,11 +51,11 @@
(def: .public (do! console fs repository profile)
(-> (Console Async) (file.System Async) (Repository Async) (Command Any))
- (case (value@ #/.identity profile)
- {#.Some identity}
+ (case (value@ /.#identity profile)
+ {.#Some identity}
(do ///action.monad
[package (|> profile
- (value@ #/.sources)
+ (value@ /.#sources)
set.list
(export.library fs))
pom (|> profile
@@ -66,10 +66,10 @@
(let [pom_data (|> pom
(\ xml.codec encoded)
(\ utf8.codec encoded))]
- [#///package.origin {#///origin.Local ""}
- #///package.library (let [library (binary.result tar.writer package)]
+ [///package.#origin {///origin.#Local ""}
+ ///package.#library (let [library (binary.result tar.writer package)]
[library (///dependency/status.verified library)])
- #///package.pom [pom
+ ///package.#pom [pom
pom_data
(///dependency/status.verified pom_data)]]))]
(console.write_line ..success console))
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index 3e5cad3c6..04f4e8e27 100644
--- a/stdlib/source/program/aedifex/command/test.lux
+++ b/stdlib/source/program/aedifex/command/test.lux
@@ -36,25 +36,25 @@
(do [! ///action.monad]
[.let [home (\ program home)]
[build_exit compiler program] (//build.do! console program fs shell resolution
- (with@ #///.program (value@ #///.test profile) profile))]
+ (with@ ///.#program (value@ ///.#test profile) profile))]
(if (i.= shell.normal build_exit)
(do !
[_ (console.write_line ..start console)
.let [host_dependencies (//build.host_dependencies fs home resolution)
[test_command test_parameters] (case compiler
- {#//build.JVM dependency}
+ {//build.#JVM dependency}
(|> program
- (///runtime.for (value@ #///.java profile))
+ (///runtime.for (value@ ///.#java profile))
(//build.with_jvm_class_path host_dependencies))
(^template [<tag> <runtime>]
[{<tag> artifact}
(///runtime.for (value@ <runtime> profile)
program)])
- ([#//build.JS #///.js]
- [#//build.Python #///.python]
- [#//build.Lua #///.lua]
- [#//build.Ruby #///.ruby]))]
+ ([//build.#JS ///.#js]
+ [//build.#Python ///.#python]
+ [//build.#Lua ///.#lua]
+ [//build.#Ruby ///.#ruby]))]
process (\ shell execute [environment
working_directory
test_command