diff options
Diffstat (limited to 'licentia/source')
| -rw-r--r-- | licentia/source/program/licentia.lux | 2 | ||||
| -rw-r--r-- | licentia/source/program/licentia/document.lux | 2 | ||||
| -rw-r--r-- | licentia/source/program/licentia/license/black_list.lux | 4 | ||||
| -rw-r--r-- | licentia/source/program/licentia/license/distribution.lux | 2 | ||||
| -rw-r--r-- | licentia/source/program/licentia/license/notice.lux | 2 | ||||
| -rw-r--r-- | licentia/source/program/licentia/output.lux | 18 | ||||
| -rw-r--r-- | licentia/source/test/licentia.lux | 10 |
7 files changed, 20 insertions, 20 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?) diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index e9a1da86e..ec8fc04a9 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -50,7 +50,7 @@ [start (random.filter (|>> (n.= n\top) not) random.nat) #let [wiggle_room (n.- start n\top)] - end (\ ! map + end (\ ! each (|>> (n.% wiggle_room) (n.max 1)) random.nat)] (wrap {#time.start start @@ -109,7 +109,7 @@ (def: (variable_list max_size gen_element) (All [a] (-> Nat (Random a) (Random (List a)))) (do {! random.monad} - [amount (\ ! map (n.% (n.max 1 max_size)) + [amount (\ ! each (n.% (n.max 1 max_size)) random.nat)] (random.list amount gen_element))) @@ -247,14 +247,14 @@ (_.test "The attribution phrase is present." (|> attribution (value@ #license.phrase) - (maybe\map present?) + (maybe\each present?) (maybe.default true))) (_.test "The attribution URL is present." (present? (value@ #license.url attribution))) (_.test "The attribution image is present." (|> attribution (value@ #license.image) - (maybe\map present?) + (maybe\each present?) (maybe.default true))) )) @@ -315,7 +315,7 @@ bit.yes) every_entity_is_mentioned? (|> black_list (value@ #license.entities) - (list\map black_list.entity) + (list\each black_list.entity) (list.every? present?))] (and black_list_is_justified? every_entity_is_mentioned?))) |