diff options
Diffstat (limited to '')
-rw-r--r-- | stdlib/source/program/aedifex/dependency.lux | 12 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/dependency/deployment.lux | 16 | ||||
-rw-r--r-- | stdlib/source/program/aedifex/dependency/resolution.lux | 40 |
3 files changed, 34 insertions, 34 deletions
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 (<xml>.result ///pom.parser (list pom))] (in [///package.#origin {///repository/origin.#Remote ""} ///package.#library library_&_status @@ -167,11 +167,11 @@ (template [<sigil> <name> <doing> <at>] [(def: (<name> console repository artifact) (-> (Console Async) (Repository Async) Artifact (Async (Try Any))) - (\ console write (format "[" <sigil> "]" + (# console write (format "[" <sigil> "]" " " <doing> " " (///artifact.format artifact) " " <at> - " " (%.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} |