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] --- licentia/source/program/licentia.lux | 2 +- licentia/source/program/licentia/input.lux | 4 ++-- licentia/source/program/licentia/license.lux | 4 ++-- licentia/source/program/licentia/license/addendum.lux | 2 +- licentia/source/program/licentia/license/assurance.lux | 2 +- licentia/source/program/licentia/license/black_list.lux | 2 +- licentia/source/program/licentia/license/commercial.lux | 2 +- licentia/source/program/licentia/license/copyright.lux | 2 +- licentia/source/program/licentia/license/distribution.lux | 2 +- licentia/source/program/licentia/license/extension.lux | 2 +- licentia/source/program/licentia/license/grant.lux | 2 +- licentia/source/program/licentia/license/liability.lux | 2 +- licentia/source/program/licentia/license/limitation.lux | 4 ++-- licentia/source/program/licentia/license/miscellaneous.lux | 4 ++-- licentia/source/program/licentia/license/notice.lux | 4 ++-- licentia/source/program/licentia/license/submission.lux | 2 +- licentia/source/program/licentia/license/term.lux | 2 +- licentia/source/program/licentia/license/time.lux | 2 +- licentia/source/test/licentia.lux | 2 +- 19 files changed, 24 insertions(+), 24 deletions(-) (limited to 'licentia/source') diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux index 92b1ca33a..05ea0a2f7 100644 --- a/licentia/source/program/licentia.lux +++ b/licentia/source/program/licentia.lux @@ -38,7 +38,7 @@ ["[0]" json]]] [world ["[0]" file]]]] - ["[0]" / "_" + ["[0]" / ["[1][0]" input] ["[1][0]" output]]) diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux index bc15a805e..2e821d062 100644 --- a/licentia/source/program/licentia/input.lux +++ b/licentia/source/program/licentia/input.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [abstract [monad (.only do)]] [control @@ -15,7 +15,7 @@ ["n" nat] ["i" int] ["f" frac]]]]] - ["[0]" // "_" + ["[0]" // ["[1]" license (.only Identification Termination Liability diff --git a/licentia/source/program/licentia/license.lux b/licentia/source/program/licentia/license.lux index 997206aea..a5633e0e3 100644 --- a/licentia/source/program/licentia/license.lux +++ b/licentia/source/program/licentia/license.lux @@ -1,7 +1,7 @@ (.using [library - [lux (.full)]] - ["[0]" / "_" + [lux (.except)]] + ["[0]" / [time (.only Days Months Period)] ["[1][0]" copyright]]) diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux index efc357b0a..a30e271e7 100644 --- a/licentia/source/program/licentia/license/addendum.lux +++ b/licentia/source/program/licentia/license/addendum.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data [text ["%" format (.only format)]]]]] diff --git a/licentia/source/program/licentia/license/assurance.lux b/licentia/source/program/licentia/license/assurance.lux index 9e02ababb..37dd3ae5b 100644 --- a/licentia/source/program/licentia/license/assurance.lux +++ b/licentia/source/program/licentia/license/assurance.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data ["[0]" text ["%" format (.only format)]]]]] diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux index 6ec0d4bfb..85338d15b 100644 --- a/licentia/source/program/licentia/license/black_list.lux +++ b/licentia/source/program/licentia/license/black_list.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [control ["[0]" maybe ("[1]#[0]" functor)]] [data diff --git a/licentia/source/program/licentia/license/commercial.lux b/licentia/source/program/licentia/license/commercial.lux index c49fa3422..e750c9de6 100644 --- a/licentia/source/program/licentia/license/commercial.lux +++ b/licentia/source/program/licentia/license/commercial.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data ["[0]" text ["%" format (.only format)]]]]] diff --git a/licentia/source/program/licentia/license/copyright.lux b/licentia/source/program/licentia/license/copyright.lux index fc7dffde6..6e4bfab07 100644 --- a/licentia/source/program/licentia/license/copyright.lux +++ b/licentia/source/program/licentia/license/copyright.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full)]] + [lux (.except)]] [// [time (.only Year Period)]]) diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux index 6e734f017..396bdd4ec 100644 --- a/licentia/source/program/licentia/license/distribution.lux +++ b/licentia/source/program/licentia/license/distribution.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data ["[0]" text ["%" format (.only format)]] diff --git a/licentia/source/program/licentia/license/extension.lux b/licentia/source/program/licentia/license/extension.lux index 9209b3bff..6e93b366c 100644 --- a/licentia/source/program/licentia/license/extension.lux +++ b/licentia/source/program/licentia/license/extension.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data ["[0]" text ["%" format (.only format)]]]]] diff --git a/licentia/source/program/licentia/license/grant.lux b/licentia/source/program/licentia/license/grant.lux index 1f4b93f03..bd319a1dc 100644 --- a/licentia/source/program/licentia/license/grant.lux +++ b/licentia/source/program/licentia/license/grant.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data ["[0]" text ["%" format (.only format)]]]]] diff --git a/licentia/source/program/licentia/license/liability.lux b/licentia/source/program/licentia/license/liability.lux index cc56738d9..661ce8b52 100644 --- a/licentia/source/program/licentia/license/liability.lux +++ b/licentia/source/program/licentia/license/liability.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data ["[0]" text ["%" format (.only format)]]]]] diff --git a/licentia/source/program/licentia/license/limitation.lux b/licentia/source/program/licentia/license/limitation.lux index c65477b04..dd02ad7dc 100644 --- a/licentia/source/program/licentia/license/limitation.lux +++ b/licentia/source/program/licentia/license/limitation.lux @@ -1,8 +1,8 @@ (.using [library - [lux (.full) + [lux (.except) [data - ["[0]" text + [text ["%" format (.only format)]]]]] [// ["_" term] diff --git a/licentia/source/program/licentia/license/miscellaneous.lux b/licentia/source/program/licentia/license/miscellaneous.lux index 83965b5dd..2e85786d5 100644 --- a/licentia/source/program/licentia/license/miscellaneous.lux +++ b/licentia/source/program/licentia/license/miscellaneous.lux @@ -1,8 +1,8 @@ (.using [library - [lux (.full) + [lux (.except) [data - ["[0]" text + [text ["%" format (.only format)]]]]] [// ["_" term] diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux index 34dc7c429..009401794 100644 --- a/licentia/source/program/licentia/license/notice.lux +++ b/licentia/source/program/licentia/license/notice.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data ["[0]" text ["%" format (.only format)]] @@ -9,7 +9,7 @@ [math [number ["n" nat]]]]] - ["[0]" // "_" + ["[0]" // ["[1][0]" time] ["[1][0]" copyright] ["_" term] diff --git a/licentia/source/program/licentia/license/submission.lux b/licentia/source/program/licentia/license/submission.lux index b596470ea..98765ad92 100644 --- a/licentia/source/program/licentia/license/submission.lux +++ b/licentia/source/program/licentia/license/submission.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [data ["[0]" text ["%" format (.only format)]]]]] diff --git a/licentia/source/program/licentia/license/term.lux b/licentia/source/program/licentia/license/term.lux index 370a8829f..87f94860a 100644 --- a/licentia/source/program/licentia/license/term.lux +++ b/licentia/source/program/licentia/license/term.lux @@ -1,7 +1,7 @@ (.using [library [lux (.except Definition)]] - ["[0]" // "_" + ["[0]" // ["[1][0]" definition]]) (template [ ] diff --git a/licentia/source/program/licentia/license/time.lux b/licentia/source/program/licentia/license/time.lux index 10956aed3..eb08fe651 100644 --- a/licentia/source/program/licentia/license/time.lux +++ b/licentia/source/program/licentia/license/time.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full)]]) + [lux (.except)]]) (type: .public Days Nat) diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index 5dd08c02e..86da654d9 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.full) + [lux (.except) [program (.only program:)] ["_" test (.only Test)] [abstract -- cgit v1.2.3