From 2dbbaaec93a53f8dd0b96a0028b9cf125c9066cd Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 12 Sep 2021 15:39:55 -0400 Subject: Re-named \ => # && \\ => ## --- stdlib/source/program/aedifex/artifact.lux | 18 ++++---- .../source/program/aedifex/artifact/time/date.lux | 4 +- .../source/program/aedifex/artifact/versioning.lux | 4 +- stdlib/source/program/aedifex/cli.lux | 2 +- stdlib/source/program/aedifex/command/auto.lux | 14 +++---- stdlib/source/program/aedifex/command/build.lux | 48 +++++++++++----------- stdlib/source/program/aedifex/command/clean.lux | 18 ++++---- stdlib/source/program/aedifex/command/deploy.lux | 10 ++--- stdlib/source/program/aedifex/command/deps.lux | 12 +++--- stdlib/source/program/aedifex/command/install.lux | 6 +-- stdlib/source/program/aedifex/command/pom.lux | 12 +++--- stdlib/source/program/aedifex/command/test.lux | 10 ++--- stdlib/source/program/aedifex/dependency.lux | 12 +++--- .../program/aedifex/dependency/deployment.lux | 16 ++++---- .../program/aedifex/dependency/resolution.lux | 40 +++++++++--------- stdlib/source/program/aedifex/format.lux | 22 +++++----- stdlib/source/program/aedifex/hash.lux | 8 ++-- stdlib/source/program/aedifex/input.lux | 6 +-- .../source/program/aedifex/metadata/artifact.lux | 16 ++++---- .../source/program/aedifex/metadata/snapshot.lux | 16 ++++---- stdlib/source/program/aedifex/package.lux | 8 ++-- stdlib/source/program/aedifex/parser.lux | 22 +++++----- stdlib/source/program/aedifex/pom.lux | 40 +++++++++--------- stdlib/source/program/aedifex/profile.lux | 26 ++++++------ stdlib/source/program/aedifex/project.lux | 8 ++-- stdlib/source/program/aedifex/repository.lux | 12 +++--- .../source/program/aedifex/repository/identity.lux | 2 +- stdlib/source/program/aedifex/repository/local.lux | 16 ++++---- .../source/program/aedifex/repository/remote.lux | 6 +-- stdlib/source/program/aedifex/runtime.lux | 4 +- 30 files changed, 219 insertions(+), 219 deletions(-) (limited to 'stdlib/source/program/aedifex') diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index 8e5ee0429..e6e7bf949 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -7,10 +7,10 @@ [hash {"+" [Hash]}]] [data ["[0]" product] - ["[0]" text ("[1]\[0]" order) + ["[0]" text ("[1]#[0]" order) ["%" format {"+" [Format]}]] [collection - ["[0]" list ("[1]\[0]" monoid)]]] + ["[0]" list ("[1]#[0]" monoid)]]] [world ["[0]" file {"+" [Path]}] [net @@ -41,7 +41,7 @@ (def: .public equivalence (Equivalence Artifact) - (\ ..hash &equivalence)) + (# ..hash &equivalence)) (implementation: .public order (Order Artifact) @@ -50,17 +50,17 @@ ..equivalence) (def: (< reference subject) - (<| (or (text\< (value@ #group reference) + (<| (or (text#< (value@ #group reference) (value@ #group subject))) - (and (text\= (value@ #group reference) + (and (text#= (value@ #group reference) (value@ #group subject))) - (or (text\< (value@ #name reference) + (or (text#< (value@ #name reference) (value@ #name subject))) - (and (text\= (value@ #name reference) + (and (text#= (value@ #name reference) (value@ #name subject))) - (text\< (value@ #version reference) + (text#< (value@ #version reference) (value@ #version subject))))) (template [ ] @@ -102,7 +102,7 @@ (def: .public (local artifact) (-> Artifact (List Text)) - (list\composite (|> artifact + (list#composite (|> artifact (value@ #group) (text.all_split_by ..group_separator)) (list (value@ #name artifact) diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux index 3eeda23f0..464c597c2 100644 --- a/stdlib/source/program/aedifex/artifact/time/date.lux +++ b/stdlib/source/program/aedifex/artifact/time/date.lux @@ -17,7 +17,7 @@ ["n" nat] ["i" int]]] [time - ["[0]" date ("[1]\[0]" equivalence)] + ["[0]" date ("[1]#[0]" equivalence)] ["[0]" year] ["[0]" month]] [type @@ -61,7 +61,7 @@ (Equivalence Date) (def: (= reference subject) - (date\= (:representation reference) + (date#= (:representation reference) (:representation subject)))) (def: .public (format value) diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux index dbac91543..1e8d2cf04 100644 --- a/stdlib/source/program/aedifex/artifact/versioning.lux +++ b/stdlib/source/program/aedifex/artifact/versioning.lux @@ -16,7 +16,7 @@ [format ["[0]" xml {"+" [XML]}]] [collection - ["[0]" list ("[1]\[0]" functor)]]] + ["[0]" list ("[1]#[0]" functor)]]] [math [number ["n" nat]]] @@ -67,7 +67,7 @@ (list (//snapshot.format snapshot) (..last_updated_format last_updated) (|> versions - (list\each //snapshot/version.format) + (list#each //snapshot/version.format) {xml.#Node .. xml.attributes})))) (def: (text tag) diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux index bf02c76cd..9bc36f4c5 100644 --- a/stdlib/source/program/aedifex/cli.lux +++ b/stdlib/source/program/aedifex/cli.lux @@ -98,6 +98,6 @@ [head cli.any [tail command] command] (in [{.#Item head tail} command]))) - (\ <>.monad each (|>> [(list /.default)]) + (# <>.monad each (|>> [(list /.default)]) ..command') )))) diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index 2160398eb..863251305 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -29,11 +29,11 @@ (-> (file.System Async) file.Path (Async (List file.Path))) (let [! async.monad] (|> path - (\ fs sub_directories) - (\ ! each (|>> (try.else (list)) + (# fs sub_directories) + (# ! each (|>> (try.else (list)) (monad.each ! (targets fs)))) - (\ ! conjoint) - (\ ! each (|>> list.together (list& path)))))) + (# ! conjoint) + (# ! each (|>> list.together (list& path)))))) (def: .public delay Nat @@ -56,14 +56,14 @@ (value@ ///.#sources) set.list (monad.each ! (..targets fs)) - (\ ! each list.together))] + (# ! each list.together))] (do [! ///action.monad] - [_ (monad.each ! (\ watcher start watch.modification) targets) + [_ (monad.each ! (# watcher start watch.modification) targets) _ ] (loop [_ []] (do ! [_ (..pause delay) - events (\ watcher poll [])] + events (# watcher poll [])] (case events {.#Item _} (do ! diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index c16f7c9ef..d20b00479 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -10,13 +10,13 @@ ["[0]" exception {"+" [exception:]}] ["[0]" io {"+" [IO]}] [concurrency - ["[0]" async {"+" [Async]} ("[1]\[0]" monad)]]] + ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]] [data ["[0]" product] - ["[0]" text ("[1]\[0]" order) + ["[0]" text ("[1]#[0]" order) ["%" format {"+" [format]}]] [collection - ["[0]" list ("[1]\[0]" functor mix)] + ["[0]" list ("[1]#[0]" functor mix)] ["[0]" dictionary {"+" [Dictionary]}] ["[0]" set]]] [math @@ -49,8 +49,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 (value@ [///dependency.#artifact ///artifact.#group] dependency)) + (text#= name (value@ [///dependency.#artifact ///artifact.#name] dependency))) {.#Some dependency} {.#None}))))) @@ -111,7 +111,7 @@ (def: (path fs home dependency) (All (_ !) (-> (file.System !) Path Dependency Path)) - (let [/ (\ fs separator) + (let [/ (# fs separator) artifact (value@ ///dependency.#artifact dependency)] (|> artifact (///local.uri (value@ ///artifact.#version artifact)) @@ -123,8 +123,8 @@ (All (_ !) (-> (file.System !) Path Resolution (List Path))) (|>> dictionary.keys (list.only (|>> (value@ ///dependency.#type) - (text\= ///artifact/type.lux_library))) - (list\each (..path fs home)))) + (text#= ///artifact/type.lux_library))) + (list#each (..path fs home)))) (def: version_separator ".") @@ -140,10 +140,10 @@ right (text.all_split_by ..version_separator right)] (case [left right] [{.#Item leftH leftT} {.#Item rightH rightT}] - (if (text\= leftH rightH) + (if (text#= leftH rightH) (recur leftT rightT) (or (n.< (text.size leftH) (text.size rightH)) - (text\< leftH rightH))) + (text#< leftH rightH))) [{.#Item leftH leftT} {.#End}] false @@ -158,16 +158,16 @@ (All (_ !) (-> (file.System !) Path Resolution (List Path))) (|>> dictionary.keys (list.only (|>> (value@ ///dependency.#type) - (text\= ///artifact/type.lux_library) + (text#= ///artifact/type.lux_library) not)) - (list\mix (function (_ dependency uniques) + (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)] (case (dictionary.value identity uniques) {.#Some [current_version current_path]} - (if (\ version_order < version current_version) + (if (# version_order < version current_version) (dictionary.has identity [version dependency] uniques) uniques) @@ -176,7 +176,7 @@ (: (Dictionary [Group Name] [Version Dependency]) (dictionary.empty (product.hash text.hash text.hash)))) dictionary.values - (list\each (|>> product.right (..path fs home))))) + (list#each (|>> product.right (..path fs home))))) (def: (singular name) (-> Text Text (List Text)) @@ -184,7 +184,7 @@ (def: (plural name) (-> Text (List Text) (List Text)) - (|>> (list\each (|>> (list name))) list.together)) + (|>> (list#each (|>> (list name))) list.together)) (def: .public start "[BUILD STARTED]") (def: .public success "[BUILD ENDED]") @@ -200,7 +200,7 @@ (let [[read! write!] (: [(Async (Try Any)) (async.Resolver (Try Any))] (async.async [])) - _ (|> (\ process []) + _ (|> (# process []) (async.upon! (function (recur ?line) (case ?line {try.#Failure error} @@ -216,7 +216,7 @@ {try.#Success _} (async.upon! recur - (\ process [])))) + (# process [])))) (console.write_line line console))))) io.run!)] read!))] @@ -265,15 +265,15 @@ (let [target (value@ ///.#target profile)] (case (value@ ///.#program profile) {.#None} - (async\in (exception.except ..no_specified_program [])) + (async#in (exception.except ..no_specified_program [])) {.#Some program_module} (do async.monad [environment (program.environment async.monad program) - .let [home (\ program home) - working_directory (\ program directory)]] + .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} @@ -292,7 +292,7 @@ [#Python ///.#java "program.py"] [#Lua ///.#java "program.lua"] [#Ruby ///.#java "program.rb"])) - / (\ fs separator) + / (# fs separator) cache_directory (format working_directory / target)] _ (console.write_line ..start console) .let [full_parameters (list.together (list compiler_params @@ -302,13 +302,13 @@ (..plural "--source" (set.list (value@ ///.#sources profile))) (..singular "--target" cache_directory) (..singular "--module" program_module)))] - process (\ shell execute [environment + process (# shell execute [environment working_directory command full_parameters]) _ (..log_output! console process) _ (..log_error! console process) - exit (\ process await []) + exit (# process await []) _ (console.write_line (if (i.= shell.normal exit) ..success ..failure) diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux index d175ae291..bbdec8763 100644 --- a/stdlib/source/program/aedifex/command/clean.lux +++ b/stdlib/source/program/aedifex/command/clean.lux @@ -22,9 +22,9 @@ (-> (file.System Async) Path (Async (Try Any))) (let [! ///action.monad] (|> root - (\ fs directory_files) - (\ ! each (monad.each ! (\ fs delete))) - (\ ! conjoint)))) + (# fs directory_files) + (# ! each (monad.each ! (# fs delete))) + (# ! conjoint)))) (def: .public success (-> ///.Target Text) @@ -34,16 +34,16 @@ (-> (Console Async) (file.System Async) (Command Any)) (do [! async.monad] [.let [target (value@ ///.#target profile)] - ? (\ fs directory? target) + ? (# fs directory? target) _ (let [! ///action.monad] (if ? (loop [root target] (do ! [_ (..clean_files! fs root) _ (|> root - (\ fs sub_directories) - (\ ! each (monad.each ! recur)) - (\ ! conjoint))] - (\ fs delete root))) - (\ ! in [])))] + (# fs sub_directories) + (# ! each (monad.each ! recur)) + (# ! conjoint))] + (# fs delete root))) + (# ! in [])))] (console.write_line (..success target) console))) diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux index 7210e9a30..d6d783113 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -7,7 +7,7 @@ [pipe {"+" [do>]}] ["[0]" try {"+" [Try]}] [concurrency - ["[0]" async {"+" [Async]} ("[1]\[0]" monad)]] + ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]] ["<>" parser ["<[0]>" xml]]] [data @@ -63,14 +63,14 @@ (value@ /.#sources) set.list (export.library fs) - (\ ! each (binary.result tar.writer))) - pom (\ async.monad in (///pom.write profile)) + (# ! each (binary.result tar.writer))) + pom (# async.monad in (///pom.write profile)) _ (///dependency/deployment.one repository [artifact ///artifact/type.lux_library] (let [pom_data (|> pom - (\ xml.codec encoded) - (\ utf8.codec encoded))] + (# xml.codec encoded) + (# utf8.codec encoded))] [///package.#origin {///repository/origin.#Remote ""} ///package.#library [library (///dependency/status.verified library)] diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index ed636efeb..50df346db 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -10,7 +10,7 @@ [data [collection ["[0]" set {"+" [Set]}] - ["[0]" list ("[1]\[0]" mix)] + ["[0]" list ("[1]#[0]" mix)] ["[0]" dictionary]] [text ["%" format]]] @@ -55,23 +55,23 @@ cache)] (do ///action.monad [cached (|> (dictionary.keys cache) - (list\mix dictionary.lacks resolution) + (list#mix dictionary.lacks resolution) (///dependency/deployment.all local)) _ (console.write_line (exception.report ["Local successes" (|> local_successes - (list.sorted (\ ///dependency.order <)) + (list.sorted (# ///dependency.order <)) (exception.listing ..format))] ["Local failures" (|> local_failures - (list.sorted (\ ///dependency.order <)) + (list.sorted (# ///dependency.order <)) (exception.listing ..format))] ["Remote successes" (|> remote_successes (set.of_list ///dependency.hash) (set.difference (set.of_list ///dependency.hash local_successes)) set.list - (list.sorted (\ ///dependency.order <)) + (list.sorted (# ///dependency.order <)) (exception.listing ..format))] ["Remote failures" (|> remote_failures - (list.sorted (\ ///dependency.order <)) + (list.sorted (# ///dependency.order <)) (exception.listing ..format))]) console)] (in resolution)))) diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index 4b413faa5..d89773504 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -60,12 +60,12 @@ (export.library fs)) pom (|> profile ///pom.write - (\ async.monad in)) + (# async.monad in)) _ (///dependency/deployment.one repository [identity ///artifact/type.lux_library] (let [pom_data (|> pom - (\ xml.codec encoded) - (\ utf8.codec encoded))] + (# xml.codec encoded) + (# utf8.codec encoded))] [///package.#origin {///origin.#Local ""} ///package.#library (let [library (binary.result tar.writer package)] [library (///dependency/status.verified library)]) diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux index b176232aa..f4eee1c2b 100644 --- a/stdlib/source/program/aedifex/command/pom.lux +++ b/stdlib/source/program/aedifex/command/pom.lux @@ -4,9 +4,9 @@ [abstract [monad {"+" [do]}]] [control - ["[0]" try ("[1]\[0]" functor)] + ["[0]" try ("[1]#[0]" functor)] [concurrency - ["[0]" async {"+" [Async]} ("[1]\[0]" monad)]]] + ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]] [data [text ["%" format {"+" [format]}] @@ -29,8 +29,8 @@ (-> (Console Async) (file.System Async) (Command Any)) (do ///action.monad [content (|> (///pom.write profile) - (try\each (|>> (\ xml.codec encoded) - (\ utf8.codec encoded))) - async\in) - _ (\ fs write content ///pom.file)] + (try#each (|>> (# xml.codec encoded) + (# utf8.codec encoded))) + async#in) + _ (# fs write content ///pom.file)] (console.write_line ..success console))) diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux index 04f4e8e27..d017dd228 100644 --- a/stdlib/source/program/aedifex/command/test.lux +++ b/stdlib/source/program/aedifex/command/test.lux @@ -5,7 +5,7 @@ [monad {"+" [do]}]] [control [concurrency - ["[0]" async {"+" [Async]} ("[1]\[0]" monad)]]] + ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]] [math [number ["i" int]]] @@ -32,9 +32,9 @@ (-> (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 (with@ ///.#program (value@ ///.#test profile) profile))] (if (i.= shell.normal build_exit) @@ -55,13 +55,13 @@ [//build.#Python ///.#python] [//build.#Lua ///.#lua] [//build.#Ruby ///.#ruby]))] - process (\ shell execute [environment + process (# shell execute [environment working_directory test_command test_parameters]) _ (//build.log_output! console process) _ (//build.log_error! console process) - exit (\ process await []) + exit (# process await []) _ (console.write_line (if (i.= shell.normal exit) ..success ..failure) diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index d2f299b1d..451accd25 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -7,10 +7,10 @@ [hash {"+" [Hash]}]] [data ["[0]" product] - ["[0]" text ("[1]\[0]" order) + ["[0]" text ("[1]#[0]" order) ["%" format {"+" [format]}]]]]] ["[0]" // "_" - ["[1]" artifact {"+" [Artifact]} ("[1]\[0]" order) + ["[1]" artifact {"+" [Artifact]} ("[1]#[0]" order) [type {"+" [Type]}]]]) (type: .public Dependency @@ -27,7 +27,7 @@ (def: .public equivalence (Equivalence Dependency) - (\ hash &equivalence)) + (# hash &equivalence)) (implementation: .public order (Order Dependency) @@ -36,10 +36,10 @@ ..equivalence) (def: (< reference subject) - (<| (or (//\< (value@ #artifact reference) + (<| (or (//#< (value@ #artifact reference) (value@ #artifact subject))) - (and (//\= (value@ #artifact reference) + (and (//#= (value@ #artifact reference) (value@ #artifact subject))) - (text\< (value@ #type reference) + (text#< (value@ #type reference) (value@ #type subject))))) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 60fcd57d1..843b24917 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -18,7 +18,7 @@ [collection ["[0]" dictionary] ["[0]" set {"+" [Set]}] - ["[0]" list ("[1]\[0]" monoid)]]] + ["[0]" list ("[1]#[0]" monoid)]]] [time ["[0]" instant {"+" [Instant]}]]]] ["[0]" /// "_" @@ -47,11 +47,11 @@ deploy_hash (: (All (_ h) (-> (Codec Text (Hash h)) Extension (Hash h) (Async (Try Any)))) (function (_ codec extension hash) (|> hash - (\ codec encoded) - (\ utf8.codec encoded) - (\ repository upload (format artifact extension)))))] + (# codec encoded) + (# utf8.codec encoded) + (# repository upload (format artifact extension)))))] (do [! (try.with async.monad)] - [_ (\ repository upload artifact data)] + [_ (# repository upload artifact data)] (case status {///dependency/status.#Unverified} (in []) @@ -111,7 +111,7 @@ ///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))) + ... (list#composite (..artifacts type (product.right (value@ ///package.#library package))) ... (..artifacts ///artifact/type.pom (product.right (value@ ///package.#pom package))))) )))) @@ -131,7 +131,7 @@ status])) snapshot (///metadata/snapshot.read repository artifact) - snapshot (\ ! in (..update_snapshot [artifact type] now snapshot)) + snapshot (# ! in (..update_snapshot [artifact type] now snapshot)) _ (///metadata/snapshot.write repository artifact snapshot) project (///metadata/artifact.read repository artifact) _ (|> project @@ -146,4 +146,4 @@ (|> (dictionary.entries resolution) (monad.each ! (function (_ [dependency package]) (..one repository dependency package))) - (\ ! each (set.of_list ///artifact.hash))))) + (# ! each (set.of_list ///artifact.hash))))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 12848cb58..c5cdce6b8 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -11,7 +11,7 @@ ["[0]" predicate {"+" [Predicate]}]] [control ["[0]" maybe] - ["[0]" try {"+" [Try]} ("[1]\[0]" functor)] + ["[0]" try {"+" [Try]} ("[1]#[0]" functor)] ["[0]" exception {"+" [Exception exception:]}] ["<>" parser ["<[0]>" xml {"+" [Parser]}]] @@ -29,7 +29,7 @@ [collection ["[0]" dictionary {"+" [Dictionary]}] ["[0]" set] - ["[0]" list ("[1]\[0]" functor monoid)]]] + ["[0]" list ("[1]#[0]" functor monoid)]]] [math [number ["n" nat] @@ -83,22 +83,22 @@ (Exception [Artifact Extension Text]) (Async (Try (Maybe (Hash h)))))) (do async.monad - [?actual (\ repository download (///repository/remote.uri version_template artifact extension))] + [?actual (# repository download (///repository/remote.uri version_template artifact extension))] (case ?actual {try.#Success actual} (in (do [! try.monad] - [output (\ ! each (for [@.old (|>> (:as java/lang/String) + [output (# ! each (for [@.old (|>> (:as java/lang/String) java/lang/String::trim (:as Text)) @.jvm (|>> java/lang/String::trim)]) - (\ utf8.codec decoded actual)) + (# utf8.codec decoded actual)) actual (|> output (text.all_split_by " ") list.head (maybe.else output) - (\ codec decoded)) + (# codec decoded)) _ (exception.assertion exception [artifact extension output] - (\ ///hash.equivalence = (hash library) actual))] + (# ///hash.equivalence = (hash library) actual))] (in {.#Some actual}))) {try.#Failure error} @@ -107,7 +107,7 @@ (def: (hashed repository version_template artifact extension) (-> (Repository Async) Version Artifact Extension (Async (Try [Binary Status]))) (do (try.with async.monad) - [data (\ repository download (///repository/remote.uri version_template artifact extension)) + [data (# repository download (///repository/remote.uri version_template artifact extension)) ?sha-1 (..verified_hash data repository version_template artifact (format extension ///artifact/extension.sha-1) ///hash.sha-1 ///hash.sha-1_codec ..sha-1_does_not_match) @@ -139,10 +139,10 @@ artifact (with@ ///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 + (# async.monad in (do try.monad - [pom (\ utf8.codec decoded pom_data) - pom (\ xml.codec decoded pom) + [pom (# utf8.codec decoded pom_data) + pom (# xml.codec decoded pom) profile (.result ///pom.parser (list pom))] (in [///package.#origin {///repository/origin.#Remote ""} ///package.#library library_&_status @@ -167,11 +167,11 @@ (template [ ] [(def: ( console repository artifact) (-> (Console Async) (Repository Async) Artifact (Async (Try Any))) - (\ console write (format "[" "]" + (# console write (format "[" "]" " " " " (///artifact.format artifact) " " - " " (%.text (\ repository description)) + " " (%.text (# repository description)) text.new_line)))] ["?" announce_fetching "Fetching" "from"] @@ -185,7 +185,7 @@ {.#End} (|> dependency (exception.except ..cannot_resolve) - (\ async.monad in)) + (# async.monad in)) {.#Item repository alternatives} (do [! async.monad] @@ -214,7 +214,7 @@ resolution resolution] (case dependencies {.#End} - (\ async.monad in + (# async.monad in [successes failures resolution]) {.#Item head tail} @@ -236,20 +236,20 @@ {try.#Success package} (do ! [.let [redundant? (: (Predicate Dependency) - (predicate.or (\ //.equivalence = head) + (predicate.or (# //.equivalence = head) (dictionary.key? resolution))) sub_dependencies (|> package ///package.dependencies - (try\each (|>> set.list + (try#each (|>> set.list (list.only (|>> redundant? not)))) (try.else (list))) ... For security reasons, it's not a good idea to allow dependencies to introduce repositories. ... package_repositories (|> package ... ///package.repositories - ... (try\each set.list) + ... (try#each set.list) ... (try.else (list)) - ... (list\each new_repository)) - ... sub_repositories (list\composite repositories package_repositories) + ... (list#each new_repository)) + ... sub_repositories (list#composite repositories package_repositories) ]] (recur repositories {.#Item head successes} diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index 95b4bf30a..31471fa83 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -2,10 +2,10 @@ [library [lux "*" [data - ["[0]" text ("[1]\[0]" equivalence)] + ["[0]" text ("[1]#[0]" equivalence)] [collection ["[0]" dictionary {"+" [Dictionary]}] - ["[0]" list ("[1]\[0]" monad)] + ["[0]" list ("[1]#[0]" monad)] ["[0]" set {"+" [Set]}]]] [macro ["[0]" code] @@ -59,9 +59,9 @@ (def: aggregate (Format Aggregate) (|>> dictionary.entries - (list\each (function (_ [key value]) + (list#each (function (_ [key value]) (list (code.text key) value))) - list\conjoint + list#conjoint code.tuple)) (def: empty @@ -86,7 +86,7 @@ aggregate value - (dictionary.has field (` [(~+ (list\each format value))]) aggregate))) + (dictionary.has field (` [(~+ (list#each format value))]) aggregate))) (def: (on_set field value format aggregate) (All (_ a) @@ -101,9 +101,9 @@ (dictionary.has field (|> value dictionary.entries - (list\each (function (_ [key value]) + (list#each (function (_ [key value]) (list (key_format key) (value_format value)))) - list\conjoint + list#conjoint code.tuple) aggregate))) @@ -131,7 +131,7 @@ (def: (dependency [artifact type]) (Format Dependency) - (if (text\= //artifact/type.lux_library type) + (if (text#= //artifact/type.lux_library type) (` [(~+ (..artifact' artifact))]) (` [(~+ (..artifact' artifact)) (~ (code.text type))]))) @@ -139,7 +139,7 @@ (def: (runtime [program parameters]) (Format Runtime) (` [(~ (code.text program)) - (~+ (list\each code.text parameters))])) + (~+ (list#each code.text parameters))])) (def: (profile value) (Format /.Profile) @@ -168,7 +168,7 @@ (def: .public project (Format Project) (|>> dictionary.entries - (list\each (function (_ [key value]) + (list#each (function (_ [key value]) (list (code.text key) (..profile value)))) - list\conjoint + list#conjoint code.tuple)) diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index 4cbc77515..21b9abeff 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -55,7 +55,7 @@ (def: encoded (Format Binary) (binary.aggregate (function (_ byte representation) - (let [hex (\ n.hex encoded byte) + (let [hex (# n.hex encoded byte) hex (case (text.size hex) 1 (format "0" hex) _ hex)] @@ -127,7 +127,7 @@ (case (text.split_at ..hex_per_chunk input) {.#Some [head tail]} (do try.monad - [head (\ n.hex decoded head) + [head (# n.hex decoded head) output (binary.write/64! index head output)] (recur tail (++ chunk) output)) @@ -137,7 +137,7 @@ (^template [ ] [ (do try.monad - [head (\ n.hex decoded input) + [head (# n.hex decoded input) output ( index head output)] (constructor output))]) ([1 binary.write/8!] @@ -161,7 +161,7 @@ (All (_ h) (Equivalence (Hash h))) (def: (= reference subject) - (\ binary.equivalence = + (# binary.equivalence = (:representation reference) (:representation subject)))) ) diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index 024c4d0b2..9d470f772 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -45,15 +45,15 @@ (def: project_parser (-> Binary (Try Project)) (|>> (do> try.monad - [(\ utf8.codec decoded)] + [(# utf8.codec decoded)] [..lux_parser] [(list) (.result //parser.project)]))) (def: .public (read monad fs profiles) (All (_ !) (-> (Monad !) (file.System !) (List Name) (! (Try Profile)))) (|> //project.file - (\ fs read) - (\ monad each + (# fs read) + (# monad each (function (_ it) (do [! try.monad] [it it diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index ad0477dcc..2bae67087 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -21,7 +21,7 @@ [format ["[0]" xml {"+" [XML]}]] [collection - ["[0]" list ("[1]\[0]" functor)]]] + ["[0]" list ("[1]#[0]" functor)]]] [math [number ["n" nat]]] @@ -94,7 +94,7 @@ (def: versions_format (-> (List Version) XML) - (|>> (list\each ..version_format) {xml.#Node .. xml.attributes})) + (|>> (list#each ..version_format) {xml.#Node .. xml.attributes})) (def: .public (format value) (-> Metadata XML) @@ -176,13 +176,13 @@ (def: .public (read repository artifact) (-> (Repository Async) Artifact (Async (Try Metadata))) (do async.monad - [project (\ repository download (..uri artifact))] + [project (# repository download (..uri artifact))] (case project {try.#Success project} (in (|> project (do> try.monad - [(\ utf8.codec decoded)] - [(\ xml.codec decoded)] + [(# utf8.codec decoded)] + [(# xml.codec decoded)] [list (.result ..parser)]))) {try.#Failure error} @@ -197,6 +197,6 @@ (-> (Repository Async) Artifact Metadata (Async (Try Any))) (|> metadata ..format - (\ xml.codec encoded) - (\ utf8.codec encoded) - (\ repository upload (..uri artifact)))) + (# xml.codec encoded) + (# utf8.codec encoded) + (# repository upload (..uri artifact)))) diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index c840fc870..982d15556 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -22,7 +22,7 @@ [format ["[0]" xml {"+" [XML]}]] [collection - ["[0]" list ("[1]\[0]" functor)]]] + ["[0]" list ("[1]#[0]" functor)]]] [math [number ["n" nat]]] @@ -95,7 +95,7 @@ ///artifact/snapshot/version.#value version ///artifact/snapshot/version.#updated ///artifact/time.epoch]] (|> (.somewhere ///artifact/versioning.parser) - (\ ! each + (# ! each (revised@ ///artifact/versioning.#versions (: (-> (List ///artifact/snapshot/version.Version) (List ///artifact/snapshot/version.Version)) @@ -126,13 +126,13 @@ (def: .public (read repository artifact) (-> (Repository Async) Artifact (Async (Try Metadata))) (do async.monad - [project (\ repository download (..uri artifact))] + [project (# repository download (..uri artifact))] (case project {try.#Success project} (in (|> project (do> try.monad - [(\ utf8.codec decoded)] - [(\ xml.codec decoded)] + [(# utf8.codec decoded)] + [(# xml.codec decoded)] [list (.result ..parser)]))) {try.#Failure error} @@ -144,6 +144,6 @@ (-> (Repository Async) Artifact Metadata (Async (Try Any))) (|> metadata ..format - (\ xml.codec encoded) - (\ utf8.codec encoded) - (\ repository upload (..uri artifact)))) + (# xml.codec encoded) + (# utf8.codec encoded) + (# repository upload (..uri artifact)))) diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index a80ae368d..6a8e89c57 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -4,7 +4,7 @@ [abstract [equivalence {"+" [Equivalence]}]] [control - ["[0]" try {"+" [Try]} ("[1]\[0]" functor)] + ["[0]" try {"+" [Try]} ("[1]#[0]" functor)] [parser ["<[0]>" xml]]] [data @@ -54,7 +54,7 @@ #library [library {//status.#Verified (//hash.sha-1 library) (//hash.md5 library)}] - #pom (let [binary_pom (|> pom (\ xml.codec encoded) (\ utf8.codec encoded))] + #pom (let [binary_pom (|> pom (# xml.codec encoded) (# utf8.codec encoded))] [pom binary_pom {//status.#Verified (//hash.sha-1 binary_pom) @@ -66,7 +66,7 @@ product.left list (.result //pom.parser) - (try\each (value@ /.#dependencies)))) + (try#each (value@ /.#dependencies)))) (def: .public repositories (-> Package (Try (Set Address))) @@ -74,7 +74,7 @@ product.left list (.result //pom.parser) - (try\each (value@ /.#repositories)))) + (try#each (value@ /.#repositories)))) (def: .public equivalence (Equivalence Package) diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index b42553a8e..80eb1bfea 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -82,7 +82,7 @@ (def: license (Parser /.License) (do [! <>.monad] - [input (\ ! each + [input (# ! each (dictionary.of_list text.hash) (.tuple (<>.some (<>.and .text .any))))] @@ -97,7 +97,7 @@ (def: organization (Parser /.Organization) (do [! <>.monad] - [input (\ ! each + [input (# ! each (dictionary.of_list text.hash) (.tuple (<>.some (<>.and .text .any))))] @@ -108,7 +108,7 @@ (def: developer (Parser /.Developer) (do [! <>.monad] - [input (\ ! each + [input (# ! each (dictionary.of_list text.hash) (.tuple (<>.some (<>.and .text .any))))] @@ -125,7 +125,7 @@ (def: info (Parser /.Info) (do [! <>.monad] - [input (\ ! each + [input (# ! each (dictionary.of_list text.hash) (.tuple (<>.some (<>.and .text .any))))] @@ -181,7 +181,7 @@ (def: profile (Parser /.Profile) (do [! <>.monad] - [input (\ ! each + [input (# ! each (dictionary.of_list text.hash) (.tuple (<>.some (<>.and .text .any)))) @@ -196,19 +196,19 @@ (..singular input "info" ..info))) ^repositories (: (Parser (Set //repository.Address)) (|> (..plural input "repositories" ..repository) - (\ ! each (set.of_list text.hash)) + (# ! each (set.of_list text.hash)) (<>.else (set.empty text.hash)) - (\ ! each (set.has /.default_repository)))) + (# ! each (set.has /.default_repository)))) ^dependencies (: (Parser (Set //dependency.Dependency)) (|> (..plural input "dependencies" ..dependency) - (\ ! each (set.of_list //dependency.hash)) + (# ! each (set.of_list //dependency.hash)) (<>.else (set.empty //dependency.hash)))) ^compiler (|> ..dependency (..singular input "compiler") (<>.else /.default_compiler)) ^sources (: (Parser (Set /.Source)) (|> (..plural input "sources" ..source) - (\ ! each (set.of_list text.hash)) + (# ! each (set.of_list text.hash)) (<>.else (set.of_list text.hash (list /.default_source))))) ^target (: (Parser /.Target) (|> ..target @@ -221,7 +221,7 @@ (<>.maybe (..singular input "test" ..module))) ^deploy_repositories (: (Parser (Dictionary Text //repository.Address)) - (<| (\ ! each (dictionary.of_list text.hash)) + (<| (# ! each (dictionary.of_list text.hash)) (<>.else (list)) (..singular input "deploy_repositories" ..deploy_repository))) ^java (|> ..runtime @@ -260,7 +260,7 @@ (def: .public project (Parser Project) - (\ <>.monad each + (# <>.monad each (dictionary.of_list text.hash) (.tuple (<>.many (<>.and .text ..profile))))) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 932a24207..226de3015 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -5,7 +5,7 @@ [monad {"+" [do]}]] [control [pipe {"+" [case>]}] - ["[0]" maybe ("[1]\[0]" functor)] + ["[0]" maybe ("[1]#[0]" functor)] ["[0]" try {"+" [Try]}] ["[0]" exception] ["<>" parser @@ -16,7 +16,7 @@ [format ["_" xml {"+" [Tag XML]}]] [collection - ["[0]" list ("[1]\[0]" monoid functor mix)] + ["[0]" list ("[1]#[0]" monoid functor mix)] ["[0]" set] ["[0]" dictionary]]] [world @@ -85,7 +85,7 @@ (-> Dependency XML) {_.#Node ["" ..dependency_tag] _.attributes - (list\composite (..artifact (value@ //dependency.#artifact value)) + (list#composite (..artifact (value@ //dependency.#artifact value)) (list (..property "type" (value@ //dependency.#type value))))}) (def: (group tag) @@ -114,7 +114,7 @@ (-> /.Developer (List XML)) (list& (..property "name" name) (..property "email" email) - (|> organization (maybe\each ..developer_organization) (maybe.else (list))))) + (|> organization (maybe#each ..developer_organization) (maybe.else (list))))) (template [ ] [(def: @@ -127,14 +127,14 @@ (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) + ($_ 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) )) ) @@ -144,11 +144,11 @@ {.#Some identity} {try.#Success {_.#Node ["" ..project_tag] _.attributes - ($_ list\composite + ($_ 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 (value@ /.#repositories) set.list (list#each ..repository) (..group "repositories") list) + (|> value (value@ /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list) )}} _ @@ -159,13 +159,13 @@ (do [! <>.monad] [tag .tag] (<| (.node tag) - (\ ! each (|>> [tag])) + (# ! each (|>> [tag])) .text))) (def: (dependency_parser own_version parent_version) (-> Text Text (Parser Dependency)) (do [! <>.monad] - [properties (\ ! each (dictionary.of_list name.hash) + [properties (# ! each (dictionary.of_list name.hash) (<| (.node ["" ..dependency_tag]) (<>.some ..property_parser)))] (<| <>.lifted @@ -224,8 +224,8 @@ .somewhere (<>.else (list))) _ (<>.some .any)] - (in (|> (\ /.monoid identity) + (in (|> (# /.monoid identity) (revised@ /.#dependencies (function (_ empty) - (list\mix set.has empty dependencies))) + (list#mix set.has empty dependencies))) (revised@ /.#repositories (function (_ empty) - (list\mix set.has empty repositories))))))))) + (list#mix set.has empty repositories))))))))) diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 8ef0abbf4..3a81f1271 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -5,14 +5,14 @@ [monoid {"+" [Monoid]}] [equivalence {"+" [Equivalence]}]] [control - ["[0]" maybe ("[1]\[0]" monoid)] + ["[0]" maybe ("[1]#[0]" monoid)] ["[0]" exception {"+" [exception:]}]] [data ["[0]" product] - ["[0]" text ("[1]\[0]" equivalence)] + ["[0]" text ("[1]#[0]" equivalence)] [collection ["[0]" dictionary {"+" [Dictionary]}] - ["[0]" list ("[1]\[0]" monoid)] + ["[0]" list ("[1]#[0]" monoid)] ["[0]" set {"+" [Set]}]]] [macro ["[0]" template]] @@ -25,8 +25,8 @@ [archive [descriptor {"+" [Module]}]]]]]]] [// - ["[0]" runtime {"+" [Runtime]} ("[1]\[0]" equivalence)] - ["[0]" dependency {"+" [Dependency]} ("[1]\[0]" equivalence)] + ["[0]" runtime {"+" [Runtime]} ("[1]#[0]" equivalence)] + ["[0]" dependency {"+" [Dependency]} ("[1]#[0]" equivalence)] ["[0]" artifact {"+" [Artifact]} ["[0]" type]] [repository @@ -233,23 +233,23 @@ (def: (composite override baseline) (template.let [(!runtime ) - [(if (runtime\= (value@ override)) + [(if (runtime#= (value@ override)) (value@ baseline) (value@ 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)) + [#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)) - #compiler (if (dependency\= ..default_compiler (value@ #compiler override)) + #compiler (if (dependency#= ..default_compiler (value@ #compiler override)) (value@ #compiler baseline) (value@ #compiler override)) #sources (set.union (value@ #sources baseline) (value@ #sources override)) - #target (if (text\= ..default_target (value@ #target baseline)) + #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)) + #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)) #java (!runtime #java runtime.default_java) #js (!runtime #js runtime.default_js) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index aedae9c64..01173dba5 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -14,7 +14,7 @@ [collection ["[0]" dictionary {"+" [Dictionary]}] ["[0]" set {"+" [Set]}] - ["[0]" list ("[1]\[0]" mix)]]]]] + ["[0]" list ("[1]#[0]" mix)]]]]] ["[0]" // "_" ["[1]" profile {"+" [Name Profile]}]]) @@ -39,7 +39,7 @@ (dictionary.empty text.hash)) (def: composite - (dictionary.merged_with (\ //.monoid composite)))) + (dictionary.merged_with (# //.monoid composite)))) (exception: .public (unknown_profile [name Name]) (exception.report @@ -64,8 +64,8 @@ (do [! try.monad] [parents (monad.each ! (profile' (set.has name lineage) project) (value@ //.#parents profile))] - (in (list\mix (function (_ parent child) - (\ //.monoid composite child parent)) + (in (list#mix (function (_ parent child) + (# //.monoid composite child parent)) (with@ //.#parents (list) profile) parents)))) diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux index 365195828..8aefc9dc6 100644 --- a/stdlib/source/program/aedifex/repository.lux +++ b/stdlib/source/program/aedifex/repository.lux @@ -28,12 +28,12 @@ (-> (Repository IO) (Repository Async)) (implementation (def: description - (\ repository description)) + (# repository description)) (def: (download uri) - (async.future (\ repository download uri))) + (async.future (# repository download uri))) (def: (upload uri content) - (async.future (\ repository upload uri content))) + (async.future (# repository upload uri content))) )) (type: .public (Mock s) @@ -50,13 +50,13 @@ (let [state (stm.var init)] (implementation (def: description - (\ mock the_description)) + (# mock the_description)) (def: (download uri) (stm.commit! (do [! stm.monad] [|state| (stm.read state)] - (case (\ mock on_download uri |state|) + (case (# mock on_download uri |state|) {try.#Success [|state| output]} (do ! [_ (stm.write |state| state)] @@ -69,7 +69,7 @@ (stm.commit! (do [! stm.monad] [|state| (stm.read state)] - (case (\ mock on_upload uri content |state|) + (case (# mock on_upload uri content |state|) {try.#Success |state|} (do ! [_ (stm.write |state| state)] diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux index abe5e2e1b..39a614880 100644 --- a/stdlib/source/program/aedifex/repository/identity.lux +++ b/stdlib/source/program/aedifex/repository/identity.lux @@ -39,7 +39,7 @@ (def: .public (basic_auth user password) (-> User Password Text) - (let [credentials (\ utf8.codec encoded (format user ":" password))] + (let [credentials (# utf8.codec encoded (format user ":" password))] (|> (java/util/Base64::getEncoder) (java/util/Base64$Encoder::encodeToString credentials) (format "Basic ")))) diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux index e00c5f240..5af09ac99 100644 --- a/stdlib/source/program/aedifex/repository/local.lux +++ b/stdlib/source/program/aedifex/repository/local.lux @@ -24,7 +24,7 @@ (-> (Program Async) Text file.Path) (|> ///local.repository (text.replaced uri.separator /) - (format (\ program home) /))) + (format (# program home) /))) (def: (path /) (-> Text (-> URI file.Path)) @@ -40,16 +40,16 @@ (-> (Program Async) (file.System Async) (//.Repository Async)) (def: description - (..root program (\ fs separator))) + (..root program (# fs separator))) (def: download - (|>> (..absolute_path program (\ fs separator)) - (\ fs read))) + (|>> (..absolute_path program (# fs separator)) + (# fs read))) (def: (upload uri content) (do [! async.monad] - [.let [absolute_path (..absolute_path program (\ fs separator) uri)] - ? (\ fs file? absolute_path) + [.let [absolute_path (..absolute_path program (# fs separator) uri)] + ? (# fs file? absolute_path) _ (if ? (in []) (case (file.parent fs absolute_path) @@ -58,5 +58,5 @@ _ (let [! (try.with async.monad)] - (\ ! in []))))] - (\ fs write content absolute_path)))) + (# ! in []))))] + (# fs write content absolute_path)))) diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index 9f09b0993..d314cfa39 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -69,12 +69,12 @@ http))] (case status (^ (static http/status.ok)) - (\ ! each product.right ((value@ #@http.body message) {.#None})) + (# ! each product.right ((value@ #@http.body message) {.#None})) _ (do ! [_ ((value@ #@http.body message) {.#Some 0})] - (\ io.monad in (exception.except ..download_failure [(format address uri) status])))))) + (# io.monad in (exception.except ..download_failure [(format address uri) status])))))) (def: (upload uri content) (do (try.with io.monad) @@ -95,5 +95,5 @@ (in []) _ - (\ io.monad in (exception.except ..upload_failure [(format address uri) status]))))) + (# io.monad in (exception.except ..upload_failure [(format address uri) status]))))) ) diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux index f600a87f5..6c90e4b73 100644 --- a/stdlib/source/program/aedifex/runtime.lux +++ b/stdlib/source/program/aedifex/runtime.lux @@ -8,7 +8,7 @@ ["[0]" text ["%" format {"+" [format]}]] [collection - ["[0]" list ("[1]\[0]" monoid)]]] + ["[0]" list ("[1]#[0]" monoid)]]] [macro ["[0]" template]] [world @@ -43,5 +43,5 @@ (-> Runtime file.Path Runtime) (revised@ #parameters (function (_ parameters) - (list\composite parameters (list path))) + (list#composite parameters (list path))) runtime)) -- cgit v1.2.3