From 93eb82e1bf6d2f2a6b3b0adb85f4ab93cbb766a9 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Mon, 14 Mar 2022 03:33:01 -0400 Subject: De-sigil-ification: @ --- stdlib/source/program/aedifex/command/build.lux | 46 ++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-) (limited to 'stdlib/source/program/aedifex/command/build.lux') diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 599887fe4..a0cd97fd9 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -58,8 +58,8 @@ (-> 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))) + (if (and (text#= group (the [///dependency.#artifact ///artifact.#group] dependency)) + (text#= name (the [///dependency.#artifact ///artifact.#name] dependency))) {.#Some dependency} {.#None}))))) @@ -121,17 +121,17 @@ (def: (path fs home dependency) (All (_ !) (-> (file.System !) Path Dependency Path)) (let [/ (# fs separator) - artifact (value@ ///dependency.#artifact dependency)] + artifact (the ///dependency.#artifact dependency)] (|> artifact - (///local.uri (value@ ///artifact.#version artifact)) + (///local.uri (the ///artifact.#version artifact)) (text.replaced uri.separator /) (format home /) - (text.suffix (format "." (value@ ///dependency.#type dependency)))))) + (text.suffix (format "." (the ///dependency.#type dependency)))))) (def: (libraries fs home) (All (_ !) (-> (file.System !) Path Resolution (List Path))) (|>> dictionary.keys - (list.only (|>> (value@ ///dependency.#type) + (list.only (|>> (the ///dependency.#type) (text#= ///artifact/type.lux_library))) (list#each (..path fs home)))) @@ -166,14 +166,14 @@ (def: .public (host_dependencies fs home) (All (_ !) (-> (file.System !) Path Resolution (List Path))) (|>> dictionary.keys - (list.only (|>> (value@ ///dependency.#type) + (list.only (|>> (the ///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 (the ///dependency.#artifact dependency) + identity [(the ///artifact.#group artifact) + (the ///artifact.#name artifact)] + version (the ///artifact.#version artifact)] (case (dictionary.value identity uniques) {.#Some [current_version current_path]} (if (# version_order < version current_version) @@ -266,15 +266,15 @@ runtime _ - (revised@ ///runtime.#parameters - (|>> (list& "-cp" (..jvm_class_path host_dependencies))) - runtime))) + (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 Lux Path])) (function (_ profile) - (let [target (value@ ///.#target profile)] - (case (value@ ///.#program profile) + (let [target (the ///.#target profile)] + (case (the ///.#program profile) {.#None} (async#in (exception.except ..no_specified_program [])) @@ -284,12 +284,12 @@ .let [home (# program home) working_directory (# program directory)]] (do ///action.monad - [[resolution lux] (async#in (..lux resolution (value@ ///.#lux profile))) + [[resolution lux] (async#in (..lux resolution (the ///.#lux profile))) .let [host_dependencies (..host_dependencies fs home resolution) [[command lux_params] output] (case lux {#JVM dependency} - [(|> (value@ ///.#java profile) - (with@ ///runtime.#parameters (list "program._")) + [(|> (the ///.#java profile) + (has ///runtime.#parameters (list "program._")) (with_jvm_class_path {.#Item (..path fs home dependency) host_dependencies})) "program.jar"] @@ -297,7 +297,7 @@ [{ dependency} [(|> dependency (..path fs home) - (///runtime.for (value@ profile))) + (///runtime.for (the profile))) ]]) ([#JS ///.#js "program.js"] [#Python ///.#java "program.py"] @@ -310,11 +310,11 @@ (list "build") (..plural "--library" (..libraries fs home resolution)) (..plural "--host_dependency" host_dependencies) - (..plural "--compiler" (list#each compiler.format (value@ ///.#compilers profile))) - (..plural "--source" (set.list (value@ ///.#sources profile))) + (..plural "--compiler" (list#each compiler.format (the ///.#compilers profile))) + (..plural "--source" (set.list (the ///.#sources profile))) (..singular "--target" cache_directory) (..singular "--module" program_module) - (..singular "--configuration" (configuration.format (value@ ///.#configuration profile)))))] + (..singular "--configuration" (configuration.format (the ///.#configuration profile)))))] process (# shell execute [environment working_directory command -- cgit v1.2.3