aboutsummaryrefslogtreecommitdiff
path: root/licentia/source/program
diff options
context:
space:
mode:
authorEduardo Julian2021-08-24 05:23:45 -0400
committerEduardo Julian2021-08-24 05:23:45 -0400
commit36303d6cb2ce3ab9e36d045b9516c997bd461862 (patch)
treeb9d2f1495143054d61d9af129f36833624db9dac /licentia/source/program
parentec1f31b5a1492d5e0ab260397291d4449483bbd9 (diff)
Outsourced the syntax for labelled type definitions to macros.
Diffstat (limited to 'licentia/source/program')
-rw-r--r--licentia/source/program/licentia.lux2
-rw-r--r--licentia/source/program/licentia/document.lux2
-rw-r--r--licentia/source/program/licentia/license/black_list.lux4
-rw-r--r--licentia/source/program/licentia/license/distribution.lux2
-rw-r--r--licentia/source/program/licentia/license/notice.lux2
-rw-r--r--licentia/source/program/licentia/output.lux18
6 files changed, 15 insertions, 15 deletions
diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux
index 14f29237f..04fd52191 100644
--- a/licentia/source/program/licentia.lux
+++ b/licentia/source/program/licentia.lux
@@ -73,7 +73,7 @@
(\ json.codec decoded))]
(|> json
(<json>.result /input.license)
- (\ ! map /output.license))))]
+ (\ ! each /output.license))))]
(\ file.default write (\ utf8.codec encoded document) output)))]
(wrap (debug.log! (case ?done
(#try.Success _)
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux
index 8b2d1300c..7b159b8f5 100644
--- a/licentia/source/program/licentia/document.lux
+++ b/licentia/source/program/licentia/document.lux
@@ -25,7 +25,7 @@
(def: .public paragraph
(-> (List Text) Text)
- (|>> (list\map ..sentence)
+ (|>> (list\each ..sentence)
(text.interposed text.new_line)))
(template [<name> <word>]
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index fc1257875..fbedb62cd 100644
--- a/licentia/source/program/licentia/license/black_list.lux
+++ b/licentia/source/program/licentia/license/black_list.lux
@@ -23,11 +23,11 @@
effect "shall not be granted to the following entities, or any subsidiary thereof"
justification (|> black_list
(value@ #//.justification)
- (maybe\map (|>> (format ", due to ")))
+ (maybe\each (|>> (format ", due to ")))
(maybe.default ""))
entities (|> black_list
(value@ #//.entities)
- (list\map ..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 6324a60d8..e5185598f 100644
--- a/licentia/source/program/licentia/license/distribution.lux
+++ b/licentia/source/program/licentia/license/distribution.lux
@@ -104,7 +104,7 @@
(def: .public (extension distribution)
(-> Distribution Text)
- ($.paragraph ($_ list\compose
+ ($.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 2a4857c31..c6f27e183 100644
--- a/licentia/source/program/licentia/license/notice.lux
+++ b/licentia/source/program/licentia/license/notice.lux
@@ -30,5 +30,5 @@
(def: .public copyright
(-> (List //copyright.Holder) Text)
- (|>> (list\map ..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 22b81de8b..c4dd78214 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -179,8 +179,8 @@
"")]
[(value@ #license.same_license? value) "License Retention"
- ($.paragraph (list\compose extension.sharing_requirement
- extension.license_conflict_resolution))]
+ ($.paragraph (list\composite extension.sharing_requirement
+ extension.license_conflict_resolution))]
[(value@ #license.must_be_distinguishable? value) (format _.extension " Distinctness")
extension.distinctness_requirement]
@@ -255,7 +255,7 @@
(-> License Text)
(let [identification (|> value
(value@ #license.identification)
- (maybe\map ..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\map black_list.black_list)
+ (list\each black_list.black_list)
(text.interposed ..black_list_spacing))})))
($.section {#$.title "Definitions"
#$.content (|> definition.all
- (list\map (|>> ..definition $.block))
+ (list\each (|>> ..definition $.block))
(text.interposed ""))})
($.block ($.section {#$.title (format "Acceptance of " _.license)
@@ -298,10 +298,10 @@
(|> value
(value@ #license.attribution)
- (maybe\map (|>> ..attribution
- ["Attribution Information"]
- $.section
- $.block))
+ (maybe\each (|>> ..attribution
+ ["Attribution Information"]
+ $.section
+ $.block))
(maybe.default ""))
(..miscellaneous identified?)