diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/program/aedifex/dependency/resolution.lux | 30 | ||||
| -rw-r--r-- | stdlib/source/program/aedifex/dependency/status.lux | 4 |
2 files changed, 17 insertions, 17 deletions
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index f49d1da56..11c3cd057 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -48,11 +48,11 @@ ["Extension" (%.text extension)] ["Hash" (%.text hash)]))] - [sha-1-does-not-match] - [md5-does-not-match] + [sha-1_does_not_match] + [md5_does_not_match] ) -(def: (verified-hash library repository artifact extension hash codec exception) +(def: (verified_hash library repository artifact extension hash codec exception) (All [h] (-> Binary (Repository Promise) Artifact Extension (-> Binary (Hash h)) (Codec Text (Hash h)) @@ -72,12 +72,12 @@ (-> (Repository Promise) Artifact Extension (Promise (Try [Binary Status]))) (do (try.with promise.monad) [data (\ repository download (///repository.uri artifact extension)) - sha-1 (..verified-hash data + sha-1 (..verified_hash data repository artifact (format extension ///artifact/extension.sha-1) - ///hash.sha-1 ///hash.sha-1-codec ..sha-1-does-not-match) - md5 (..verified-hash data + ///hash.sha-1 ///hash.sha-1_codec ..sha-1_does_not_match) + md5 (..verified_hash data repository artifact (format extension ///artifact/extension.md5) - ///hash.md5 ///hash.md5-codec ..md5-does-not-match)] + ///hash.md5 ///hash.md5_codec ..md5_does_not_match)] (wrap [data (#//status.Verified sha-1 md5)]))) (def: #export (one repository dependency) @@ -85,16 +85,16 @@ (let [[artifact type] dependency extension (///artifact/extension.extension type)] (do (try.with promise.monad) - [[pom pom-status] (..hashed repository artifact ///artifact/extension.pom) - library-&-status (..hashed repository artifact extension)] + [[pom pom_status] (..hashed repository artifact ///artifact/extension.pom) + library_&_status (..hashed repository artifact extension)] (\ promise.monad wrap (do try.monad [pom (\ encoding.utf8 decode pom) pom (\ xml.codec decode pom) profile (<xml>.run ///pom.parser pom)] (wrap {#///package.origin #///package.Remote - #///package.library library-&-status - #///package.pom [pom pom-status]})))))) + #///package.library library_&_status + #///package.pom [pom pom_status]})))))) (type: #export Resolution (Dictionary Dependency Package)) @@ -107,7 +107,7 @@ (Equivalence Resolution) (dictionary.equivalence ///package.equivalence)) -(exception: #export (cannot-resolve {dependency Dependency}) +(exception: #export (cannot_resolve {dependency Dependency}) (exception.report ["Artifact" (%.text (///artifact.format (get@ #//.artifact dependency)))] ["Type" (%.text (get@ #//.type dependency))])) @@ -117,7 +117,7 @@ (case repositories #.Nil (|> dependency - (exception.throw ..cannot-resolve) + (exception.throw ..cannot_resolve) (\ promise.monad wrap)) (#.Cons repository alternatives) @@ -144,8 +144,8 @@ #.None (..any repositories head)) - sub-dependencies (\ promise.monad wrap (///package.dependencies package)) + sub_dependencies (\ promise.monad wrap (///package.dependencies package)) resolution (|> resolution (dictionary.put head package) - (all repositories (set.to-list sub-dependencies)))] + (all repositories (set.to_list sub_dependencies)))] (all repositories tail resolution)))) diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux index fa62f643e..bedaffdb8 100644 --- a/stdlib/source/program/aedifex/dependency/status.lux +++ b/stdlib/source/program/aedifex/dependency/status.lux @@ -14,7 +14,7 @@ (Hash MD5))) (#Verified (Hash SHA-1) (Hash MD5))) -(structure: any-equivalence +(structure: any_equivalence (Equivalence Any) (def: (= _ _) @@ -23,7 +23,7 @@ (def: #export equivalence (Equivalence Status) ($_ sum.equivalence - ..any-equivalence + ..any_equivalence ($_ sum.equivalence ///hash.equivalence ///hash.equivalence |