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 --- licentia/source/program/licentia.lux | 30 +++++----- licentia/source/program/licentia/document.lux | 4 +- licentia/source/program/licentia/input.lux | 30 +++++----- licentia/source/program/licentia/license.lux | 4 +- .../source/program/licentia/license/addendum.lux | 2 +- .../source/program/licentia/license/assurance.lux | 2 +- .../source/program/licentia/license/black_list.lux | 8 +-- .../source/program/licentia/license/commercial.lux | 4 +- .../source/program/licentia/license/definition.lux | 2 +- .../program/licentia/license/distribution.lux | 6 +- .../source/program/licentia/license/extension.lux | 6 +- licentia/source/program/licentia/license/grant.lux | 4 +- .../source/program/licentia/license/liability.lux | 2 +- .../source/program/licentia/license/limitation.lux | 2 +- .../program/licentia/license/miscellaneous.lux | 2 +- .../source/program/licentia/license/notice.lux | 10 ++-- .../source/program/licentia/license/submission.lux | 2 +- licentia/source/program/licentia/license/term.lux | 4 +- licentia/source/program/licentia/output.lux | 54 +++++++++--------- licentia/source/test/licentia.lux | 64 +++++++++++----------- 20 files changed, 121 insertions(+), 121 deletions(-) (limited to 'licentia') diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux index 1f5b9c05d..058f762c7 100644 --- a/licentia/source/program/licentia.lux +++ b/licentia/source/program/licentia.lux @@ -16,37 +16,37 @@ [lux "*" [ffi {"+" [import:]}] [program {"+" [program:]}] - ["." debug] + ["[0]" debug] [abstract [monad {"+" [do]}]] [control [remember {"+" [to_do]}] - ["." io {"+" [IO]} ("#\." monad)] - ["." maybe] - ["." try {"+" [Try]}] - ["." parser - ["<.>" cli] - ["<.>" json]] + ["[0]" io {"+" [IO]} ("[1]\[0]" monad)] + ["[0]" maybe] + ["[0]" try {"+" [Try]}] + ["[0]" parser + ["<[0]>" cli] + ["<[0]>" json]] [security ["!" capability]]] [data - ["." text + ["[0]" text ["%" format {"+" [format]}] [encoding - ["." utf8]]] + ["[0]" utf8]]] [format - ["." json]]] + ["[0]" json]]] [world - ["." file]]]] - ["." / "_" - ["#." input] - ["#." output]]) + ["[0]" file]]]] + ["[0]" / "_" + ["[1][0]" input] + ["[1][0]" output]]) (with_expansions [ "2022-04-01"] (to_do "Create a short notice to add as a comment to each file in the _.work")) (import: java/lang/String - ["#::." + ["[1]::[0]" (trim [] java/lang/String)]) (def: default_output_file diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux index 0746e3cbc..a5a6251b2 100644 --- a/licentia/source/program/licentia/document.lux +++ b/licentia/source/program/licentia/document.lux @@ -2,10 +2,10 @@ [library [lux {"-" [or and]} [data - ["." text + ["[0]" text ["%" format {"+" [format]}]] [collection - ["." list ("#\." functor)]]]]]) + ["[0]" list ("[1]\[0]" functor)]]]]]) (def: .public (quote text) (-> Text Text) diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux index 7f2796026..96d19cf14 100644 --- a/licentia/source/program/licentia/input.lux +++ b/licentia/source/program/licentia/input.lux @@ -4,9 +4,9 @@ [abstract [monad {"+" [do]}]] [control - ["." exception {"+" [exception:]}] + ["[0]" exception {"+" [exception:]}] ["<>" parser - ["<.>" json {"+" [Parser]}]]] + ["<[0]>" json {"+" [Parser]}]]] [data [text ["%" format {"+" [format]}]]] @@ -15,19 +15,19 @@ ["n" nat] ["i" int] ["f" frac]]]]] - ["." // "_" - ["#" license {"+" [Identification - Termination - Liability - Distribution - Commercial - Extension - Entity Black_List - URL Attribution - Addendum - License]} - ["." time {"+" [Period]}] - ["." copyright]]]) + ["[0]" // "_" + ["[1]" license {"+" [Identification + Termination + Liability + Distribution + Commercial + Extension + Entity Black_List + URL Attribution + Addendum + License]} + ["[0]" time {"+" [Period]}] + ["[0]" copyright]]]) (def: identification (Parser Identification) diff --git a/licentia/source/program/licentia/license.lux b/licentia/source/program/licentia/license.lux index c810e865d..c52cbe577 100644 --- a/licentia/source/program/licentia/license.lux +++ b/licentia/source/program/licentia/license.lux @@ -1,9 +1,9 @@ (.module: [library [lux "*"]] - ["." / "_" + ["[0]" / "_" [time {"+" [Days Months Period]}] - ["#." copyright]]) + ["[1][0]" copyright]]) (type: .public Identification (Record diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux index 825e91968..7cbe236c9 100644 --- a/licentia/source/program/licentia/license/addendum.lux +++ b/licentia/source/program/licentia/license/addendum.lux @@ -4,7 +4,7 @@ [data [text ["%" format {"+" [format]}]]]]] - ["." // {"+" [Addendum]} + ["[0]" // {"+" [Addendum]} [// ["$" document]]]) diff --git a/licentia/source/program/licentia/license/assurance.lux b/licentia/source/program/licentia/license/assurance.lux index 64e865e14..da571d407 100644 --- a/licentia/source/program/licentia/license/assurance.lux +++ b/licentia/source/program/licentia/license/assurance.lux @@ -2,7 +2,7 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] [// ["_" term] diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux index 96dd85d85..2c3d721ca 100644 --- a/licentia/source/program/licentia/license/black_list.lux +++ b/licentia/source/program/licentia/license/black_list.lux @@ -2,13 +2,13 @@ [library [lux "*" [control - ["." maybe ("#\." functor)]] + ["[0]" maybe ("[1]\[0]" functor)]] [data - ["." text + ["[0]" text ["%" format {"+" [format]}]] [collection - ["." list ("#\." functor)]]]]] - ["." // {"+" [Entity Black_List]} + ["[0]" list ("[1]\[0]" functor)]]]]] + ["[0]" // {"+" [Entity Black_List]} ["_" term] [// ["$" document]]]) diff --git a/licentia/source/program/licentia/license/commercial.lux b/licentia/source/program/licentia/license/commercial.lux index 5a9ea86d3..0410347be 100644 --- a/licentia/source/program/licentia/license/commercial.lux +++ b/licentia/source/program/licentia/license/commercial.lux @@ -2,9 +2,9 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] - ["." // {"+" [Commercial]} + ["[0]" // {"+" [Commercial]} ["_" term] [// ["$" document]]]) diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux index 921c67675..7a2d38381 100644 --- a/licentia/source/program/licentia/license/definition.lux +++ b/licentia/source/program/licentia/license/definition.lux @@ -2,7 +2,7 @@ [library [lux {"-" [Definition]} [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] [/// ["$" document]]) diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux index 22a783d79..c1a24a0b5 100644 --- a/licentia/source/program/licentia/license/distribution.lux +++ b/licentia/source/program/licentia/license/distribution.lux @@ -2,11 +2,11 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]] [collection - ["." list ("#\." monoid)]]]]] - ["." // {"+" [Distribution]} + ["[0]" list ("[1]\[0]" monoid)]]]]] + ["[0]" // {"+" [Distribution]} ["_" term] [// ["$" document]]]) diff --git a/licentia/source/program/licentia/license/extension.lux b/licentia/source/program/licentia/license/extension.lux index 2cf225b88..e2e2c469f 100644 --- a/licentia/source/program/licentia/license/extension.lux +++ b/licentia/source/program/licentia/license/extension.lux @@ -2,11 +2,11 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] - ["." // {"+" [Extension]} + ["[0]" // {"+" [Extension]} ["_" term] - ["." grant] + ["[0]" grant] [time {"+" [Months Period]}] [// ["$" document]]]) diff --git a/licentia/source/program/licentia/license/grant.lux b/licentia/source/program/licentia/license/grant.lux index a0ad84474..0ec3f8a12 100644 --- a/licentia/source/program/licentia/license/grant.lux +++ b/licentia/source/program/licentia/license/grant.lux @@ -2,12 +2,12 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] [// [time {"+" [Days]}] ["_" term] - ["." definition] + ["[0]" definition] [// ["$" document]]]) diff --git a/licentia/source/program/licentia/license/liability.lux b/licentia/source/program/licentia/license/liability.lux index aac47b4e9..005f27112 100644 --- a/licentia/source/program/licentia/license/liability.lux +++ b/licentia/source/program/licentia/license/liability.lux @@ -2,7 +2,7 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] [// ["_" term] diff --git a/licentia/source/program/licentia/license/limitation.lux b/licentia/source/program/licentia/license/limitation.lux index 3da275235..e66ccc562 100644 --- a/licentia/source/program/licentia/license/limitation.lux +++ b/licentia/source/program/licentia/license/limitation.lux @@ -2,7 +2,7 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] [// ["_" term] diff --git a/licentia/source/program/licentia/license/miscellaneous.lux b/licentia/source/program/licentia/license/miscellaneous.lux index bda4bade6..a2d77a122 100644 --- a/licentia/source/program/licentia/license/miscellaneous.lux +++ b/licentia/source/program/licentia/license/miscellaneous.lux @@ -2,7 +2,7 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] [// ["_" term] diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux index 7ade12fc8..33ea7362e 100644 --- a/licentia/source/program/licentia/license/notice.lux +++ b/licentia/source/program/licentia/license/notice.lux @@ -2,16 +2,16 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]] [collection - ["." list ("#\." functor)]]] + ["[0]" list ("[1]\[0]" functor)]]] [math [number ["n" nat]]]]] - ["." // "_" - ["#." time] - ["#." copyright] + ["[0]" // "_" + ["[1][0]" time] + ["[1][0]" copyright] ["_" term] [// ["$" document]]]) diff --git a/licentia/source/program/licentia/license/submission.lux b/licentia/source/program/licentia/license/submission.lux index 4b74d0df8..3fb986351 100644 --- a/licentia/source/program/licentia/license/submission.lux +++ b/licentia/source/program/licentia/license/submission.lux @@ -2,7 +2,7 @@ [library [lux "*" [data - ["." text + ["[0]" text ["%" format {"+" [format]}]]]]] [// ["_" term] diff --git a/licentia/source/program/licentia/license/term.lux b/licentia/source/program/licentia/license/term.lux index 2d4df6ce7..1b9e55ef7 100644 --- a/licentia/source/program/licentia/license/term.lux +++ b/licentia/source/program/licentia/license/term.lux @@ -1,8 +1,8 @@ (.module: [library [lux {"-" [Definition]}]] - ["." // "_" - ["#." definition]]) + ["[0]" // "_" + ["[1][0]" definition]]) (template [ ] [(def: .public diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux index 8b69b0f8d..c271f3005 100644 --- a/licentia/source/program/licentia/output.lux +++ b/licentia/source/program/licentia/output.lux @@ -2,38 +2,38 @@ [library [lux {"-" [Definition]} [control - ["." maybe ("#\." functor)]] + ["[0]" maybe ("[1]\[0]" functor)]] [data - ["." bit] - ["." text + ["[0]" bit] + ["[0]" text ["%" format {"+" [format]}]] [collection - ["." list ("#\." functor monoid)]]]]] + ["[0]" list ("[1]\[0]" functor monoid)]]]]] [// - ["." license {"+" [Identification - Termination - Liability - Distribution - Commercial - Extension - Entity Black_List - URL Attribution - License]} - ["." copyright] - ["." definition {"+" [Definition]}] - ["." grant] - ["." limitation] - ["." assurance] - ["." liability] - ["." distribution] - ["." commercial] - ["." extension] - ["." submission] - ["." miscellaneous] - ["." black_list] - ["." notice] + ["[0]" license {"+" [Identification + Termination + Liability + Distribution + Commercial + Extension + Entity Black_List + URL Attribution + License]} + ["[0]" copyright] + ["[0]" definition {"+" [Definition]}] + ["[0]" grant] + ["[0]" limitation] + ["[0]" assurance] + ["[0]" liability] + ["[0]" distribution] + ["[0]" commercial] + ["[0]" extension] + ["[0]" submission] + ["[0]" miscellaneous] + ["[0]" black_list] + ["[0]" notice] ["_" term] - ["." addendum]] + ["[0]" addendum]] ["$" document]]) (def: .public (definition value) diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index 8f967502a..4940b31eb 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -6,43 +6,43 @@ [abstract [monad {"+" [do]}]] [control - ["." io] - ["." maybe ("#\." functor)]] + ["[0]" io] + ["[0]" maybe ("[1]\[0]" functor)]] [data - ["." bit ("#\." equivalence)] - ["." text] + ["[0]" bit ("[1]\[0]" equivalence)] + ["[0]" text] [collection - ["." list ("#\." functor)]]] + ["[0]" list ("[1]\[0]" functor)]]] [math - ["." random {"+" [Random]}] + ["[0]" random {"+" [Random]}] [number - ["n" nat ("#\." interval)]]]]] + ["n" nat ("[1]\[0]" interval)]]]]] [\\program - ["." output] - ["." license {"+" [Identification - Termination - Liability - Distribution - Commercial - Extension - Entity Black_List - URL Attribution - Addendum - License]} - ["." time {"+" [Period]}] - ["." copyright] - ["." notice] - ["." definition] - ["." grant] - ["." limitation] - ["." submission] - ["." liability] - ["." distribution] - ["." commercial] - ["." extension] - ["." miscellaneous] - ["." black_list] - ["." addendum]]]) + ["[0]" output] + ["[0]" license {"+" [Identification + Termination + Liability + Distribution + Commercial + Extension + Entity Black_List + URL Attribution + Addendum + License]} + ["[0]" time {"+" [Period]}] + ["[0]" copyright] + ["[0]" notice] + ["[0]" definition] + ["[0]" grant] + ["[0]" limitation] + ["[0]" submission] + ["[0]" liability] + ["[0]" distribution] + ["[0]" commercial] + ["[0]" extension] + ["[0]" miscellaneous] + ["[0]" black_list] + ["[0]" addendum]]]) (def: period (Random (Period Nat)) -- cgit v1.2.3