diff options
Diffstat (limited to 'stdlib/source/program/aedifex')
| -rw-r--r-- | stdlib/source/program/aedifex/action.lux | 2 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/artifact.lux | 4 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/command/build.lux | 8 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/dependency/resolution.lux | 4 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/parser.lux | 4 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/pom.lux | 8 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/project.lux | 6 |
7 files changed, 18 insertions, 18 deletions
diff --git a/stdlib/source/program/aedifex/action.lux b/stdlib/source/program/aedifex/action.lux index 55994c67b..41d168b97 100644 --- a/stdlib/source/program/aedifex/action.lux +++ b/stdlib/source/program/aedifex/action.lux @@ -13,4 +13,4 @@ (def: .public monad (Monad Action) - (:assume (try.with async.monad))) + (:expected (try.with async.monad))) diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index a6980813e..e37894330 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -87,7 +87,7 @@ (def: .public (directory separator group) (-> Text Group Text) (|> group - (text.split_all_with ..group_separator) + (text.all_split_by ..group_separator) (text.join_with separator))) (def: .public (uri version artifact) @@ -103,6 +103,6 @@ (-> Artifact (List Text)) (list\compose (|> artifact (get@ #group) - (text.split_all_with ..group_separator)) + (text.all_split_by ..group_separator)) (list (get@ #name artifact) (get@ #version artifact)))) diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index e14eee20f..41668665e 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -83,7 +83,7 @@ (def: (remove_dependency dependency) (-> Dependency (-> Resolution Resolution)) (|>> dictionary.entries - (list.only (|>> product.left (is? dependency) not)) + (list.only (|>> product.left (same? dependency) not)) (dictionary.of_list ///dependency.hash))) (def: (compiler resolution compiler_dependency) @@ -135,8 +135,8 @@ text.equivalence) (def: (< left right) - (loop [left (text.split_all_with ..version_separator left) - right (text.split_all_with ..version_separator right)] + (loop [left (text.all_split_by ..version_separator left) + right (text.all_split_by ..version_separator right)] (case [left right] [(#.Item leftH leftT) (#.Item rightH rightT)] (if (text\= leftH rightH) @@ -164,7 +164,7 @@ identity [(get@ #///artifact.group artifact) (get@ #///artifact.name artifact)] version (get@ #///artifact.version artifact)] - (case (dictionary.get identity uniques) + (case (dictionary.value identity uniques) (#.Some [current_version current_path]) (if (\ version_order < version current_version) (dictionary.has identity [version dependency] uniques) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 05ae5c523..22778e25b 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -88,7 +88,7 @@ (:as Text)) (\ utf8.codec decode actual)) actual (|> output - (text.split_all_with " ") + (text.all_split_by " ") list.head (maybe.else output) (\ codec decode)) @@ -221,7 +221,7 @@ tail resolution) _ (do {! async.monad} - [?package (case (dictionary.get head resolution) + [?package (case (dictionary.value head resolution) (#.Some package) (in (#try.Success package)) diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index 37ce2c46b..6d4d05b92 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -39,12 +39,12 @@ (def: (singular input tag parser) (All [a] (-> (Dictionary Text Code) Text (Parser a) (Parser a))) - (<code>.local (..as_input (dictionary.get tag input)) + (<code>.local (..as_input (dictionary.value tag input)) parser)) (def: (plural input tag parser) (All [a] (-> (Dictionary Text Code) Text (Parser a) (Parser (List a)))) - (<code>.local (..as_input (dictionary.get tag input)) + (<code>.local (..as_input (dictionary.value tag input)) (<code>.tuple (<>.some parser)))) (def: group diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 146ef471b..f3a945d66 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -171,17 +171,17 @@ (<| <>.lift try.of_maybe (do maybe.monad - [group (dictionary.get ["" ..group_tag] properties) - artifact (dictionary.get ["" ..artifact_tag] properties)] + [group (dictionary.value ["" ..group_tag] properties) + artifact (dictionary.value ["" ..artifact_tag] properties)] (in {#//dependency.artifact {#//artifact.group group #//artifact.name artifact #//artifact.version (|> properties - (dictionary.get ["" ..version_tag]) + (dictionary.value ["" ..version_tag]) (maybe.else "") (text.replaced "${project.version}" own_version) (text.replaced "${project.parent.version}" parent_version))} #//dependency.type (|> properties - (dictionary.get ["" "type"]) + (dictionary.value ["" "type"]) (maybe.else //artifact/type.jvm_library))}))))) (def: (dependencies_parser own_version parent_version) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index fdaf77e6c..951e82d34 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -52,10 +52,10 @@ (def: (profile' lineage project name) (-> (Set Name) Project Name (Try Profile)) - (case (dictionary.get name project) + (case (dictionary.value name project) (#.Some profile) - (case (list.find (set.member? lineage) - (get@ #//.parents profile)) + (case (list.example (set.member? lineage) + (get@ #//.parents profile)) (#.Some ouroboros) (exception.except ..circular_dependency [ouroboros name]) |