From f9e33ae96aec4741385a576719786092c9e68043 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sat, 4 Jun 2022 19:34:42 -0400 Subject: De-sigil-ification: # --- stdlib/source/program/aedifex.lux | 14 +++--- stdlib/source/program/aedifex/artifact.lux | 2 +- stdlib/source/program/aedifex/cli.lux | 4 +- stdlib/source/program/aedifex/command/auto.lux | 16 +++--- stdlib/source/program/aedifex/command/build.lux | 24 ++++----- stdlib/source/program/aedifex/command/clean.lux | 18 +++---- .../program/aedifex/command/deploy/release.lux | 36 +++++++------- .../program/aedifex/command/deploy/snapshot.lux | 8 +-- stdlib/source/program/aedifex/command/deps.lux | 8 +-- stdlib/source/program/aedifex/command/install.lux | 6 +-- stdlib/source/program/aedifex/command/pom.lux | 6 +-- stdlib/source/program/aedifex/command/test.lux | 14 +++--- stdlib/source/program/aedifex/dependency.lux | 2 +- .../program/aedifex/dependency/deployment.lux | 12 ++--- .../program/aedifex/dependency/resolution.lux | 48 +++++++++--------- stdlib/source/program/aedifex/hash.lux | 12 ++--- stdlib/source/program/aedifex/input.lux | 18 +++---- .../source/program/aedifex/metadata/artifact.lux | 12 ++--- .../source/program/aedifex/metadata/snapshot.lux | 30 +++++------ stdlib/source/program/aedifex/package.lux | 2 +- stdlib/source/program/aedifex/parser.lux | 58 +++++++++++----------- stdlib/source/program/aedifex/pom.lux | 10 ++-- stdlib/source/program/aedifex/project.lux | 4 +- stdlib/source/program/aedifex/repository.lux | 12 ++--- .../source/program/aedifex/repository/identity.lux | 2 +- stdlib/source/program/aedifex/repository/local.lux | 12 ++--- .../source/program/aedifex/repository/remote.lux | 6 +-- stdlib/source/program/compositor.lux | 14 +++--- 28 files changed, 205 insertions(+), 205 deletions(-) (limited to 'stdlib/source/program') diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index d14e5ba74..1de6b7d30 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -92,7 +92,7 @@ _ (do async.monad - [_ (# program exit exit_code)] + [_ (at program exit exit_code)] (in {try.#Failure ""})))] (in output))) @@ -106,13 +106,13 @@ (def: succeed! (IO Any) - (# program.default exit shell.normal)) + (at program.default exit shell.normal)) (def: (fail! error) (-> Text (IO Any)) (exec (debug.log! error) - (# program.default exit shell.error))) + (at program.default exit shell.error))) (def: (command action) (All (_ a) (-> (Async (Try a)) (IO Any))) @@ -126,7 +126,7 @@ {try.#Failure error} (..fail! error)))) - (# io.monad in []))) + (at io.monad in []))) (exception: .public invalid_operation) @@ -152,12 +152,12 @@ (program: [[profiles operation] /cli.command] (do [! io.monad] - [console (# ! each (|>> (try.else ..write_only) console.async) - console.default)] + [console (at ! each (|>> (try.else ..write_only) console.async) + console.default)] (case operation {/cli.#Version} (..command - (/command/version.do! console (# /.monoid identity))) + (/command/version.do! console (at /.monoid identity))) _ (do ! diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index 247e4a5d0..35c7bddb3 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -41,7 +41,7 @@ (def: .public equivalence (Equivalence Artifact) - (# ..hash equivalence)) + (at ..hash equivalence)) (implementation: .public order (Order Artifact) diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux index 0eabd6b7e..e2c7c92e6 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)]) - ..command') + (at <>.monad each (|>> [(list)]) + ..command') )))) diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index dc922b4c1..07842d32e 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)) - (monad.each ! (targets fs)))) - (# ! conjoint) - (# ! each (|>> list.together (partial_list path)))))) + (at fs sub_directories) + (at ! each (|>> (try.else (list)) + (monad.each ! (targets fs)))) + (at ! conjoint) + (at ! each (|>> list.together (partial_list path)))))) (def: .public delay Nat @@ -56,14 +56,14 @@ (the ///.#sources) set.list (monad.each ! (..targets fs)) - (# ! each list.together))] + (at ! each list.together))] (do [! ///action.monad] - [_ (monad.each ! (# watcher start watch.modification) targets) + [_ (monad.each ! (at watcher start watch.modification) targets) _ ] (loop (again [_ []]) (do ! [_ (..pause delay) - events (# watcher poll [])] + events (at 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 d08f7f7b1..0454a4a60 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -122,7 +122,7 @@ (def: (path fs home dependency) (All (_ !) (-> (file.System !) Path Dependency Path)) - (let [/ (# fs separator) + (let [/ (at fs separator) artifact (the ///dependency.#artifact dependency)] (|> artifact (///local.uri (the ///artifact.#version artifact)) @@ -178,7 +178,7 @@ version (the ///artifact.#version artifact)] (case (dictionary.value identity uniques) {.#Some [current_version current_path]} - (if (# version_order < version current_version) + (if (at version_order < version current_version) (dictionary.has identity [version dependency] uniques) uniques) @@ -212,7 +212,7 @@ (let [[read! write!] (is [(Async (Try Any)) (async.Resolver (Try Any))] (async.async [])) - _ (|> (# process []) + _ (|> (at process []) (async.upon! (function (again ?line) (case ?line {try.#Failure error} @@ -229,7 +229,7 @@ {try.#Success _} (async.upon! again - (# process [])))) + (at process [])))) (is (Async (Try Any)) (console.write_line line console)))))) io.run!)] @@ -287,8 +287,8 @@ {.#Some program_module} (do async.monad [environment (program.environment async.monad program) - .let [home (# program home) - working_directory (# program directory)]] + .let [home (at program home) + working_directory (at program directory)]] (do ///action.monad [[resolution lux] (async#in (..lux resolution (the ///.#lux profile))) .let [host_dependencies (..host_dependencies fs home resolution) @@ -310,7 +310,7 @@ [#Python ///.#java "program.py"] [#Lua ///.#java "program.lua"] [#Ruby ///.#java (file.rooted fs "program" ruby_packager.main_file)])) - / (# fs separator) + / (at fs separator) cache_directory (format working_directory / target)] _ (is (Async (Try Any)) (console.write_line ..start console)) @@ -323,13 +323,13 @@ (..singular "--target" cache_directory) (..singular "--module" program_module) (..singular "--configuration" (configuration.format (the ///.#configuration profile)))))] - process (# shell execute [(dictionary.composite environment command_environment) - working_directory - command - full_parameters]) + process (at shell execute [(dictionary.composite environment command_environment) + working_directory + command + full_parameters]) _ (..log_output! console process) _ (..log_error! console process) - exit (# process await []) + exit (at process await []) _ (is (Async (Try Any)) (console.write_line (if (i.= shell.normal exit) ..success diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux index 3187376e8..7798a2006 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))) (do [! ///action.monad] [_ (|> root - (# fs directory_files) - (# ! each (monad.each ! (# fs delete))) - (# ! conjoint))] + (at fs directory_files) + (at ! each (monad.each ! (at fs delete))) + (at ! conjoint))] (in []))) (def: .public success @@ -35,16 +35,16 @@ (-> (Console Async) (file.System Async) (Command Any)) (do [! async.monad] [.let [target (the ///.#target profile)] - ? (# fs directory? target) + ? (at fs directory? target) _ (let [! ///action.monad] (if ? (loop (again [root target]) (do ! [_ (..clean_files! fs root) _ (|> root - (# fs sub_directories) - (# ! each (monad.each ! again)) - (# ! conjoint))] - (# fs delete root))) - (# ! in [])))] + (at fs sub_directories) + (at ! each (monad.each ! again)) + (at ! conjoint))] + (at fs delete root))) + (at ! in [])))] (console.write_line (..success target) console))) diff --git a/stdlib/source/program/aedifex/command/deploy/release.lux b/stdlib/source/program/aedifex/command/deploy/release.lux index 2f7d1e4d7..b6d93b30b 100644 --- a/stdlib/source/program/aedifex/command/deploy/release.lux +++ b/stdlib/source/program/aedifex/command/deploy/release.lux @@ -70,9 +70,9 @@ (def: windows? (IO (Try Bit)) - (# (try.with io.monad) each - (|>> java/lang/String::toLowerCase ffi.of_string (text.starts_with? "windows")) - (java/lang/System::getProperty (ffi.as_string "os.name")))) + (at (try.with io.monad) each + (|>> java/lang/String::toLowerCase ffi.of_string (text.starts_with? "windows")) + (java/lang/System::getProperty (ffi.as_string "os.name")))) (def: dummy_jar Binary @@ -117,9 +117,9 @@ (-> (Program Async) (Repository Async) (file.System Async) Artifact (Async (Try Any))) (do (try.with async.monad) [.let [$artifact (////artifact.uri (the ////artifact.#version artifact) artifact)] - _ (# local upload (..jar $artifact) ..dummy_jar) - _ (# local upload (..javadoc $artifact) ..dummy_jar) - _ (# local upload (..sources $artifact) ..dummy_jar)] + _ (at local upload (..jar $artifact) ..dummy_jar) + _ (at local upload (..javadoc $artifact) ..dummy_jar) + _ (at local upload (..sources $artifact) ..dummy_jar)] (in []))) (def: (signed it) @@ -129,8 +129,8 @@ (def: (release_unsigned_artifact! local remote uri) (-> (Repository Async) (Repository Async) Text (Async (Try Binary))) (do [! ////action.monad] - [it (# local download uri) - _ (# remote upload uri it)] + [it (at local download uri) + _ (at remote upload uri it)] (in it))) (def: (release_signed_artifact! local remote [artifact signature]) @@ -139,9 +139,9 @@ [it (..release_unsigned_artifact! local remote artifact) _ (|> it ////hash.md5 - (# ////hash.md5_codec encoded) - (# utf8.codec encoded) - (# remote upload (..md5 artifact))) + (at ////hash.md5_codec encoded) + (at utf8.codec encoded) + (at remote upload (..md5 artifact))) _ (..release_unsigned_artifact! local remote signature)] (in []))) @@ -150,19 +150,19 @@ (do [! ////action.monad] [_ (///install.do! console fs local profile) _ (install_dummies! program local fs artifact) - .let [working_directory (# program directory) + .let [working_directory (at program directory) @root (////repository/local.root program fs) $bundle (////artifact.bundle (the ////artifact.#version artifact) artifact) - / (# fs separator) + / (at fs separator) @local (%.format @root / $bundle)] windows? (async.future ..windows?) process (is (Async (Try (shell.Process Async))) - (# shell execute [environment.empty @local - (if windows? - ["cmd" (list "/c" "for %file in (.\*) do gpg.exe -ab %file")] - ["sh" (list "-c" "for file in *.*; do gpg -ab $file; done")])])) + (at shell execute [environment.empty @local + (if windows? + ["cmd" (list "/c" "for %file in (.\*) do gpg.exe -ab %file")] + ["sh" (list "-c" "for file in *.*; do gpg -ab $file; done")])])) exit (is (Async (Try shell.Exit)) - (# process await [])) + (at process await [])) .let [$artifact (////artifact.uri (the ////artifact.#version artifact) artifact)] _ (monad.each ! (release_signed_artifact! local remote) (list (..signed (..pom $artifact)) diff --git a/stdlib/source/program/aedifex/command/deploy/snapshot.lux b/stdlib/source/program/aedifex/command/deploy/snapshot.lux index 90251c3bd..1fd2c8793 100644 --- a/stdlib/source/program/aedifex/command/deploy/snapshot.lux +++ b/stdlib/source/program/aedifex/command/deploy/snapshot.lux @@ -50,14 +50,14 @@ (the /.#sources) set.list (export.library fs) - (# ! each (binary.result tar.writer))) - pom (# async.monad in (////pom.write profile)) + (at ! each (binary.result tar.writer))) + pom (at async.monad in (////pom.write profile)) _ (////dependency/deployment.one remote [artifact ////artifact/type.lux_library] (let [pom_data (|> pom - (# xml.codec encoded) - (# utf8.codec encoded))] + (at xml.codec encoded) + (at 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 915ac8db0..e113616ef 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -59,19 +59,19 @@ (///dependency/deployment.all local)) _ (console.write_line (exception.report "Local successes" (|> local_successes - (list.sorted (# ///dependency.order <)) + (list.sorted (at ///dependency.order <)) (exception.listing ..format)) "Local failures" (|> local_failures - (list.sorted (# ///dependency.order <)) + (list.sorted (at ///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 (at ///dependency.order <)) (exception.listing ..format)) "Remote failures" (|> remote_failures - (list.sorted (# ///dependency.order <)) + (list.sorted (at ///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 90ace7b46..e6e85948c 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -61,12 +61,12 @@ (export.library fs)) pom (|> profile ///pom.write - (# async.monad in)) + (at async.monad in)) _ (///dependency/deployment.one local [identity ///artifact/type.lux_library] (let [pom_data (|> pom - (# xml.codec encoded) - (# utf8.codec encoded))] + (at xml.codec encoded) + (at 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 784a07d9a..2abff6969 100644 --- a/stdlib/source/program/aedifex/command/pom.lux +++ b/stdlib/source/program/aedifex/command/pom.lux @@ -29,9 +29,9 @@ (-> (Console Async) (file.System Async) (Command Any)) (do ///action.monad [content (|> (///pom.write profile) - (try#each (|>> (# xml.codec encoded) - (# utf8.codec encoded))) + (try#each (|>> (at xml.codec encoded) + (at utf8.codec encoded))) async#in) - _ (# fs write ///pom.file content)] + _ (at fs write ///pom.file content)] (is (Async (Try Any)) (console.write_line ..success console)))) diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux index fa3d55d1d..0c6c03db9 100644 --- a/stdlib/source/program/aedifex/command/test.lux +++ b/stdlib/source/program/aedifex/command/test.lux @@ -38,9 +38,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 (at program directory)]] (do [! ///action.monad] - [.let [home (# program home)] + [.let [home (at program home)] [build_exit compiler program] (//build.do! console program fs shell resolution (has ///.#program (the ///.#test profile) profile))] (if (i.= shell.normal build_exit) @@ -62,13 +62,13 @@ [//build.#Python ///.#python] [//build.#Lua ///.#lua] [//build.#Ruby ///.#ruby]))] - process (# shell execute [(dictionary.composite environment command_environment) - working_directory - test_command - test_parameters]) + process (at shell execute [(dictionary.composite environment command_environment) + working_directory + test_command + test_parameters]) _ (//build.log_output! console process) _ (//build.log_error! console process) - exit (# process await []) + exit (at process await []) _ (is (Async (Try Any)) (console.write_line (if (i.= shell.normal exit) ..success diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index 9e522fa94..2b207cbcd 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -27,7 +27,7 @@ (def: .public equivalence (Equivalence Dependency) - (# hash equivalence)) + (at hash equivalence)) (implementation: .public order (Order Dependency) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 69d85ef9a..49688ae20 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -47,11 +47,11 @@ deploy_hash (is (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)))))] + (at codec encoded) + (at utf8.codec encoded) + (at repository upload (format artifact extension)))))] (do [! (try.with async.monad)] - [_ (# repository upload artifact data)] + [_ (at repository upload artifact data)] (case status {///dependency/status.#Unverified} (in []) @@ -131,7 +131,7 @@ status])) snapshot (///metadata/snapshot.read repository artifact) - snapshot (# ! in (..update_snapshot [artifact type] now snapshot)) + snapshot (at ! 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))))) + (at ! 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 568973c47..b79f6c5d9 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -82,19 +82,19 @@ (Exception [Artifact Extension Text]) (Async (Try (Maybe (Hash h)))))) (do async.monad - [?actual (# repository download (///repository/remote.uri version_template artifact extension))] + [?actual (at repository download (///repository/remote.uri version_template artifact extension))] (case ?actual {try.#Success actual} (in (do [! try.monad] - [output (# ! each (|>> ffi.as_string java/lang/String::trim ffi.of_string) - (# utf8.codec decoded actual)) + [output (at ! each (|>> ffi.as_string java/lang/String::trim ffi.of_string) + (at utf8.codec decoded actual)) actual (|> output (text.all_split_by " ") list.head (maybe.else output) - (# codec decoded)) + (at codec decoded)) _ (exception.assertion exception [artifact extension output] - (# ///hash.equivalence = (hash library) actual))] + (at ///hash.equivalence = (hash library) actual))] (in {.#Some actual}))) {try.#Failure error} @@ -103,7 +103,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 (at 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) @@ -135,14 +135,14 @@ 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 - (do try.monad - [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 - ///package.#pom [pom pom_data pom_status]])))))) + (at async.monad in + (do try.monad + [pom (at utf8.codec decoded pom_data) + pom (at xml.codec decoded pom) + profile (.result ///pom.parser (list pom))] + (in [///package.#origin {///repository/origin.#Remote ""} + ///package.#library library_&_status + ///package.#pom [pom pom_data pom_status]])))))) (type: .public Resolution (Dictionary Dependency Package)) @@ -163,12 +163,12 @@ (template [ ] [(def: ( console repository artifact) (-> (Console Async) (Repository Async) Artifact (Async (Try Any))) - (# console write (format "[" "]" - " " - " " (///artifact.format artifact) - " " - " " (%.text (# repository description)) - text.new_line)))] + (at console write (format "[" "]" + " " + " " (///artifact.format artifact) + " " + " " (%.text (at repository description)) + text.new_line)))] ["?" announce_fetching "Fetching" "from"] ["O" announce_success "Found" "at"] @@ -181,7 +181,7 @@ {.#End} (|> dependency (exception.except ..cannot_resolve) - (# async.monad in)) + (at async.monad in)) {.#Item repository alternatives} (do [! async.monad] @@ -210,8 +210,8 @@ resolution resolution]) (case dependencies {.#End} - (# async.monad in - [successes failures resolution]) + (at async.monad in + [successes failures resolution]) {.#Item head tail} (case (the [//.#artifact ///artifact.#version] head) @@ -232,7 +232,7 @@ {try.#Success package} (do ! [.let [redundant? (is (Predicate Dependency) - (predicate.or (# //.equivalence = head) + (predicate.or (at //.equivalence = head) (dictionary.key? resolution))) sub_dependencies (|> package ///package.dependencies diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index c38f993c4..b566dc5e6 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -58,7 +58,7 @@ (def: encoded (Format Binary) (binary.mix (function (_ byte representation) - (let [hex (# n.hex encoded byte) + (let [hex (at n.hex encoded byte) hex (case (text.size hex) 1 (format "0" hex) _ hex)] @@ -130,7 +130,7 @@ (case (text.split_at ..hex_per_chunk input) {.#Some [head tail]} (do try.monad - [head (# n.hex decoded head) + [head (at n.hex decoded head) output (binary.has_64! index head output)] (again tail (++ chunk) output)) @@ -140,7 +140,7 @@ (^.template [ ] [ (do try.monad - [head (# n.hex decoded input) + [head (at n.hex decoded input) output ( index head output)] (constructor output))]) ([1 binary.has_8!] @@ -164,7 +164,7 @@ (All (_ h) (Equivalence (Hash h))) (def: (= reference subject) - (# binary.equivalence = - (representation reference) - (representation subject)))) + (at binary.equivalence = + (representation reference) + (representation subject)))) ) diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index 5733fa97a..c85970a5b 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -45,18 +45,18 @@ (def: project_parser (-> Binary (Try Project)) (|>> (pipe.do try.monad - [(# utf8.codec decoded)] + [(at 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 - (function (_ it) - (do [! try.monad] - [it it - it (..project_parser it) - it (monad.each ! (//project.profile it) (partial_list //profile.default profiles))] - (in (mix.with_monoid //profile.monoid list.mix it))))))) + (at fs read) + (at monad each + (function (_ it) + (do [! try.monad] + [it it + it (..project_parser it) + it (monad.each ! (//project.profile it) (partial_list //profile.default profiles))] + (in (mix.with_monoid //profile.monoid list.mix it))))))) diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index 0ba7371b8..e2e363c16 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -178,13 +178,13 @@ (def: .public (read repository artifact) (-> (Repository Async) Artifact (Async (Try Metadata))) (do async.monad - [project (# repository download (..uri artifact))] + [project (at repository download (..uri artifact))] (case project {try.#Success binary_metadata} (in (|> binary_metadata (pipe.do try.monad - [(# utf8.codec decoded)] - [(# xml.codec decoded)] + [(at utf8.codec decoded)] + [(at xml.codec decoded)] [list (.result ..parser)]))) {try.#Failure error} @@ -199,6 +199,6 @@ (-> (Repository Async) Artifact Metadata (Async (Try Any))) (|> metadata ..format - (# xml.codec encoded) - (# utf8.codec encoded) - (# repository upload (..uri artifact)))) + (at xml.codec encoded) + (at utf8.codec encoded) + (at repository upload (..uri artifact)))) diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index eb2f48c76..caf25a787 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -95,16 +95,16 @@ ///artifact/snapshot/version.#value version ///artifact/snapshot/version.#updated ///artifact/time.epoch]] (|> (.somewhere ///artifact/versioning.parser) - (# ! each - (revised ///artifact/versioning.#versions - (is (-> (List ///artifact/snapshot/version.Version) - (List ///artifact/snapshot/version.Version)) - (|>> (pipe.case - (pattern (list)) - (list ) + (at ! each + (revised ///artifact/versioning.#versions + (is (-> (List ///artifact/snapshot/version.Version) + (List ///artifact/snapshot/version.Version)) + (|>> (pipe.case + (pattern (list)) + (list ) - versions - versions))))) + versions + versions))))) (<>.else [///artifact/versioning.#snapshot {///artifact/snapshot.#Local} ///artifact/versioning.#last_updated ///artifact/time.epoch ///artifact/versioning.#versions (list )])))] @@ -127,13 +127,13 @@ (def: .public (read repository artifact) (-> (Repository Async) Artifact (Async (Try Metadata))) (do async.monad - [project (# repository download (..uri artifact))] + [project (at repository download (..uri artifact))] (case project {try.#Success project} (in (|> project (pipe.do try.monad - [(# utf8.codec decoded)] - [(# xml.codec decoded)] + [(at utf8.codec decoded)] + [(at xml.codec decoded)] [list (.result ..parser)]))) {try.#Failure error} @@ -145,6 +145,6 @@ (-> (Repository Async) Artifact Metadata (Async (Try Any))) (|> metadata ..format - (# xml.codec encoded) - (# utf8.codec encoded) - (# repository upload (..uri artifact)))) + (at xml.codec encoded) + (at utf8.codec encoded) + (at repository upload (..uri artifact)))) diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 4706c50ce..a08033b88 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -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 (at xml.codec encoded) (at utf8.codec encoded))] [pom binary_pom {//status.#Verified (//hash.sha-1 binary_pom) diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index 7f184b2eb..7fa14fb60 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -79,10 +79,10 @@ (def: license (Parser /.License) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (.tuple (<>.some (<>.and .text - .any))))] + [input (at ! each + (dictionary.of_list text.hash) + (.tuple (<>.some (<>.and .text + .any))))] (all <>.and (..singular input "name" ..name) (..singular input "url" ..url) @@ -94,10 +94,10 @@ (def: organization (Parser /.Organization) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (.tuple (<>.some (<>.and .text - .any))))] + [input (at ! each + (dictionary.of_list text.hash) + (.tuple (<>.some (<>.and .text + .any))))] (all <>.and (..singular input "name" ..name) (..singular input "url" ..url)))) @@ -105,10 +105,10 @@ (def: developer (Parser /.Developer) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (.tuple (<>.some (<>.and .text - .any))))] + [input (at ! each + (dictionary.of_list text.hash) + (.tuple (<>.some (<>.and .text + .any))))] (all <>.and (..singular input "name" ..name) (..singular input "url" ..url) @@ -122,10 +122,10 @@ (def: info (Parser /.Info) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (.tuple (<>.some (<>.and .text - .any))))] + [input (at ! each + (dictionary.of_list text.hash) + (.tuple (<>.some (<>.and .text + .any))))] (all <>.and (<>.maybe (..singular input "name" ..name)) (<>.maybe (..singular input "url" ..url)) @@ -196,10 +196,10 @@ (def: profile (Parser /.Profile) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (.tuple (<>.some (<>.and .text - .any)))) + [input (at ! each + (dictionary.of_list text.hash) + (.tuple (<>.some (<>.and .text + .any)))) .let [^parents (is (Parser (List /.Name)) (<>.else (list) (..plural input "parents" .text))) @@ -211,12 +211,12 @@ (..singular input "info" ..info))) ^repositories (is (Parser (Set //repository.Address)) (|> (..plural input "repositories" ..repository) - (# ! each (set.of_list text.hash)) + (at ! each (set.of_list text.hash)) (<>.else (set.empty text.hash)) - (# ! each (set.has /.default_repository)))) + (at ! each (set.has /.default_repository)))) ^dependencies (is (Parser (Set //dependency.Dependency)) (|> (..plural input "dependencies" ..dependency) - (# ! each (set.of_list //dependency.hash)) + (at ! each (set.of_list //dependency.hash)) (<>.else (set.empty //dependency.hash)))) ^lux (|> ..dependency (..singular input //format.lux_compiler_label) @@ -226,7 +226,7 @@ (<>.else (list))) ^sources (is (Parser (Set /.Source)) (|> (..plural input "sources" ..source) - (# ! each (set.of_list text.hash)) + (at ! each (set.of_list text.hash)) (<>.else (set.of_list text.hash (list /.default_source))))) ^target (is (Parser /.Target) (|> ..target @@ -239,7 +239,7 @@ (<>.maybe (..singular input "test" ..module))) ^deploy_repositories (is (Parser (Dictionary Text //repository.Address)) - (<| (# ! each (dictionary.of_list text.hash)) + (<| (at ! each (dictionary.of_list text.hash)) (<>.else (list)) (..plural input "deploy_repositories" ..deploy_repository))) ^configuration (is (Parser (PList Text)) @@ -283,7 +283,7 @@ (def: .public project (Parser Project) - (# <>.monad each - (dictionary.of_list text.hash) - (.tuple (<>.many (<>.and .text - ..profile))))) + (at <>.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 537fde5e7..9b9cfd998 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -164,15 +164,15 @@ (do [! <>.monad] [tag .tag] (<| (.node tag) - (# ! each (|>> [tag])) + (at ! each (|>> [tag])) .text))) (def: (dependency_parser own_version parent_version) (-> Text Text (Parser Dependency)) (do [! <>.monad] - [properties (# ! each (dictionary.of_list symbol.hash) - (<| (.node ["" ..dependency_tag]) - (<>.some ..property_parser)))] + [properties (at ! each (dictionary.of_list symbol.hash) + (<| (.node ["" ..dependency_tag]) + (<>.some ..property_parser)))] (<| <>.lifted try.of_maybe (do maybe.monad @@ -229,7 +229,7 @@ .somewhere (<>.else (list))) _ (<>.some .any)] - (in (|> (# /.monoid identity) + (in (|> (at /.monoid identity) (revised /.#dependencies (function (_ empty) (list#mix set.has empty dependencies))) (revised /.#repositories (function (_ empty) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index e4ab5be29..51288af15 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -39,7 +39,7 @@ (dictionary.empty text.hash)) (def: composite - (dictionary.composite_with (# //.monoid composite)))) + (dictionary.composite_with (at //.monoid composite)))) (exception: .public (unknown_profile [name Name]) (exception.report @@ -65,7 +65,7 @@ [parents (monad.each ! (profile' (set.has name lineage) project) (the //.#parents profile))] (in (list#mix (function (_ parent child) - (# //.monoid composite child parent)) + (at //.monoid composite child parent)) (has //.#parents (list) profile) parents)))) diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux index 65c13db0f..395eefc20 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)) + (at repository description)) (def: (download uri) - (async.future (# repository download uri))) + (async.future (at repository download uri))) (def: (upload uri content) - (async.future (# repository upload uri content))) + (async.future (at repository upload uri content))) )) (type: .public (Mock s) @@ -50,13 +50,13 @@ (let [state (stm.var init)] (implementation (def: description - (# mock the_description)) + (at mock the_description)) (def: (download uri) (stm.commit! (do [! stm.monad] [|state| (stm.read state)] - (case (# mock on_download uri |state|) + (case (at 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 (at 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 f3111fed3..5f618e183 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 (at utf8.codec encoded (format user ":" password))] (|> (java/util/Base64::getEncoder) (java/util/Base64$Encoder::encodeToString credentials) ffi.of_string diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux index e712e1db1..6f031ccfd 100644 --- a/stdlib/source/program/aedifex/repository/local.lux +++ b/stdlib/source/program/aedifex/repository/local.lux @@ -22,10 +22,10 @@ (def: .public (root program fs) (-> (Program Async) (file.System Async) file.Path) - (let [/ (# fs separator)] + (let [/ (at fs separator)] (|> ///local.repository (text.replaced uri.separator /) - (format (# program home) /)))) + (format (at program home) /)))) (def: (path /) (-> Text (-> URI file.Path)) @@ -33,7 +33,7 @@ (def: (absolute_path program fs) (-> (Program Async) (file.System Async) (-> URI file.Path)) - (let [/ (# fs separator)] + (let [/ (at fs separator)] (|>> ///metadata.local_uri (..path /) (format (..root program fs) /)))) @@ -46,12 +46,12 @@ (def: download (|>> (..absolute_path program fs) - (# fs read))) + (at fs read))) (def: (upload uri content) (do [! async.monad] [.let [absolute_path (..absolute_path program fs uri)] - ? (# fs file? absolute_path) + ? (at fs file? absolute_path) _ (is (Async (Try Any)) (if ? (in {try.#Success []}) @@ -61,4 +61,4 @@ _ (in {try.#Success []}))))] - (# fs write absolute_path content)))) + (at fs write absolute_path content)))) diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index c6aafb221..8a93e4cfd 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -68,12 +68,12 @@ http))] (case status (pattern (static http/status.ok)) - (# ! each product.right ((the @http.#body message) {.#None})) + (at ! each product.right ((the @http.#body message) {.#None})) _ (do ! [_ ((the @http.#body message) {.#Some 0})] - (# io.monad in (exception.except ..download_failure [(format address uri) status])))))) + (at io.monad in (exception.except ..download_failure [(format address uri) status])))))) (def: (upload uri content) (do (try.with io.monad) @@ -94,5 +94,5 @@ (in []) _ - (# io.monad in (exception.except ..upload_failure [(format address uri) status]))))) + (at io.monad in (exception.except ..upload_failure [(format address uri) status]))))) ) diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 543900782..986e1f161 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -78,7 +78,7 @@ (console.write_line report console))) (is (Async (Try Any)) )))] - (io.run! (# world/program.default exit +1)))) + (io.run! (at world/program.default exit +1)))) {try.#Success output} (in output)))) @@ -101,18 +101,18 @@ {try.#Success content} (case content {.#Left content} - (# fs write package content) + (at fs write package content) {.#Right content} (do [! (try.with async.monad)] - [_ (# fs make_directory package) + [_ (at fs make_directory package) _ (monad.each ! (function (_ [name content]) - (# fs write (file.rooted fs package name) content)) + (at fs write (file.rooted fs package name) content)) content)] (in []))) {try.#Failure error} - (# async.monad in {try.#Failure error}))) + (at async.monad in {try.#Failure error}))) (def: (load_host_dependencies fs host_dependencies) (-> (file.System Async) (List file.Path) (Async (Try (Dictionary file.Path Binary)))) @@ -127,7 +127,7 @@ {.#Item head tail} (do ! - [content (# fs read head)] + [content (at fs read head)] (again tail (dictionary.has head content output))))))) @@ -201,6 +201,6 @@ ... (do [! async.monad] ... [console (|> console.default ... async.future - ... (# ! each (|>> try.trusted console.async)))] + ... (at ! each (|>> try.trusted console.async)))] ... (interpreter.run! (try.with async.monad) console platform interpretation generation_bundle))) )))) -- cgit v1.2.3