aboutsummaryrefslogtreecommitdiff
path: root/licentia/source
diff options
context:
space:
mode:
authorEduardo Julian2021-08-18 03:29:15 -0400
committerEduardo Julian2021-08-18 03:29:15 -0400
commite00ba096c8837abe85d366e0c1293c09dbe84d81 (patch)
treedc1f0955d4461ae30bb4945cddd74c462f1aee98 /licentia/source
parent3289b9dcf9d5d1c1e5c380e3185065c8fd32535f (diff)
Some bug fixes.
Diffstat (limited to 'licentia/source')
-rw-r--r--licentia/source/program/licentia/document.lux4
-rw-r--r--licentia/source/program/licentia/input.lux4
-rw-r--r--licentia/source/program/licentia/license/addendum.lux2
-rw-r--r--licentia/source/program/licentia/license/black_list.lux4
-rw-r--r--licentia/source/program/licentia/license/definition.lux116
-rw-r--r--licentia/source/program/licentia/license/distribution.lux4
-rw-r--r--licentia/source/program/licentia/license/notice.lux4
-rw-r--r--licentia/source/program/licentia/license/term.lux2
-rw-r--r--licentia/source/program/licentia/output.lux64
-rw-r--r--licentia/source/test/licentia.lux62
10 files changed, 133 insertions, 133 deletions
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux
index c7806ab6a..8b2d1300c 100644
--- a/licentia/source/program/licentia/document.lux
+++ b/licentia/source/program/licentia/document.lux
@@ -45,5 +45,5 @@
(def: .public (section value)
(-> Section Text)
- (format (..block (get@ #title value))
- (get@ #content value)))
+ (format (..block (value@ #title value))
+ (value@ #content value)))
diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux
index 5482daba4..ede659fcf 100644
--- a/licentia/source/program/licentia/input.lux
+++ b/licentia/source/program/licentia/input.lux
@@ -58,8 +58,8 @@
(exception: .public (invalid_period {period (Period Nat)})
(exception.report
- ["Start" (%.nat (get@ #time.start period))]
- ["End" (%.nat (get@ #time.end period))]))
+ ["Start" (%.nat (value@ #time.start period))]
+ ["End" (%.nat (value@ #time.end period))]))
(def: period
(Parser (Period Nat))
diff --git a/licentia/source/program/licentia/license/addendum.lux b/licentia/source/program/licentia/license/addendum.lux
index 256b516cc..a3518f68e 100644
--- a/licentia/source/program/licentia/license/addendum.lux
+++ b/licentia/source/program/licentia/license/addendum.lux
@@ -24,6 +24,6 @@
"")]
["“Commons Clause” License Condition v1.0"
- (get@ #//.commons_clause? value)
+ (value@ #//.commons_clause? value)
..commons_clause]
)))))
diff --git a/licentia/source/program/licentia/license/black_list.lux b/licentia/source/program/licentia/license/black_list.lux
index 577f53242..fc1257875 100644
--- a/licentia/source/program/licentia/license/black_list.lux
+++ b/licentia/source/program/licentia/license/black_list.lux
@@ -22,11 +22,11 @@
(let [scope (format "The rights granted under " _.license)
effect "shall not be granted to the following entities, or any subsidiary thereof"
justification (|> black_list
- (get@ #//.justification)
+ (value@ #//.justification)
(maybe\map (|>> (format ", due to ")))
(maybe.default ""))
entities (|> black_list
- (get@ #//.entities)
+ (value@ #//.entities)
(list\map ..entity)
(text.interposed text.new_line))]
(format scope " " effect justification ":" text.new_line
diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux
index 0335a9b30..81be7ffc6 100644
--- a/licentia/source/program/licentia/license/definition.lux
+++ b/licentia/source/program/licentia/license/definition.lux
@@ -54,7 +54,7 @@
($.paragraph (list (format "the terms and conditions defined in this document")))]
[licensable "Licensable"
- ($.paragraph (list (format "having the right to grant any and all of the rights conveyed by " (get@ #term license))))]
+ ($.paragraph (list (format "having the right to grant any and all of the rights conveyed by " (value@ #term license))))]
[legal_entity "Legal Entity"
(let [abilities (: (List Text)
@@ -64,28 +64,28 @@
($.paragraph (list (format "any human or non-human entity that is recognized as having privileges and obligations, such as having the ability " ($.and abilities)))))]
[recipient "Recipient"
- ($.paragraph (list (format "a " (get@ #term legal_entity) " exercising permissions by " (get@ #term license))))]
+ ($.paragraph (list (format "a " (value@ #term legal_entity) " exercising permissions by " (value@ #term license))))]
[licensor "The Licensor"
- ($.paragraph (list (format "the copyright owner granting " (get@ #term license) ", or a " (get@ #term legal_entity) " authorized by the copyright owner")))]
+ ($.paragraph (list (format "the copyright owner granting " (value@ #term license) ", or a " (value@ #term legal_entity) " authorized by the copyright owner")))]
[source_code_form "Source Code Form"
($.paragraph (list (format "the preferred form of the " ..covered_work_description " in order to make modifications to it")))]
[object_form "Object Form"
- ($.paragraph (list (format "any form produced by transforming a " (get@ #term source_code_form) ", including but not limited to compiled code and transpiled code")))]
+ ($.paragraph (list (format "any form produced by transforming a " (value@ #term source_code_form) ", including but not limited to compiled code and transpiled code")))]
[licensed_work "The Licensed Work"
($.paragraph (list (format "the " ..covered_work_description
- ", whether in a " (get@ #term source_code_form)
- " or in an " (get@ #term object_form)
- ", made available under " (get@ #term license)
+ ", whether in a " (value@ #term source_code_form)
+ " or in an " (value@ #term object_form)
+ ", made available under " (value@ #term license)
", as indicated by a copyright notice that is included in or attached to the " ..covered_work_description)))]
[derivative_work "Derivative Work"
- ($.paragraph (list (format "any work, whether in a " (get@ #term source_code_form)
- " or in an " (get@ #term object_form)
- ", that is based on (or derived from) " (get@ #term licensed_work)
+ ($.paragraph (list (format "any work, whether in a " (value@ #term source_code_form)
+ " or in an " (value@ #term object_form)
+ ", that is based on (or derived from) " (value@ #term licensed_work)
" and which represents an original " ..covered_work_description)))]
[submission "Submission"
@@ -93,17 +93,17 @@
(list "electronic"
"verbal"
"written"))]
- ($.paragraph (list (format "any form of " ($.or forms_of_communication) " communication sent to " (get@ #term licensor)
- ", or its representatives, for the purpose of discussing and improving " (get@ #term licensed_work)
+ ($.paragraph (list (format "any form of " ($.or forms_of_communication) " communication sent to " (value@ #term licensor)
+ ", or its representatives, for the purpose of discussing and improving " (value@ #term licensed_work)
", but excluding communication that is designated in writing by the copyright owner as " not_a_contribution_notice))))]
[modification "Modification"
(let [alteration "any addition to, or deletion from, the substance or structure of"
object "file or other storage"
targets (: (List Text)
- (list (format "a " object " contained in " (get@ #term licensed_work))
- (format "any new " object " that contains any part of " (get@ #term licensed_work))
- (format "any " object " which replaces or otherwise alters the original functionality of "(get@ #term licensed_work) " at runtime")))]
+ (list (format "a " object " contained in " (value@ #term licensed_work))
+ (format "any new " object " that contains any part of " (value@ #term licensed_work))
+ (format "any " object " which replaces or otherwise alters the original functionality of "(value@ #term licensed_work) " at runtime")))]
($.paragraph (list (format alteration " " ($.or targets)))))]
[required_component "Required Component"
@@ -116,74 +116,74 @@
"control file"
"other work"))]
($.paragraph (list (format "any " ($.or possibilities)
- " created by " (get@ #term recipient)
- " which is required by a third party to successfully install and run a " (get@ #term derivative_work)
- " by " (get@ #term recipient)))))]
+ " created by " (value@ #term recipient)
+ " which is required by a third party to successfully install and run a " (value@ #term derivative_work)
+ " by " (value@ #term recipient)))))]
[extension "Extension"
(let [possibilities (: (List Text)
- (list (get@ #term modification)
- (get@ #term derivative_work)
- (get@ #term required_component)))]
+ (list (value@ #term modification)
+ (value@ #term derivative_work)
+ (value@ #term required_component)))]
($.paragraph (list (format "any " ($.or possibilities)))))]
[contribution "Contribution"
- ($.paragraph (list (format "any " covered_work_description ", including the original version of " (get@ #term licensed_work)
- " and any " (get@ #term extension) " to " (get@ #term licensed_work)
- ", that is intentionally communicated as a " (get@ #term submission)
- " to " (get@ #term licensor)
- " for inclusion in " (get@ #term licensed_work) " by the copyright owner"
- ", or by a " (get@ #term legal_entity) " authorized to submit on behalf of the copyright owner")))]
+ ($.paragraph (list (format "any " covered_work_description ", including the original version of " (value@ #term licensed_work)
+ " and any " (value@ #term extension) " to " (value@ #term licensed_work)
+ ", that is intentionally communicated as a " (value@ #term submission)
+ " to " (value@ #term licensor)
+ " for inclusion in " (value@ #term licensed_work) " by the copyright owner"
+ ", or by a " (value@ #term legal_entity) " authorized to submit on behalf of the copyright owner")))]
[contributor "Contributor"
- ($.paragraph (list (format (get@ #term licensor)
- " or any " (get@ #term legal_entity)
- " on behalf of whom a " (get@ #term contribution)
- " has been received by " (get@ #term licensor)
- ", and subsequently incorporated within " (get@ #term licensed_work))))]
+ ($.paragraph (list (format (value@ #term licensor)
+ " or any " (value@ #term legal_entity)
+ " on behalf of whom a " (value@ #term contribution)
+ " has been received by " (value@ #term licensor)
+ ", and subsequently incorporated within " (value@ #term licensed_work))))]
- [patent_claim (format "Patent Claim Of A " (get@ #term contributor))
+ [patent_claim (format "Patent Claim Of A " (value@ #term contributor))
(let [claim_types (: (List Text)
(list "method"
"process"
"apparatus"))]
($.paragraph (list (format "any patent claim(s), including without limitation " ($.and claim_types) " claims, in any patent "
- (get@ #term licensable) " by such " (get@ #term contributor)
- " that would be infringed, but for the grant of " (get@ #term license)
- ", to " ($.or patent_rights) " its " (get@ #term contribution)))))]
+ (value@ #term licensable) " by such " (value@ #term contributor)
+ " that would be infringed, but for the grant of " (value@ #term license)
+ ", to " ($.or patent_rights) " its " (value@ #term contribution)))))]
[secondary_license "Secondary License"
- ($.paragraph (list (format "any license for which compliance does not imply or require violating the terms of " (get@ #term license))))]
+ ($.paragraph (list (format "any license for which compliance does not imply or require violating the terms of " (value@ #term license))))]
[sell "Sell"
- ($.paragraph (list (format "practicing any or all of the rights granted to " (get@ #term recipient)
- " under " (get@ #term license)
+ ($.paragraph (list (format "practicing any or all of the rights granted to " (value@ #term recipient)
+ " under " (value@ #term license)
" to provide to third parties, for a fee or other consideration "
"(including without limitation fees for " ($.or commercial_services)
- " related to "(get@ #term licensed_work) ")"
- ", a product or service whose value derives, entirely or substantially, from the functionality of " (get@ #term licensed_work))))]
+ " related to "(value@ #term licensed_work) ")"
+ ", a product or service whose value derives, entirely or substantially, from the functionality of " (value@ #term licensed_work))))]
[personal_use "Personal Use"
(let [valid_purposes (: (List Text)
(list "personal"
"private"
"non-commercial"))]
- ($.paragraph (list (format "use of " (get@ #term licensed_work) " by an individual solely for his or her " ($.and valid_purposes) " purposes")
- (format "An individual's use of " (get@ #term licensed_work) " in his or her capacity as an " ($.or individual_capacities) " does not qualify"))))]
+ ($.paragraph (list (format "use of " (value@ #term licensed_work) " by an individual solely for his or her " ($.and valid_purposes) " purposes")
+ (format "An individual's use of " (value@ #term licensed_work) " in his or her capacity as an " ($.or individual_capacities) " does not qualify"))))]
[serve "Serve"
- ($.paragraph (list (format "to deliver " (get@ #term licensed_work)
- " and/or any " (get@ #term extension)
- " by means of a computer network to one or more computers for purposes of execution of " (get@ #term licensed_work)
- ", and/or the " (get@ #term extension))))]
+ ($.paragraph (list (format "to deliver " (value@ #term licensed_work)
+ " and/or any " (value@ #term extension)
+ " by means of a computer network to one or more computers for purposes of execution of " (value@ #term licensed_work)
+ ", and/or the " (value@ #term extension))))]
[research "Research"
- ($.paragraph (list (format "investigation or experimentation for the purpose of understanding the nature and limits of " (get@ #term licensed_work) " and its potential uses")))]
+ ($.paragraph (list (format "investigation or experimentation for the purpose of understanding the nature and limits of " (value@ #term licensed_work) " and its potential uses")))]
[deploy "Deploy"
(let [deployment_types (: (List Text)
(list "use"
- (get@ #term serve)
+ (value@ #term serve)
"sublicense"
"distribute"))
sub_licensing (: (-> Text Text)
@@ -194,20 +194,20 @@
(sub_licensing "indirect")
"distribution"))
basic_definition (format "to " ($.or deployment_types)
- " " (get@ #term licensed_work)
- " other than for internal " (get@ #term research)
- " and/or " (get@ #term personal_use)
- " by " (get@ #term recipient))
- examples (format "any and all internal use or distribution of " (get@ #term licensed_work)
- " within a business or organization in which " (get@ #term recipient)
+ " " (value@ #term licensed_work)
+ " other than for internal " (value@ #term research)
+ " and/or " (value@ #term personal_use)
+ " by " (value@ #term recipient))
+ examples (format "any and all internal use or distribution of " (value@ #term licensed_work)
+ " within a business or organization in which " (value@ #term recipient)
" participates")
- exceptions (format "for " (get@ #term research) " and/or " (get@ #term personal_use))]
+ exceptions (format "for " (value@ #term research) " and/or " (value@ #term personal_use))]
($.paragraph (list (format basic_definition
", and includes without limitation, " examples
", other than " exceptions
", as well as " ($.or third_party_interactions)
- " of " (get@ #term licensed_work)
- " by " (get@ #term recipient)
+ " of " (value@ #term licensed_work)
+ " by " (value@ #term recipient)
" to any third party in any form or manner"))))]
[electronic_distribution_mechanism "Electronic Distribution Mechanism"
diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux
index ca5e37f1c..6324a60d8 100644
--- a/licentia/source/program/licentia/license/distribution.lux
+++ b/licentia/source/program/licentia/license/distribution.lux
@@ -105,9 +105,9 @@
(def: .public (extension distribution)
(-> Distribution Text)
($.paragraph ($_ list\compose
- (if (get@ #//.can_re_license? distribution)
+ (if (value@ #//.can_re_license? distribution)
(list allow_re_licensing)
(list))
- (if (get@ #//.can_multi_license? distribution)
+ (if (value@ #//.can_multi_license? distribution)
(list allow_multi_licensing)
(list)))))
diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux
index 87308f87b..2a4857c31 100644
--- a/licentia/source/program/licentia/license/notice.lux
+++ b/licentia/source/program/licentia/license/notice.lux
@@ -21,12 +21,12 @@
(def: .public (copyright_holder holder)
(-> //copyright.Holder Text)
- (let [(^slots [#//time.start #//time.end]) (get@ #//copyright.period holder)
+ (let [(^slots [#//time.start #//time.end]) (value@ #//copyright.period holder)
single_year? (n.= start end)
period_section (if single_year?
(%.nat start)
(format (%.nat start) "-" (%.nat end)))]
- (format "Copyright (C) " period_section " " (get@ #//copyright.name holder))))
+ (format "Copyright (C) " period_section " " (value@ #//copyright.name holder))))
(def: .public copyright
(-> (List //copyright.Holder) Text)
diff --git a/licentia/source/program/licentia/license/term.lux b/licentia/source/program/licentia/license/term.lux
index c66afc56c..9b210fb2b 100644
--- a/licentia/source/program/licentia/license/term.lux
+++ b/licentia/source/program/licentia/license/term.lux
@@ -7,7 +7,7 @@
(template [<term> <definition>]
[(def: .public <term>
Text
- (get@ #//definition.term <definition>))]
+ (value@ #//definition.term <definition>))]
[source_code_form //definition.source_code_form]
[object_form //definition.object_form]
diff --git a/licentia/source/program/licentia/output.lux b/licentia/source/program/licentia/output.lux
index bef7014b3..22b81de8b 100644
--- a/licentia/source/program/licentia/output.lux
+++ b/licentia/source/program/licentia/output.lux
@@ -38,12 +38,12 @@
(def: .public (definition value)
(-> Definition Text)
- (format ($.quote (get@ #definition.term value)) ": " (get@ #definition.meaning value)))
+ (format ($.quote (value@ #definition.term value)) ": " (value@ #definition.meaning value)))
(def: .public (identification value)
(-> Identification Text)
- (format (get@ #license.name value) text.new_line
- (get@ #license.version value)))
+ (format (value@ #license.name value) text.new_line
+ (value@ #license.version value)))
(def: .public (grant termination)
(-> Termination Text)
@@ -55,14 +55,14 @@
grant.copyright]
["Grant of Patent License"
- (grant.patent (get@ #license.patent_retaliation? termination))]
+ (grant.patent (value@ #license.patent_retaliation? termination))]
["Effective Date for the Grants"
grant.date]
["Grant Termination"
- (grant.termination (get@ #license.termination_period termination)
- (get@ #license.grace_period termination))]
+ (grant.termination (value@ #license.termination_period termination)
+ (value@ #license.grace_period termination))]
["No Retroactive Effect of Termination"
grant.no_retroactive_termination])))))
@@ -115,11 +115,11 @@
liability.litigation]
["Accepting Warranty or Additional Liability"
- (get@ #license.can_accept? value)
+ (value@ #license.can_accept? value)
liability.can_accept]
["High Risk Activities"
- (get@ #license.disclaim_high_risk? value)
+ (value@ #license.disclaim_high_risk? value)
liability.disclaim_high_risk])))))
(def: .public (distribution distribution)
@@ -139,8 +139,8 @@
distribution.object_form]
[(format "Distribution of an " _.extension)
- (or (get@ #license.can_re_license? distribution)
- (get@ #license.can_multi_license? distribution))
+ (or (value@ #license.can_re_license? distribution)
+ (value@ #license.can_multi_license? distribution))
(distribution.extension distribution)])))))
(def: .public (commercial value)
@@ -152,21 +152,21 @@
"")]
["Non-Commerciality"
- (not (get@ #license.can_sell? value))
+ (not (value@ #license.can_sell? value))
commercial.cannot_sell]
[(format _.contributor " Attribution")
- (get@ #license.require_contributor_credit? value)
+ (value@ #license.require_contributor_credit? value)
commercial.require_contributor_attribution]
[(format _.contributor " Endorsement")
- (not (get@ #license.allow_contributor_endorsement? value))
+ (not (value@ #license.allow_contributor_endorsement? value))
commercial.disallow_contributor_endorsement]
)))))
(def: .public (extension value)
(-> Extension Text)
- (let [[show? document] (case (get@ #license.notification_period value)
+ (let [[show? document] (case (value@ #license.notification_period value)
(#.Some period)
[true (extension.notification_requirement period)]
@@ -178,30 +178,30 @@
#$.content <content>}))
"")]
- [(get@ #license.same_license? value) "License Retention"
+ [(value@ #license.same_license? value) "License Retention"
($.paragraph (list\compose extension.sharing_requirement
extension.license_conflict_resolution))]
- [(get@ #license.must_be_distinguishable? value) (format _.extension " Distinctness")
+ [(value@ #license.must_be_distinguishable? value) (format _.extension " Distinctness")
extension.distinctness_requirement]
[show? (format _.source_code_form " Availability")
document]
- [(get@ #license.must_describe_modifications? value) (format "Description of " ($.plural _.modification))
+ [(value@ #license.must_describe_modifications? value) (format "Description of " ($.plural _.modification))
extension.description_requirement]))))))
(def: .public (attribution value)
(-> Attribution Text)
- (let [copyright_notice (format "Attribution Copyright Notice: " (get@ #license.copyright_notice value))
- phrase (case (get@ #license.phrase value)
+ (let [copyright_notice (format "Attribution Copyright Notice: " (value@ #license.copyright_notice value))
+ phrase (case (value@ #license.phrase value)
(#.Some phrase)
(format text.new_line "Attribution Phrase: " phrase text.new_line)
#.None
"")
- url (format text.new_line "Attribution URL: " (get@ #license.url value))
- image (case (get@ #license.image value)
+ url (format text.new_line "Attribution URL: " (value@ #license.url value))
+ image (case (value@ #license.image value)
(#.Some image)
(format text.new_line "Attribution Image: " image)
@@ -254,19 +254,19 @@
(def: .public (license value)
(-> License Text)
(let [identification (|> value
- (get@ #license.identification)
+ (value@ #license.identification)
(maybe\map ..identification)
(maybe.default ""))
- identified? (case (get@ #license.identification value)
+ identified? (case (value@ #license.identification value)
(#.Some _)
true
#.None
false)]
(`` (format ($.block identification)
- ($.block (notice.copyright (get@ #license.copyright_holders value)))
+ ($.block (notice.copyright (value@ #license.copyright_holders value)))
- (case (get@ #license.black_lists value)
+ (case (value@ #license.black_lists value)
#.Nil
""
@@ -284,20 +284,20 @@
($.block ($.section {#$.title (format "Acceptance of " _.license)
#$.content limitation.acceptance}))
- (..grant (get@ #license.termination value))
+ (..grant (value@ #license.termination value))
..limitation
..assurance
($.block ($.section {#$.title (format _.submission " of " ($.plural _.contribution))
#$.content submission.contribution}))
- (..liability (get@ #license.liability value))
- (..distribution (get@ #license.distribution value))
- (..commercial (get@ #license.commercial value))
- (..extension (get@ #license.extension value))
+ (..liability (value@ #license.liability value))
+ (..distribution (value@ #license.distribution value))
+ (..commercial (value@ #license.commercial value))
+ (..extension (value@ #license.extension value))
(|> value
- (get@ #license.attribution)
+ (value@ #license.attribution)
(maybe\map (|>> ..attribution
["Attribution Information"]
$.section
@@ -306,7 +306,7 @@
(..miscellaneous identified?)
- (addendum.output (get@ #license.addendum value))
+ (addendum.output (value@ #license.addendum value))
notice.end_of_license
))))
diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux
index b2302d8ef..e9a1da86e 100644
--- a/licentia/source/test/licentia.lux
+++ b/licentia/source/test/licentia.lux
@@ -161,16 +161,16 @@
(_.test "Copyright grant is present."
(present? grant.copyright))
(_.test "Patent grant is present."
- (present? (grant.patent (get@ #license.patent_retaliation? termination))))
+ (present? (grant.patent (value@ #license.patent_retaliation? termination))))
(_.test "Effective date for the grants is present."
(present? grant.date))
(_.test "Patent grant is present."
- (present? (grant.termination (get@ #license.termination_period termination)
- (get@ #license.grace_period termination))))
+ (present? (grant.termination (value@ #license.termination_period termination)
+ (value@ #license.grace_period termination))))
(_.test "The termination period is accurately conveyed."
- (present? (grant.grant_restoration_clause (get@ #license.termination_period termination))))
+ (present? (grant.grant_restoration_clause (value@ #license.termination_period termination))))
(_.test "The grace period is accurately conveyed."
- (present? (grant.grace_period_clause (get@ #license.grace_period termination))))
+ (present? (grant.grace_period_clause (value@ #license.grace_period termination))))
(_.test "The grants are not retro-actively terminated."
(present? grant.no_retroactive_termination))
))
@@ -185,10 +185,10 @@
(_.test "Litigation conditions are present."
(present? liability.litigation))
(_.test "Liability acceptance conditions may be present."
- (bit\= (get@ #license.can_accept? liability)
+ (bit\= (value@ #license.can_accept? liability)
(present? liability.can_accept)))
(_.test "Liability acceptance conditions may be present."
- (bit\= (get@ #license.disclaim_high_risk? liability)
+ (bit\= (value@ #license.disclaim_high_risk? liability)
(present? liability.disclaim_high_risk)))
))
@@ -207,13 +207,13 @@
(Concern Commercial)
($_ _.and
(_.test "Non-commercial clause is present."
- (bit\= (not (get@ #license.can_sell? commercial))
+ (bit\= (not (value@ #license.can_sell? commercial))
(present? commercial.cannot_sell)))
(_.test "Contributor credit condition is present."
- (bit\= (get@ #license.require_contributor_credit? commercial)
+ (bit\= (value@ #license.require_contributor_credit? commercial)
(present? commercial.require_contributor_attribution)))
(_.test "Anti-endorsement condition is present."
- (bit\= (not (get@ #license.allow_contributor_endorsement? commercial))
+ (bit\= (not (value@ #license.allow_contributor_endorsement? commercial))
(present? commercial.disallow_contributor_endorsement)))
))
@@ -221,21 +221,21 @@
(Concern Extension)
($_ _.and
(_.test "The license is viral."
- (bit\= (get@ #license.same_license? extension)
+ (bit\= (value@ #license.same_license? extension)
(and (list.every? present? extension.sharing_requirement)
(list.every? present? extension.license_conflict_resolution))))
(_.test "Extensions must be distinguishable from the original work."
- (bit\= (get@ #license.must_be_distinguishable? extension)
+ (bit\= (value@ #license.must_be_distinguishable? extension)
(present? extension.distinctness_requirement)))
(_.test "The community must be notified of new extensions."
- (case (get@ #license.notification_period extension)
+ (case (value@ #license.notification_period extension)
(#.Some period)
(present? (extension.notification_requirement period))
#.None
true))
(_.test "Must describe modifications."
- (bit\= (get@ #license.must_describe_modifications? extension)
+ (bit\= (value@ #license.must_describe_modifications? extension)
(present? extension.description_requirement)))
))
@@ -243,17 +243,17 @@
(Concern Attribution)
($_ _.and
(_.test "The attribution copyright notice is present."
- (present? (get@ #license.copyright_notice attribution)))
+ (present? (value@ #license.copyright_notice attribution)))
(_.test "The attribution phrase is present."
(|> attribution
- (get@ #license.phrase)
+ (value@ #license.phrase)
(maybe\map present?)
(maybe.default true)))
(_.test "The attribution URL is present."
- (present? (get@ #license.url attribution)))
+ (present? (value@ #license.url attribution)))
(_.test "The attribution image is present."
(|> attribution
- (get@ #license.image)
+ (value@ #license.image)
(maybe\map present?)
(maybe.default true)))
))
@@ -279,7 +279,7 @@
(Concern Addendum)
($_ _.and
(_.test "Commons clause"
- (bit\= (get@ #license.commons_clause? value)
+ (bit\= (value@ #license.commons_clause? value)
(present? addendum.commons_clause)))
))
@@ -294,10 +294,10 @@
($_ _.and
(_.test "Copyright notices are present."
(list.every? (|>> notice.copyright_holder present?)
- (get@ #license.copyright_holders license)))
+ (value@ #license.copyright_holders license)))
(_.test "Identification is present (if the license is identified)."
- (case (get@ #license.identification license)
+ (case (value@ #license.identification license)
(#.Some identification)
(and (present? (output.identification identification))
(present? miscellaneous.new_versions))
@@ -307,19 +307,19 @@
(_.test "Black-lists (if wanted by licensor) are explicitly enumerated and justified."
(list.every? (function (_ black_list)
- (let [black_list_is_justified? (case (get@ #license.justification black_list)
+ (let [black_list_is_justified? (case (value@ #license.justification black_list)
(#.Some justification)
(present? justification)
#.None
bit.yes)
every_entity_is_mentioned? (|> black_list
- (get@ #license.entities)
+ (value@ #license.entities)
(list\map black_list.entity)
(list.every? present?))]
(and black_list_is_justified?
every_entity_is_mentioned?)))
- (get@ #license.black_lists license)))
+ (value@ #license.black_lists license)))
(_.test "All definitions are present."
(list.every? (|>> output.definition present?)
@@ -328,7 +328,7 @@
(_.test "Acceptance of the license is demanded."
(present? limitation.acceptance))
- (..about_grant present? (get@ #license.termination license))
+ (..about_grant present? (value@ #license.termination license))
(_.test "All limitations are present."
(present? output.limitation))
@@ -339,15 +339,15 @@
(_.test "The terms of submission are present."
(present? submission.contribution))
- (..about_liability present? (get@ #license.liability license))
+ (..about_liability present? (value@ #license.liability license))
- (..about_distribution present? (get@ #license.distribution license))
+ (..about_distribution present? (value@ #license.distribution license))
- (..about_commercial present? (get@ #license.commercial license))
+ (..about_commercial present? (value@ #license.commercial license))
- (..about_extension present? (get@ #license.extension license))
+ (..about_extension present? (value@ #license.extension license))
- (case (get@ #license.attribution license)
+ (case (value@ #license.attribution license)
(#.Some attribution)
(..about_attribution present? attribution)
@@ -357,7 +357,7 @@
(..about_miscellaneous present?)
- (..about_addendum present? (get@ #license.addendum license))
+ (..about_addendum present? (value@ #license.addendum license))
(_.test "License ending footer is present."
(present? notice.end_of_license))