aboutsummaryrefslogtreecommitdiff
path: root/licentia/source/program
diff options
context:
space:
mode:
authorEduardo Julian2022-04-08 05:42:36 -0400
committerEduardo Julian2022-04-08 05:42:36 -0400
commit0d909187d5b9effcd08f533d50af7d29c0d6bfd8 (patch)
treec50f12c5e47e3db90c3a701b54ee9953da942210 /licentia/source/program
parente5e4c2aff562e5c01fefb808d1d68a40f29c9cc5 (diff)
De-sigil-ification: $
Diffstat (limited to 'licentia/source/program')
-rw-r--r--licentia/source/program/licentia/input.lux98
-rw-r--r--licentia/source/program/licentia/license/distribution.lux14
2 files changed, 56 insertions, 56 deletions
diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux
index 23e8ab29e..b92d0e52e 100644
--- a/licentia/source/program/licentia/input.lux
+++ b/licentia/source/program/licentia/input.lux
@@ -32,9 +32,9 @@
(def: identification
(Parser Identification)
(<json>.object
- ($_ <>.and
- (<json>.field "name" <json>.string)
- (<json>.field "version" <json>.string))))
+ (all <>.and
+ (<json>.field "name" <json>.string)
+ (<json>.field "version" <json>.string))))
(exception: .public (cannot_use_fractional_amount [amount Frac])
(exception.report
@@ -76,48 +76,48 @@
(def: copyright_holder
(Parser copyright.Holder)
(<json>.object
- ($_ <>.and
- (<json>.field "name" <json>.string)
- (<json>.field "period" ..period))))
+ (all <>.and
+ (<json>.field "name" <json>.string)
+ (<json>.field "period" ..period))))
(def: termination
(Parser Termination)
(<json>.object
- ($_ <>.and
- (<json>.field "patent retaliation?" <json>.boolean)
- (<json>.field "termination period" ..amount)
- (<json>.field "grace period" ..amount))))
+ (all <>.and
+ (<json>.field "patent retaliation?" <json>.boolean)
+ (<json>.field "termination period" ..amount)
+ (<json>.field "grace period" ..amount))))
(def: liability
(Parser Liability)
(<json>.object
- ($_ <>.and
- (<json>.field "can accept?" <json>.boolean)
- (<json>.field "disclaim high risk?" <json>.boolean))))
+ (all <>.and
+ (<json>.field "can accept?" <json>.boolean)
+ (<json>.field "disclaim high risk?" <json>.boolean))))
(def: distribution
(Parser Distribution)
(<json>.object
- ($_ <>.and
- (<json>.field "can re-license?" <json>.boolean)
- (<json>.field "can multi-license?" <json>.boolean))))
+ (all <>.and
+ (<json>.field "can re-license?" <json>.boolean)
+ (<json>.field "can multi-license?" <json>.boolean))))
(def: commercial
(Parser Commercial)
(<json>.object
- ($_ <>.and
- (<json>.field "can sell?" <json>.boolean)
- (<json>.field "require contributor credit?" <json>.boolean)
- (<json>.field "allow contributor endorsement?" <json>.boolean))))
+ (all <>.and
+ (<json>.field "can sell?" <json>.boolean)
+ (<json>.field "require contributor credit?" <json>.boolean)
+ (<json>.field "allow contributor endorsement?" <json>.boolean))))
(def: extension
(Parser Extension)
(<json>.object
- ($_ <>.and
- (<json>.field "same license?" <json>.boolean)
- (<json>.field "must be distinguishable?" <json>.boolean)
- (<json>.field "notification period" (<json>.nullable ..period))
- (<json>.field "must describe modifications?" <json>.boolean))))
+ (all <>.and
+ (<json>.field "same license?" <json>.boolean)
+ (<json>.field "must be distinguishable?" <json>.boolean)
+ (<json>.field "notification period" (<json>.nullable ..period))
+ (<json>.field "must describe modifications?" <json>.boolean))))
(def: entity
(Parser Entity)
@@ -126,9 +126,9 @@
(def: black_list
(Parser Black_List)
(<json>.object
- ($_ <>.and
- (<json>.field "justification" (<json>.nullable <json>.string))
- (<json>.field "entities" (<json>.array (<>.many ..entity))))))
+ (all <>.and
+ (<json>.field "justification" (<json>.nullable <json>.string))
+ (<json>.field "entities" (<json>.array (<>.many ..entity))))))
(def: url
(Parser URL)
@@ -137,32 +137,32 @@
(def: attribution
(Parser Attribution)
(<json>.object
- ($_ <>.and
- (<json>.field "copyright-notice" <json>.string)
- (<json>.field "phrase" (<json>.nullable <json>.string))
- (<json>.field "url" ..url)
- (<json>.field "image" (<json>.nullable ..url)))))
+ (all <>.and
+ (<json>.field "copyright-notice" <json>.string)
+ (<json>.field "phrase" (<json>.nullable <json>.string))
+ (<json>.field "url" ..url)
+ (<json>.field "image" (<json>.nullable ..url)))))
(def: addendum
(Parser Addendum)
(<json>.object
- ($_ <>.and
- (<json>.field "commons clause?" <json>.boolean)
- )))
+ (all <>.and
+ (<json>.field "commons clause?" <json>.boolean)
+ )))
(def: .public license
(Parser License)
(<json>.object
- ($_ <>.and
- (<json>.field "copyright-holders" (<json>.array (<>.many ..copyright_holder)))
- (<json>.field "identification" (<json>.nullable ..identification))
- (<json>.field "termination" ..termination)
- (<json>.field "liability" ..liability)
- (<json>.field "distribution" ..distribution)
- (<json>.field "commercial" ..commercial)
- (<json>.field "extension" ..extension)
- (<json>.field "black-lists" (<json>.array (<>.some ..black_list)))
- (<json>.field "attribution" (<json>.nullable ..attribution))
- (<>.default [//.#commons_clause? false]
- (<json>.field "addendum" ..addendum))
- )))
+ (all <>.and
+ (<json>.field "copyright-holders" (<json>.array (<>.many ..copyright_holder)))
+ (<json>.field "identification" (<json>.nullable ..identification))
+ (<json>.field "termination" ..termination)
+ (<json>.field "liability" ..liability)
+ (<json>.field "distribution" ..distribution)
+ (<json>.field "commercial" ..commercial)
+ (<json>.field "extension" ..extension)
+ (<json>.field "black-lists" (<json>.array (<>.some ..black_list)))
+ (<json>.field "attribution" (<json>.nullable ..attribution))
+ (<>.default [//.#commons_clause? false]
+ (<json>.field "addendum" ..addendum))
+ )))
diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux
index 849b7294a..87b397ff7 100644
--- a/licentia/source/program/licentia/license/distribution.lux
+++ b/licentia/source/program/licentia/license/distribution.lux
@@ -104,10 +104,10 @@
(def: .public (extension distribution)
(-> Distribution Text)
- ($.paragraph ($_ list#composite
- (if (the //.#can_re_license? distribution)
- (list allow_re_licensing)
- (list))
- (if (the //.#can_multi_license? distribution)
- (list allow_multi_licensing)
- (list)))))
+ ($.paragraph (all list#composite
+ (if (the //.#can_re_license? distribution)
+ (list allow_re_licensing)
+ (list))
+ (if (the //.#can_multi_license? distribution)
+ (list allow_multi_licensing)
+ (list)))))