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 --- stdlib/source/program/aedifex/action.lux | 4 +- stdlib/source/program/aedifex/artifact.lux | 10 +-- .../source/program/aedifex/artifact/extension.lux | 8 +-- .../source/program/aedifex/artifact/snapshot.lux | 12 ++-- .../program/aedifex/artifact/snapshot/build.lux | 8 +-- .../program/aedifex/artifact/snapshot/stamp.lux | 14 ++-- .../program/aedifex/artifact/snapshot/time.lux | 18 +++--- .../program/aedifex/artifact/snapshot/version.lux | 16 ++--- .../aedifex/artifact/snapshot/version/value.lux | 10 +-- stdlib/source/program/aedifex/artifact/time.lux | 16 ++--- .../source/program/aedifex/artifact/time/date.lux | 12 ++-- .../source/program/aedifex/artifact/time/time.lux | 8 +-- .../source/program/aedifex/artifact/versioning.lux | 30 ++++----- stdlib/source/program/aedifex/cli.lux | 8 +-- stdlib/source/program/aedifex/command.lux | 6 +- stdlib/source/program/aedifex/command/auto.lux | 22 +++---- stdlib/source/program/aedifex/command/build.lux | 54 ++++++++-------- stdlib/source/program/aedifex/command/clean.lux | 14 ++-- stdlib/source/program/aedifex/command/deploy.lux | 62 +++++++++--------- stdlib/source/program/aedifex/command/deps.lux | 32 +++++----- stdlib/source/program/aedifex/command/install.lux | 50 +++++++-------- stdlib/source/program/aedifex/command/pom.lux | 18 +++--- stdlib/source/program/aedifex/command/test.lux | 24 +++---- stdlib/source/program/aedifex/command/version.lux | 12 ++-- stdlib/source/program/aedifex/dependency.lux | 8 +-- .../program/aedifex/dependency/deployment.lux | 50 +++++++-------- .../program/aedifex/dependency/resolution.lux | 74 +++++++++++----------- .../source/program/aedifex/dependency/status.lux | 8 +-- stdlib/source/program/aedifex/format.lux | 24 +++---- stdlib/source/program/aedifex/hash.lux | 16 ++--- stdlib/source/program/aedifex/input.lux | 28 ++++---- stdlib/source/program/aedifex/local.lux | 6 +- stdlib/source/program/aedifex/metadata.lux | 8 +-- .../source/program/aedifex/metadata/artifact.lux | 36 +++++------ .../source/program/aedifex/metadata/snapshot.lux | 50 +++++++-------- stdlib/source/program/aedifex/package.lux | 24 +++---- stdlib/source/program/aedifex/parser.lux | 24 +++---- stdlib/source/program/aedifex/pom.lux | 28 ++++---- stdlib/source/program/aedifex/profile.lux | 24 +++---- stdlib/source/program/aedifex/project.lux | 18 +++--- stdlib/source/program/aedifex/repository.lux | 6 +- .../source/program/aedifex/repository/identity.lux | 12 ++-- stdlib/source/program/aedifex/repository/local.lux | 18 +++--- .../source/program/aedifex/repository/origin.lux | 4 +- .../source/program/aedifex/repository/remote.lux | 32 +++++----- stdlib/source/program/aedifex/runtime.lux | 10 +-- 46 files changed, 488 insertions(+), 488 deletions(-) (limited to 'stdlib/source/program/aedifex') diff --git a/stdlib/source/program/aedifex/action.lux b/stdlib/source/program/aedifex/action.lux index 35024a755..9923ea207 100644 --- a/stdlib/source/program/aedifex/action.lux +++ b/stdlib/source/program/aedifex/action.lux @@ -4,9 +4,9 @@ [abstract [monad {"+" [Monad]}]] [control - ["." try {"+" [Try]}] + ["[0]" try {"+" [Try]}] [concurrency - ["." async {"+" [Async]}]]]]]) + ["[0]" async {"+" [Async]}]]]]]) (type: .public (Action a) (Async (Try a))) diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index 1f1261436..8e5ee0429 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -6,15 +6,15 @@ [order {"+" [Order]}] [hash {"+" [Hash]}]] [data - ["." product] - ["." text ("#\." order) + ["[0]" product] + ["[0]" text ("[1]\[0]" order) ["%" format {"+" [Format]}]] [collection - ["." list ("#\." monoid)]]] + ["[0]" list ("[1]\[0]" monoid)]]] [world - ["." file {"+" [Path]}] + ["[0]" file {"+" [Path]}] [net - ["." uri {"+" [URI]}]]]]]) + ["[0]" uri {"+" [URI]}]]]]]) (type: .public Group Text) diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux index 6b3a61367..3150b9df4 100644 --- a/stdlib/source/program/aedifex/artifact/extension.lux +++ b/stdlib/source/program/aedifex/artifact/extension.lux @@ -2,12 +2,12 @@ [library [lux {"-" [type]} [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]] [macro - ["." template]]]] - ["." // "_" - ["#" type]]) + ["[0]" template]]]] + ["[0]" // "_" + ["[1]" type]]) (type: .public Extension Text) diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux index a83905f0b..0a0d5cd94 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot.lux @@ -6,14 +6,14 @@ [monad {"+" [do]}]] [control ["<>" parser - ["<.>" xml {"+" [Parser]}] - ["<.>" text]]] + ["<[0]>" xml {"+" [Parser]}] + ["<[0]>" text]]] [data - ["." sum] + ["[0]" sum] [format - ["." xml {"+" [XML]}]]]]] - ["." / "_" - ["#." stamp {"+" [Stamp]}]]) + ["[0]" xml {"+" [XML]}]]]]] + ["[0]" / "_" + ["[1][0]" stamp {"+" [Stamp]}]]) (type: .public Snapshot (Variant diff --git a/stdlib/source/program/aedifex/artifact/snapshot/build.lux b/stdlib/source/program/aedifex/artifact/snapshot/build.lux index 3afdf31b1..a7e9e2fc8 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux @@ -6,16 +6,16 @@ [monad {"+" [do]}]] [control ["<>" parser - ["<.>" xml {"+" [Parser]}] - ["<.>" text]]] + ["<[0]>" xml {"+" [Parser]}] + ["<[0]>" text]]] [data [text ["%" format]] [format - ["." xml {"+" [XML]}]]] + ["[0]" xml {"+" [XML]}]]] [math [number - ["." nat]]]]]) + ["[0]" nat]]]]]) (type: .public Build Nat) diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux index 8d57034ef..0a951c097 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux @@ -6,15 +6,15 @@ [monad {"+" [do]}]] [control ["<>" parser - ["<.>" xml {"+" [Parser]}] - ["<.>" text]]] + ["<[0]>" xml {"+" [Parser]}] + ["<[0]>" text]]] [data - ["." product] + ["[0]" product] [format - ["." xml {"+" [XML]}]]]]] - ["." // "_" - ["#." time {"+" [Time]}] - ["#." build {"+" [Build]}]]) + ["[0]" xml {"+" [XML]}]]]]] + ["[0]" // "_" + ["[1][0]" time {"+" [Time]}] + ["[1][0]" build {"+" [Build]}]]) (type: .public Stamp (Record diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux index ab62308b2..0b0bb8227 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux @@ -5,21 +5,21 @@ [equivalence {"+" [Equivalence]}] [monad {"+" [do]}]] [control - ["." exception {"+" [exception:]}] + ["[0]" exception {"+" [exception:]}] ["<>" parser - ["<.>" text] - ["<.>" xml {"+" [Parser]}]]] + ["<[0]>" text] + ["<[0]>" xml {"+" [Parser]}]]] [data [text ["%" format]] [format - ["." xml {"+" [XML]}]]] + ["[0]" xml {"+" [XML]}]]] [time - ["." instant {"+" [Instant]}]]]] - ["." /// "_" - ["#." time - ["#/." date] - ["#/." time]]]) + ["[0]" instant {"+" [Instant]}]]]] + ["[0]" /// "_" + ["[1][0]" time + ["[1]/[0]" date] + ["[1]/[0]" time]]]) (type: .public Time ///time.Time) diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux index ff3017838..33238b990 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux @@ -6,16 +6,16 @@ [monad {"+" [do]}]] [control ["<>" parser - ["<.>" xml {"+" [Parser]}] - ["<.>" text]]] + ["<[0]>" xml {"+" [Parser]}] + ["<[0]>" text]]] [data - ["." product] - ["." text] + ["[0]" product] + ["[0]" text] [format - ["." xml {"+" [XML]}]]]]] - ["." /// "_" - ["#." type {"+" [Type]}] - ["#." time {"+" [Time]}]]) + ["[0]" xml {"+" [XML]}]]]]] + ["[0]" /// "_" + ["[1][0]" type {"+" [Type]}] + ["[1][0]" time {"+" [Time]}]]) (type: .public Version (Record diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux index eff775ab3..dc3744f4f 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux @@ -4,12 +4,12 @@ [abstract [equivalence {"+" [Equivalence]}]] [data - ["." product] - ["." text + ["[0]" product] + ["[0]" text ["%" format]]]]] - ["." /// {"+" [Snapshot]} - ["#." time] - ["#." stamp]]) + ["[0]" /// {"+" [Snapshot]} + ["[1][0]" time] + ["[1][0]" stamp]]) (type: .public Value (Record diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux index d46d204bc..7096d7420 100644 --- a/stdlib/source/program/aedifex/artifact/time.lux +++ b/stdlib/source/program/aedifex/artifact/time.lux @@ -1,23 +1,23 @@ (.module: [library [lux "*" - ["." time] + ["[0]" time] [abstract [equivalence {"+" [Equivalence]}] [monad {"+" [do]}]] [control - ["." try {"+" [Try]}] + ["[0]" try {"+" [Try]}] ["<>" parser - ["<.>" text {"+" [Parser]}]]] + ["<[0]>" text {"+" [Parser]}]]] [data - ["." product] + ["[0]" product] [text ["%" format {"+" [Format]}]]] [time - ["." instant {"+" [Instant]}]]]] - ["." / "_" - ["#." date] - ["#." time]]) + ["[0]" instant {"+" [Instant]}]]]] + ["[0]" / "_" + ["[1][0]" date] + ["[1][0]" time]]) (type: .public Time [/date.Date /time.Time]) diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux index deb9cb8ed..18688bf1a 100644 --- a/stdlib/source/program/aedifex/artifact/time/date.lux +++ b/stdlib/source/program/aedifex/artifact/time/date.lux @@ -5,10 +5,10 @@ [monad {"+" [do]}] [equivalence {"+" [Equivalence]}]] [control - ["." try {"+" [Try]}] - ["." exception {"+" [exception:]}] + ["[0]" try {"+" [Try]}] + ["[0]" exception {"+" [exception:]}] ["<>" parser - ["<.>" text {"+" [Parser]}]]] + ["<[0]>" text {"+" [Parser]}]]] [data [text ["%" format]]] @@ -17,9 +17,9 @@ ["n" nat] ["i" int]]] [time - ["." date ("#\." equivalence)] - ["." year] - ["." month]] + ["[0]" date ("[1]\[0]" equivalence)] + ["[0]" year] + ["[0]" month]] [type abstract]]]) diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux index 5fca26062..c27b1b69c 100644 --- a/stdlib/source/program/aedifex/artifact/time/time.lux +++ b/stdlib/source/program/aedifex/artifact/time/time.lux @@ -1,20 +1,20 @@ (.module: [library [lux "*" - ["." time] + ["[0]" time] [abstract [monad {"+" [do]}]] [control ["<>" parser - ["<.>" text {"+" [Parser]}]]] + ["<[0]>" text {"+" [Parser]}]]] [data [text ["%" format]]] [math [number ["n" nat]]]]] - ["." // "_" - ["#" date]]) + ["[0]" // "_" + ["[1]" date]]) (type: .public Time time.Time) diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux index d2d702236..644af3fa1 100644 --- a/stdlib/source/program/aedifex/artifact/versioning.lux +++ b/stdlib/source/program/aedifex/artifact/versioning.lux @@ -5,29 +5,29 @@ [equivalence {"+" [Equivalence]}] [monad {"+" [do]}]] [control - ["." exception {"+" [exception:]}] + ["[0]" exception {"+" [exception:]}] ["<>" parser - ["<.>" xml {"+" [Parser]}] - ["<.>" text]]] + ["<[0]>" xml {"+" [Parser]}] + ["<[0]>" text]]] [data - ["." product] - ["." text + ["[0]" product] + ["[0]" text ["%" format]] [format - ["." xml {"+" [XML]}]] + ["[0]" xml {"+" [XML]}]] [collection - ["." list ("#\." functor)]]] + ["[0]" list ("[1]\[0]" functor)]]] [math [number ["n" nat]]] - ["." time {"+" [Time]} - ["." date {"+" [Date]}] - ["." year] - ["." month]]]] - ["." // "_" - ["#." time] - ["#." snapshot {"+" [Snapshot]} - ["#/." version {"+" [Version]}]]]) + ["[0]" time {"+" [Time]} + ["[0]" date {"+" [Date]}] + ["[0]" year] + ["[0]" month]]]] + ["[0]" // "_" + ["[1][0]" time] + ["[1][0]" snapshot {"+" [Snapshot]} + ["[1]/[0]" version {"+" [Version]}]]]) (type: .public Versioning (Record diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux index 6c93fa3cc..04706756f 100644 --- a/stdlib/source/program/aedifex/cli.lux +++ b/stdlib/source/program/aedifex/cli.lux @@ -6,11 +6,11 @@ [monad {"+" [do]}]] [control ["<>" parser - ["." cli {"+" [Parser]}]]] + ["[0]" cli {"+" [Parser]}]]] [data - ["." sum] - ["." product] - ["." text]]]] + ["[0]" sum] + ["[0]" product] + ["[0]" text]]]] [// [repository [identity {"+" [Identity]}]] diff --git a/stdlib/source/program/aedifex/command.lux b/stdlib/source/program/aedifex/command.lux index b0b900e05..8594f0cfc 100644 --- a/stdlib/source/program/aedifex/command.lux +++ b/stdlib/source/program/aedifex/command.lux @@ -1,9 +1,9 @@ (.module: [library [lux "*"]] - ["." // "_" - ["#" profile] - ["#." action {"+" [Action]}]]) + ["[0]" // "_" + ["[1]" profile] + ["[1][0]" action {"+" [Action]}]]) (type: .public (Command a) (-> //.Profile (Action a))) diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index 5e3b425fe..dc065c399 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -2,26 +2,26 @@ [library [lux "*" [abstract - ["." monad {"+" [do]}]] + ["[0]" monad {"+" [do]}]] [control - ["." try {"+" [Try]}] + ["[0]" try {"+" [Try]}] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data [collection - ["." list] - ["." set]]] + ["[0]" list] + ["[0]" set]]] [world [program {"+" [Program]}] [shell {"+" [Exit Shell]}] [console {"+" [Console]}] - ["." file - ["." watch {"+" [Watcher]}]]]]] - ["." // "_" - ["/#" // "_" + ["[0]" file + ["[0]" watch {"+" [Watcher]}]]]]] + ["[0]" // "_" + ["/[1]" // "_" [command {"+" [Command]}] - ["#" profile] - ["#." action] + ["[1]" profile] + ["[1][0]" action] [dependency [resolution {"+" [Resolution]}]]]]) diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index fea5ab74a..7d4592179 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -1,46 +1,46 @@ (.module: [library [lux {"-" [Name]} - ["." ffi {"+" [import:]}] + ["[0]" ffi {"+" [import:]}] [abstract [order {"+" [Order]}] [monad {"+" [do]}]] [control - ["." try {"+" [Try]}] - ["." exception {"+" [exception:]}] - ["." io {"+" [IO]}] + ["[0]" try {"+" [Try]}] + ["[0]" exception {"+" [exception:]}] + ["[0]" io {"+" [IO]}] [concurrency - ["." async {"+" [Async]} ("#\." monad)]]] + ["[0]" async {"+" [Async]} ("[1]\[0]" monad)]]] [data - ["." product] - ["." text ("#\." order) + ["[0]" product] + ["[0]" text ("[1]\[0]" order) ["%" format {"+" [format]}]] [collection - ["." list ("#\." functor mix)] - ["." dictionary {"+" [Dictionary]}] - ["." set]]] + ["[0]" list ("[1]\[0]" functor mix)] + ["[0]" dictionary {"+" [Dictionary]}] + ["[0]" set]]] [math [number ["n" nat] ["i" int]]] [world - ["." program {"+" [Program]}] - ["." file {"+" [Path]}] - ["." shell {"+" [Exit Process Shell]}] - ["." console {"+" [Console]}] + ["[0]" program {"+" [Program]}] + ["[0]" file {"+" [Path]}] + ["[0]" shell {"+" [Exit Process Shell]}] + ["[0]" console {"+" [Console]}] [net - ["." uri]]]]] - ["." /// "_" - ["#" profile] - ["#." action] - ["#." command {"+" [Command]}] - ["#." local] - ["#." repository] - ["#." runtime] - ["#." dependency {"+" [Dependency]} - ["#/." resolution {"+" [Resolution]}]] - ["#." artifact {"+" [Group Name Version Artifact]} - ["#/." type]]]) + ["[0]" uri]]]]] + ["[0]" /// "_" + ["[1]" profile] + ["[1][0]" action] + ["[1][0]" command {"+" [Command]}] + ["[1][0]" local] + ["[1][0]" repository] + ["[1][0]" runtime] + ["[1][0]" dependency {"+" [Dependency]} + ["[1]/[0]" resolution {"+" [Resolution]}]] + ["[1][0]" artifact {"+" [Group Name Version Artifact]} + ["[1]/[0]" type]]]) (type: Finder (-> Resolution (Maybe Dependency))) @@ -226,7 +226,7 @@ ) (import: java/lang/System - ["#::." + ["[1]::[0]" ("static" getProperty [java/lang/String] "io" "try" java/lang/String)]) (def: windows? diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux index 0d8a62512..232bde793 100644 --- a/stdlib/source/program/aedifex/command/clean.lux +++ b/stdlib/source/program/aedifex/command/clean.lux @@ -2,21 +2,21 @@ [library [lux "*" [abstract - ["." monad {"+" [do]}]] + ["[0]" monad {"+" [do]}]] [control [try {"+" [Try]}] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data [text ["%" format {"+" [format]}]]] [world - ["." file {"+" [Path]}] - ["." console {"+" [Console]}]]]] - ["." /// "_" + ["[0]" file {"+" [Path]}] + ["[0]" console {"+" [Console]}]]]] + ["[0]" /// "_" [command {"+" [Command]}] - ["#" profile] - ["#." action {"+" [Action]}]]) + ["[1]" profile] + ["[1][0]" action {"+" [Action]}]]) (def: (clean_files! fs root) (-> (file.System Async) Path (Async (Try Any))) diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux index 49837055c..ee2cc3c71 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -5,53 +5,53 @@ [monad {"+" [do]}]] [control [pipe {"+" [do>]}] - ["." try {"+" [Try]}] + ["[0]" try {"+" [Try]}] [concurrency - ["." async {"+" [Async]} ("#\." monad)]] + ["[0]" async {"+" [Async]} ("[1]\[0]" monad)]] ["<>" parser - ["<.>" xml]]] + ["<[0]>" xml]]] [data [binary {"+" [Binary]}] [text ["%" format {"+" [format]}] [encoding - ["." utf8]]] + ["[0]" utf8]]] [collection - ["." set]] + ["[0]" set]] [format - ["." binary] - ["." tar] - ["." xml]]] + ["[0]" binary] + ["[0]" tar] + ["[0]" xml]]] [time - ["." instant {"+" [Instant]}]] + ["[0]" instant {"+" [Instant]}]] [world - ["." file] - ["." console {"+" [Console]}]]]] + ["[0]" file] + ["[0]" console {"+" [Console]}]]]] [program [compositor - ["." export]]] - ["." // "_" - ["#." clean] - ["/#" // "_" + ["[0]" export]]] + ["[0]" // "_" + ["[1][0]" clean] + ["/[1]" // "_" [command {"+" [Command]}] ["/" profile] - ["#." action {"+" [Action]}] - ["#." pom] - ["#." hash] - ["#." package] - ["#." dependency - ["#/." deployment] - ["#/." status {"+" [Status]}]] - ["#." repository {"+" [Repository]} + ["[1][0]" action {"+" [Action]}] + ["[1][0]" pom] + ["[1][0]" hash] + ["[1][0]" package] + ["[1][0]" dependency + ["[1]/[0]" deployment] + ["[1]/[0]" status {"+" [Status]}]] + ["[1][0]" repository {"+" [Repository]} [identity {"+" [Identity]}] - ["#/." remote] - ["#/." origin]] - ["#." metadata - ["#/." artifact] - ["#/." snapshot]] - ["#." artifact {"+" [Artifact]} - ["#/." extension {"+" [Extension]}] - ["#/." type]]]]) + ["[1]/[0]" remote] + ["[1]/[0]" origin]] + ["[1][0]" metadata + ["[1]/[0]" artifact] + ["[1]/[0]" snapshot]] + ["[1][0]" artifact {"+" [Artifact]} + ["[1]/[0]" extension {"+" [Extension]}] + ["[1]/[0]" type]]]]) (def: .public success "Successfully deployed the project.") diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index a5c27f5ac..0cce84d7c 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -4,32 +4,32 @@ [abstract [monad {"+" [do]}]] [control - ["." exception] + ["[0]" exception] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data [collection - ["." set {"+" [Set]}] - ["." list ("#\." mix)] - ["." dictionary]] + ["[0]" set {"+" [Set]}] + ["[0]" list ("[1]\[0]" mix)] + ["[0]" dictionary]] [text ["%" format]]] [world [net {"+" [URL]}] [program {"+" [Program]}] - ["." file] - ["." console {"+" [Console]}]]]] - ["." // "_" - ["#." clean] - ["/#" // "_" + ["[0]" file] + ["[0]" console {"+" [Console]}]]]] + ["[0]" // "_" + ["[1][0]" clean] + ["/[1]" // "_" [command {"+" [Command]}] [repository {"+" [Repository]}] - ["#" profile] - ["#." action {"+" [Action]}] - ["#." artifact {"+" [Artifact]}] - ["#." dependency {"+" [Dependency]} - ["#/." resolution {"+" [Resolution]}] - ["#/." deployment]]]]) + ["[1]" profile] + ["[1][0]" action {"+" [Action]}] + ["[1][0]" artifact {"+" [Artifact]}] + ["[1][0]" dependency {"+" [Dependency]} + ["[1]/[0]" resolution {"+" [Resolution]}] + ["[1]/[0]" deployment]]]]) (def: format (%.Format Dependency) diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index 023b2cc84..660d82477 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -4,44 +4,44 @@ [abstract [monad {"+" [do]}]] [control - ["." try {"+" [Try]}] - ["." exception] + ["[0]" try {"+" [Try]}] + ["[0]" exception] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data [binary {"+" [Binary]}] [text [encoding - ["." utf8]]] + ["[0]" utf8]]] [collection - ["." set]] + ["[0]" set]] [format - ["." binary] - ["." tar] - ["." xml]]] + ["[0]" binary] + ["[0]" tar] + ["[0]" xml]]] [world [program {"+" [Program]}] - ["." file] - ["." console {"+" [Console]}]]]] + ["[0]" file] + ["[0]" console {"+" [Console]}]]]] [program [compositor - ["." export]]] - ["." // "_" - ["#." clean] - ["/#" // "_" + ["[0]" export]]] + ["[0]" // "_" + ["[1][0]" clean] + ["/[1]" // "_" ["/" profile {"+" [Profile]}] - ["#." action {"+" [Action]}] - ["#." command {"+" [Command]}] - ["#." local] - ["#." pom] - ["#." package] + ["[1][0]" action {"+" [Action]}] + ["[1][0]" command {"+" [Command]}] + ["[1][0]" local] + ["[1][0]" pom] + ["[1][0]" package] [repository {"+" [Repository]} - ["#." origin]] - ["#." dependency "_" - ["#/." deployment] - ["#/." status]] - ["#." artifact {"+" [Artifact]} - ["#/." type]]]]) + ["[1][0]" origin]] + ["[1][0]" dependency "_" + ["[1]/[0]" deployment] + ["[1]/[0]" status]] + ["[1][0]" artifact {"+" [Artifact]} + ["[1]/[0]" type]]]]) (def: .public success "Successfully installed the project locally.") diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux index fed4f8771..b176232aa 100644 --- a/stdlib/source/program/aedifex/command/pom.lux +++ b/stdlib/source/program/aedifex/command/pom.lux @@ -4,23 +4,23 @@ [abstract [monad {"+" [do]}]] [control - ["." try ("#\." functor)] + ["[0]" try ("[1]\[0]" functor)] [concurrency - ["." async {"+" [Async]} ("#\." monad)]]] + ["[0]" async {"+" [Async]} ("[1]\[0]" monad)]]] [data [text ["%" format {"+" [format]}] [encoding - ["." utf8]]] + ["[0]" utf8]]] [format - ["." xml]]] + ["[0]" xml]]] [world - ["." file] - ["." console {"+" [Console]}]]]] - ["." /// "_" + ["[0]" file] + ["[0]" console {"+" [Console]}]]]] + ["[0]" /// "_" [command {"+" [Command]}] - ["#." action] - ["#." pom]]) + ["[1][0]" action] + ["[1][0]" pom]]) (def: .public success (format "Successfully created POM file: " ///pom.file)) diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux index 8c18e45be..35c805645 100644 --- a/stdlib/source/program/aedifex/command/test.lux +++ b/stdlib/source/program/aedifex/command/test.lux @@ -5,22 +5,22 @@ [monad {"+" [do]}]] [control [concurrency - ["." async {"+" [Async]} ("#\." monad)]]] + ["[0]" async {"+" [Async]} ("[1]\[0]" monad)]]] [math [number ["i" int]]] [world - ["." program {"+" [Program]}] - ["." file] - ["." shell {"+" [Exit Shell]}] - ["." console {"+" [Console]}]]]] - ["." // "_" - ["#." build] - ["/#" // "_" - ["#" profile] - ["#." action] - ["#." command {"+" [Command]}] - ["#." runtime] + ["[0]" program {"+" [Program]}] + ["[0]" file] + ["[0]" shell {"+" [Exit Shell]}] + ["[0]" console {"+" [Console]}]]]] + ["[0]" // "_" + ["[1][0]" build] + ["/[1]" // "_" + ["[1]" profile] + ["[1][0]" action] + ["[1][0]" command {"+" [Command]}] + ["[1][0]" runtime] [dependency [resolution {"+" [Resolution]}]]]]) diff --git a/stdlib/source/program/aedifex/command/version.lux b/stdlib/source/program/aedifex/command/version.lux index 640277699..11883dd86 100644 --- a/stdlib/source/program/aedifex/command/version.lux +++ b/stdlib/source/program/aedifex/command/version.lux @@ -3,15 +3,15 @@ [lux "*" [control [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [tool [compiler - ["." version] - ["." language "_" - ["#/." lux "_" - ["#" version]]]]] + ["[0]" version] + ["[0]" language "_" + ["[1]/[0]" lux "_" + ["[1]" version]]]]] [world - ["." console {"+" [Console]}]]]] + ["[0]" console {"+" [Console]}]]]] [/// [command {"+" [Command]}]]) diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index bb75342c1..d2f299b1d 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -6,11 +6,11 @@ [order {"+" [Order]}] [hash {"+" [Hash]}]] [data - ["." product] - ["." text ("#\." order) + ["[0]" product] + ["[0]" text ("[1]\[0]" order) ["%" format {"+" [format]}]]]]] - ["." // "_" - ["#" artifact {"+" [Artifact]} ("#\." order) + ["[0]" // "_" + ["[1]" artifact {"+" [Artifact]} ("[1]\[0]" order) [type {"+" [Type]}]]]) (type: .public 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 diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index f6b737fdf..3f626f0e2 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -2,21 +2,21 @@ [library [lux "*" [data - ["." text ("#\." equivalence)] + ["[0]" text ("[1]\[0]" equivalence)] [collection - ["." dictionary {"+" [Dictionary]}] - ["." list ("#\." monad)] - ["." set {"+" [Set]}]]] + ["[0]" dictionary {"+" [Dictionary]}] + ["[0]" list ("[1]\[0]" monad)] + ["[0]" set {"+" [Set]}]]] [macro - ["." code] - ["." template]]]] - ["." // "_" + ["[0]" code] + ["[0]" template]]]] + ["[0]" // "_" ["/" profile] - ["#." runtime {"+" [Runtime]}] - ["#." project {"+" [Project]}] - ["#." dependency {"+" [Dependency]}] - ["#." artifact {"+" [Artifact]} - ["#/." type]]]) + ["[1][0]" runtime {"+" [Runtime]}] + ["[1][0]" project {"+" [Project]}] + ["[1][0]" dependency {"+" [Dependency]}] + ["[1][0]" artifact {"+" [Artifact]} + ["[1]/[0]" type]]]) (type: .public (Format a) (-> a Code)) diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index 13ee22b41..eb00c2af5 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -1,23 +1,23 @@ (.module: [library [lux "*" - ["." ffi {"+" [import:]}] + ["[0]" ffi {"+" [import:]}] [abstract [codec {"+" [Codec]}] [equivalence {"+" [Equivalence]}] [monad {"+" [do]}]] [control - ["." try {"+" [Try]}] - ["." exception {"+" [exception:]}]] + ["[0]" try {"+" [Try]}] + ["[0]" exception {"+" [exception:]}]] [data - ["." binary {"+" [Binary]}] - ["." text + ["[0]" binary {"+" [Binary]}] + ["[0]" text ["%" format {"+" [Format format]}] - ["." encoding]]] + ["[0]" encoding]]] [math [number ["n" nat] - ["." i64]]] + ["[0]" i64]]] [type abstract]]]) @@ -27,7 +27,7 @@ (import: java/lang/String) (import: java/security/MessageDigest - ["#::." + ["[1]::[0]" ("static" getInstance [java/lang/String] java/security/MessageDigest) (digest [[byte]] [byte])]) diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index 5bc33377b..02e212744 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -2,33 +2,33 @@ [library [lux {"-" [Name]} [abstract - ["." monad {"+" [Monad do]}] - ["." mix]] + ["[0]" monad {"+" [Monad do]}] + ["[0]" mix]] [control [pipe {"+" [do>]}] - ["." try {"+" [Try]}] + ["[0]" try {"+" [Try]}] [parser - ["<.>" code]]] + ["<[0]>" code]]] [data [binary {"+" [Binary]}] - ["." text + ["[0]" text [encoding - ["." utf8]]] + ["[0]" utf8]]] [collection - ["." list]]] + ["[0]" list]]] [meta - ["." location]] + ["[0]" location]] [tool [compiler [language [lux - ["." syntax]]]]] + ["[0]" syntax]]]]] [world - ["." file]]]] - ["." // "_" - ["#." profile {"+" [Name Profile]}] - ["#." project {"+" [Project]}] - ["#." parser]]) + ["[0]" file]]]] + ["[0]" // "_" + ["[1][0]" profile {"+" [Name Profile]}] + ["[1][0]" project {"+" [Project]}] + ["[1][0]" parser]]) (def: (lux_parser source_code) (-> Text (Try Code)) diff --git a/stdlib/source/program/aedifex/local.lux b/stdlib/source/program/aedifex/local.lux index 4fec9c339..c901cc8a1 100644 --- a/stdlib/source/program/aedifex/local.lux +++ b/stdlib/source/program/aedifex/local.lux @@ -6,9 +6,9 @@ ["%" format {"+" [format]}]]] [world [net - ["." uri {"+" [URI]}]]]]] - ["." // "_" - ["#." artifact {"+" [Version Artifact]}]]) + ["[0]" uri {"+" [URI]}]]]]] + ["[0]" // "_" + ["[1][0]" artifact {"+" [Version Artifact]}]]) (def: / uri.separator) diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux index 652aab29d..d0dbba2ba 100644 --- a/stdlib/source/program/aedifex/metadata.lux +++ b/stdlib/source/program/aedifex/metadata.lux @@ -2,14 +2,14 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]] [world [file {"+" [Path]}] [net - ["." uri {"+" [URI]}]]]]] - ["." // "_" - ["#." artifact {"+" [Artifact]}]]) + ["[0]" uri {"+" [URI]}]]]]] + ["[0]" // "_" + ["[1][0]" artifact {"+" [Artifact]}]]) (def: remote_file Path diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index dc54c8e2d..571d9bff1 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -6,37 +6,37 @@ [equivalence {"+" [Equivalence]}]] [control [pipe {"+" [do>]}] - ["." try {"+" [Try]}] + ["[0]" try {"+" [Try]}] ["<>" parser - ["<.>" xml {"+" [Parser]}] - ["<.>" text]] + ["<[0]>" xml {"+" [Parser]}] + ["<[0]>" text]] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data - ["." product] - ["." text + ["[0]" product] + ["[0]" text ["%" format] [encoding - ["." utf8]]] + ["[0]" utf8]]] [format - ["." xml {"+" [XML]}]] + ["[0]" xml {"+" [XML]}]] [collection - ["." list ("#\." functor)]]] + ["[0]" list ("[1]\[0]" functor)]]] [math [number ["n" nat]]] - ["." time {"+" [Time]} - ["." instant {"+" [Instant]}] - ["." date {"+" [Date]}] - ["." year] - ["." month]] + ["[0]" time {"+" [Time]} + ["[0]" instant {"+" [Instant]}] + ["[0]" date {"+" [Date]}] + ["[0]" year] + ["[0]" month]] [world [net - ["." uri {"+" [URI]}]]]]] - ["." // - ["/#" // "_" + ["[0]" uri {"+" [URI]}]]]]] + ["[0]" // + ["/[1]" // "_" [repository {"+" [Repository]}] - ["#." artifact {"+" [Group Name Version Artifact]}]]]) + ["[1][0]" artifact {"+" [Group Name Version Artifact]}]]]) (type: .public Metadata (Record diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index 6f8ceb41c..53f5faee0 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -6,44 +6,44 @@ [equivalence {"+" [Equivalence]}]] [control [pipe {"+" [do> case>]}] - ["." try {"+" [Try]}] - ["." exception {"+" [exception:]}] + ["[0]" try {"+" [Try]}] + ["[0]" exception {"+" [exception:]}] ["<>" parser - ["<.>" xml {"+" [Parser]}] - ["<.>" text]] + ["<[0]>" xml {"+" [Parser]}] + ["<[0]>" text]] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data - ["." product] - ["." text + ["[0]" product] + ["[0]" text ["%" format] [encoding - ["." utf8]]] + ["[0]" utf8]]] [format - ["." xml {"+" [XML]}]] + ["[0]" xml {"+" [XML]}]] [collection - ["." list ("#\." functor)]]] + ["[0]" list ("[1]\[0]" functor)]]] [math [number ["n" nat]]] - ["." time {"+" [Time]} - ["." instant {"+" [Instant]}] - ["." date {"+" [Date]}] - ["." year] - ["." month]] + ["[0]" time {"+" [Time]} + ["[0]" instant {"+" [Instant]}] + ["[0]" date {"+" [Date]}] + ["[0]" year] + ["[0]" month]] [world [net - ["." uri {"+" [URI]}]]]]] - ["." // - ["/#" // "_" + ["[0]" uri {"+" [URI]}]]]]] + ["[0]" // + ["/[1]" // "_" [repository {"+" [Repository]}] - ["#." artifact {"+" [Group Name Version Artifact]} - ["#/." time] - ["#/." type {"+" [Type]}] - ["#/." versioning {"+" [Versioning]}] - ["#/." snapshot - ["#/." version] - ["#/." stamp]]]]]) + ["[1][0]" artifact {"+" [Group Name Version Artifact]} + ["[1]/[0]" time] + ["[1]/[0]" type {"+" [Type]}] + ["[1]/[0]" versioning {"+" [Versioning]}] + ["[1]/[0]" snapshot + ["[1]/[0]" version] + ["[1]/[0]" stamp]]]]]) (type: .public Metadata (Record diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 069bdb83c..bd149b0d9 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -4,29 +4,29 @@ [abstract [equivalence {"+" [Equivalence]}]] [control - ["." try {"+" [Try]} ("#\." functor)] + ["[0]" try {"+" [Try]} ("[1]\[0]" functor)] [parser - ["<.>" xml]]] + ["<[0]>" xml]]] [data - ["." sum] - ["." product] - ["." binary {"+" [Binary]}] + ["[0]" sum] + ["[0]" product] + ["[0]" binary {"+" [Binary]}] [text [encoding - ["." utf8]]] + ["[0]" utf8]]] [format - ["." xml {"+" [XML]}]] + ["[0]" xml {"+" [XML]}]] [collection [set {"+" [Set]}]]]]] - ["." // "_" + ["[0]" // "_" ["/" profile] - ["#." hash] - ["#." pom] + ["[1][0]" hash] + ["[1][0]" pom] [dependency {"+" [Dependency]} - ["#." status {"+" [Status]}]] + ["[1][0]" status {"+" [Status]}]] [repository [remote {"+" [Address]}] - ["#." origin {"+" [Origin]}]]]) + ["[1][0]" origin {"+" [Origin]}]]]) (type: .public Package (Record diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index c2a4c2754..02840c2ec 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -5,12 +5,12 @@ [monad {"+" [do]}]] [control ["<>" parser - ["<.>" code {"+" [Parser]}]]] + ["<[0]>" code {"+" [Parser]}]]] [data - ["." text] + ["[0]" text] [collection - ["." dictionary {"+" [Dictionary]}] - ["." set {"+" [Set]}]]] + ["[0]" dictionary {"+" [Dictionary]}] + ["[0]" set {"+" [Set]}]]] [tool [compiler [meta @@ -18,15 +18,15 @@ [descriptor {"+" [Module]}]]]]] [world [net {"+" [URL]}]]]] - ["." // "_" + ["[0]" // "_" ["/" profile] - ["#." runtime {"+" [Runtime]}] - ["#." project {"+" [Project]}] - ["#." dependency] - ["#." repository "_" - ["#" remote]] - ["#." artifact {"+" [Artifact]} - ["#/." type]]]) + ["[1][0]" runtime {"+" [Runtime]}] + ["[1][0]" project {"+" [Project]}] + ["[1][0]" dependency] + ["[1][0]" repository "_" + ["[1]" remote]] + ["[1][0]" artifact {"+" [Artifact]} + ["[1]/[0]" type]]]) (def: (as_input input) (-> (Maybe Code) (List Code)) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 87a070f08..7cf6f961e 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -5,29 +5,29 @@ [monad {"+" [do]}]] [control [pipe {"+" [case>]}] - ["." maybe ("#\." functor)] - ["." try {"+" [Try]}] - ["." exception] + ["[0]" maybe ("[1]\[0]" functor)] + ["[0]" try {"+" [Try]}] + ["[0]" exception] ["<>" parser - ["<.>" xml {"+" [Parser]}]]] + ["<[0]>" xml {"+" [Parser]}]]] [data - ["." name] - ["." text] + ["[0]" name] + ["[0]" text] [format ["_" xml {"+" [Tag XML]}]] [collection - ["." list ("#\." monoid functor mix)] - ["." set] - ["." dictionary]]] + ["[0]" list ("[1]\[0]" monoid functor mix)] + ["[0]" set] + ["[0]" dictionary]]] [world - ["." file]]]] - ["." // "_" + ["[0]" file]]]] + ["[0]" // "_" ["/" profile] - ["#." dependency {"+" [Dependency]}] + ["[1][0]" dependency {"+" [Dependency]}] [repository [remote {"+" [Address]}]] - ["#." artifact {"+" [Artifact]} - ["#/." type]]]) + ["[1][0]" artifact {"+" [Artifact]} + ["[1]/[0]" type]]]) ... https://maven.apache.org/pom.html diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 93be5bb38..2e3dc3da3 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -5,17 +5,17 @@ [monoid {"+" [Monoid]}] [equivalence {"+" [Equivalence]}]] [control - ["." maybe ("#\." monoid)] - ["." exception {"+" [exception:]}]] + ["[0]" maybe ("[1]\[0]" monoid)] + ["[0]" exception {"+" [exception:]}]] [data - ["." product] - ["." text ("#\." equivalence)] + ["[0]" product] + ["[0]" text ("[1]\[0]" equivalence)] [collection - ["." dictionary {"+" [Dictionary]}] - ["." list ("#\." monoid)] - ["." set {"+" [Set]}]]] + ["[0]" dictionary {"+" [Dictionary]}] + ["[0]" list ("[1]\[0]" monoid)] + ["[0]" set {"+" [Set]}]]] [macro - ["." template]] + ["[0]" template]] [world [net {"+" [URL]}] [file {"+" [Path]}]] @@ -25,10 +25,10 @@ [archive [descriptor {"+" [Module]}]]]]]]] [// - ["." runtime {"+" [Runtime]} ("#\." equivalence)] - ["." dependency {"+" [Dependency]} ("#\." equivalence)] - ["." artifact {"+" [Artifact]} - ["." type]] + ["[0]" runtime {"+" [Runtime]} ("[1]\[0]" equivalence)] + ["[0]" dependency {"+" [Dependency]} ("[1]\[0]" equivalence)] + ["[0]" artifact {"+" [Artifact]} + ["[0]" type]] [repository [remote {"+" [Address]}]]]) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index f497b499d..e7ed18148 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -4,19 +4,19 @@ [abstract [equivalence {"+" [Equivalence]}] [monoid {"+" [Monoid]}] - ["." monad {"+" [do]}]] + ["[0]" monad {"+" [do]}]] [control - ["." try {"+" [Try]}] - ["." exception {"+" [exception:]}]] + ["[0]" try {"+" [Try]}] + ["[0]" exception {"+" [exception:]}]] [data - ["." text + ["[0]" text ["%" format {"+" [format]}]] [collection - ["." dictionary {"+" [Dictionary]}] - ["." set {"+" [Set]}] - ["." list ("#\." mix)]]]]] - ["." // "_" - ["#" profile {"+" [Name Profile]}]]) + ["[0]" dictionary {"+" [Dictionary]}] + ["[0]" set {"+" [Set]}] + ["[0]" list ("[1]\[0]" mix)]]]]] + ["[0]" // "_" + ["[1]" profile {"+" [Name Profile]}]]) (def: .public file "project.lux") diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux index 04eb87356..5cca8174b 100644 --- a/stdlib/source/program/aedifex/repository.lux +++ b/stdlib/source/program/aedifex/repository.lux @@ -5,10 +5,10 @@ [monad {"+" [do]}]] [control [io {"+" [IO]}] - ["." try {"+" [Try]}] + ["[0]" try {"+" [Try]}] [concurrency - ["." async {"+" [Async]}] - ["." stm]]] + ["[0]" async {"+" [Async]}] + ["[0]" stm]]] [data [binary {"+" [Binary]}]] [world diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux index 06df89360..abe5e2e1b 100644 --- a/stdlib/source/program/aedifex/repository/identity.lux +++ b/stdlib/source/program/aedifex/repository/identity.lux @@ -1,15 +1,15 @@ (.module: [library [lux "*" - ["." ffi {"+" [import:]}] + ["[0]" ffi {"+" [import:]}] [abstract [equivalence {"+" [Equivalence]}]] [data - ["." product] - ["." text + ["[0]" product] + ["[0]" text ["%" format {"+" [format]}] [encoding - ["." utf8]]]]]]) + ["[0]" utf8]]]]]]) (type: .public User Text) @@ -30,11 +30,11 @@ )) (import: java/util/Base64$Encoder - ["#::." + ["[1]::[0]" (encodeToString [[byte]] java/lang/String)]) (import: java/util/Base64 - ["#::." + ["[1]::[0]" ("static" getEncoder [] java/util/Base64$Encoder)]) (def: .public (basic_auth user password) diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux index 4a2837672..2c528a520 100644 --- a/stdlib/source/program/aedifex/repository/local.lux +++ b/stdlib/source/program/aedifex/repository/local.lux @@ -4,21 +4,21 @@ [abstract [monad {"+" [do]}]] [control - ["." try] + ["[0]" try] [concurrency - ["." async {"+" [Async]}]]] + ["[0]" async {"+" [Async]}]]] [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]] [world [program {"+" [Program]}] - ["." file] + ["[0]" file] [net - ["." uri {"+" [URI]}]]]]] - ["." // - ["/#" // "_" - ["#." local] - ["#." metadata]]]) + ["[0]" uri {"+" [URI]}]]]]] + ["[0]" // + ["/[1]" // "_" + ["[1][0]" local] + ["[1][0]" metadata]]]) (def: (root program /) (-> (Program Async) Text file.Path) diff --git a/stdlib/source/program/aedifex/repository/origin.lux b/stdlib/source/program/aedifex/repository/origin.lux index fdee108c5..72163f641 100644 --- a/stdlib/source/program/aedifex/repository/origin.lux +++ b/stdlib/source/program/aedifex/repository/origin.lux @@ -4,8 +4,8 @@ [abstract [equivalence {"+" [Equivalence]}]] [data - ["." sum] - ["." text]] + ["[0]" sum] + ["[0]" text]] [world [file {"+" [Path]}] [net {"+" [URL]}]]]]) diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index ea8952bef..69fd9c255 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -4,30 +4,30 @@ [abstract [monad {"+" [do]}]] [control - ["." io {"+" [IO]}] - ["." try {"+" [Try]}] - ["." exception {"+" [exception:]}]] + ["[0]" io {"+" [IO]}] + ["[0]" try {"+" [Try]}] + ["[0]" exception {"+" [exception:]}]] [data - ["." product] + ["[0]" product] [text ["%" format {"+" [format]}]]] [tool [compiler - ["." version] - ["." language "_" - ["#/." lux "_" - ["#" version]]]]] + ["[0]" version] + ["[0]" language "_" + ["[1]/[0]" lux "_" + ["[1]" version]]]]] [world [net {"+" [URL]} [uri {"+" [URI]}] - ["." http "_" - ["#" client] - ["#/." status] - ["@#" /]]]]]] - ["." // - ["#." identity {"+" [Identity]}] - ["/#" // "_" - ["#." artifact {"+" [Version Artifact]} + ["[0]" http "_" + ["[1]" client] + ["[1]/[0]" status] + ["@[1]" /]]]]]] + ["[0]" // + ["[1][0]" identity {"+" [Identity]}] + ["/[1]" // "_" + ["[1][0]" artifact {"+" [Version Artifact]} [extension {"+" [Extension]}]]]]) (type: .public Address diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux index 3c8ec6485..f600a87f5 100644 --- a/stdlib/source/program/aedifex/runtime.lux +++ b/stdlib/source/program/aedifex/runtime.lux @@ -4,15 +4,15 @@ [abstract [equivalence {"+" [Equivalence]}]] [data - ["." product] - ["." text + ["[0]" product] + ["[0]" text ["%" format {"+" [format]}]] [collection - ["." list ("#\." monoid)]]] + ["[0]" list ("[1]\[0]" monoid)]]] [macro - ["." template]] + ["[0]" template]] [world - ["." file]]]]) + ["[0]" file]]]]) (type: .public Runtime (Record -- cgit v1.2.3