diff options
Diffstat (limited to 'stdlib/source/program/aedifex')
-rw-r--r-- | stdlib/source/program/aedifex/command/build.lux | 32 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/deploy.lux | 4 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/deps.lux | 4 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/install.lux | 4 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/command/pom.lux | 4 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/dependency/deployment.lux | 4 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/dependency/resolution.lux | 8 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/hash.lux | 16 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/input.lux | 2 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/metadata/artifact.lux | 8 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/metadata/snapshot.lux | 8 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/package.lux | 2 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/pom.lux | 6 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/project.lux | 10 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/repository/identity.lux | 2 |
15 files changed, 57 insertions, 57 deletions
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index e4de9ab0a..d3c5b17a0 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -16,7 +16,7 @@ ["." text ("#\." order) ["%" format (#+ format)]] [collection - ["." list ("#\." functor fold)] + ["." list ("#\." functor mix)] ["." dictionary (#+ Dictionary)] ["." set]]] [math @@ -159,21 +159,21 @@ (list.only (|>> (value@ #///dependency.type) (text\= ///artifact/type.lux_library) not)) - (list\fold (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) - (dictionary.has identity [version dependency] uniques) - uniques) - - #.None - (dictionary.has identity [version dependency] uniques)))) - (: (Dictionary [Group Name] [Version Dependency]) - (dictionary.empty (product.hash text.hash text.hash)))) + (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) + (dictionary.has identity [version dependency] uniques) + uniques) + + #.None + (dictionary.has identity [version dependency] uniques)))) + (: (Dictionary [Group Name] [Version Dependency]) + (dictionary.empty (product.hash text.hash text.hash)))) dictionary.values (list\map (|>> product.right (..path fs home))))) diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux index 38f975939..62ec8e985 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -69,8 +69,8 @@ repository [artifact ///artifact/type.lux_library] (let [pom_data (|> pom - (\ xml.codec encode) - (\ utf8.codec encode))] + (\ 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 3c8381e51..c1b0990f5 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -10,7 +10,7 @@ [data [collection ["." set (#+ Set)] - ["." list ("#\." fold)] + ["." list ("#\." mix)] ["." dictionary]] [text ["%" format]]] @@ -55,7 +55,7 @@ cache)] (do ///action.monad [cached (|> (dictionary.keys cache) - (list\fold dictionary.lacks resolution) + (list\mix dictionary.lacks resolution) (///dependency/deployment.all local)) _ (console.write_line (exception.report ["Local successes" (|> local_successes diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index f0677afc7..37a5c77b1 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -64,8 +64,8 @@ _ (///dependency/deployment.one repository [identity ///artifact/type.lux_library] (let [pom_data (|> pom - (\ xml.codec encode) - (\ utf8.codec encode))] + (\ 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 163fa87fa..c43982a98 100644 --- a/stdlib/source/program/aedifex/command/pom.lux +++ b/stdlib/source/program/aedifex/command/pom.lux @@ -29,8 +29,8 @@ (-> (Console Async) (file.System Async) (Command Any)) (do ///action.monad [content (|> (///pom.write profile) - (try\map (|>> (\ xml.codec encode) - (\ utf8.codec encode))) + (try\map (|>> (\ 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/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 0e9ab0def..c637ae931 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -47,8 +47,8 @@ deploy_hash (: (All [h] (-> (Codec Text (Hash h)) Extension (Hash h) (Async (Try Any)))) (function (_ codec extension hash) (|> hash - (\ codec encode) - (\ utf8.codec encode) + (\ codec encoded) + (\ utf8.codec encoded) (\ repository upload (format artifact extension)))))] (do {! (try.with async.monad)} [_ (\ repository upload artifact data)] diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 73c5f6608..50415b61f 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -88,12 +88,12 @@ java/lang/String::trim (:as Text)) @.jvm (|>> java/lang/String::trim)}) - (\ utf8.codec decode actual)) + (\ utf8.codec decoded actual)) actual (|> output (text.all_split_by " ") list.head (maybe.else output) - (\ codec decode)) + (\ codec decoded)) _ (exception.assertion exception [artifact extension output] (\ ///hash.equivalence = (hash library) actual))] (in (#.Some actual)))) @@ -138,8 +138,8 @@ library_&_status (..hashed repository version_template artifact extension)] (\ async.monad in (do try.monad - [pom (\ utf8.codec decode pom_data) - pom (\ xml.codec decode pom) + [pom (\ utf8.codec decoded pom_data) + pom (\ xml.codec decoded pom) profile (<xml>.result ///pom.parser (list pom))] (in {#///package.origin (#///repository/origin.Remote "") #///package.library library_&_status diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index 92414c441..74e78ca55 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -54,10 +54,10 @@ [md5 ..MD5 "MD5"] ) - (def: encode + (def: encoded (Format Binary) (binary.aggregate (function (_ byte representation) - (let [hex (\ n.hex encode byte) + (let [hex (\ n.hex encoded byte) hex (case (text.size hex) 1 (format "0" hex) _ hex)] @@ -88,7 +88,7 @@ (template [<name> <size>] [(exception: .public (<name> {data Binary}) (exception.report - ["Pseudo hash" (%.text (..encode data))] + ["Pseudo hash" (%.text (..encoded data))] ["Expected size" (%.nat <size>)] ["Actual size" (%.nat (binary.size data))]))] @@ -115,7 +115,7 @@ (-> Nat Nat) (n.* ..hex_per_byte)) - (def: (decode size constructor encoded) + (def: (decoded size constructor encoded) (All [h] (-> Nat (-> Binary (Try (Hash h))) (-> Text (Try (Hash h))))) @@ -128,7 +128,7 @@ (case (text.split_at ..hex_per_chunk input) (#.Some [head tail]) (do try.monad - [head (\ n.hex decode head) + [head (\ n.hex decoded head) output (binary.write/64! index head output)] (recur tail (++ chunk) output)) @@ -138,7 +138,7 @@ (^template [<size> <write>] [<size> (do try.monad - [head (\ n.hex decode input) + [head (\ n.hex decoded input) output (<write> index head output)] (constructor output))]) ([1 binary.write/8!] @@ -151,8 +151,8 @@ [(implementation: .public <codec> (Codec Text (Hash <hash>)) - (def: encode (|>> :representation ..encode)) - (def: decode (..decode <nat> <constructor>)))] + (def: encoded (|>> :representation ..encoded)) + (def: decoded (..decoded <nat> <constructor>)))] [sha-1_codec SHA-1 ..sha-1::size ..as_sha-1] [md5_codec MD5 ..md5::size ..as_md5] diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index 58f37e252..b78e502a6 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -42,7 +42,7 @@ (def: project_parser (-> Binary (Try Project)) (|>> (do> try.monad - [(\ utf8.codec decode)] + [(\ utf8.codec decoded)] [..lux_parser] [(list) (<code>.result //parser.project)]))) diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index 3512114be..d8134515c 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -180,8 +180,8 @@ (#try.Success project) (in (|> project (do> try.monad - [(\ utf8.codec decode)] - [(\ xml.codec decode)] + [(\ utf8.codec decoded)] + [(\ xml.codec decoded)] [list (<xml>.result ..parser)]))) (#try.Failure error) @@ -196,6 +196,6 @@ (-> (Repository Async) Artifact Metadata (Async (Try Any))) (|> metadata ..format - (\ xml.codec encode) - (\ utf8.codec encode) + (\ 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 6a32effef..3852f5fe1 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -130,8 +130,8 @@ (#try.Success project) (in (|> project (do> try.monad - [(\ utf8.codec decode)] - [(\ xml.codec decode)] + [(\ utf8.codec decoded)] + [(\ xml.codec decoded)] [list (<xml>.result ..parser)]))) (#try.Failure error) @@ -143,6 +143,6 @@ (-> (Repository Async) Artifact Metadata (Async (Try Any))) (|> metadata ..format - (\ xml.codec encode) - (\ utf8.codec encode) + (\ 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 c0c73e0fd..7611cdac9 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -53,7 +53,7 @@ #library [library (#//status.Verified (//hash.sha-1 library) (//hash.md5 library))] - #pom (let [binary_pom (|> pom (\ xml.codec encode) (\ utf8.codec encode))] + #pom (let [binary_pom (|> pom (\ xml.codec encoded) (\ utf8.codec encoded))] [pom binary_pom (#//status.Verified (//hash.sha-1 binary_pom) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 810c30588..7f9464e5c 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -16,7 +16,7 @@ [format ["_" xml (#+ Tag XML)]] [collection - ["." list ("#\." monoid functor fold)] + ["." list ("#\." monoid functor mix)] ["." set] ["." dictionary]]] [world @@ -226,6 +226,6 @@ _ (<>.some <xml>.any)] (in (|> (\ /.monoid identity) (revised@ #/.dependencies (function (_ empty) - (list\fold set.has empty dependencies))) + (list\mix set.has empty dependencies))) (revised@ #/.repositories (function (_ empty) - (list\fold set.has empty repositories))))))))) + (list\mix set.has empty repositories))))))))) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index 5717221d1..687fd215b 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -14,7 +14,7 @@ [collection ["." dictionary (#+ Dictionary)] ["." set (#+ Set)] - ["." list ("#\." fold)]]]]] + ["." list ("#\." mix)]]]]] ["." // #_ ["#" profile (#+ Name Profile)]]) @@ -63,10 +63,10 @@ (do {! try.monad} [parents (monad.map ! (profile' (set.has name lineage) project) (value@ #//.parents profile))] - (in (list\fold (function (_ parent child) - (\ //.monoid compose child parent)) - (with@ #//.parents (list) profile) - parents)))) + (in (list\mix (function (_ parent child) + (\ //.monoid compose child parent)) + (with@ #//.parents (list) profile) + parents)))) #.None (exception.except ..unknown_profile [name]))) diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux index 742c1aef2..4201123c0 100644 --- a/stdlib/source/program/aedifex/repository/identity.lux +++ b/stdlib/source/program/aedifex/repository/identity.lux @@ -38,7 +38,7 @@ (def: .public (basic_auth user password) (-> User Password Text) - (let [credentials (\ utf8.codec encode (format user ":" password))] + (let [credentials (\ utf8.codec encoded (format user ":" password))] (|> (java/util/Base64::getEncoder) (java/util/Base64$Encoder::encodeToString credentials) (format "Basic ")))) |