From 35c0807799717cd720ab28b35851c1a01a67445d Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Tue, 7 Sep 2021 22:50:21 -0400 Subject: De-taggification | part 4 --- .../program/aedifex/dependency/deployment.lux | 50 +++++++-------- .../program/aedifex/dependency/resolution.lux | 74 +++++++++++----------- .../source/program/aedifex/dependency/status.lux | 8 +-- 3 files changed, 66 insertions(+), 66 deletions(-) (limited to 'stdlib/source/program/aedifex/dependency') diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 5227a8b95..fa6da0bc0 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -3,42 +3,42 @@ [lux "*" [abstract [codec {"+" [Codec]}] - ["." monad {"+" [do]}]] + ["[0]" monad {"+" [do]}]] [control - ["." try {"+" [Try]}] + ["[0]" try {"+" [Try]}] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data [binary {"+" [Binary]}] - ["." product] + ["[0]" product] [text ["%" format {"+" [format]}] [encoding - ["." utf8]]] + ["[0]" utf8]]] [collection - ["." dictionary] - ["." set {"+" [Set]}] - ["." list ("#\." monoid)]]] + ["[0]" dictionary] + ["[0]" set {"+" [Set]}] + ["[0]" list ("[1]\[0]" monoid)]]] [time - ["." instant {"+" [Instant]}]]]] - ["." /// "_" + ["[0]" instant {"+" [Instant]}]]]] + ["[0]" /// "_" [repository {"+" [Repository]}] - ["#." hash {"+" [Hash]}] - ["#." package {"+" [Package]}] - ["#." artifact {"+" [Artifact]} - ["#/." time] - ["#/." type] - ["#/." extension {"+" [Extension]}] - ["#/." versioning] - ["#/." snapshot - ["#/." version - ["#/." value]]]] - ["#." metadata "_" - ["#/." artifact] - ["#/." snapshot {"+" [Metadata]}]] - ["#." dependency {"+" [Dependency]} + ["[1][0]" hash {"+" [Hash]}] + ["[1][0]" package {"+" [Package]}] + ["[1][0]" artifact {"+" [Artifact]} + ["[1]/[0]" time] + ["[1]/[0]" type] + ["[1]/[0]" extension {"+" [Extension]}] + ["[1]/[0]" versioning] + ["[1]/[0]" snapshot + ["[1]/[0]" version + ["[1]/[0]" value]]]] + ["[1][0]" metadata "_" + ["[1]/[0]" artifact] + ["[1]/[0]" snapshot {"+" [Metadata]}]] + ["[1][0]" dependency {"+" [Dependency]} [resolution {"+" [Resolution]}] - ["#/." status {"+" [Status]}]]]) + ["[1]/[0]" status {"+" [Status]}]]]) (def: (with_status repository version_template [artifact type] [data status]) (-> (Repository Async) ///artifact.Version Dependency [Binary Status] (Async (Try Any))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index b8aead0aa..04609b10b 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -2,62 +2,62 @@ [library [lux {"-" [Name]} ["@" target] - ["." debug] - ["." ffi {"+" [import:]}] + ["[0]" debug] + ["[0]" ffi {"+" [import:]}] [abstract [codec {"+" [Codec]}] [equivalence {"+" [Equivalence]}] [monad {"+" [do]}] - ["." predicate {"+" [Predicate]}]] + ["[0]" predicate {"+" [Predicate]}]] [control - ["." maybe] - ["." try {"+" [Try]} ("#\." functor)] - ["." exception {"+" [Exception exception:]}] + ["[0]" maybe] + ["[0]" try {"+" [Try]} ("[1]\[0]" functor)] + ["[0]" exception {"+" [Exception exception:]}] ["<>" parser - ["<.>" xml {"+" [Parser]}]] + ["<[0]>" xml {"+" [Parser]}]] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data - ["." binary {"+" [Binary]}] - ["." name] - ["." text + ["[0]" binary {"+" [Binary]}] + ["[0]" name] + ["[0]" text ["%" format {"+" [format]}] [encoding - ["." utf8]]] + ["[0]" utf8]]] [format - ["." xml {"+" [Tag XML]}]] + ["[0]" xml {"+" [Tag XML]}]] [collection - ["." dictionary {"+" [Dictionary]}] - ["." set] - ["." list ("#\." functor monoid)]]] + ["[0]" dictionary {"+" [Dictionary]}] + ["[0]" set] + ["[0]" list ("[1]\[0]" functor monoid)]]] [math [number ["n" nat] - ["." i64]]] + ["[0]" i64]]] [world [console {"+" [Console]}] [net {"+" [URL]} - ["." uri] - ["." http "_" - ["#" client]]]]]] - ["." // {"+" [Dependency]} - ["#." status {"+" [Status]}] - ["/#" // "_" + ["[0]" uri] + ["[0]" http "_" + ["[1]" client]]]]]] + ["[0]" // {"+" [Dependency]} + ["[1][0]" status {"+" [Status]}] + ["/[1]" // "_" ["/" profile] - ["#." hash {"+" [Hash SHA-1 MD5]}] - ["#." pom] - ["#." package {"+" [Package]}] - ["#." artifact {"+" [Version Artifact]} - ["#/." extension {"+" [Extension]}] - ["#/." versioning] - ["." snapshot + ["[1][0]" hash {"+" [Hash SHA-1 MD5]}] + ["[1][0]" pom] + ["[1][0]" package {"+" [Package]}] + ["[1][0]" artifact {"+" [Version Artifact]} + ["[1]/[0]" extension {"+" [Extension]}] + ["[1]/[0]" versioning] + ["[0]" snapshot [version - ["." value]]]] - ["#." repository {"+" [Repository]} - ["#/." remote {"+" [Address]}] - ["#/." origin {"+" [Origin]}]] - ["#." metadata - ["#/." snapshot]]]]) + ["[0]" value]]]] + ["[1][0]" repository {"+" [Repository]} + ["[1]/[0]" remote {"+" [Address]}] + ["[1]/[0]" origin {"+" [Origin]}]] + ["[1][0]" metadata + ["[1]/[0]" snapshot]]]]) (template [] [(exception: .public ( {artifact Artifact} {extension Extension} {hash Text}) @@ -71,7 +71,7 @@ ) (import: java/lang/String - ["#::." + ["[1]::[0]" (trim [] java/lang/String)]) (def: (verified_hash library repository version_template artifact extension hash codec exception) diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux index 8d5f8ecc4..f5439114e 100644 --- a/stdlib/source/program/aedifex/dependency/status.lux +++ b/stdlib/source/program/aedifex/dependency/status.lux @@ -5,10 +5,10 @@ [equivalence {"+" [Equivalence]}]] [data [binary {"+" [Binary]}] - ["." sum] - ["." product]]]] - ["." /// "_" - ["#." hash {"+" [Hash SHA-1 MD5]}]]) + ["[0]" sum] + ["[0]" product]]]] + ["[0]" /// "_" + ["[1][0]" hash {"+" [Hash SHA-1 MD5]}]]) (type: .public Status (Variant -- cgit v1.2.3