From bf53ee92fc3c33a4885aa227e55d24f7ba3cb2c4 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 16 Mar 2022 08:37:23 -0400 Subject: De-sigil-ification: prefix : --- licentia/source/program/licentia.lux | 24 +++--- .../source/program/licentia/license/assurance.lux | 24 +++--- .../source/program/licentia/license/definition.lux | 94 +++++++++++----------- .../program/licentia/license/distribution.lux | 6 +- .../source/program/licentia/license/extension.lux | 44 +++++----- .../source/program/licentia/license/liability.lux | 62 +++++++------- .../source/program/licentia/license/limitation.lux | 34 ++++---- .../program/licentia/license/miscellaneous.lux | 62 +++++++------- licentia/source/test/licentia.lux | 6 +- 9 files changed, 178 insertions(+), 178 deletions(-) (limited to 'licentia') diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux index 74d072067..7576f739a 100644 --- a/licentia/source/program/licentia.lux +++ b/licentia/source/program/licentia.lux @@ -63,18 +63,18 @@ (.named "--output") .any)] (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) - json (|> raw_json - java/lang/String::trim - (# json.codec decoded))] - (|> json - (.result /input.license) - (# ! each /output.license))))] - (# file.default write (# utf8.codec encoded document) output)))] + [?done (is (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) + json (|> raw_json + java/lang/String::trim + (# json.codec decoded))] + (|> json + (.result /input.license) + (# ! 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/license/assurance.lux b/licentia/source/program/licentia/license/assurance.lux index bf5609cc2..a36b38dcf 100644 --- a/licentia/source/program/licentia/license/assurance.lux +++ b/licentia/source/program/licentia/license/assurance.lux @@ -1,13 +1,13 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]]]]] + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]]]]] + [// + ["_" term] [// - ["_" term] - [// - ["$" document]]]) + ["$" document]]]) (def: .public representation ($.sentence (format "Each " _.contributor @@ -17,10 +17,10 @@ " conveyed by " _.license))) (def: .public fair_use - (let [copyright_doctrines (: (List Text) - (list "fair use" - "fair dealing" - "other equivalents"))] + (let [copyright_doctrines (is (List Text) + (list "fair use" + "fair dealing" + "other equivalents"))] ($.sentence (format _.license " is not intended to limit any rights " _.recipient " has under applicable copyright doctrines of " ($.or copyright_doctrines))))) diff --git a/licentia/source/program/licentia/license/definition.lux b/licentia/source/program/licentia/license/definition.lux index d9ddede8b..3d002311c 100644 --- a/licentia/source/program/licentia/license/definition.lux +++ b/licentia/source/program/licentia/license/definition.lux @@ -27,9 +27,9 @@ (def: commercial_services (List Text) - (let [services (: (-> Text Text) - (function (_ type) - (format type " services")))] + (let [services (is (-> Text Text) + (function (_ type) + (format type " services")))] (list (services "hosting") (services "consulting") (services "support")))) @@ -58,10 +58,10 @@ ($.paragraph (list (format "having the right to grant any and all of the rights conveyed by " (the #term license))))] [legal_entity "Legal Entity" - (let [abilities (: (List Text) - (list "to enter into contracts" - "to sue" - "to be sued"))] + (let [abilities (is (List Text) + (list "to enter into contracts" + "to sue" + "to be sued"))] ($.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" @@ -90,10 +90,10 @@ " and which represents an original " ..covered_work_description)))] [submission "Submission" - (let [forms_of_communication (: (List Text) - (list "electronic" - "verbal" - "written"))] + (let [forms_of_communication (is (List Text) + (list "electronic" + "verbal" + "written"))] ($.paragraph (list (format "any form of " ($.or forms_of_communication) " communication sent to " (the #term licensor) ", or its representatives, for the purpose of discussing and improving " (the #term licensed_work) ", but excluding communication that is designated in writing by the copyright owner as " not_a_contribution_notice))))] @@ -101,31 +101,31 @@ [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 " (the #term licensed_work)) - (format "any new " object " that contains any part of " (the #term licensed_work)) - (format "any " object " which replaces or otherwise alters the original functionality of "(the #term licensed_work) " at runtime")))] + targets (is (List Text) + (list (format "a " object " contained in " (the #term licensed_work)) + (format "any new " object " that contains any part of " (the #term licensed_work)) + (format "any " object " which replaces or otherwise alters the original functionality of "(the #term licensed_work) " at runtime")))] ($.paragraph (list (format alteration " " ($.or targets)))))] [required_component "Required Component" - (let [possibilities (: (List Text) - (list "text" - "program" - "script" - "schema" - "interface definition" - "control file" - "other work"))] + (let [possibilities (is (List Text) + (list "text" + "program" + "script" + "schema" + "interface definition" + "control file" + "other work"))] ($.paragraph (list (format "any " ($.or possibilities) " created by " (the #term recipient) " which is required by a third party to successfully install and run a " (the #term derivative_work) " by " (the #term recipient)))))] [extension "Extension" - (let [possibilities (: (List Text) - (list (the #term modification) - (the #term derivative_work) - (the #term required_component)))] + (let [possibilities (is (List Text) + (list (the #term modification) + (the #term derivative_work) + (the #term required_component)))] ($.paragraph (list (format "any " ($.or possibilities)))))] [contribution "Contribution" @@ -144,10 +144,10 @@ ", and subsequently incorporated within " (the #term licensed_work))))] [patent_claim (format "Patent Claim Of A " (the #term contributor)) - (let [claim_types (: (List Text) - (list "method" - "process" - "apparatus"))] + (let [claim_types (is (List Text) + (list "method" + "process" + "apparatus"))] ($.paragraph (list (format "any patent claim(s), including without limitation " ($.and claim_types) " claims, in any patent " (the #term licensable) " by such " (the #term contributor) " that would be infringed, but for the grant of " (the #term license) @@ -165,10 +165,10 @@ ", a product or service whose value derives, entirely or substantially, from the functionality of " (the #term licensed_work))))] [personal_use "Personal Use" - (let [valid_purposes (: (List Text) - (list "personal" - "private" - "non-commercial"))] + (let [valid_purposes (is (List Text) + (list "personal" + "private" + "non-commercial"))] ($.paragraph (list (format "use of " (the #term licensed_work) " by an individual solely for his or her " ($.and valid_purposes) " purposes") (format "An individual's use of " (the #term licensed_work) " in his or her capacity as an " ($.or individual_capacities) " does not qualify"))))] @@ -182,18 +182,18 @@ ($.paragraph (list (format "investigation or experimentation for the purpose of understanding the nature and limits of " (the #term licensed_work) " and its potential uses")))] [deploy "Deploy" - (let [deployment_types (: (List Text) - (list "use" - (the #term serve) - "sublicense" - "distribute")) - sub_licensing (: (-> Text Text) - (function (_ type) - (format type " sublicensing"))) - third_party_interactions (: (List Text) - (list (sub_licensing "direct") - (sub_licensing "indirect") - "distribution")) + (let [deployment_types (is (List Text) + (list "use" + (the #term serve) + "sublicense" + "distribute")) + sub_licensing (is (-> Text Text) + (function (_ type) + (format type " sublicensing"))) + third_party_interactions (is (List Text) + (list (sub_licensing "direct") + (sub_licensing "indirect") + "distribution")) basic_definition (format "to " ($.or deployment_types) " " (the #term licensed_work) " other than for internal " (the #term research) diff --git a/licentia/source/program/licentia/license/distribution.lux b/licentia/source/program/licentia/license/distribution.lux index d64b3ccac..849b7294a 100644 --- a/licentia/source/program/licentia/license/distribution.lux +++ b/licentia/source/program/licentia/license/distribution.lux @@ -13,9 +13,9 @@ (def: notices (List Text) - (let [notices (: (-> Text Text) - (function (_ what) - (format what " notices")))] + (let [notices (is (-> Text Text) + (function (_ what) + (format what " notices")))] (list (notices "copyright") (notices "patent") (notices "trademark") diff --git a/licentia/source/program/licentia/license/extension.lux b/licentia/source/program/licentia/license/extension.lux index 38ad300a3..82a5a0243 100644 --- a/licentia/source/program/licentia/license/extension.lux +++ b/licentia/source/program/licentia/license/extension.lux @@ -1,15 +1,15 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]]]]] - ["[0]" // {"+" Extension} - ["_" term] - ["[0]" grant] - [time {"+" Months Period}] - [// - ["$" document]]]) + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]]]]] + ["[0]" // {"+" Extension} + ["_" term] + ["[0]" grant] + [time {"+" Months Period}] + [// + ["$" document]]]) (def: .public sharing_requirement (List Text) @@ -136,20 +136,20 @@ " that " _.recipient " creates, or to which " _.recipient " contributes, to be documented in the " _.source_code_form) - modification_types (: (List Text) - (list "additions" - "changes" - "deletions")) + modification_types (is (List Text) + (list "additions" + "changes" + "deletions")) details (format "clearly describing the " ($.and modification_types) " that " _.recipient " made")] (format basic ", " details)) - on_notice_location (let [statement_locations (: (List Text) - (list (format "in the " _.source_code_form) - (format "in any notice displayed by " _.licensed_work - " " _.recipient - " distributes") - (format "in related documentation in which " _.recipient - " describes the origin or ownership of " _.licensed_work)))] + on_notice_location (let [statement_locations (is (List Text) + (list (format "in the " _.source_code_form) + (format "in any notice displayed by " _.licensed_work + " " _.recipient + " distributes") + (format "in related documentation in which " _.recipient + " describes the origin or ownership of " _.licensed_work)))] (format _.recipient " must include a prominent statement that the " _.modification " is derived, directly or indirectly, from " _.licensed_work diff --git a/licentia/source/program/licentia/license/liability.lux b/licentia/source/program/licentia/license/liability.lux index 6f4c82c6b..b6801b900 100644 --- a/licentia/source/program/licentia/license/liability.lux +++ b/licentia/source/program/licentia/license/liability.lux @@ -1,13 +1,13 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]]]]] + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]]]]] + [// + ["_" term] [// - ["_" term] - [// - ["$" document]]]) + ["$" document]]]) (def: warranty_communications (List Text) @@ -115,13 +115,13 @@ on_responsibility (let [but "However, in accepting such obligations" cannot_represent_a_contributor (format _.recipient " may not act on behalf of any other " _.contributor) can_only_represent_oneself (format "only on behalf and on sole responsibility of " _.recipient) - each_contributor (: (-> Text Text) - (function (_ responsibility) - (format responsibility " each " _.contributor))) - responsibilities (: (List Text) - (list (each_contributor "indemnify") - (each_contributor "defend") - (format (each_contributor "hold") " harmless"))) + each_contributor (is (-> Text Text) + (function (_ responsibility) + (format responsibility " each " _.contributor))) + responsibilities (is (List Text) + (list (each_contributor "indemnify") + (each_contributor "defend") + (format (each_contributor "hold") " harmless"))) full_responsibility_condition (format "and only if " _.recipient " agrees to " ($.and responsibilities) " for any liability incurred by, or claims asserted against, such " _.contributor @@ -131,22 +131,22 @@ on_responsibility)))) (def: .public disclaim_high_risk - (let [on_work (let [intentions (: (List Text) - (list "designed" - "manufactured" - "intended for use or distribution")) - hazardous_environments (: (List Text) - (list "nuclear facilities" - "aircraft navigation" - "communications systems" - "air traffic control" - "direct life support machines" - "weapons systems")) - consequences (: (List Text) - (list "death" - "personal injury" - "severe physical damage" - "environmental damage")) + (let [on_work (let [intentions (is (List Text) + (list "designed" + "manufactured" + "intended for use or distribution")) + hazardous_environments (is (List Text) + (list "nuclear facilities" + "aircraft navigation" + "communications systems" + "air traffic control" + "direct life support machines" + "weapons systems")) + consequences (is (List Text) + (list "death" + "personal injury" + "severe physical damage" + "environmental damage")) disclaim (format _.licensed_work " is not fault tolerant" ", and is not " ($.or intentions) " as on-line control equipment in hazardous environments requiring fail-safe performance") diff --git a/licentia/source/program/licentia/license/limitation.lux b/licentia/source/program/licentia/license/limitation.lux index 005a46601..cc8ff460c 100644 --- a/licentia/source/program/licentia/license/limitation.lux +++ b/licentia/source/program/licentia/license/limitation.lux @@ -1,24 +1,24 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]]]]] + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]]]]] + [// + ["_" term] [// - ["_" term] - [// - ["$" document]]]) + ["$" document]]]) (def: .public acceptance - (let [abilities (: (List Text) - (list "use" - "copy" - "distribute" - "modify" - (format "create an " _.extension - " of either " _.licensed_work - " or any " _.extension - " created by a " _.contributor))) + (let [abilities (is (List Text) + (list "use" + "copy" + "distribute" + "modify" + (format "create an " _.extension + " of either " _.licensed_work + " or any " _.extension + " created by a " _.contributor))) acknowledgement (format _.recipient " is not required to accept " _.license " since " _.recipient diff --git a/licentia/source/program/licentia/license/miscellaneous.lux b/licentia/source/program/licentia/license/miscellaneous.lux index 94f194f84..329d5ce9d 100644 --- a/licentia/source/program/licentia/license/miscellaneous.lux +++ b/licentia/source/program/licentia/license/miscellaneous.lux @@ -1,28 +1,28 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]]]]] + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]]]]] + [// + ["_" term] [// - ["_" term] - [// - ["$" document]]]) + ["$" document]]]) (def: .public entire_agreement ($.paragraph (list (format _.license " constitutes the entire agreement between the parties with respect to the subject matter hereof")))) (def: .public relationship_of_parties - (let [legal_associations (: (List Text) - (list "an agency" - "a partnership" - "a joint venture" - "any other form of legal association")) - forms_of_representation (: (List Text) - (list "expressly" - "by implication" - "by appearance" - "otherwise")) + (let [legal_associations (is (List Text) + (list "an agency" + "a partnership" + "a joint venture" + "any other form of legal association")) + forms_of_representation (is (List Text) + (list "expressly" + "by implication" + "by appearance" + "otherwise")) disclaimer (format _.license " will not be construed as creating " ($.or legal_associations)) scope (format "between or among " _.recipient ", " _.licensor @@ -32,14 +32,14 @@ ($.paragraph (list (format disclaimer " " scope ", and " constraint))))) (def: .public independent_development - (let [actions (: (List Text) - (list "acquire" - "license" - "develop" - "subcontract" - "market" - "distribute" - "produce")) + (let [actions (is (List Text) + (list "acquire" + "license" + "develop" + "subcontract" + "market" + "distribute" + "produce")) scope (format "Nothing in " _.license) effect (format "impair the right of " _.licensor) target "technology or products" @@ -71,11 +71,11 @@ (def: .public export_restrictions (let [limiter "applicable laws and regulations" - limited (: (List Text) - (list "downloading" - "acquiring" - "exporting" - "reexporting")) + limited (is (List Text) + (list "downloading" + "acquiring" + "exporting" + "reexporting")) on_circumstances (let [limitation (format _.recipient " may be restricted with respect to " ($.or limited)) target (format _.licensed_work " or any underlying information or technology")] diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index e721d58f1..c753cd555 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -288,9 +288,9 @@ (do random.monad [license ..license #let [writ (output.license license) - present? (: (-> Text Bit) - (function (_ snippet) - (text.contains? snippet writ)))]] + present? (is (-> Text Bit) + (function (_ snippet) + (text.contains? snippet writ)))]] ($_ _.and (_.test "Copyright notices are present." (list.every? (|>> notice.copyright_holder present?) -- cgit v1.2.3