From 3e7d188cbe7bc9bce4a14318e2f62583fe2501d1 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Fri, 3 Jun 2022 20:02:46 -0400 Subject: Extensible import syntax [Part 4] --- stdlib/source/program/aedifex/artifact/extension.lux | 4 ++-- stdlib/source/program/aedifex/artifact/snapshot.lux | 4 ++-- stdlib/source/program/aedifex/artifact/snapshot/stamp.lux | 4 ++-- stdlib/source/program/aedifex/artifact/snapshot/time.lux | 4 ++-- stdlib/source/program/aedifex/artifact/snapshot/version.lux | 4 ++-- stdlib/source/program/aedifex/artifact/time.lux | 4 ++-- stdlib/source/program/aedifex/artifact/time/time.lux | 4 ++-- stdlib/source/program/aedifex/artifact/versioning.lux | 6 +++--- stdlib/source/program/aedifex/command.lux | 2 +- stdlib/source/program/aedifex/command/auto.lux | 6 +++--- stdlib/source/program/aedifex/command/build.lux | 4 ++-- stdlib/source/program/aedifex/command/clean.lux | 2 +- stdlib/source/program/aedifex/command/deploy.lux | 6 +++--- stdlib/source/program/aedifex/command/deploy/release.lux | 12 ++++++------ stdlib/source/program/aedifex/command/deploy/snapshot.lux | 4 ++-- stdlib/source/program/aedifex/command/deps.lux | 4 ++-- stdlib/source/program/aedifex/command/install.lux | 6 +++--- stdlib/source/program/aedifex/command/pom.lux | 2 +- stdlib/source/program/aedifex/command/test.lux | 4 ++-- stdlib/source/program/aedifex/command/version.lux | 2 +- stdlib/source/program/aedifex/dependency.lux | 2 +- stdlib/source/program/aedifex/dependency/deployment.lux | 8 ++++---- stdlib/source/program/aedifex/dependency/resolution.lux | 10 +++++----- stdlib/source/program/aedifex/dependency/status.lux | 2 +- stdlib/source/program/aedifex/format.lux | 2 +- stdlib/source/program/aedifex/input.lux | 2 +- stdlib/source/program/aedifex/local.lux | 2 +- stdlib/source/program/aedifex/metadata.lux | 4 ++-- stdlib/source/program/aedifex/metadata/artifact.lux | 8 ++++---- stdlib/source/program/aedifex/metadata/snapshot.lux | 10 +++++----- stdlib/source/program/aedifex/package.lux | 2 +- stdlib/source/program/aedifex/parser.lux | 4 ++-- stdlib/source/program/aedifex/pom.lux | 4 ++-- stdlib/source/program/aedifex/project.lux | 4 ++-- stdlib/source/program/aedifex/repository/local.lux | 6 +++--- stdlib/source/program/aedifex/repository/remote.lux | 8 ++++---- 36 files changed, 83 insertions(+), 83 deletions(-) (limited to 'stdlib/source/program/aedifex') diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux index 7a308a1bf..744731370 100644 --- a/stdlib/source/program/aedifex/artifact/extension.lux +++ b/stdlib/source/program/aedifex/artifact/extension.lux @@ -2,11 +2,11 @@ [library [lux (.except type) [data - ["[0]" text + ["[0]" text (.only) ["%" format (.only format)]]] [macro ["[0]" template]]]] - ["[0]" // "_" + ["[0]" // ["[1]" type]]) (type: .public Extension diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux index 49e689a72..b8c0f8db4 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot.lux @@ -5,14 +5,14 @@ [equivalence (.only Equivalence)] [monad (.only do)]] [control - ["<>" parser + ["<>" parser (.only) ["<[0]>" xml (.only Parser)] ["<[0]>" text]]] [data ["[0]" sum] [format ["[0]" xml (.only XML)]]]]] - ["[0]" / "_" + ["[0]" / ["[1][0]" stamp (.only Stamp)]]) (type: .public Snapshot diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux index 8e2a68db8..315aa037d 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux @@ -5,14 +5,14 @@ [equivalence (.only Equivalence)] [monad (.only do)]] [control - ["<>" parser + ["<>" parser (.only) ["<[0]>" xml (.only Parser)] ["<[0]>" text]]] [data ["[0]" product] [format ["[0]" xml (.only XML)]]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" time (.only Time)] ["[1][0]" build (.only Build)]]) diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux index 3fd81d69d..9f306f1d7 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux @@ -6,7 +6,7 @@ [monad (.only do)]] [control ["[0]" exception (.only exception:)] - ["<>" parser + ["<>" parser (.only) ["<[0]>" text] ["<[0]>" xml (.only Parser)]]] [data @@ -16,7 +16,7 @@ ["[0]" xml (.only XML)]]] [time ["[0]" instant (.only Instant)]]]] - ["[0]" /// "_" + ["[0]" /// ["[1][0]" time ["[1]/[0]" date] ["[1]/[0]" time]]]) diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux index d027bf8e8..a1afbd888 100644 --- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux +++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux @@ -5,7 +5,7 @@ [equivalence (.only Equivalence)] [monad (.only do)]] [control - ["<>" parser + ["<>" parser (.only) ["<[0]>" xml (.only Parser)] ["<[0]>" text]]] [data @@ -13,7 +13,7 @@ ["[0]" text] [format ["[0]" xml (.only XML)]]]]] - ["[0]" /// "_" + ["[0]" /// ["[1][0]" type (.only Type)] ["[1][0]" time (.only Time)]]) diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux index 1afab48ba..a35084d6e 100644 --- a/stdlib/source/program/aedifex/artifact/time.lux +++ b/stdlib/source/program/aedifex/artifact/time.lux @@ -7,7 +7,7 @@ [monad (.only do)]] [control ["[0]" try (.only Try)] - ["<>" parser + ["<>" parser (.only) ["<[0]>" text (.only Parser)]]] [data ["[0]" product] @@ -15,7 +15,7 @@ ["%" format (.only Format)]]] [time ["[0]" instant (.only Instant)]]]] - ["[0]" / "_" + ["[0]" / ["[1][0]" date] ["[1][0]" time]]) diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux index cf4bb0761..a957c6a15 100644 --- a/stdlib/source/program/aedifex/artifact/time/time.lux +++ b/stdlib/source/program/aedifex/artifact/time/time.lux @@ -5,7 +5,7 @@ [abstract [monad (.only do)]] [control - ["<>" parser + ["<>" parser (.only) ["<[0]>" text (.only Parser)]]] [data [text @@ -13,7 +13,7 @@ [math [number ["n" nat]]]]] - ["[0]" // "_" + ["[0]" // ["[1]" date]]) (type: .public Time diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux index 66ac3c146..fd4563b10 100644 --- a/stdlib/source/program/aedifex/artifact/versioning.lux +++ b/stdlib/source/program/aedifex/artifact/versioning.lux @@ -6,12 +6,12 @@ [monad (.only do)]] [control ["[0]" exception (.only exception:)] - ["<>" parser + ["<>" parser (.only) ["<[0]>" xml (.only Parser)] ["<[0]>" text]]] [data ["[0]" product] - ["[0]" text + ["[0]" text (.only) ["%" format]] [format ["[0]" xml (.only XML)]] @@ -24,7 +24,7 @@ ["[0]" date (.only Date)] ["[0]" year] ["[0]" month]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" time] ["[1][0]" snapshot (.only Snapshot) ["[1]/[0]" version (.only Version)]]]) diff --git a/stdlib/source/program/aedifex/command.lux b/stdlib/source/program/aedifex/command.lux index a8370462d..c7fe7d1dd 100644 --- a/stdlib/source/program/aedifex/command.lux +++ b/stdlib/source/program/aedifex/command.lux @@ -1,7 +1,7 @@ (.using [library [lux (.full)]] - ["[0]" // "_" + ["[0]" // ["[1]" profile] ["[1][0]" action (.only Action)]]) diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index 5b48f53e9..d9b565a08 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -15,10 +15,10 @@ [program (.only Program)] [shell (.only Exit Shell)] [console (.only Console)] - ["[0]" file + ["[0]" file (.only) ["[0]" watch (.only Watcher)]]]]] - ["[0]" // "_" - ["/[1]" // "_" + ["[0]" // + ["/[1]" // [command (.only Command)] ["[1]" profile] ["[1][0]" action] diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 6e4629a72..3e175f2d7 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -32,7 +32,7 @@ [meta [cli ["[0]" compiler]] - ["[0]" packager + ["[0]" packager (.only) ["[0]_[1]" ruby]]]]] [world ["[0]" program (.only Program)] @@ -41,7 +41,7 @@ ["[0]" console (.only Console)] [net ["[0]" uri]]]]] - ["[0]" /// "_" + ["[0]" /// ["[1]" profile] ["[1][0]" action] ["[1][0]" command (.only Command)] diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux index 8026697e9..6b03b8cea 100644 --- a/stdlib/source/program/aedifex/command/clean.lux +++ b/stdlib/source/program/aedifex/command/clean.lux @@ -13,7 +13,7 @@ [world ["[0]" file (.only Path)] ["[0]" console (.only Console)]]]] - ["[0]" /// "_" + ["[0]" /// [command (.only Command)] ["[1]" profile] ["[1][0]" action (.only Action)]]) diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux index 2349894f2..572672110 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -12,11 +12,11 @@ [shell (.only Shell)] ["[0]" file] ["[0]" console (.only Console)]]]] - ["[0]" / "_" + ["[0]" / ["[1][0]" snapshot] ["[1][0]" release] - ["/[1]" // "_" - ["/[1]" // "_" + ["/[1]" // + ["/[1]" // [command (.only Command)] [repository (.only Repository)] [artifact (.only Artifact)] diff --git a/stdlib/source/program/aedifex/command/deploy/release.lux b/stdlib/source/program/aedifex/command/deploy/release.lux index dcda6536d..04c699286 100644 --- a/stdlib/source/program/aedifex/command/deploy/release.lux +++ b/stdlib/source/program/aedifex/command/deploy/release.lux @@ -15,7 +15,7 @@ ["[0]" environment]]] [data ["[0]" binary (.only Binary)] - ["[0]" text + ["[0]" text (.only) ["%" format] [encoding ["[0]" utf8]]] @@ -32,25 +32,25 @@ ["[0]" export] ["[0]" archive] ["[0]" context] - ["[0]" packager "_" + ["[0]" packager ["[1]" jvm]]]]] [world [program (.only Program)] [console (.only Console)] ["[0]" shell (.only Shell)] ["[0]" file]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" snapshot] - ["/[1]" // "_" + ["/[1]" // ["[1][0]" install] - ["/[1]" // "_" + ["/[1]" // [command (.only Command)] ["/" profile] ["[1][0]" action] ["[1][0]" pom] ["[1][0]" package] ["[1][0]" hash] - ["[1][0]" dependency "_" + ["[1][0]" dependency ["[1]/[0]" deployment] ["[1]/[0]" status]] ["[1][0]" repository (.only Repository) diff --git a/stdlib/source/program/aedifex/command/deploy/snapshot.lux b/stdlib/source/program/aedifex/command/deploy/snapshot.lux index 9e0f0f73c..f1c779517 100644 --- a/stdlib/source/program/aedifex/command/deploy/snapshot.lux +++ b/stdlib/source/program/aedifex/command/deploy/snapshot.lux @@ -24,13 +24,13 @@ [world [console (.only Console)] ["[0]" file]]]] - ["[0]" //// "_" + ["[0]" //// [command (.only Command)] ["/" profile] ["[1][0]" action] ["[1][0]" pom] ["[1][0]" package] - ["[1][0]" dependency "_" + ["[1][0]" dependency ["[1]/[0]" deployment] ["[1]/[0]" status]] ["[1][0]" repository (.only Repository) diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index 795187c01..f3cfc3d20 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -19,9 +19,9 @@ [program (.only Program)] ["[0]" file] ["[0]" console (.only Console)]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" clean] - ["/[1]" // "_" + ["/[1]" // [command (.only Command)] [repository (.only Repository)] ["[1]" profile] diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index 27ed1b7c6..803bda26f 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -27,9 +27,9 @@ [program (.only Program)] ["[0]" file] ["[0]" console (.only Console)]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" clean] - ["/[1]" // "_" + ["/[1]" // ["/" profile (.only Profile)] ["[1][0]" action (.only Action)] ["[1][0]" command (.only Command)] @@ -38,7 +38,7 @@ ["[1][0]" package] [repository (.only Repository) ["[1][0]" origin]] - ["[1][0]" dependency "_" + ["[1][0]" dependency ["[1]/[0]" deployment] ["[1]/[0]" status]] ["[1][0]" artifact (.only Artifact) diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux index 32b71a4f4..865e650a1 100644 --- a/stdlib/source/program/aedifex/command/pom.lux +++ b/stdlib/source/program/aedifex/command/pom.lux @@ -17,7 +17,7 @@ [world ["[0]" file] ["[0]" console (.only Console)]]]] - ["[0]" /// "_" + ["[0]" /// [command (.only Command)] ["[1][0]" action] ["[1][0]" pom]]) diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux index 8b3c5fae3..921a74148 100644 --- a/stdlib/source/program/aedifex/command/test.lux +++ b/stdlib/source/program/aedifex/command/test.lux @@ -20,9 +20,9 @@ ["[0]" file] ["[0]" shell (.only Exit Shell)] ["[0]" console (.only Console)]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" build] - ["/[1]" // "_" + ["/[1]" // ["[1]" profile] ["[1][0]" action] ["[1][0]" command (.only Command)] diff --git a/stdlib/source/program/aedifex/command/version.lux b/stdlib/source/program/aedifex/command/version.lux index 6e3e5dd3f..488b7660a 100644 --- a/stdlib/source/program/aedifex/command/version.lux +++ b/stdlib/source/program/aedifex/command/version.lux @@ -5,7 +5,7 @@ [try (.only Try)] [concurrency ["[0]" async (.only Async)]]] - ["[0]" meta "_" + ["[0]" meta ["[1]/[0]" version]] [tool [compiler diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index 4a06cbede..3a8a69d81 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -9,7 +9,7 @@ ["[0]" product] ["[0]" text ("[1]#[0]" order) ["%" format (.only format)]]]]] - ["[0]" // "_" + ["[0]" // ["[1]" artifact (.only Artifact) ("[1]#[0]" order) [type (.only Type)]]]) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index fae43920d..a904e9f6c 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -21,7 +21,7 @@ ["[0]" list ("[1]#[0]" monoid)]]] [time ["[0]" instant (.only Instant)]]]] - ["[0]" /// "_" + ["[0]" /// [repository (.only Repository)] ["[1][0]" hash (.only Hash)] ["[1][0]" package (.only Package)] @@ -30,10 +30,10 @@ ["[1]/[0]" type] ["[1]/[0]" extension (.only Extension)] ["[1]/[0]" versioning] - ["[1]/[0]" snapshot - ["[1]/[0]" version + ["[1]/[0]" snapshot (.only) + ["[1]/[0]" version (.only) ["[1]/[0]" value]]]] - ["[1][0]" metadata "_" + ["[1][0]" metadata ["[1]/[0]" artifact] ["[1]/[0]" snapshot (.only Metadata)]] ["[1][0]" dependency (.only Dependency) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index c0645959a..f535dd186 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -13,13 +13,13 @@ ["[0]" maybe] ["[0]" try (.only Try) ("[1]#[0]" functor)] ["[0]" exception (.only Exception exception:)] - ["<>" parser + ["<>" parsernone ["<[0]>" xml (.only Parser)]] [concurrency ["[0]" async (.only Async)]]] [data ["[0]" binary (.only Binary)] - ["[0]" text + ["[0]" textnone ["%" format (.only format)] [encoding ["[0]" utf8]]] @@ -37,11 +37,11 @@ [console (.only Console)] [net (.only URL) ["[0]" uri] - ["[0]" http "_" + ["[0]" http ["[1]" client]]]]]] ["[0]" // (.only Dependency) ["[1][0]" status (.only Status)] - ["/[1]" // "_" + ["/[1]" // ["/" profile] ["[1][0]" hash (.only Hash SHA-1 MD5)] ["[1][0]" pom] @@ -49,7 +49,7 @@ ["[1][0]" artifact (.only Version Artifact) ["[1]/[0]" extension (.only Extension)] ["[1]/[0]" versioning] - ["[0]" snapshot + ["[0]" snapshotnone [version ["[0]" value]]]] ["[1][0]" repository (.only Repository) diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux index 627bae8c7..1ed4b187a 100644 --- a/stdlib/source/program/aedifex/dependency/status.lux +++ b/stdlib/source/program/aedifex/dependency/status.lux @@ -7,7 +7,7 @@ [binary (.only Binary)] ["[0]" sum] ["[0]" product]]]] - ["[0]" /// "_" + ["[0]" /// ["[1][0]" hash (.only Hash SHA-1 MD5)]]) (type: .public Status diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index 25881fc2e..17faaa55c 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -15,7 +15,7 @@ [meta [cli [compiler (.only Compiler)]]]]]]] - ["[0]" // "_" + ["[0]" // ["/" profile] ["[1][0]" runtime (.only Runtime)] ["[1][0]" project (.only Project)] diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index 463c21179..c9cea74cc 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -25,7 +25,7 @@ ["[0]" syntax]]]]] [world ["[0]" file]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" profile (.only Name Profile)] ["[1][0]" project (.only Project)] ["[1][0]" parser]]) diff --git a/stdlib/source/program/aedifex/local.lux b/stdlib/source/program/aedifex/local.lux index fb7ae07dd..7de56dfaa 100644 --- a/stdlib/source/program/aedifex/local.lux +++ b/stdlib/source/program/aedifex/local.lux @@ -7,7 +7,7 @@ [world [net ["[0]" uri (.only URI)]]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" artifact (.only Version Artifact)]]) (def: / uri.separator) diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux index 7900ad204..e85c4dd5b 100644 --- a/stdlib/source/program/aedifex/metadata.lux +++ b/stdlib/source/program/aedifex/metadata.lux @@ -2,13 +2,13 @@ [library [lux (.full) [data - ["[0]" text + ["[0]" text (.only) ["%" format (.only format)]]] [world [file (.only Path)] [net ["[0]" uri (.only URI)]]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" artifact (.only Artifact)]]) (def: remote_file diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index b5cffce20..6391eb70a 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -7,14 +7,14 @@ [control ["[0]" pipe] ["[0]" try (.only Try)] - ["<>" parser + ["<>" parser (.only) ["<[0]>" xml (.only Parser)] ["<[0]>" text]] [concurrency ["[0]" async (.only Async)]]] [data ["[0]" product] - ["[0]" text + ["[0]" text (.only) ["%" format] [encoding ["[0]" utf8]]] @@ -33,8 +33,8 @@ [world [net ["[0]" uri (.only URI)]]]]] - ["[0]" // - ["/[1]" // "_" + ["[0]" // (.only) + ["/[1]" // [repository (.only Repository)] ["[1][0]" artifact (.only Group Name Version Artifact)]]]) diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index deb58391e..1e0879467 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -8,14 +8,14 @@ ["[0]" pipe] ["[0]" try (.only Try)] ["[0]" exception (.only exception:)] - ["<>" parser + ["<>" parser (.only) ["<[0]>" xml (.only Parser)] ["<[0]>" text]] [concurrency ["[0]" async (.only Async)]]] [data ["[0]" product] - ["[0]" text + ["[0]" text (.only) ["%" format] [encoding ["[0]" utf8]]] @@ -34,14 +34,14 @@ [world [net ["[0]" uri (.only URI)]]]]] - ["[0]" // - ["/[1]" // "_" + ["[0]" // (.only) + ["/[1]" // [repository (.only Repository)] ["[1][0]" artifact (.only Group Name Version Artifact) ["[1]/[0]" time] ["[1]/[0]" type (.only Type)] ["[1]/[0]" versioning (.only Versioning)] - ["[1]/[0]" snapshot + ["[1]/[0]" snapshot (.only) ["[1]/[0]" version] ["[1]/[0]" stamp]]]]]) diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 4929320d9..f8f140b40 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -18,7 +18,7 @@ ["[0]" xml (.only XML)]] [collection [set (.only Set)]]]]] - ["[0]" // "_" + ["[0]" // ["/" profile] ["[1][0]" hash] ["[1][0]" pom] diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index cc45e659e..b4014f06a 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -23,13 +23,13 @@ [descriptor (.only Module)]]]]]] [world [net (.only URL)]]]] - ["[0]" // "_" + ["[0]" // ["/" profile] ["[1][0]" runtime (.only Runtime)] ["[1][0]" project (.only Project)] ["[1][0]" dependency] ["[1][0]" format] - ["[1][0]" repository "_" + ["[1][0]" repository ["[1]" remote]] ["[1][0]" artifact (.only Artifact) ["[1]/[0]" type]]]) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 8736deba8..4bf36f52a 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -8,7 +8,7 @@ ["[0]" maybe ("[1]#[0]" functor)] ["[0]" try (.only Try)] ["[0]" exception] - ["<>" parser + ["<>" parser (.only) ["<[0]>" xml (.only Parser)]]] [data ["[0]" text] @@ -22,7 +22,7 @@ ["[0]" symbol]] [world ["[0]" file]]]] - ["[0]" // "_" + ["[0]" // ["/" profile] ["[1][0]" dependency (.only Dependency)] [repository diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index 9ab033a58..80c8292ba 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -9,13 +9,13 @@ ["[0]" try (.only Try)] ["[0]" exception (.only exception:)]] [data - ["[0]" text + ["[0]" text (.only) ["%" format (.only format)]] [collection ["[0]" dictionary (.only Dictionary)] ["[0]" set (.only Set)] ["[0]" list ("[1]#[0]" mix)]]]]] - ["[0]" // "_" + ["[0]" // ["[1]" profile (.only Name Profile)]]) (def: .public file diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux index 03ea25b7a..89faa2788 100644 --- a/stdlib/source/program/aedifex/repository/local.lux +++ b/stdlib/source/program/aedifex/repository/local.lux @@ -8,15 +8,15 @@ [concurrency ["[0]" async (.only Async)]]] [data - ["[0]" text + ["[0]" text (.only) ["%" format (.only format)]]] [world [program (.only Program)] ["[0]" file] [net ["[0]" uri (.only URI)]]]]] - ["[0]" // - ["/[1]" // "_" + ["[0]" // (.only) + ["/[1]" // ["[1][0]" local] ["[1][0]" metadata]]]) diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index 5b231fbca..7f5d84775 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -11,7 +11,7 @@ ["[0]" product] [text ["%" format (.only format)]]] - ["[0]" meta "_" + ["[0]" meta ["[1]/[0]" version]] [tool [compiler @@ -19,13 +19,13 @@ [world [net (.only URL) [uri (.only URI)] - ["[0]" http "_" + ["[0]" http ["[1]" client] ["[1]/[0]" status] ["@[1]" /]]]]]] - ["[0]" // + ["[0]" // (.only) ["[1][0]" identity (.only Identity)] - ["/[1]" // "_" + ["/[1]" // ["[1][0]" artifact (.only Version Artifact) [extension (.only Extension)]]]]) -- cgit v1.2.3