From 2dbbaaec93a53f8dd0b96a0028b9cf125c9066cd Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Sun, 12 Sep 2021 15:39:55 -0400 Subject: Re-named \ => # && \\ => ## --- licentia/source/program/licentia.lux | 14 +++++++------- licentia/source/program/licentia/document.lux | 4 ++-- licentia/source/program/licentia/license/black_list.lux | 8 ++++---- licentia/source/program/licentia/license/distribution.lux | 4 ++-- licentia/source/program/licentia/license/notice.lux | 4 ++-- licentia/source/program/licentia/output.lux | 14 +++++++------- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'licentia/source/program') diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux index 5ba705517..fd2ee3202 100644 --- a/licentia/source/program/licentia.lux +++ b/licentia/source/program/licentia.lux @@ -21,7 +21,7 @@ [monad {"+" [do]}]] [control [remember {"+" [to_do]}] - ["[0]" io {"+" [IO]} ("[1]\[0]" monad)] + ["[0]" io {"+" [IO]} ("[1]#[0]" monad)] ["[0]" maybe] ["[0]" try {"+" [Try]}] ["[0]" parser @@ -65,16 +65,16 @@ (do io.monad [?done (: (IO (Try Any)) (do (try.with io.monad) - [blob (\ file.default read input) - document (io\wrap (do [! try.monad] - [raw_json (\ utf8.codec decoded blob) + [blob (# file.default read input) + document (io#wrap (do [! try.monad] + [raw_json (# utf8.codec decoded blob) json (|> raw_json java/lang/String::trim - (\ json.codec decoded))] + (# json.codec decoded))] (|> json (.result /input.license) - (\ ! each /output.license))))] - (\ file.default write (\ utf8.codec encoded document) output)))] + (# ! each /output.license))))] + (# file.default write (# utf8.codec encoded document) output)))] (wrap (debug.log! (case ?done {try.#Success _} (success_message output) diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux index a5a6251b2..b4eb63453 100644 --- a/licentia/source/program/licentia/document.lux +++ b/licentia/source/program/licentia/document.lux @@ -5,7 +5,7 @@ ["[0]" text ["%" format {"+" [format]}]] [collection - ["[0]" list ("[1]\[0]" functor)]]]]]) + ["[0]" list ("[1]#[0]" functor)]]]]]) (def: .public (quote text) (-> Text Text) @@ -25,7 +25,7 @@ (def: .public paragraph (-> (List Text) Text) - (|>> (list\each ..sentence) + (|>> (list#each ..sentence) (text.interposed text.new_line))) (template [ ] diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux index b17c674bf..14e851c99 100644 --- a/licentia/source/program/licentia/license/black_list.lux +++ b/licentia/source/program/licentia/license/black_list.lux @@ -2,12 +2,12 @@ [library [lux "*" [control - ["[0]" maybe ("[1]\[0]" functor)]] + ["[0]" maybe ("[1]#[0]" functor)]] [data ["[0]" text ["%" format {"+" [format]}]] [collection - ["[0]" list ("[1]\[0]" functor)]]]]] + ["[0]" list ("[1]#[0]" functor)]]]]] ["[0]" // {"+" [Entity Black_List]} ["_" term] [// @@ -23,11 +23,11 @@ effect "shall not be granted to the following entities, or any subsidiary thereof" justification (|> black_list (value@ //.#justification) - (maybe\each (|>> (format ", due to "))) + (maybe#each (|>> (format ", due to "))) (maybe.default "")) entities (|> black_list (value@ //.#entities) - (list\each ..entity) + (list#each ..entity) (text.interposed text.new_line))] (format scope " " effect justification ":" text.new_line entities))) diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux index 8471653fa..1a0e58601 100644 --- a/licentia/source/program/licentia/license/distribution.lux +++ b/licentia/source/program/licentia/license/distribution.lux @@ -5,7 +5,7 @@ ["[0]" text ["%" format {"+" [format]}]] [collection - ["[0]" list ("[1]\[0]" monoid)]]]]] + ["[0]" list ("[1]#[0]" monoid)]]]]] ["[0]" // {"+" [Distribution]} ["_" term] [// @@ -104,7 +104,7 @@ (def: .public (extension distribution) (-> Distribution Text) - ($.paragraph ($_ list\composite + ($.paragraph ($_ list#composite (if (value@ //.#can_re_license? distribution) (list allow_re_licensing) (list)) diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux index 2579e51e0..634cf6a16 100644 --- a/licentia/source/program/licentia/license/notice.lux +++ b/licentia/source/program/licentia/license/notice.lux @@ -5,7 +5,7 @@ ["[0]" text ["%" format {"+" [format]}]] [collection - ["[0]" list ("[1]\[0]" functor)]]] + ["[0]" list ("[1]#[0]" functor)]]] [math [number ["n" nat]]]]] @@ -30,5 +30,5 @@ (def: .public copyright (-> (List //copyright.Holder) Text) - (|>> (list\each ..copyright_holder) + (|>> (list#each ..copyright_holder) (text.interposed text.new_line))) diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux index 583305dd9..72257a0ac 100644 --- a/licentia/source/program/licentia/output.lux +++ b/licentia/source/program/licentia/output.lux @@ -2,13 +2,13 @@ [library [lux {"-" [Definition]} [control - ["[0]" maybe ("[1]\[0]" functor)]] + ["[0]" maybe ("[1]#[0]" functor)]] [data ["[0]" bit] ["[0]" text ["%" format {"+" [format]}]] [collection - ["[0]" list ("[1]\[0]" functor monoid)]]]]] + ["[0]" list ("[1]#[0]" functor monoid)]]]]] [// ["[0]" license {"+" [Identification Termination @@ -179,7 +179,7 @@ "")] [(value@ license.#same_license? value) "License Retention" - ($.paragraph (list\composite extension.sharing_requirement + ($.paragraph (list#composite extension.sharing_requirement extension.license_conflict_resolution))] [(value@ license.#must_be_distinguishable? value) (format _.extension " Distinctness") @@ -255,7 +255,7 @@ (-> License Text) (let [identification (|> value (value@ license.#identification) - (maybe\each ..identification) + (maybe#each ..identification) (maybe.default "")) identified? (case (value@ license.#identification value) {.#Some _} @@ -273,12 +273,12 @@ black_lists ($.block ($.section [#$.title (format "Denial of " _.license) #$.content (|> black_lists - (list\each black_list.black_list) + (list#each black_list.black_list) (text.interposed ..black_list_spacing))]))) ($.section [#$.title "Definitions" #$.content (|> definition.all - (list\each (|>> ..definition $.block)) + (list#each (|>> ..definition $.block)) (text.interposed ""))]) ($.block ($.section [#$.title (format "Acceptance of " _.license) @@ -298,7 +298,7 @@ (|> value (value@ license.#attribution) - (maybe\each (|>> ..attribution + (maybe#each (|>> ..attribution ["Attribution Information"] $.section $.block)) -- cgit v1.2.3