diff options
Diffstat (limited to '')
23 files changed, 442 insertions, 442 deletions
diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index e61b08397..af302a16b 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -1,71 +1,71 @@ (.using - [library - [lux "*" - [program {"+" program:}] - ["[0]" debug] - [abstract - [monad {"+" do}]] - [control - [pipe {"+" do>}] - ["[0]" io {"+" IO}] - ["[0]" try {"+" Try} ("[1]#[0]" functor)] - ["[0]" exception {"+" exception:}] - [parser - [environment {"+" Environment}]] - [concurrency - ["[0]" async {"+" Async} ("[1]#[0]" monad)]]] - [data - [binary {"+" Binary}] - ["[0]" text - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml]] - [collection - ["[0]" set] - ["[0]" dictionary {"+" Dictionary}] - ["[0]" list ("[1]#[0]" functor)]]] - [tool - [compiler - [language - [lux - ["[0]" syntax]]]]] - [world - ["[0]" shell {"+" Exit Shell}] - ["[0]" console {"+" Console}] - ["[0]" program {"+" Program}] - ["[0]" file {"+" Path} - ["[0]" watch]] - [net - ["[0]" http "_" - ["[1]" client]]]]]] - ["[0]" / "_" - ["[1]" profile] - ["[1][0]" action {"+" Action}] - ["[1][0]" project {"+" Project}] - ["[1][0]" input] - ["[1][0]" pom] - ["[1][0]" cli] - ["[1][0]" dependency "_" - ["[1]" resolution {"+" Resolution}]] - ["[1][0]" repository {"+" Repository} - ["[1]/[0]" remote {"+" Address}] - ["[1]/[0]" local]] - ["[1][0]" command {"+" Command} - ["[1]/[0]" version] - ["[1]/[0]" clean] - ["[1]/[0]" pom] - ["[1]/[0]" install] - ["[1]/[0]" deps] - ["[1]/[0]" build] - ["[1]/[0]" test] - ["[1]/[0]" auto] - ["[1]/[0]" deploy]]]) + [library + [lux "*" + [program {"+" program:}] + ["[0]" debug] + [abstract + [monad {"+" do}]] + [control + [pipe {"+" do>}] + ["[0]" io {"+" IO}] + ["[0]" try {"+" Try} ("[1]#[0]" functor)] + ["[0]" exception {"+" exception:}] + [parser + [environment {"+" Environment}]] + [concurrency + ["[0]" async {"+" Async} ("[1]#[0]" monad)]]] + [data + [binary {"+" Binary}] + ["[0]" text + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml]] + [collection + ["[0]" set] + ["[0]" dictionary {"+" Dictionary}] + ["[0]" list ("[1]#[0]" functor)]]] + [tool + [compiler + [language + [lux + ["[0]" syntax]]]]] + [world + ["[0]" shell {"+" Exit Shell}] + ["[0]" console {"+" Console}] + ["[0]" program {"+" Program}] + ["[0]" file {"+" Path} + ["[0]" watch]] + [net + ["[0]" http "_" + ["[1]" client]]]]]] + ["[0]" / "_" + ["[1]" profile] + ["[1][0]" action {"+" Action}] + ["[1][0]" project {"+" Project}] + ["[1][0]" input] + ["[1][0]" pom] + ["[1][0]" cli] + ["[1][0]" dependency "_" + ["[1]" resolution {"+" Resolution}]] + ["[1][0]" repository {"+" Repository} + ["[1]/[0]" remote {"+" Address}] + ["[1]/[0]" local]] + ["[1][0]" command {"+" Command} + ["[1]/[0]" version] + ["[1]/[0]" clean] + ["[1]/[0]" pom] + ["[1]/[0]" install] + ["[1]/[0]" deps] + ["[1]/[0]" build] + ["[1]/[0]" test] + ["[1]/[0]" auto] + ["[1]/[0]" deploy]]]) (def: repositories (-> /.Profile (List (Repository Async))) - (|>> (value@ /.#repositories) + (|>> (the /.#repositories) set.list (list#each (|>> (/repository/remote.repository http.default {.#None}) /repository.async)))) @@ -164,9 +164,9 @@ {/cli.#Deploy repository identity} (..command - (case (value@ /.#identity profile) + (case (the /.#identity profile) {.#Some artifact} - (case (dictionary.value repository (value@ /.#deploy_repositories profile)) + (case (dictionary.value repository (the /.#deploy_repositories profile)) {.#Some repository} (/command/deploy.do! console (/repository.async (/repository/remote.repository http.default {.#Some identity} repository)) @@ -175,7 +175,7 @@ profile) {.#None} - (async#in (exception.except ..cannot_find_repository [repository (value@ /.#deploy_repositories profile)]))) + (async#in (exception.except ..cannot_find_repository [repository (the /.#deploy_repositories profile)]))) {.#None} (async#in (exception.except /.no_identity [])))) diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index cc47f081e..b7342a650 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -1,20 +1,20 @@ (.using - [library - [lux {"-" local} - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}] - [hash {"+" Hash}]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" order) - ["%" format {"+" Format}]] - [collection - ["[0]" list ("[1]#[0]" monoid)]]] - [world - ["[0]" file {"+" Path}] - [net - ["[0]" uri {"+" URI}]]]]]) + [library + [lux {"-" local} + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}] + [hash {"+" Hash}]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" order) + ["%" format {"+" Format}]] + [collection + ["[0]" list ("[1]#[0]" monoid)]]] + [world + ["[0]" file {"+" Path}] + [net + ["[0]" uri {"+" URI}]]]]]) (type: .public Group Text) @@ -50,18 +50,18 @@ ..equivalence) (def: (< reference subject) - (<| (or (text#< (value@ #group reference) - (value@ #group subject))) + (<| (or (text#< (the #group reference) + (the #group subject))) - (and (text#= (value@ #group reference) - (value@ #group subject))) - (or (text#< (value@ #name reference) - (value@ #name subject))) + (and (text#= (the #group reference) + (the #group subject))) + (or (text#< (the #name reference) + (the #name subject))) - (and (text#= (value@ #name reference) - (value@ #name subject))) - (text#< (value@ #version reference) - (value@ #version subject))))) + (and (text#= (the #name reference) + (the #name subject))) + (text#< (the #version reference) + (the #version subject))))) (template [<separator> <definition>] [(def: <definition> @@ -75,13 +75,13 @@ (def: .public (identity artifact) (-> Artifact Text) - (%.format (value@ #name artifact) + (%.format (the #name artifact) ..version_separator - (value@ #version artifact))) + (the #version artifact))) (def: .public (format value) (Format Artifact) - (%.format (value@ #group value) + (%.format (the #group value) ..identity_separator (..identity value))) @@ -94,16 +94,16 @@ (def: .public (uri version artifact) (-> Version Artifact URI) (let [/ uri.separator - group (..directory / (value@ #group artifact)) - name (value@ #name artifact) - ... version (value@ #version artifact) + group (..directory / (the #group artifact)) + name (the #name artifact) + ... version (the #version artifact) identity (..identity artifact)] (%.format group / name / version / identity))) (def: .public (local artifact) (-> Artifact (List Text)) (list#composite (|> artifact - (value@ #group) + (the #group) (text.all_split_by ..group_separator)) - (list (value@ #name artifact) - (value@ #version artifact)))) + (list (the #name artifact) + (the #version artifact)))) diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index 5d8b0b1d4..d447bfe1d 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -1,29 +1,29 @@ (.using - [library - [lux "*" - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - [collection - ["[0]" list] - ["[0]" set]]] - [world - [program {"+" Program}] - [shell {"+" Exit Shell}] - [console {"+" Console}] - ["[0]" file - ["[0]" watch {"+" Watcher}]]]]] - ["[0]" // "_" - ["/[1]" // "_" - [command {"+" Command}] - ["[1]" profile] - ["[1][0]" action] - [dependency - [resolution {"+" Resolution}]]]]) + [library + [lux "*" + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + [collection + ["[0]" list] + ["[0]" set]]] + [world + [program {"+" Program}] + [shell {"+" Exit Shell}] + [console {"+" Console}] + ["[0]" file + ["[0]" watch {"+" Watcher}]]]]] + ["[0]" // "_" + ["/[1]" // "_" + [command {"+" Command}] + ["[1]" profile] + ["[1][0]" action] + [dependency + [resolution {"+" Resolution}]]]]) (def: (targets fs path) (-> (file.System Async) file.Path (Async (List file.Path))) @@ -53,7 +53,7 @@ (with_expansions [<call> ((command console program fs shell resolution) profile)] (do [! async.monad] [targets (|> profile - (value@ ///.#sources) + (the ///.#sources) set.list (monad.each ! (..targets fs)) (# ! each list.together))] 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 @@ [{<tag> dependency} [(|> dependency (..path fs home) - (///runtime.for (value@ <runtime> profile))) + (///runtime.for (the <runtime> profile))) <program>]]) ([#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 diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux index 02405e189..34ed21042 100644 --- a/stdlib/source/program/aedifex/command/clean.lux +++ b/stdlib/source/program/aedifex/command/clean.lux @@ -1,22 +1,22 @@ (.using - [library - [lux "*" - [abstract - ["[0]" monad {"+" do}]] - [control - [try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - [text - ["%" format {"+" format}]]] - [world - ["[0]" file {"+" Path}] - ["[0]" console {"+" Console}]]]] - ["[0]" /// "_" - [command {"+" Command}] - ["[1]" profile] - ["[1][0]" action {"+" Action}]]) + [library + [lux "*" + [abstract + ["[0]" monad {"+" do}]] + [control + [try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + [text + ["%" format {"+" format}]]] + [world + ["[0]" file {"+" Path}] + ["[0]" console {"+" Console}]]]] + ["[0]" /// "_" + [command {"+" Command}] + ["[1]" profile] + ["[1][0]" action {"+" Action}]]) (def: (clean_files! fs root) (-> (file.System Async) Path (Async (Try Any))) @@ -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 (the ///.#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 3ceefa7c1..180f39a95 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -61,7 +61,7 @@ (-> (Console Async) (Repository Async) (file.System Async) Artifact (Command Any)) (do [! ///action.monad] [library (|> profile - (value@ /.#sources) + (the /.#sources) set.list (export.library fs) (# ! each (binary.result tar.writer))) diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index 85c6fbb57..24e29882b 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) + (|>> (the ///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 (|> (the ///.#dependencies profile) set.list - {.#Item (value@ ///.#lux profile)})] + {.#Item (the ///.#lux 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 a1553e4bd..6933264d3 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -52,11 +52,11 @@ (def: .public (do! console fs repository profile) (-> (Console Async) (file.System Async) (Repository Async) (Command Any)) - (case (value@ /.#identity profile) + (case (the /.#identity profile) {.#Some identity} (do ///action.monad [package (|> profile - (value@ /.#sources) + (the /.#sources) set.list (export.library fs)) pom (|> profile diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux index 4aa1ecc54..649201465 100644 --- a/stdlib/source/program/aedifex/command/test.lux +++ b/stdlib/source/program/aedifex/command/test.lux @@ -36,7 +36,7 @@ (do [! ///action.monad] [.let [home (# program home)] [build_exit compiler program] (//build.do! console program fs shell resolution - (with@ ///.#program (value@ ///.#test profile) profile))] + (has ///.#program (the ///.#test profile) profile))] (if (i.= shell.normal build_exit) (do ! [_ (console.write_line ..start console) @@ -44,12 +44,12 @@ [test_command test_parameters] (case compiler {//build.#JVM dependency} (|> program - (///runtime.for (value@ ///.#java profile)) + (///runtime.for (the ///.#java profile)) (//build.with_jvm_class_path host_dependencies)) (^template [<tag> <runtime>] [{<tag> artifact} - (///runtime.for (value@ <runtime> profile) + (///runtime.for (the <runtime> profile) program)]) ([//build.#JS ///.#js] [//build.#Python ///.#python] diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index 3dd3d9c71..5bf2e4ef9 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -1,17 +1,17 @@ (.using - [library - [lux {"-" Type} - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}] - [hash {"+" Hash}]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" order) - ["%" format {"+" format}]]]]] - ["[0]" // "_" - ["[1]" artifact {"+" Artifact} ("[1]#[0]" order) - [type {"+" Type}]]]) + [library + [lux {"-" Type} + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}] + [hash {"+" Hash}]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" order) + ["%" format {"+" format}]]]]] + ["[0]" // "_" + ["[1]" artifact {"+" Artifact} ("[1]#[0]" order) + [type {"+" Type}]]]) (type: .public Dependency (Record @@ -36,10 +36,10 @@ ..equivalence) (def: (< reference subject) - (<| (or (//#< (value@ #artifact reference) - (value@ #artifact subject))) + (<| (or (//#< (the #artifact reference) + (the #artifact subject))) - (and (//#= (value@ #artifact reference) - (value@ #artifact subject))) - (text#< (value@ #type reference) - (value@ #type subject))))) + (and (//#= (the #artifact reference) + (the #artifact subject))) + (text#< (the #type reference) + (the #type subject))))) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 7098505d4..f55520ec1 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -91,39 +91,39 @@ (do try.monad [now (: (Try ///artifact/time.Time) (///artifact/time.of_instant now)) - .let [version_template (value@ ///artifact.#version artifact) + .let [version_template (the ///artifact.#version artifact) snapshot (|> snapshot - (revised@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] - (function (_ snapshot) - (case snapshot - {///artifact/snapshot.#Local} - {///artifact/snapshot.#Local} - - {///artifact/snapshot.#Remote [_ build]} - {///artifact/snapshot.#Remote [now (++ build)]}))) - (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#last_updated] now)) - versioning_snapshot (value@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]] + (revised [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] + (function (_ snapshot) + (case snapshot + {///artifact/snapshot.#Local} + {///artifact/snapshot.#Local} + + {///artifact/snapshot.#Remote [_ build]} + {///artifact/snapshot.#Remote [now (++ build)]}))) + (has [///metadata/snapshot.#versioning ///artifact/versioning.#last_updated] now)) + versioning_snapshot (the [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]] (in (|> snapshot - (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#versions] - (list [///artifact/snapshot/version.#extension type - ///artifact/snapshot/version.#value (///artifact/snapshot/version/value.format - [///artifact/snapshot/version/value.#version version_template - ///artifact/snapshot/version/value.#snapshot versioning_snapshot]) - ///artifact/snapshot/version.#updated now])) - ... (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] - ... (list#composite (..artifacts type (product.right (value@ ///package.#library package))) - ... (..artifacts ///artifact/type.pom (product.right (value@ ///package.#pom package))))) + (has [///metadata/snapshot.#versioning ///artifact/versioning.#versions] + (list [///artifact/snapshot/version.#extension type + ///artifact/snapshot/version.#value (///artifact/snapshot/version/value.format + [///artifact/snapshot/version/value.#version version_template + ///artifact/snapshot/version/value.#snapshot versioning_snapshot]) + ///artifact/snapshot/version.#updated now])) + ... (has [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] + ... (list#composite (..artifacts type (product.right (the ///package.#library package))) + ... (..artifacts ///artifact/type.pom (product.right (the ///package.#pom package))))) )))) (def: .public (one repository [artifact type] package) (-> (Repository Async) Dependency Package (Async (Try Artifact))) (do [! async.monad] [now (async.future instant.now) - .let [version_template (value@ ///artifact.#version artifact)]] + .let [version_template (the ///artifact.#version artifact)]] (do (try.with !) - [_ (with_status repository version_template [artifact type] (value@ ///package.#library package)) + [_ (with_status repository version_template [artifact type] (the ///package.#library package)) - _ (let [[pom pom_data status] (value@ ///package.#pom package)] + _ (let [[pom pom_data status] (the ///package.#pom package)] (with_status repository version_template [artifact ///artifact/type.pom] @@ -135,8 +135,8 @@ _ (///metadata/snapshot.write repository artifact snapshot) project (///metadata/artifact.read repository artifact) _ (|> project - (with@ ///metadata/artifact.#versions (list version_template)) - (with@ ///metadata/artifact.#last_updated now) + (has ///metadata/artifact.#versions (list version_template)) + (has ///metadata/artifact.#last_updated now) (///metadata/artifact.write repository artifact))] (in artifact)))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 627a3e6ef..1fcc77dd7 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -129,10 +129,10 @@ extension (///artifact/extension.extension type)] (do (try.with async.monad) [snapshot (///metadata/snapshot.read repository artifact) - .let [version_template (value@ [///metadata/snapshot.#artifact ///artifact.#version] snapshot) + .let [version_template (the [///metadata/snapshot.#artifact ///artifact.#version] snapshot) artifact_version (value.format [value.#version version_template - value.#snapshot (value@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]) - artifact (with@ ///artifact.#version artifact_version artifact)] + value.#snapshot (the [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]) + artifact (has ///artifact.#version artifact_version artifact)] [pom_data pom_status] (..hashed repository version_template artifact ///artifact/extension.pom) library_&_status (..hashed repository version_template artifact extension)] (# async.monad in @@ -157,8 +157,8 @@ (exception: .public (cannot_resolve [dependency Dependency]) (exception.report - ["Artifact" (%.text (///artifact.format (value@ //.#artifact dependency)))] - ["Type" (%.text (value@ //.#type dependency))])) + ["Artifact" (%.text (///artifact.format (the //.#artifact dependency)))] + ["Type" (%.text (the //.#type dependency))])) (template [<sigil> <name> <doing> <at>] [(def: (<name> console repository artifact) @@ -185,17 +185,17 @@ {.#Item repository alternatives} (do [! async.monad] - [_ (..announce_fetching console repository (value@ //.#artifact dependency)) + [_ (..announce_fetching console repository (the //.#artifact dependency)) outcome (..one repository dependency)] (case outcome {try.#Success package} (do ! - [_ (..announce_success console repository (value@ //.#artifact dependency))] + [_ (..announce_success console repository (the //.#artifact dependency))] (in outcome)) {try.#Failure error} (do ! - [_ (..announce_failure console repository (value@ //.#artifact dependency))] + [_ (..announce_failure console repository (the //.#artifact dependency))] (any console alternatives dependency)))))) (def: .public (all console repositories new_repository dependencies resolution) @@ -214,7 +214,7 @@ [successes failures resolution]) {.#Item head tail} - (case (value@ [//.#artifact ///artifact.#version] head) + (case (the [//.#artifact ///artifact.#version] head) ... Skip if there is no version "" (again repositories successes diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index d0628f160..19800f4d9 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -115,13 +115,13 @@ (def: (info value) (Format /.Info) (|> ..empty - (..on_maybe "url" (value@ /.#url value) code.text) - (..on_maybe "scm" (value@ /.#scm value) code.text) - (..on_maybe "description" (value@ /.#description value) code.text) - (..on_list "licenses" (value@ /.#licenses value) ..license) - (..on_maybe "organization" (value@ /.#organization value) ..organization) - (..on_list "developers" (value@ /.#developers value) ..developer) - (..on_list "contributors" (value@ /.#contributors value) ..contributor) + (..on_maybe "url" (the /.#url value) code.text) + (..on_maybe "scm" (the /.#scm value) code.text) + (..on_maybe "description" (the /.#description value) code.text) + (..on_list "licenses" (the /.#licenses value) ..license) + (..on_maybe "organization" (the /.#organization value) ..organization) + (..on_list "developers" (the /.#developers value) ..developer) + (..on_list "contributors" (the /.#contributors value) ..contributor) ..aggregate)) (def: (artifact' [group name version]) @@ -157,20 +157,20 @@ (def: (profile value) (Format /.Profile) (`` (|> ..empty - (..on_list "parents" (value@ /.#parents value) code.text) - (..on_maybe "identity" (value@ /.#identity value) ..artifact) - (..on_maybe "info" (value@ /.#info value) ..info) - (..on_set "repositories" (value@ /.#repositories value) code.text) - (..on_set "dependencies" (value@ /.#dependencies value) ..dependency) - (dictionary.has ..lux_compiler_label (..dependency (value@ /.#lux value))) - (..on_list "compilers" (value@ /.#compilers value) ..compiler) - (..on_set "sources" (value@ /.#sources value) code.text) - (dictionary.has "target" (code.text (value@ /.#target value))) - (..on_maybe "program" (value@ /.#program value) code.text) - (..on_maybe "test" (value@ /.#test value) code.text) - (..on_dictionary "deploy_repositories" (value@ /.#deploy_repositories value) code.text code.text) + (..on_list "parents" (the /.#parents value) code.text) + (..on_maybe "identity" (the /.#identity value) ..artifact) + (..on_maybe "info" (the /.#info value) ..info) + (..on_set "repositories" (the /.#repositories value) code.text) + (..on_set "dependencies" (the /.#dependencies value) ..dependency) + (dictionary.has ..lux_compiler_label (..dependency (the /.#lux value))) + (..on_list "compilers" (the /.#compilers value) ..compiler) + (..on_set "sources" (the /.#sources value) code.text) + (dictionary.has "target" (code.text (the /.#target value))) + (..on_maybe "program" (the /.#program value) code.text) + (..on_maybe "test" (the /.#test value) code.text) + (..on_dictionary "deploy_repositories" (the /.#deploy_repositories value) code.text code.text) (~~ (template [<tag>] - [(dictionary.has (template.text [<tag>]) (..runtime (value@ <tag> value)))] + [(dictionary.has (template.text [<tag>]) (..runtime (the <tag> value)))] [/.#java] [/.#js] diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux index a191a74dd..097aedac8 100644 --- a/stdlib/source/program/aedifex/metadata.lux +++ b/stdlib/source/program/aedifex/metadata.lux @@ -1,15 +1,15 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]]] - [world - [file {"+" Path}] - [net - ["[0]" uri {"+" URI}]]]]] - ["[0]" // "_" - ["[1][0]" artifact {"+" Artifact}]]) + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]]] + [world + [file {"+" Path}] + [net + ["[0]" uri {"+" URI}]]]]] + ["[0]" // "_" + ["[1][0]" artifact {"+" Artifact}]]) (def: remote_file Path @@ -18,16 +18,16 @@ (def: .public (remote_artifact_uri artifact) (-> Artifact URI) (let [/ uri.separator] - (format (//artifact.directory / (value@ //artifact.#group artifact)) - / (value@ //artifact.#name artifact) - / (value@ //artifact.#version artifact) + (format (//artifact.directory / (the //artifact.#group artifact)) + / (the //artifact.#name artifact) + / (the //artifact.#version artifact) / ..remote_file))) (def: .public (remote_project_uri artifact) (-> Artifact URI) (let [/ uri.separator] - (format (//artifact.directory / (value@ //artifact.#group artifact)) - / (value@ //artifact.#name artifact) + (format (//artifact.directory / (the //artifact.#group artifact)) + / (the //artifact.#name artifact) / ..remote_file))) (def: local_file diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index 27448f154..90ce39aa7 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -100,12 +100,12 @@ (-> Metadata XML) {xml.#Node ..<metadata> xml.attributes - (list (..group_format (value@ #group value)) - (..name_format (value@ #name value)) + (list (..group_format (the #group value)) + (..name_format (the #name value)) {xml.#Node ..<versioning> xml.attributes - (list (..versions_format (value@ #versions value)) - (..last_updated_format (value@ #last_updated value)))})}) + (list (..versions_format (the #versions value)) + (..last_updated_format (the #last_updated value)))})}) (def: (text tag) (-> xml.Tag (Parser Text)) diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index 487b91b8e..7aa41ff78 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -1,49 +1,49 @@ (.using - [library - [lux {"-" Type} - [abstract - [monad {"+" do}] - [equivalence {"+" Equivalence}]] - [control - [pipe {"+" do> case>}] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["<>" parser - ["<[0]>" xml {"+" Parser}] - ["<[0]>" text]] - [concurrency - ["[0]" async {"+" Async}]]] - [data - ["[0]" product] - ["[0]" text - ["%" format] - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml {"+" XML}]] - [collection - ["[0]" list ("[1]#[0]" functor)]]] - [math - [number - ["n" nat]]] - ["[0]" time {"+" Time} - ["[0]" instant {"+" Instant}] - ["[0]" date {"+" Date}] - ["[0]" year] - ["[0]" month]] - [world - [net - ["[0]" uri {"+" URI}]]]]] - ["[0]" // - ["/[1]" // "_" - [repository {"+" Repository}] - ["[1][0]" artifact {"+" Group Name Version Artifact} - ["[1]/[0]" time] - ["[1]/[0]" type {"+" Type}] - ["[1]/[0]" versioning {"+" Versioning}] - ["[1]/[0]" snapshot - ["[1]/[0]" version] - ["[1]/[0]" stamp]]]]]) + [library + [lux {"-" Type} + [abstract + [monad {"+" do}] + [equivalence {"+" Equivalence}]] + [control + [pipe {"+" do> case>}] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["<>" parser + ["<[0]>" xml {"+" Parser}] + ["<[0]>" text]] + [concurrency + ["[0]" async {"+" Async}]]] + [data + ["[0]" product] + ["[0]" text + ["%" format] + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml {"+" XML}]] + [collection + ["[0]" list ("[1]#[0]" functor)]]] + [math + [number + ["n" nat]]] + ["[0]" time {"+" Time} + ["[0]" instant {"+" Instant}] + ["[0]" date {"+" Date}] + ["[0]" year] + ["[0]" month]] + [world + [net + ["[0]" uri {"+" URI}]]]]] + ["[0]" // + ["/[1]" // "_" + [repository {"+" Repository}] + ["[1][0]" artifact {"+" Group Name Version Artifact} + ["[1]/[0]" time] + ["[1]/[0]" type {"+" Type}] + ["[1]/[0]" versioning {"+" Versioning}] + ["[1]/[0]" snapshot + ["[1]/[0]" version] + ["[1]/[0]" stamp]]]]]) (type: .public Metadata (Record @@ -96,14 +96,14 @@ ///artifact/snapshot/version.#updated ///artifact/time.epoch]] (|> (<xml>.somewhere ///artifact/versioning.parser) (# ! each - (revised@ ///artifact/versioning.#versions - (: (-> (List ///artifact/snapshot/version.Version) - (List ///artifact/snapshot/version.Version)) - (|>> (case> (^ (list)) - (list <default_version>) + (revised ///artifact/versioning.#versions + (: (-> (List ///artifact/snapshot/version.Version) + (List ///artifact/snapshot/version.Version)) + (|>> (case> (^ (list)) + (list <default_version>) - versions - versions))))) + versions + versions))))) (<>.else [///artifact/versioning.#snapshot {///artifact/snapshot.#Local} ///artifact/versioning.#last_updated ///artifact/time.epoch ///artifact/versioning.#versions (list <default_version>)])))] diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 841a0e581..fa0fb33af 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -1,32 +1,32 @@ (.using - [library - [lux {"-" local} - [abstract - [equivalence {"+" Equivalence}]] - [control - ["[0]" try {"+" Try} ("[1]#[0]" functor)] - [parser - ["<[0]>" xml]]] - [data - ["[0]" sum] - ["[0]" product] - ["[0]" binary {"+" Binary}] - [text - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml {"+" XML}]] - [collection - [set {"+" Set}]]]]] - ["[0]" // "_" - ["/" profile] - ["[1][0]" hash] - ["[1][0]" pom] - [dependency {"+" Dependency} - ["[1][0]" status {"+" Status}]] - [repository - [remote {"+" Address}] - ["[1][0]" origin {"+" Origin}]]]) + [library + [lux {"-" local} + [abstract + [equivalence {"+" Equivalence}]] + [control + ["[0]" try {"+" Try} ("[1]#[0]" functor)] + [parser + ["<[0]>" xml]]] + [data + ["[0]" sum] + ["[0]" product] + ["[0]" binary {"+" Binary}] + [text + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml {"+" XML}]] + [collection + [set {"+" Set}]]]]] + ["[0]" // "_" + ["/" profile] + ["[1][0]" hash] + ["[1][0]" pom] + [dependency {"+" Dependency} + ["[1][0]" status {"+" Status}]] + [repository + [remote {"+" Address}] + ["[1][0]" origin {"+" Origin}]]]) (type: .public Package (Record @@ -37,7 +37,7 @@ (template [<name> <tag>] [(def: .public (<name> package) (-> Package Bit) - (case (value@ #origin package) + (case (the #origin package) {<tag> _} true @@ -62,19 +62,19 @@ (def: .public dependencies (-> Package (Try (Set Dependency))) - (|>> (value@ #pom) + (|>> (the #pom) product.left list (<xml>.result //pom.parser) - (try#each (value@ /.#dependencies)))) + (try#each (the /.#dependencies)))) (def: .public repositories (-> Package (Try (Set Address))) - (|>> (value@ #pom) + (|>> (the #pom) product.left list (<xml>.result //pom.parser) - (try#each (value@ /.#repositories)))) + (try#each (the /.#repositories)))) (def: .public equivalence (Equivalence Package) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 26dd35348..ccb7f11ac 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -59,9 +59,9 @@ (def: (artifact value) (-> Artifact (List XML)) - (list (..property ..group_tag (value@ //artifact.#group value)) - (..property ..artifact_tag (value@ //artifact.#name value)) - (..property ..version_tag (value@ //artifact.#version value)))) + (list (..property ..group_tag (the //artifact.#group value)) + (..property ..artifact_tag (the //artifact.#name value)) + (..property ..version_tag (the //artifact.#version value)))) (def: distribution (-> /.Distribution XML) @@ -86,8 +86,8 @@ (-> Dependency XML) {_.#Node ["" ..dependency_tag] _.attributes - (list#composite (..artifact (value@ //dependency.#artifact value)) - (list (..property "type" (value@ //dependency.#type value))))}) + (list#composite (..artifact (the //dependency.#artifact value)) + (list (..property "type" (the //dependency.#type value))))}) (def: (group tag) (-> Text (-> (List XML) XML)) @@ -129,27 +129,27 @@ (def: (info value) (-> /.Info (List XML)) ($_ list#composite - (|> value (value@ /.#url) (maybe#each (..property ..url_tag)) maybe.list) - (|> value (value@ /.#description) (maybe#each (..property "description")) maybe.list) - (|> value (value@ /.#licenses) (list#each ..license) (..group "licenses") list) - (|> value (value@ /.#scm) (maybe#each ..scm) maybe.list) - (|> value (value@ /.#organization) (maybe#each ..organization) maybe.list) - (|> value (value@ /.#developers) (list#each ..developer) (..group "developers") list) - (|> value (value@ /.#contributors) (list#each ..contributor) (..group "contributors") list) + (|> value (the /.#url) (maybe#each (..property ..url_tag)) maybe.list) + (|> value (the /.#description) (maybe#each (..property "description")) maybe.list) + (|> value (the /.#licenses) (list#each ..license) (..group "licenses") list) + (|> value (the /.#scm) (maybe#each ..scm) maybe.list) + (|> value (the /.#organization) (maybe#each ..organization) maybe.list) + (|> value (the /.#developers) (list#each ..developer) (..group "developers") list) + (|> value (the /.#contributors) (list#each ..contributor) (..group "contributors") list) )) ) (def: .public (write value) (-> /.Profile (Try XML)) - (case (value@ /.#identity value) + (case (the /.#identity value) {.#Some identity} {try.#Success {_.#Node ["" ..project_tag] _.attributes ($_ list#composite (list ..version) (..artifact identity) - (|> value (value@ /.#repositories) set.list (list#each ..repository) (..group "repositories") list) - (|> value (value@ /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list) + (|> value (the /.#repositories) set.list (list#each ..repository) (..group "repositories") list) + (|> value (the /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list) )}} _ @@ -226,7 +226,7 @@ (<>.else (list))) _ (<>.some <xml>.any)] (in (|> (# /.monoid identity) - (revised@ /.#dependencies (function (_ empty) - (list#mix set.has empty dependencies))) - (revised@ /.#repositories (function (_ empty) - (list#mix set.has empty repositories))))))))) + (revised /.#dependencies (function (_ empty) + (list#mix set.has empty dependencies))) + (revised /.#repositories (function (_ empty) + (list#mix set.has empty repositories))))))))) diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 43887caa4..048aabf27 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -247,26 +247,26 @@ (def: (composite override baseline) (template.let [(!runtime <tag> <runtime>) - [(if (runtime#= <runtime> (value@ <tag> override)) - (value@ <tag> baseline) - (value@ <tag> override))]] - [#parents (list#composite (value@ #parents baseline) (value@ #parents override)) - #identity (maybe#composite (value@ #identity override) (value@ #identity baseline)) - #info (maybe#composite (value@ #info override) (value@ #info baseline)) - #repositories (set.union (value@ #repositories baseline) (value@ #repositories override)) - #dependencies (set.union (value@ #dependencies baseline) (value@ #dependencies override)) - #lux (if (dependency#= ..default_compiler (value@ #lux override)) - (value@ #lux baseline) - (value@ #lux override)) - #compilers (list#composite (value@ #compilers baseline) (value@ #compilers override)) - #sources (set.union (value@ #sources baseline) (value@ #sources override)) - #target (if (text#= ..default_target (value@ #target baseline)) - (value@ #target override) - (value@ #target baseline)) - #program (maybe#composite (value@ #program override) (value@ #program baseline)) - #test (maybe#composite (value@ #test override) (value@ #test baseline)) - #deploy_repositories (dictionary.merged (value@ #deploy_repositories override) (value@ #deploy_repositories baseline)) - #configuration (plist#composite (value@ #configuration override) (value@ #configuration baseline)) + [(if (runtime#= <runtime> (the <tag> override)) + (the <tag> baseline) + (the <tag> override))]] + [#parents (list#composite (the #parents baseline) (the #parents override)) + #identity (maybe#composite (the #identity override) (the #identity baseline)) + #info (maybe#composite (the #info override) (the #info baseline)) + #repositories (set.union (the #repositories baseline) (the #repositories override)) + #dependencies (set.union (the #dependencies baseline) (the #dependencies override)) + #lux (if (dependency#= ..default_compiler (the #lux override)) + (the #lux baseline) + (the #lux override)) + #compilers (list#composite (the #compilers baseline) (the #compilers override)) + #sources (set.union (the #sources baseline) (the #sources override)) + #target (if (text#= ..default_target (the #target baseline)) + (the #target override) + (the #target baseline)) + #program (maybe#composite (the #program override) (the #program baseline)) + #test (maybe#composite (the #test override) (the #test baseline)) + #deploy_repositories (dictionary.merged (the #deploy_repositories override) (the #deploy_repositories baseline)) + #configuration (plist#composite (the #configuration override) (the #configuration baseline)) #java (!runtime #java runtime.default_java) #js (!runtime #js runtime.default_js) #python (!runtime #python runtime.default_python) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index e576797b4..9741cc731 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -1,22 +1,22 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}] - [monoid {"+" Monoid}] - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}]] - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" dictionary {"+" Dictionary}] - ["[0]" set {"+" Set}] - ["[0]" list ("[1]#[0]" mix)]]]]] - ["[0]" // "_" - ["[1]" profile {"+" Name Profile}]]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}] + [monoid {"+" Monoid}] + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}]] + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" dictionary {"+" Dictionary}] + ["[0]" set {"+" Set}] + ["[0]" list ("[1]#[0]" mix)]]]]] + ["[0]" // "_" + ["[1]" profile {"+" Name Profile}]]) (def: .public file "project.lux") @@ -56,17 +56,17 @@ (case (dictionary.value name project) {.#Some profile} (case (list.example (set.member? lineage) - (value@ //.#parents profile)) + (the //.#parents profile)) {.#Some ouroboros} (exception.except ..circular_dependency [ouroboros name]) {.#None} (do [! try.monad] [parents (monad.each ! (profile' (set.has name lineage) project) - (value@ //.#parents profile))] + (the //.#parents profile))] (in (list#mix (function (_ parent child) (# //.monoid composite child parent)) - (with@ //.#parents (list) profile) + (has //.#parents (list) profile) parents)))) {.#None} diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index 7f1a735b8..6252d75f2 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -68,11 +68,11 @@ http))] (case status (^ (static http/status.ok)) - (# ! each product.right ((value@ @http.#body message) {.#None})) + (# ! each product.right ((the @http.#body message) {.#None})) _ (do ! - [_ ((value@ @http.#body message) {.#Some 0})] + [_ ((the @http.#body message) {.#Some 0})] (# io.monad in (exception.except ..download_failure [(format address uri) status])))))) (def: (upload uri content) @@ -88,7 +88,7 @@ ..base_headers))) {.#Some content} http)) - _ ((value@ @http.#body message) {.#Some 0})] + _ ((the @http.#body message) {.#Some 0})] (case status (^ (static http/status.created)) (in []) diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux index 3e972edcb..78b17c8ea 100644 --- a/stdlib/source/program/aedifex/runtime.lux +++ b/stdlib/source/program/aedifex/runtime.lux @@ -1,18 +1,18 @@ (.using - [library - [lux {"-" for} - [abstract - [equivalence {"+" Equivalence}]] - [data - ["[0]" product] - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" monoid)]]] - [macro - ["[0]" template]] - [world - ["[0]" file]]]]) + [library + [lux {"-" for} + [abstract + [equivalence {"+" Equivalence}]] + [data + ["[0]" product] + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" monoid)]]] + [macro + ["[0]" template]] + [world + ["[0]" file]]]]) (type: .public Runtime (Record @@ -41,7 +41,7 @@ (def: .public (for runtime path) (-> Runtime file.Path Runtime) - (revised@ #parameters - (function (_ parameters) - (list#composite parameters (list path))) - runtime)) + (revised #parameters + (function (_ parameters) + (list#composite parameters (list path))) + runtime)) diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 082ad0db9..69bae4f82 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -156,7 +156,7 @@ ..timed (do (try.with async.monad) [.let [[compilation_host_dependencies compilation_libraries compilation_compilers compilation_sources compilation_target compilation_module compilation_configuration] compilation] - import (import.import (value@ platform.#&file_system platform) compilation_libraries) + import (import.import (the platform.#&file_system platform) compilation_libraries) [state archive phase_wrapper] (:sharing [<parameters>] (Platform <parameters>) platform @@ -172,8 +172,8 @@ (Async (Try [Archive (directive.State+ <parameters>)])) (:expected (platform.compile lux_compiler phase_wrapper import file_context expander platform compilation [archive state]))) - _ (cache.cache! (value@ platform.#&file_system platform) file_context archive) - host_dependencies (..load_host_dependencies (value@ platform.#&file_system platform) compilation_host_dependencies) + _ (cache.cache! (the platform.#&file_system platform) file_context archive) + host_dependencies (..load_host_dependencies (the platform.#&file_system platform) compilation_host_dependencies) _ (..package! (for [@.old (file.async file.default) @.jvm (file.async file.default) ... TODO: Handle this in a safer manner. @@ -188,7 +188,7 @@ {cli.#Export export} (<| (or_crash! "Export failed:") (do (try.with async.monad) - [_ (export.export (value@ platform.#&file_system platform) + [_ (export.export (the platform.#&file_system platform) export)] (in (debug.log! "Export complete!")))) |