diff options
234 files changed, 5018 insertions, 5015 deletions
diff --git a/licentia/source/program/licentia/document.lux b/licentia/source/program/licentia/document.lux index 5e1a99ade..4a3253f76 100644 --- a/licentia/source/program/licentia/document.lux +++ b/licentia/source/program/licentia/document.lux @@ -1,11 +1,11 @@ (.using - [library - [lux {"-" or and} - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor)]]]]]) + [library + [lux {"-" or and} + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor)]]]]]) (def: .public (quote text) (-> Text Text) @@ -46,5 +46,5 @@ (def: .public (section value) (-> Section Text) - (format (..block (value@ #title value)) - (value@ #content value))) + (format (..block (the #title value)) + (the #content value))) diff --git a/licentia/source/program/licentia/input.lux b/licentia/source/program/licentia/input.lux index ff14a78d6..ee48bec92 100644 --- a/licentia/source/program/licentia/input.lux +++ b/licentia/source/program/licentia/input.lux @@ -1,33 +1,33 @@ (.using - [library - [lux "*" - [abstract - [monad {"+" do}]] - [control - ["[0]" exception {"+" exception:}] - ["<>" parser - ["<[0]>" json {"+" Parser}]]] - [data - [text - ["%" format {"+" format}]]] - [math - [number - ["n" nat] - ["i" int] - ["f" frac]]]]] - ["[0]" // "_" - ["[1]" license {"+" Identification - Termination - Liability - Distribution - Commercial - Extension - Entity Black_List - URL Attribution - Addendum - License} - ["[0]" time {"+" Period}] - ["[0]" copyright]]]) + [library + [lux "*" + [abstract + [monad {"+" do}]] + [control + ["[0]" exception {"+" exception:}] + ["<>" parser + ["<[0]>" json {"+" Parser}]]] + [data + [text + ["%" format {"+" format}]]] + [math + [number + ["n" nat] + ["i" int] + ["f" frac]]]]] + ["[0]" // "_" + ["[1]" license {"+" Identification + Termination + Liability + Distribution + Commercial + Extension + Entity Black_List + URL Attribution + Addendum + License} + ["[0]" time {"+" Period}] + ["[0]" copyright]]]) (def: identification (Parser Identification) @@ -58,8 +58,8 @@ (exception: .public (invalid_period [period (Period Nat)]) (exception.report - ["Start" (%.nat (value@ time.#start period))] - ["End" (%.nat (value@ time.#end period))])) + ["Start" (%.nat (the time.#start period))] + ["End" (%.nat (the 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 95cc78446..3aa71b353 100644 --- a/licentia/source/program/licentia/license/addendum.lux +++ b/licentia/source/program/licentia/license/addendum.lux @@ -1,12 +1,12 @@ (.using - [library - [lux "*" - [data - [text - ["%" format {"+" format}]]]]] - ["[0]" // {"+" Addendum} - [// - ["$" document]]]) + [library + [lux "*" + [data + [text + ["%" format {"+" format}]]]]] + ["[0]" // {"+" Addendum} + [// + ["$" document]]]) ... https://commonsclause.com/ (def: .public commons_clause @@ -24,6 +24,6 @@ "")] ["“Commons Clause” License Condition v1.0" - (value@ //.#commons_clause? value) + (the //.#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 19dded3a4..24d367d6a 100644 --- a/licentia/source/program/licentia/license/black_list.lux +++ b/licentia/source/program/licentia/license/black_list.lux @@ -1,17 +1,17 @@ (.using - [library - [lux "*" - [control - ["[0]" maybe ("[1]#[0]" functor)]] - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor)]]]]] - ["[0]" // {"+" Entity Black_List} - ["_" term] - [// - ["$" document]]]) + [library + [lux "*" + [control + ["[0]" maybe ("[1]#[0]" functor)]] + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor)]]]]] + ["[0]" // {"+" Entity Black_List} + ["_" term] + [// + ["$" document]]]) (def: .public entity (-> Entity Text) @@ -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 - (value@ //.#justification) + (the //.#justification) (maybe#each (|>> (format ", due to "))) (maybe.default "")) entities (|> black_list - (value@ //.#entities) + (the //.#entities) (list#each ..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 0b55e72dd..d9ddede8b 100644 --- a/licentia/source/program/licentia/license/definition.lux +++ b/licentia/source/program/licentia/license/definition.lux @@ -1,11 +1,11 @@ (.using - [library - [lux {"-" Definition} - [data - ["[0]" text - ["%" format {"+" format}]]]]] - [/// - ["$" document]]) + [library + [lux {"-" Definition} + [data + ["[0]" text + ["%" format {"+" format}]]]]] + [/// + ["$" document]]) (type: .public Definition (Record @@ -55,7 +55,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 " (value@ #term license))))] + ($.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) @@ -65,28 +65,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 " (value@ #term legal_entity) " exercising permissions by " (value@ #term license))))] + ($.paragraph (list (format "a " (the #term legal_entity) " exercising permissions by " (the #term license))))] [licensor "The Licensor" - ($.paragraph (list (format "the copyright owner granting " (value@ #term license) ", or a " (value@ #term legal_entity) " authorized by the copyright owner")))] + ($.paragraph (list (format "the copyright owner granting " (the #term license) ", or a " (the #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 " (value@ #term source_code_form) ", including but not limited to compiled code and transpiled code")))] + ($.paragraph (list (format "any form produced by transforming a " (the #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 " (value@ #term source_code_form) - " or in an " (value@ #term object_form) - ", made available under " (value@ #term license) + ", whether in a " (the #term source_code_form) + " or in an " (the #term object_form) + ", made available under " (the #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 " (value@ #term source_code_form) - " or in an " (value@ #term object_form) - ", that is based on (or derived from) " (value@ #term licensed_work) + ($.paragraph (list (format "any work, whether in a " (the #term source_code_form) + " or in an " (the #term object_form) + ", that is based on (or derived from) " (the #term licensed_work) " and which represents an original " ..covered_work_description)))] [submission "Submission" @@ -94,17 +94,17 @@ (list "electronic" "verbal" "written"))] - ($.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) + ($.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))))] [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 " (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")))] + (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" @@ -117,74 +117,74 @@ "control file" "other work"))] ($.paragraph (list (format "any " ($.or possibilities) - " 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)))))] + " 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 (value@ #term modification) - (value@ #term derivative_work) - (value@ #term required_component)))] + (list (the #term modification) + (the #term derivative_work) + (the #term required_component)))] ($.paragraph (list (format "any " ($.or possibilities)))))] [contribution "Contribution" - ($.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")))] + ($.paragraph (list (format "any " covered_work_description ", including the original version of " (the #term licensed_work) + " and any " (the #term extension) " to " (the #term licensed_work) + ", that is intentionally communicated as a " (the #term submission) + " to " (the #term licensor) + " for inclusion in " (the #term licensed_work) " by the copyright owner" + ", or by a " (the #term legal_entity) " authorized to submit on behalf of the copyright owner")))] [contributor "Contributor" - ($.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))))] + ($.paragraph (list (format (the #term licensor) + " or any " (the #term legal_entity) + " on behalf of whom a " (the #term contribution) + " has been received by " (the #term licensor) + ", and subsequently incorporated within " (the #term licensed_work))))] - [patent_claim (format "Patent Claim Of A " (value@ #term contributor)) + [patent_claim (format "Patent Claim Of A " (the #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 " - (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)))))] + (the #term licensable) " by such " (the #term contributor) + " that would be infringed, but for the grant of " (the #term license) + ", to " ($.or patent_rights) " its " (the #term contribution)))))] [secondary_license "Secondary License" - ($.paragraph (list (format "any license for which compliance does not imply or require violating the terms of " (value@ #term license))))] + ($.paragraph (list (format "any license for which compliance does not imply or require violating the terms of " (the #term license))))] [sell "Sell" - ($.paragraph (list (format "practicing any or all of the rights granted to " (value@ #term recipient) - " under " (value@ #term license) + ($.paragraph (list (format "practicing any or all of the rights granted to " (the #term recipient) + " under " (the #term license) " to provide to third parties, for a fee or other consideration " "(including without limitation fees for " ($.or commercial_services) - " related to "(value@ #term licensed_work) ")" - ", a product or service whose value derives, entirely or substantially, from the functionality of " (value@ #term licensed_work))))] + " related to "(the #term licensed_work) ")" + ", 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"))] - ($.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"))))] + ($.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"))))] [serve "Serve" - ($.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))))] + ($.paragraph (list (format "to deliver " (the #term licensed_work) + " and/or any " (the #term extension) + " by means of a computer network to one or more computers for purposes of execution of " (the #term licensed_work) + ", and/or the " (the #term extension))))] [research "Research" - ($.paragraph (list (format "investigation or experimentation for the purpose of understanding the nature and limits of " (value@ #term licensed_work) " and its potential uses")))] + ($.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" - (value@ #term serve) + (the #term serve) "sublicense" "distribute")) sub_licensing (: (-> Text Text) @@ -195,20 +195,20 @@ (sub_licensing "indirect") "distribution")) basic_definition (format "to " ($.or deployment_types) - " " (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) + " " (the #term licensed_work) + " other than for internal " (the #term research) + " and/or " (the #term personal_use) + " by " (the #term recipient)) + examples (format "any and all internal use or distribution of " (the #term licensed_work) + " within a business or organization in which " (the #term recipient) " participates") - exceptions (format "for " (value@ #term research) " and/or " (value@ #term personal_use))] + exceptions (format "for " (the #term research) " and/or " (the #term personal_use))] ($.paragraph (list (format basic_definition ", and includes without limitation, " examples ", other than " exceptions ", as well as " ($.or third_party_interactions) - " of " (value@ #term licensed_work) - " by " (value@ #term recipient) + " of " (the #term licensed_work) + " by " (the #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 8d8afba3b..d64b3ccac 100644 --- a/licentia/source/program/licentia/license/distribution.lux +++ b/licentia/source/program/licentia/license/distribution.lux @@ -1,15 +1,15 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" monoid)]]]]] - ["[0]" // {"+" Distribution} - ["_" term] - [// - ["$" document]]]) + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" monoid)]]]]] + ["[0]" // {"+" Distribution} + ["_" term] + [// + ["$" document]]]) (def: notices (List Text) @@ -105,9 +105,9 @@ (def: .public (extension distribution) (-> Distribution Text) ($.paragraph ($_ list#composite - (if (value@ //.#can_re_license? distribution) + (if (the //.#can_re_license? distribution) (list allow_re_licensing) (list)) - (if (value@ //.#can_multi_license? distribution) + (if (the //.#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 b5fd18b65..39c762ab4 100644 --- a/licentia/source/program/licentia/license/notice.lux +++ b/licentia/source/program/licentia/license/notice.lux @@ -1,32 +1,32 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor)]]] - [math - [number - ["n" nat]]]]] - ["[0]" // "_" - ["[1][0]" time] - ["[1][0]" copyright] - ["_" term] - [// - ["$" document]]]) + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor)]]] + [math + [number + ["n" nat]]]]] + ["[0]" // "_" + ["[1][0]" time] + ["[1][0]" copyright] + ["_" term] + [// + ["$" document]]]) (def: .public end_of_license ($.sentence "END OF TERMS AND CONDITIONS")) (def: .public (copyright_holder holder) (-> //copyright.Holder Text) - (let [(^open "[0]") (value@ //copyright.#period holder) + (let [(^open "[0]") (the //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 " " (value@ //copyright.#name holder)))) + (format "Copyright (C) " period_section " " (the //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 213dd25c0..d4b56752b 100644 --- a/licentia/source/program/licentia/license/term.lux +++ b/licentia/source/program/licentia/license/term.lux @@ -1,13 +1,13 @@ (.using - [library - [lux {"-" Definition}]] - ["[0]" // "_" - ["[1][0]" definition]]) + [library + [lux {"-" Definition}]] + ["[0]" // "_" + ["[1][0]" definition]]) (template [<term> <definition>] [(def: .public <term> Text - (value@ //definition.#term <definition>))] + (the //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 64d6ab597..9f08bd250 100644 --- a/licentia/source/program/licentia/output.lux +++ b/licentia/source/program/licentia/output.lux @@ -1,49 +1,49 @@ (.using - [library - [lux {"-" Definition} - [control - ["[0]" maybe ("[1]#[0]" functor)]] - [data - ["[0]" bit] - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor monoid)]]]]] - [// - ["[0]" license {"+" Identification - Termination - Liability - Distribution - Commercial - Extension - Entity Black_List - URL Attribution - License} - ["[0]" copyright] - ["[0]" definition {"+" Definition}] - ["[0]" grant] - ["[0]" limitation] - ["[0]" assurance] - ["[0]" liability] - ["[0]" distribution] - ["[0]" commercial] - ["[0]" extension] - ["[0]" submission] - ["[0]" miscellaneous] - ["[0]" black_list] - ["[0]" notice] - ["_" term] - ["[0]" addendum]] - ["$" document]]) + [library + [lux {"-" Definition} + [control + ["[0]" maybe ("[1]#[0]" functor)]] + [data + ["[0]" bit] + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor monoid)]]]]] + [// + ["[0]" license {"+" Identification + Termination + Liability + Distribution + Commercial + Extension + Entity Black_List + URL Attribution + License} + ["[0]" copyright] + ["[0]" definition {"+" Definition}] + ["[0]" grant] + ["[0]" limitation] + ["[0]" assurance] + ["[0]" liability] + ["[0]" distribution] + ["[0]" commercial] + ["[0]" extension] + ["[0]" submission] + ["[0]" miscellaneous] + ["[0]" black_list] + ["[0]" notice] + ["_" term] + ["[0]" addendum]] + ["$" document]]) (def: .public (definition value) (-> Definition Text) - (format ($.quote (value@ definition.#term value)) ": " (value@ definition.#meaning value))) + (format ($.quote (the definition.#term value)) ": " (the definition.#meaning value))) (def: .public (identification value) (-> Identification Text) - (format (value@ license.#name value) text.new_line - (value@ license.#version value))) + (format (the license.#name value) text.new_line + (the license.#version value))) (def: .public (grant termination) (-> Termination Text) @@ -55,14 +55,14 @@ grant.copyright] ["Grant of Patent License" - (grant.patent (value@ license.#patent_retaliation? termination))] + (grant.patent (the license.#patent_retaliation? termination))] ["Effective Date for the Grants" grant.date] ["Grant Termination" - (grant.termination (value@ license.#termination_period termination) - (value@ license.#grace_period termination))] + (grant.termination (the license.#termination_period termination) + (the license.#grace_period termination))] ["No Retroactive Effect of Termination" grant.no_retroactive_termination]))))) @@ -115,11 +115,11 @@ liability.litigation] ["Accepting Warranty or Additional Liability" - (value@ license.#can_accept? value) + (the license.#can_accept? value) liability.can_accept] ["High Risk Activities" - (value@ license.#disclaim_high_risk? value) + (the 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 (value@ license.#can_re_license? distribution) - (value@ license.#can_multi_license? distribution)) + (or (the license.#can_re_license? distribution) + (the license.#can_multi_license? distribution)) (distribution.extension distribution)]))))) (def: .public (commercial value) @@ -152,21 +152,21 @@ "")] ["Non-Commerciality" - (not (value@ license.#can_sell? value)) + (not (the license.#can_sell? value)) commercial.cannot_sell] [(format _.contributor " Attribution") - (value@ license.#require_contributor_credit? value) + (the license.#require_contributor_credit? value) commercial.require_contributor_attribution] [(format _.contributor " Endorsement") - (not (value@ license.#allow_contributor_endorsement? value)) + (not (the license.#allow_contributor_endorsement? value)) commercial.disallow_contributor_endorsement] ))))) (def: .public (extension value) (-> Extension Text) - (let [[show? document] (case (value@ license.#notification_period value) + (let [[show? document] (case (the license.#notification_period value) {.#Some period} [true (extension.notification_requirement period)] @@ -178,30 +178,30 @@ #$.content <content>])) "")] - [(value@ license.#same_license? value) "License Retention" + [(the license.#same_license? value) "License Retention" ($.paragraph (list#composite extension.sharing_requirement extension.license_conflict_resolution))] - [(value@ license.#must_be_distinguishable? value) (format _.extension " Distinctness") + [(the license.#must_be_distinguishable? value) (format _.extension " Distinctness") extension.distinctness_requirement] [show? (format _.source_code_form " Availability") document] - [(value@ license.#must_describe_modifications? value) (format "Description of " ($.plural _.modification)) + [(the 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: " (value@ license.#copyright_notice value)) - phrase (case (value@ license.#phrase value) + (let [copyright_notice (format "Attribution Copyright Notice: " (the license.#copyright_notice value)) + phrase (case (the license.#phrase value) {.#Some phrase} (format text.new_line "Attribution Phrase: " phrase text.new_line) {.#None} "") - url (format text.new_line "Attribution URL: " (value@ license.#url value)) - image (case (value@ license.#image value) + url (format text.new_line "Attribution URL: " (the license.#url value)) + image (case (the 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 - (value@ license.#identification) + (the license.#identification) (maybe#each ..identification) (maybe.default "")) - identified? (case (value@ license.#identification value) + identified? (case (the license.#identification value) {.#Some _} true {.#None} false)] (`` (format ($.block identification) - ($.block (notice.copyright (value@ license.#copyright_holders value))) + ($.block (notice.copyright (the license.#copyright_holders value))) - (case (value@ license.#black_lists value) + (case (the license.#black_lists value) {.#End} "" @@ -284,20 +284,20 @@ ($.block ($.section [#$.title (format "Acceptance of " _.license) #$.content limitation.acceptance])) - (..grant (value@ license.#termination value)) + (..grant (the license.#termination value)) ..limitation ..assurance ($.block ($.section [#$.title (format _.submission " of " ($.plural _.contribution)) #$.content submission.contribution])) - (..liability (value@ license.#liability value)) - (..distribution (value@ license.#distribution value)) - (..commercial (value@ license.#commercial value)) - (..extension (value@ license.#extension value)) + (..liability (the license.#liability value)) + (..distribution (the license.#distribution value)) + (..commercial (the license.#commercial value)) + (..extension (the license.#extension value)) (|> value - (value@ license.#attribution) + (the license.#attribution) (maybe#each (|>> ..attribution ["Attribution Information"] $.section @@ -306,7 +306,7 @@ (..miscellaneous identified?) - (addendum.output (value@ license.#addendum value)) + (addendum.output (the license.#addendum value)) notice.end_of_license )))) diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index b6a151822..e721d58f1 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -1,48 +1,48 @@ (.using - [library - [lux "*" - [program {"+" program:}] - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" io] - ["[0]" maybe ("[1]#[0]" functor)]] - [data - ["[0]" bit ("[1]#[0]" equivalence)] - ["[0]" text] - [collection - ["[0]" list ("[1]#[0]" functor)]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat ("[1]#[0]" interval)]]]]] - [\\program - ["[0]" output] - ["[0]" license {"+" Identification - Termination - Liability - Distribution - Commercial - Extension - Entity Black_List - URL Attribution - Addendum - License} - ["[0]" time {"+" Period}] - ["[0]" copyright] - ["[0]" notice] - ["[0]" definition] - ["[0]" grant] - ["[0]" limitation] - ["[0]" submission] - ["[0]" liability] - ["[0]" distribution] - ["[0]" commercial] - ["[0]" extension] - ["[0]" miscellaneous] - ["[0]" black_list] - ["[0]" addendum]]]) + [library + [lux "*" + [program {"+" program:}] + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" io] + ["[0]" maybe ("[1]#[0]" functor)]] + [data + ["[0]" bit ("[1]#[0]" equivalence)] + ["[0]" text] + [collection + ["[0]" list ("[1]#[0]" functor)]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat ("[1]#[0]" interval)]]]]] + [\\program + ["[0]" output] + ["[0]" license {"+" Identification + Termination + Liability + Distribution + Commercial + Extension + Entity Black_List + URL Attribution + Addendum + License} + ["[0]" time {"+" Period}] + ["[0]" copyright] + ["[0]" notice] + ["[0]" definition] + ["[0]" grant] + ["[0]" limitation] + ["[0]" submission] + ["[0]" liability] + ["[0]" distribution] + ["[0]" commercial] + ["[0]" extension] + ["[0]" miscellaneous] + ["[0]" black_list] + ["[0]" addendum]]]) (def: period (Random (Period Nat)) @@ -161,16 +161,16 @@ (_.test "Copyright grant is present." (present? grant.copyright)) (_.test "Patent grant is present." - (present? (grant.patent (value@ license.#patent_retaliation? termination)))) + (present? (grant.patent (the license.#patent_retaliation? termination)))) (_.test "Effective date for the grants is present." (present? grant.date)) (_.test "Patent grant is present." - (present? (grant.termination (value@ license.#termination_period termination) - (value@ license.#grace_period termination)))) + (present? (grant.termination (the license.#termination_period termination) + (the license.#grace_period termination)))) (_.test "The termination period is accurately conveyed." - (present? (grant.grant_restoration_clause (value@ license.#termination_period termination)))) + (present? (grant.grant_restoration_clause (the license.#termination_period termination)))) (_.test "The grace period is accurately conveyed." - (present? (grant.grace_period_clause (value@ license.#grace_period termination)))) + (present? (grant.grace_period_clause (the 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#= (value@ license.#can_accept? liability) + (bit#= (the license.#can_accept? liability) (present? liability.can_accept))) (_.test "Liability acceptance conditions may be present." - (bit#= (value@ license.#disclaim_high_risk? liability) + (bit#= (the 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 (value@ license.#can_sell? commercial)) + (bit#= (not (the license.#can_sell? commercial)) (present? commercial.cannot_sell))) (_.test "Contributor credit condition is present." - (bit#= (value@ license.#require_contributor_credit? commercial) + (bit#= (the license.#require_contributor_credit? commercial) (present? commercial.require_contributor_attribution))) (_.test "Anti-endorsement condition is present." - (bit#= (not (value@ license.#allow_contributor_endorsement? commercial)) + (bit#= (not (the license.#allow_contributor_endorsement? commercial)) (present? commercial.disallow_contributor_endorsement))) )) @@ -221,21 +221,21 @@ (Concern Extension) ($_ _.and (_.test "The license is viral." - (bit#= (value@ license.#same_license? extension) + (bit#= (the 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#= (value@ license.#must_be_distinguishable? extension) + (bit#= (the license.#must_be_distinguishable? extension) (present? extension.distinctness_requirement))) (_.test "The community must be notified of new extensions." - (case (value@ license.#notification_period extension) + (case (the license.#notification_period extension) {.#Some period} (present? (extension.notification_requirement period)) {.#None} true)) (_.test "Must describe modifications." - (bit#= (value@ license.#must_describe_modifications? extension) + (bit#= (the license.#must_describe_modifications? extension) (present? extension.description_requirement))) )) @@ -243,17 +243,17 @@ (Concern Attribution) ($_ _.and (_.test "The attribution copyright notice is present." - (present? (value@ license.#copyright_notice attribution))) + (present? (the license.#copyright_notice attribution))) (_.test "The attribution phrase is present." (|> attribution - (value@ license.#phrase) + (the license.#phrase) (maybe#each present?) (maybe.default true))) (_.test "The attribution URL is present." - (present? (value@ license.#url attribution))) + (present? (the license.#url attribution))) (_.test "The attribution image is present." (|> attribution - (value@ license.#image) + (the license.#image) (maybe#each present?) (maybe.default true))) )) @@ -279,7 +279,7 @@ (Concern Addendum) ($_ _.and (_.test "Commons clause" - (bit#= (value@ license.#commons_clause? value) + (bit#= (the license.#commons_clause? value) (present? addendum.commons_clause))) )) @@ -294,10 +294,10 @@ ($_ _.and (_.test "Copyright notices are present." (list.every? (|>> notice.copyright_holder present?) - (value@ license.#copyright_holders license))) + (the license.#copyright_holders license))) (_.test "Identification is present (if the license is identified)." - (case (value@ license.#identification license) + (case (the 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 (value@ license.#justification black_list) + (let [black_list_is_justified? (case (the license.#justification black_list) {.#Some justification} (present? justification) {.#None} bit.yes) every_entity_is_mentioned? (|> black_list - (value@ license.#entities) + (the license.#entities) (list#each black_list.entity) (list.every? present?))] (and black_list_is_justified? every_entity_is_mentioned?))) - (value@ license.#black_lists license))) + (the 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? (value@ license.#termination license)) + (..about_grant present? (the 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? (value@ license.#liability license)) + (..about_liability present? (the license.#liability license)) - (..about_distribution present? (value@ license.#distribution license)) + (..about_distribution present? (the license.#distribution license)) - (..about_commercial present? (value@ license.#commercial license)) + (..about_commercial present? (the license.#commercial license)) - (..about_extension present? (value@ license.#extension license)) + (..about_extension present? (the license.#extension license)) - (case (value@ license.#attribution license) + (case (the license.#attribution license) {.#Some attribution} (..about_attribution present? attribution) @@ -357,7 +357,7 @@ (..about_miscellaneous present?) - (..about_addendum present? (value@ license.#addendum license)) + (..about_addendum present? (the license.#addendum license)) (_.test "License ending footer is present." (present? notice.end_of_license)) diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index 8993c1192..b4b82d9ce 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -553,7 +553,7 @@ ... Note: I have to call "eval" this way ... in order to avoid a quirk of calling eval in Node ... when the code is running under "use strict";. - (try (let [return ("js apply" (function.identity ("js constant" "eval")) code)] + (try (let [return ("js apply" (function.identity ("js constant" "eval")) [code])] (if ("js object null?" return) {.#None} {.#Some return})))) @@ -717,8 +717,8 @@ service [(packager.package _.use_strict _.code _.then ..scope) (format (cli.target service) - (# (value@ platform.#&file_system platform) separator) + (# (the platform.#&file_system platform) separator) "program" - (value@ context.#artifact_extension context))])] + (the context.#artifact_extension context))])] (..declare_success! [])) (io.io [])))) diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux index 46771939d..017dd834a 100644 --- a/lux-jvm/source/luxc/lang/host/jvm.lux +++ b/lux-jvm/source/luxc/lang/host/jvm.lux @@ -1,34 +1,34 @@ (.using - [library - [lux {"-" Definition Type Label} - [ffi {"+" import:}] - [abstract - monad] - [control - ["<>" parser - ["<[0]>" code]]] - [data - [binary {"+" Binary}] - [text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" monad)]]] - [macro - ["[0]" code] - [syntax {"+" syntax:}]] - [target - [jvm - ["[0]" type {"+" Type} - [category {"+" Class}]]]] - [tool - [compiler - [reference - [variable {"+" Register}]] - [language - [lux - ["[0]" generation]]] - [meta - [archive {"+" Archive}]]]]]]) + [library + [lux {"-" Definition Type Label} + [ffi {"+" import:}] + [abstract + monad] + [control + ["<>" parser + ["<[0]>" code]]] + [data + [binary {"+" Binary}] + [text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" monad)]]] + [macro + ["[0]" code] + [syntax {"+" syntax:}]] + [target + [jvm + ["[0]" type {"+" Type} + [category {"+" Class}]]]] + [tool + [compiler + [reference + [variable {"+" Register}]] + [language + [lux + ["[0]" generation]]] + [meta + [archive {"+" Archive}]]]]]]) (import: org/objectweb/asm/MethodVisitor) @@ -105,7 +105,7 @@ (` (def: .public (~ (code.local_symbol option)) (~ g!type) (|> (~ g!none) - (with@ (~ (code.local_symbol (format "#" option))) #1))))) + (has (~ (code.local_symbol (format "#" option))) #1))))) options)] (in (list& (` (type: .public (~ g!type) (.Record @@ -127,8 +127,8 @@ (-> (~ g!type) (~ g!type) (~ g!type)) (~ (|> g!tags+ (list#each (function (_ tag) - (list tag (` (or (value@ (~ tag) (~ g!_left)) - (value@ (~ tag) (~ g!_right))))))) + (list tag (` (or (the (~ tag) (~ g!_left)) + (the (~ tag) (~ g!_right))))))) list#conjoint code.tuple)))) diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux index 1fff1604a..e7174a61e 100644 --- a/lux-jvm/source/luxc/lang/host/jvm/def.lux +++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux @@ -1,28 +1,28 @@ (.using - [library - [lux {"-" Type} - ["[0]" ffi {"+" import: do_to}] - [control - ["[0]" function]] - [data - ["[0]" product] - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" array {"+" Array}] - ["[0]" list ("[1]@[0]" functor)]]] - [math - [number - ["i" int]]] - [target - [jvm - [encoding - ["[0]" name]] - ["[0]" type {"+" Type Constraint} - [category {"+" Class Value Method}] - ["[0]" signature] - ["[0]" descriptor]]]]]] - ["[0]" //]) + [library + [lux {"-" Type} + ["[0]" ffi {"+" import: do_to}] + [control + ["[0]" function]] + [data + ["[0]" product] + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" array {"+" Array}] + ["[0]" list ("[1]@[0]" functor)]]] + [math + [number + ["i" int]]] + [target + [jvm + [encoding + ["[0]" name]] + ["[0]" type {"+" Type Constraint} + [category {"+" Class Value Method}] + ["[0]" signature] + ["[0]" descriptor]]]]]] + ["[0]" //]) (def: signature (|>> type.signature signature.signature)) (def: descriptor (|>> type.descriptor descriptor.descriptor)) @@ -110,23 +110,23 @@ (def: (class_flags config) (-> //.Class_Config Int) ($_ i.+ - (if (value@ //.#finalC config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0))) + (if (the //.#finalC config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0))) (def: (method_flags config) (-> //.Method_Config Int) ($_ i.+ - (if (value@ //.#staticM config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0) - (if (value@ //.#finalM config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0) - (if (value@ //.#synchronizedM config) (org/objectweb/asm/Opcodes::ACC_SYNCHRONIZED) +0) - (if (value@ //.#strictM config) (org/objectweb/asm/Opcodes::ACC_STRICT) +0))) + (if (the //.#staticM config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0) + (if (the //.#finalM config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0) + (if (the //.#synchronizedM config) (org/objectweb/asm/Opcodes::ACC_SYNCHRONIZED) +0) + (if (the //.#strictM config) (org/objectweb/asm/Opcodes::ACC_STRICT) +0))) (def: (field_flags config) (-> //.Field_Config Int) ($_ i.+ - (if (value@ //.#staticF config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0) - (if (value@ //.#finalF config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0) - (if (value@ //.#transientF config) (org/objectweb/asm/Opcodes::ACC_TRANSIENT) +0) - (if (value@ //.#volatileF config) (org/objectweb/asm/Opcodes::ACC_VOLATILE) +0))) + (if (the //.#staticF config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0) + (if (the //.#finalF config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0) + (if (the //.#transientF config) (org/objectweb/asm/Opcodes::ACC_TRANSIENT) +0) + (if (the //.#volatileF config) (org/objectweb/asm/Opcodes::ACC_VOLATILE) +0))) (def: param_signature (-> (Type Class) Text) diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index ae6f3af2f..6393f6fe1 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -901,6 +901,6 @@ (format (cli.target service) (# file.default separator) "program" - (value@ context.#artifact_extension context))])] + (the context.#artifact_extension context))])] (..declare_success! [])) (io.io [])))))) diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el index ff17f0a44..5018e8894 100644 --- a/lux-mode/lux-mode.el +++ b/lux-mode/lux-mode.el @@ -363,7 +363,7 @@ Called by `imenu--generic-function'." (specialRE (let (;; Control (control//flow (altRE "case" "exec" "let" "if" "cond" "loop" "again" "do" "be")) (control//pattern-matching (altRE "\\^" "\\^or" - "\\^multi" "\\^@" "\\^template" + "\\^multi" "\\^let" "\\^template" "\\^open" "\\^|>" "\\^code" "\\^stream&" "\\^regex")) (control//logic (altRE "and" "or")) @@ -383,7 +383,7 @@ Called by `imenu--generic-function'." (type//dynamic (altRE ":dynamic" "/.:static")) (type//capability (altRE "capability:")) ;; Data - (data//record (altRE "value@" "with@" "revised@")) + (data//record (altRE "the" "has" "revised")) (data//interface (altRE "open:" "implementation" "#")) (data//implicit (altRE "implicit:" "##")) (data//collection (altRE "list" "list&" "sequence" "tree")) diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux index 8fcfe64d9..64241e5ff 100644 --- a/stdlib/source/documentation/lux.lux +++ b/stdlib/source/documentation/lux.lux @@ -552,13 +552,13 @@ (odd? num) "WHEN odd" "ELSE")]) -(documentation: /.value@ +(documentation: /.the "Accesses the value of a record at a given tag." - [(value@ #field my_record)] + [(the #field my_record)] ["Can also work with multiple levels of nesting." - (value@ [#foo #bar #baz] my_record)] + (the [#foo #bar #baz] my_record)] ["And, if only the slot/path is given, generates an accessor function." - (let [getter (value@ [#foo #bar #baz])] + (let [getter (the [#foo #bar #baz])] (getter my_record))]) (documentation: /.open: @@ -611,26 +611,26 @@ ["Also allows using that value as a function." (# codec encoded +123)]) -(documentation: /.with@ +(documentation: /.has "Sets the value of a record at a given tag." - [(with@ #name "Lux" lang)] + [(has #name "Lux" lang)] ["Can also work with multiple levels of nesting." - (with@ [#foo #bar #baz] value my_record)] + (has [#foo #bar #baz] value my_record)] ["And, if only the slot/path and (optionally) the value are given, generates a mutator function." - (let [setter (with@ [#foo #bar #baz] value)] + (let [setter (has [#foo #bar #baz] value)] (setter my_record)) - (let [setter (with@ [#foo #bar #baz])] + (let [setter (has [#foo #bar #baz])] (setter value my_record))]) -(documentation: /.revised@ +(documentation: /.revised "Modifies the value of a record at a given tag, based on some function." - [(revised@ #age ++ person)] + [(revised #age ++ person)] ["Can also work with multiple levels of nesting." - (revised@ [#foo #bar #baz] func my_record)] + (revised [#foo #bar #baz] func my_record)] ["And, if only the slot/path and (optionally) the value are given, generates a mutator function." - (let [updater (revised@ [#foo #bar #baz] func)] + (let [updater (revised [#foo #bar #baz] func)] (updater my_record)) - (let [updater (revised@ [#foo #bar #baz])] + (let [updater (revised [#foo #bar #baz])] (updater func my_record))]) (documentation: /.^template @@ -786,9 +786,9 @@ (same? +5 (+ +2 +3))]) -(documentation: /.^@ +(documentation: /.^let "Allows you to simultaneously bind and de-structure a value." - [(def: (hash (^@ set [member_hash _])) + [(def: (hash (^let set [member_hash _])) (list#mix (function (_ elem acc) (+ acc (# member_hash hash elem))) @@ -981,14 +981,14 @@ ..module_separator ..^open ..cond - ..value@ + ..the ..open: ..|>> ..<<| ..using ..# - ..with@ - ..revised@ + ..has + ..revised ..^template ..++ ..-- @@ -999,7 +999,7 @@ ..symbol ..:parameter ..same? - ..^@ + ..^let ..^|> ..:expected ..undefined diff --git a/stdlib/source/documentation/lux/type/unit.lux b/stdlib/source/documentation/lux/type/unit.lux index 417d9cbcb..a3d37d552 100644 --- a/stdlib/source/documentation/lux/type/unit.lux +++ b/stdlib/source/documentation/lux/type/unit.lux @@ -1,20 +1,20 @@ (.using - [library - [lux {"-" and} - ["$" documentation {"+" documentation:}] - [control - ["<>" parser - ["<[0]>" code]]] - [data - ["[0]" text {"+" \n} - ["%" format {"+" format}]]] - [macro - ["[0]" template]] - [math - [number - ["[0]" ratio]]]]] - [\\library - ["[0]" /]]) + [library + [lux {"-" and} + ["$" documentation {"+" documentation:}] + [control + ["<>" parser + ["<[0]>" code]]] + [data + ["[0]" text {"+" \n} + ["%" format {"+" format}]]] + [macro + ["[0]" template]] + [math + [number + ["[0]" ratio]]]]] + [\\library + ["[0]" /]]) (documentation: (/.Qty unit) "A quantity with an associated unit of measurement.") @@ -44,8 +44,8 @@ (template [<type> <scale>] [(`` (documentation: <scale> - (let [numerator (value@ [/.ratio ratio.#numerator] <scale>) - denominator (value@ [/.ratio ratio.#denominator] <scale>)] + (let [numerator (the [/.ratio ratio.#numerator] <scale>) + denominator (the [/.ratio ratio.#denominator] <scale>)] (format "The '" (~~ (template.text [<scale>])) "' scale, from " (%.nat numerator) " to " (%.nat denominator) "."))))] [/.Kilo /.kilo] diff --git a/stdlib/source/documentation/lux/world/output/video/resolution.lux b/stdlib/source/documentation/lux/world/output/video/resolution.lux index 1d36488c7..0a75bb938 100644 --- a/stdlib/source/documentation/lux/world/output/video/resolution.lux +++ b/stdlib/source/documentation/lux/world/output/video/resolution.lux @@ -1,17 +1,17 @@ (.using - [library - [lux "*" - ["$" documentation {"+" documentation:}] - [control - ["<>" parser - ["<[0]>" code]]] - [data - ["[0]" text {"+" \n} - ["%" format {"+" format}]]] - [macro - ["[0]" template]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["$" documentation {"+" documentation:}] + [control + ["<>" parser + ["<[0]>" code]]] + [data + ["[0]" text {"+" \n} + ["%" format {"+" format}]]] + [macro + ["[0]" template]]]] + [\\library + ["[0]" /]]) (documentation: /.Resolution "A screen resolution.") @@ -23,8 +23,8 @@ (text.replaced "_" " ") text.upper_cased)] (format name " resolution: " - (%.nat (value@ /.#width <name>)) - "x" (%.nat (value@ /.#height <name>)) + (%.nat (the /.#width <name>)) + "x" (%.nat (the /.#height <name>)) ".")))] [/.svga] diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux index 657bc4faa..09f0a9e4c 100644 --- a/stdlib/source/library/lux.lux +++ b/stdlib/source/library/lux.lux @@ -3965,7 +3965,7 @@ (-> (List a) (List [Nat a]))) (enumeration' 0 xs)) -(macro: .public (value@ tokens) +(macro: .public (the tokens) (case tokens (^ (list [_ {#Symbol slot'}] record)) (do meta_monad @@ -3988,12 +3988,12 @@ (meta#in (list (` ({(~ pattern) (~ g!output)} (~ record)))))) _ - (failure "value@ can only use records."))) + (failure "the can only use records."))) (^ (list [_ {#Tuple slots}] record)) (meta#in (list (list#mix (: (-> Code Code Code) (function (_ slot inner) - (` (..value@ (~ slot) (~ inner))))) + (` (..the (~ slot) (~ inner))))) record slots))) @@ -4001,10 +4001,10 @@ (do meta_monad [g!_ (..generated_symbol "_") g!record (..generated_symbol "record")] - (in (list (` (function ((~ g!_) (~ g!record)) (..value@ (~ selector) (~ g!record))))))) + (in (list (` (function ((~ g!_) (~ g!record)) (..the (~ selector) (~ g!record))))))) _ - (failure "Wrong syntax for value@"))) + (failure "Wrong syntax for the"))) (def: (open_declaration alias tags my_tag_index [module short] source type) (-> Text (List Symbol) Nat Symbol Code Type (Meta (List Code))) @@ -4200,7 +4200,7 @@ _ (failure "Wrong syntax for #"))) -(macro: .public (with@ tokens) +(macro: .public (has tokens) (case tokens (^ (list [_ {#Symbol slot'}] value record)) (do meta_monad @@ -4236,12 +4236,12 @@ (meta#in (list (` ({(~ pattern) (~ output)} (~ record))))))) _ - (failure "with@ can only use records."))) + (failure "has can only use records."))) (^ (list [_ {#Tuple slots}] value record)) (case slots {#End} - (failure "Wrong syntax for with@") + (failure "Wrong syntax for has") _ (do meta_monad @@ -4252,12 +4252,12 @@ .let [pairs (zipped/2 slots bindings) update_expr (list#mix (: (-> [Code Code] Code Code) (function (_ [s b] v) - (` (..with@ (~ s) (~ v) (~ b))))) + (` (..has (~ s) (~ v) (~ b))))) value (list#reversed pairs)) [_ accesses'] (list#mix (: (-> [Code Code] [Code (List (List Code))] [Code (List (List Code))]) (function (_ [new_slot new_binding] [old_record accesses']) - [(` (value@ (~ new_slot) (~ new_binding))) + [(` (the (~ new_slot) (~ new_binding))) {#Item (list new_binding old_record) accesses'}])) [record (: (List (List Code)) {#End})] pairs) @@ -4270,7 +4270,7 @@ [g!_ (..generated_symbol "_") g!record (..generated_symbol "record")] (in (list (` (function ((~ g!_) (~ g!record)) - (..with@ (~ selector) (~ value) (~ g!record))))))) + (..has (~ selector) (~ value) (~ g!record))))))) (^ (list selector)) (do meta_monad @@ -4278,12 +4278,12 @@ g!value (..generated_symbol "value") g!record (..generated_symbol "record")] (in (list (` (function ((~ g!_) (~ g!value) (~ g!record)) - (..with@ (~ selector) (~ g!value) (~ g!record))))))) + (..has (~ selector) (~ g!value) (~ g!record))))))) _ - (failure "Wrong syntax for with@"))) + (failure "Wrong syntax for has"))) -(macro: .public (revised@ tokens) +(macro: .public (revised tokens) (case tokens (^ (list [_ {#Symbol slot'}] fun record)) (do meta_monad @@ -4319,27 +4319,27 @@ (meta#in (list (` ({(~ pattern) (~ output)} (~ record))))))) _ - (failure "revised@ can only use records."))) + (failure "revised can only use records."))) (^ (list [_ {#Tuple slots}] fun record)) (case slots {#End} - (failure "Wrong syntax for revised@") + (failure "Wrong syntax for revised") _ (do meta_monad [g!record (..generated_symbol "record") g!temp (..generated_symbol "temp")] (in (list (` (let [(~ g!record) (~ record) - (~ g!temp) (value@ [(~+ slots)] (~ g!record))] - (with@ [(~+ slots)] ((~ fun) (~ g!temp)) (~ g!record)))))))) + (~ g!temp) (the [(~+ slots)] (~ g!record))] + (has [(~+ slots)] ((~ fun) (~ g!temp)) (~ g!record)))))))) (^ (list selector fun)) (do meta_monad [g!_ (..generated_symbol "_") g!record (..generated_symbol "record")] (in (list (` (function ((~ g!_) (~ g!record)) - (..revised@ (~ selector) (~ fun) (~ g!record))))))) + (..revised (~ selector) (~ fun) (~ g!record))))))) (^ (list selector)) (do meta_monad @@ -4347,10 +4347,10 @@ g!fun (..generated_symbol "fun") g!record (..generated_symbol "record")] (in (list (` (function ((~ g!_) (~ g!fun) (~ g!record)) - (..revised@ (~ selector) (~ g!fun) (~ g!record))))))) + (..revised (~ selector) (~ g!fun) (~ g!record))))))) _ - (failure "Wrong syntax for revised@"))) + (failure "Wrong syntax for revised"))) (macro: .public (^template tokens) (case tokens @@ -4704,7 +4704,7 @@ (-> a a Bit)) ("lux is" reference sample)) -(macro: .public (^@ tokens) +(macro: .public (^let tokens) (case tokens (^ (list& [_meta {#Form (list [_ {#Symbol ["" name]}] pattern)}] body branches)) (let [g!whole (local_symbol$ name)] @@ -4713,7 +4713,7 @@ branches))) _ - (failure (..wrong_syntax_error (symbol ..^@))))) + (failure (..wrong_syntax_error (symbol ..^let))))) (macro: .public (^|> tokens) (case tokens @@ -4740,7 +4740,7 @@ (def: location (Meta Location) (function (_ compiler) - {#Right [compiler (value@ #location compiler)]})) + {#Right [compiler (the #location compiler)]})) (macro: .public (undefined tokens) (case tokens @@ -4835,7 +4835,7 @@ (def: target (Meta Text) (function (_ compiler) - {#Right [compiler (value@ [#info #target] compiler)]})) + {#Right [compiler (the [#info #target] compiler)]})) (def: (platform_name choice) (-> Code (Meta Text)) diff --git a/stdlib/source/library/lux/abstract/apply.lux b/stdlib/source/library/lux/abstract/apply.lux index 8b3762485..a7cc3d764 100644 --- a/stdlib/source/library/lux/abstract/apply.lux +++ b/stdlib/source/library/lux/abstract/apply.lux @@ -1,10 +1,10 @@ (.using - [library - [lux "*" - ["@" target]]] - [// - [monad {"+" Monad}] - ["[0]" functor {"+" Functor}]]) + [library + [lux "*" + ["@" target]]] + [// + [monad {"+" Monad do}] + ["[0]" functor {"+" Functor}]]) (type: .public (Apply f) (Interface @@ -21,8 +21,8 @@ (Apply (All (_ a) (F (G a)))))) (def: &functor - (functor.composite (value@ &functor f_apply) - (value@ &functor g_apply))) + (functor.composite (the &functor f_apply) + (the &functor g_apply))) (def: (on fgx fgf) ... TODO: Switch from this version to the one below (in comments) ASAP. diff --git a/stdlib/source/library/lux/abstract/interval.lux b/stdlib/source/library/lux/abstract/interval.lux index 829c3ca5b..d16e140de 100644 --- a/stdlib/source/library/lux/abstract/interval.lux +++ b/stdlib/source/library/lux/abstract/interval.lux @@ -1,11 +1,11 @@ ... https://en.wikipedia.org/wiki/Interval_(mathematics) (.using - [library - [lux "*"]] - [// - [equivalence {"+" Equivalence}] - ["[0]" order] - [enum {"+" Enum}]]) + [library + [lux "*"]] + [// + [equivalence {"+" Equivalence}] + ["[0]" order] + [enum {"+" Enum}]]) (type: .public (Interval a) (Interface @@ -76,21 +76,21 @@ (implementation: .public (union left right) (All (_ a) (-> (Interval a) (Interval a) (Interval a))) - (def: &enum (value@ &enum right)) + (def: &enum (the &enum right)) (def: bottom (order.min (# right &order) (# left bottom) (# right bottom))) (def: top (order.max (# right &order) (# left top) (# right top)))) (implementation: .public (intersection left right) (All (_ a) (-> (Interval a) (Interval a) (Interval a))) - (def: &enum (value@ &enum right)) + (def: &enum (the &enum right)) (def: bottom (order.max (# right &order) (# left bottom) (# right bottom))) (def: top (order.min (# right &order) (# left top) (# right top)))) (implementation: .public (complement interval) (All (_ a) (-> (Interval a) (Interval a))) - (def: &enum (value@ &enum interval)) + (def: &enum (the &enum interval)) (def: bottom (# interval succ (# interval top))) (def: top (# interval pred (# interval bottom)))) diff --git a/stdlib/source/library/lux/control/concatenative.lux b/stdlib/source/library/lux/control/concatenative.lux index 85d5e6ee2..84383bba4 100644 --- a/stdlib/source/library/lux/control/concatenative.lux +++ b/stdlib/source/library/lux/control/concatenative.lux @@ -1,30 +1,30 @@ (.using - [library - [lux {"-" Alias if loop} - ["[0]" meta] - [abstract - ["[0]" monad]] - [control - ["[0]" maybe ("[1]#[0]" monad)]] - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" mix functor)]]] - ["[0]" macro {"+" with_symbols} - ["[0]" code] - ["[0]" template] - [syntax {"+" syntax:} - ["|[0]|" export]]] - [math - [number - ["n" nat] - ["i" int] - ["r" rev] - ["f" frac]]]]] - [// - ["<>" parser ("[1]#[0]" monad) - ["<[0]>" code {"+" Parser}]]]) + [library + [lux {"-" Alias if loop} + ["[0]" meta] + [abstract + ["[0]" monad]] + [control + ["[0]" maybe ("[1]#[0]" monad)]] + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" mix functor)]]] + ["[0]" macro {"+" with_symbols} + ["[0]" code] + ["[0]" template] + [syntax {"+" syntax:} + ["|[0]|" export]]] + [math + [number + ["n" nat] + ["i" int] + ["r" rev] + ["f" frac]]]]] + [// + ["<>" parser ("[1]#[0]" monad) + ["<[0]>" code {"+" Parser}]]]) (type: Alias [Text Code]) @@ -85,20 +85,20 @@ (code.replaced (code.local_symbol from) to pre)) aliased aliases))] - (case [(value@ #bottom inputs) - (value@ #bottom outputs)] + (case [(the #bottom inputs) + (the #bottom outputs)] [{.#Some bottomI} {.#Some bottomO}] (monad.do meta.monad - [inputC (singleton (macro.full_expansion (stack_mix (value@ #top inputs) bottomI))) - outputC (singleton (macro.full_expansion (stack_mix (value@ #top outputs) bottomO)))] + [inputC (singleton (macro.full_expansion (stack_mix (the #top inputs) bottomI))) + outputC (singleton (macro.full_expansion (stack_mix (the #top outputs) bottomO)))] (in (list (` (-> (~ (de_alias inputC)) (~ (de_alias outputC))))))) [?bottomI ?bottomO] (with_symbols [g!stack] (monad.do meta.monad - [inputC (singleton (macro.full_expansion (stack_mix (value@ #top inputs) (maybe.else g!stack ?bottomI)))) - outputC (singleton (macro.full_expansion (stack_mix (value@ #top outputs) (maybe.else g!stack ?bottomO))))] + [inputC (singleton (macro.full_expansion (stack_mix (the #top inputs) (maybe.else g!stack ?bottomI)))) + outputC (singleton (macro.full_expansion (stack_mix (the #top outputs) (maybe.else g!stack ?bottomO))))] (with_symbols [g!_] (in (list (` (All ((~ g!_) (~ g!stack)) (-> (~ (de_alias inputC)) diff --git a/stdlib/source/library/lux/control/concurrency/actor.lux b/stdlib/source/library/lux/control/concurrency/actor.lux index ded23e008..d534c198c 100644 --- a/stdlib/source/library/lux/control/concurrency/actor.lux +++ b/stdlib/source/library/lux/control/concurrency/actor.lux @@ -1,39 +1,39 @@ (.using - [library - [lux "*" - ["[0]" debug] - [abstract - monad] - [control - [pipe {"+" case>}] - ["[0]" function] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["[0]" io {"+" IO io}] - ["<>" parser ("[1]#[0]" monad) - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" bit] - ["[0]" product] - [text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" monoid monad)]]] - ["[0]" macro {"+" with_symbols} - ["[0]" code] - [syntax {"+" syntax:} - ["|[0]|" input] - ["|[0]|" export]]] - [math - [number - ["n" nat]]] - ["[0]" meta {"+" monad}] - [type {"+" :sharing} - ["[0]" abstract {"+" abstract: :representation :abstraction}]]]] - [// - ["[0]" atom {"+" Atom atom}] - ["[0]" async {"+" Async Resolver} ("[1]#[0]" monad)] - ["[0]" frp {"+" Channel}]]) + [library + [lux "*" + ["[0]" debug] + [abstract + monad] + [control + [pipe {"+" case>}] + ["[0]" function] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["[0]" io {"+" IO io}] + ["<>" parser ("[1]#[0]" monad) + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" bit] + ["[0]" product] + [text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" monoid monad)]]] + ["[0]" macro {"+" with_symbols} + ["[0]" code] + [syntax {"+" syntax:} + ["|[0]|" input] + ["|[0]|" export]]] + [math + [number + ["n" nat]]] + ["[0]" meta {"+" monad}] + [type {"+" :sharing} + ["[0]" abstract {"+" abstract: :representation :abstraction}]]]] + [// + ["[0]" atom {"+" Atom atom}] + ["[0]" async {"+" Async Resolver} ("[1]#[0]" monad)] + ["[0]" frp {"+" Channel}]]) (exception: .public poisoned) (exception: .public dead) @@ -89,13 +89,13 @@ (:abstraction [#obituary (async.async []) #mailbox (atom (async.async []))])) process (loop [state (on_init init) - [|mailbox| _] (io.run! (atom.read! (value@ #mailbox (:representation self))))] + [|mailbox| _] (io.run! (atom.read! (the #mailbox (:representation self))))] (do [! async.monad] [[head tail] |mailbox| ?state' (on_mail head state self)] (case ?state' {try.#Failure error} - (let [[_ resolve] (value@ #obituary (:representation self))] + (let [[_ resolve] (the #obituary (:representation self))] (exec (io.run! (do io.monad [pending (..pending tail)] @@ -108,7 +108,7 @@ (def: .public (alive? actor) (All (_ s) (-> (Actor s) (IO Bit))) - (let [[obituary _] (value@ #obituary (:representation actor))] + (let [[obituary _] (the #obituary (:representation actor))] (|> obituary async.value (# io.functor each @@ -120,13 +120,13 @@ (def: .public (obituary' actor) (All (_ s) (-> (Actor s) (IO (Maybe (Obituary s))))) - (let [[obituary _] (value@ #obituary (:representation actor))] + (let [[obituary _] (the #obituary (:representation actor))] (async.value obituary))) (def: .public obituary (All (_ s) (-> (Actor s) (Async (Obituary s)))) (|>> :representation - (value@ #obituary) + (the #obituary) product.left)) (def: .public (mail! mail actor) @@ -136,7 +136,7 @@ (if alive? (let [entry [mail (async.async [])]] (do ! - [|mailbox|&resolve (atom.read! (value@ #mailbox (:representation actor)))] + [|mailbox|&resolve (atom.read! (the #mailbox (:representation actor)))] (loop [[|mailbox| resolve] |mailbox|&resolve] (do ! [|mailbox| (async.value |mailbox|)] @@ -146,7 +146,7 @@ [resolved? (resolve entry)] (if resolved? (do ! - [_ (atom.write! (product.right entry) (value@ #mailbox (:representation actor)))] + [_ (atom.write! (product.right entry) (the #mailbox (:representation actor)))] (in {try.#Success []})) (again |mailbox|&resolve))) @@ -319,26 +319,26 @@ (with_symbols [g!_ g!return] (do meta.monad [actor_scope abstract.current - .let [g!type (code.local_symbol (value@ abstract.#name actor_scope)) - g!message (code.local_symbol (value@ #name signature)) - g!actor_vars (value@ abstract.#type_vars actor_scope) - g!all_vars (|> signature (value@ #vars) (list#each code.local_symbol) (list#composite g!actor_vars)) - g!inputsC (|> signature (value@ #inputs) (list#each product.left)) - g!inputsT (|> signature (value@ #inputs) (list#each product.right)) - g!state (|> signature (value@ #state) code.local_symbol) - g!self (|> signature (value@ #self) code.local_symbol)]] + .let [g!type (code.local_symbol (the abstract.#name actor_scope)) + g!message (code.local_symbol (the #name signature)) + g!actor_vars (the abstract.#type_vars actor_scope) + g!all_vars (|> signature (the #vars) (list#each code.local_symbol) (list#composite g!actor_vars)) + g!inputsC (|> signature (the #inputs) (list#each product.left)) + g!inputsT (|> signature (the #inputs) (list#each product.right)) + g!state (|> signature (the #state) code.local_symbol) + g!self (|> signature (the #self) code.local_symbol)]] (in (list (` (def: (~ export_policy) ((~ g!message) (~+ g!inputsC)) (All ((~ g!_) (~+ g!all_vars)) (-> (~+ g!inputsT) - (..Message (~ (value@ abstract.#abstraction actor_scope)) + (..Message (~ (the abstract.#abstraction actor_scope)) (~ output_type)))) (function ((~ g!_) (~ g!state) (~ g!self)) - (let [(~ g!state) (:as (~ (value@ abstract.#representation actor_scope)) + (let [(~ g!state) (:as (~ (the abstract.#representation actor_scope)) (~ g!state))] (|> (~ body) - (: ((~! async.Async) ((~! try.Try) [(~ (value@ abstract.#representation actor_scope)) + (: ((~! async.Async) ((~! try.Try) [(~ (the abstract.#representation actor_scope)) (~ output_type)]))) - (:as ((~! async.Async) ((~! try.Try) [(~ (value@ abstract.#abstraction actor_scope)) + (:as ((~! async.Async) ((~! try.Try) [(~ (the abstract.#abstraction actor_scope)) (~ output_type)])))))))) ))))) diff --git a/stdlib/source/library/lux/control/concurrency/async.lux b/stdlib/source/library/lux/control/concurrency/async.lux index e19682691..b131ddd1e 100644 --- a/stdlib/source/library/lux/control/concurrency/async.lux +++ b/stdlib/source/library/lux/control/concurrency/async.lux @@ -1,21 +1,21 @@ (.using - [library - [lux {"-" and or} - [abstract - [functor {"+" Functor}] - [apply {"+" Apply}] - ["[0]" monad {"+" Monad do}]] - [control - [pipe {"+" case>}] - ["[0]" function] - ["[0]" io {"+" IO io}]] - [data - ["[0]" product]] - [type {"+" :sharing} - abstract]]] - [// - ["[0]" thread] - ["[0]" atom {"+" Atom atom}]]) + [library + [lux {"-" and or} + [abstract + [functor {"+" Functor}] + [apply {"+" Apply}] + ["[0]" monad {"+" Monad do}]] + [control + [pipe {"+" case>}] + ["[0]" function] + ["[0]" io {"+" IO io}]] + [data + ["[0]" product]] + [type {"+" :sharing} + abstract]]] + [// + ["[0]" thread] + ["[0]" atom {"+" Atom atom}]]) (abstract: .public (Async a) (Atom [(Maybe a) (List (-> a (IO Any)))]) @@ -29,7 +29,7 @@ (function (resolve value) (let [async (:representation async)] (do [! io.monad] - [(^@ old [_value _observers]) (atom.read! async)] + [(^let old [_value _observers]) (atom.read! async)] (case _value {.#Some _} (in #0) @@ -64,7 +64,7 @@ (All (_ a) (-> (-> a (IO Any)) (Async a) (IO Any))) (do [! io.monad] [.let [async (:representation async)] - (^@ old [_value _observers]) (atom.read! async)] + (^let old [_value _observers]) (atom.read! async)] (case _value {.#Some value} (f value) diff --git a/stdlib/source/library/lux/control/concurrency/semaphore.lux b/stdlib/source/library/lux/control/concurrency/semaphore.lux index 56ab29a03..58e664966 100644 --- a/stdlib/source/library/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/library/lux/control/concurrency/semaphore.lux @@ -1,28 +1,28 @@ (.using - [library - [lux "*" - [abstract - [monad {"+" do}]] - [control - [pipe {"+" if>}] - ["[0]" io {"+" IO}] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}]] - [data - [text - ["%" format {"+" format}]] - [collection - ["[0]" queue {"+" Queue}]]] - [math - [number - ["n" nat] - ["i" int]]] - [type - abstract - ["[0]" refinement]]]] - [// - ["[0]" atom {"+" Atom}] - ["[0]" async {"+" Async Resolver}]]) + [library + [lux "*" + [abstract + [monad {"+" do}]] + [control + [pipe {"+" if>}] + ["[0]" io {"+" IO}] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}]] + [data + [text + ["%" format {"+" format}]] + [collection + ["[0]" queue {"+" Queue}]]] + [math + [number + ["n" nat] + ["i" int]]] + [type + abstract + ["[0]" refinement]]]] + [// + ["[0]" atom {"+" Atom}] + ["[0]" async {"+" Async Resolver}]]) (type: State (Record @@ -51,12 +51,12 @@ (async.async []))] (exec (io.run! - (with_expansions [<had_open_position?> (as_is (value@ #open_positions) (i.> -1))] + (with_expansions [<had_open_position?> (as_is (the #open_positions) (i.> -1))] (do io.monad - [[_ state'] (atom.update! (|>> (revised@ #open_positions --) + [[_ state'] (atom.update! (|>> (revised #open_positions --) (if> [<had_open_position?>] [] - [(revised@ #waiting_list (queue.end sink))])) + [(revised #waiting_list (queue.end sink))])) semaphore)] (with_expansions [<go_ahead> (sink []) <get_in_line> (in false)] @@ -75,23 +75,23 @@ (async.future (do [! io.monad] [[pre post] (atom.update! (function (_ state) - (if (i.= (.int (value@ #max_positions state)) - (value@ #open_positions state)) + (if (i.= (.int (the #max_positions state)) + (the #open_positions state)) state (|> state - (revised@ #open_positions ++) - (revised@ #waiting_list queue.next)))) + (revised #open_positions ++) + (revised #waiting_list queue.next)))) semaphore)] (if (same? pre post) - (in (exception.except ..semaphore_is_maxed_out [(value@ #max_positions pre)])) + (in (exception.except ..semaphore_is_maxed_out [(the #max_positions pre)])) (do ! - [_ (case (queue.front (value@ #waiting_list pre)) + [_ (case (queue.front (the #waiting_list pre)) {.#None} (in true) {.#Some sink} (sink []))] - (in {try.#Success (value@ #open_positions post)}))))))) + (in {try.#Success (the #open_positions post)}))))))) ) (abstract: .public Mutex @@ -151,13 +151,13 @@ [(def: (<phase> (^:representation barrier)) (-> Barrier (Async Any)) (do async.monad - [.let [limit (refinement.value (value@ #limit barrier)) + [.let [limit (refinement.value (the #limit barrier)) goal <goal> - [_ count] (io.run! (atom.update! <update> (value@ #count barrier))) + [_ count] (io.run! (atom.update! <update> (the #count barrier))) reached? (n.= goal count)]] (if reached? - (..un_block! (-- limit) (value@ <turnstile> barrier)) - (..wait! (value@ <turnstile> barrier)))))] + (..un_block! (-- limit) (the <turnstile> barrier)) + (..wait! (the <turnstile> barrier)))))] [start! ++ limit #start_turnstile] [end! -- 0 #end_turnstile] diff --git a/stdlib/source/library/lux/control/concurrency/stm.lux b/stdlib/source/library/lux/control/concurrency/stm.lux index c4ebebad4..22ebc470e 100644 --- a/stdlib/source/library/lux/control/concurrency/stm.lux +++ b/stdlib/source/library/lux/control/concurrency/stm.lux @@ -1,24 +1,24 @@ (.using - [library - [lux "*" - [abstract - [functor {"+" Functor}] - [apply {"+" Apply}] - ["[0]" monad {"+" Monad do}]] - [control - ["[0]" io {"+" IO io}] - ["[0]" maybe] - ["[0]" try]] - [data - ["[0]" product] - [collection - ["[0]" list]]] - [type - abstract]]] - [// - ["[0]" atom {"+" Atom atom}] - ["[0]" async {"+" Async Resolver}] - ["[0]" frp {"+" Channel Sink}]]) + [library + [lux "*" + [abstract + [functor {"+" Functor}] + [apply {"+" Apply}] + ["[0]" monad {"+" Monad do}]] + [control + ["[0]" io {"+" IO io}] + ["[0]" maybe] + ["[0]" try]] + [data + ["[0]" product] + [collection + ["[0]" list]]] + [type + abstract]]] + [// + ["[0]" atom {"+" Atom atom}] + ["[0]" async {"+" Async Resolver}] + ["[0]" frp {"+" Channel Sink}]]) (type: (Observer a) (-> a (IO Any))) @@ -46,7 +46,7 @@ (All (_ a) (-> a (Var a) (IO Any))) (do [! io.monad] [.let [var' (:representation var)] - (^@ old [old_value observers]) (atom.read! var') + (^let old [old_value observers]) (atom.read! var') succeeded? (atom.compare_and_swap! old [new_value observers] var')] (if succeeded? (do ! diff --git a/stdlib/source/library/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux index 0f5c30601..bfb4dc24f 100644 --- a/stdlib/source/library/lux/control/concurrency/thread.lux +++ b/stdlib/source/library/lux/control/concurrency/thread.lux @@ -178,14 +178,14 @@ (do ! [now (# ! each (|>> instant.millis .nat) instant.now) .let [[ready pending] (list.partition (function (_ thread) - (|> (value@ #creation thread) - (n.+ (value@ #delay thread)) + (|> (the #creation thread) + (n.+ (the #delay thread)) (n.<= now))) threads)] swapped? (atom.compare_and_swap! threads pending ..runner)] (if swapped? (do ! - [_ (monad.each ! (|>> (value@ #action) ..execute! io.io) ready)] + [_ (monad.each ! (|>> (the #action) ..execute! io.io) ready)] (again [])) (panic! (exception.error ..cannot_continue_running_threads [])))) ))))))) diff --git a/stdlib/source/library/lux/control/exception.lux b/stdlib/source/library/lux/control/exception.lux index 5e78a155e..942ebbfd8 100644 --- a/stdlib/source/library/lux/control/exception.lux +++ b/stdlib/source/library/lux/control/exception.lux @@ -1,30 +1,30 @@ (.using - [library - [lux "*" - ["[0]" macro] - ["[0]" meta] - [abstract - [monad {"+" do}]] - [control - ["[0]" maybe] - ["<>" parser ("[1]#[0]" monad) - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" monoid)] - [collection - ["[0]" list ("[1]#[0]" functor mix)]]] - [macro - ["[0]" code] - [syntax {"+" syntax:} - ["|[0]|" input] - ["[0]" type "_" - ["|[1]_[0]|" variable]]]] - [math - [number - ["n" nat ("[1]#[0]" decimal)]]]]] - [// - ["//" try {"+" Try}]]) + [library + [lux "*" + ["[0]" macro] + ["[0]" meta] + [abstract + [monad {"+" do}]] + [control + ["[0]" maybe] + ["<>" parser ("[1]#[0]" monad) + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" monoid)] + [collection + ["[0]" list ("[1]#[0]" functor mix)]]] + [macro + ["[0]" code] + [syntax {"+" syntax:} + ["|[0]|" input] + ["[0]" type "_" + ["|[1]_[0]|" variable]]]] + [math + [number + ["n" nat ("[1]#[0]" decimal)]]]]] + [// + ["//" try {"+" Try}]]) (type: .public (Exception a) (Record @@ -33,7 +33,7 @@ (def: .public (match? exception error) (All (_ e) (-> (Exception e) Text Bit)) - (text.starts_with? (value@ #label exception) error)) + (text.starts_with? (the #label exception) error)) (def: .public (when exception then try) (All (_ e a) @@ -44,7 +44,7 @@ {//.#Success output} {//.#Failure error} - (let [reference (value@ #label exception)] + (let [reference (the #label exception)] (if (text.starts_with? reference error) {//.#Success (|> error (text.clip_since (text.size reference)) @@ -64,7 +64,7 @@ (def: .public (error exception message) (All (_ e) (-> (Exception e) e Text)) - ((value@ ..#constructor exception) message)) + ((the ..#constructor exception) message)) (def: .public (except exception message) (All (_ e a) (-> (Exception e) e (Try a))) @@ -99,10 +99,10 @@ (in (list (` (def: (~ export_policy) (~ g!self) (All ((~ g!_) (~+ (list#each |type_variable|.format t_vars))) - (..Exception [(~+ (list#each (value@ |input|.#type) inputs))])) + (..Exception [(~+ (list#each (the |input|.#type) inputs))])) (let [(~ g!descriptor) (~ (code.text descriptor))] [..#label (~ g!descriptor) - ..#constructor (function ((~ g!self) [(~+ (list#each (value@ |input|.#binding) inputs))]) + ..#constructor (function ((~ g!self) [(~+ (list#each (the |input|.#binding) inputs))]) ((~! text#composite) (~ g!descriptor) (~ (maybe.else (' "") body))))])))))))) diff --git a/stdlib/source/library/lux/control/function/mutual.lux b/stdlib/source/library/lux/control/function/mutual.lux index b59578d3a..102457383 100644 --- a/stdlib/source/library/lux/control/function/mutual.lux +++ b/stdlib/source/library/lux/control/function/mutual.lux @@ -1,28 +1,28 @@ (.using - [library - [lux {"-" Definition let def: macro} - ["[0]" meta] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["<>" parser ("[1]#[0]" monad) - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" product] - [text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor)] - [dictionary - ["[0]" plist {"+" PList}]]]] - ["[0]" macro - ["[0]" local] - ["[0]" code] - [syntax {"+" syntax:} - ["[0]" declaration {"+" Declaration}]]]]] - ["[0]" //]) + [library + [lux {"-" Definition let def: macro} + ["[0]" meta] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["<>" parser ("[1]#[0]" monad) + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" product] + [text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor)] + [dictionary + ["[0]" plist {"+" PList}]]]] + ["[0]" macro + ["[0]" local] + ["[0]" code] + [syntax {"+" syntax:} + ["[0]" declaration {"+" Declaration}]]]]] + ["[0]" //]) (type: Mutual (Record @@ -42,8 +42,8 @@ (-> (List Code) Code [Code Mutual] Code) (` (function ((~ g!name) (~ g!context)) (.let [[(~+ context)] (~ g!context)] - (function (~ (declaration.format (value@ #declaration mutual))) - (~ (value@ #body mutual))))))) + (function (~ (declaration.format (the #declaration mutual))) + (~ (the #body mutual))))))) (.def: (macro g!context g!self) (-> Code Code Macro) @@ -59,10 +59,10 @@ (in (list body)) {.#Item mutual {.#End}} - (.let [g!name (|> mutual (value@ [#declaration declaration.#name]) code.local_symbol)] - (in (list (` (.let [(~ g!name) (: (~ (value@ #type mutual)) - (function (~ (declaration.format (value@ #declaration mutual))) - (~ (value@ #body mutual))))] + (.let [g!name (|> mutual (the [#declaration declaration.#name]) code.local_symbol)] + (in (list (` (.let [(~ g!name) (: (~ (the #type mutual)) + (function (~ (declaration.format (the #declaration mutual))) + (~ (the #body mutual))))] (~ body)))))) _ @@ -75,12 +75,12 @@ (list.zipped/2 hidden_names functions)) context_types (list#each (function (_ mutual) - (` (-> (~ g!context) (~ (value@ #type mutual))))) + (` (-> (~ g!context) (~ (the #type mutual))))) functions) - user_names (list#each (|>> (value@ [#declaration declaration.#name]) code.local_symbol) + user_names (list#each (|>> (the [#declaration declaration.#name]) code.local_symbol) functions)] g!pop (local.push (list#each (function (_ [g!name mutual]) - [[here_name (value@ [#declaration declaration.#name] mutual)] + [[here_name (the [#declaration declaration.#name] mutual)] (..macro g!context g!name)]) (list.zipped/2 hidden_names functions)))] @@ -125,19 +125,19 @@ functions) .let [definitions (list#each (..mutual_definition hidden_names g!context) (list.zipped/2 hidden_names - (list#each (value@ #mutual) functions))) + (list#each (the #mutual) functions))) context_types (list#each (function (_ mutual) - (` (-> (~ g!context) (~ (value@ [#mutual #type] mutual))))) + (` (-> (~ g!context) (~ (the [#mutual #type] mutual))))) functions) - user_names (list#each (|>> (value@ [#mutual #declaration declaration.#name]) code.local_symbol) + user_names (list#each (|>> (the [#mutual #declaration declaration.#name]) code.local_symbol) functions)] g!pop (local.push (list#each (function (_ [g!name mutual]) - [[here_name (value@ [#mutual #declaration declaration.#name] mutual)] + [[here_name (the [#mutual #declaration declaration.#name] mutual)] (..macro g!context g!name)]) (list.zipped/2 hidden_names functions)))] (in (list& (` (.def: (~ g!context) - [(~+ (list#each (value@ [#mutual #type]) functions))] + [(~+ (list#each (the [#mutual #type]) functions))] (.let [(~ g!context) (: (Rec (~ g!context) [(~+ context_types)]) [(~+ definitions)]) @@ -147,11 +147,11 @@ user_names))]))) g!pop (list#each (function (_ mutual) - (.let [g!name (|> mutual (value@ [#mutual #declaration declaration.#name]) code.local_symbol)] + (.let [g!name (|> mutual (the [#mutual #declaration declaration.#name]) code.local_symbol)] (` (.def: - (~ (value@ #export_policy mutual)) + (~ (the #export_policy mutual)) (~ g!name) - (~ (value@ [#mutual #type] mutual)) + (~ (the [#mutual #type] mutual)) (.let [[(~+ user_names)] (~ g!context)] (~ g!name)))))) functions))))))) diff --git a/stdlib/source/library/lux/control/maybe.lux b/stdlib/source/library/lux/control/maybe.lux index af48067c5..386548905 100644 --- a/stdlib/source/library/lux/control/maybe.lux +++ b/stdlib/source/library/lux/control/maybe.lux @@ -103,7 +103,7 @@ (All (_ M) (-> (Monad M) (Monad (All (_ a) (M (Maybe a)))))) (def: &functor - (functor.composite (value@ monad.&functor monad) + (functor.composite (the monad.&functor monad) ..functor)) (def: in diff --git a/stdlib/source/library/lux/control/parser/binary.lux b/stdlib/source/library/lux/control/parser/binary.lux index f2b2e7f5d..a3430e4d7 100644 --- a/stdlib/source/library/lux/control/parser/binary.lux +++ b/stdlib/source/library/lux/control/parser/binary.lux @@ -1,30 +1,30 @@ (.using - [library - [lux {"-" and or nat int rev list type symbol} - [type {"+" :sharing}] - [abstract - [hash {"+" Hash}] - [monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}]] - [data - ["/" binary {"+" Binary}] - [text - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [collection - ["[0]" list] - ["[0]" sequence {"+" Sequence}] - ["[0]" set {"+" Set}]]] - [macro - ["[0]" template]] - [math - [number - ["n" nat] - ["[0]" frac]]]]] - ["[0]" // ("[1]#[0]" monad)]) + [library + [lux {"-" and or nat int rev list type symbol} + [type {"+" :sharing}] + [abstract + [hash {"+" Hash}] + [monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}]] + [data + ["/" binary {"+" Binary}] + [text + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [collection + ["[0]" list] + ["[0]" sequence {"+" Sequence}] + ["[0]" set {"+" Set}]]] + [macro + ["[0]" template]] + [math + [number + ["n" nat] + ["[0]" frac]]]]] + ["[0]" // ("[1]#[0]" monad)]) (type: .public Offset Nat) @@ -52,17 +52,17 @@ (def: .public end? (Parser Bit) - (function (_ (^@ input [offset data])) + (function (_ (^let input [offset data])) {try.#Success [input (n.= offset (/.size data))]})) (def: .public offset (Parser Offset) - (function (_ (^@ input [offset data])) + (function (_ (^let input [offset data])) {try.#Success [input offset]})) (def: .public remaining (Parser Nat) - (function (_ (^@ input [offset data])) + (function (_ (^let input [offset data])) {try.#Success [input (n.- offset (/.size data))]})) (type: .public Size diff --git a/stdlib/source/library/lux/control/parser/text.lux b/stdlib/source/library/lux/control/parser/text.lux index de79a42b5..8fe67d90f 100644 --- a/stdlib/source/library/lux/control/parser/text.lux +++ b/stdlib/source/library/lux/control/parser/text.lux @@ -1,24 +1,24 @@ (.using - [library - [lux {"-" and not local} - [abstract - [monad {"+" Monad do}]] - [control - ["[0]" maybe] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}]] - [data - ["/" text {"+" Char} ("[1]#[0]" monoid)] - ["[0]" product] - [collection - ["[0]" list ("[1]#[0]" mix)]]] - [macro - ["[0]" code] - ["[0]" template]] - [math - [number - ["n" nat ("[1]#[0]" decimal)]]]]] - ["[0]" //]) + [library + [lux {"-" and not local} + [abstract + [monad {"+" Monad do}]] + [control + ["[0]" maybe] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}]] + [data + ["/" text {"+" Char} ("[1]#[0]" monoid)] + ["[0]" product] + [collection + ["[0]" list ("[1]#[0]" mix)]]] + [macro + ["[0]" code] + ["[0]" template]] + [math + [number + ["n" nat ("[1]#[0]" decimal)]]]]] + ["[0]" //]) (type: .public Offset Nat) @@ -68,7 +68,7 @@ (def: .public offset (Parser Offset) - (function (_ (^@ input [offset tape])) + (function (_ (^let input [offset tape])) {try.#Success [input offset]})) (def: (with_slices parser) @@ -139,14 +139,14 @@ (def: .public end! (Parser Any) - (function (_ (^@ input [offset tape])) + (function (_ (^let input [offset tape])) (if (n.= offset (/.size tape)) {try.#Success [input []]} (exception.except ..unconsumed_input input)))) (def: .public next (Parser Text) - (function (_ (^@ input [offset tape])) + (function (_ (^let input [offset tape])) (case (/.char offset tape) {.#Some output} {try.#Success [input (/.of_char output)]} @@ -156,7 +156,7 @@ (def: .public remaining (Parser Text) - (function (_ (^@ input [offset tape])) + (function (_ (^let input [offset tape])) {try.#Success [input (..left_over offset tape)]})) (def: .public (range bottom top) @@ -350,7 +350,7 @@ (-> (Parser Slice) (Parser Text)) (do //.monad [[basis distance] parser] - (function (_ (^@ input [offset tape])) + (function (_ (^let input [offset tape])) (case (/.clip basis distance tape) {.#Some output} {try.#Success [input output]} diff --git a/stdlib/source/library/lux/control/reader.lux b/stdlib/source/library/lux/control/reader.lux index bac66ac07..6a81806ac 100644 --- a/stdlib/source/library/lux/control/reader.lux +++ b/stdlib/source/library/lux/control/reader.lux @@ -1,10 +1,11 @@ (.using - [library - [lux {"-" local} - [abstract - [apply {"+" Apply}] - ["[0]" functor {"+" Functor}] - ["[0]" monad {"+" Monad do}]]]]) + [library + [lux {"-" local} + ["@" target] + [abstract + [apply {"+" Apply}] + ["[0]" functor {"+" Functor}] + ["[0]" monad {"+" Monad do}]]]]) (type: .public (Reader r a) (-> r a)) @@ -50,10 +51,10 @@ (mma env env)))) (implementation: .public (with monad) - (All (_ M) (-> (Monad M) (All (_ e) (Monad (All (_ a) (Reader e (M a))))))) + (All (_ !) (-> (Monad !) (All (_ e) (Monad (All (_ a) (Reader e (! a))))))) (def: &functor - (functor.composite ..functor (value@ monad.&functor monad))) + (functor.composite ..functor (the monad.&functor monad))) (def: in (|>> (# monad in) @@ -66,5 +67,5 @@ (result env eMa))))) (def: .public lifted - (All (_ M e a) (-> (M a) (Reader e (M a)))) + (All (_ ! e a) (-> (! a) (Reader e (! a)))) (# ..monad in)) diff --git a/stdlib/source/library/lux/control/region.lux b/stdlib/source/library/lux/control/region.lux index a0297e569..0aa7d8939 100644 --- a/stdlib/source/library/lux/control/region.lux +++ b/stdlib/source/library/lux/control/region.lux @@ -1,19 +1,19 @@ (.using - [library - [lux "*" - [abstract - [functor {"+" Functor}] - [apply {"+" Apply}] - ["[0]" monad {"+" Monad do}]] - [control - ["[0]" try {"+" Try}]] - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" mix)]]]]] - [// - ["[0]" exception {"+" Exception exception:}]]) + [library + [lux "*" + [abstract + [functor {"+" Functor}] + [apply {"+" Apply}] + ["[0]" monad {"+" Monad do}]] + [control + ["[0]" try {"+" Try}]] + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" mix)]]]]] + [// + ["[0]" exception {"+" Exception exception:}]]) (type: (Cleaner r !) (-> r (! (Try Any)))) @@ -93,7 +93,7 @@ (All (_ r) (Apply (Region r !))))) (def: &functor - (..functor (value@ monad.&functor super))) + (..functor (the monad.&functor super))) (def: (on fa ff) (function (_ [region cleaners]) @@ -118,7 +118,7 @@ (All (_ r) (Monad (Region r !))))) (def: &functor - (..functor (value@ monad.&functor super))) + (..functor (the monad.&functor super))) (def: (in value) (function (_ [region cleaners]) diff --git a/stdlib/source/library/lux/control/try.lux b/stdlib/source/library/lux/control/try.lux index a82b72d33..d1722f394 100644 --- a/stdlib/source/library/lux/control/try.lux +++ b/stdlib/source/library/lux/control/try.lux @@ -1,13 +1,14 @@ (.using - [library - [lux "*" - [abstract - [apply {"+" Apply}] - [equivalence {"+" Equivalence}] - ["[0]" functor {"+" Functor}] - ["[0]" monad {"+" Monad do}]] - [meta - ["[0]" location]]]]) + [library + [lux "*" + ["@" target] + [abstract + [apply {"+" Apply}] + [equivalence {"+" Equivalence}] + ["[0]" functor {"+" Functor}] + ["[0]" monad {"+" Monad do}]] + [meta + ["[0]" location]]]]) (type: .public (Try a) (Variant @@ -68,7 +69,7 @@ (All (_ !) (-> (Monad !) (Monad (All (_ a) (! (Try a)))))) (def: &functor - (functor.composite (value@ monad.&functor monad) + (functor.composite (the monad.&functor monad) ..functor)) (def: in diff --git a/stdlib/source/library/lux/control/writer.lux b/stdlib/source/library/lux/control/writer.lux index 5b01af67b..06676e8eb 100644 --- a/stdlib/source/library/lux/control/writer.lux +++ b/stdlib/source/library/lux/control/writer.lux @@ -1,12 +1,12 @@ (.using - [library - [lux "*" - ["@" target] - [abstract - [monoid {"+" Monoid}] - [apply {"+" Apply}] - ["[0]" functor {"+" Functor}] - ["[0]" monad {"+" Monad do}]]]]) + [library + [lux "*" + ["@" target] + [abstract + [monoid {"+" Monoid}] + [apply {"+" Apply}] + ["[0]" functor {"+" Functor}] + ["[0]" monad {"+" Monad do}]]]]) (type: .public (Writer log value) (Record @@ -53,7 +53,7 @@ (All (_ l M) (-> (Monoid l) (Monad M) (Monad (All (_ a) (M (Writer l a)))))) (def: &functor - (functor.composite (value@ monad.&functor monad) + (functor.composite (the monad.&functor monad) ..functor)) (def: in diff --git a/stdlib/source/library/lux/data/collection/dictionary.lux b/stdlib/source/library/lux/data/collection/dictionary.lux index e61a79230..6ff9c51fe 100644 --- a/stdlib/source/library/lux/data/collection/dictionary.lux +++ b/stdlib/source/library/lux/data/collection/dictionary.lux @@ -1,6 +1,6 @@ (.using [library - [lux "*" + [lux {"-" has revised} [abstract [hash {"+" Hash}] [equivalence {"+" Equivalence}] @@ -263,7 +263,7 @@ (Hash k) Level Bit_Map (Base k v) (Array (Node k v)))) - (product.right (list#mix (function (_ hierarchy_idx (^@ default [base_idx h_array])) + (product.right (list#mix (function (_ hierarchy_idx (^let default [base_idx h_array])) (if (with_bit_position? (to_bit_position hierarchy_idx) bitmap) [(++ base_idx) @@ -564,7 +564,7 @@ (def: .public key_hash (All (_ k v) (-> (Dictionary k v) (Hash k))) - (value@ ..#hash)) + (the ..#hash)) (def: .public (empty key_hash) (All (_ k v) (-> (Hash k) (Dictionary k v))) @@ -618,7 +618,7 @@ (def: .public size (All (_ k v) (-> (Dictionary k v) Nat)) - (|>> (value@ #root) ..node#size)) + (|>> (the #root) ..node#size)) (def: .public empty? (All (_ k v) (-> (Dictionary k v) Bit)) @@ -626,7 +626,7 @@ (def: .public entries (All (_ k v) (-> (Dictionary k v) (List [k v]))) - (|>> (value@ #root) ..node#entries)) + (|>> (the #root) ..node#entries)) (def: .public (of_list key_hash kvs) (All (_ k v) (-> (Hash k) (List [k v]) (Dictionary k v))) @@ -638,7 +638,7 @@ (template [<side> <name>] [(def: .public <name> (All (_ k v) (-> (Dictionary k v) (List <side>))) - (|>> (value@ #root) + (|>> (the #root) (node#mix (function (_ [k v] bundle) {.#Item <side> bundle}) {.#End})))] @@ -652,7 +652,7 @@ (node#mix (function (_ [key val] dict) (has key val dict)) dict1 - (value@ #root dict2))) + (the #root dict2))) (def: .public (merged_with f dict2 dict1) (All (_ k v) (-> (-> v v v) (Dictionary k v) (Dictionary k v) (Dictionary k v))) @@ -664,7 +664,7 @@ {.#Some val1} (has key (f val2 val1) dict))) dict1 - (value@ #root dict2))) + (the #root dict2))) (def: .public (re_bound from_key to_key dict) (All (_ k v) (-> k k (Dictionary k v) (Dictionary k v))) @@ -729,4 +729,4 @@ (All (_ k) (Functor (Dictionary k))) (def: (each f fa) - (revised@ #root (# ..node_functor each f) fa))) + (.revised #root (# ..node_functor each f) fa))) diff --git a/stdlib/source/library/lux/data/collection/dictionary/ordered.lux b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux index 7437962f6..13f9c1568 100644 --- a/stdlib/source/library/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux @@ -1,19 +1,19 @@ (.using - [library - [lux "*" - [abstract - equivalence - [monad {"+" Monad do}] - ["[0]" order {"+" Order}]] - [control - ["[0]" maybe]] - [data - ["p" product] - [collection - ["[0]" list ("[1]#[0]" monoid mix)]]] - [math - [number - ["n" nat]]]]]) + [library + [lux {"-" has revised} + [abstract + equivalence + [monad {"+" Monad do}] + ["[0]" order {"+" Order}]] + [control + ["[0]" maybe]] + [data + ["p" product] + [collection + ["[0]" list ("[1]#[0]" monoid mix)]]] + [math + [number + ["n" nat]]]]]) (def: error_message "Invariant violation") @@ -58,59 +58,59 @@ ... TODO: Must improve it as soon as bug is fixed. (def: .public (value key dict) (All (_ k v) (-> k (Dictionary k v) (Maybe v))) - (let [... (^open "_#[0]") (value@ #&order dict) + (let [... (^open "_#[0]") (the #&order dict) ] - (loop [node (value@ #root dict)] + (loop [node (the #root dict)] (case node {.#None} {.#None} {.#Some node} - (let [node_key (value@ #key node)] + (let [node_key (the #key node)] (cond (# dict = node_key key) ... (_#= node_key key) - {.#Some (value@ #value node)} + {.#Some (the #value node)} (# dict < node_key key) ... (_#< node_key key) - (again (value@ #left node)) + (again (the #left node)) - ... (_#> (value@ #key node) key) - (again (value@ #right node)))) + ... (_#> (the #key node) key) + (again (the #right node)))) )))) ... TODO: Doing inneficient access of Order functions due to compiler bug. ... TODO: Must improve it as soon as bug is fixed. (def: .public (key? dict key) (All (_ k v) (-> (Dictionary k v) k Bit)) - (let [... (^open "_#[0]") (value@ #&order dict) + (let [... (^open "_#[0]") (the #&order dict) ] - (loop [node (value@ #root dict)] + (loop [node (the #root dict)] (case node {.#None} #0 {.#Some node} - (let [node_key (value@ #key node)] + (let [node_key (the #key node)] (or (# dict = node_key key) ... (_#= node_key key) (if (# dict < node_key key) ... (_#< node_key key) - (again (value@ #left node)) - (again (value@ #right node))))))))) + (again (the #left node)) + (again (the #right node))))))))) (template [<name> <side>] [(def: .public (<name> dict) (All (_ k v) (-> (Dictionary k v) (Maybe v))) - (case (value@ #root dict) + (case (the #root dict) {.#None} {.#None} {.#Some node} (loop [node node] - (case (value@ <side> node) + (case (the <side> node) {.#None} - {.#Some (value@ #value node)} + {.#Some (the #value node)} {.#Some side} (again side)))))] @@ -121,14 +121,14 @@ (def: .public (size dict) (All (_ k v) (-> (Dictionary k v) Nat)) - (loop [node (value@ #root dict)] + (loop [node (the #root dict)] (case node {.#None} 0 {.#Some node} - (++ (n.+ (again (value@ #left node)) - (again (value@ #right node))))))) + (++ (n.+ (again (the #left node)) + (again (the #right node))))))) (def: .public empty? (All (_ k v) (-> (Dictionary k v) Bit)) @@ -137,9 +137,9 @@ (template [<name> <other_color> <self_color> <no_change>] [(def: (<name> self) (All (_ k v) (-> (Node k v) (Node k v))) - (case (value@ #color self) + (case (the #color self) {<other_color>} - (with@ #color {<self_color>} self) + (.has #color {<self_color>} self) {<self_color>} <no_change> @@ -151,46 +151,46 @@ (def: (with_left addition center) (All (_ k v) (-> (Node k v) (Node k v) (Node k v))) - (case (value@ #color center) + (case (the #color center) {#Red} - (red (value@ #key center) - (value@ #value center) + (red (the #key center) + (the #value center) {.#Some addition} - (value@ #right center)) + (the #right center)) {#Black} (with_expansions - [<default_behavior> (as_is (black (value@ #key center) - (value@ #value center) + [<default_behavior> (as_is (black (the #key center) + (the #value center) {.#Some addition} - (value@ #right center)))] - (case (value@ #color addition) + (the #right center)))] + (case (the #color addition) {#Red} - (case (value@ #left addition) + (case (the #left addition) (^multi {.#Some left} - [(value@ #color left) {#Red}]) - (red (value@ #key addition) - (value@ #value addition) + [(the #color left) {#Red}]) + (red (the #key addition) + (the #value addition) {.#Some (blackened left)} - {.#Some (black (value@ #key center) - (value@ #value center) - (value@ #right addition) - (value@ #right center))}) + {.#Some (black (the #key center) + (the #value center) + (the #right addition) + (the #right center))}) _ - (case (value@ #right addition) + (case (the #right addition) (^multi {.#Some right} - [(value@ #color right) {#Red}]) - (red (value@ #key right) - (value@ #value right) - {.#Some (black (value@ #key addition) - (value@ #value addition) - (value@ #left addition) - (value@ #left right))} - {.#Some (black (value@ #key center) - (value@ #value center) - (value@ #right right) - (value@ #right center))}) + [(the #color right) {#Red}]) + (red (the #key right) + (the #value right) + {.#Some (black (the #key addition) + (the #value addition) + (the #left addition) + (the #left right))} + {.#Some (black (the #key center) + (the #value center) + (the #right right) + (the #right center))}) _ <default_behavior>)) @@ -200,46 +200,46 @@ (def: (with_right addition center) (All (_ k v) (-> (Node k v) (Node k v) (Node k v))) - (case (value@ #color center) + (case (the #color center) {#Red} - (red (value@ #key center) - (value@ #value center) - (value@ #left center) + (red (the #key center) + (the #value center) + (the #left center) {.#Some addition}) {#Black} (with_expansions - [<default_behavior> (as_is (black (value@ #key center) - (value@ #value center) - (value@ #left center) + [<default_behavior> (as_is (black (the #key center) + (the #value center) + (the #left center) {.#Some addition}))] - (case (value@ #color addition) + (case (the #color addition) {#Red} - (case (value@ #right addition) + (case (the #right addition) (^multi {.#Some right} - [(value@ #color right) {#Red}]) - (red (value@ #key addition) - (value@ #value addition) - {.#Some (black (value@ #key center) - (value@ #value center) - (value@ #left center) - (value@ #left addition))} + [(the #color right) {#Red}]) + (red (the #key addition) + (the #value addition) + {.#Some (black (the #key center) + (the #value center) + (the #left center) + (the #left addition))} {.#Some (blackened right)}) _ - (case (value@ #left addition) + (case (the #left addition) (^multi {.#Some left} - [(value@ #color left) {#Red}]) - (red (value@ #key left) - (value@ #value left) - {.#Some (black (value@ #key center) - (value@ #value center) - (value@ #left center) - (value@ #left left))} - {.#Some (black (value@ #key addition) - (value@ #value addition) - (value@ #right left) - (value@ #right addition))}) + [(the #color left) {#Red}]) + (red (the #key left) + (the #value left) + {.#Some (black (the #key center) + (the #value center) + (the #left center) + (the #left left))} + {.#Some (black (the #key addition) + (the #value addition) + (the #right left) + (the #right addition))}) _ <default_behavior>)) @@ -249,17 +249,17 @@ (def: .public (has key value dict) (All (_ k v) (-> k v (Dictionary k v) (Dictionary k v))) - (let [(^open "_#[0]") (value@ #&order dict) - root' (loop [?root (value@ #root dict)] + (let [(^open "_#[0]") (the #&order dict) + root' (loop [?root (the #root dict)] (case ?root {.#None} {.#Some (red key value {.#None} {.#None})} {.#Some root} - (let [reference (value@ #key root)] + (let [reference (the #key root)] (`` (cond (~~ (template [<comp> <tag> <add>] [(<comp> reference key) - (let [side_root (value@ <tag> root) + (let [side_root (the <tag> root) outcome (again side_root)] (if (same? side_root outcome) ?root @@ -267,39 +267,39 @@ root)}))] [_#< #left ..with_left] - [(order.> (value@ #&order dict)) #right ..with_right] + [(order.> (the #&order dict)) #right ..with_right] )) ... (_#= reference key) - {.#Some (with@ #value value root)} + {.#Some (.has #value value root)} ))) ))] - (with@ #root root' dict))) + (.has #root root' dict))) (def: (left_balanced key value ?left ?right) (All (_ k v) (-> k v (Maybe (Node k v)) (Maybe (Node k v)) (Node k v))) (case ?left (^multi {.#Some left} - [(value@ #color left) {#Red}] - [(value@ #left left) {.#Some left>>left}] - [(value@ #color left>>left) {#Red}]) - (red (value@ #key left) - (value@ #value left) + [(the #color left) {#Red}] + [(the #left left) {.#Some left>>left}] + [(the #color left>>left) {#Red}]) + (red (the #key left) + (the #value left) {.#Some (blackened left>>left)} - {.#Some (black key value (value@ #right left) ?right)}) + {.#Some (black key value (the #right left) ?right)}) (^multi {.#Some left} - [(value@ #color left) {#Red}] - [(value@ #right left) {.#Some left>>right}] - [(value@ #color left>>right) {#Red}]) - (red (value@ #key left>>right) - (value@ #value left>>right) - {.#Some (black (value@ #key left) - (value@ #value left) - (value@ #left left) - (value@ #left left>>right))} + [(the #color left) {#Red}] + [(the #right left) {.#Some left>>right}] + [(the #color left>>right) {#Red}]) + (red (the #key left>>right) + (the #value left>>right) + {.#Some (black (the #key left) + (the #value left) + (the #left left) + (the #left left>>right))} {.#Some (black key value - (value@ #right left>>right) + (the #right left>>right) ?right)}) _ @@ -309,25 +309,25 @@ (All (_ k v) (-> k v (Maybe (Node k v)) (Maybe (Node k v)) (Node k v))) (case ?right (^multi {.#Some right} - [(value@ #color right) {#Red}] - [(value@ #right right) {.#Some right>>right}] - [(value@ #color right>>right) {#Red}]) - (red (value@ #key right) - (value@ #value right) - {.#Some (black key value ?left (value@ #left right))} + [(the #color right) {#Red}] + [(the #right right) {.#Some right>>right}] + [(the #color right>>right) {#Red}]) + (red (the #key right) + (the #value right) + {.#Some (black key value ?left (the #left right))} {.#Some (blackened right>>right)}) (^multi {.#Some right} - [(value@ #color right) {#Red}] - [(value@ #left right) {.#Some right>>left}] - [(value@ #color right>>left) {#Red}]) - (red (value@ #key right>>left) - (value@ #value right>>left) - {.#Some (black key value ?left (value@ #left right>>left))} - {.#Some (black (value@ #key right) - (value@ #value right) - (value@ #right right>>left) - (value@ #right right))}) + [(the #color right) {#Red}] + [(the #left right) {.#Some right>>left}] + [(the #color right>>left) {#Red}]) + (red (the #key right>>left) + (the #value right>>left) + {.#Some (black key value ?left (the #left right>>left))} + {.#Some (black (the #key right) + (the #value right) + (the #right right>>left) + (the #right right))}) _ (black key value ?left ?right))) @@ -336,26 +336,26 @@ (All (_ k v) (-> k v (Maybe (Node k v)) (Maybe (Node k v)) (Node k v))) (case ?left (^multi {.#Some left} - [(value@ #color left) {#Red}]) + [(the #color left) {#Red}]) (red key value {.#Some (blackened left)} ?right) _ (case ?right (^multi {.#Some right} - [(value@ #color right) {#Black}]) + [(the #color right) {#Black}]) (right_balanced key value ?left {.#Some (reddened right)}) (^multi {.#Some right} - [(value@ #color right) {#Red}] - [(value@ #left right) {.#Some right>>left}] - [(value@ #color right>>left) {#Black}]) - (red (value@ #key right>>left) - (value@ #value right>>left) - {.#Some (black key value ?left (value@ #left right>>left))} - {.#Some (right_balanced (value@ #key right) - (value@ #value right) - (value@ #right right>>left) - (# maybe.functor each reddened (value@ #right right)))}) + [(the #color right) {#Red}] + [(the #left right) {.#Some right>>left}] + [(the #color right>>left) {#Black}]) + (red (the #key right>>left) + (the #value right>>left) + {.#Some (black key value ?left (the #left right>>left))} + {.#Some (right_balanced (the #key right) + (the #value right) + (the #right right>>left) + (# maybe.functor each reddened (the #right right)))}) _ (panic! error_message)) @@ -365,26 +365,26 @@ (All (_ k v) (-> k v (Maybe (Node k v)) (Maybe (Node k v)) (Node k v))) (case ?right (^multi {.#Some right} - [(value@ #color right) {#Red}]) + [(the #color right) {#Red}]) (red key value ?left {.#Some (blackened right)}) _ (case ?left (^multi {.#Some left} - [(value@ #color left) {#Black}]) + [(the #color left) {#Black}]) (left_balanced key value {.#Some (reddened left)} ?right) (^multi {.#Some left} - [(value@ #color left) {#Red}] - [(value@ #right left) {.#Some left>>right}] - [(value@ #color left>>right) {#Black}]) - (red (value@ #key left>>right) - (value@ #value left>>right) - {.#Some (left_balanced (value@ #key left) - (value@ #value left) - (# maybe.functor each reddened (value@ #left left)) - (value@ #left left>>right))} - {.#Some (black key value (value@ #right left>>right) ?right)}) + [(the #color left) {#Red}] + [(the #right left) {.#Some left>>right}] + [(the #color left>>right) {#Black}]) + (red (the #key left>>right) + (the #value left>>right) + {.#Some (left_balanced (the #key left) + (the #value left) + (# maybe.functor each reddened (the #left left)) + (the #left left>>right))} + {.#Some (black key value (the #right left>>right) ?right)}) _ (panic! error_message) @@ -400,70 +400,70 @@ ?left [{.#Some left} {.#Some right}] - (case [(value@ #color left) (value@ #color right)] + (case [(the #color left) (the #color right)] [{#Red} {#Red}] (do maybe.monad - [fused (prepended (value@ #right left) (value@ #right right))] - (case (value@ #color fused) + [fused (prepended (the #right left) (the #right right))] + (case (the #color fused) {#Red} - (in (red (value@ #key fused) - (value@ #value fused) - {.#Some (red (value@ #key left) - (value@ #value left) - (value@ #left left) - (value@ #left fused))} - {.#Some (red (value@ #key right) - (value@ #value right) - (value@ #right fused) - (value@ #right right))})) + (in (red (the #key fused) + (the #value fused) + {.#Some (red (the #key left) + (the #value left) + (the #left left) + (the #left fused))} + {.#Some (red (the #key right) + (the #value right) + (the #right fused) + (the #right right))})) {#Black} - (in (red (value@ #key left) - (value@ #value left) - (value@ #left left) - {.#Some (red (value@ #key right) - (value@ #value right) + (in (red (the #key left) + (the #value left) + (the #left left) + {.#Some (red (the #key right) + (the #value right) {.#Some fused} - (value@ #right right))})))) + (the #right right))})))) [{#Red} {#Black}] - {.#Some (red (value@ #key left) - (value@ #value left) - (value@ #left left) - (prepended (value@ #right left) + {.#Some (red (the #key left) + (the #value left) + (the #left left) + (prepended (the #right left) ?right))} [{#Black} {#Red}] - {.#Some (red (value@ #key right) - (value@ #value right) + {.#Some (red (the #key right) + (the #value right) (prepended ?left - (value@ #left right)) - (value@ #right right))} + (the #left right)) + (the #right right))} [{#Black} {#Black}] (do maybe.monad - [fused (prepended (value@ #right left) (value@ #left right))] - (case (value@ #color fused) + [fused (prepended (the #right left) (the #left right))] + (case (the #color fused) {#Red} - (in (red (value@ #key fused) - (value@ #value fused) - {.#Some (black (value@ #key left) - (value@ #value left) - (value@ #left left) - (value@ #left fused))} - {.#Some (black (value@ #key right) - (value@ #value right) - (value@ #right fused) - (value@ #right right))})) + (in (red (the #key fused) + (the #value fused) + {.#Some (black (the #key left) + (the #value left) + (the #left left) + (the #left fused))} + {.#Some (black (the #key right) + (the #value right) + (the #right fused) + (the #right right))})) {#Black} - (in (without_left (value@ #key left) - (value@ #value left) - (value@ #left left) - {.#Some (black (value@ #key right) - (value@ #value right) + (in (without_left (the #key left) + (the #value left) + (the #left left) + {.#Some (black (the #key right) + (the #value right) {.#Some fused} - (value@ #right right))})) + (the #right right))})) )) ) @@ -472,42 +472,42 @@ (def: .public (lacks key dict) (All (_ k v) (-> k (Dictionary k v) (Dictionary k v))) - (let [(^open "_#[0]") (value@ #&order dict) - [?root found?] (loop [?root (value@ #root dict)] + (let [(^open "_#[0]") (the #&order dict) + [?root found?] (loop [?root (the #root dict)] (case ?root {.#Some root} - (let [root_key (value@ #key root) - root_val (value@ #value root)] + (let [root_key (the #key root) + root_val (the #value root)] (if (_#= root_key key) - [(prepended (value@ #left root) - (value@ #right root)) + [(prepended (the #left root) + (the #right root)) #1] (let [go_left? (_#< root_key key)] (case (again (if go_left? - (value@ #left root) - (value@ #right root))) + (the #left root) + (the #right root))) [{.#None} #0] [{.#None} #0] [side_outcome _] (if go_left? - (case (value@ #left root) + (case (the #left root) (^multi {.#Some left} - [(value@ #color left) {#Black}]) - [{.#Some (without_left root_key root_val side_outcome (value@ #right root))} + [(the #color left) {#Black}]) + [{.#Some (without_left root_key root_val side_outcome (the #right root))} #0] _ - [{.#Some (red root_key root_val side_outcome (value@ #right root))} + [{.#Some (red root_key root_val side_outcome (the #right root))} #0]) - (case (value@ #right root) + (case (the #right root) (^multi {.#Some right} - [(value@ #color right) {#Black}]) - [{.#Some (without_right root_key root_val (value@ #left root) side_outcome)} + [(the #color right) {#Black}]) + [{.#Some (without_right root_key root_val (the #left root) side_outcome)} #0] _ - [{.#Some (red root_key root_val (value@ #left root) side_outcome)} + [{.#Some (red root_key root_val (the #left root) side_outcome)} #0]) ))) )) @@ -518,11 +518,11 @@ (case ?root {.#None} (if found? - (with@ #root ?root dict) + (.has #root ?root dict) dict) {.#Some root} - (with@ #root {.#Some (blackened root)} dict) + (.has #root {.#Some (blackened root)} dict) ))) (def: .public (revised key transform dict) @@ -537,34 +537,34 @@ (def: .public (of_list order list) (All (_ k v) (-> (Order k) (List [k v]) (Dictionary k v))) (list#mix (function (_ [key value] dict) - (has key value dict)) + (..has key value dict)) (empty order) list)) (template [<name> <type> <output>] [(def: .public (<name> dict) (All (_ k v) (-> (Dictionary k v) (List <type>))) - (loop [node (value@ #root dict)] + (loop [node (the #root dict)] (case node {.#None} (list) {.#Some node'} ($_ list#composite - (again (value@ #left node')) + (again (the #left node')) (list <output>) - (again (value@ #right node'))))))] + (again (the #right node'))))))] - [entries [k v] [(value@ #key node') (value@ #value node')]] - [keys k (value@ #key node')] - [values v (value@ #value node')] + [entries [k v] [(the #key node') (the #value node')]] + [keys k (the #key node')] + [values v (the #value node')] ) (implementation: .public (equivalence (^open ",#[0]")) (All (_ k v) (-> (Equivalence v) (Equivalence (Dictionary k v)))) (def: (= reference sample) - (let [(^open "/#[0]") (value@ #&order reference)] + (let [(^open "/#[0]") (the #&order reference)] (loop [entriesR (entries reference) entriesS (entries sample)] (case [entriesR entriesS] diff --git a/stdlib/source/library/lux/data/collection/dictionary/plist.lux b/stdlib/source/library/lux/data/collection/dictionary/plist.lux index 6ba497f34..5417fca5d 100644 --- a/stdlib/source/library/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/library/lux/data/collection/dictionary/plist.lux @@ -1,6 +1,6 @@ (.using [library - [lux "*" + [lux {"-" has revised} [abstract [equivalence {"+" Equivalence}] [monoid {"+" Monoid}]] diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux index e5130f985..41e616a8e 100644 --- a/stdlib/source/library/lux/data/collection/list.lux +++ b/stdlib/source/library/lux/data/collection/list.lux @@ -1,6 +1,6 @@ (.using [library - [lux "*" + [lux {"-" revised} ["@" target] [abstract [monoid {"+" Monoid}] @@ -575,7 +575,7 @@ (All (_ M) (-> (Monad M) (Monad (All (_ a) (M (List a)))))) (def: &functor - (functor.composite (value@ monad.&functor monad) + (functor.composite (the monad.&functor monad) ..functor)) (def: in diff --git a/stdlib/source/library/lux/data/collection/queue.lux b/stdlib/source/library/lux/data/collection/queue.lux index e8ed4c145..81eb6092c 100644 --- a/stdlib/source/library/lux/data/collection/queue.lux +++ b/stdlib/source/library/lux/data/collection/queue.lux @@ -1,15 +1,15 @@ (.using - [library - [lux {"-" list} - [abstract - [equivalence {"+" Equivalence}] - [functor {"+" Functor}]] - [data - [collection - ["[0]" list ("[1]#[0]" monoid functor)]]] - [math - [number - ["n" nat]]]]]) + [library + [lux {"-" list} + [abstract + [equivalence {"+" Equivalence}] + [functor {"+" Functor}]] + [data + [collection + ["[0]" list ("[1]#[0]" monoid functor)]]] + [math + [number + ["n" nat]]]]]) (type: .public (Queue a) (Record @@ -33,7 +33,7 @@ (def: .public front (All (_ a) (-> (Queue a) (Maybe a))) - (|>> (value@ #front) list.head)) + (|>> (the #front) list.head)) (def: .public (size queue) (All (_ a) (-> (Queue a) Nat)) @@ -43,7 +43,7 @@ (def: .public empty? (All (_ a) (-> (Queue a) Bit)) - (|>> (value@ #front) list.empty?)) + (|>> (the #front) list.empty?)) (def: .public (member? equivalence queue member) (All (_ a) (-> (Equivalence a) (Queue a) a Bit)) @@ -53,7 +53,7 @@ (def: .public (next queue) (All (_ a) (-> (Queue a) (Queue a))) - (case (value@ #front queue) + (case (the #front queue) ... Empty... (^ (.list)) queue @@ -61,22 +61,22 @@ ... Front has dried up... (^ (.list _)) (|> queue - (with@ #front (list.reversed (value@ #rear queue))) - (with@ #rear (.list))) + (has #front (list.reversed (the #rear queue))) + (has #rear (.list))) ... Consume front! (^ (.list& _ front')) (|> queue - (with@ #front front')))) + (has #front front')))) (def: .public (end val queue) (All (_ a) (-> a (Queue a) (Queue a))) - (case (value@ #front queue) + (case (the #front queue) {.#End} - (with@ #front (.list val) queue) + (has #front (.list val) queue) _ - (revised@ #rear (|>> {.#Item val}) queue))) + (revised #rear (|>> {.#Item val}) queue))) (implementation: .public (equivalence super) (All (_ a) (-> (Equivalence a) (Equivalence (Queue a)))) @@ -90,5 +90,5 @@ (Functor Queue) (def: (each f fa) - [#front (|> fa (value@ #front) (list#each f)) - #rear (|> fa (value@ #rear) (list#each f))])) + [#front (|> fa (the #front) (list#each f)) + #rear (|> fa (the #rear) (list#each f))])) diff --git a/stdlib/source/library/lux/data/collection/sequence.lux b/stdlib/source/library/lux/data/collection/sequence.lux index 01a33b7c7..4c935a3d4 100644 --- a/stdlib/source/library/lux/data/collection/sequence.lux +++ b/stdlib/source/library/lux/data/collection/sequence.lux @@ -3,7 +3,7 @@ ... https://hypirion.com/musings/understanding-persistent-vector-pt-3 (.using [library - [lux {"-" list} + [lux {"-" list has revised} ["@" target] [abstract [functor {"+" Functor}] @@ -205,58 +205,58 @@ (def: .public (size sequence) (All (_ a) (-> (Sequence a) Nat)) - (value@ #size sequence)) + (the #size sequence)) (def: .public (suffix val sequence) (All (_ a) (-> a (Sequence a) (Sequence a))) ... Check if there is room in the tail. - (let [sequence_size (value@ #size sequence)] + (let [sequence_size (the #size sequence)] (if (|> sequence_size (n.- (tail_off sequence_size)) (n.< full_node_size)) ... If so, append to it. (|> sequence - (revised@ #size ++) - (revised@ #tail (..expanded_tail val))) + (.revised #size ++) + (.revised #tail (..expanded_tail val))) ... Otherwise, push tail into the tree ... -------------------------------------------------------- ... Will the root experience an overflow with this addition? - (|> (if (n.> (i64.left_shifted (value@ #level sequence) 1) + (|> (if (n.> (i64.left_shifted (the #level sequence) 1) (i64.right_shifted branching_exponent sequence_size)) ... If so, a brand-new root must be established, that is ... 1-level taller. (|> sequence - (with@ #root (|> (`` (: (Hierarchy (~~ (:of val))) - (empty_hierarchy []))) - (array.has! 0 {#Hierarchy (value@ #root sequence)}) - (array.has! 1 (..path (value@ #level sequence) (value@ #tail sequence))))) - (revised@ #level level_up)) + (.has #root (|> (`` (: (Hierarchy (~~ (:of val))) + (empty_hierarchy []))) + (array.has! 0 {#Hierarchy (the #root sequence)}) + (array.has! 1 (..path (the #level sequence) (the #tail sequence))))) + (.revised #level level_up)) ... Otherwise, just push the current tail onto the root. (|> sequence - (revised@ #root (..with_tail sequence_size (value@ #level sequence) (value@ #tail sequence))))) + (.revised #root (..with_tail sequence_size (the #level sequence) (the #tail sequence))))) ... Finally, update the size of the sequence and grow a new ... tail with the new element as it's sole member. - (revised@ #size ++) - (with@ #tail (..tail val))) + (.revised #size ++) + (.has #tail (..tail val))) ))) (exception: incorrect_sequence_structure) (exception: .public [a] (index_out_of_bounds [sequence (Sequence a) index Nat]) - (exception.report ["Size" (# n.decimal encoded (value@ #size sequence))] + (exception.report ["Size" (# n.decimal encoded (the #size sequence))] ["Index" (# n.decimal encoded index)])) (exception: base_was_not_found) (def: .public (within_bounds? sequence idx) (All (_ a) (-> (Sequence a) Nat Bit)) - (n.< (value@ #size sequence) idx)) + (n.< (the #size sequence) idx)) (def: (base_for idx sequence) (All (_ a) (-> Index (Sequence a) (Try (Base a)))) (if (within_bounds? sequence idx) - (if (n.< (tail_off (value@ #size sequence)) idx) - (loop [level (value@ #level sequence) - hierarchy (value@ #root sequence)] + (if (n.< (tail_off (the #size sequence)) idx) + (loop [level (the #level sequence) + hierarchy (the #root sequence)] (let [index (branch_idx (i64.right_shifted level idx))] (if (array.lacks? index hierarchy) (exception.except ..base_was_not_found []) @@ -270,7 +270,7 @@ _ (exception.except ..incorrect_sequence_structure []))))) - {try.#Success (value@ #tail sequence)}) + {try.#Success (the #tail sequence)}) (exception.except ..index_out_of_bounds [sequence idx]))) (def: .public (item idx sequence) @@ -284,12 +284,12 @@ (def: .public (has idx val sequence) (All (_ a) (-> Nat a (Sequence a) (Try (Sequence a)))) - (let [sequence_size (value@ #size sequence)] + (let [sequence_size (the #size sequence)] (if (within_bounds? sequence idx) {try.#Success (if (n.< (tail_off sequence_size) idx) - (revised@ #root (hierarchy#has (value@ #level sequence) idx val) + (.revised #root (hierarchy#has (the #level sequence) idx val) sequence) - (revised@ #tail (`` (: (-> (Base (~~ (:of val))) + (.revised #tail (`` (: (-> (Base (~~ (:of val))) (Base (~~ (:of val)))) (|>> array.clone (array.has! (branch_idx idx) val)))) sequence))} @@ -303,7 +303,7 @@ (def: .public (prefix sequence) (All (_ a) (-> (Sequence a) (Sequence a))) - (case (value@ #size sequence) + (case (the #size sequence) 0 empty @@ -312,19 +312,19 @@ sequence_size (if (|> sequence_size (n.- (tail_off sequence_size)) (n.> 1)) - (let [old_tail (value@ #tail sequence) + (let [old_tail (the #tail sequence) new_tail_size (-- (array.size old_tail))] (|> sequence - (revised@ #size --) - (with@ #tail (|> (array.empty new_tail_size) - (array.copy! new_tail_size 0 old_tail 0))))) + (.revised #size --) + (.has #tail (|> (array.empty new_tail_size) + (array.copy! new_tail_size 0 old_tail 0))))) (maybe.trusted (do maybe.monad [new_tail (base_for (n.- 2 sequence_size) sequence) - .let [[level' root'] (let [init_level (value@ #level sequence)] + .let [[level' root'] (let [init_level (the #level sequence)] (loop [level init_level root (maybe.else (empty_hierarchy []) - (without_tail sequence_size init_level (value@ #root sequence)))] + (without_tail sequence_size init_level (the #root sequence)))] (with_expansions [<else> [level root]] (if (n.> branching_exponent level) (if (array.lacks? 1 root) @@ -340,16 +340,16 @@ <else>) <else>))))]] (in (|> sequence - (revised@ #size --) - (with@ #level level') - (with@ #root root') - (with@ #tail new_tail)))))) + (.revised #size --) + (.has #level level') + (.has #root root') + (.has #tail new_tail)))))) )) (def: .public (list sequence) (All (_ a) (-> (Sequence a) (List a))) - (list#composite (node#list {#Hierarchy (value@ #root sequence)}) - (node#list {#Base (value@ #tail sequence)}))) + (list#composite (node#list {#Hierarchy (the #root sequence)}) + (node#list {#Base (the #tail sequence)}))) (def: .public of_list (All (_ a) (-> (List a) (Sequence a))) @@ -361,7 +361,7 @@ (def: .public empty? (All (_ a) (-> (Sequence a) Bit)) - (|>> (value@ #size) (n.= 0))) + (|>> (the #size) (n.= 0))) (syntax: .public (sequence [elems (<>.some <code>.any)]) (in (.list (` (..of_list (.list (~+ elems))))))) @@ -384,12 +384,12 @@ (All (_ a) (-> (Equivalence a) (Equivalence (Sequence a)))) (def: (= v1 v2) - (and (n.= (value@ #size v1) (value@ #size v2)) + (and (n.= (the #size v1) (the #size v2)) (let [(^open "node#[0]") (node_equivalence //#=)] - (and (node#= {#Base (value@ #tail v1)} - {#Base (value@ #tail v2)}) - (node#= {#Hierarchy (value@ #root v1)} - {#Hierarchy (value@ #root v2)})))))) + (and (node#= {#Base (the #tail v1)} + {#Base (the #tail v2)}) + (node#= {#Hierarchy (the #root v1)} + {#Hierarchy (the #root v2)})))))) (implementation: node_mix (Mix Node) @@ -414,8 +414,8 @@ (mix $ (mix $ init - {#Hierarchy (value@ #root xs)}) - {#Base (value@ #tail xs)})))) + {#Hierarchy (the #root xs)}) + {#Base (the #tail xs)})))) (implementation: .public monoid (All (_ a) (Monoid (Sequence a))) @@ -440,12 +440,12 @@ (Functor Sequence) (def: (each $ xs) - [#level (value@ #level xs) - #size (value@ #size xs) + [#level (the #level xs) + #size (the #size xs) #root (let [... TODO: This binding was established to get around a compilation error. Fix and inline! $ (# node_functor each $)] - (|> xs (value@ #root) (array.each $))) - #tail (|> xs (value@ #tail) (array.each $))])) + (|> xs (the #root) (array.each $))) + #tail (|> xs (the #tail) (array.each $))])) (implementation: .public apply (Apply Sequence) @@ -526,11 +526,11 @@ (case (let [... TODO: This binding was established to get around a compilation error. Fix and inline! check (..one|node check)] (|> items - (value@ #root) + (the #root) (array.one check))) {.#None} (|> items - (value@ #tail) + (the #tail) (array.one check)) output diff --git a/stdlib/source/library/lux/data/collection/set.lux b/stdlib/source/library/lux/data/collection/set.lux index ac443315f..ee9d8f345 100644 --- a/stdlib/source/library/lux/data/collection/set.lux +++ b/stdlib/source/library/lux/data/collection/set.lux @@ -1,19 +1,19 @@ (.using - [library - [lux {"-" list} - [abstract - [equivalence {"+" Equivalence}] - [hash {"+" Hash}] - [predicate {"+" Predicate}] - [monoid {"+" Monoid}]] - [data - [collection - ["[0]" list ("[1]#[0]" mix)]]] - [math - [number - ["n" nat]]]]] - ["[0]" // "_" - ["[1]" dictionary {"+" Dictionary}]]) + [library + [lux {"-" has list} + [abstract + [equivalence {"+" Equivalence}] + [hash {"+" Hash}] + [predicate {"+" Predicate}] + [monoid {"+" Monoid}]] + [data + [collection + ["[0]" list ("[1]#[0]" mix)]]] + [math + [number + ["n" nat]]]]] + ["[0]" // "_" + ["[1]" dictionary {"+" Dictionary}]]) (type: .public (Set a) (Dictionary a Any)) @@ -62,7 +62,7 @@ (implementation: .public equivalence (All (_ a) (Equivalence (Set a))) - (def: (= (^@ reference [hash _]) sample) + (def: (= (^let reference [hash _]) sample) (and (n.= (..size reference) (..size sample)) (list.every? (..member? reference) diff --git a/stdlib/source/library/lux/data/collection/set/multi.lux b/stdlib/source/library/lux/data/collection/set/multi.lux index 505fac514..57c40d2fa 100644 --- a/stdlib/source/library/lux/data/collection/set/multi.lux +++ b/stdlib/source/library/lux/data/collection/set/multi.lux @@ -1,22 +1,22 @@ ... https://en.wikipedia.org/wiki/Multiset (.using - [library - [lux {"-" list} - [abstract - [equivalence {"+" Equivalence}] - [hash {"+" Hash}]] - [control - ["[0]" function] - ["[0]" maybe]] - [math - [number - ["n" nat]]] - [type - [abstract {"+" abstract: :abstraction :representation ^:representation}]]]] - ["[0]" // - [// - ["[0]" list ("[1]#[0]" mix monoid)] - ["[0]" dictionary {"+" Dictionary}]]]) + [library + [lux {"-" has list} + [abstract + [equivalence {"+" Equivalence}] + [hash {"+" Hash}]] + [control + ["[0]" function] + ["[0]" maybe]] + [math + [number + ["n" nat]]] + [type + [abstract {"+" abstract: :abstraction :representation ^:representation}]]]] + ["[0]" // + [// + ["[0]" list ("[1]#[0]" mix monoid)] + ["[0]" dictionary {"+" Dictionary}]]]) (abstract: .public (Set a) (Dictionary a Nat) @@ -104,7 +104,7 @@ (def: .public (support set) (All (_ a) (-> (Set a) (//.Set a))) - (let [(^@ set [hash _]) (:representation set)] + (let [(^let set [hash _]) (:representation set)] (|> set dictionary.keys (//.of_list hash)))) diff --git a/stdlib/source/library/lux/data/collection/set/ordered.lux b/stdlib/source/library/lux/data/collection/set/ordered.lux index e97e0d6dd..5827e0993 100644 --- a/stdlib/source/library/lux/data/collection/set/ordered.lux +++ b/stdlib/source/library/lux/data/collection/set/ordered.lux @@ -1,16 +1,16 @@ (.using - [library - [lux {"-" list} - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}]] - [data - [collection - ["[0]" list ("[1]#[0]" mix)] - [dictionary - ["/" ordered]]]] - [type - abstract]]]) + [library + [lux {"-" has list} + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}]] + [data + [collection + ["[0]" list ("[1]#[0]" mix)] + [dictionary + ["/" ordered]]]] + [type + abstract]]]) (abstract: .public (Set a) (/.Dictionary a a) @@ -58,13 +58,13 @@ (All (_ a) (-> (Set a) (Set a) (Set a))) (|> (..list right) (list.only (..member? left)) - (..of_list (value@ /.#&order (:representation right))))) + (..of_list (the /.#&order (:representation right))))) (def: .public (difference param subject) (All (_ a) (-> (Set a) (Set a) (Set a))) (|> (..list subject) (list.only (|>> (..member? param) not)) - (..of_list (value@ /.#&order (:representation subject))))) + (..of_list (the /.#&order (:representation subject))))) (implementation: .public equivalence (All (_ a) (Equivalence (Set a))) diff --git a/stdlib/source/library/lux/data/collection/tree.lux b/stdlib/source/library/lux/data/collection/tree.lux index d231e5d18..b0940209e 100644 --- a/stdlib/source/library/lux/data/collection/tree.lux +++ b/stdlib/source/library/lux/data/collection/tree.lux @@ -1,20 +1,20 @@ (.using - [library - [lux "*" - [abstract - [functor {"+" Functor}] - [equivalence {"+" Equivalence}] - [mix {"+" Mix}] - [monad {"+" do}]] - [control - ["<>" parser - ["<[0]>" code {"+" Parser}]]] - [data - [collection - ["[0]" list ("[1]#[0]" monad mix)]]] - [macro - [syntax {"+" syntax:}] - ["[0]" code]]]]) + [library + [lux "*" + [abstract + [functor {"+" Functor}] + [equivalence {"+" Equivalence}] + [mix {"+" Mix}] + [monad {"+" do}]] + [control + ["<>" parser + ["<[0]>" code {"+" Parser}]]] + [data + [collection + ["[0]" list ("[1]#[0]" monad mix)]]] + [macro + [syntax {"+" syntax:}] + ["[0]" code]]]]) (type: .public (Tree a) (Record @@ -24,10 +24,10 @@ (def: .public (flat tree) (All (_ a) (-> (Tree a) (List a))) (|> tree - (value@ #children) + (the #children) (list#each flat) list#conjoint - {.#Item (value@ #value tree)})) + {.#Item (the #value tree)})) (def: .public (leaf value) (All (_ a) (-> a (Tree a))) @@ -63,22 +63,22 @@ (All (_ a) (-> (Equivalence a) (Equivalence (Tree a)))) (def: (= tx ty) - (and (# super = (value@ #value tx) (value@ #value ty)) - (# (list.equivalence (equivalence super)) = (value@ #children tx) (value@ #children ty))))) + (and (# super = (the #value tx) (the #value ty)) + (# (list.equivalence (equivalence super)) = (the #children tx) (the #children ty))))) (implementation: .public functor (Functor Tree) (def: (each f fa) - [#value (f (value@ #value fa)) + [#value (f (the #value fa)) #children (list#each (each f) - (value@ #children fa))])) + (the #children fa))])) (implementation: .public mix (Mix Tree) (def: (mix f init tree) (list#mix (function (_ tree' init') (mix f init' tree')) - (f (value@ #value tree) + (f (the #value tree) init) - (value@ #children tree)))) + (the #children tree)))) diff --git a/stdlib/source/library/lux/data/collection/tree/finger.lux b/stdlib/source/library/lux/data/collection/tree/finger.lux index 7c8a244b1..a7bf860b4 100644 --- a/stdlib/source/library/lux/data/collection/tree/finger.lux +++ b/stdlib/source/library/lux/data/collection/tree/finger.lux @@ -1,14 +1,14 @@ (.using - [library - [lux "*" - [abstract - [predicate {"+" Predicate}] - ["[0]" monoid {"+" Monoid}]] - [data - [collection - ["[0]" list ("[1]#[0]" monoid)]]] - [type - [abstract {"+" abstract: :abstraction :representation}]]]]) + [library + [lux "*" + [abstract + [predicate {"+" Predicate}] + ["[0]" monoid {"+" Monoid}]] + [data + [collection + ["[0]" list ("[1]#[0]" monoid)]]] + [type + [abstract {"+" abstract: :abstraction :representation}]]]]) ... https://en.wikipedia.org/wiki/Finger_tree (abstract: .public (Tree @ t v) @@ -32,7 +32,7 @@ (template [<name> <tag> <output>] [(def: .public <name> (All (_ @ t v) (-> (Tree @ t v) <output>)) - (|>> :representation (value@ <tag>)))] + (|>> :representation (the <tag>)))] [tag #tag t] [root #root (Either v [(Tree @ t v) (Tree @ t v)])] @@ -55,7 +55,7 @@ (def: .public (value tree) (All (_ @ t v) (-> (Tree @ t v) v)) - (case (value@ #root (:representation tree)) + (case (the #root (:representation tree)) {0 #0 value} value @@ -64,9 +64,9 @@ (def: .public (tags tree) (All (_ @ t v) (-> (Tree @ t v) (List t))) - (case (value@ #root (:representation tree)) + (case (the #root (:representation tree)) {0 #0 value} - (list (value@ #tag (:representation tree))) + (list (the #tag (:representation tree))) {0 #1 [left right]} (list#composite (tags left) @@ -74,7 +74,7 @@ (def: .public (values tree) (All (_ @ t v) (-> (Tree @ t v) (List v))) - (case (value@ #root (:representation tree)) + (case (the #root (:representation tree)) {0 #0 value} (list value) @@ -96,8 +96,8 @@ {0 #1 [left right]} (let [shifted_tag (tag//composite _tag (..tag left))] (if (predicate shifted_tag) - (again _tag (value@ #root (:representation left))) - (again shifted_tag (value@ #root (:representation right)))))))) + (again _tag (the #root (:representation left))) + (again shifted_tag (the #root (:representation right)))))))) {.#None}))) ) diff --git a/stdlib/source/library/lux/data/collection/tree/zipper.lux b/stdlib/source/library/lux/data/collection/tree/zipper.lux index ea6ca7119..108a486d2 100644 --- a/stdlib/source/library/lux/data/collection/tree/zipper.lux +++ b/stdlib/source/library/lux/data/collection/tree/zipper.lux @@ -1,21 +1,21 @@ (.using - [library - [lux "*" - ["@" target] - [abstract - [functor {"+" Functor}] - [comonad {"+" CoMonad}] - [monad {"+" do}] - [equivalence {"+" Equivalence}]] - [control - ["[0]" maybe ("[1]#[0]" monad)]] - [data - ["[0]" product] - [text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor monoid)]]]]] - ["[0]" // {"+" Tree} ("[1]#[0]" functor)]) + [library + [lux "*" + ["@" target] + [abstract + [functor {"+" Functor}] + [comonad {"+" CoMonad}] + [monad {"+" do}] + [equivalence {"+" Equivalence}]] + [control + ["[0]" maybe ("[1]#[0]" monad)]] + [data + ["[0]" product] + [text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor monoid)]]]]] + ["[0]" // {"+" Tree} ("[1]#[0]" functor)]) (type: (Family Zipper a) (Record @@ -51,23 +51,23 @@ (def: .public tree (All (_ a) (-> (Zipper a) (Tree a))) - (value@ #node)) + (the #node)) (def: .public value (All (_ a) (-> (Zipper a) a)) - (value@ [#node //.#value])) + (the [#node //.#value])) (def: .public (set value zipper) (All (_ a) (-> a (Zipper a) (Zipper a))) - (with@ [#node //.#value] value zipper)) + (has [#node //.#value] value zipper)) (def: .public (update transform zipper) (All (_ a) (-> (-> a a) (Zipper a) (Zipper a))) - (revised@ [#node //.#value] transform zipper)) + (revised [#node //.#value] transform zipper)) (def: children (All (_ a) (-> (Zipper a) (List (Tree a)))) - (value@ [#node //.#children])) + (the [#node //.#children])) (def: .public leaf? (All (_ a) (-> (Zipper a) Bit)) @@ -79,7 +79,7 @@ (def: .public (start? zipper) (All (_ a) (-> (Zipper a) Bit)) - (case (value@ #family zipper) + (case (the #family zipper) {.#None} true @@ -93,7 +93,7 @@ {.#None} {.#Item head tail} - {.#Some [#family {.#Some [#parent (with@ [#node //.#children] (list) zipper) + {.#Some [#family {.#Some [#parent (has [#node //.#children] (list) zipper) #lefts {.#End} #rights tail]} #node head]})) @@ -101,37 +101,37 @@ (def: .public (up zipper) (All (_ a) (-> (Zipper a) (Maybe (Zipper a)))) (do maybe.monad - [family (value@ #family zipper)] + [family (the #family zipper)] (in (let [(^open "_[0]") family] (for [@.old - (revised@ #node (: (-> (Tree (:parameter 0)) - (Tree (:parameter 0))) - (with@ //.#children (list#composite (list.reversed _#lefts) - {.#Item (value@ #node zipper) - _#rights}))) - _#parent)] - (with@ [#node //.#children] - (list#composite (list.reversed _#lefts) - {.#Item (value@ #node zipper) - _#rights}) - _#parent)))))) + (revised #node (: (-> (Tree (:parameter 0)) + (Tree (:parameter 0))) + (has //.#children (list#composite (list.reversed _#lefts) + {.#Item (the #node zipper) + _#rights}))) + _#parent)] + (has [#node //.#children] + (list#composite (list.reversed _#lefts) + {.#Item (the #node zipper) + _#rights}) + _#parent)))))) (template [<one> <all> <side> <op_side>] [(def: .public (<one> zipper) (All (_ a) (-> (Zipper a) (Maybe (Zipper a)))) - (case (value@ #family zipper) + (case (the #family zipper) {.#Some family} - (case (value@ <side> family) + (case (the <side> family) {.#Item next side'} {.#Some (for [@.old [#family {.#Some (|> family - (with@ <side> side') - (revised@ <op_side> (|>> {.#Item (value@ #node zipper)})))} + (has <side> side') + (revised <op_side> (|>> {.#Item (the #node zipper)})))} #node next]] (let [move (: (All (_ a) (-> (List (Tree a)) (Zipper a) (Family Zipper a) (Family Zipper a))) (function (_ side' zipper) - (|>> (with@ <side> side') - (revised@ <op_side> (|>> {.#Item (value@ #node zipper)})))))] + (|>> (has <side> side') + (revised <op_side> (|>> {.#Item (the #node zipper)})))))] [#family {.#Some (move side' zipper family)} #node next]))} @@ -143,26 +143,26 @@ (def: .public (<all> zipper) (All (_ a) (-> (Zipper a) (Maybe (Zipper a)))) - (case (value@ #family zipper) + (case (the #family zipper) {.#None} {.#None} {.#Some family} - (case (list.reversed (value@ <side> family)) + (case (list.reversed (the <side> family)) {.#End} {.#None} {.#Item last prevs} {.#Some (for [@.old [#family {.#Some (|> family - (with@ <side> {.#End}) - (revised@ <op_side> (|>> {.#Item (value@ #node zipper)} - (list#composite prevs))))} + (has <side> {.#End}) + (revised <op_side> (|>> {.#Item (the #node zipper)} + (list#composite prevs))))} #node last]] (let [move (: (All (_ a) (-> (List (Tree a)) (Zipper a) (Family Zipper a) (Family Zipper a))) (function (_ prevs zipper) - (|>> (with@ <side> {.#End}) - (revised@ <op_side> (|>> {.#Item (value@ #node zipper)} - (list#composite prevs))))))] + (|>> (has <side> {.#End}) + (revised <op_side> (|>> {.#Item (the #node zipper)} + (list#composite prevs))))))] [#family {.#Some (move prevs zipper family)} #node last]))})))] @@ -246,44 +246,44 @@ (def: .public (interpose value zipper) (All (_ a) (-> a (Zipper a) (Zipper a))) - (revised@ [#node //.#children] - (|>> (//.branch value) list) - zipper)) + (revised [#node //.#children] + (|>> (//.branch value) list) + zipper)) (def: .public (adopt value zipper) (All (_ a) (-> a (Zipper a) (Zipper a))) - (revised@ [#node //.#children] - (|>> {.#Item (//.leaf value)}) - zipper)) + (revised [#node //.#children] + (|>> {.#Item (//.leaf value)}) + zipper)) (def: .public (remove zipper) (All (_ a) (-> (Zipper a) (Maybe (Zipper a)))) (do maybe.monad - [family (value@ #family zipper)] - (case (value@ #lefts family) + [family (the #family zipper)] + (case (the #lefts family) {.#End} - (in (with@ [#node //.#children] - (value@ #rights family) - (value@ #parent family))) + (in (has [#node //.#children] + (the #rights family) + (the #parent family))) {.#Item next side} (in (|> zipper - (with@ #family (|> family - (with@ #lefts side) - {.#Some})) - (with@ #node next)))))) + (has #family (|> family + (has #lefts side) + {.#Some})) + (has #node next)))))) (template [<name> <side>] [(def: .public (<name> value zipper) (All (_ a) (-> a (Zipper a) (Maybe (Zipper a)))) - (case (value@ #family zipper) + (case (the #family zipper) {.#None} {.#None} {.#Some family} - {.#Some (with@ #family - {.#Some (revised@ <side> (|>> {.#Item (//.leaf value)}) family)} - zipper)}))] + {.#Some (has #family + {.#Some (revised <side> (|>> {.#Item (//.leaf value)}) family)} + zipper)}))] [insert_left #lefts] [insert_right #rights] @@ -307,14 +307,14 @@ ..functor) (def: out - (value@ [#node //.#value])) + (the [#node //.#value])) (def: (disjoint (^open "_[0]")) (let [tree_splitter (: (All (_ a) (-> (Tree a) (Tree (Zipper a)))) (function (tree_splitter tree) [//.#value (..zipper tree) //.#children (|> tree - (value@ //.#children) + (the //.#children) (list#each tree_splitter))]))] [#family (maybe#each (function (_ (^open "_[0]")) [..#parent (disjoint _#parent) diff --git a/stdlib/source/library/lux/data/format/css.lux b/stdlib/source/library/lux/data/format/css.lux index f4dd728df..649e50f5d 100644 --- a/stdlib/source/library/lux/data/format/css.lux +++ b/stdlib/source/library/lux/data/format/css.lux @@ -54,19 +54,19 @@ (def: .public (font font) (-> Font (CSS Special)) - (let [with_unicode (case (value@ /font.#unicode_range font) + (let [with_unicode (case (the /font.#unicode_range font) {.#Some unicode_range} - (let [unicode_range' (format "U+" (# nat.hex encoded (value@ /font.#start unicode_range)) - "-" (# nat.hex encoded (value@ /font.#end unicode_range)))] + (let [unicode_range' (format "U+" (# nat.hex encoded (the /font.#start unicode_range)) + "-" (# nat.hex encoded (the /font.#end unicode_range)))] (list ["unicode-range" unicode_range'])) {.#None} (list))] - (|> (list& ["font-family" (value@ /font.#family font)] - ["src" (format "url(" (value@ /font.#source font) ")")] - ["font-stretch" (|> font (value@ /font.#stretch) (maybe.else /value.normal_stretch) /value.value)] - ["font-style" (|> font (value@ /font.#style) (maybe.else /value.normal_style) /value.value)] - ["font-weight" (|> font (value@ /font.#weight) (maybe.else /value.normal_weight) /value.value)] + (|> (list& ["font-family" (the /font.#family font)] + ["src" (format "url(" (the /font.#source font) ")")] + ["font-stretch" (|> font (the /font.#stretch) (maybe.else /value.normal_stretch) /value.value)] + ["font-style" (|> font (the /font.#style) (maybe.else /value.normal_style) /value.value)] + ["font-weight" (|> font (the /font.#weight) (maybe.else /value.normal_weight) /value.value)] with_unicode) (list#each (function (_ [property value]) (format property ": " value ";"))) @@ -99,8 +99,8 @@ (:abstraction (format "@keyframes " (/value.value animation) " {" (|> frames (list#each (function (_ frame) - (format (/value.value (value@ #when frame)) " {" - (/style.inline (/style.style (value@ #what frame))) + (format (/value.value (the #when frame)) " {" + (/style.inline (/style.style (the #what frame))) "}"))) (text.interposed ..separator)) "}"))) diff --git a/stdlib/source/library/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux index 9b2de87f3..4dd831528 100644 --- a/stdlib/source/library/lux/data/format/css/value.lux +++ b/stdlib/source/library/lux/data/format/css/value.lux @@ -1115,7 +1115,7 @@ (def: .public (clip rectangle) (-> Rectangle (Value Clip)) (`` (..apply "rect" (list (~~ (template [<side>] - [(:representation (value@ <side> rectangle))] + [(:representation (the <side> rectangle))] [#top] [#right] [#bottom] [#left])))))) diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux index 49686f9fa..315665921 100644 --- a/stdlib/source/library/lux/data/format/json.lux +++ b/stdlib/source/library/lux/data/format/json.lux @@ -1,6 +1,6 @@ (.using [library - [lux "*" + [lux {"-" has} ["[0]" meta {"+" monad}] [abstract [equivalence {"+" Equivalence}] diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux index c4962a187..8e51999b3 100644 --- a/stdlib/source/library/lux/data/format/tar.lux +++ b/stdlib/source/library/lux/data/format/tar.lux @@ -637,11 +637,11 @@ (def: (header_writer header) (Writer Header) (let [checksum (|> header - (with@ #checksum ..dummy_checksum) + (has #checksum ..dummy_checksum) (format.result ..header_writer') ..checksum_code)] (|> header - (with@ #checksum checksum) + (has #checksum checksum) (format.result ..header_writer') (format.segment ..block_size)))) @@ -661,16 +661,16 @@ (format.segment (..rounded_content_size size)))] (writer [[#path path #mode mode - #user_id (value@ [#user #id] ownership) - #group_id (value@ [#group #id] ownership) + #user_id (the [#user #id] ownership) + #group_id (the [#group #id] ownership) #size size #modification_time (..modification_time modification_time) #checksum ..dummy_checksum #link_flag link_flag #link_name ..no_path #magic ..ustar - #user_name (value@ [#user #name] ownership) - #group_name (value@ [#group #name] ownership) + #user_name (the [#user #name] ownership) + #group_name (the [#group #name] ownership) #major_device ..no_device #minor_device ..no_device] content])))) @@ -806,41 +806,41 @@ (def: (file_parser header) (-> Header (Parser File)) (do <>.monad - [.let [size (value@ #size header) + [.let [size (the #size header) rounded_size (..rounded_content_size size)] content (<binary>.segment (..from_big size)) content (<>.lifted (..content content)) _ (<binary>.segment (n.- (..from_big size) rounded_size))] - (in [(value@ #path header) + (in [(the #path header) (|> header - (value@ #modification_time) + (the #modification_time) ..from_big .int duration.of_millis (duration.up (|> duration.second duration.millis .nat)) instant.absolute) - (value@ #mode header) - [#user [#name (value@ #user_name header) - #id (value@ #user_id header)] - #group [#name (value@ #group_name header) - #id (value@ #group_id header)]] + (the #mode header) + [#user [#name (the #user_name header) + #id (the #user_id header)] + #group [#name (the #group_name header) + #id (the #group_id header)]] content]))) (def: entry_parser (Parser Entry) (do [! <>.monad] [header ..header_parser] - (cond (same? ..contiguous (value@ #link_flag header)) + (cond (same? ..contiguous (the #link_flag header)) (# ! each (|>> {..#Contiguous}) (..file_parser header)) - (same? ..symbolic_link (value@ #link_flag header)) - (in {..#Symbolic_Link (value@ #link_name header)}) + (same? ..symbolic_link (the #link_flag header)) + (in {..#Symbolic_Link (the #link_name header)}) - (same? ..directory (value@ #link_flag header)) - (in {..#Directory (value@ #path header)}) + (same? ..directory (the #link_flag header)) + (in {..#Directory (the #path header)}) - ... (or (same? ..normal (value@ #link_flag header)) - ... (same? ..old_normal (value@ #link_flag header))) + ... (or (same? ..normal (the #link_flag header)) + ... (same? ..old_normal (the #link_flag header))) (# ! each (|>> {..#Normal}) (..file_parser header))))) ... It's safe to implement the parser this way because the range of values for Nat is 2^64 diff --git a/stdlib/source/library/lux/data/store.lux b/stdlib/source/library/lux/data/store.lux index 11c9580d0..a30bdf0c4 100644 --- a/stdlib/source/library/lux/data/store.lux +++ b/stdlib/source/library/lux/data/store.lux @@ -1,11 +1,11 @@ (.using - [library - [lux "*" - [abstract - [functor {"+" Functor}] - comonad] - [type - implicit]]]) + [library + [lux "*" + [abstract + [functor {"+" Functor}] + comonad] + [type + implicit]]]) (type: .public (Store s a) (Record @@ -14,8 +14,8 @@ (def: (extend f wa) (All (_ s a b) (-> (-> (Store s a) b) (Store s a) (Store s b))) - [#cursor (value@ #cursor wa) - #peek (function (_ s) (f (with@ #cursor s wa)))]) + [#cursor (the #cursor wa) + #peek (function (_ s) (f (has #cursor s wa)))]) (implementation: .public functor (All (_ s) (Functor (Store s))) diff --git a/stdlib/source/library/lux/data/text/unicode/block.lux b/stdlib/source/library/lux/data/text/unicode/block.lux index f71030258..feab490e3 100644 --- a/stdlib/source/library/lux/data/text/unicode/block.lux +++ b/stdlib/source/library/lux/data/text/unicode/block.lux @@ -1,18 +1,18 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}] - [hash {"+" Hash}] - [monoid {"+" Monoid}] - ["[0]" interval {"+" Interval}]] - [math - [number {"+" hex} - ["n" nat ("[1]#[0]" interval)] - ["[0]" i64]]] - [type - abstract]]] - [/// {"+" Char}]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}] + [hash {"+" Hash}] + [monoid {"+" Monoid}] + ["[0]" interval {"+" Interval}]] + [math + [number {"+" hex} + ["n" nat ("[1]#[0]" interval)] + ["[0]" i64]]] + [type + abstract]]] + [/// {"+" Char}]) (abstract: .public Block (Interval Char) @@ -41,7 +41,7 @@ (template [<name> <slot>] [(def: .public <name> (-> Block Char) - (|>> :representation (value@ <slot>)))] + (|>> :representation (the <slot>)))] [start interval.bottom] [end interval.top] @@ -49,8 +49,8 @@ (def: .public (size block) (-> Block Nat) - (let [start (value@ interval.bottom (:representation block)) - end (value@ interval.top (:representation block))] + (let [start (the interval.bottom (:representation block)) + end (the interval.top (:representation block))] (|> end (n.- start) ++))) (def: .public (within? block char) diff --git a/stdlib/source/library/lux/data/trace.lux b/stdlib/source/library/lux/data/trace.lux index 52e30470f..23c9fa00b 100644 --- a/stdlib/source/library/lux/data/trace.lux +++ b/stdlib/source/library/lux/data/trace.lux @@ -1,11 +1,11 @@ (.using - [library - [lux "*" - [abstract - ["[0]" monoid {"+" Monoid}] - [functor {"+" Functor}] - comonad] - function]]) + [library + [lux "*" + [abstract + ["[0]" monoid {"+" Monoid}] + [functor {"+" Functor}] + comonad] + function]]) (type: .public (Trace t a) (Record @@ -16,7 +16,7 @@ (All (_ t) (Functor (Trace t))) (def: (each f fa) - (revised@ #trace (composite f) fa))) + (revised #trace (composite f) fa))) (implementation: .public comonad (All (_ t) (CoMonad (Trace t))) @@ -24,16 +24,16 @@ (def: &functor ..functor) (def: (out wa) - ((value@ #trace wa) - (value@ [#monoid monoid.#identity] wa))) + ((the #trace wa) + (the [#monoid monoid.#identity] wa))) (def: (disjoint wa) - (let [monoid (value@ #monoid wa)] + (let [monoid (the #monoid wa)] [#monoid monoid #trace (function (_ t1) [#monoid monoid #trace (function (_ t2) - ((value@ #trace wa) + ((the #trace wa) (# monoid composite t1 t2)))])]))) (def: .public (result context tracer) diff --git a/stdlib/source/library/lux/documentation.lux b/stdlib/source/library/lux/documentation.lux index 2e2b7e65e..676746bd5 100644 --- a/stdlib/source/library/lux/documentation.lux +++ b/stdlib/source/library/lux/documentation.lux @@ -1,38 +1,38 @@ (.using - [library - [lux {"-" Definition Module type} - ["[0]" meta] - ["[0]" type ("[1]#[0]" equivalence)] - [abstract - [monad {"+" do}] - ["[0]" enum]] - [control - ["[0]" maybe ("[1]#[0]" functor)] - ["[0]" exception {"+" exception:}] - ["<>" parser ("[1]#[0]" monad) - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" product] - ["[0]" text {"+" \n} ("[1]#[0]" order) - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" monad mix monoid)] - ["[0]" set {"+" Set}] - ["[0]" stream {"+" Stream}]] - [format - ["md" markdown {"+" Markdown Block}]]] - ["[0]" macro - [syntax {"+" syntax:}] - ["[0]" code] - ["[0]" template]] - [math - [number - ["n" nat]]] - [tool - [compiler - [language - [lux - ["[0]" syntax]]]]]]]) + [library + [lux {"-" Definition Module type} + ["[0]" meta] + ["[0]" type ("[1]#[0]" equivalence)] + [abstract + [monad {"+" do}] + ["[0]" enum]] + [control + ["[0]" maybe ("[1]#[0]" functor)] + ["[0]" exception {"+" exception:}] + ["<>" parser ("[1]#[0]" monad) + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" product] + ["[0]" text {"+" \n} ("[1]#[0]" order) + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" monad mix monoid)] + ["[0]" set {"+" Set}] + ["[0]" stream {"+" Stream}]] + [format + ["md" markdown {"+" Markdown Block}]]] + ["[0]" macro + [syntax {"+" syntax:}] + ["[0]" code] + ["[0]" template]] + [math + [number + ["n" nat]]] + [tool + [compiler + [language + [lux + ["[0]" syntax]]]]]]]) (template: (|recursion_dummy|) [{.#Primitive "" {.#End}}]) @@ -96,14 +96,14 @@ ... else (%.symbol [module short]))] - [(revised@ .#column (n.+ (text.size documentation)) new_location) + [(revised .#column (n.+ (text.size documentation)) new_location) (format (padding reference_column old_location new_location) documentation)]) (^template [<tag> <format>] [[new_location {<tag> value}] (let [documentation (`` (|> value (~~ (template.spliced <format>))))] - [(revised@ .#column (n.+ (text.size documentation)) new_location) + [(revised .#column (n.+ (text.size documentation)) new_location) (format (padding reference_column old_location new_location) documentation)])]) ([.#Bit [%.bit]] @@ -118,9 +118,9 @@ (let [[group_location' members_documentation] (list#mix (function (_ part [last_location text_accum]) (let [[member_location member_documentation] (code_documentation expected_module last_location reference_column part)] [member_location (format text_accum member_documentation)])) - [(revised@ .#column ++ group_location) ""] + [(revised .#column ++ group_location) ""] members)] - [(revised@ .#column ++ group_location') + [(revised .#column ++ group_location') (format (padding reference_column old_location group_location) |<| members_documentation |>|)])]) ([syntax.open_form syntax.close_form .#Form] @@ -146,7 +146,7 @@ (let [reference_column (..reference_column example) [location _] example] (|> example - (..code_documentation module (with@ .#column reference_column location) reference_column) + (..code_documentation module (has .#column reference_column location) reference_column) product.right)))) (def: parameter_name_options "abcdefghijklmnopqrstuvwxyz") @@ -601,9 +601,9 @@ (def: definitions_documentation (-> (List Definition) (Markdown Block)) (|>> (list.sorted (function (_ left right) - (text#< (value@ #definition right) - (value@ #definition left)))) - (list#each (value@ #documentation)) + (text#< (the #definition right) + (the #definition left)))) + (list#each (the #documentation)) (list#mix md.then md.empty))) (def: expected_separator @@ -655,9 +655,9 @@ (let [(^open "_[0]") module] ($_ md.then ... Name - (md.heading/1 (value@ #module module)) + (md.heading/1 (the #module module)) ... Description - (case (value@ #description module) + (case (the #description module) "" md.empty description (<| md.paragraph md.text @@ -665,15 +665,15 @@ ... Definitions (md.heading/2 "Definitions") (|> module - (value@ #definitions) - (list.only (|>> (value@ #definition) + (the #definitions) + (list.only (|>> (the #definition) (set.member? _#expected))) ..definitions_documentation) ... Missing documentation (case (|> module - (value@ #definitions) + (the #definitions) (list#mix (function (_ definition missing) - (set.lacks (value@ #definition definition) missing)) + (set.lacks (the #definition definition) missing)) _#expected) set.list) {.#End} @@ -685,11 +685,11 @@ (..listing missing))) ... Un-expected documentation (case (|> module - (value@ #definitions) - (list.only (|>> (value@ #definition) + (the #definitions) + (list.only (|>> (the #definition) (set.member? _#expected) not)) - (list#each (value@ #definition))) + (list#each (the #definition))) {.#End} md.empty @@ -702,7 +702,7 @@ (def: .public documentation (-> (List Module) Text) (|>> (list.sorted (function (_ left right) - (text#< (value@ #module right) (value@ #module left)))) + (text#< (the #module right) (the #module left)))) (list#each ..module_documentation) (list.interposed md.horizontal_rule) (list#mix md.then (: (Markdown Block) md.empty)) diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index a1d5abe96..5720c4dff 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -1326,15 +1326,15 @@ (-> (List (Type Var)) Import_Member_Declaration (List (Type Var))) (case member {#ConstructorDecl [commons _]} - (list#composite class_tvars (value@ #import_member_tvars commons)) + (list#composite class_tvars (the #import_member_tvars commons)) {#MethodDecl [commons _]} - (case (value@ #import_member_kind commons) + (case (the #import_member_kind commons) {#StaticIMK} - (value@ #import_member_tvars commons) + (the #import_member_tvars commons) _ - (list#composite class_tvars (value@ #import_member_tvars commons))) + (list#composite class_tvars (the #import_member_tvars commons))) _ class_tvars)) @@ -1354,7 +1354,7 @@ .let [input_jvm_types (list#each product.right #import_member_args) arg_types (list#each (: (-> [Bit (Type Value)] Code) (function (_ [maybe? arg]) - (let [arg_type (value_type (value@ #import_member_mode commons) arg)] + (let [arg_type (value_type (the #import_member_mode commons) arg)] (if maybe? (` (Maybe (~ arg_type))) arg_type)))) @@ -1372,7 +1372,7 @@ (dictionary.key? ..boxes unboxed)) return_term - (value@ #import_member_maybe? commons) + (the #import_member_maybe? commons) (` (??? (~ return_term))) ... else @@ -1391,7 +1391,7 @@ (-> Import_Member_Declaration Code Code) (case member (^or {#ConstructorDecl [commons _]} {#MethodDecl [commons _]}) - (if (value@ <tag> commons) + (if (the <tag> commons) <term_trans> return_term) @@ -1515,16 +1515,16 @@ {#ConstructorDecl [commons _]} (do meta.monad [.let [classT (jvm.class full_name (list)) - def_name (code.symbol ["" (..import_name import_format method_prefix (value@ #import_member_alias commons))]) + def_name (code.symbol ["" (..import_name import_format method_prefix (the #import_member_alias commons))]) jvm_interop (|> [classT (` ("jvm member invoke constructor" [(~+ (list#each ..var$ class_tvars))] (~ (code.text full_name)) - [(~+ (list#each ..var$ (value@ #import_member_tvars commons)))] - (~+ (|> (jvm_invoke_inputs (value@ #import_member_mode commons) input_jvm_types arg_function_inputs) + [(~+ (list#each ..var$ (the #import_member_tvars commons)))] + (~+ (|> (jvm_invoke_inputs (the #import_member_mode commons) input_jvm_types arg_function_inputs) (list.zipped/2 input_jvm_types) (list#each ..decorate_input)))))] - (with_automatic_output_conversion (value@ #import_member_mode commons)) + (with_automatic_output_conversion (the #import_member_mode commons)) (with_return_maybe member true classT) (with_return_try member) (with_return_io member))]] @@ -1534,7 +1534,7 @@ {#MethodDecl [commons method]} (with_symbols [g!obj] (do meta.monad - [.let [def_name (code.symbol ["" (..import_name import_format method_prefix (value@ #import_member_alias commons))]) + [.let [def_name (code.symbol ["" (..import_name import_format method_prefix (the #import_member_alias commons))]) (^open "[0]") commons (^open "[0]") method [jvm_op object_ast] (: [Text (List Code)] @@ -1553,18 +1553,18 @@ ["jvm member invoke interface" (list g!obj)] ))) - method_return (value@ #import_method_return method) + method_return (the #import_method_return method) callC (: Code (` ((~ (code.text jvm_op)) [(~+ (list#each ..var$ class_tvars))] (~ (code.text full_name)) (~ (code.text #import_method_name)) - [(~+ (list#each ..var$ (value@ #import_member_tvars commons)))] + [(~+ (list#each ..var$ (the #import_member_tvars commons)))] (~+ (|> object_ast (list#each ..un_quoted) (list.zipped/2 (list (jvm.class full_name (list)))) - (list#each (with_automatic_input_conversion (value@ #import_member_mode commons))))) - (~+ (|> (jvm_invoke_inputs (value@ #import_member_mode commons) input_jvm_types arg_function_inputs) + (list#each (with_automatic_input_conversion (the #import_member_mode commons))))) + (~+ (|> (jvm_invoke_inputs (the #import_member_mode commons) input_jvm_types arg_function_inputs) (list.zipped/2 input_jvm_types) (list#each ..decorate_input)))))) jvm_interop (: Code @@ -1572,7 +1572,7 @@ {.#Left method_return} (|> [method_return callC] - (with_automatic_output_conversion (value@ #import_member_mode commons)) + (with_automatic_output_conversion (the #import_member_mode commons)) (with_return_maybe member false method_return) (with_return_try member) (with_return_io member)) diff --git a/stdlib/source/library/lux/ffi.lux b/stdlib/source/library/lux/ffi.lux index 7d1f709a4..7a1debe9c 100644 --- a/stdlib/source/library/lux/ffi.lux +++ b/stdlib/source/library/lux/ffi.lux @@ -171,7 +171,7 @@ (def: constructor (Parser Constructor) (<| <code>.form - (..generalized (with@ [#anonymous #variables])) + (..generalized (has [#anonymous #variables])) (<>.after (<code>.this! (' new))) (..anonymous ..input))) @@ -212,7 +212,7 @@ (def: procedure (Parser (Named Procedure)) - (<| (..generalized (with@ [#anonymous #input #variables])) + (<| (..generalized (has [#anonymous #input #variables])) ..named ($_ <>.and ..input @@ -255,9 +255,9 @@ (def: (output_type it) (-> Optional Code) - (if (value@ #optional? it) - (` (.Maybe (~ (value@ #mandatory it)))) - (value@ #mandatory it))) + (if (the #optional? it) + (` (.Maybe (~ (the #mandatory it)))) + (the #mandatory it))) (`` (template [<lux_it> <host_it> <lux_?> <host_?>] @@ -273,19 +273,19 @@ (as_is (def: g!it' (' g!it)) (def: (host_optional it) (-> Optional Code) - (.if (.value@ #optional? it) - (` (.case (~ (value@ #mandatory it)) + (.if (.the #optional? it) + (` (.case (~ (the #mandatory it)) {.#Some (~ g!it')} (~ g!it') {.#None} (<host_it>))) - (value@ #mandatory it))) + (the #mandatory it))) (def: (lux_optional it output) (-> Optional Code Code) (` (.let [(~ g!it') (~ output)] - (~ (if (value@ #optional? it) + (~ (if (the #optional? it) (` (.if (<host_?> (~ g!it')) {.#None} {.#Some (~ g!it')})) @@ -342,32 +342,32 @@ (def: (input_type input :it:) (-> Input Code Code) - (let [:it: (if (value@ #try? input) + (let [:it: (if (the #try? input) (` (.Either .Text (~ :it:))) :it:)] - (if (value@ #io? input) + (if (the #io? input) (` ((~! io.IO) (~ :it:))) :it:))) (def: (input_term input term) (-> Input Code Code) - (let [term (if (value@ #try? input) + (let [term (if (the #try? input) (` (.try (~ term))) term)] - (if (value@ #io? input) + (if (the #io? input) (` ((~! io.io) (~ term))) term))) (def: (procedure_definition import! source it) (-> (List Code) Code (Named Procedure) Code) - (let [g!it (|> (value@ #alias it) - (maybe.else (value@ #name it)) + (let [g!it (|> (the #alias it) + (maybe.else (the #name it)) code.local_symbol) - g!variables (list#each code.local_symbol (value@ [#anonymous #input #variables] it)) - input (value@ [#anonymous #input] it) - :parameters: (value@ #parameters input) + g!variables (list#each code.local_symbol (the [#anonymous #input #variables] it)) + input (the [#anonymous #input] it) + :parameters: (the #parameters input) g!parameters (..parameters :parameters:) - :output: (value@ [#anonymous #output] it) + :output: (the [#anonymous #output] it) :input:/* (case :parameters: {.#End} (list (` [])) @@ -376,7 +376,7 @@ (list#each ..output_type :parameters:))] (` (.def: ((~ g!it) (~+ (case g!parameters {.#End} (list g!it) - _ (list#each (value@ #mandatory) g!parameters)))) + _ (list#each (the #mandatory) g!parameters)))) (.All ((~ g!it) (~+ g!variables)) (-> (~+ :input:/*) (~ (|> :output: @@ -418,37 +418,37 @@ (def: (global_definition import! it) (-> (List Code) Global Code) - (let [g!name (|> (value@ #alias it) - (maybe.else (value@ #name it)) + (let [g!name (|> (the #alias it) + (maybe.else (the #name it)) code.local_symbol) - :output: (value@ #anonymous it)] + :output: (the #anonymous it)] (` (.def: (~ g!name) (~ (..output_type :output:)) (.exec (~+ import!) (.:expected (~ (<| (lux_optional :output:) - (` (<constant> (~ (code.text (..host_path (value@ #name it)))))))))))))) + (` (<constant> (~ (code.text (..host_path (the #name it)))))))))))))) (for [@.lua (as_is) @.ruby (as_is)] (def: (constructor_definition [class_name class_parameters] alias namespace it) (-> Declaration Alias Namespace Constructor Code) (let [g!it (|> it - (value@ #alias) + (the #alias) (maybe.else "new") (..namespaced namespace class_name alias) code.local_symbol) - input (value@ #anonymous it) - g!input_variables (list#each code.local_symbol (value@ #variables input)) - :parameters: (value@ #parameters input) + input (the #anonymous it) + g!input_variables (list#each code.local_symbol (the #variables input)) + :parameters: (the #parameters input) g!parameters (..parameters :parameters:) g!class_variables (list#each code.local_symbol class_parameters) g!class (` ((~ (code.local_symbol (maybe.else class_name alias))) (~+ g!class_variables))) :output: [#optional? false #mandatory g!class]] (` (.def: ((~ g!it) (~+ (case g!parameters {.#End} (list g!it) - _ (list#each (value@ #mandatory) g!parameters)))) + _ (list#each (the #mandatory) g!parameters)))) (.All ((~ g!it) (~+ g!class_variables) (~+ g!input_variables)) (.-> (~+ (list#each ..output_type :parameters:)) (~ (|> :output: @@ -464,12 +464,12 @@ (def: (static_field_definition import! [class_name class_parameters] alias namespace it) (-> (List Code) Declaration Alias Namespace (Named Output) Code) - (let [field (value@ #name it) - g!it (|> (value@ #alias it) + (let [field (the #name it) + g!it (|> (the #alias it) (maybe.else field) (..namespaced namespace class_name alias) code.local_symbol) - :field: (value@ #anonymous it)] + :field: (the #anonymous it)] (` ((~! syntax:) ((~ g!it) []) (.# (~! meta.monad) (~' in) (.list (`' (.exec @@ -483,13 +483,13 @@ (def: (virtual_field_definition [class_name class_parameters] alias namespace it) (-> Declaration Alias Namespace (Named Output) Code) - (let [name (value@ #name it) - g!it (|> (value@ #alias it) + (let [name (the #name it) + g!it (|> (the #alias it) (maybe.else name) (..namespaced namespace class_name alias) code.local_symbol) path (%.format (..host_path class_name) "." name) - :field: (value@ #anonymous it) + :field: (the #anonymous it) g!variables (list#each code.local_symbol class_parameters) g!class (` ((~ (code.local_symbol (maybe.else class_name alias))) (~+ g!variables)))] (` (.def: ((~ g!it) (~ g!it)) @@ -502,18 +502,18 @@ (def: (field_definition import! class alias namespace it) (-> (List Code) Declaration Alias Namespace Field Code) - (if (value@ #static? it) - (..static_field_definition import! class alias namespace (value@ #member it)) - (..virtual_field_definition class alias namespace (value@ #member it)))) + (if (the #static? it) + (..static_field_definition import! class alias namespace (the #member it)) + (..virtual_field_definition class alias namespace (the #member it)))) (def: (static_method_definition import! [class_name class_parameters] alias namespace it) (-> (List Code) Declaration Alias Namespace (Named Procedure) Code) - (let [method (value@ #name it) - name (|> (value@ #alias it) - (maybe.else (value@ #name it)) + (let [method (the #name it) + name (|> (the #alias it) + (maybe.else (the #name it)) (..namespaced namespace class_name alias))] (|> it - (with@ #alias {.#Some name}) + (has #alias {.#Some name}) (..procedure_definition import! (for [@.js (` (<constant> (~ (code.text (%.format (..host_path class_name) "." method))))) @.ruby (` (<constant> (~ (code.text (%.format (..host_path class_name) "::" method)))))] @@ -523,20 +523,20 @@ (def: (virtual_method_definition [class_name class_parameters] alias namespace it) (-> Declaration Alias Namespace (Named Procedure) Code) - (let [method (value@ #name it) - g!it (|> (value@ #alias it) + (let [method (the #name it) + g!it (|> (the #alias it) (maybe.else method) (..namespaced namespace class_name alias) code.local_symbol) - procedure (value@ #anonymous it) - input (value@ #input procedure) - g!input_variables (list#each code.local_symbol (value@ #variables input)) - :parameters: (value@ #parameters input) + procedure (the #anonymous it) + input (the #input procedure) + g!input_variables (list#each code.local_symbol (the #variables input)) + :parameters: (the #parameters input) g!parameters (..parameters :parameters:) g!class_variables (list#each code.local_symbol class_parameters) g!class (` ((~ (code.local_symbol (maybe.else class_name alias))) (~+ g!class_variables))) - :output: (value@ #output procedure)] - (` (.def: ((~ g!it) (~+ (list#each (value@ #mandatory) g!parameters)) (~ g!it)) + :output: (the #output procedure)] + (` (.def: ((~ g!it) (~+ (list#each (the #mandatory) g!parameters)) (~ g!it)) (.All ((~ g!it) (~+ g!class_variables) (~+ g!input_variables)) (.-> (~+ (list#each ..output_type :parameters:)) (~ g!class) @@ -552,9 +552,9 @@ (def: (method_definition import! class alias namespace it) (-> (List Code) Declaration Alias Namespace Method Code) - (if (value@ #static? it) - (static_method_definition import! class alias namespace (value@ #member it)) - (virtual_method_definition class alias namespace (value@ #member it)))) + (if (the #static? it) + (static_method_definition import! class alias namespace (the #member it)) + (virtual_method_definition class alias namespace (the #member it)))) (syntax: .public (import: [host_module (<>.maybe <code>.text) it ..import]) @@ -571,14 +571,14 @@ {#Procedure it} (in (list (..procedure_definition host_module_import! - (` (<constant> (~ (code.text (..host_path (value@ #name it)))))) + (` (<constant> (~ (code.text (..host_path (the #name it)))))) it))) {#Class it} - (let [class (value@ #declaration it) - alias (value@ #class_alias it) + (let [class (the #declaration it) + alias (the #class_alias it) [class_name class_parameters] class - namespace (value@ #namespace it) + namespace (the #namespace it) g!class_variables (list#each code.local_symbol class_parameters) declaration (` ((~ (code.local_symbol (maybe.else class_name alias))) (~+ g!class_variables)))] @@ -597,7 +597,7 @@ {#Method it} (..method_definition host_module_import! class alias namespace it))))) - (value@ #members it))))) + (the #members it))))) ))) (for [@.ruby (as_is)] diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux index 0a6acfa83..43a327049 100644 --- a/stdlib/source/library/lux/ffi.old.lux +++ b/stdlib/source/library/lux/ffi.old.lux @@ -1137,7 +1137,7 @@ .let [arg_decls' (: (List Text) (list#each (|>> product.right (simple_class$ (list))) arg_decls))]] (in (`' ((~ (code.text (format "jvm invokespecial" - ":" (value@ #super_class_name super_class) + ":" (the #super_class_name super_class) ":" name ":" (text.interposed "," arg_decls')))) (~' _jvm_this) (~+ args)))))))] @@ -1330,15 +1330,15 @@ (-> (List Type_Parameter) Import_Member_Declaration (List Type_Parameter)) (case member {#ConstructorDecl [commons _]} - (list#composite class_tvars (value@ #import_member_tvars commons)) + (list#composite class_tvars (the #import_member_tvars commons)) {#MethodDecl [commons _]} - (case (value@ #import_member_kind commons) + (case (the #import_member_kind commons) {#StaticIMK} - (value@ #import_member_tvars commons) + (the #import_member_tvars commons) _ - (list#composite class_tvars (value@ #import_member_tvars commons))) + (list#composite class_tvars (the #import_member_tvars commons))) _ class_tvars)) @@ -1360,7 +1360,7 @@ #import_member_args)) arg_types (list#each (: (-> [Bit GenericType] Code) (function (_ [maybe? arg]) - (let [arg_type (class_type (value@ #import_member_mode commons) type_params arg)] + (let [arg_type (class_type (the #import_member_mode commons) type_params arg)] (if maybe? (` (Maybe (~ arg_type))) arg_type)))) @@ -1374,7 +1374,7 @@ (-> Class_Declaration Import_Member_Declaration Code Code) (case member (^or {#ConstructorDecl [commons _]} {#MethodDecl [commons _]}) - (if (value@ #import_member_maybe? commons) + (if (the #import_member_maybe? commons) (` (??? (~ return_term))) (let [g!temp (` ((~' ~') (~ (code.symbol ["" " Ω "]))))] (` (let [(~ g!temp) (~ return_term)] @@ -1382,8 +1382,8 @@ (~ g!temp)))) (~ g!temp) (panic! (~ (code.text (format "Cannot produce null references from method calls @ " - (value@ #class_name class) - "." (value@ #import_member_alias commons)))))))))) + (the #class_name class) + "." (the #import_member_alias commons)))))))))) _ return_term)) @@ -1393,7 +1393,7 @@ (-> Import_Member_Declaration Code Code) (case member (^or {#ConstructorDecl [commons _]} {#MethodDecl [commons _]}) - (if (value@ <tag> commons) + (if (the <tag> commons) <term_trans> return_term) @@ -1485,10 +1485,10 @@ {#ConstructorDecl [commons _]} (do meta.monad - [.let [def_name (code.symbol ["" (..import_name import_format method_prefix (value@ #import_member_alias commons))]) + [.let [def_name (code.symbol ["" (..import_name import_format method_prefix (the #import_member_alias commons))]) jvm_extension (code.text (format "jvm new" ":" full_name ":" (text.interposed "," arg_classes))) jvm_interop (|> (` ((~ jvm_extension) - (~+ (jvm_extension_inputs (value@ #import_member_mode commons) arg_classes arg_function_inputs)))) + (~+ (jvm_extension_inputs (the #import_member_mode commons) arg_classes arg_function_inputs)))) (decorate_return_maybe class member) (decorate_return_try member) (decorate_return_io member))]] @@ -1498,7 +1498,7 @@ {#MethodDecl [commons method]} (with_symbols [g!obj] (do meta.monad - [.let [def_name (code.symbol ["" (..import_name import_format method_prefix (value@ #import_member_alias commons))]) + [.let [def_name (code.symbol ["" (..import_name import_format method_prefix (the #import_member_alias commons))]) (^open "[0]") commons (^open "[0]") method [jvm_op object_ast] (: [Text (List Code)] @@ -1518,10 +1518,10 @@ (list g!obj)] ))) jvm_extension (code.text (format "jvm " jvm_op ":" full_name ":" #import_method_name ":" (text.interposed "," arg_classes))) - jvm_interop (|> [(simple_class$ (list) (value@ #import_method_return method)) + jvm_interop (|> [(simple_class$ (list) (the #import_method_return method)) (` ((~ jvm_extension) (~+ (list#each un_quote object_ast)) - (~+ (jvm_extension_inputs (value@ #import_member_mode commons) arg_classes arg_function_inputs))))] - (auto_convert_output (value@ #import_member_mode commons)) + (~+ (jvm_extension_inputs (the #import_member_mode commons) arg_classes arg_function_inputs))))] + (auto_convert_output (the #import_member_mode commons)) (decorate_return_maybe class member) (decorate_return_try member) (decorate_return_io member))]] diff --git a/stdlib/source/library/lux/locale/language.lux b/stdlib/source/library/lux/locale/language.lux index 6074d9dde..50604e065 100644 --- a/stdlib/source/library/lux/locale/language.lux +++ b/stdlib/source/library/lux/locale/language.lux @@ -1,15 +1,15 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}] - [hash {"+" Hash}]] - [data - ["[0]" text]] - [type - abstract] - [macro - ["[0]" template]]]]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}] + [hash {"+" Hash}]] + [data + ["[0]" text]] + [type + abstract] + [macro + ["[0]" template]]]]) ... https://en.wikipedia.org/wiki/List_of_ISO_639-2_codes (abstract: .public Language @@ -20,7 +20,7 @@ (template [<name> <tag>] [(def: .public <name> (-> Language Text) - (|>> :representation (value@ <tag>)))] + (|>> :representation (the <tag>)))] [name #name] [code #code] diff --git a/stdlib/source/library/lux/locale/territory.lux b/stdlib/source/library/lux/locale/territory.lux index 14a1df61a..8df6f861d 100644 --- a/stdlib/source/library/lux/locale/territory.lux +++ b/stdlib/source/library/lux/locale/territory.lux @@ -1,15 +1,15 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}] - [hash {"+" Hash}]] - [data - ["[0]" text]] - [type - abstract] - [macro - ["[0]" template]]]]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}] + [hash {"+" Hash}]] + [data + ["[0]" text]] + [type + abstract] + [macro + ["[0]" template]]]]) ... https://en.wikipedia.org/wiki/ISO_3166-1 (abstract: .public Territory @@ -23,7 +23,7 @@ [(def: .public <name> (-> Territory <type>) (|>> :representation - (value@ <field>)))] + (the <field>)))] [name #name Text] [short_code #short Text] @@ -308,6 +308,6 @@ (def: hash (|>> :representation - (value@ #long) + (the #long) (# text.hash hash)))) ) diff --git a/stdlib/source/library/lux/macro/local.lux b/stdlib/source/library/lux/macro/local.lux index 55495bc08..a01e438de 100644 --- a/stdlib/source/library/lux/macro/local.lux +++ b/stdlib/source/library/lux/macro/local.lux @@ -1,21 +1,21 @@ (.using - [library - [lux "*" - ["[0]" meta] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}]] - [data - ["[0]" product] - ["[0]" text] - [collection - ["[0]" list ("[1]#[0]" functor)] - [dictionary - ["[0]" plist {"+" PList}]]]]]] - ["[0]" // - ["[1][0]" code]]) + [library + [lux "*" + ["[0]" meta] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}]] + [data + ["[0]" product] + ["[0]" text] + [collection + ["[0]" list ("[1]#[0]" functor)] + [dictionary + ["[0]" plist {"+" PList}]]]]]] + ["[0]" // + ["[1][0]" code]]) (exception: .public (unknown_module [module Text]) (exception.report @@ -35,11 +35,11 @@ (def: (with_module name body) (All (_ a) (-> Text (-> Module (Try [Module a])) (Meta a))) (function (_ compiler) - (case (|> compiler (value@ .#modules) (plist.value name)) + (case (|> compiler (the .#modules) (plist.value name)) {.#Some module} (case (body module) {try.#Success [module' output]} - {try.#Success [(revised@ .#modules (plist.has name module') compiler) + {try.#Success [(revised .#modules (plist.has name module') compiler) output]} {try.#Failure error} @@ -57,9 +57,9 @@ (plist.has definition_name definition))]] (..with_module module_name (function (_ module) - (case (|> module (value@ .#definitions) (plist.value definition_name)) + (case (|> module (the .#definitions) (plist.value definition_name)) {.#None} - {try.#Success [(revised@ .#definitions add_macro! module) + {try.#Success [(revised .#definitions add_macro! module) []]} {.#Some _} @@ -73,9 +73,9 @@ (plist.lacks definition_name))]] (..with_module module_name (function (_ module) - (case (|> module (value@ .#definitions) (plist.value definition_name)) + (case (|> module (the .#definitions) (plist.value definition_name)) {.#Some _} - {try.#Success [(revised@ .#definitions lacks_macro! module) + {try.#Success [(revised .#definitions lacks_macro! module) []]} {.#None} @@ -89,7 +89,7 @@ [_ (monad.each ! ..pop_one macros) _ (..pop_one self) compiler meta.compiler_state] - (in (case (value@ .#expected compiler) + (in (case (the .#expected compiler) {.#Some _} (list (' [])) diff --git a/stdlib/source/library/lux/macro/syntax/declaration.lux b/stdlib/source/library/lux/macro/syntax/declaration.lux index ee4e68150..d817fa193 100644 --- a/stdlib/source/library/lux/macro/syntax/declaration.lux +++ b/stdlib/source/library/lux/macro/syntax/declaration.lux @@ -1,18 +1,18 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}]] - [control - ["<>" parser ("[1]#[0]" monad) - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" product] - ["[0]" text] - [collection - ["[0]" list ("[1]#[0]" functor)]]] - [macro - ["[0]" code]]]]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}]] + [control + ["<>" parser ("[1]#[0]" monad) + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" product] + ["[0]" text] + [collection + ["[0]" list ("[1]#[0]" functor)]]] + [macro + ["[0]" code]]]]) (type: .public Declaration (Record @@ -35,8 +35,8 @@ (def: .public (format value) (-> Declaration Code) - (let [g!name (code.local_symbol (value@ #name value))] - (case (value@ #arguments value) + (let [g!name (code.local_symbol (the #name value))] + (case (the #arguments value) {.#End} g!name diff --git a/stdlib/source/library/lux/macro/syntax/definition.lux b/stdlib/source/library/lux/macro/syntax/definition.lux index d35d48d9b..6d84be918 100644 --- a/stdlib/source/library/lux/macro/syntax/definition.lux +++ b/stdlib/source/library/lux/macro/syntax/definition.lux @@ -1,27 +1,27 @@ (.using - [library - [lux {"-" Definition} - [abstract - [equivalence {"+" Equivalence}] - [monad {"+" do}]] - [control - ["[0]" exception {"+" exception:}] - ["<>" parser - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" sum] - ["[0]" product] - ["[0]" bit] - ["[0]" text - ["%" format]] - [collection - ["[0]" list]]] - ["[0]" macro - ["[0]" code]] - ["[0]" meta - ["[0]" location]]]] - ["[0]" // - ["[1][0]" check {"+" Check}]]) + [library + [lux {"-" Definition} + [abstract + [equivalence {"+" Equivalence}] + [monad {"+" do}]] + [control + ["[0]" exception {"+" exception:}] + ["<>" parser + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" sum] + ["[0]" product] + ["[0]" bit] + ["[0]" text + ["%" format]] + [collection + ["[0]" list]]] + ["[0]" macro + ["[0]" code]] + ["[0]" meta + ["[0]" location]]]] + ["[0]" // + ["[1][0]" check {"+" Check}]]) (type: .public Definition (Record @@ -46,9 +46,9 @@ (def: dummy Code - (` [.#module (~ (code.text (value@ .#module location.dummy))) - .#line (~ (code.nat (value@ .#line location.dummy))) - .#column (~ (code.nat (value@ .#column location.dummy)))])) + (` [.#module (~ (code.text (the .#module location.dummy))) + .#line (~ (code.nat (the .#line location.dummy))) + .#column (~ (code.nat (the .#column location.dummy)))])) (def: .public (format (^open "_[0]")) (-> Definition Code) @@ -88,7 +88,7 @@ (-> Lux (Parser Definition)) (do <>.monad [definition (..parser compiler) - _ (case (value@ #value definition) + _ (case (the #value definition) {.#Left _} (in []) diff --git a/stdlib/source/library/lux/macro/syntax/input.lux b/stdlib/source/library/lux/macro/syntax/input.lux index 2b59fce16..6d7d8c357 100644 --- a/stdlib/source/library/lux/macro/syntax/input.lux +++ b/stdlib/source/library/lux/macro/syntax/input.lux @@ -1,17 +1,17 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}]] - [control - ["<>" parser - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" product] - [collection - ["[0]" list ("[1]#[0]" monad)]]] - [macro - ["[0]" code]]]]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}]] + [control + ["<>" parser + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" product] + [collection + ["[0]" list ("[1]#[0]" monad)]]] + [macro + ["[0]" code]]]]) (type: .public Input (Record @@ -28,8 +28,8 @@ (def: .public format (-> (List Input) Code) (|>> (list#each (function (_ value) - (list (value@ #binding value) - (value@ #type value)))) + (list (the #binding value) + (the #type value)))) list#conjoint code.tuple)) diff --git a/stdlib/source/library/lux/macro/template.lux b/stdlib/source/library/lux/macro/template.lux index 57373d640..9e5db759a 100644 --- a/stdlib/source/library/lux/macro/template.lux +++ b/stdlib/source/library/lux/macro/template.lux @@ -1,30 +1,30 @@ (.using - [library - [lux {"-" let local macro symbol} - ["[0]" meta] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["<>" parser ("[1]#[0]" functor) - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" bit ("[1]#[0]" codec)] - ["[0]" text] - [collection - ["[0]" list ("[1]#[0]" monad)] - ["[0]" dictionary {"+" Dictionary}]]] - [math - [number - ["[0]" nat ("[1]#[0]" decimal)] - ["[0]" int ("[1]#[0]" decimal)] - ["[0]" rev ("[1]#[0]" decimal)] - ["[0]" frac ("[1]#[0]" decimal)]]]]] - ["[0]" // - [syntax {"+" syntax:}] - ["[0]" code] - ["[0]" local]]) + [library + [lux {"-" let local macro symbol} + ["[0]" meta] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["<>" parser ("[1]#[0]" functor) + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" bit ("[1]#[0]" codec)] + ["[0]" text] + [collection + ["[0]" list ("[1]#[0]" monad)] + ["[0]" dictionary {"+" Dictionary}]]] + [math + [number + ["[0]" nat ("[1]#[0]" decimal)] + ["[0]" int ("[1]#[0]" decimal)] + ["[0]" rev ("[1]#[0]" decimal)] + ["[0]" frac ("[1]#[0]" decimal)]]]]] + ["[0]" // + [syntax {"+" syntax:}] + ["[0]" code] + ["[0]" local]]) (syntax: .public (spliced [parts (<code>.tuple (<>.some <code>.any))]) (in parts)) @@ -156,14 +156,14 @@ [here_name meta.current_module_name expression? (: (Meta Bit) (function (_ lux) - {try.#Success [lux (case (value@ .#expected lux) + {try.#Success [lux (case (the .#expected lux) {.#None} false {.#Some _} true)]})) g!pop (local.push (list#each (function (_ local) - [[here_name (value@ #name local)] + [[here_name (the #name local)] (..macro local)]) locals))] (if expression? diff --git a/stdlib/source/library/lux/math/number/complex.lux b/stdlib/source/library/lux/math/number/complex.lux index 636a77838..b1c14d1bb 100644 --- a/stdlib/source/library/lux/math/number/complex.lux +++ b/stdlib/source/library/lux/math/number/complex.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["[0]" math] - [abstract - [equivalence {"+" Equivalence}] - [codec {"+" Codec}] - ["M" monad {"+" Monad do}]] - [control - ["[0]" maybe] - ["<>" parser - ["<[0]>" code {"+" Parser}]]] - [data - [collection - ["[0]" list ("[1]#[0]" functor)]]] - [macro - [syntax {"+" syntax:}] - ["[0]" code]] - [math - [number - ["n" nat] - ["f" frac] - ["[0]" int]]]]]) + [library + [lux "*" + ["[0]" math] + [abstract + [equivalence {"+" Equivalence}] + [codec {"+" Codec}] + ["M" monad {"+" Monad do}]] + [control + ["[0]" maybe] + ["<>" parser + ["<[0]>" code {"+" Parser}]]] + [data + [collection + ["[0]" list ("[1]#[0]" functor)]]] + [macro + [syntax {"+" syntax:}] + ["[0]" code]] + [math + [number + ["n" nat] + ["f" frac] + ["[0]" int]]]]]) (type: .public Complex (Record @@ -50,23 +50,23 @@ (def: .public (not_a_number? complex) (-> Complex Bit) - (or (f.not_a_number? (value@ #real complex)) - (f.not_a_number? (value@ #imaginary complex)))) + (or (f.not_a_number? (the #real complex)) + (f.not_a_number? (the #imaginary complex)))) (def: .public (= param input) (-> Complex Complex Bit) - (and (f.= (value@ #real param) - (value@ #real input)) - (f.= (value@ #imaginary param) - (value@ #imaginary input)))) + (and (f.= (the #real param) + (the #real input)) + (f.= (the #imaginary param) + (the #imaginary input)))) (template [<name> <op>] [(def: .public (<name> param input) (-> Complex Complex Complex) - [#real (<op> (value@ #real param) - (value@ #real input)) - #imaginary (<op> (value@ #imaginary param) - (value@ #imaginary input))])] + [#real (<op> (the #real param) + (the #real input)) + #imaginary (<op> (the #imaginary param) + (the #imaginary input))])] [+ f.+] [- f.-] @@ -80,8 +80,8 @@ (template [<name> <transform>] [(def: .public <name> (-> Complex Complex) - (|>> (revised@ #real <transform>) - (revised@ #imaginary <transform>)))] + (|>> (revised #real <transform>) + (revised #imaginary <transform>)))] [opposite f.opposite] [signum f.signum] @@ -89,25 +89,25 @@ (def: .public conjugate (-> Complex Complex) - (revised@ #imaginary f.opposite)) + (revised #imaginary f.opposite)) (def: .public (*' param input) (-> Frac Complex Complex) [#real (f.* param - (value@ #real input)) + (the #real input)) #imaginary (f.* param - (value@ #imaginary input))]) + (the #imaginary input))]) (def: .public (* param input) (-> Complex Complex Complex) - [#real (f.- (f.* (value@ #imaginary param) - (value@ #imaginary input)) - (f.* (value@ #real param) - (value@ #real input))) - #imaginary (f.+ (f.* (value@ #real param) - (value@ #imaginary input)) - (f.* (value@ #imaginary param) - (value@ #real input)))]) + [#real (f.- (f.* (the #imaginary param) + (the #imaginary input)) + (f.* (the #real param) + (the #real input))) + #imaginary (f.+ (f.* (the #real param) + (the #imaginary input)) + (f.* (the #imaginary param) + (the #real input)))]) (def: .public (/ param input) (-> Complex Complex Complex) @@ -116,12 +116,12 @@ (f.abs #real)) (let [quot (f./ #imaginary #real) denom (|> #real (f.* quot) (f.+ #imaginary))] - [..#real (|> (value@ ..#real input) (f.* quot) (f.+ (value@ ..#imaginary input)) (f./ denom)) - ..#imaginary (|> (value@ ..#imaginary input) (f.* quot) (f.- (value@ ..#real input)) (f./ denom))]) + [..#real (|> (the ..#real input) (f.* quot) (f.+ (the ..#imaginary input)) (f./ denom)) + ..#imaginary (|> (the ..#imaginary input) (f.* quot) (f.- (the ..#real input)) (f./ denom))]) (let [quot (f./ #real #imaginary) denom (|> #imaginary (f.* quot) (f.+ #real))] - [..#real (|> (value@ ..#imaginary input) (f.* quot) (f.+ (value@ ..#real input)) (f./ denom)) - ..#imaginary (|> (value@ ..#imaginary input) (f.- (f.* quot (value@ ..#real input))) (f./ denom))])))) + [..#real (|> (the ..#imaginary input) (f.* quot) (f.+ (the ..#real input)) (f./ denom)) + ..#imaginary (|> (the ..#imaginary input) (f.- (f.* quot (the ..#real input))) (f./ denom))])))) (def: .public (/' param subject) (-> Frac Complex Complex) @@ -133,8 +133,8 @@ (-> Complex Complex Complex) (let [scaled (/ param input) quotient (|> scaled - (revised@ #real math.floor) - (revised@ #imaginary math.floor))] + (revised #real math.floor) + (revised #imaginary math.floor))] (- (* quotient param) input))) @@ -311,8 +311,8 @@ (def: .public (approximately? margin_of_error standard value) (-> Frac Complex Complex Bit) (and (f.approximately? margin_of_error - (value@ ..#real standard) - (value@ ..#real value)) + (the ..#real standard) + (the ..#real value)) (f.approximately? margin_of_error - (value@ ..#imaginary standard) - (value@ ..#imaginary value)))) + (the ..#imaginary standard) + (the ..#imaginary value)))) diff --git a/stdlib/source/library/lux/math/number/ratio.lux b/stdlib/source/library/lux/math/number/ratio.lux index b1cd62a3c..93bdca39e 100644 --- a/stdlib/source/library/lux/math/number/ratio.lux +++ b/stdlib/source/library/lux/math/number/ratio.lux @@ -1,26 +1,26 @@ (.using - [library - [lux {"-" nat} - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}] - [monoid {"+" Monoid}] - [codec {"+" Codec}] - [monad {"+" do}]] - [control - ["[0]" function] - ["[0]" maybe] - ["[0]" try] - ["<>" parser - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" monoid)]] - [macro - [syntax {"+" syntax:}] - ["[0]" code]]]] - [// - ["n" nat ("[1]#[0]" decimal)]]) + [library + [lux {"-" nat} + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}] + [monoid {"+" Monoid}] + [codec {"+" Codec}] + [monad {"+" do}]] + [control + ["[0]" function] + ["[0]" maybe] + ["[0]" try] + ["<>" parser + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" monoid)]] + [macro + [syntax {"+" syntax:}] + ["[0]" code]]]] + [// + ["n" nat ("[1]#[0]" decimal)]]) (type: .public Ratio (Record @@ -29,8 +29,8 @@ (def: .public (nat value) (-> Ratio (Maybe Nat)) - (case (value@ #denominator value) - 1 {.#Some (value@ #numerator value)} + (case (the #denominator value) + 1 {.#Some (the #numerator value)} _ {.#None})) (def: (normal (^open "_[0]")) @@ -46,10 +46,10 @@ (def: .public (= parameter subject) (-> Ratio Ratio Bit) - (and (n.= (value@ #numerator parameter) - (value@ #numerator subject)) - (n.= (value@ #denominator parameter) - (value@ #denominator subject)))) + (and (n.= (the #numerator parameter) + (the #numerator subject)) + (n.= (the #denominator parameter) + (the #denominator subject)))) (implementation: .public equivalence (Equivalence Ratio) @@ -58,10 +58,10 @@ (def: (equalized parameter subject) (-> Ratio Ratio [Nat Nat]) - [(n.* (value@ #denominator subject) - (value@ #numerator parameter)) - (n.* (value@ #denominator parameter) - (value@ #numerator subject))]) + [(n.* (the #denominator subject) + (the #numerator parameter)) + (n.* (the #denominator parameter) + (the #numerator subject))]) (def: .public (< parameter subject) (-> Ratio Ratio Bit) @@ -92,22 +92,22 @@ (-> Ratio Ratio Ratio) (let [[parameter' subject'] (..equalized parameter subject)] (normal [(n.+ parameter' subject') - (n.* (value@ #denominator parameter) - (value@ #denominator subject))]))) + (n.* (the #denominator parameter) + (the #denominator subject))]))) (def: .public (- parameter subject) (-> Ratio Ratio Ratio) (let [[parameter' subject'] (..equalized parameter subject)] (normal [(n.- parameter' subject') - (n.* (value@ #denominator parameter) - (value@ #denominator subject))]))) + (n.* (the #denominator parameter) + (the #denominator subject))]))) (def: .public (* parameter subject) (-> Ratio Ratio Ratio) - (normal [(n.* (value@ #numerator parameter) - (value@ #numerator subject)) - (n.* (value@ #denominator parameter) - (value@ #denominator subject))])) + (normal [(n.* (the #numerator parameter) + (the #numerator subject)) + (n.* (the #denominator parameter) + (the #denominator subject))])) (def: .public (/ parameter subject) (-> Ratio Ratio Ratio) @@ -118,7 +118,7 @@ (-> Ratio Ratio Ratio) (let [[parameter' subject'] (..equalized parameter subject) quot (n./ parameter' subject')] - (..- (revised@ #numerator (n.* quot) parameter) + (..- (revised #numerator (n.* quot) parameter) subject))) (def: .public (reciprocal (^open "_[0]")) diff --git a/stdlib/source/library/lux/meta.lux b/stdlib/source/library/lux/meta.lux index 8bf80bce5..5f6dad623 100644 --- a/stdlib/source/library/lux/meta.lux +++ b/stdlib/source/library/lux/meta.lux @@ -112,12 +112,12 @@ (All (_ a) (-> Text (Meta a))) (function (_ state) - {try.#Failure (location.with (value@ .#location state) error)})) + {try.#Failure (location.with (the .#location state) error)})) (def: .public (module name) (-> Text (Meta Module)) (function (_ lux) - (case (plist.value name (value@ .#modules lux)) + (case (plist.value name (the .#modules lux)) {.#Some module} {try.#Success [lux module]} @@ -127,7 +127,7 @@ (def: .public current_module_name (Meta Text) (function (_ lux) - (case (value@ .#current_module lux) + (case (the .#current_module lux) {.#Some current_module} {try.#Success [lux current_module]} @@ -173,7 +173,7 @@ {.#None} {try.#Success [_ this_module]} - (let [modules (value@ .#modules lux)] + (let [modules (the .#modules lux)] (loop [module module name name] (do maybe.monad @@ -181,7 +181,7 @@ definition (: (Maybe Global) (|> $module (: Module) - (value@ .#definitions) + (the .#definitions) (plist.value name)))] (case definition {.#Alias [r_module r_name]} @@ -204,13 +204,13 @@ (def: .public seed (Meta Nat) (function (_ lux) - {try.#Success [(revised@ .#seed ++ lux) - (value@ .#seed lux)]})) + {try.#Success [(revised .#seed ++ lux) + (the .#seed lux)]})) (def: .public (module_exists? module) (-> Text (Meta Bit)) (function (_ lux) - {try.#Success [lux (case (plist.value module (value@ .#modules lux)) + {try.#Success [lux (case (plist.value module (the .#modules lux)) {.#Some _} #1 @@ -241,7 +241,7 @@ {.#Var var} (function (_ lux) (case (|> lux - (value@ [.#type_context .#var_bindings]) + (the [.#type_context .#var_bindings]) (type_variable var)) (^or {.#None} {.#Some {.#Var _}}) {try.#Success [lux type]} @@ -260,15 +260,15 @@ (case (do maybe.monad [scope (list.example (function (_ env) (or (list.any? test (: (List [Text [Type Any]]) - (value@ [.#locals .#mappings] env))) + (the [.#locals .#mappings] env))) (list.any? test (: (List [Text [Type Any]]) - (value@ [.#captured .#mappings] env))))) - (value@ .#scopes lux)) + (the [.#captured .#mappings] env))))) + (the .#scopes lux)) [_ [type _]] (on_either (list.example test) (: (List [Text [Type Any]]) - (value@ [.#locals .#mappings] scope)) + (the [.#locals .#mappings] scope)) (: (List [Text [Type Any]]) - (value@ [.#captured .#mappings] scope)))] + (the [.#captured .#mappings] scope)))] (in type)) {.#Some var_type} ((clean_type var_type) lux) @@ -301,28 +301,28 @@ (case (: (Maybe Global) (do maybe.monad [(^open "[0]") (|> lux - (value@ .#modules) + (the .#modules) (plist.value normal_module))] (plist.value normal_short #definitions))) {.#Some definition} {try.#Success [lux definition]} _ - (let [current_module (|> lux (value@ .#current_module) (maybe.else "???")) + (let [current_module (|> lux (the .#current_module) (maybe.else "???")) all_known_modules (|> lux - (value@ .#modules) + (the .#modules) (list#each product.left) ..module_listing)] {try.#Failure ($_ text#composite "Unknown definition: " (symbol#encoded name) text.new_line " Current module: " current_module text.new_line - (case (plist.value current_module (value@ .#modules lux)) + (case (plist.value current_module (the .#modules lux)) {.#Some this_module} (let [candidates (|> lux - (value@ .#modules) + (the .#modules) (list#each (function (_ [module_name module]) (|> module - (value@ .#definitions) + (the .#definitions) (list.all (function (_ [def_name global]) (case global (^or {.#Definition [exported? _]} @@ -344,10 +344,10 @@ (list.sorted text#<) (text.interposed ..listing_separator)) imports (|> this_module - (value@ .#imports) + (the .#imports) ..module_listing) aliases (|> this_module - (value@ .#module_aliases) + (the .#module_aliases) (list#each (function (_ [alias real]) ($_ text#composite alias " => " real))) (list.sorted text#<) (text.interposed ..listing_separator))] @@ -454,12 +454,12 @@ (def: .public (globals module) (-> Text (Meta (List [Text Global]))) (function (_ lux) - (case (plist.value module (value@ .#modules lux)) + (case (plist.value module (the .#modules lux)) {.#None} {try.#Failure ($_ text#composite "Unknown module: " module)} {.#Some module} - {try.#Success [lux (value@ .#definitions module)]}))) + {try.#Success [lux (the .#definitions module)]}))) (def: .public (definitions module) (-> Text (Meta (List [Text Definition]))) @@ -496,7 +496,7 @@ (Meta (List [Text Module])) (function (_ lux) (|> lux - (value@ .#modules) + (the .#modules) [lux] {try.#Success}))) @@ -505,7 +505,7 @@ (do ..monad [.let [[module_name name] type_name] module (..module module_name)] - (case (plist.value name (value@ .#definitions module)) + (case (plist.value name (the .#definitions module)) {.#Some {.#Type [exported? type labels]}} (case labels (^or {.#Left labels} @@ -519,12 +519,12 @@ (def: .public location (Meta Location) (function (_ lux) - {try.#Success [lux (value@ .#location lux)]})) + {try.#Success [lux (the .#location lux)]})) (def: .public expected_type (Meta Type) (function (_ lux) - (case (value@ .#expected lux) + (case (the .#expected lux) {.#Some type} {try.#Success [lux type]} @@ -546,7 +546,7 @@ (def: .public (imported? import) (-> Text (Meta Bit)) (# ..functor each - (|>> (value@ .#imports) (list.any? (text#= import))) + (|>> (the .#imports) (list.any? (text#= import))) ..current_module)) (template [<name> <tag> <description>] @@ -556,7 +556,7 @@ [.let [[module name] label_name] =module (..module module) this_module_name ..current_module_name] - (case (plist.value name (value@ .#definitions =module)) + (case (plist.value name (the .#definitions =module)) {.#Some {<tag> [exported? type group idx]}} (if (or (text#= this_module_name module) exported?) @@ -593,18 +593,18 @@ _ {.#None})) - (value@ .#definitions =module))))) + (the .#definitions =module))))) (def: .public locals (Meta (List (List [Text Type]))) (function (_ lux) - (case (list.inits (value@ .#scopes lux)) + (case (list.inits (the .#scopes lux)) {.#None} {try.#Failure "No local environment"} {.#Some scopes} {try.#Success [lux - (list#each (|>> (value@ [.#locals .#mappings]) + (list#each (|>> (the [.#locals .#mappings]) (list#each (function (_ [name [type _]]) [name type]))) scopes)]}))) @@ -637,7 +637,7 @@ (def: .public type_context (Meta Type_Context) (function (_ lux) - {try.#Success [lux (value@ .#type_context lux)]})) + {try.#Success [lux (the .#type_context lux)]})) (def: .public (lifted result) (All (_ a) (-> (Try a) (Meta a))) @@ -651,7 +651,7 @@ (def: .public (eval type code) (-> Type Code (Meta Any)) (do [! ..monad] - [eval (# ! each (value@ .#eval) + [eval (# ! each (the .#eval) ..compiler_state)] (eval type code))) @@ -670,7 +670,7 @@ (Meta <type>) (function (_ lux) {try.#Success [lux - (value@ [.#info <slot>] lux)]}))] + (the [.#info <slot>] lux)]}))] [Text target .#target] [Text version .#version] diff --git a/stdlib/source/library/lux/meta/location.lux b/stdlib/source/library/lux/meta/location.lux index 1c2908972..1080669a2 100644 --- a/stdlib/source/library/lux/meta/location.lux +++ b/stdlib/source/library/lux/meta/location.lux @@ -8,9 +8,9 @@ (Equivalence Location) (def: (= reference subject) - (and ("lux text =" (value@ .#module reference) (value@ .#module subject)) - ("lux i64 =" (value@ .#line reference) (value@ .#line subject)) - ("lux i64 =" (value@ .#column reference) (value@ .#column subject))))) + (and ("lux text =" (the .#module reference) (the .#module subject)) + ("lux i64 =" (the .#line reference) (the .#line subject)) + ("lux i64 =" (the .#column reference) (the .#column subject))))) (def: .public dummy Location @@ -21,12 +21,12 @@ (macro: .public (here tokens compiler) (case tokens {.#End} - (let [location (value@ .#location compiler)] + (let [location (the .#location compiler)] {.#Right [compiler (list (` (.: .Location - [.#module (~ [..dummy {.#Text (value@ .#module location)}]) - .#line (~ [..dummy {.#Nat (value@ .#line location)}]) - .#column (~ [..dummy {.#Nat (value@ .#column location)}])])))]}) + [.#module (~ [..dummy {.#Text (the .#module location)}]) + .#line (~ [..dummy {.#Nat (the .#line location)}]) + .#column (~ [..dummy {.#Nat (the .#column location)}])])))]}) _ {.#Left (`` (("lux in-module" (~~ (static .prelude_module)) wrong_syntax_error) (symbol ..here)))})) diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux index 2e12d2c19..b3f54a375 100644 --- a/stdlib/source/library/lux/target/js.lux +++ b/stdlib/source/library/lux/target/js.lux @@ -1,6 +1,6 @@ (.using [library - [lux {"-" Location Code Label or and function if undefined for comment not int try ++ --} + [lux {"-" Location Code Label or and function if undefined for comment not int try ++ -- the} [control [pipe {"+" case>}]] [data diff --git a/stdlib/source/library/lux/target/jvm/attribute/code.lux b/stdlib/source/library/lux/target/jvm/attribute/code.lux index 2526ae6bf..f7619a587 100644 --- a/stdlib/source/library/lux/target/jvm/attribute/code.lux +++ b/stdlib/source/library/lux/target/jvm/attribute/code.lux @@ -1,26 +1,26 @@ (.using - [library - [lux {"-" Code} - [abstract - [equivalence {"+" Equivalence}]] - [data - ["[0]" product] - ["[0]" binary {"+" Binary}] - [format - ["[0]F" binary {"+" Writer} ("[1]#[0]" monoid)]] - [collection - ["[0]" sequence {"+" Sequence} ("[1]#[0]" functor mix)]]] - [math - [number - ["n" nat]]]]] - ["[0]" /// "_" - [bytecode - [environment - ["[1][0]" limit {"+" Limit}]]] - [encoding - ["[1][0]" unsigned {"+" U2}]]] - ["[0]" / "_" - ["[1][0]" exception {"+" Exception}]]) + [library + [lux {"-" Code} + [abstract + [equivalence {"+" Equivalence}]] + [data + ["[0]" product] + ["[0]" binary {"+" Binary}] + [format + ["[0]F" binary {"+" Writer} ("[1]#[0]" monoid)]] + [collection + ["[0]" sequence {"+" Sequence} ("[1]#[0]" functor mix)]]] + [math + [number + ["n" nat]]]]] + ["[0]" /// "_" + [bytecode + [environment + ["[1][0]" limit {"+" Limit}]]] + [encoding + ["[1][0]" unsigned {"+" U2}]]] + ["[0]" / "_" + ["[1][0]" exception {"+" Exception}]]) (type: .public (Code Attribute) (Record @@ -38,19 +38,19 @@ ... u4 code_length; ///unsigned.bytes/4 ... u1 code[code_length]; - (binary.size (value@ #code code)) + (binary.size (the #code code)) ... u2 exception_table_length; ///unsigned.bytes/2 ... exception_table[exception_table_length]; (|> code - (value@ #exception_table) + (the #exception_table) sequence.size (n.* /exception.length)) ... u2 attributes_count; ///unsigned.bytes/2 ... attribute_info attributes[attributes_count]; (|> code - (value@ #attributes) + (the #attributes) (sequence#each length) (sequence#mix n.+ 0)))) @@ -70,14 +70,14 @@ ($_ binaryF#composite ... u2 max_stack; ... u2 max_locals; - (///limit.writer (value@ #limit code)) + (///limit.writer (the #limit code)) ... u4 code_length; ... u1 code[code_length]; - (binaryF.binary/32 (value@ #code code)) + (binaryF.binary/32 (the #code code)) ... u2 exception_table_length; ... exception_table[exception_table_length]; - ((binaryF.sequence/16 /exception.writer) (value@ #exception_table code)) + ((binaryF.sequence/16 /exception.writer) (the #exception_table code)) ... u2 attributes_count; ... attribute_info attributes[attributes_count]; - ((binaryF.sequence/16 writer) (value@ #attributes code)) + ((binaryF.sequence/16 writer) (the #attributes code)) )) diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux index 55e9fa71f..29d93fad0 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode.lux @@ -121,9 +121,9 @@ (function (_ [pool environment tracker]) {try.#Success [[pool environment - (revised@ #next ++ tracker)] + (revised #next ++ tracker)] [..relative#identity - (value@ #next tracker)]]})) + (the #next tracker)]]})) (exception: .public (label_has_already_been_set [label Label]) (exception.report @@ -147,7 +147,7 @@ (let [[pool environment tracker] state] {try.#Success [state [..relative#identity - (case (dictionary.value label (value@ #known tracker)) + (case (dictionary.value label (the #known tracker)) {.#Some [expected {.#Some address}]} {.#Some [expected address]} @@ -160,7 +160,7 @@ (let [[pool environment tracker] state] {try.#Success [state [..relative#identity - (case (dictionary.value label (value@ #known tracker)) + (case (dictionary.value label (the #known tracker)) {.#Some [expected {.#None}]} {.#Some expected} @@ -173,20 +173,20 @@ (let [[pool environment tracker] state] {try.#Success [state [..relative#identity - (value@ /environment.#stack environment)]]}))) + (the /environment.#stack environment)]]}))) (with_expansions [<success> (as_is (try|in [[pool environment - (revised@ #known - (dictionary.has label [actual {.#Some @here}]) - tracker)] + (revised #known + (dictionary.has label [actual {.#Some @here}]) + tracker)] [..relative#identity []]]))] (def: .public (set_label label) (-> Label (Bytecode Any)) (function (_ [pool environment tracker]) - (let [@here (value@ #program_counter tracker)] - (case (dictionary.value label (value@ #known tracker)) + (let [@here (the #program_counter tracker)] + (case (dictionary.value label (the #known tracker)) {.#Some [expected {.#Some address}]} (exception.except ..label_has_already_been_set [label]) @@ -197,7 +197,7 @@ ... {.#None} _ (<| (try|do [actual environment] (/environment.continue (|> environment - (value@ /environment.#stack) + (the /environment.#stack) (maybe.else /stack.empty)) environment)) <success>)))))) @@ -276,7 +276,7 @@ (All (_ a) (-> Environment (Bytecode a) (Resource [Environment (Sequence Exception) Instruction a]))) (function (_ pool) (<| (try|do [[pool environment tracker] [relative output]] (bytecode [pool environment ..fresh])) - (try|do [exceptions instruction] (relative (value@ #known tracker))) + (try|do [exceptions instruction] (relative (the #known tracker))) (try|in [pool [environment exceptions instruction output]])))) (def: (step estimator counter) @@ -291,10 +291,10 @@ (monad.then try.monad (|>> (/environment.produces production) (try#each (/environment.has registry)) try#conjoint)))) - (try|do program_counter' (step estimator (value@ #program_counter tracker))) + (try|do program_counter' (step estimator (the #program_counter tracker))) (try|in [[pool environment' - (with@ #program_counter program_counter' tracker)] + (has #program_counter program_counter' tracker)] [(function (_ _) (try|in [..no_exceptions (bytecode input)])) []]])))) @@ -823,20 +823,20 @@ (def: (acknowledge_label stack label tracker) (-> Stack Label Tracker Tracker) - (case (dictionary.value label (value@ #known tracker)) + (case (dictionary.value label (the #known tracker)) {.#Some _} tracker ... {.#None} _ - (revised@ #known (dictionary.has label [stack {.#None}]) tracker))) + (revised #known (dictionary.has label [stack {.#None}]) tracker))) (template [<consumption> <name> <instruction>] [(def: .public (<name> label) (-> Label (Bytecode Any)) (let [[estimator bytecode] <instruction>] (function (_ [pool environment tracker]) - (<| (let [@here (value@ #program_counter tracker)]) + (<| (let [@here (the #program_counter tracker)]) (try|do environment' (|> environment (/environment.consumes <consumption>))) (try|do actual (/environment.stack environment')) @@ -846,7 +846,7 @@ environment' (|> tracker (..acknowledge_label actual label) - (with@ #program_counter program_counter'))] + (has #program_counter program_counter'))] [(function (_ resolver) (<| (try|do [expected @to] (..resolve_label label resolver)) (try|do _ (exception.assertion ..mismatched_environments [(symbol <instruction>) label @here expected actual] @@ -887,14 +887,14 @@ (let [[estimator bytecode] <instruction>] (function (_ [pool environment tracker]) (<| (try|do actual (/environment.stack environment)) - (let [@here (value@ #program_counter tracker)]) + (let [@here (the #program_counter tracker)]) (try|do program_counter' (step estimator @here)) (try|in (let [@from @here] [[pool (/environment.discontinue environment) (|> tracker (..acknowledge_label actual label) - (with@ #program_counter program_counter'))] + (has #program_counter program_counter'))] [(function (_ resolver) (case (dictionary.value label resolver) {.#Some [expected {.#Some @to}]} @@ -942,12 +942,12 @@ (<| (try|do environment' (|> environment (/environment.consumes $1))) (try|do actual (/environment.stack environment')) - (try|do program_counter' (step (estimator (list.size afterwards)) (value@ #program_counter tracker))) - (try|in (let [@from (value@ #program_counter tracker)] + (try|do program_counter' (step (estimator (list.size afterwards)) (the #program_counter tracker))) + (try|in (let [@from (the #program_counter tracker)] [[pool environment' (|> (list#mix (..acknowledge_label actual) tracker (list& default at_minimum afterwards)) - (with@ #program_counter program_counter'))] + (has #program_counter program_counter'))] [(function (_ resolver) (let [get (: (-> Label (Maybe [Stack (Maybe Address)])) (function (_ label) @@ -984,12 +984,12 @@ (<| (try|do environment' (|> environment (/environment.consumes $1))) (try|do actual (/environment.stack environment')) - (try|do program_counter' (step (estimator (list.size cases)) (value@ #program_counter tracker))) - (try|in (let [@from (value@ #program_counter tracker)] + (try|do program_counter' (step (estimator (list.size cases)) (the #program_counter tracker))) + (try|in (let [@from (the #program_counter tracker)] [[pool environment' (|> (list#mix (..acknowledge_label actual) tracker (list& default (list#each product.right cases))) - (with@ #program_counter program_counter'))] + (has #program_counter program_counter'))] [(function (_ resolver) (let [get (: (-> Label (Maybe [Stack (Maybe Address)])) (function (_ label) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux index 3e6f60b30..222bd7c0e 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux @@ -1,21 +1,21 @@ (.using - [library - [lux {"-" Type static} - [abstract - [monad {"+" do}] - [monoid {"+" Monoid}]] - [control - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}]]]] - [/ - ["/[0]" limit {"+" Limit} - ["/[0]" stack {"+" Stack}] - ["/[0]" registry {"+" Registry}]] - [/// - [encoding - [unsigned {"+" U2}]] - [type {"+" Type} - [category {"+" Method}]]]]) + [library + [lux {"-" Type static has} + [abstract + [monad {"+" do}] + [monoid {"+" Monoid}]] + [control + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}]]]] + [/ + ["/[0]" limit {"+" Limit} + ["/[0]" stack {"+" Stack}] + ["/[0]" registry {"+" Registry}]] + [/// + [encoding + [unsigned {"+" U2}]] + [type {"+" Type} + [category {"+" Method}]]]]) (type: .public Environment (Record @@ -53,7 +53,7 @@ (def: .public (stack environment) (-> Environment (Try Stack)) - (case (value@ ..#stack environment) + (case (the ..#stack environment) {.#Some stack} {try.#Success stack} @@ -62,7 +62,7 @@ (def: .public discontinue (-> Environment Environment) - (with@ ..#stack {.#None})) + (.has ..#stack {.#None})) (exception: .public (mismatched_stacks [expected Stack actual Stack]) @@ -72,14 +72,14 @@ (def: .public (continue expected environment) (-> Stack Environment (Try [Stack Environment])) - (case (value@ ..#stack environment) + (case (the ..#stack environment) {.#Some actual} (if (# /stack.equivalence = expected actual) {try.#Success [actual environment]} (exception.except ..mismatched_stacks [expected actual])) {.#None} - {try.#Success [expected (with@ ..#stack {.#Some expected} environment)]})) + {try.#Success [expected (.has ..#stack {.#Some expected} environment)]})) (def: .public (consumes amount) (-> U2 Condition) @@ -89,7 +89,7 @@ (do try.monad [previous (..stack environment) current (/stack.pop amount previous)] - (in (with@ ..#stack {.#Some current} environment))))) + (in (.has ..#stack {.#Some current} environment))))) (def: .public (produces amount) (-> U2 Condition) @@ -98,13 +98,13 @@ [previous (..stack environment) current (/stack.push amount previous) .let [limit (|> environment - (value@ [..#limit /limit.#stack]) + (the [..#limit /limit.#stack]) (/stack.max current))]] (in (|> environment - (with@ ..#stack {.#Some current}) - (with@ [..#limit /limit.#stack] limit)))))) + (.has ..#stack {.#Some current}) + (.has [..#limit /limit.#stack] limit)))))) (def: .public (has registry) (-> Registry Condition) - (|>> (revised@ [..#limit /limit.#registry] (/registry.has registry)) + (|>> (revised [..#limit /limit.#registry] (/registry.has registry)) {try.#Success})) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux index e27137cbc..3d3bb2d8d 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux @@ -1,24 +1,24 @@ (.using - [library - [lux {"-" Type static} - [abstract - [monad {"+" do}] - [equivalence {"+" Equivalence}]] - [control - ["[0]" try {"+" Try}]] - [data - ["[0]" product] - ["[0]" format "_" - ["[1]" binary {"+" Writer} ("[1]#[0]" monoid)]]] - [math - [number - ["n" nat]]]]] - ["[0]" / "_" - ["[1][0]" stack {"+" Stack}] - ["[1][0]" registry {"+" Registry}] - [//// - [type {"+" Type} - [category {"+" Method}]]]]) + [library + [lux {"-" Type static} + [abstract + [monad {"+" do}] + [equivalence {"+" Equivalence}]] + [control + ["[0]" try {"+" Try}]] + [data + ["[0]" product] + ["[0]" format "_" + ["[1]" binary {"+" Writer} ("[1]#[0]" monoid)]]] + [math + [number + ["n" nat]]]]] + ["[0]" / "_" + ["[1][0]" stack {"+" Stack}] + ["[1][0]" registry {"+" Registry}] + [//// + [type {"+" Type} + [category {"+" Method}]]]]) (type: .public Limit (Record @@ -54,6 +54,6 @@ (def: .public (writer limit) (Writer Limit) ($_ format#composite - (/stack.writer (value@ #stack limit)) - (/registry.writer (value@ #registry limit)) + (/stack.writer (the #stack limit)) + (/registry.writer (the #registry limit)) )) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux index f2ead2686..4f42ccffc 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux @@ -1,26 +1,26 @@ (.using - [library - [lux {"-" Type for static} - [abstract - ["[0]" equivalence {"+" Equivalence}]] - [control - ["[0]" try {"+" Try} ("[1]#[0]" functor)]] - [data - [format - [binary {"+" Writer}]] - [collection - ["[0]" list ("[1]#[0]" functor mix)]]] - [math - [number - ["n" nat]]] - [type - abstract]]] - ["[0]" ///// "_" - [encoding - ["[1][0]" unsigned {"+" U1 U2}]] - ["[1][0]" type {"+" Type} - [category {"+" Method}] - ["[1]/[0]" parser]]]) + [library + [lux {"-" Type for static has} + [abstract + ["[0]" equivalence {"+" Equivalence}]] + [control + ["[0]" try {"+" Try} ("[1]#[0]" functor)]] + [data + [format + [binary {"+" Writer}]] + [collection + ["[0]" list ("[1]#[0]" functor mix)]]] + [math + [number + ["n" nat]]] + [type + abstract]]] + ["[0]" ///// "_" + [encoding + ["[1][0]" unsigned {"+" U1 U2}]] + ["[1][0]" type {"+" Type} + [category {"+" Method}] + ["[1]/[0]" parser]]]) (type: .public Register U1) diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux index 2235046e9..73966259f 100644 --- a/stdlib/source/library/lux/target/jvm/class.lux +++ b/stdlib/source/library/lux/target/jvm/class.lux @@ -130,7 +130,7 @@ (Writer Class) (`` ($_ binaryF#composite (~~ (template [<writer> <slot>] - [(<writer> (value@ <slot> class))] + [(<writer> (the <slot> class))] [//magic.writer #magic] [//version.writer #minor_version] @@ -140,7 +140,7 @@ [//index.writer #this] [//index.writer #super])) (~~ (template [<writer> <slot>] - [((binaryF.sequence/16 <writer>) (value@ <slot> class))] + [((binaryF.sequence/16 <writer>) (the <slot> class))] [//index.writer #interfaces] [//field.writer #fields] diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux index 494583650..ab2ef722c 100644 --- a/stdlib/source/library/lux/target/jvm/field.lux +++ b/stdlib/source/library/lux/target/jvm/field.lux @@ -52,7 +52,7 @@ (Writer Field) (`` ($_ binaryF#composite (~~ (template [<writer> <slot>] - [(<writer> (value@ <slot> field))] + [(<writer> (the <slot> field))] [modifier.writer #modifier] [//index.writer #name] diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux index c5011887a..264e6d475 100644 --- a/stdlib/source/library/lux/target/jvm/method.lux +++ b/stdlib/source/library/lux/target/jvm/method.lux @@ -74,7 +74,7 @@ (function (_ _) {try.#Failure error})) [environment exceptions instruction output] (//bytecode.resolve environment code) .let [bytecode (|> instruction //instruction.result format.instance)] - @code (//attribute.code [//code.#limit (value@ //environment.#limit environment) + @code (//attribute.code [//code.#limit (the //environment.#limit environment) //code.#code bytecode //code.#exception_table exceptions //code.#attributes (sequence.sequence)])] @@ -100,7 +100,7 @@ (Writer Method) (`` ($_ format#composite (~~ (template [<writer> <slot>] - [(<writer> (value@ <slot> field))] + [(<writer> (the <slot> field))] [//modifier.writer #modifier] [//index.writer #name] diff --git a/stdlib/source/library/lux/target/lua.lux b/stdlib/source/library/lux/target/lua.lux index c99893692..ed2e1087f 100644 --- a/stdlib/source/library/lux/target/lua.lux +++ b/stdlib/source/library/lux/target/lua.lux @@ -1,6 +1,6 @@ (.using [library - [lux {"-" Location Code Label int if function or and not let ^ local comment} + [lux {"-" Location Code Label int if function or and not let ^ local comment the} ["@" target] [abstract [equivalence {"+" Equivalence}] diff --git a/stdlib/source/library/lux/target/php.lux b/stdlib/source/library/lux/target/php.lux index f02eafd89..b23ac1b98 100644 --- a/stdlib/source/library/lux/target/php.lux +++ b/stdlib/source/library/lux/target/php.lux @@ -1,30 +1,30 @@ (.using - [library - [lux {"-" Location Code Global Label static int if cond or and not comment for try global} - ["@" target] - [abstract - [equivalence {"+" Equivalence}] - [hash {"+" Hash}] - ["[0]" enum]] - [control - [pipe {"+" case> cond> new>}] - [parser - ["<[0]>" code]]] - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor mix)]]] - [macro - [syntax {"+" syntax:}] - ["[0]" template] - ["[0]" code]] - [math - [number - ["n" nat] - ["f" frac]]] - [type - abstract]]]) + [library + [lux {"-" Location Code Global Label static int if cond or and not comment for try global the} + ["@" target] + [abstract + [equivalence {"+" Equivalence}] + [hash {"+" Hash}] + ["[0]" enum]] + [control + [pipe {"+" case> cond> new>}] + [parser + ["<[0]>" code]]] + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor mix)]]] + [macro + [syntax {"+" syntax:}] + ["[0]" template] + ["[0]" code]] + [math + [number + ["n" nat] + ["f" frac]]] + [type + abstract]]]) (def: input_separator ", ") (def: statement_suffix ";") @@ -486,10 +486,10 @@ (def: (catch except) (-> Except Text) - (let [declaration (format (:representation (value@ #class except)) - " " (:representation (value@ #exception except)))] + (let [declaration (format (:representation (.the #class except)) + " " (:representation (.the #exception except)))] (format "catch" (..group declaration) " " - (..block (:representation (value@ #handler except)))))) + (..block (:representation (.the #handler except)))))) (def: .public (try body! excepts) (-> Statement (List Except) Statement) diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux index bd3d68711..237baadd7 100644 --- a/stdlib/source/library/lux/target/python.lux +++ b/stdlib/source/library/lux/target/python.lux @@ -1,6 +1,6 @@ (.using [library - [lux {"-" Location Code not or and list if int comment exec try} + [lux {"-" Location Code not or and list if int comment exec try the} ["@" target] ["[0]" ffi] [abstract diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux index c197f6a64..b965a3296 100644 --- a/stdlib/source/library/lux/target/ruby.lux +++ b/stdlib/source/library/lux/target/ruby.lux @@ -1,6 +1,6 @@ (.using [library - [lux {"-" Location Code static int if function or and not comment local global symbol} + [lux {"-" Location Code static int if function or and not comment local global symbol the} ["@" target] [abstract [equivalence {"+" Equivalence}] @@ -233,11 +233,11 @@ (def: (block it) (-> Block Text) - (|> (format (|> (value@ #parameters it) + (|> (format (|> (.the #parameters it) (list#each (|>> :representation)) (text.interposed ..input_separator) (text.enclosed' "|")) - (..nested (:representation (value@ #body it)))) + (..nested (:representation (.the #body it)))) (text.enclosed ["{" "}"]))) (def: .public (apply/* arguments block func) diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux index f1ad798e7..5a90ecbe4 100644 --- a/stdlib/source/library/lux/target/scheme.lux +++ b/stdlib/source/library/lux/target/scheme.lux @@ -1,25 +1,25 @@ (.using - [library - [lux {"-" Code int or and if cond let symbol} - ["@" target] - [abstract - [equivalence {"+" Equivalence}] - [hash {"+" Hash}]] - [control - [pipe {"+" new> cond> case>}]] - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor monoid)]]] - [macro - ["[0]" template]] - [math - [number - ["n" nat] - ["f" frac]]] - [type - abstract]]]) + [library + [lux {"-" Code int or and if cond let symbol} + ["@" target] + [abstract + [equivalence {"+" Equivalence}] + [hash {"+" Hash}]] + [control + [pipe {"+" new> cond> case>}]] + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor monoid)]]] + [macro + ["[0]" template]] + [math + [number + ["n" nat] + ["f" frac]]] + [type + abstract]]]) ... Added the carriage return for better Windows compatibility. (def: \n+ @@ -345,7 +345,7 @@ (-> Var Arguments Expression Computation) (..form (list (..var "define") (|> arguments - (revised@ #mandatory (|>> {.#Item name})) + (revised #mandatory (|>> {.#Item name})) ..arguments) body))) diff --git a/stdlib/source/library/lux/test.lux b/stdlib/source/library/lux/test.lux index d9555ec44..ad817a70b 100644 --- a/stdlib/source/library/lux/test.lux +++ b/stdlib/source/library/lux/test.lux @@ -51,12 +51,12 @@ (def: (total parameter subject) (-> Tally Tally Tally) - [#successes (n.+ (value@ #successes parameter) (value@ #successes subject)) - #failures (n.+ (value@ #failures parameter) (value@ #failures subject)) - #expected_coverage (set.union (value@ #expected_coverage parameter) - (value@ #expected_coverage subject)) - #actual_coverage (set.union (value@ #actual_coverage parameter) - (value@ #actual_coverage subject))]) + [#successes (n.+ (the #successes parameter) (the #successes subject)) + #failures (n.+ (the #failures parameter) (the #failures subject)) + #expected_coverage (set.union (the #expected_coverage parameter) + (the #expected_coverage subject)) + #actual_coverage (set.union (the #actual_coverage parameter) + (the #actual_coverage subject))]) (def: start Tally @@ -68,7 +68,7 @@ (template [<name> <category>] [(def: <name> Tally - (revised@ <category> .++ ..start))] + (revised <category> .++ ..start))] [success_tally #successes] [failure_tally #failures] @@ -157,7 +157,7 @@ (def: failed? (-> Tally Bit) - (|>> (value@ #failures) (n.> 0))) + (|>> (the #failures) (n.> 0))) (def: (times_failure seed documentation) (-> Seed Text Text) @@ -187,20 +187,20 @@ (def: (description duration tally) (-> Duration Tally Text) - (let [successes (value@ #successes tally) - failures (value@ #failures tally) - missing (set.difference (value@ #actual_coverage tally) - (value@ #expected_coverage tally)) - unexpected (set.difference (value@ #expected_coverage tally) - (value@ #actual_coverage tally)) + (let [successes (the #successes tally) + failures (the #failures tally) + missing (set.difference (the #actual_coverage tally) + (the #expected_coverage tally)) + unexpected (set.difference (the #expected_coverage tally) + (the #actual_coverage tally)) report (: (-> (Set Symbol) Text) (|>> set.list (list.sorted (# symbol.order <)) (exception.listing %.symbol))) - expected_definitions_to_cover (set.size (value@ #expected_coverage tally)) + expected_definitions_to_cover (set.size (the #expected_coverage tally)) unexpected_definitions_covered (set.size unexpected) actual_definitions_covered (n.- unexpected_definitions_covered - (set.size (value@ #actual_coverage tally))) + (set.size (the #actual_coverage tally))) coverage (case expected_definitions_to_cover 0 "N/A" expected (let [missing_ratio (f./ (n.frac expected) @@ -260,7 +260,7 @@ (console.write_line report console))] <else>))] (async.future (# program.default exit - (case (value@ #failures tally) + (case (the #failures tally) 0 ..success_exit_code _ ..failure_exit_code))))) @@ -280,7 +280,7 @@ coverage (set.of_list symbol.hash coverage)] (|> (..assertion message condition) (async#each (function (_ [tally documentation]) - [(revised@ #actual_coverage (set.union coverage) tally) + [(revised #actual_coverage (set.union coverage) tally) documentation]))))) (def: (|cover| coverage condition) @@ -295,7 +295,7 @@ (text.interposed ..definition_separator)) coverage (set.of_list symbol.hash coverage)] (random#each (async#each (function (_ [tally documentation]) - [(revised@ #actual_coverage (set.union coverage) tally) + [(revised #actual_coverage (set.union coverage) tally) documentation])) (..context' context test)))) @@ -362,7 +362,7 @@ (let [coverage (..coverage module coverage)] (|> (..context' module test) (random#each (async#each (function (_ [tally documentation]) - [(revised@ #expected_coverage (set.union coverage) tally) + [(revised #expected_coverage (set.union coverage) tally) (|> documentation (text.replaced (format ..clean_up_marker module symbol.separator) "") (text.replaced ..clean_up_marker ""))])))))) diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/time.lux index 9a5b3ce93..debab4ab4 100644 --- a/stdlib/source/library/lux/time.lux +++ b/stdlib/source/library/lux/time.lux @@ -1,27 +1,27 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}] - [enum {"+" Enum}] - [codec {"+" Codec}] - [monad {"+" Monad do}]] - [control - [pipe {"+" case>}] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["<>" parser - ["<[0]>" text {"+" Parser}]]] - [data - ["[0]" text ("[1]#[0]" monoid)]] - [math - [number - ["n" nat ("[1]#[0]" decimal)]]] - [type - abstract]]] - [/ - ["[0]" duration {"+" Duration}]]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}] + [enum {"+" Enum}] + [codec {"+" Codec}] + [monad {"+" Monad do}]] + [control + [pipe {"+" case>}] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["<>" parser + ["<[0]>" text {"+" Parser}]]] + [data + ["[0]" text ("[1]#[0]" monoid)]] + [math + [number + ["n" nat ("[1]#[0]" decimal)]]] + [type + abstract]]] + [/ + ["[0]" duration {"+" Duration}]]) (template [<name> <singular> <plural>] [(def: .public <name> @@ -189,10 +189,10 @@ (def: .public (time clock) (-> Clock (Try Time)) (|> ($_ duration.merged - (duration.up (value@ #hour clock) duration.hour) - (duration.up (value@ #minute clock) duration.minute) - (duration.up (value@ #second clock) duration.second) - (duration.of_millis (.int (value@ #milli_second clock)))) + (duration.up (the #hour clock) duration.hour) + (duration.up (the #minute clock) duration.minute) + (duration.up (the #second clock) duration.second) + (duration.of_millis (.int (the #milli_second clock)))) duration.millis .nat ..of_millis)) diff --git a/stdlib/source/library/lux/time/date.lux b/stdlib/source/library/lux/time/date.lux index 6fcd9a73b..e32440153 100644 --- a/stdlib/source/library/lux/time/date.lux +++ b/stdlib/source/library/lux/time/date.lux @@ -1,32 +1,32 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}] - [enum {"+" Enum}] - [codec {"+" Codec}] - [monad {"+" do}]] - [control - ["[0]" maybe] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["<>" parser - ["<[0]>" text {"+" Parser}]]] - [data - ["[0]" text ("[1]#[0]" monoid)] - [collection - ["[0]" list ("[1]#[0]" mix)] - ["[0]" dictionary {"+" Dictionary}]]] - [math - [number - ["n" nat ("[1]#[0]" decimal)] - ["i" int]]] - [type - abstract]]] - ["[0]" // "_" - ["[1][0]" year {"+" Year}] - ["[1][0]" month {"+" Month}]]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}] + [enum {"+" Enum}] + [codec {"+" Codec}] + [monad {"+" do}]] + [control + ["[0]" maybe] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["<>" parser + ["<[0]>" text {"+" Parser}]]] + [data + ["[0]" text ("[1]#[0]" monoid)] + [collection + ["[0]" list ("[1]#[0]" mix)] + ["[0]" dictionary {"+" Dictionary}]]] + [math + [number + ["n" nat ("[1]#[0]" decimal)] + ["i" int]]] + [type + abstract]]] + ["[0]" // "_" + ["[1][0]" year {"+" Year}] + ["[1][0]" month {"+" Month}]]) (def: month_by_number (Dictionary Nat Month) @@ -95,7 +95,7 @@ (template [<name> <type> <field>] [(def: .public <name> (-> Date <type>) - (|>> :representation (value@ <field>)))] + (|>> :representation (the <field>)))] [year Year #year] [month Month #month] @@ -109,13 +109,13 @@ (let [reference (:representation reference) sample (:representation sample)] (and (# //year.equivalence = - (value@ #year reference) - (value@ #year sample)) + (the #year reference) + (the #year sample)) (# //month.equivalence = - (value@ #month reference) - (value@ #month sample)) - (n.= (value@ #day reference) - (value@ #day sample)))))) + (the #month reference) + (the #month sample)) + (n.= (the #day reference) + (the #day sample)))))) (implementation: .public order (Order Date) @@ -126,19 +126,19 @@ (let [reference (:representation reference) sample (:representation sample)] (or (# //year.order < - (value@ #year reference) - (value@ #year sample)) + (the #year reference) + (the #year sample)) (and (# //year.equivalence = - (value@ #year reference) - (value@ #year sample)) + (the #year reference) + (the #year sample)) (or (# //month.order < - (value@ #month reference) - (value@ #month sample)) + (the #month reference) + (the #month sample)) (and (# //month.order = - (value@ #month reference) - (value@ #month sample)) - (n.< (value@ #day reference) - (value@ #day sample))))))))) + (the #month reference) + (the #month sample)) + (n.< (the #day reference) + (the #day sample))))))))) ) (def: section_parser diff --git a/stdlib/source/library/lux/tool/compiler/default/init.lux b/stdlib/source/library/lux/tool/compiler/default/init.lux index 7f815abf9..48a1fb475 100644 --- a/stdlib/source/library/lux/tool/compiler/default/init.lux +++ b/stdlib/source/library/lux/tool/compiler/default/init.lux @@ -110,8 +110,8 @@ {.#Right [source' output]} (let [[location _] output] {try.#Success [[bundle (|> compiler - (with@ .#source source') - (with@ .#location location))] + (has .#source source') + (has .#location location))] [source' output]]})))) (type: (Operation a) @@ -128,13 +128,13 @@ (///directive.Operation anchor expression directive [Source (Payload directive)]))) (do ///phase.monad - [.let [module (value@ ///.#module input)] + [.let [module (the ///.#module input)] _ (///directive.set_current_module module)] (///directive.lifted_analysis (do [! ///phase.monad] [_ (moduleA.create hash module) _ (monad.each ! moduleA.import dependencies) - .let [source (///analysis.source (value@ ///.#module input) (value@ ///.#code input))] + .let [source (///analysis.source (the ///.#module input) (the ///.#code input))] _ (///analysis.set_source_code source)] (in [source [///generation.empty_buffer registry.empty]]))))) @@ -223,13 +223,13 @@ (def: (default_dependencies prelude input) (-> descriptor.Module ///.Input (List descriptor.Module)) (list& descriptor.runtime - (if (text#= prelude (value@ ///.#module input)) + (if (text#= prelude (the ///.#module input)) (list) (list prelude)))) (def: module_aliases (-> .Module Aliases) - (|>> (value@ .#module_aliases) (dictionary.of_list text.hash))) + (|>> (the .#module_aliases) (dictionary.of_list text.hash))) (def: .public (compiler wrapper expander prelude write_directive) (All (_ anchor expression directive) @@ -241,10 +241,10 @@ [///.#dependencies dependencies ///.#process (function (_ state archive) (do [! try.monad] - [.let [hash (text#hash (value@ ///.#code input))] + [.let [hash (text#hash (the ///.#code input))] [state [source buffer]] (<| (///phase.result' state) (..begin dependencies hash input)) - .let [module (value@ ///.#module input)]] + .let [module (the ///.#module input)]] (loop [iteration (<| (///phase.result' state) (..iteration wrapper archive expander module source buffer ///syntax.no_aliases))] (do ! @@ -255,7 +255,7 @@ [[state [analysis_module [final_buffer final_registry]]] (///phase.result' state (..end module)) .let [descriptor [descriptor.#hash hash descriptor.#name module - descriptor.#file (value@ ///.#file input) + descriptor.#file (the ///.#file input) descriptor.#references (set.of_list text.hash dependencies) descriptor.#state {.#Compiled}]]] (in [state @@ -271,7 +271,7 @@ (let [[temporary_buffer temporary_registry] temporary_payload] (in [state {.#Left [///.#dependencies (|> requirements - (value@ ///directive.#imports) + (the ///directive.#imports) (list#each product.left)) ///.#process (function (_ state archive) (again (<| (///phase.result' state) @@ -285,7 +285,7 @@ _ (///directive.lifted_generation (///generation.set_registry temporary_registry)) _ (|> requirements - (value@ ///directive.#referrals) + (the ///directive.#referrals) (monad.each ! (execute! archive))) temporary_payload (..get_current_payload temporary_payload)] (..iteration wrapper archive expander module source temporary_payload (..module_aliases analysis_module))))))]}])) diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux index 6aa9f8b77..1bccf29e7 100644 --- a/stdlib/source/library/lux/tool/compiler/default/platform.lux +++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux @@ -112,7 +112,7 @@ (All (_ <type_vars> document) (-> context.Context <Platform> module.ID (Key document) (Writer document) (archive.Entry document) (Async (Try Any)))) - (let [system (value@ #&file_system platform) + (let [system (the #&file_system platform) write_artifact! (: (-> [artifact.ID (Maybe Text) Binary] (Action Any)) (function (_ [artifact_id custom content]) (cache/artifact.cache! system context @module artifact_id content)))] @@ -120,22 +120,22 @@ [_ (: (Async (Try Any)) (cache/module.enable! async.monad system context @module)) _ (for [@.python (|> entry - (value@ archive.#output) + (the archive.#output) sequence.list (list.sub 128) (monad.each ! (monad.each ! write_artifact!)) (: (Action (List (List Any)))))] (|> entry - (value@ archive.#output) + (the archive.#output) sequence.list (monad.each ..monad write_artifact!) (: (Action (List Any))))) document (# async.monad in - (document.marked? key (value@ [archive.#module module.#document] entry)))] + (document.marked? key (the [archive.#module module.#document] entry)))] (|> [(|> entry - (value@ archive.#module) - (with@ module.#document document)) - (value@ archive.#registry entry)] + (the archive.#module) + (has module.#document document)) + (the archive.#registry entry)] (_.result (..writer format)) (cache/module.cache! system context @module))))) @@ -151,7 +151,7 @@ (-> <Platform> (///generation.Operation <type_vars> [Registry Output]))) (do ///phase.monad [_ ..initialize_buffer!] - (value@ #runtime platform))) + (the #runtime platform))) (def: runtime_descriptor Descriptor @@ -226,7 +226,7 @@ (All (_ <type_vars>) (-> Archive <Platform> <State+> (Try [<State+> ///phase.Wrapper]))) (|> archive - ((value@ #phase_wrapper platform)) + ((the #phase_wrapper platform)) ///directive.lifted_generation (///phase.result' state))) @@ -262,17 +262,17 @@ Import (List _io.Context) Configuration (Async (Try [<State+> Archive ///phase.Wrapper])))) (do [! (try.with async.monad)] - [.let [state (//init.state (value@ context.#host context) + [.let [state (//init.state (the context.#host context) module compilation_configuration expander host_analysis - (value@ #host platform) - (value@ #phase platform) + (the #host platform) + (the #phase platform) generation_bundle)] _ (: (Async (Try Any)) - (cache.enable! async.monad (value@ #&file_system platform) context)) - [archive analysis_state bundles] (ioW.thaw (list) compilation_configuration (value@ #host platform) (value@ #&file_system platform) context import compilation_sources) + (cache.enable! async.monad (the #&file_system platform) context)) + [archive analysis_state bundles] (ioW.thaw (list) compilation_configuration (the #host platform) (the #&file_system platform) context import compilation_sources) .let [with_missing_extensions (: (All (_ <type_vars>) (-> <Platform> (Program expression directive) <State+> @@ -306,11 +306,11 @@ (def: (module_compilation_log module) (All (_ <type_vars>) (-> descriptor.Module <State+> Text)) - (|>> (value@ [extension.#state - ///directive.#generation - ///directive.#state - extension.#state - ///generation.#log]) + (|>> (the [extension.#state + ///directive.#generation + ///directive.#state + extension.#state + ///generation.#log]) (sequence#mix (function (_ right left) (format left ..compilation_log_separator right)) module))) @@ -318,12 +318,12 @@ (def: with_reset_log (All (_ <type_vars>) (-> <State+> <State+>)) - (with@ [extension.#state - ///directive.#generation - ///directive.#state - extension.#state - ///generation.#log] - sequence.empty)) + (has [extension.#state + ///directive.#generation + ///directive.#state + extension.#state + ///generation.#log] + sequence.empty)) (def: empty (Set descriptor.Module) @@ -351,8 +351,8 @@ lens (dictionary.value module) (maybe.else ..empty)))) - transitive_depends_on (transitive_dependency (value@ #depends_on) import) - transitive_depended_by (transitive_dependency (value@ #depended_by) module) + transitive_depends_on (transitive_dependency (the #depends_on) import) + transitive_depended_by (transitive_dependency (the #depended_by) module) update_dependence (: (-> [descriptor.Module (Set descriptor.Module)] [descriptor.Module (Set descriptor.Module)] (-> Mapping Mapping)) (function (_ [source forward] [target backward]) @@ -366,14 +366,14 @@ with_dependence+transitives (set.list backward))))))] (|> dependence - (revised@ #depends_on - (update_dependence - [module transitive_depends_on] - [import transitive_depended_by])) - (revised@ #depended_by - ((function.flipped update_dependence) - [module transitive_depends_on] - [import transitive_depended_by]))))) + (revised #depends_on + (update_dependence + [module transitive_depends_on] + [import transitive_depended_by])) + (revised #depended_by + ((function.flipped update_dependence) + [module transitive_depends_on] + [import transitive_depended_by]))))) (def: (circular_dependency? module import dependence) (-> descriptor.Module descriptor.Module Dependence Bit) @@ -384,8 +384,8 @@ (dictionary.value from) (maybe.else ..empty))] (set.member? targets to))))] - (or (dependence? import (value@ #depends_on) module) - (dependence? module (value@ #depended_by) import)))) + (or (dependence? import (the #depends_on) module) + (dependence? module (the #depended_by) import)))) (exception: .public (module_cannot_import_itself [module descriptor.Module]) (exception.report @@ -444,8 +444,8 @@ (All (_ <type_vars>) (-> <State+> <State+> (Try <State+>))) (do try.monad - [inherited (with_extensions (value@ <path> from) (value@ <path> state))] - (in (with@ <path> inherited state))))] + [inherited (with_extensions (the <path> from) (the <path> state))] + (in (has <path> inherited state))))] [with_analysis_extensions [extension.#state ///directive.#analysis ///directive.#state extension.#bundle]] [with_synthesis_extensions [extension.#state ///directive.#synthesis ///directive.#state extension.#bundle]] @@ -593,7 +593,7 @@ (do ! [entry (archive.find module archive) lux_module (|> entry - (value@ [archive.#module module.#document]) + (the [archive.#module module.#document]) (document.content $.key))] (in [module lux_module]))) (archive.archived archive)) @@ -602,21 +602,21 @@ (set.of_list text.hash)) with_modules (: (All (_ <type_vars>) (-> <State+> <State+>)) - (revised@ [extension.#state - ///directive.#analysis - ///directive.#state - extension.#state] - (: (All (_ a) (-> a a)) - (function (_ analysis_state) - (|> analysis_state - (:as .Lux) - (revised@ .#modules (function (_ current) - (list#composite (list.only (|>> product.left - (set.member? additions) - not) - current) - modules))) - :expected)))))] + (revised [extension.#state + ///directive.#analysis + ///directive.#state + extension.#state] + (: (All (_ a) (-> a a)) + (function (_ analysis_state) + (|> analysis_state + (:as .Lux) + (revised .#modules (function (_ current) + (list#composite (list.only (|>> product.left + (set.member? additions) + not) + current) + modules))) + :expected)))))] state (monad.mix ! with_all_extensions state extended_states)] (in (with_modules state)))) @@ -687,7 +687,7 @@ (-> descriptor.Module Lux_Context (///.Compilation <State+> .Module Any) (Try [<State+> (Either (///.Compilation <State+> .Module Any) (archive.Entry Any))]))) - ((value@ ///.#process compilation) + ((the ///.#process compilation) ... TODO: The "///directive.set_current_module" below shouldn't be necessary. Remove it ASAP. ... TODO: The context shouldn't need to be re-set either. (|> (///directive.set_current_module module) @@ -700,7 +700,7 @@ (All (_ <type_vars>) (-> ///phase.Wrapper Expander <Platform> (///.Compiler <State+> .Module Any))) - (let [instancer (//init.compiler phase_wrapper expander syntax.prelude (value@ #write platform))] + (let [instancer (//init.compiler phase_wrapper expander syntax.prelude (the #write platform))] (instancer $.key (list)))) (def: (custom_compiler import context platform compilation_sources compiler @@ -716,10 +716,10 @@ all_dependencies (: (Set descriptor.Module) (set.of_list text.hash (list)))] (do [! (try.with async.monad)] - [.let [new_dependencies (value@ ///.#dependencies compilation) + [.let [new_dependencies (the ///.#dependencies compilation) [all_dependencies duplicates] (with_new_dependencies new_dependencies all_dependencies)] [archive _] (any|after_imports customs import! module duplicates new_dependencies archive)] - (case ((value@ ///.#process compilation) state archive) + (case ((the ///.#process compilation) state archive) {try.#Success [state more|done]} (case more|done {.#Left more} @@ -734,7 +734,7 @@ {.#Right entry} (do ! - [.let [entry (with@ [archive.#module module.#descriptor descriptor.#references] all_dependencies entry)] + [.let [entry (has [archive.#module module.#descriptor descriptor.#references] all_dependencies entry)] _ (..cache_module context platform @module custom_key custom_format entry)] (async#in (do try.monad [archive (archive.has module entry archive)] @@ -742,7 +742,7 @@ {try.#Failure error} (do ! - [_ (cache/archive.cache! (value@ #&file_system platform) context archive)] + [_ (cache/archive.cache! (the #&file_system platform) context archive)] (async#in {try.#Failure error}))))))) (def: (lux_compiler import context platform compilation_sources compiler compilation) @@ -756,7 +756,7 @@ all_dependencies (: (Set descriptor.Module) (set.of_list text.hash (list)))] (do [! (try.with async.monad)] - [.let [new_dependencies (value@ ///.#dependencies compilation) + [.let [new_dependencies (the ///.#dependencies compilation) [all_dependencies duplicates] (with_new_dependencies new_dependencies all_dependencies)] [archive state] (lux|after_imports customs import! module duplicates new_dependencies [archive state])] (case (next_compilation module [archive state] compilation) @@ -783,7 +783,7 @@ {.#Some console} (console.write_line report console))] <else>))) - .let [entry (with@ [archive.#module module.#descriptor descriptor.#references] all_dependencies entry)] + .let [entry (has [archive.#module module.#descriptor descriptor.#references] all_dependencies entry)] _ (..cache_module context platform @module $.key $.writer (:as (archive.Entry .Module) entry))] (async#in (do try.monad [archive (archive.has module entry archive)] @@ -792,7 +792,7 @@ {try.#Failure error} (do ! - [_ (cache/archive.cache! (value@ #&file_system platform) context archive)] + [_ (cache/archive.cache! (the #&file_system platform) context archive)] (async#in {try.#Failure error}))))))) (for [@.old (as_is (def: Fake_State @@ -814,11 +814,11 @@ Lux_Compiler)) (function (_ all_customs importer import! @module [archive lux_state] module) (do [! (try.with async.monad)] - [input (io.read (value@ #&file_system platform) + [input (io.read (the #&file_system platform) importer import compilation_sources - (value@ context.#host_module_extension context) + (the context.#host_module_extension context) module)] (loop [customs (for [@.old (:as (List (///.Custom Fake_State Fake_Document Fake_Object)) all_customs)] @@ -854,22 +854,22 @@ (def: (custom import! it) (All (_ <type_vars>) (-> Lux_Importer compiler.Compiler (Async (Try [Lux_Context (List Text) Any])))) - (let [/#definition (value@ compiler.#definition it) + (let [/#definition (the compiler.#definition it) [/#module /#name] /#definition] (do ..monad [context (import! (list) descriptor.runtime /#module) .let [[archive state] context - meta_state (value@ [extension.#state - ///directive.#analysis - ///directive.#state - extension.#state] - state)] + meta_state (the [extension.#state + ///directive.#analysis + ///directive.#state + extension.#state] + state)] [_ /#type /#value] (|> /#definition meta.export (meta.result meta_state) async#in)] (async#in (if (check.subsumes? ..Custom /#type) - {try.#Success [context (value@ compiler.#parameters it) /#value]} + {try.#Success [context (the compiler.#parameters it) /#value]} (exception.except ..invalid_custom_compiler [/#definition /#type])))))) (def: .public (compile lux_compiler phase_wrapper import file_context expander platform compilation context) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux index 650842124..1828747ab 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux @@ -252,10 +252,10 @@ (def: .public (with_source_code source action) (All (_ a) (-> Source (Operation a) (Operation a))) (function (_ [bundle state]) - (let [old_source (value@ .#source state)] - (.case (action [bundle (with@ .#source source state)]) + (let [old_source (the .#source state)] + (.case (action [bundle (has .#source source state)]) {try.#Success [[bundle' state'] output]} - {try.#Success [[bundle' (with@ .#source old_source state')] + {try.#Success [[bundle' (has .#source old_source state')] output]} failure @@ -263,8 +263,8 @@ (def: .public (with_current_module name) (All (_ a) (-> Text (Operation a) (Operation a))) - (extension.localized (value@ .#current_module) - (with@ .#current_module) + (extension.localized (the .#current_module) + (has .#current_module) (function.constant {.#Some name}))) (def: .public (with_location location action) @@ -272,10 +272,10 @@ (if (text#= "" (product.left location)) action (function (_ [bundle state]) - (let [old_location (value@ .#location state)] - (.case (action [bundle (with@ .#location location state)]) + (let [old_location (the .#location state)] + (.case (action [bundle (has .#location location state)]) {try.#Success [[bundle' state'] output]} - {try.#Success [[bundle' (with@ .#location old_location state')] + {try.#Success [[bundle' (has .#location old_location state')] output]} failure @@ -289,14 +289,14 @@ (def: .public (failure error) (-> Text Operation) (function (_ [bundle state]) - {try.#Failure (located (value@ .#location state) error)})) + {try.#Failure (located (the .#location state) error)})) (def: .public (of_try it) (All (_ a) (-> (Try a) (Operation a))) (function (_ [bundle state]) (.case it {try.#Failure error} - {try.#Failure (located (value@ .#location state) error)} + {try.#Failure (located (the .#location state) error)} {try.#Success it} {try.#Success [[bundle state] it]}))) @@ -318,7 +318,7 @@ (action bundle,state)) {try.#Failure error} (let [[bundle state] bundle,state] - {try.#Failure (located (value@ .#location state) error)}) + {try.#Failure (located (the .#location state) error)}) success success))) @@ -332,7 +332,7 @@ (template [<name> <type> <field> <value>] [(def: .public (<name> value) (-> <type> (Operation Any)) - (extension.update (with@ <field> <value>)))] + (extension.update (has <field> <value>)))] [set_source_code Source .#source value] [set_current_module Text .#current_module {.#Some value}] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux index a3084664d..39fcf63e7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/module.lux @@ -83,13 +83,13 @@ (do ///.monad [self_name meta.current_module_name] (function (_ state) - {try.#Success [(revised@ .#modules - (plist.revised self_name (revised@ .#imports (function (_ current) - (if (list.any? (text#= module) - current) - current - {.#Item module current})))) - state) + {try.#Success [(revised .#modules + (plist.revised self_name (revised .#imports (function (_ current) + (if (list.any? (text#= module) + current) + current + {.#Item module current})))) + state) []]})))) (def: .public (alias alias module) @@ -98,10 +98,10 @@ (do ///.monad [self_name meta.current_module_name] (function (_ state) - {try.#Success [(revised@ .#modules - (plist.revised self_name (revised@ .#module_aliases (: (-> (List [Text Text]) (List [Text Text])) - (|>> {.#Item [alias module]})))) - state) + {try.#Success [(revised .#modules + (plist.revised self_name (revised .#module_aliases (: (-> (List [Text Text]) (List [Text Text])) + (|>> {.#Item [alias module]})))) + state) []]})))) (def: .public (exists? module) @@ -109,7 +109,7 @@ (///extension.lifted (function (_ state) (|> state - (value@ .#modules) + (the .#modules) (plist.value module) (case> {.#Some _} #1 {.#None} #0) [state] {try.#Success})))) @@ -121,15 +121,15 @@ [self_name meta.current_module_name self meta.current_module] (function (_ state) - (case (plist.value name (value@ .#definitions self)) + (case (plist.value name (the .#definitions self)) {.#None} - {try.#Success [(revised@ .#modules - (plist.has self_name - (revised@ .#definitions - (: (-> (List [Text Global]) (List [Text Global])) - (|>> {.#Item [name definition]})) - self)) - state) + {try.#Success [(revised .#modules + (plist.has self_name + (revised .#definitions + (: (-> (List [Text Global]) (List [Text Global])) + (|>> {.#Item [name definition]})) + self)) + state) []]} {.#Some already_existing} @@ -140,9 +140,9 @@ (-> Nat Text (Operation Any)) (///extension.lifted (function (_ state) - {try.#Success [(revised@ .#modules - (plist.has name (..empty hash)) - state) + {try.#Success [(revised .#modules + (plist.has name (..empty hash)) + state) []]}))) (def: .public (with hash name action) @@ -159,15 +159,15 @@ (-> Text (Operation Any)) (///extension.lifted (function (_ state) - (case (|> state (value@ .#modules) (plist.value module_name)) + (case (|> state (the .#modules) (plist.value module_name)) {.#Some module} - (let [active? (case (value@ .#module_state module) + (let [active? (case (the .#module_state module) {.#Active} #1 _ #0)] (if active? - {try.#Success [(revised@ .#modules - (plist.has module_name (with@ .#module_state {<tag>} module)) - state) + {try.#Success [(revised .#modules + (plist.has module_name (has .#module_state {<tag>} module)) + state) []]} ((///extension.up (/.except ..can_only_change_state_of_active_module [module_name {<tag>}])) state))) @@ -180,10 +180,10 @@ (-> Text (Operation Bit)) (///extension.lifted (function (_ state) - (case (|> state (value@ .#modules) (plist.value module_name)) + (case (|> state (the .#modules) (plist.value module_name)) {.#Some module} {try.#Success [state - (case (value@ .#module_state module) + (case (the .#module_state module) {<tag>} #1 _ #0)]} diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/scope.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/scope.lux index d3187458a..42ccf412d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/scope.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/scope.lux @@ -32,13 +32,13 @@ (def: (local? name scope) (-> Text Scope Bit) (|> scope - (value@ [.#locals .#mappings]) + (the [.#locals .#mappings]) (plist.contains? name))) (def: (local name scope) (-> Text Scope (Maybe [Type Variable])) (|> scope - (value@ [.#locals .#mappings]) + (the [.#locals .#mappings]) (plist.value name) (maybe#each (function (_ [type value]) [type {variable.#Local value}])))) @@ -46,13 +46,13 @@ (def: (captured? name scope) (-> Text Scope Bit) (|> scope - (value@ [.#captured .#mappings]) + (the [.#captured .#mappings]) (plist.contains? name))) (def: (captured name scope) (-> Text Scope (Maybe [Type Variable])) (loop [idx 0 - mappings (value@ [.#captured .#mappings] scope)] + mappings (the [.#captured .#mappings] scope)] (case mappings {.#Item [_name [_source_type _source_ref]] mappings'} (if (text#= name _name) @@ -81,7 +81,7 @@ (extension.lifted (function (_ state) (let [[inner outer] (|> state - (value@ .#scopes) + (the .#scopes) (list.split_when (|>> (reference? name))))] (case outer {.#End} @@ -92,17 +92,17 @@ (..reference name top_outer)) [ref inner'] (list#mix (: (-> Scope [Variable (List Scope)] [Variable (List Scope)]) (function (_ scope ref+inner) - [{variable.#Foreign (value@ [.#captured .#counter] scope)} - {.#Item (revised@ .#captured - (: (-> Foreign Foreign) - (|>> (revised@ .#counter ++) - (revised@ .#mappings (plist.has name [ref_type (product.left ref+inner)])))) - scope) + [{variable.#Foreign (the [.#captured .#counter] scope)} + {.#Item (revised .#captured + (: (-> Foreign Foreign) + (|>> (revised .#counter ++) + (revised .#mappings (plist.has name [ref_type (product.left ref+inner)])))) + scope) (product.right ref+inner)}])) [init_ref {.#End}] (list.reversed inner)) scopes (list#composite inner' outer)] - {.#Right [(with@ .#scopes scopes state) + {.#Right [(has .#scopes scopes state) {.#Some [ref_type ref]}]}) ))))) @@ -112,23 +112,23 @@ (def: .public (with_local [name type] action) (All (_ a) (-> [Text Type] (Operation a) (Operation a))) (function (_ [bundle state]) - (case (value@ .#scopes state) + (case (the .#scopes state) {.#Item head tail} - (let [old_mappings (value@ [.#locals .#mappings] head) - new_var_id (value@ [.#locals .#counter] head) - new_head (revised@ .#locals - (: (-> Local Local) - (|>> (revised@ .#counter ++) - (revised@ .#mappings (plist.has name [type new_var_id])))) - head)] - (case (phase.result' [bundle (with@ .#scopes {.#Item new_head tail} state)] + (let [old_mappings (the [.#locals .#mappings] head) + new_var_id (the [.#locals .#counter] head) + new_head (revised .#locals + (: (-> Local Local) + (|>> (revised .#counter ++) + (revised .#mappings (plist.has name [type new_var_id])))) + head)] + (case (phase.result' [bundle (has .#scopes {.#Item new_head tail} state)] action) {try.#Success [[bundle' state'] output]} - (case (value@ .#scopes state') + (case (the .#scopes state') {.#Item head' tail'} - (let [scopes' {.#Item (with@ .#locals (value@ .#locals head) head') + (let [scopes' {.#Item (has .#locals (the .#locals head) head') tail'}] - {try.#Success [[bundle' (with@ .#scopes scopes' state')] + {try.#Success [[bundle' (has .#scopes scopes' state')] output]}) _ @@ -153,9 +153,9 @@ (def: .public (reset action) (All (_ a) (-> (Operation a) (Operation a))) (function (_ [bundle state]) - (case (action [bundle (with@ .#scopes (list ..empty) state)]) + (case (action [bundle (has .#scopes (list ..empty) state)]) {try.#Success [[bundle' state'] output]} - {try.#Success [[bundle' (with@ .#scopes (value@ .#scopes state) state')] + {try.#Success [[bundle' (has .#scopes (the .#scopes state) state')] output]} failure @@ -164,11 +164,11 @@ (def: .public (with action) (All (_ a) (-> (Operation a) (Operation [Scope a]))) (function (_ [bundle state]) - (case (action [bundle (revised@ .#scopes (|>> {.#Item ..empty}) state)]) + (case (action [bundle (revised .#scopes (|>> {.#Item ..empty}) state)]) {try.#Success [[bundle' state'] output]} - (case (value@ .#scopes state') + (case (the .#scopes state') {.#Item head tail} - {try.#Success [[bundle' (with@ .#scopes tail state')] + {try.#Success [[bundle' (has .#scopes tail state')] [head output]]} {.#End} @@ -181,14 +181,14 @@ (Operation Register) (extension.lifted (function (_ state) - (case (value@ .#scopes state) + (case (the .#scopes state) {.#Item top _} - {try.#Success [state (value@ [.#locals .#counter] top)]} + {try.#Success [state (the [.#locals .#counter] top)]} {.#End} (exception.except ..no_scope []))))) (def: .public environment (-> Scope (Environment Variable)) - (|>> (value@ [.#captured .#mappings]) + (|>> (the [.#captured .#mappings]) (list#each (function (_ [_ [_ ref]]) ref)))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux index e8f045d1e..f8002874f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/type.lux @@ -26,10 +26,10 @@ (def: .public (check action) (All (_ a) (-> (Check a) (Operation a))) - (function (_ (^@ stateE [bundle state])) - (case (action (value@ .#type_context state)) + (function (_ (^let stateE [bundle state])) + (case (action (the .#type_context state)) {try.#Success [context' output]} - {try.#Success [[bundle (with@ .#type_context context' state)] + {try.#Success [[bundle (has .#type_context context' state)] output]} {try.#Failure error} @@ -60,12 +60,12 @@ (def: .public (expecting expected) (All (_ a) (-> Type (Operation a) (Operation a))) - (extension.localized (value@ .#expected) (with@ .#expected) + (extension.localized (the .#expected) (has .#expected) (function.constant {.#Some expected}))) (def: .public fresh (All (_ a) (-> (Operation a) (Operation a))) - (extension.localized (value@ .#type_context) (with@ .#type_context) + (extension.localized (the .#type_context) (has .#type_context) (function.constant check.fresh_context))) (def: .public (inference actualT) @@ -78,8 +78,8 @@ ... [pre check.context ... it (check.check expectedT actualT) ... post check.context - ... .let [pre#var_counter (value@ .#var_counter pre)]] - ... (if (n.< (value@ .#var_counter post) + ... .let [pre#var_counter (the .#var_counter pre)]] + ... (if (n.< (the .#var_counter post) ... pre#var_counter) ... (do ! ... [.let [new! (: (-> [Nat (Maybe Type)] (Maybe Nat)) @@ -88,7 +88,7 @@ ... {.#Some id} ... {.#None}))) ... new_vars (|> post - ... (value@ .#var_bindings) + ... (the .#var_bindings) ... (list.all new!))] ... _ (monad.each ! (function (_ @new) ... (do ! diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux index 94b7a7894..d9bf832a3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux @@ -52,8 +52,8 @@ (def: .public (merge_requirements left right) (-> Requirements Requirements Requirements) - [#imports (list#composite (value@ #imports left) (value@ #imports right)) - #referrals (list#composite (value@ #referrals left) (value@ #referrals right))]) + [#imports (list#composite (the #imports left) (the #imports right)) + #referrals (list#composite (the #referrals left) (the #referrals right))]) (template [<special> <general>] [(type: .public (<special> anchor expression directive) @@ -71,7 +71,7 @@ (All (_ anchor expression directive) (Operation anchor expression directive <phase>)) (function (_ [bundle state]) - {try.#Success [[bundle state] (value@ [<component> ..#phase] state)]}))] + {try.#Success [[bundle state] (the [<component> ..#phase] state)]}))] [analysis ..#analysis analysis.Phase] [synthesis ..#synthesis synthesis.Phase] @@ -83,8 +83,8 @@ (All (_ anchor expression directive output) (-> (<operation> output) (Operation anchor expression directive output))) - (|>> (phase.sub [(value@ [<component> ..#state]) - (with@ [<component> ..#state])]) + (|>> (phase.sub [(the [<component> ..#state]) + (has [<component> ..#state])]) extension.lifted))] [lifted_analysis ..#analysis analysis.Operation] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux index 2953b2886..e439110f9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux @@ -124,9 +124,9 @@ (All (_ anchor expression directive output) <with_type>) (function (_ body) (function (_ [bundle state]) - (case (body [bundle (with@ <tag> {.#Some <with_value>} state)]) + (case (body [bundle (has <tag> {.#Some <with_value>} state)]) {try.#Success [[bundle' state'] output]} - {try.#Success [[bundle' (with@ <tag> (value@ <tag> state) state')] + {try.#Success [[bundle' (has <tag> (the <tag> state) state')] output]} {try.#Failure error} @@ -135,8 +135,8 @@ (def: .public <get> (All (_ anchor expression directive) (Operation anchor expression directive <get_type>)) - (function (_ (^@ stateE [bundle state])) - (case (value@ <tag> state) + (function (_ (^let stateE [bundle state])) + (case (the <tag> state) {.#Some output} {try.#Success [stateE output]} @@ -147,7 +147,7 @@ (All (_ anchor expression directive) (-> <get_type> (Operation anchor expression directive Any))) (function (_ [bundle state]) - {try.#Success [[bundle (with@ <tag> {.#Some value} state)] + {try.#Success [[bundle (has <tag> {.#Some value} state)] []]}))] [#anchor @@ -168,22 +168,22 @@ (def: .public get_registry (All (_ anchor expression directive) (Operation anchor expression directive Registry)) - (function (_ (^@ stateE [bundle state])) - {try.#Success [stateE (value@ #registry state)]})) + (function (_ (^let stateE [bundle state])) + {try.#Success [stateE (the #registry state)]})) (def: .public (set_registry value) (All (_ anchor expression directive) (-> Registry (Operation anchor expression directive Any))) (function (_ [bundle state]) - {try.#Success [[bundle (with@ #registry value state)] + {try.#Success [[bundle (has #registry value state)] []]})) (def: .public next (All (_ anchor expression directive) (Operation anchor expression directive Nat)) (do phase.monad - [count (extension.read (value@ #counter)) - _ (extension.update (revised@ #counter ++))] + [count (extension.read (the #counter)) + _ (extension.update (revised #counter ++))] (in count))) (def: .public (symbol prefix) @@ -194,18 +194,18 @@ (def: .public (enter_module module) (All (_ anchor expression directive) (-> descriptor.Module (Operation anchor expression directive Any))) - (extension.update (with@ #module module))) + (extension.update (has #module module))) (def: .public module (All (_ anchor expression directive) (Operation anchor expression directive descriptor.Module)) - (extension.read (value@ #module))) + (extension.read (the #module))) (def: .public (evaluate! label code) (All (_ anchor expression directive) (-> unit.ID [(Maybe unit.ID) expression] (Operation anchor expression directive Any))) - (function (_ (^@ state+ [bundle state])) - (case (# (value@ #host state) evaluate label code) + (function (_ (^let state+ [bundle state])) + (case (# (the #host state) evaluate label code) {try.#Success output} {try.#Success [state+ output]} @@ -215,8 +215,8 @@ (def: .public (execute! code) (All (_ anchor expression directive) (-> directive (Operation anchor expression directive Any))) - (function (_ (^@ state+ [bundle state])) - (case (# (value@ #host state) execute code) + (function (_ (^let state+ [bundle state])) + (case (# (the #host state) execute code) {try.#Success output} {try.#Success [state+ output]} @@ -226,8 +226,8 @@ (def: .public (define! context custom code) (All (_ anchor expression directive) (-> unit.ID (Maybe Text) [(Maybe unit.ID) expression] (Operation anchor expression directive [Text Any directive]))) - (function (_ (^@ stateE [bundle state])) - (case (# (value@ #host state) define context custom code) + (function (_ (^let stateE [bundle state])) + (case (# (the #host state) define context custom code) {try.#Success output} {try.#Success [stateE output]} @@ -238,13 +238,13 @@ (All (_ anchor expression directive) (-> artifact.ID (Maybe Text) directive (Operation anchor expression directive Any))) (do [! phase.monad] - [?buffer (extension.read (value@ #buffer))] + [?buffer (extension.read (the #buffer))] (case ?buffer {.#Some buffer} ... TODO: Optimize by no longer checking for overwrites... (if (sequence.any? (|>> product.left (n.= artifact_id)) buffer) (phase.except ..cannot_overwrite_output [artifact_id]) - (extension.update (with@ #buffer {.#Some (sequence.suffix [artifact_id custom code] buffer)}))) + (extension.update (has #buffer {.#Some (sequence.suffix [artifact_id custom code] buffer)}))) {.#None} (phase.except ..no_buffer_for_saving_code [artifact_id])))) @@ -253,9 +253,9 @@ [(`` (def: .public (<name> it (~~ (template.spliced <inputs>)) dependencies) (All (_ anchor expression directive) (-> <type> (~~ (template.spliced <input_types>)) (Set unit.ID) (Operation anchor expression directive artifact.ID))) - (function (_ (^@ stateE [bundle state])) - (let [[id registry'] (<artifact> it <mandatory?> dependencies (value@ #registry state))] - {try.#Success [[bundle (with@ #registry registry' state)] + (function (_ (^let stateE [bundle state])) + (let [[id registry'] (<artifact> it <mandatory?> dependencies (the #registry state))] + {try.#Success [[bundle (has #registry registry' state)] id]}))))] [category.Definition mandatory? [mandatory?] [Bit] learn registry.definition] @@ -276,12 +276,12 @@ (def: .public (remember archive name) (All (_ anchor expression directive) (-> Archive Symbol (Operation anchor expression directive unit.ID))) - (function (_ (^@ stateE [bundle state])) + (function (_ (^let stateE [bundle state])) (let [[_module _name] name] (do try.monad [@module (archive.id _module archive) - registry (if (text#= (value@ #module state) _module) - {try.#Success (value@ #registry state)} + registry (if (text#= (the #module state) _module) + {try.#Success (the #registry state)} (do try.monad [[_module output registry] (archive.find _module archive)] {try.#Success registry}))] @@ -295,12 +295,12 @@ (def: .public (definition archive name) (All (_ anchor expression directive) (-> Archive Symbol (Operation anchor expression directive [unit.ID (Maybe category.Definition)]))) - (function (_ (^@ stateE [bundle state])) + (function (_ (^let stateE [bundle state])) (let [[_module _name] name] (do try.monad [@module (archive.id _module archive) - registry (if (text#= (value@ #module state) _module) - {try.#Success (value@ #registry state)} + registry (if (text#= (the #module state) _module) + {try.#Success (the #registry state)} (do try.monad [[_module output registry] (archive.find _module archive)] {try.#Success registry}))] @@ -316,7 +316,7 @@ (def: .public (module_id module archive) (All (_ anchor expression directive) (-> descriptor.Module Archive (Operation anchor expression directive module.ID))) - (function (_ (^@ stateE [bundle state])) + (function (_ (^let stateE [bundle state])) (do try.monad [@module (archive.id module archive)] (in [stateE @module])))) @@ -324,14 +324,14 @@ (def: .public (context archive) (All (_ anchor expression directive) (-> Archive (Operation anchor expression directive unit.ID))) - (function (_ (^@ stateE [bundle state])) - (case (value@ #context state) + (function (_ (^let stateE [bundle state])) + (case (the #context state) {.#None} (exception.except ..no_context []) {.#Some id} (do try.monad - [@module (archive.id (value@ #module state) archive)] + [@module (archive.id (the #module state) archive)] (in [stateE [@module id]]))))) (def: .public (with_context @artifact body) @@ -341,8 +341,8 @@ (Operation anchor expression directive a))) (function (_ [bundle state]) (do try.monad - [[[bundle' state'] output] (body [bundle (with@ #context {.#Some @artifact} state)])] - (in [[bundle' (with@ #context (value@ #context state) state')] + [[[bundle' state'] output] (body [bundle (has #context {.#Some @artifact} state)])] + (in [[bundle' (has #context (the #context state) state')] output])))) (def: .public (with_registry_shift shift body) @@ -352,24 +352,24 @@ (Operation anchor expression directive a))) (function (_ [bundle state]) (do try.monad - [[[bundle' state'] output] (body [bundle (with@ #registry_shift shift state)])] - (in [[bundle' (with@ #registry_shift (value@ #registry_shift state) state')] + [[[bundle' state'] output] (body [bundle (has #registry_shift shift state)])] + (in [[bundle' (has #registry_shift (the #registry_shift state) state')] output])))) (def: .public (with_new_context archive dependencies body) (All (_ anchor expression directive a) (-> Archive (Set unit.ID) (Operation anchor expression directive a) (Operation anchor expression directive [unit.ID a]))) - (function (_ (^@ stateE [bundle state])) - (let [[@artifact registry'] (registry.resource false dependencies (value@ #registry state)) - @artifact (n.+ @artifact (value@ #registry_shift state))] + (function (_ (^let stateE [bundle state])) + (let [[@artifact registry'] (registry.resource false dependencies (the #registry state)) + @artifact (n.+ @artifact (the #registry_shift state))] (do try.monad [[[bundle' state'] output] (body [bundle (|> state - (with@ #registry registry') - (with@ #context {.#Some @artifact}) - (revised@ #interim_artifacts (|>> {.#Item @artifact})))]) - @module (archive.id (value@ #module state) archive)] - (in [[bundle' (with@ #context (value@ #context state) state')] + (has #registry registry') + (has #context {.#Some @artifact}) + (revised #interim_artifacts (|>> {.#Item @artifact})))]) + @module (archive.id (the #module state) archive)] + (in [[bundle' (has #context (the #context state) state')] [[@module @artifact] output]]))))) @@ -378,7 +378,7 @@ (-> Text (Operation anchor expression directive Any))) (function (_ [bundle state]) {try.#Success [[bundle - (revised@ #log (sequence.suffix message) state)] + (revised #log (sequence.suffix message) state)] []]})) (def: .public (with_interim_artifacts archive body) @@ -386,12 +386,12 @@ (-> Archive (Operation anchor expression directive a) (Operation anchor expression directive [(List unit.ID) a]))) (do phase.monad - [module (extension.read (value@ #module))] + [module (extension.read (the #module))] (function (_ state+) (do try.monad [@module (archive.id module archive) [[bundle' state'] output] (body state+)] (in [[bundle' - (with@ #interim_artifacts (list) state')] - [(list#each (|>> [@module]) (value@ #interim_artifacts state')) + (has #interim_artifacts (list) state')] + [(list#each (|>> [@module]) (the #interim_artifacts state')) output]]))))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux index 7b24ab177..f38a33f0d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux @@ -48,7 +48,7 @@ {.#Definition [exported? actualT _]} (do ! [_ (/type.inference actualT) - (^@ def_name [::module ::name]) (///extension.lifted (meta.normal def_name)) + (^let def_name [::module ::name]) (///extension.lifted (meta.normal def_name)) current (///extension.lifted meta.current_module_name)] (if (text#= current ::module) <return> @@ -63,7 +63,7 @@ {.#Type [exported? value labels]} (do ! [_ (/type.inference .Type) - (^@ def_name [::module ::name]) (///extension.lifted (meta.normal def_name)) + (^let def_name [::module ::name]) (///extension.lifted (meta.normal def_name)) current (///extension.lifted meta.current_module_name)] (if (text#= current ::module) <return> diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux index 670b54765..f5be4859f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux @@ -82,13 +82,13 @@ (do [! //.monad] [state //.state .let [compiler_eval (meta_eval archive - (value@ [//extension.#state /.#analysis /.#state //extension.#bundle] state) + (the [//extension.#state /.#analysis /.#state //extension.#bundle] state) (evaluation.evaluator expander - (value@ [//extension.#state /.#synthesis /.#state] state) - (value@ [//extension.#state /.#generation /.#state] state) - (value@ [//extension.#state /.#generation /.#phase] state))) + (the [//extension.#state /.#synthesis /.#state] state) + (the [//extension.#state /.#generation /.#state] state) + (the [//extension.#state /.#generation /.#phase] state))) extension_eval (:as Eval (wrapper (:expected compiler_eval)))] - _ (//.with (with@ [//extension.#state /.#analysis /.#state //extension.#state .#eval] extension_eval state))] + _ (//.with (has [//extension.#state /.#analysis /.#state //extension.#state .#eval] extension_eval state))] (case code (^ [_ {.#Form (list& [_ {.#Text name}] inputs)}]) (//extension.apply archive again [name inputs]) @@ -116,7 +116,7 @@ (case expansion (^ (list& <lux_def_module> referrals)) (|> (again archive <lux_def_module>) - (# ! each (revised@ /.#referrals (list#composite referrals)))) + (# ! each (revised /.#referrals (list#composite referrals)))) _ (..requiring again archive expansion))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux index 0f1848eff..b4e91c905 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux @@ -117,7 +117,7 @@ (def: .public (apply archive phase [name parameters]) (All (_ s i o) (-> Archive (Phase s i o) (Extension i) (Operation s i o o))) - (function (_ (^@ stateE [bundle state])) + (function (_ (^let stateE [bundle state])) (case (dictionary.value name bundle) {.#Some handler} (((handler name phase) archive parameters) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux index 3374c4ba4..a69d511f3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux @@ -894,9 +894,9 @@ selfT {.#Primitive name (list#each product.right parameters)}] state (extension.lifted phase.state) methods (monad.each ! (..method_definition archive super interfaces [mapping selfT] - [(value@ [directive.#analysis directive.#phase] state) - (value@ [directive.#synthesis directive.#phase] state) - (value@ [directive.#generation directive.#phase] state)]) + [(the [directive.#analysis directive.#phase] state) + (the [directive.#synthesis directive.#phase] state) + (the [directive.#generation directive.#phase] state)]) methods) .let [all_dependencies (cache.all (list#each product.left methods))] bytecode (<| (# ! each (format.result class.writer)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux index 889d400b0..3680787de 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux @@ -99,9 +99,9 @@ (-> Archive Type Code (Operation anchor expression directive [Type expression Any]))) (do phase.monad [state (///.lifted phase.state) - .let [analyse (value@ [/////directive.#analysis /////directive.#phase] state) - synthesize (value@ [/////directive.#synthesis /////directive.#phase] state) - generate (value@ [/////directive.#generation /////directive.#phase] state)] + .let [analyse (the [/////directive.#analysis /////directive.#phase] state) + synthesize (the [/////directive.#synthesis /////directive.#phase] state) + generate (the [/////directive.#generation /////directive.#phase] state)] [_ codeA] (<| /////directive.lifted_analysis scope.with typeA.fresh @@ -145,9 +145,9 @@ (Operation anchor expression directive [Type expression Any]))) (do [! phase.monad] [state (///.lifted phase.state) - .let [analyse (value@ [/////directive.#analysis /////directive.#phase] state) - synthesize (value@ [/////directive.#synthesis /////directive.#phase] state) - generate (value@ [/////directive.#generation /////directive.#phase] state)] + .let [analyse (the [/////directive.#analysis /////directive.#phase] state) + synthesize (the [/////directive.#synthesis /////directive.#phase] state) + generate (the [/////directive.#generation /////directive.#phase] state)] [_ code//type codeA] (/////directive.lifted_analysis (scope.with (typeA.fresh @@ -198,9 +198,9 @@ (Operation anchor expression directive [expression Any]))) (do phase.monad [state (///.lifted phase.state) - .let [analyse (value@ [/////directive.#analysis /////directive.#phase] state) - synthesize (value@ [/////directive.#synthesis /////directive.#phase] state) - generate (value@ [/////directive.#generation /////directive.#phase] state)] + .let [analyse (the [/////directive.#analysis /////directive.#phase] state) + synthesize (the [/////directive.#synthesis /////directive.#phase] state) + generate (the [/////directive.#generation /////directive.#phase] state)] [_ codeA] (<| /////directive.lifted_analysis scope.with typeA.fresh @@ -223,17 +223,17 @@ (do phase.monad [[bundle state] phase.state .let [eval (/////analysis/evaluation.evaluator expander - (value@ [/////directive.#synthesis /////directive.#state] state) - (value@ [/////directive.#generation /////directive.#state] state) - (value@ [/////directive.#generation /////directive.#phase] state)) - previous_analysis_extensions (value@ [/////directive.#analysis /////directive.#state ///.#bundle] state)]] + (the [/////directive.#synthesis /////directive.#state] state) + (the [/////directive.#generation /////directive.#state] state) + (the [/////directive.#generation /////directive.#phase] state)) + previous_analysis_extensions (the [/////directive.#analysis /////directive.#state ///.#bundle] state)]] (phase.with [bundle - (revised@ [/////directive.#analysis /////directive.#state] - (: (-> /////analysis.State+ /////analysis.State+) - (|>> product.right - [(|> previous_analysis_extensions - (dictionary.merged (///analysis.bundle eval host_analysis)))])) - state)]))) + (revised [/////directive.#analysis /////directive.#state] + (: (-> /////analysis.State+ /////analysis.State+) + (|>> product.right + [(|> previous_analysis_extensions + (dictionary.merged (///analysis.bundle eval host_analysis)))])) + state)]))) (def: (announce_definition! short type) (All (_ anchor expression directive) @@ -369,8 +369,8 @@ (function (_ extension_name phase archive [alias def_name]) (do phase.monad [_ (///.lifted - (phase.sub [(value@ [/////directive.#analysis /////directive.#state]) - (with@ [/////directive.#analysis /////directive.#state])] + (phase.sub [(the [/////directive.#analysis /////directive.#state]) + (has [/////directive.#analysis /////directive.#state])] (define_alias alias def_name)))] (in /////directive.no_requirements)))])) @@ -522,9 +522,9 @@ (^ (list programC)) (do phase.monad [state (///.lifted phase.state) - .let [analyse (value@ [/////directive.#analysis /////directive.#phase] state) - synthesize (value@ [/////directive.#synthesis /////directive.#phase] state) - generate (value@ [/////directive.#generation /////directive.#phase] state)] + .let [analyse (the [/////directive.#analysis /////directive.#phase] state) + synthesize (the [/////directive.#synthesis /////directive.#phase] state) + generate (the [/////directive.#generation /////directive.#phase] state)] programS (prepare_program archive analyse synthesize programC) current_module (/////directive.lifted_analysis (///.lifted meta.current_module_name)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux index 0f063ea82..09ab89d42 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux @@ -1,39 +1,39 @@ (.using - [library - [lux {"-" case let if} - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" exception {"+" exception:}]] - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor mix monoid)] - ["[0]" set]]] - [math - [number - ["n" nat]]] - [target - ["_" common_lisp {"+" Expression Var/1}]]]] - ["[0]" // "_" - ["[1][0]" runtime {"+" Operation Phase Generator}] + [library + [lux {"-" case let if} + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" exception {"+" exception:}]] + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor mix monoid)] + ["[0]" set]]] + [math + [number + ["n" nat]]] + [target + ["_" common_lisp {"+" Expression Var/1}]]]] + ["[0]" // "_" + ["[1][0]" runtime {"+" Operation Phase Generator}] + ["[1][0]" reference] + ["[1][0]" primitive] + ["/[1]" // "_" ["[1][0]" reference] - ["[1][0]" primitive] ["/[1]" // "_" - ["[1][0]" reference] + ["[1][0]" synthesis "_" + ["[1]/[0]" case]] ["/[1]" // "_" - ["[1][0]" synthesis "_" - ["[1]/[0]" case]] - ["/[1]" // "_" - ["[1][0]" synthesis {"+" Member Synthesis Path}] - ["[1][0]" generation] - ["//[1]" /// "_" - [reference - ["[1][0]" variable {"+" Register}]] - ["[1][0]" phase ("[1]#[0]" monad)] - [meta - [archive {"+" Archive}]]]]]]]) + ["[1][0]" synthesis {"+" Member Synthesis Path}] + ["[1][0]" generation] + ["//[1]" /// "_" + [reference + ["[1][0]" variable {"+" Register}]] + ["[1][0]" phase ("[1]#[0]" monad)] + [meta + [archive {"+" Archive}]]]]]]]) (def: .public register (-> Register Var/1) @@ -248,7 +248,7 @@ pattern_matching! (pattern_matching $output expression archive pathP) .let [storage (|> pathP ////synthesis/case.storage - (value@ ////synthesis/case.#bindings) + (the ////synthesis/case.#bindings) set.list (list#each (function (_ register) [(..register register) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux index 4a5ee59f0..c90729050 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux @@ -97,9 +97,9 @@ (do ///////phase.monad [valueO (expression archive valueS)] (in (list#mix (function (_ side source) - (.let [method (.if (value@ member.#right? side) - (//runtime.tuple//right (_.i32 (.int (value@ member.#lefts side)))) - (//runtime.tuple//left (_.i32 (.int (value@ member.#lefts side)))))] + (.let [method (.if (the member.#right? side) + (//runtime.tuple//right (_.i32 (.int (the member.#lefts side)))) + (//runtime.tuple//left (_.i32 (.int (the member.#lefts side)))))] (method source))) valueO (list.reversed pathP))))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux index 325700c72..6504a5f55 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux @@ -300,9 +300,9 @@ (do phase.monad [record! (phase archive recordS)] (in (list#mix (function (_ step so_far!) - (.let [next! (.if (value@ member.#right? step) - (..right_projection (value@ member.#lefts step)) - (..left_projection (value@ member.#lefts step)))] + (.let [next! (.if (the member.#right? step) + (..right_projection (the member.#lefts step)) + (..left_projection (the member.#lefts step)))] ($_ _.composite so_far! next!))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux index 1ad5f6df6..7e879516a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux @@ -83,9 +83,9 @@ (do ///////phase.monad [valueO (expression archive valueS)] (in (list#mix (function (_ side source) - (.let [method (.if (value@ member.#right? side) - (//runtime.tuple//right (_.int (.int (value@ member.#lefts side)))) - (//runtime.tuple//left (_.int (.int (value@ member.#lefts side)))))] + (.let [method (.if (the member.#right? side) + (//runtime.tuple//right (_.int (.int (the member.#lefts side)))) + (//runtime.tuple//left (_.int (.int (the member.#lefts side)))))] (method source))) valueO (list.reversed pathP))))) @@ -271,7 +271,7 @@ (def: .public dependencies (-> Path (List Var)) (|>> ////synthesis/case.storage - (value@ ////synthesis/case.#dependencies) + (the ////synthesis/case.#dependencies) set.list (list#each (function (_ variable) (.case variable diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux index d65c81d6a..54685bfff 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux @@ -1,38 +1,38 @@ (.using - [library - [lux {"-" case let if} - [abstract - ["[0]" monad {"+" do}]] - [data - ["[0]" product] - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor mix)] - ["[0]" set]]] - [math - [number - ["i" int]]] - [target - ["_" php {"+" Expression Var Statement}]]]] - ["[0]" // "_" - ["[1][0]" runtime {"+" Operation Phase Phase! Generator Generator!}] + [library + [lux {"-" case let if} + [abstract + ["[0]" monad {"+" do}]] + [data + ["[0]" product] + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor mix)] + ["[0]" set]]] + [math + [number + ["i" int]]] + [target + ["_" php {"+" Expression Var Statement}]]]] + ["[0]" // "_" + ["[1][0]" runtime {"+" Operation Phase Phase! Generator Generator!}] + ["[1][0]" reference] + ["[1][0]" primitive] + ["/[1]" // "_" ["[1][0]" reference] - ["[1][0]" primitive] ["/[1]" // "_" - ["[1][0]" reference] + ["[1][0]" synthesis "_" + ["[1]/[0]" case]] ["/[1]" // "_" - ["[1][0]" synthesis "_" - ["[1]/[0]" case]] - ["/[1]" // "_" - ["[1][0]" synthesis {"+" Member Synthesis Path}] - ["[1][0]" generation] - ["//[1]" /// "_" - [reference - ["[1][0]" variable {"+" Register}]] - ["[1][0]" phase ("[1]#[0]" monad)] - [meta - [archive {"+" Archive}]]]]]]]) + ["[1][0]" synthesis {"+" Member Synthesis Path}] + ["[1][0]" generation] + ["//[1]" /// "_" + [reference + ["[1][0]" variable {"+" Register}]] + ["[1][0]" phase ("[1]#[0]" monad)] + [meta + [archive {"+" Archive}]]]]]]]) (def: .public register (-> Register Var) @@ -260,7 +260,7 @@ (def: .public dependencies (-> Path (List Var)) (|>> ////synthesis/case.storage - (value@ ////synthesis/case.#dependencies) + (the ////synthesis/case.#dependencies) set.list (list#each (function (_ variable) (.case variable diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux index 8b10f2833..bfb3ebdc8 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux @@ -110,10 +110,10 @@ (do ///////phase.monad [valueO (expression archive valueS)] (in (list#mix (function (_ side source) - (.let [method (.if (value@ member.#right? side) + (.let [method (.if (the member.#right? side) //runtime.tuple::right //runtime.tuple::left)] - (method (_.int (.int (value@ member.#lefts side))) + (method (_.int (.int (the member.#lefts side))) source))) valueO (list.reversed pathP))))) @@ -320,7 +320,7 @@ (def: .public dependencies (-> Path (List SVar)) (|>> case.storage - (value@ case.#dependencies) + (the case.#dependencies) set.list (list#each (function (_ variable) (.case variable diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux index ec725005a..d4abe4b2b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux @@ -111,9 +111,9 @@ (do ///////phase.monad [valueO (expression archive valueS)] (in (list#mix (function (_ side source) - (.let [method (.if (value@ member.#right? side) - (//runtime.tuple//right (_.int (.int (value@ member.#lefts side)))) - (//runtime.tuple//left (_.int (.int (value@ member.#lefts side)))))] + (.let [method (.if (the member.#right? side) + (//runtime.tuple//right (_.int (.int (the member.#lefts side)))) + (//runtime.tuple//left (_.int (.int (the member.#lefts side)))))] (method source))) valueO (list.reversed pathP))))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux index d711e963a..ae74e45f3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux @@ -62,8 +62,8 @@ (case structure {///complex.#Variant variant} (do phase.monad - [valueS (optimization' (value@ ///complex.#value variant))] - (in (/.variant (with@ ///complex.#value valueS variant)))) + [valueS (optimization' (the ///complex.#value variant))] + (in (/.variant (has ///complex.#value valueS variant)))) {///complex.#Tuple tuple} (|> tuple diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux index ebab6fe8a..1bf6357f7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux @@ -371,8 +371,8 @@ path_storage (^ (/.path/bind register)) - (revised@ #bindings (set.has register) - path_storage) + (revised #bindings (set.has register) + path_storage) {/.#Bit_Fork _ default otherwise} (|> (case otherwise @@ -410,12 +410,12 @@ (list#mix for_synthesis synthesis_storage members) {/.#Reference {///reference.#Variable {///reference/variable.#Local register}}} - (if (set.member? (value@ #bindings synthesis_storage) register) + (if (set.member? (the #bindings synthesis_storage) register) synthesis_storage - (revised@ #dependencies (set.has {///reference/variable.#Local register}) synthesis_storage)) + (revised #dependencies (set.has {///reference/variable.#Local register}) synthesis_storage)) {/.#Reference {///reference.#Variable var}} - (revised@ #dependencies (set.has var) synthesis_storage) + (revised #dependencies (set.has var) synthesis_storage) (^ (/.function/apply [functionS argsS])) (list#mix for_synthesis synthesis_storage {.#Item functionS argsS}) @@ -424,20 +424,20 @@ (list#mix for_synthesis synthesis_storage environment) (^ (/.branch/case [inputS pathS])) - (revised@ #dependencies - (set.union (value@ #dependencies (for_path pathS synthesis_storage))) - (for_synthesis inputS synthesis_storage)) + (revised #dependencies + (set.union (the #dependencies (for_path pathS synthesis_storage))) + (for_synthesis inputS synthesis_storage)) (^ (/.branch/exec [before after])) (list#mix for_synthesis synthesis_storage (list before after)) (^ (/.branch/let [inputS register exprS])) - (revised@ #dependencies - (set.union (|> synthesis_storage - (revised@ #bindings (set.has register)) - (for_synthesis exprS) - (value@ #dependencies))) - (for_synthesis inputS synthesis_storage)) + (revised #dependencies + (set.union (|> synthesis_storage + (revised #bindings (set.has register)) + (for_synthesis exprS) + (the #dependencies))) + (for_synthesis inputS synthesis_storage)) (^ (/.branch/if [testS thenS elseS])) (list#mix for_synthesis synthesis_storage (list testS thenS elseS)) @@ -446,15 +446,15 @@ (for_synthesis whole synthesis_storage) (^ (/.loop/scope [start initsS+ iterationS])) - (revised@ #dependencies - (set.union (|> synthesis_storage - (revised@ #bindings (set.union (|> initsS+ - list.enumeration - (list#each (|>> product.left (n.+ start))) - (set.of_list n.hash)))) - (for_synthesis iterationS) - (value@ #dependencies))) - (list#mix for_synthesis synthesis_storage initsS+)) + (revised #dependencies + (set.union (|> synthesis_storage + (revised #bindings (set.union (|> initsS+ + list.enumeration + (list#each (|>> product.left (n.+ start))) + (set.of_list n.hash)))) + (for_synthesis iterationS) + (the #dependencies))) + (list#mix for_synthesis synthesis_storage initsS+)) (^ (/.loop/again replacementsS+)) (list#mix for_synthesis synthesis_storage replacementsS+) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux index 8e37a6714..c08117adc 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux @@ -57,7 +57,7 @@ (with_expansions [<apply> (as_is (/.function/apply [funcS argsS]))] (case funcS (^ (/.function/abstraction functionS)) - (if (n.= (value@ /.#arity functionS) + (if (n.= (the /.#arity functionS) (list.size argsS)) (do ! [locals /.locals] @@ -279,7 +279,7 @@ (case (//loop.optimization false 1 (list) abstraction) {.#Some [startL initsL bodyL]} [/.#environment environment - /.#arity (value@ /.#arity abstraction) + /.#arity (the /.#arity abstraction) /.#body (/.loop/scope [startL initsL bodyL])] {.#None} diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux index 75ddb63b0..f3d6b8b68 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux @@ -87,9 +87,9 @@ (case structure {analysis/complex.#Variant variant} (do maybe.monad - [value' (|> variant (value@ analysis/complex.#value) (again false))] + [value' (|> variant (the analysis/complex.#value) (again false))] (in (|> variant - (with@ analysis/complex.#value value') + (has analysis/complex.#value value') /.variant))) {analysis/complex.#Tuple tuple} @@ -148,10 +148,10 @@ (^ (/.loop/scope scope)) (do [! maybe.monad] [inits' (|> scope - (value@ /.#inits) + (the /.#inits) (monad.each ! (again false))) - iteration' (again return? (value@ /.#iteration scope))] - (in (/.loop/scope [/.#start (|> scope (value@ /.#start) (register_optimization offset)) + iteration' (again return? (the /.#iteration scope))] + (in (/.loop/scope [/.#start (|> scope (the /.#start) (register_optimization offset)) /.#inits inits' /.#iteration iteration']))) @@ -211,6 +211,6 @@ (def: .public (optimization true_loop? offset inits functionS) (-> Bit Register (List Synthesis) Abstraction (Maybe [Register (List Synthesis) Synthesis])) - (|> (value@ /.#body functionS) - (body_optimization true_loop? offset (value@ /.#environment functionS) (value@ /.#arity functionS)) + (|> (the /.#body functionS) + (body_optimization true_loop? offset (the /.#environment functionS) (the /.#arity functionS)) (maybe#each (|>> [offset inits])))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux index 1108cfbc4..0b1d000b4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux @@ -205,7 +205,7 @@ (:expected <<otherwise>>))]) (template: (!horizontal where offset source_code) - [[(revised@ .#column ++ where) + [[(revised .#column ++ where) (!++ offset) source_code]]) @@ -264,7 +264,7 @@ (<| (let [g!content (!clip offset g!end source_code)]) (!guarantee_no_new_lines where offset source_code g!content) {.#Right [[(let [size (!n/- offset g!end)] - (revised@ .#column (|>> (!n/+ size) (!n/+ 2)) where)) + (revised .#column (|>> (!n/+ size) (!n/+ 2)) where)) (!++ g!end) source_code] [where @@ -410,7 +410,7 @@ (signed_parser source_code//size offset where (!++/2 offset) source_code) (!full_symbol_parser offset [where (!++ offset) source_code] where @aliases .#Symbol)))]) -(with_expansions [<output> {.#Right [[(revised@ .#column (|>> (!n/+ (!n/- start end))) where) +(with_expansions [<output> {.#Right [[(revised .#column (|>> (!n/+ (!n/- start end))) where) end source_code] (!clip start end source_code)]}] @@ -483,7 +483,7 @@ (def: (bit_syntax value [where offset/0 source_code]) (-> Bit (Parser Code)) - {.#Right [[(revised@ .#column (|>> !++/2) where) + {.#Right [[(revised .#column (|>> !++/2) where) (!++/2 offset/0) source_code] [where {.#Bit value}]]}) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux index 819c44a5f..1d8b9e6d3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux @@ -203,11 +203,11 @@ (template [<with> <query> <tag> <type>] [(def: .public (<with> value) (-> <type> (All (_ a) (-> (Operation a) (Operation a)))) - (extension.temporary (with@ <tag> value))) + (extension.temporary (has <tag> value))) (def: .public <query> (Operation <type>) - (extension.read (value@ <tag>)))] + (extension.read (the <tag>)))] [with_locals locals #locals Nat] [with_currying? currying? #currying? Bit] @@ -383,12 +383,12 @@ {#Loop loop} (case loop {#Scope scope} - (|> (format (%.nat (value@ #start scope)) - " " (|> (value@ #inits scope) + (|> (format (%.nat (the #start scope)) + " " (|> (the #inits scope) (list#each %synthesis) (text.interposed " ") (text.enclosed ["[" "]"])) - " " (%synthesis (value@ #iteration scope))) + " " (%synthesis (the #iteration scope))) (text.enclosed ["{#loop " "}"])) {#Again args} diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux index 4e1ed910b..e6c9fb680 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/member.lux @@ -20,7 +20,7 @@ (def: .public (format it) (%.Format Member) - (%.format "[" (%.nat (value@ #lefts it)) " " (%.bit (value@ #right? it)) "]")) + (%.format "[" (%.nat (the #lefts it)) " " (%.bit (the #right? it)) "]")) (def: .public hash (Hash Member) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux index dd9bf4223..045681ac2 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access/side.lux @@ -20,7 +20,7 @@ (def: .public (format it) (%.Format Side) - (%.format "{" (%.nat (value@ #lefts it)) " " (%.bit (value@ #right? it)) "}")) + (%.format "{" (%.nat (the #lefts it)) " " (%.bit (the #right? it)) "}")) (def: .public hash (Hash Side) diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/archive.lux index 4ec08ed90..a63bde0a1 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive.lux @@ -1,6 +1,6 @@ (.using [library - [lux {"-" Module} + [lux {"-" Module has} [abstract ["[0]" equivalence {"+" Equivalence}] ["[0]" monad {"+" do}]] @@ -79,7 +79,7 @@ (def: next (-> Archive module.ID) - (|>> :representation (value@ #next))) + (|>> :representation (the #next))) (def: .public empty Archive @@ -108,8 +108,8 @@ {try.#Success [/#next (|> archive :representation - (revised@ #resolver (dictionary.has module [/#next (: (Maybe (Entry Any)) {.#None})])) - (revised@ #next ++) + (revised #resolver (dictionary.has module [/#next (: (Maybe (Entry Any)) {.#None})])) + (revised #next ++) :abstraction)]}))) (def: .public (has module entry archive) @@ -119,15 +119,15 @@ {.#Some [id {.#None}]} {try.#Success (|> archive :representation - (revised@ ..#resolver (dictionary.has module [id {.#Some entry}])) + (revised ..#resolver (dictionary.has module [id {.#Some entry}])) :abstraction)} {.#Some [id {.#Some [existing_module existing_output existing_registry]}]} - (if (same? (value@ module.#document existing_module) - (value@ [#module module.#document] entry)) + (if (same? (the module.#document existing_module) + (the [#module module.#document] entry)) ... TODO: Find out why this code allows for the same module to be added more than once. It looks fishy... {try.#Success archive} - (exception.except ..cannot_replace_document [module (value@ module.#document existing_module) (value@ [#module module.#document] entry)])) + (exception.except ..cannot_replace_document [module (the module.#document existing_module) (the [#module module.#document] entry)])) {.#None} (exception.except ..module_must_be_reserved_before_it_can_be_added [module])))) @@ -135,7 +135,7 @@ (def: .public entries (-> Archive (List [descriptor.Module [module.ID (Entry Any)]])) (|>> :representation - (value@ #resolver) + (the #resolver) dictionary.entries (list.all (function (_ [module [module_id entry]]) (# maybe.monad each (|>> [module_id] [module]) entry))))) @@ -165,7 +165,7 @@ (def: .public archived (-> Archive (List descriptor.Module)) (|>> :representation - (value@ #resolver) + (the #resolver) dictionary.entries (list.all (function (_ [module [id descriptor+document]]) (case descriptor+document @@ -185,13 +185,13 @@ (def: .public reserved (-> Archive (List descriptor.Module)) (|>> :representation - (value@ #resolver) + (the #resolver) dictionary.keys)) (def: .public reservations (-> Archive (List [descriptor.Module module.ID])) (|>> :representation - (value@ #resolver) + (the #resolver) dictionary.entries (list#each (function (_ [module [id _]]) [module id])))) @@ -201,17 +201,17 @@ (let [[+next +resolver] (:representation additions)] (|> archive :representation - (revised@ #next (n.max +next)) - (revised@ #resolver (function (_ resolver) - (list#mix (function (_ [module [id entry]] resolver) - (case entry - {.#Some _} - (dictionary.has module [id entry] resolver) - - {.#None} - resolver)) - resolver - (dictionary.entries +resolver)))) + (revised #next (n.max +next)) + (revised #resolver (function (_ resolver) + (list#mix (function (_ [module [id entry]] resolver) + (case entry + {.#Some _} + (dictionary.has module [id entry] resolver) + + {.#None} + resolver)) + resolver + (dictionary.entries +resolver)))) :abstraction))) (type: Reservation @@ -262,6 +262,6 @@ [#next next #resolver (list#mix (function (_ [module id] archive) (dictionary.has module [id (: (Maybe (Entry Any)) {.#None})] archive)) - (value@ #resolver (:representation ..empty)) + (the #resolver (:representation ..empty)) reservations)])))) ) diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux index 144895928..9a97cc0ec 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/module/document.lux @@ -58,7 +58,7 @@ (def: .public signature (-> (Document Any) Signature) - (|>> :representation (value@ #signature))) + (|>> :representation (the #signature))) (def: .public (writer content) (All (_ d) (-> (Writer d) (Writer (Document d)))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux index 6489b6fb7..be3619845 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux @@ -39,7 +39,7 @@ (def: .public artifacts (-> Registry (Sequence [Artifact (Set unit.ID)])) - (|>> :representation (value@ #artifacts))) + (|>> :representation (the #artifacts))) (def: next (-> Registry ID) @@ -51,10 +51,10 @@ [id (|> registry :representation - (revised@ #artifacts (sequence.suffix [[//.#id id - //.#category {//category.#Anonymous} - //.#mandatory? mandatory?] - dependencies])) + (revised #artifacts (sequence.suffix [[//.#id id + //.#category {//category.#Anonymous} + //.#mandatory? mandatory?] + dependencies])) :abstraction)])) (template [<tag> <create> <fetch> <type> <name> <+resolver>] @@ -64,21 +64,21 @@ [id (|> registry :representation - (revised@ #artifacts (sequence.suffix [[//.#id id - //.#category {<tag> it} - //.#mandatory? mandatory?] - dependencies])) - (revised@ #resolver (dictionary.has (<name> it) [id (: (Maybe //category.Definition) <+resolver>)])) + (revised #artifacts (sequence.suffix [[//.#id id + //.#category {<tag> it} + //.#mandatory? mandatory?] + dependencies])) + (revised #resolver (dictionary.has (<name> it) [id (: (Maybe //category.Definition) <+resolver>)])) :abstraction)])) (def: .public (<fetch> registry) (-> Registry (List <type>)) (|> registry :representation - (value@ #artifacts) + (the #artifacts) sequence.list (list.all (|>> product.left - (value@ //.#category) + (the //.#category) (case> {<tag> it} {.#Some it} _ {.#None})))))] @@ -94,7 +94,7 @@ (def: .public (find_definition name registry) (-> Text Registry (Maybe [ID (Maybe //category.Definition)])) (|> (:representation registry) - (value@ #resolver) + (the #resolver) (dictionary.value name))) (def: .public (id name registry) @@ -134,10 +134,10 @@ artifacts (: (Writer (Sequence [Category Bit (Set unit.ID)])) (binary.sequence/64 ($_ binary.and category mandatory? dependencies)))] (|>> :representation - (value@ #artifacts) + (the #artifacts) (sequence#each (function (_ [it dependencies]) - [(value@ //.#category it) - (value@ //.#mandatory? it) + [(the //.#category it) + (the //.#mandatory? it) dependencies])) artifacts))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux index 533ed6cb0..235913727 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux @@ -33,7 +33,7 @@ (def: .public (description signature) (-> Signature Text) - (format (%.symbol (value@ #name signature)) " " (version.format (value@ #version signature)))) + (format (%.symbol (the #name signature)) " " (version.format (the #version signature)))) (def: .public writer (Writer Signature) diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux index ed2e00876..9412bbb0b 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux @@ -38,6 +38,6 @@ (def: .public (format it) (%.Format ID) - (%.format (%.nat (value@ #module it)) + (%.format (%.nat (the #module it)) "." - (%.nat (value@ #artifact it)))) + (%.nat (the #artifact it)))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache.lux b/stdlib/source/library/lux/tool/compiler/meta/cache.lux index 6b4194359..72470f228 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache.lux @@ -18,8 +18,8 @@ (def: .public (path fs context) (All (_ !) (-> (file.System !) Context file.Path)) (let [/ (# fs separator)] - (format (value@ context.#target context) - / (value@ context.#host context) + (format (the context.#target context) + / (the context.#host context) / (version.format //.version)))) (def: .public (enabled? fs context) diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux index fd63495d1..ca2689c18 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux @@ -26,7 +26,7 @@ (format (//module.path fs context @module) (# fs separator) (%.nat @artifact) - (value@ context.#artifact_extension context))) + (the context.#artifact_extension context))) (def: .public (cache fs context @module @artifact) (All (_ !) diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux index 9bce830d6..f1c4a4806 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/artifact.lux @@ -83,7 +83,7 @@ (case value {analysis/complex.#Variant value} (|> value - (value@ analysis/complex.#value) + (the analysis/complex.#value) references) {analysis/complex.#Tuple value} @@ -131,7 +131,7 @@ (case value {synthesis.#Scope value} (|> value - (value@ synthesis.#iteration) + (the synthesis.#iteration) references) {synthesis.#Again value} @@ -143,7 +143,7 @@ (case value {synthesis.#Abstraction value} (|> value - (value@ synthesis.#body) + (the synthesis.#body) references) {synthesis.#Apply function arguments} @@ -193,8 +193,8 @@ registry.artifacts sequence.list (list#each (function (_ [artifact dependencies]) - [[module_id (value@ artifact.#id artifact)] - (value@ artifact.#mandatory? artifact) + [[module_id (the artifact.#id artifact)] + (the artifact.#mandatory? artifact) dependencies]))))) list.together (list#mix (function (_ [artifact_id mandatory? dependencies] diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/module.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/module.lux index 01c37431f..4fd7fdebf 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/module.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency/module.lux @@ -59,7 +59,7 @@ (do [! state.monad] [.let [parents (case (archive.find module archive) {try.#Success [module output registry]} - (value@ [module.#descriptor descriptor.#references] module) + (the [module.#descriptor descriptor.#references] module) {try.#Failure error} ..fresh)] @@ -95,5 +95,5 @@ (do try.monad [module_id (archive.id module archive) entry (archive.find module archive) - document (document.marked? key (value@ [archive.#module module.#document] entry))] - (in [module [module_id (with@ [archive.#module module.#document] document entry)]]))))))) + document (document.marked? key (the [archive.#module module.#document] entry))] + (in [module [module_id (has [archive.#module module.#document] document entry)]]))))))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux index c5f2f577a..e393253e1 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux @@ -50,12 +50,12 @@ (def: .public (valid? expected actual) (-> Descriptor Input Bit) - (and (text#= (value@ descriptor.#name expected) - (value@ ////.#module actual)) - (text#= (value@ descriptor.#file expected) - (value@ ////.#file actual)) - (n.= (value@ descriptor.#hash expected) - (value@ ////.#hash actual)))) + (and (text#= (the descriptor.#name expected) + (the ////.#module actual)) + (text#= (the descriptor.#file expected) + (the ////.#file actual)) + (n.= (the descriptor.#hash expected) + (the ////.#hash actual)))) (def: initial (-> (List Cache) Purge) @@ -73,7 +73,7 @@ (if (purged? module_name) purge (if (|> entry - (value@ [archive.#module module.#descriptor descriptor.#references]) + (the [archive.#module module.#descriptor descriptor.#references]) set.list (list.any? purged?)) (dictionary.has module_name @module purge) diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux index 212006bbe..a807e083c 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux @@ -81,11 +81,11 @@ (do ! [entry (archive.find module archive) content (|> entry - (value@ [archive.#module module.#document]) + (the [archive.#module module.#document]) (document.content $.key))] (in [module content]))) (archive.archived archive)))] - (in (with@ .#modules modules (fresh_analysis_state host configuration))))) + (in (has .#modules modules (fresh_analysis_state host configuration))))) (type: Definitions (Dictionary Text Any)) (type: Analysers (Dictionary Text analysis.Handler)) @@ -240,8 +240,8 @@ try.of_maybe (# ! each (function (_ def_value) [def_name {.#Type [exported? (:as .Type def_value) labels]}]))))) - (value@ .#definitions content))] - (in [(document.document $.key (with@ .#definitions definitions content)) + (the .#definitions content))] + (in [(document.document $.key (has .#definitions definitions content)) bundles]))) (def: (load_definitions fs context @module host_environment entry) @@ -252,13 +252,13 @@ (do (try.with async.monad) [actual (: (Async (Try (Dictionary Text Binary))) (cache/module.artifacts async.monad fs context @module)) - .let [expected (registry.artifacts (value@ archive.#registry entry))] - [document bundles output] (|> (value@ [archive.#module module.#document] entry) - (loaded_document (value@ context.#artifact_extension context) host_environment @module expected actual) + .let [expected (registry.artifacts (the archive.#registry entry))] + [document bundles output] (|> (the [archive.#module module.#document] entry) + (loaded_document (the context.#artifact_extension context) host_environment @module expected actual) async#in)] (in [(|> entry - (with@ [archive.#module module.#document] document) - (with@ archive.#output output)) + (has [archive.#module module.#document] document) + (has archive.#output output)) bundles]))) (def: pseudo_module @@ -291,8 +291,8 @@ (if (text#= descriptor.runtime module_name) (in [true <cache>]) (do ! - [input (//context.read fs ..pseudo_module import contexts (value@ context.#host_module_extension context) module_name)] - (in [(cache/purge.valid? (value@ module.#descriptor module) input) <cache>])))))) + [input (//context.read fs ..pseudo_module import contexts (the context.#host_module_extension context) module_name)] + (in [(cache/purge.valid? (the module.#descriptor module) input) <cache>])))))) (def: (pre_loaded_caches customs fs context import contexts archive) (-> (List Custom) (file.System Async) Context Import (List //.Context) Archive @@ -354,7 +354,7 @@ (archive.has module entry archive)) archive loaded_caches) - analysis_state (..analysis_state (value@ context.#host context) configuration archive)] + analysis_state (..analysis_state (the context.#host context) configuration archive)] (in [archive analysis_state (list#mix (function (_ [_ [+analysers +synthesizers +generators +directives]] @@ -380,5 +380,5 @@ {try.#Failure error} (in {try.#Success [archive.empty - (fresh_analysis_state (value@ context.#host context) configuration) + (fresh_analysis_state (the context.#host context) configuration) ..empty_bundles]})))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager.lux b/stdlib/source/library/lux/tool/compiler/meta/packager.lux index 5b0bd0438..a92bdbbe1 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager.lux @@ -37,8 +37,8 @@ (-> (cache/module.Order Any) Order) (list#each (function (_ [module [module_id entry]]) (|> entry - (value@ archive.#registry) + (the archive.#registry) registry.artifacts sequence.list - (list#each (|>> product.left (value@ artifact.#id))) + (list#each (|>> product.left (the artifact.#id))) [module_id])))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux index 99c9a316b..4e1c841b5 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux @@ -152,7 +152,7 @@ (maybe#each (|>> name.internal name.read)) (maybe.else (runtime.class_name [module artifact])) (text.replaced "." "/") - (text.suffix (value@ context.#artifact_extension static)))] + (text.suffix (the context.#artifact_extension static)))] (do try.monad [_ (java/util/jar/JarOutputStream::putNextEntry (java/util/jar/JarEntry::new class_path) sink)] (in (do_to sink @@ -266,7 +266,7 @@ .let [buffer (java/io/ByteArrayOutputStream::new (ffi.as_int (.int ..mebi_byte)))] sink (|> order (list#each (function (_ [module [module_id entry]]) - [module_id (value@ archive.#output entry)])) + [module_id (the archive.#output entry)])) (monad.mix ! (..write_module static necessary_dependencies) (java/util/jar/JarOutputStream::new buffer (..manifest program)))) [entries duplicates sink] (|> host_dependencies diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux index 85eb525cf..df7f11ce0 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux @@ -85,7 +85,7 @@ (Try (List [module.ID [Text Binary]]))) (do [! try.monad] [bundle (: (Try (Maybe _.Statement)) - (..bundle_module module module_id necessary_dependencies (value@ archive.#output entry)))] + (..bundle_module module module_id necessary_dependencies (the archive.#output entry)))] (case bundle {.#None} (in sink) diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux index f46a71e8e..f1dfb0189 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux @@ -1,48 +1,48 @@ (.using - [library - [lux {"-" Module} - [type {"+" :sharing}] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}]] - [data - [binary {"+" Binary}] - ["[0]" product] - ["[0]" text - ["%" format {"+" format}] - ["[0]" encoding]] - [collection - ["[0]" sequence] - ["[0]" list ("[1]#[0]" functor mix)] - ["[0]" dictionary {"+" Dictionary}] - ["[0]" set]] - [format - ["[0]" tar] - ["[0]" binary]]] - [target - ["_" scheme]] - [time - ["[0]" instant {"+" Instant}]] - [world - ["[0]" file]]]] - [program - [compositor - ["[0]" static {"+" Static}]]] - ["[0]" // {"+" Packager} + [library + [lux {"-" Module} + [type {"+" :sharing}] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}]] + [data + [binary {"+" Binary}] + ["[0]" product] + ["[0]" text + ["%" format {"+" format}] + ["[0]" encoding]] + [collection + ["[0]" sequence] + ["[0]" list ("[1]#[0]" functor mix)] + ["[0]" dictionary {"+" Dictionary}] + ["[0]" set]] + [format + ["[0]" tar] + ["[0]" binary]]] + [target + ["_" scheme]] + [time + ["[0]" instant {"+" Instant}]] + [world + ["[0]" file]]]] + [program + [compositor + ["[0]" static {"+" Static}]]] + ["[0]" // {"+" Packager} + [// + ["[0]" archive {"+" Output} + ["[0]" descriptor {"+" Module Descriptor}] + ["[0]" artifact] + ["[0]" document {"+" Document}]] + [cache + ["[0]" dependency]] + ["[0]" io "_" + ["[1]" archive]] [// - ["[0]" archive {"+" Output} - ["[0]" descriptor {"+" Module Descriptor}] - ["[0]" artifact] - ["[0]" document {"+" Document}]] - [cache - ["[0]" dependency]] - ["[0]" io "_" - ["[1]" archive]] - [// - [language - ["$" lux - [generation {"+" Context}]]]]]]) + [language + ["$" lux + [generation {"+" Context}]]]]]]) ... TODO: Delete ASAP (type: (Action ! a) @@ -104,7 +104,7 @@ (..bundle_module output)) entry_content (: (Try tar.Content) (|> descriptor - (value@ descriptor.#references) + (the descriptor.#references) set.list (list.all (function (_ module) (dictionary.value module mapping))) (list#each (|>> ..module_file _.string _.load_relative/1)) diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux index f3cc4f7a0..1b867cd4f 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux @@ -71,7 +71,7 @@ order (cache/module.load_order $.key archive)] (|> order (list#each (function (_ [module [module_id entry]]) - [module_id (value@ archive.#output entry)])) + [module_id (the archive.#output entry)])) (monad.mix ! (..write_module necessary_dependencies sequence) header) (# ! each (|>> scope code diff --git a/stdlib/source/library/lux/tool/interpreter.lux b/stdlib/source/library/lux/tool/interpreter.lux index 8cf01011c..a5e907a52 100644 --- a/stdlib/source/library/lux/tool/interpreter.lux +++ b/stdlib/source/library/lux/tool/interpreter.lux @@ -1,33 +1,33 @@ (.using - [library - [lux "*" - [control - [monad {"+" Monad do}] - ["[0]" try {"+" Try}] - ["ex" exception {"+" exception:}]] - [data - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]]] - [type {"+" :sharing} - ["[0]" check]] - [compiler - ["[0]" phase - ["[0]" analysis - ["[0]" module] - ["[0]" type]] - ["[0]" generation] - ["[0]" directive {"+" State+ Operation} - ["[0]" total]] - ["[0]" extension]] - ["[0]" default - ["[0]" syntax] - ["[0]" platform {"+" Platform}] - ["[0]" init]] - ["[0]" cli {"+" Configuration}]] - [world - ["[0]" file {"+" File}] - ["[0]" console {"+" Console}]]]] - ["[0]" /type]) + [library + [lux "*" + [control + [monad {"+" Monad do}] + ["[0]" try {"+" Try}] + ["ex" exception {"+" exception:}]] + [data + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]]] + [type {"+" :sharing} + ["[0]" check]] + [compiler + ["[0]" phase + ["[0]" analysis + ["[0]" module] + ["[0]" type]] + ["[0]" generation] + ["[0]" directive {"+" State+ Operation} + ["[0]" total]] + ["[0]" extension]] + ["[0]" default + ["[0]" syntax] + ["[0]" platform {"+" Platform}] + ["[0]" init]] + ["[0]" cli {"+" Configuration}]] + [world + ["[0]" file {"+" File}] + ["[0]" console {"+" Console}]]]] + ["[0]" /type]) (exception: .public (error [message Text]) message) @@ -75,14 +75,14 @@ (do Monad<!> [state (platform.initialize platform generation_bundle) state (platform.compile platform - (with@ cli.#module syntax.prelude configuration) - (with@ [extension.#state - directive.#analysis directive.#state - extension.#state - .#info .#mode] - {.#Interpreter} - state)) - [state _] (# (value@ platform.#file_system platform) + (has cli.#module syntax.prelude configuration) + (has [extension.#state + directive.#analysis directive.#state + extension.#state + .#info .#mode] + {.#Interpreter} + state)) + [state _] (# (the platform.#file_system platform) lift (phase.result' state enter_module)) _ (# Console<!> write ..welcome_message)] (in state))) @@ -102,9 +102,9 @@ (-> Code <Interpretation>)) (do [! phase.monad] [state (extension.lifted phase.state) - .let [analyse (value@ [directive.#analysis directive.#phase] state) - synthesize (value@ [directive.#synthesis directive.#phase] state) - generate (value@ [directive.#generation directive.#phase] state)] + .let [analyse (the [directive.#analysis directive.#phase] state) + synthesize (the [directive.#synthesis directive.#phase] state) + generate (the [directive.#generation directive.#phase] state)] [_ codeT codeA] (directive.lifted_analysis (analysis.with_scope (type.with_fresh_env @@ -156,10 +156,10 @@ (do phase.monad [[codeT codeV] (interpret configuration code) state phase.state] - (in (/type.represent (value@ [extension.#state - directive.#analysis directive.#state - extension.#state] - state) + (in (/type.represent (the [extension.#state + directive.#analysis directive.#state + extension.#state] + state) codeT codeV)))) @@ -174,15 +174,15 @@ (All (_ anchor expression directive) (-> <Context> (Try [<Context> Text]))) (do try.monad - [.let [[_where _offset _code] (value@ #source context)] - [source' input] (syntax.parse ..module syntax.no_aliases (text.size _code) (value@ #source context)) + [.let [[_where _offset _code] (the #source context)] + [source' input] (syntax.parse ..module syntax.no_aliases (text.size _code) (the #source context)) [state' representation] (let [... TODO: Simplify ASAP state (:sharing [anchor expression directive] <Context> context (State+ anchor expression directive) - (value@ #state context))] + (the #state context))] (<| (phase.result' state) ... TODO: Simplify ASAP (:sharing [anchor expression directive] @@ -190,10 +190,10 @@ context (Operation anchor expression directive Text) - (execute (value@ #configuration context) input))))] + (execute (the #configuration context) input))))] (in [(|> context - (with@ #state state') - (with@ #source source')) + (has #state state') + (has #source source')) representation])))) (def: .public (run! Monad<!> Console<!> platform configuration generation_bundle) @@ -217,7 +217,7 @@ (if (and (not multi_line?) (text#= ..exit_command line)) (# Console<!> write ..farewell_message) - (case (read_eval_print (revised@ #source (add_line line) context)) + (case (read_eval_print (revised #source (add_line line) context)) {try.#Success [context' representation]} (do ! [_ (# Console<!> write representation)] @@ -227,5 +227,5 @@ (if (ex.match? syntax.end_of_file error) (again context #1) (exec (log! (ex.error ..error error)) - (again (with@ #source ..fresh_source context) #0)))))) + (again (has #source ..fresh_source context) #0)))))) ))) diff --git a/stdlib/source/library/lux/type.lux b/stdlib/source/library/lux/type.lux index ac81fe26b..cd1aaa867 100644 --- a/stdlib/source/library/lux/type.lux +++ b/stdlib/source/library/lux/type.lux @@ -447,12 +447,12 @@ computation ..typed]) (macro.with_symbols [g!_] (let [typeC (` (All ((~ g!_) (~+ (list#each code.local_symbol type_vars))) - (-> (~ (value@ #type exemplar)) - (~ (value@ #type computation))))) + (-> (~ (the #type exemplar)) + (~ (the #type computation))))) shareC (` (: (~ typeC) (.function ((~ g!_) (~ g!_)) - (~ (value@ #expression computation)))))] - (in (list (` ((~ shareC) (~ (value@ #expression exemplar))))))))) + (~ (the #expression computation)))))] + (in (list (` ((~ shareC) (~ (the #expression exemplar))))))))) (syntax: .public (:by_example [type_vars ..type_parameters exemplar ..typed @@ -460,8 +460,8 @@ (in (list (` (:of ((~! ..:sharing) [(~+ (list#each code.local_symbol type_vars))] - (~ (value@ #type exemplar)) - (~ (value@ #expression exemplar)) + (~ (the #type exemplar)) + (~ (the #expression exemplar)) (~ extraction) ... The value of this expression will never be relevant, so it doesn't matter what it is. diff --git a/stdlib/source/library/lux/type/abstract.lux b/stdlib/source/library/lux/type/abstract.lux index f70175de2..77ca88bee 100644 --- a/stdlib/source/library/lux/type/abstract.lux +++ b/stdlib/source/library/lux/type/abstract.lux @@ -1,24 +1,24 @@ (.using - [library - [lux "*" - ["[0]" meta] - [abstract - [monad {"+" Monad do}]] - [control - ["[0]" exception {"+" exception:}] - ["<>" parser ("[1]#[0]" monad) - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" text ("[1]#[0]" equivalence monoid)] - [collection - ["[0]" list ("[1]#[0]" functor monoid)]]] - [macro - ["[0]" code] - [syntax {"+" syntax:} - ["|[0]|" export]]] - [meta - ["[0]" symbol ("[1]#[0]" codec)]]]] - ["[0]" //]) + [library + [lux "*" + ["[0]" meta] + [abstract + [monad {"+" Monad do}]] + [control + ["[0]" exception {"+" exception:}] + ["<>" parser ("[1]#[0]" monad) + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" text ("[1]#[0]" equivalence monoid)] + [collection + ["[0]" list ("[1]#[0]" functor monoid)]]] + [macro + ["[0]" code] + [syntax {"+" syntax:} + ["|[0]|" export]]] + [meta + ["[0]" symbol ("[1]#[0]" codec)]]]] + ["[0]" //]) (type: Stack List) @@ -73,7 +73,7 @@ (def: (peek_frames reference definition_reference source) (-> Text Text (List [Text Module]) (Stack Frame)) (!peek source reference - (peek_frames_definition definition_reference (value@ .#definitions head)))) + (peek_frames_definition definition_reference (the .#definitions head)))) (exception: .public no_active_frames) @@ -81,7 +81,7 @@ (-> (Maybe Text) (Meta Frame)) (function (_ compiler) (let [[reference definition_reference] (symbol ..frames) - current_frames (peek_frames reference definition_reference (value@ .#modules compiler))] + current_frames (peek_frames reference definition_reference (the .#modules compiler))] (case (case frame {.#Some frame} (list.example (function (_ [actual _]) @@ -135,14 +135,14 @@ (def: (push_frame [module_reference definition_reference] frame source) (-> Symbol Frame (List [Text Module]) (List [Text Module])) (!push source module_reference - (revised@ .#definitions (push_frame_definition definition_reference frame) head))) + (revised .#definitions (push_frame_definition definition_reference frame) head))) (def: (push! frame) (-> Frame (Meta Any)) (function (_ compiler) - {.#Right [(revised@ .#modules - (..push_frame (symbol ..frames) frame) - compiler) + {.#Right [(revised .#modules + (..push_frame (symbol ..frames) frame) + compiler) []]})) (def: (pop_frame_definition reference source) @@ -169,13 +169,13 @@ (def: (pop_frame [module_reference definition_reference] source) (-> Symbol (List [Text Module]) (List [Text Module])) (!push source module_reference - (|> head (revised@ .#definitions (pop_frame_definition definition_reference))))) + (|> head (revised .#definitions (pop_frame_definition definition_reference))))) (syntax: (pop! []) (function (_ compiler) - {.#Right [(revised@ .#modules - (..pop_frame (symbol ..frames)) - compiler) + {.#Right [(revised .#modules + (..pop_frame (symbol ..frames)) + compiler) (list)]})) (def: cast diff --git a/stdlib/source/library/lux/type/check.lux b/stdlib/source/library/lux/type/check.lux index 785e321fb..e7ed19839 100644 --- a/stdlib/source/library/lux/type/check.lux +++ b/stdlib/source/library/lux/type/check.lux @@ -188,15 +188,15 @@ (def: .public existential (Check [Nat Type]) (function (_ context) - (let [id (value@ .#ex_counter context)] - {try.#Success [(revised@ .#ex_counter ++ context) + (let [id (the .#ex_counter context)] + {try.#Success [(revised .#ex_counter ++ context) [id {.#Ex id}]]}))) (template [<name> <outputT> <fail> <succeed>] [(def: .public (<name> id) (-> Var (Check <outputT>)) (function (_ context) - (case (|> context (value@ .#var_bindings) (var::get id)) + (case (|> context (the .#var_bindings) (var::get id)) (^or {.#Some {.#Some {.#Var _}}} {.#Some {.#None}}) {try.#Success [context <fail>]} @@ -225,7 +225,7 @@ (def: (bound id) (-> Var (Check Type)) (function (_ context) - (case (|> context (value@ .#var_bindings) (var::get id)) + (case (|> context (the .#var_bindings) (var::get id)) {.#Some {.#Some bound}} {try.#Success [context bound]} @@ -238,9 +238,9 @@ (def: .public (bind type id) (-> Type Var (Check Any)) (function (_ context) - (case (|> context (value@ .#var_bindings) (var::get id)) + (case (|> context (the .#var_bindings) (var::get id)) {.#Some {.#None}} - {try.#Success [(revised@ .#var_bindings (var::put id {.#Some type}) context) + {try.#Success [(revised .#var_bindings (var::put id {.#Some type}) context) []]} {.#Some {.#Some bound}} @@ -252,9 +252,9 @@ (def: (re_bind' ?type id) (-> (Maybe Type) Var (Check Any)) (function (_ context) - (case (|> context (value@ .#var_bindings) (var::get id)) + (case (|> context (the .#var_bindings) (var::get id)) {.#Some _} - {try.#Success [(revised@ .#var_bindings (var::put id ?type) context) + {try.#Success [(revised .#var_bindings (var::put id ?type) context) []]} _ @@ -267,10 +267,10 @@ (def: .public var (Check [Var Type]) (function (_ context) - (let [id (value@ .#var_counter context)] + (let [id (the .#var_counter context)] {try.#Success [(|> context - (revised@ .#var_counter ++) - (revised@ .#var_bindings (var::new id))) + (revised .#var_counter ++) + (revised .#var_bindings (var::new id))) [id {.#Var id}]]}))) (def: (on argT funcT) @@ -304,7 +304,7 @@ (function (_ context) (loop [current start output (list start)] - (case (|> context (value@ .#var_bindings) (var::get current)) + (case (|> context (the .#var_bindings) (var::get current)) {.#Some {.#Some type}} (case type {.#Var next} @@ -363,19 +363,19 @@ (def: (erase! @) (-> Var (Check Any)) (function (_ context) - {try.#Success [(revised@ .#var_bindings - (list#mix (: (:let [binding [Nat (Maybe Type)]] - (-> binding - (List binding) - (List binding))) - (function (_ in out) - (let [[@var :var:] in] - (if (n.= @ @var) - out - (list& in out))))) - (: (List [Nat (Maybe Type)]) - (list))) - context) + {try.#Success [(revised .#var_bindings + (list#mix (: (:let [binding [Nat (Maybe Type)]] + (-> binding + (List binding) + (List binding))) + (function (_ in out) + (let [[@var :var:] in] + (if (n.= @ @var) + out + (list& in out))))) + (: (List [Nat (Maybe Type)]) + (list))) + context) []]})) (def: .public (forget! @) diff --git a/stdlib/source/library/lux/type/implicit.lux b/stdlib/source/library/lux/type/implicit.lux index bd4ac94b0..25678f37a 100644 --- a/stdlib/source/library/lux/type/implicit.lux +++ b/stdlib/source/library/lux/type/implicit.lux @@ -1,35 +1,35 @@ (.using - [library - [lux "*" - [abstract - ["[0]" monad {"+" do}] - ["[0]" equivalence]] - [control - ["[0]" maybe] - ["[0]" try] - ["<>" parser - ["<[0]>" code {"+" Parser}]]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" monad mix)] - ["[0]" dictionary {"+" Dictionary}]]] - ["[0]" macro - ["[0]" code] - [syntax {"+" syntax:}]] - [math - ["[0]" number - ["n" nat]]] - ["[0]" meta] - ["[0]" type ("[1]#[0]" equivalence) - ["[0]" check {"+" Check}]]]]) + [library + [lux "*" + [abstract + ["[0]" monad {"+" do}] + ["[0]" equivalence]] + [control + ["[0]" maybe] + ["[0]" try] + ["<>" parser + ["<[0]>" code {"+" Parser}]]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" monad mix)] + ["[0]" dictionary {"+" Dictionary}]]] + ["[0]" macro + ["[0]" code] + [syntax {"+" syntax:}]] + [math + ["[0]" number + ["n" nat]]] + ["[0]" meta] + ["[0]" type ("[1]#[0]" equivalence) + ["[0]" check {"+" Check}]]]]) (def: (type_var id env) (-> Nat Type_Context (Meta Type)) (case (list.example (|>> product.left (n.= id)) - (value@ .#var_bindings env)) + (the .#var_bindings env)) {.#Some [_ {.#Some type}]} (case type {.#Var id'} @@ -52,7 +52,7 @@ compiler meta.compiler_state] (case raw_type {.#Var id} - (type_var id (value@ .#type_context compiler)) + (type_var id (the .#type_context compiler)) _ (in raw_type)))) diff --git a/stdlib/source/library/lux/type/quotient.lux b/stdlib/source/library/lux/type/quotient.lux index b43d5035e..591734219 100644 --- a/stdlib/source/library/lux/type/quotient.lux +++ b/stdlib/source/library/lux/type/quotient.lux @@ -1,15 +1,15 @@ (.using - [library - [lux {"-" type} - [abstract - [equivalence {"+" Equivalence}]] - [control - [parser - ["<[0]>" code]]] - [macro {"+" with_symbols} - [syntax {"+" syntax:}]] - ["[0]" type - abstract]]]) + [library + [lux {"-" type} + [abstract + [equivalence {"+" Equivalence}]] + [control + [parser + ["<[0]>" code]]] + [macro {"+" with_symbols} + [syntax {"+" syntax:}]] + ["[0]" type + abstract]]]) (abstract: .public (Class t c %) (-> t c) @@ -35,7 +35,7 @@ (template [<name> <output> <slot>] [(def: .public <name> (All (_ t c %) (-> (Quotient t c %) <output>)) - (|>> :representation (value@ <slot>)))] + (|>> :representation (the <slot>)))] [value t #value] [label c #label] diff --git a/stdlib/source/library/lux/type/refinement.lux b/stdlib/source/library/lux/type/refinement.lux index 194a63b2d..df4fc8d3c 100644 --- a/stdlib/source/library/lux/type/refinement.lux +++ b/stdlib/source/library/lux/type/refinement.lux @@ -1,15 +1,15 @@ (.using - [library - [lux {"-" type} - [abstract - [predicate {"+" Predicate}]] - [control - [parser - ["<[0]>" code]]] - ["[0]" macro - [syntax {"+" syntax:}]] - ["[0]" type - abstract]]]) + [library + [lux {"-" type} + [abstract + [predicate {"+" Predicate}]] + [control + [parser + ["<[0]>" code]]] + ["[0]" macro + [syntax {"+" syntax:}]] + ["[0]" type + abstract]]]) (abstract: .public (Refined t %) (Record @@ -32,7 +32,7 @@ (template [<name> <output> <slot>] [(def: .public <name> (All (_ t %) (-> (Refined t %) <output>)) - (|>> :representation (value@ <slot>)))] + (|>> :representation (the <slot>)))] [value t #value] [predicate (Predicate t) #predicate] diff --git a/stdlib/source/library/lux/world/db/jdbc.lux b/stdlib/source/library/lux/world/db/jdbc.lux index beb4d8bce..25a29b3b3 100644 --- a/stdlib/source/library/lux/world/db/jdbc.lux +++ b/stdlib/source/library/lux/world/db/jdbc.lux @@ -1,29 +1,29 @@ (.using - [library - [lux {"-" and int} - [control - [functor {"+" Functor}] - [apply {"+" Apply}] - [monad {"+" Monad do}] - ["[0]" try {"+" Try}] - ["ex" exception] - [concurrency - ["[0]" async {"+" Async} ("[1]#[0]" monad)]] - [security - ["!" capability {"+" capability:}]]] - [data - ["[0]" product] - [text - ["%" format {"+" format}]]] - ["[0]" io {"+" IO}] - [world - [net {"+" URL}]] - [host {"+" import:}]]] - [// - ["[0]" sql]] - ["[0]" / "_" - ["[1][0]" input {"+" Input}] - ["[1][0]" output {"+" Output}]]) + [library + [lux {"-" and int} + [control + [functor {"+" Functor}] + [apply {"+" Apply}] + [monad {"+" Monad do}] + ["[0]" try {"+" Try}] + ["ex" exception] + [concurrency + ["[0]" async {"+" Async} ("[1]#[0]" monad)]] + [security + ["!" capability {"+" capability:}]]] + [data + ["[0]" product] + [text + ["%" format {"+" format}]]] + ["[0]" io {"+" IO}] + [world + [net {"+" URL}]] + [host {"+" import:}]]] + [// + ["[0]" sql]] + ["[0]" / "_" + ["[1][0]" input {"+" Input}] + ["[1][0]" output {"+" Output}]]) (import: java/lang/String) @@ -96,10 +96,10 @@ (-> java/sql/PreparedStatement (IO (Try a))) (IO (Try a)))) (do (try.with io.monad) - [prepared (io.io (java/sql/Connection::prepareStatement (sql.sql (value@ #sql statement)) + [prepared (io.io (java/sql/Connection::prepareStatement (sql.sql (the #sql statement)) (java/sql/Statement::RETURN_GENERATED_KEYS) conn)) - _ (io.io ((value@ #input statement) (value@ #value statement) [1 prepared])) + _ (io.io ((the #input statement) (the #value statement) [1 prepared])) result (action prepared) _ (java/sql/Statement::close prepared)] (in result))) @@ -118,9 +118,9 @@ (def: .public (connect creds) (-> Credentials (IO (Try (DB IO)))) (do (try.with io.monad) - [connection (java/sql/DriverManager::getConnection (value@ #url creds) - (value@ #user creds) - (value@ #password creds))] + [connection (java/sql/DriverManager::getConnection (the #url creds) + (the #user creds) + (the #password creds))] (in (: (DB IO) (implementation (def: execute diff --git a/stdlib/source/library/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux index cf1a5fc83..aa1598254 100644 --- a/stdlib/source/library/lux/world/file.lux +++ b/stdlib/source/library/lux/world/file.lux @@ -1026,8 +1026,8 @@ [{.#Left file} {.#End}] {try.#Success (dictionary.has head {.#Left (|> file - (with@ #mock_last_modified now) - (with@ #mock_content content))} + (has #mock_last_modified now) + (has #mock_content content))} directory)} [{.#Right sub_directory} {.#Item _}] @@ -1204,7 +1204,7 @@ (in (|> |store| (..retrieve_mock_file! separator path) (try#each (|>> product.right - (value@ #mock_content) + (the #mock_content) binary.size))))))) (def: (last_modified path) @@ -1214,7 +1214,7 @@ (in (|> |store| (..retrieve_mock_file! separator path) (try#each (|>> product.right - (value@ #mock_last_modified)))))))) + (the #mock_last_modified)))))))) (def: (can_execute? path) (stm.commit! @@ -1223,7 +1223,7 @@ (in (|> |store| (..retrieve_mock_file! separator path) (try#each (|>> product.right - (value@ #mock_can_execute)))))))) + (the #mock_can_execute)))))))) (def: (read path) (stm.commit! @@ -1232,7 +1232,7 @@ (in (|> |store| (..retrieve_mock_file! separator path) (try#each (|>> product.right - (value@ #mock_content)))))))) + (the #mock_content)))))))) (def: (delete path) (stm.commit! @@ -1243,7 +1243,7 @@ (..attempt! (function (_ |store|) (do try.monad [[name file] (..retrieve_mock_file! separator path |store|)] - (..update_mock_file! separator path now (value@ #mock_content file) |store|))) + (..update_mock_file! separator path now (the #mock_content file) |store|))) store))) (def: (write content path) @@ -1261,7 +1261,7 @@ [[name file] (..retrieve_mock_file! separator path |store|)] (..update_mock_file! separator path now (# binary.monoid composite - (value@ #mock_content file) + (the #mock_content file) content) |store|))) store)))) @@ -1273,7 +1273,7 @@ (case (do try.monad [[name file] (..retrieve_mock_file! separator origin |store|) |store| (..delete_mock_node! separator origin |store|)] - (..update_mock_file! separator destination (value@ #mock_last_modified file) (value@ #mock_content file) |store|)) + (..update_mock_file! separator destination (the #mock_last_modified file) (the #mock_content file) |store|)) {try.#Success |store|} (do ! [_ (stm.write |store| store)] diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux index c26923c54..5ad94c22e 100644 --- a/stdlib/source/library/lux/world/file/watch.lux +++ b/stdlib/source/library/lux/world/file/watch.lux @@ -1,36 +1,36 @@ (.using - [library - [lux "*" - ["@" target] - ["[0]" ffi {"+" import:}] - [abstract - [predicate {"+" Predicate}] - ["[0]" monad {"+" do}]] - [control - ["[0]" io {"+" IO}] - ["[0]" maybe] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - [concurrency - ["[0]" async {"+" Async}] - ["[0]" stm {"+" STM Var}]]] - [data - ["[0]" product] - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" dictionary {"+" Dictionary}] - ["[0]" list ("[1]#[0]" functor monoid mix)] - ["[0]" set] - ["[0]" array]]] - [math - [number - ["n" nat]]] - [time - ["[0]" instant {"+" Instant} ("[1]#[0]" equivalence)]] - [type - [abstract {"+" abstract: :representation :abstraction}]]]] - ["[0]" //]) + [library + [lux "*" + ["@" target] + ["[0]" ffi {"+" import:}] + [abstract + [predicate {"+" Predicate}] + ["[0]" monad {"+" do}]] + [control + ["[0]" io {"+" IO}] + ["[0]" maybe] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + [concurrency + ["[0]" async {"+" Async}] + ["[0]" stm {"+" STM Var}]]] + [data + ["[0]" product] + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" dictionary {"+" Dictionary}] + ["[0]" list ("[1]#[0]" functor monoid mix)] + ["[0]" set] + ["[0]" array]]] + [math + [number + ["n" nat]]] + [time + ["[0]" instant {"+" Instant} ("[1]#[0]" equivalence)]] + [type + [abstract {"+" abstract: :representation :abstraction}]]]] + ["[0]" //]) (abstract: .public Concern (Record @@ -55,7 +55,7 @@ (def: .public <predicate> (Predicate Concern) - (|>> :representation (value@ <event>)))] + (|>> :representation (the <event>)))] [creation creation? #creation true false false] diff --git a/stdlib/source/library/lux/world/net/http/client.lux b/stdlib/source/library/lux/world/net/http/client.lux index 9dd11a62f..85e9c2cbd 100644 --- a/stdlib/source/library/lux/world/net/http/client.lux +++ b/stdlib/source/library/lux/world/net/http/client.lux @@ -1,34 +1,34 @@ (.using - [library - [lux "*" - ["@" target] - ["[0]" ffi] - [abstract - ["[0]" monad {"+" do}]] - [control - [pipe {"+" case>}] - ["[0]" io {"+" IO}] - ["[0]" maybe ("[1]#[0]" functor)] - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["<[0]>" code]]] - [data - ["[0]" binary {"+" Binary}] - ["[0]" text] - [collection - ["[0]" dictionary]]] - [macro - [syntax {"+" syntax:}] - ["[0]" code] - ["[0]" template]] - [math - [number - ["n" nat] - ["i" int]]]]] - ["[0]" // - [// {"+" URL}]]) + [library + [lux "*" + ["@" target] + ["[0]" ffi] + [abstract + ["[0]" monad {"+" do}]] + [control + [pipe {"+" case>}] + ["[0]" io {"+" IO}] + ["[0]" maybe ("[1]#[0]" functor)] + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["<[0]>" code]]] + [data + ["[0]" binary {"+" Binary}] + ["[0]" text] + [collection + ["[0]" dictionary]]] + [macro + [syntax {"+" syntax:}] + ["[0]" code] + ["[0]" template]] + [math + [number + ["n" nat] + ["i" int]]]]] + ["[0]" // + [// {"+" URL}]]) (type: .public (Client !) (Interface @@ -227,10 +227,10 @@ async.future (# async.monad each (|>> (case> {try.#Success [status message]} - {try.#Success [status (revised@ //.#body (: (-> (//.Body IO) (//.Body Async)) - (function (_ body) - (|>> body async.future))) - message)]} + {try.#Success [status (revised //.#body (: (-> (//.Body IO) (//.Body Async)) + (function (_ body) + (|>> body async.future))) + message)]} {try.#Failure error} {try.#Failure error})))))) diff --git a/stdlib/source/library/lux/world/net/http/request.lux b/stdlib/source/library/lux/world/net/http/request.lux index 6bc72ff50..a7a29eaca 100644 --- a/stdlib/source/library/lux/world/net/http/request.lux +++ b/stdlib/source/library/lux/world/net/http/request.lux @@ -1,33 +1,33 @@ (.using - [library - [lux "*" - [control - pipe - ["[0]" monad {"+" do}] - ["[0]" maybe] - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}] - ["[0]" frp]] - [parser - ["<[0]>" json]]] - [data - ["[0]" number - ["n" nat]] - ["[0]" text - ["[0]" encoding]] - [format - ["[0]" json {"+" JSON}] - ["[0]" context {"+" Context Property}]] - [collection - ["[0]" list ("[1]#[0]" functor mix)] - ["[0]" dictionary]]] - [world - ["[0]" binary {"+" Binary}]]]] - ["[0]" // {"+" Body Response Server} - ["[1][0]" response] - ["[1][0]" query] - ["[1][0]" cookie]]) + [library + [lux "*" + [control + pipe + ["[0]" monad {"+" do}] + ["[0]" maybe] + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}] + ["[0]" frp]] + [parser + ["<[0]>" json]]] + [data + ["[0]" number + ["n" nat]] + ["[0]" text + ["[0]" encoding]] + [format + ["[0]" json {"+" JSON}] + ["[0]" context {"+" Context Property}]] + [collection + ["[0]" list ("[1]#[0]" functor mix)] + ["[0]" dictionary]]] + [world + ["[0]" binary {"+" Binary}]]]] + ["[0]" // {"+" Body Response Server} + ["[1][0]" response] + ["[1][0]" query] + ["[1][0]" cookie]]) (def: (merge inputs) (-> (List Binary) Binary) @@ -54,9 +54,9 @@ (def: .public (json reader server) (All (_ a) (-> (<json>.Reader a) (-> a Server) Server)) - (function (_ (^@ request [identification protocol resource message])) + (function (_ (^let request [identification protocol resource message])) (do async.monad - [?raw (read_text_body (value@ //.#body message))] + [?raw (read_text_body (the //.#body message))] (case (do try.monad [raw ?raw content (# json.codec decoded raw)] @@ -69,9 +69,9 @@ (def: .public (text server) (-> (-> Text Server) Server) - (function (_ (^@ request [identification protocol resource message])) + (function (_ (^let request [identification protocol resource message])) (do async.monad - [?raw (read_text_body (value@ //.#body message))] + [?raw (read_text_body (the //.#body message))] (case ?raw {try.#Success content} (server content request) @@ -82,14 +82,14 @@ (def: .public (query property server) (All (_ a) (-> (Property a) (-> a Server) Server)) (function (_ [identification protocol resource message]) - (let [full (value@ //.#uri resource) + (let [full (the //.#uri resource) [uri query] (|> full (text.split_by "?") (maybe.else [full ""]))] (case (do try.monad [query (//query.parameters query) input (context.result query property)] - (in [[identification protocol (with@ //.#uri uri resource) message] + (in [[identification protocol (has //.#uri uri resource) message] input])) {try.#Success [request input]} (server input request) @@ -99,9 +99,9 @@ (def: .public (form property server) (All (_ a) (-> (Property a) (-> a Server) Server)) - (function (_ (^@ request [identification protocol resource message])) + (function (_ (^let request [identification protocol resource message])) (do async.monad - [?body (read_text_body (value@ //.#body message))] + [?body (read_text_body (the //.#body message))] (case (do try.monad [body ?body form (//query.parameters body)] @@ -114,9 +114,9 @@ (def: .public (cookies property server) (All (_ a) (-> (Property a) (-> a Server) Server)) - (function (_ (^@ request [identification protocol resource message])) + (function (_ (^let request [identification protocol resource message])) (case (do try.monad - [cookies (|> (value@ //.#headers message) + [cookies (|> (the //.#headers message) (dictionary.value "Cookie") (maybe.else "") //cookie.get)] diff --git a/stdlib/source/library/lux/world/net/http/response.lux b/stdlib/source/library/lux/world/net/http/response.lux index b19571a45..eeb67bcde 100644 --- a/stdlib/source/library/lux/world/net/http/response.lux +++ b/stdlib/source/library/lux/world/net/http/response.lux @@ -1,26 +1,26 @@ (.using - [library - [lux {"-" static} - [control - [concurrency - ["[0]" async] - ["[0]" frp ("[1]#[0]" monad)]]] - [data - ["[0]" text - ["[0]" encoding]] - [format - ["[0]" html] - ["[0]" css {"+" CSS}] - ["[0]" context] - ["[0]" json {"+" JSON} ("[1]#[0]" codec)]]] - ["[0]" io] - [world - ["[0]" binary {"+" Binary}]]]] - ["[0]" // {"+" Status Body Response Server} - ["[0]" status] - ["[0]" mime {"+" MIME}] - ["[0]" header] - [// {"+" URL}]]) + [library + [lux {"-" static} + [control + [concurrency + ["[0]" async] + ["[0]" frp ("[1]#[0]" monad)]]] + [data + ["[0]" text + ["[0]" encoding]] + [format + ["[0]" html] + ["[0]" css {"+" CSS}] + ["[0]" context] + ["[0]" json {"+" JSON} ("[1]#[0]" codec)]]] + ["[0]" io] + [world + ["[0]" binary {"+" Binary}]]]] + ["[0]" // {"+" Status Body Response Server} + ["[0]" status] + ["[0]" mime {"+" MIME}] + ["[0]" header] + [// {"+" URL}]]) (def: .public (static response) (-> Response Server) @@ -40,7 +40,7 @@ (def: .public (temporary_redirect to) (-> URL Response) (let [[status message] (..empty status.temporary_redirect)] - [status (revised@ //.#headers (header.location to) message)])) + [status (revised //.#headers (header.location to) message)])) (def: .public not_found Response diff --git a/stdlib/source/library/lux/world/net/http/route.lux b/stdlib/source/library/lux/world/net/http/route.lux index 9da7710ac..e882c126c 100644 --- a/stdlib/source/library/lux/world/net/http/route.lux +++ b/stdlib/source/library/lux/world/net/http/route.lux @@ -1,24 +1,24 @@ (.using - [library - [lux {"-" or} - [control - [monad {"+" do}] - ["[0]" maybe] - [concurrency - ["[0]" async]]] - [data - ["[0]" text] - [number - ["n" nat]]]]] - ["[0]" // {"+" URI Server} - ["[1][0]" status] - ["[1][0]" response]]) + [library + [lux {"-" or} + [control + [monad {"+" do}] + ["[0]" maybe] + [concurrency + ["[0]" async]]] + [data + ["[0]" text] + [number + ["n" nat]]]]] + ["[0]" // {"+" URI Server} + ["[1][0]" status] + ["[1][0]" response]]) (template [<scheme> <name>] [(def: .public (<name> server) (-> Server Server) - (function (_ (^@ request [identification protocol resource message])) - (case (value@ //.#scheme protocol) + (function (_ (^let request [identification protocol resource message])) + (case (the //.#scheme protocol) {<scheme>} (server request) @@ -32,8 +32,8 @@ (template [<method> <name>] [(def: .public (<name> server) (-> Server Server) - (function (_ (^@ request [identification protocol resource message])) - (case (value@ //.#method resource) + (function (_ (^let request [identification protocol resource message])) + (case (the //.#method resource) {<method>} (server request) @@ -54,12 +54,12 @@ (def: .public (uri path server) (-> URI Server Server) (function (_ [identification protocol resource message]) - (if (text.starts_with? path (value@ //.#uri resource)) + (if (text.starts_with? path (the //.#uri resource)) (server [identification protocol - (revised@ //.#uri - (|>> (text.clip_since (text.size path)) maybe.trusted) - resource) + (revised //.#uri + (|>> (text.clip_since (text.size path)) maybe.trusted) + resource) message]) (async.resolved //response.not_found)))) diff --git a/stdlib/source/library/lux/world/program.lux b/stdlib/source/library/lux/world/program.lux index 7ec1fbd68..cb3c96f19 100644 --- a/stdlib/source/library/lux/world/program.lux +++ b/stdlib/source/library/lux/world/program.lux @@ -24,7 +24,8 @@ ["[0]" dictionary {"+" Dictionary}] ["[0]" list ("[1]#[0]" functor)]]] ["[0]" ffi {"+" import:} - (~~ (.for ["JavaScript" (~~ (.as_is ["[0]" node_js]))] + (~~ (.for ["JavaScript" (~~ (.as_is ["[0]" node_js])) + "{old}" (~~ (.as_is ["node_js" //math]))] (~~ (.as_is))))] ["[0]" macro ["[0]" template]] diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index e61b08397..af302a16b 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -1,71 +1,71 @@ (.using - [library - [lux "*" - [program {"+" program:}] - ["[0]" debug] - [abstract - [monad {"+" do}]] - [control - [pipe {"+" do>}] - ["[0]" io {"+" IO}] - ["[0]" try {"+" Try} ("[1]#[0]" functor)] - ["[0]" exception {"+" exception:}] - [parser - [environment {"+" Environment}]] - [concurrency - ["[0]" async {"+" Async} ("[1]#[0]" monad)]]] - [data - [binary {"+" Binary}] - ["[0]" text - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml]] - [collection - ["[0]" set] - ["[0]" dictionary {"+" Dictionary}] - ["[0]" list ("[1]#[0]" functor)]]] - [tool - [compiler - [language - [lux - ["[0]" syntax]]]]] - [world - ["[0]" shell {"+" Exit Shell}] - ["[0]" console {"+" Console}] - ["[0]" program {"+" Program}] - ["[0]" file {"+" Path} - ["[0]" watch]] - [net - ["[0]" http "_" - ["[1]" client]]]]]] - ["[0]" / "_" - ["[1]" profile] - ["[1][0]" action {"+" Action}] - ["[1][0]" project {"+" Project}] - ["[1][0]" input] - ["[1][0]" pom] - ["[1][0]" cli] - ["[1][0]" dependency "_" - ["[1]" resolution {"+" Resolution}]] - ["[1][0]" repository {"+" Repository} - ["[1]/[0]" remote {"+" Address}] - ["[1]/[0]" local]] - ["[1][0]" command {"+" Command} - ["[1]/[0]" version] - ["[1]/[0]" clean] - ["[1]/[0]" pom] - ["[1]/[0]" install] - ["[1]/[0]" deps] - ["[1]/[0]" build] - ["[1]/[0]" test] - ["[1]/[0]" auto] - ["[1]/[0]" deploy]]]) + [library + [lux "*" + [program {"+" program:}] + ["[0]" debug] + [abstract + [monad {"+" do}]] + [control + [pipe {"+" do>}] + ["[0]" io {"+" IO}] + ["[0]" try {"+" Try} ("[1]#[0]" functor)] + ["[0]" exception {"+" exception:}] + [parser + [environment {"+" Environment}]] + [concurrency + ["[0]" async {"+" Async} ("[1]#[0]" monad)]]] + [data + [binary {"+" Binary}] + ["[0]" text + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml]] + [collection + ["[0]" set] + ["[0]" dictionary {"+" Dictionary}] + ["[0]" list ("[1]#[0]" functor)]]] + [tool + [compiler + [language + [lux + ["[0]" syntax]]]]] + [world + ["[0]" shell {"+" Exit Shell}] + ["[0]" console {"+" Console}] + ["[0]" program {"+" Program}] + ["[0]" file {"+" Path} + ["[0]" watch]] + [net + ["[0]" http "_" + ["[1]" client]]]]]] + ["[0]" / "_" + ["[1]" profile] + ["[1][0]" action {"+" Action}] + ["[1][0]" project {"+" Project}] + ["[1][0]" input] + ["[1][0]" pom] + ["[1][0]" cli] + ["[1][0]" dependency "_" + ["[1]" resolution {"+" Resolution}]] + ["[1][0]" repository {"+" Repository} + ["[1]/[0]" remote {"+" Address}] + ["[1]/[0]" local]] + ["[1][0]" command {"+" Command} + ["[1]/[0]" version] + ["[1]/[0]" clean] + ["[1]/[0]" pom] + ["[1]/[0]" install] + ["[1]/[0]" deps] + ["[1]/[0]" build] + ["[1]/[0]" test] + ["[1]/[0]" auto] + ["[1]/[0]" deploy]]]) (def: repositories (-> /.Profile (List (Repository Async))) - (|>> (value@ /.#repositories) + (|>> (the /.#repositories) set.list (list#each (|>> (/repository/remote.repository http.default {.#None}) /repository.async)))) @@ -164,9 +164,9 @@ {/cli.#Deploy repository identity} (..command - (case (value@ /.#identity profile) + (case (the /.#identity profile) {.#Some artifact} - (case (dictionary.value repository (value@ /.#deploy_repositories profile)) + (case (dictionary.value repository (the /.#deploy_repositories profile)) {.#Some repository} (/command/deploy.do! console (/repository.async (/repository/remote.repository http.default {.#Some identity} repository)) @@ -175,7 +175,7 @@ profile) {.#None} - (async#in (exception.except ..cannot_find_repository [repository (value@ /.#deploy_repositories profile)]))) + (async#in (exception.except ..cannot_find_repository [repository (the /.#deploy_repositories profile)]))) {.#None} (async#in (exception.except /.no_identity [])))) diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index cc47f081e..b7342a650 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -1,20 +1,20 @@ (.using - [library - [lux {"-" local} - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}] - [hash {"+" Hash}]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" order) - ["%" format {"+" Format}]] - [collection - ["[0]" list ("[1]#[0]" monoid)]]] - [world - ["[0]" file {"+" Path}] - [net - ["[0]" uri {"+" URI}]]]]]) + [library + [lux {"-" local} + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}] + [hash {"+" Hash}]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" order) + ["%" format {"+" Format}]] + [collection + ["[0]" list ("[1]#[0]" monoid)]]] + [world + ["[0]" file {"+" Path}] + [net + ["[0]" uri {"+" URI}]]]]]) (type: .public Group Text) @@ -50,18 +50,18 @@ ..equivalence) (def: (< reference subject) - (<| (or (text#< (value@ #group reference) - (value@ #group subject))) + (<| (or (text#< (the #group reference) + (the #group subject))) - (and (text#= (value@ #group reference) - (value@ #group subject))) - (or (text#< (value@ #name reference) - (value@ #name subject))) + (and (text#= (the #group reference) + (the #group subject))) + (or (text#< (the #name reference) + (the #name subject))) - (and (text#= (value@ #name reference) - (value@ #name subject))) - (text#< (value@ #version reference) - (value@ #version subject))))) + (and (text#= (the #name reference) + (the #name subject))) + (text#< (the #version reference) + (the #version subject))))) (template [<separator> <definition>] [(def: <definition> @@ -75,13 +75,13 @@ (def: .public (identity artifact) (-> Artifact Text) - (%.format (value@ #name artifact) + (%.format (the #name artifact) ..version_separator - (value@ #version artifact))) + (the #version artifact))) (def: .public (format value) (Format Artifact) - (%.format (value@ #group value) + (%.format (the #group value) ..identity_separator (..identity value))) @@ -94,16 +94,16 @@ (def: .public (uri version artifact) (-> Version Artifact URI) (let [/ uri.separator - group (..directory / (value@ #group artifact)) - name (value@ #name artifact) - ... version (value@ #version artifact) + group (..directory / (the #group artifact)) + name (the #name artifact) + ... version (the #version artifact) identity (..identity artifact)] (%.format group / name / version / identity))) (def: .public (local artifact) (-> Artifact (List Text)) (list#composite (|> artifact - (value@ #group) + (the #group) (text.all_split_by ..group_separator)) - (list (value@ #name artifact) - (value@ #version artifact)))) + (list (the #name artifact) + (the #version artifact)))) diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index 5d8b0b1d4..d447bfe1d 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -1,29 +1,29 @@ (.using - [library - [lux "*" - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - [collection - ["[0]" list] - ["[0]" set]]] - [world - [program {"+" Program}] - [shell {"+" Exit Shell}] - [console {"+" Console}] - ["[0]" file - ["[0]" watch {"+" Watcher}]]]]] - ["[0]" // "_" - ["/[1]" // "_" - [command {"+" Command}] - ["[1]" profile] - ["[1][0]" action] - [dependency - [resolution {"+" Resolution}]]]]) + [library + [lux "*" + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + [collection + ["[0]" list] + ["[0]" set]]] + [world + [program {"+" Program}] + [shell {"+" Exit Shell}] + [console {"+" Console}] + ["[0]" file + ["[0]" watch {"+" Watcher}]]]]] + ["[0]" // "_" + ["/[1]" // "_" + [command {"+" Command}] + ["[1]" profile] + ["[1][0]" action] + [dependency + [resolution {"+" Resolution}]]]]) (def: (targets fs path) (-> (file.System Async) file.Path (Async (List file.Path))) @@ -53,7 +53,7 @@ (with_expansions [<call> ((command console program fs shell resolution) profile)] (do [! async.monad] [targets (|> profile - (value@ ///.#sources) + (the ///.#sources) set.list (monad.each ! (..targets fs)) (# ! each list.together))] diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index 599887fe4..a0cd97fd9 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -58,8 +58,8 @@ (-> Group Name Finder) (|>> dictionary.entries (list.one (function (_ [dependency package]) - (if (and (text#= group (value@ [///dependency.#artifact ///artifact.#group] dependency)) - (text#= name (value@ [///dependency.#artifact ///artifact.#name] dependency))) + (if (and (text#= group (the [///dependency.#artifact ///artifact.#group] dependency)) + (text#= name (the [///dependency.#artifact ///artifact.#name] dependency))) {.#Some dependency} {.#None}))))) @@ -121,17 +121,17 @@ (def: (path fs home dependency) (All (_ !) (-> (file.System !) Path Dependency Path)) (let [/ (# fs separator) - artifact (value@ ///dependency.#artifact dependency)] + artifact (the ///dependency.#artifact dependency)] (|> artifact - (///local.uri (value@ ///artifact.#version artifact)) + (///local.uri (the ///artifact.#version artifact)) (text.replaced uri.separator /) (format home /) - (text.suffix (format "." (value@ ///dependency.#type dependency)))))) + (text.suffix (format "." (the ///dependency.#type dependency)))))) (def: (libraries fs home) (All (_ !) (-> (file.System !) Path Resolution (List Path))) (|>> dictionary.keys - (list.only (|>> (value@ ///dependency.#type) + (list.only (|>> (the ///dependency.#type) (text#= ///artifact/type.lux_library))) (list#each (..path fs home)))) @@ -166,14 +166,14 @@ (def: .public (host_dependencies fs home) (All (_ !) (-> (file.System !) Path Resolution (List Path))) (|>> dictionary.keys - (list.only (|>> (value@ ///dependency.#type) + (list.only (|>> (the ///dependency.#type) (text#= ///artifact/type.lux_library) not)) (list#mix (function (_ dependency uniques) - (let [artifact (value@ ///dependency.#artifact dependency) - identity [(value@ ///artifact.#group artifact) - (value@ ///artifact.#name artifact)] - version (value@ ///artifact.#version artifact)] + (let [artifact (the ///dependency.#artifact dependency) + identity [(the ///artifact.#group artifact) + (the ///artifact.#name artifact)] + version (the ///artifact.#version artifact)] (case (dictionary.value identity uniques) {.#Some [current_version current_path]} (if (# version_order < version current_version) @@ -266,15 +266,15 @@ runtime _ - (revised@ ///runtime.#parameters - (|>> (list& "-cp" (..jvm_class_path host_dependencies))) - runtime))) + (revised ///runtime.#parameters + (|>> (list& "-cp" (..jvm_class_path host_dependencies))) + runtime))) (def: .public (do! console program fs shell resolution) (-> (Console Async) (Program Async) (file.System Async) (Shell Async) Resolution (Command [Exit Lux Path])) (function (_ profile) - (let [target (value@ ///.#target profile)] - (case (value@ ///.#program profile) + (let [target (the ///.#target profile)] + (case (the ///.#program profile) {.#None} (async#in (exception.except ..no_specified_program [])) @@ -284,12 +284,12 @@ .let [home (# program home) working_directory (# program directory)]] (do ///action.monad - [[resolution lux] (async#in (..lux resolution (value@ ///.#lux profile))) + [[resolution lux] (async#in (..lux resolution (the ///.#lux profile))) .let [host_dependencies (..host_dependencies fs home resolution) [[command lux_params] output] (case lux {#JVM dependency} - [(|> (value@ ///.#java profile) - (with@ ///runtime.#parameters (list "program._")) + [(|> (the ///.#java profile) + (has ///runtime.#parameters (list "program._")) (with_jvm_class_path {.#Item (..path fs home dependency) host_dependencies})) "program.jar"] @@ -297,7 +297,7 @@ [{<tag> dependency} [(|> dependency (..path fs home) - (///runtime.for (value@ <runtime> profile))) + (///runtime.for (the <runtime> profile))) <program>]]) ([#JS ///.#js "program.js"] [#Python ///.#java "program.py"] @@ -310,11 +310,11 @@ (list "build") (..plural "--library" (..libraries fs home resolution)) (..plural "--host_dependency" host_dependencies) - (..plural "--compiler" (list#each compiler.format (value@ ///.#compilers profile))) - (..plural "--source" (set.list (value@ ///.#sources profile))) + (..plural "--compiler" (list#each compiler.format (the ///.#compilers profile))) + (..plural "--source" (set.list (the ///.#sources profile))) (..singular "--target" cache_directory) (..singular "--module" program_module) - (..singular "--configuration" (configuration.format (value@ ///.#configuration profile)))))] + (..singular "--configuration" (configuration.format (the ///.#configuration profile)))))] process (# shell execute [environment working_directory command diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux index 02405e189..34ed21042 100644 --- a/stdlib/source/program/aedifex/command/clean.lux +++ b/stdlib/source/program/aedifex/command/clean.lux @@ -1,22 +1,22 @@ (.using - [library - [lux "*" - [abstract - ["[0]" monad {"+" do}]] - [control - [try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - [text - ["%" format {"+" format}]]] - [world - ["[0]" file {"+" Path}] - ["[0]" console {"+" Console}]]]] - ["[0]" /// "_" - [command {"+" Command}] - ["[1]" profile] - ["[1][0]" action {"+" Action}]]) + [library + [lux "*" + [abstract + ["[0]" monad {"+" do}]] + [control + [try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + [text + ["%" format {"+" format}]]] + [world + ["[0]" file {"+" Path}] + ["[0]" console {"+" Console}]]]] + ["[0]" /// "_" + [command {"+" Command}] + ["[1]" profile] + ["[1][0]" action {"+" Action}]]) (def: (clean_files! fs root) (-> (file.System Async) Path (Async (Try Any))) @@ -33,7 +33,7 @@ (def: .public (do! console fs profile) (-> (Console Async) (file.System Async) (Command Any)) (do [! async.monad] - [.let [target (value@ ///.#target profile)] + [.let [target (the ///.#target profile)] ? (# fs directory? target) _ (let [! ///action.monad] (if ? diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux index 3ceefa7c1..180f39a95 100644 --- a/stdlib/source/program/aedifex/command/deploy.lux +++ b/stdlib/source/program/aedifex/command/deploy.lux @@ -61,7 +61,7 @@ (-> (Console Async) (Repository Async) (file.System Async) Artifact (Command Any)) (do [! ///action.monad] [library (|> profile - (value@ /.#sources) + (the /.#sources) set.list (export.library fs) (# ! each (binary.result tar.writer))) diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index 85c6fbb57..24e29882b 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -33,16 +33,16 @@ (def: format (%.Format Dependency) - (|>> (value@ ///dependency.#artifact) + (|>> (the ///dependency.#artifact) ///artifact.format %.text)) (def: .public (do! console local remotes new_repository profile) (-> (Console Async) (Repository Async) (List (Repository Async)) (-> URL (Repository Async)) (Command Resolution)) (do async.monad - [.let [dependencies (|> (value@ ///.#dependencies profile) + [.let [dependencies (|> (the ///.#dependencies profile) set.list - {.#Item (value@ ///.#lux profile)})] + {.#Item (the ///.#lux profile)})] [local_successes local_failures cache] (///dependency/resolution.all console (list local) new_repository diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index a1553e4bd..6933264d3 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -52,11 +52,11 @@ (def: .public (do! console fs repository profile) (-> (Console Async) (file.System Async) (Repository Async) (Command Any)) - (case (value@ /.#identity profile) + (case (the /.#identity profile) {.#Some identity} (do ///action.monad [package (|> profile - (value@ /.#sources) + (the /.#sources) set.list (export.library fs)) pom (|> profile diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux index 4aa1ecc54..649201465 100644 --- a/stdlib/source/program/aedifex/command/test.lux +++ b/stdlib/source/program/aedifex/command/test.lux @@ -36,7 +36,7 @@ (do [! ///action.monad] [.let [home (# program home)] [build_exit compiler program] (//build.do! console program fs shell resolution - (with@ ///.#program (value@ ///.#test profile) profile))] + (has ///.#program (the ///.#test profile) profile))] (if (i.= shell.normal build_exit) (do ! [_ (console.write_line ..start console) @@ -44,12 +44,12 @@ [test_command test_parameters] (case compiler {//build.#JVM dependency} (|> program - (///runtime.for (value@ ///.#java profile)) + (///runtime.for (the ///.#java profile)) (//build.with_jvm_class_path host_dependencies)) (^template [<tag> <runtime>] [{<tag> artifact} - (///runtime.for (value@ <runtime> profile) + (///runtime.for (the <runtime> profile) program)]) ([//build.#JS ///.#js] [//build.#Python ///.#python] diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index 3dd3d9c71..5bf2e4ef9 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -1,17 +1,17 @@ (.using - [library - [lux {"-" Type} - [abstract - [equivalence {"+" Equivalence}] - [order {"+" Order}] - [hash {"+" Hash}]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" order) - ["%" format {"+" format}]]]]] - ["[0]" // "_" - ["[1]" artifact {"+" Artifact} ("[1]#[0]" order) - [type {"+" Type}]]]) + [library + [lux {"-" Type} + [abstract + [equivalence {"+" Equivalence}] + [order {"+" Order}] + [hash {"+" Hash}]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" order) + ["%" format {"+" format}]]]]] + ["[0]" // "_" + ["[1]" artifact {"+" Artifact} ("[1]#[0]" order) + [type {"+" Type}]]]) (type: .public Dependency (Record @@ -36,10 +36,10 @@ ..equivalence) (def: (< reference subject) - (<| (or (//#< (value@ #artifact reference) - (value@ #artifact subject))) + (<| (or (//#< (the #artifact reference) + (the #artifact subject))) - (and (//#= (value@ #artifact reference) - (value@ #artifact subject))) - (text#< (value@ #type reference) - (value@ #type subject))))) + (and (//#= (the #artifact reference) + (the #artifact subject))) + (text#< (the #type reference) + (the #type subject))))) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 7098505d4..f55520ec1 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -91,39 +91,39 @@ (do try.monad [now (: (Try ///artifact/time.Time) (///artifact/time.of_instant now)) - .let [version_template (value@ ///artifact.#version artifact) + .let [version_template (the ///artifact.#version artifact) snapshot (|> snapshot - (revised@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] - (function (_ snapshot) - (case snapshot - {///artifact/snapshot.#Local} - {///artifact/snapshot.#Local} - - {///artifact/snapshot.#Remote [_ build]} - {///artifact/snapshot.#Remote [now (++ build)]}))) - (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#last_updated] now)) - versioning_snapshot (value@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]] + (revised [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] + (function (_ snapshot) + (case snapshot + {///artifact/snapshot.#Local} + {///artifact/snapshot.#Local} + + {///artifact/snapshot.#Remote [_ build]} + {///artifact/snapshot.#Remote [now (++ build)]}))) + (has [///metadata/snapshot.#versioning ///artifact/versioning.#last_updated] now)) + versioning_snapshot (the [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]] (in (|> snapshot - (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#versions] - (list [///artifact/snapshot/version.#extension type - ///artifact/snapshot/version.#value (///artifact/snapshot/version/value.format - [///artifact/snapshot/version/value.#version version_template - ///artifact/snapshot/version/value.#snapshot versioning_snapshot]) - ///artifact/snapshot/version.#updated now])) - ... (with@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] - ... (list#composite (..artifacts type (product.right (value@ ///package.#library package))) - ... (..artifacts ///artifact/type.pom (product.right (value@ ///package.#pom package))))) + (has [///metadata/snapshot.#versioning ///artifact/versioning.#versions] + (list [///artifact/snapshot/version.#extension type + ///artifact/snapshot/version.#value (///artifact/snapshot/version/value.format + [///artifact/snapshot/version/value.#version version_template + ///artifact/snapshot/version/value.#snapshot versioning_snapshot]) + ///artifact/snapshot/version.#updated now])) + ... (has [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] + ... (list#composite (..artifacts type (product.right (the ///package.#library package))) + ... (..artifacts ///artifact/type.pom (product.right (the ///package.#pom package))))) )))) (def: .public (one repository [artifact type] package) (-> (Repository Async) Dependency Package (Async (Try Artifact))) (do [! async.monad] [now (async.future instant.now) - .let [version_template (value@ ///artifact.#version artifact)]] + .let [version_template (the ///artifact.#version artifact)]] (do (try.with !) - [_ (with_status repository version_template [artifact type] (value@ ///package.#library package)) + [_ (with_status repository version_template [artifact type] (the ///package.#library package)) - _ (let [[pom pom_data status] (value@ ///package.#pom package)] + _ (let [[pom pom_data status] (the ///package.#pom package)] (with_status repository version_template [artifact ///artifact/type.pom] @@ -135,8 +135,8 @@ _ (///metadata/snapshot.write repository artifact snapshot) project (///metadata/artifact.read repository artifact) _ (|> project - (with@ ///metadata/artifact.#versions (list version_template)) - (with@ ///metadata/artifact.#last_updated now) + (has ///metadata/artifact.#versions (list version_template)) + (has ///metadata/artifact.#last_updated now) (///metadata/artifact.write repository artifact))] (in artifact)))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 627a3e6ef..1fcc77dd7 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -129,10 +129,10 @@ extension (///artifact/extension.extension type)] (do (try.with async.monad) [snapshot (///metadata/snapshot.read repository artifact) - .let [version_template (value@ [///metadata/snapshot.#artifact ///artifact.#version] snapshot) + .let [version_template (the [///metadata/snapshot.#artifact ///artifact.#version] snapshot) artifact_version (value.format [value.#version version_template - value.#snapshot (value@ [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]) - artifact (with@ ///artifact.#version artifact_version artifact)] + value.#snapshot (the [///metadata/snapshot.#versioning ///artifact/versioning.#snapshot] snapshot)]) + artifact (has ///artifact.#version artifact_version artifact)] [pom_data pom_status] (..hashed repository version_template artifact ///artifact/extension.pom) library_&_status (..hashed repository version_template artifact extension)] (# async.monad in @@ -157,8 +157,8 @@ (exception: .public (cannot_resolve [dependency Dependency]) (exception.report - ["Artifact" (%.text (///artifact.format (value@ //.#artifact dependency)))] - ["Type" (%.text (value@ //.#type dependency))])) + ["Artifact" (%.text (///artifact.format (the //.#artifact dependency)))] + ["Type" (%.text (the //.#type dependency))])) (template [<sigil> <name> <doing> <at>] [(def: (<name> console repository artifact) @@ -185,17 +185,17 @@ {.#Item repository alternatives} (do [! async.monad] - [_ (..announce_fetching console repository (value@ //.#artifact dependency)) + [_ (..announce_fetching console repository (the //.#artifact dependency)) outcome (..one repository dependency)] (case outcome {try.#Success package} (do ! - [_ (..announce_success console repository (value@ //.#artifact dependency))] + [_ (..announce_success console repository (the //.#artifact dependency))] (in outcome)) {try.#Failure error} (do ! - [_ (..announce_failure console repository (value@ //.#artifact dependency))] + [_ (..announce_failure console repository (the //.#artifact dependency))] (any console alternatives dependency)))))) (def: .public (all console repositories new_repository dependencies resolution) @@ -214,7 +214,7 @@ [successes failures resolution]) {.#Item head tail} - (case (value@ [//.#artifact ///artifact.#version] head) + (case (the [//.#artifact ///artifact.#version] head) ... Skip if there is no version "" (again repositories successes diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux index d0628f160..19800f4d9 100644 --- a/stdlib/source/program/aedifex/format.lux +++ b/stdlib/source/program/aedifex/format.lux @@ -115,13 +115,13 @@ (def: (info value) (Format /.Info) (|> ..empty - (..on_maybe "url" (value@ /.#url value) code.text) - (..on_maybe "scm" (value@ /.#scm value) code.text) - (..on_maybe "description" (value@ /.#description value) code.text) - (..on_list "licenses" (value@ /.#licenses value) ..license) - (..on_maybe "organization" (value@ /.#organization value) ..organization) - (..on_list "developers" (value@ /.#developers value) ..developer) - (..on_list "contributors" (value@ /.#contributors value) ..contributor) + (..on_maybe "url" (the /.#url value) code.text) + (..on_maybe "scm" (the /.#scm value) code.text) + (..on_maybe "description" (the /.#description value) code.text) + (..on_list "licenses" (the /.#licenses value) ..license) + (..on_maybe "organization" (the /.#organization value) ..organization) + (..on_list "developers" (the /.#developers value) ..developer) + (..on_list "contributors" (the /.#contributors value) ..contributor) ..aggregate)) (def: (artifact' [group name version]) @@ -157,20 +157,20 @@ (def: (profile value) (Format /.Profile) (`` (|> ..empty - (..on_list "parents" (value@ /.#parents value) code.text) - (..on_maybe "identity" (value@ /.#identity value) ..artifact) - (..on_maybe "info" (value@ /.#info value) ..info) - (..on_set "repositories" (value@ /.#repositories value) code.text) - (..on_set "dependencies" (value@ /.#dependencies value) ..dependency) - (dictionary.has ..lux_compiler_label (..dependency (value@ /.#lux value))) - (..on_list "compilers" (value@ /.#compilers value) ..compiler) - (..on_set "sources" (value@ /.#sources value) code.text) - (dictionary.has "target" (code.text (value@ /.#target value))) - (..on_maybe "program" (value@ /.#program value) code.text) - (..on_maybe "test" (value@ /.#test value) code.text) - (..on_dictionary "deploy_repositories" (value@ /.#deploy_repositories value) code.text code.text) + (..on_list "parents" (the /.#parents value) code.text) + (..on_maybe "identity" (the /.#identity value) ..artifact) + (..on_maybe "info" (the /.#info value) ..info) + (..on_set "repositories" (the /.#repositories value) code.text) + (..on_set "dependencies" (the /.#dependencies value) ..dependency) + (dictionary.has ..lux_compiler_label (..dependency (the /.#lux value))) + (..on_list "compilers" (the /.#compilers value) ..compiler) + (..on_set "sources" (the /.#sources value) code.text) + (dictionary.has "target" (code.text (the /.#target value))) + (..on_maybe "program" (the /.#program value) code.text) + (..on_maybe "test" (the /.#test value) code.text) + (..on_dictionary "deploy_repositories" (the /.#deploy_repositories value) code.text code.text) (~~ (template [<tag>] - [(dictionary.has (template.text [<tag>]) (..runtime (value@ <tag> value)))] + [(dictionary.has (template.text [<tag>]) (..runtime (the <tag> value)))] [/.#java] [/.#js] diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux index a191a74dd..097aedac8 100644 --- a/stdlib/source/program/aedifex/metadata.lux +++ b/stdlib/source/program/aedifex/metadata.lux @@ -1,15 +1,15 @@ (.using - [library - [lux "*" - [data - ["[0]" text - ["%" format {"+" format}]]] - [world - [file {"+" Path}] - [net - ["[0]" uri {"+" URI}]]]]] - ["[0]" // "_" - ["[1][0]" artifact {"+" Artifact}]]) + [library + [lux "*" + [data + ["[0]" text + ["%" format {"+" format}]]] + [world + [file {"+" Path}] + [net + ["[0]" uri {"+" URI}]]]]] + ["[0]" // "_" + ["[1][0]" artifact {"+" Artifact}]]) (def: remote_file Path @@ -18,16 +18,16 @@ (def: .public (remote_artifact_uri artifact) (-> Artifact URI) (let [/ uri.separator] - (format (//artifact.directory / (value@ //artifact.#group artifact)) - / (value@ //artifact.#name artifact) - / (value@ //artifact.#version artifact) + (format (//artifact.directory / (the //artifact.#group artifact)) + / (the //artifact.#name artifact) + / (the //artifact.#version artifact) / ..remote_file))) (def: .public (remote_project_uri artifact) (-> Artifact URI) (let [/ uri.separator] - (format (//artifact.directory / (value@ //artifact.#group artifact)) - / (value@ //artifact.#name artifact) + (format (//artifact.directory / (the //artifact.#group artifact)) + / (the //artifact.#name artifact) / ..remote_file))) (def: local_file diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index 27448f154..90ce39aa7 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -100,12 +100,12 @@ (-> Metadata XML) {xml.#Node ..<metadata> xml.attributes - (list (..group_format (value@ #group value)) - (..name_format (value@ #name value)) + (list (..group_format (the #group value)) + (..name_format (the #name value)) {xml.#Node ..<versioning> xml.attributes - (list (..versions_format (value@ #versions value)) - (..last_updated_format (value@ #last_updated value)))})}) + (list (..versions_format (the #versions value)) + (..last_updated_format (the #last_updated value)))})}) (def: (text tag) (-> xml.Tag (Parser Text)) diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index 487b91b8e..7aa41ff78 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -1,49 +1,49 @@ (.using - [library - [lux {"-" Type} - [abstract - [monad {"+" do}] - [equivalence {"+" Equivalence}]] - [control - [pipe {"+" do> case>}] - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}] - ["<>" parser - ["<[0]>" xml {"+" Parser}] - ["<[0]>" text]] - [concurrency - ["[0]" async {"+" Async}]]] - [data - ["[0]" product] - ["[0]" text - ["%" format] - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml {"+" XML}]] - [collection - ["[0]" list ("[1]#[0]" functor)]]] - [math - [number - ["n" nat]]] - ["[0]" time {"+" Time} - ["[0]" instant {"+" Instant}] - ["[0]" date {"+" Date}] - ["[0]" year] - ["[0]" month]] - [world - [net - ["[0]" uri {"+" URI}]]]]] - ["[0]" // - ["/[1]" // "_" - [repository {"+" Repository}] - ["[1][0]" artifact {"+" Group Name Version Artifact} - ["[1]/[0]" time] - ["[1]/[0]" type {"+" Type}] - ["[1]/[0]" versioning {"+" Versioning}] - ["[1]/[0]" snapshot - ["[1]/[0]" version] - ["[1]/[0]" stamp]]]]]) + [library + [lux {"-" Type} + [abstract + [monad {"+" do}] + [equivalence {"+" Equivalence}]] + [control + [pipe {"+" do> case>}] + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}] + ["<>" parser + ["<[0]>" xml {"+" Parser}] + ["<[0]>" text]] + [concurrency + ["[0]" async {"+" Async}]]] + [data + ["[0]" product] + ["[0]" text + ["%" format] + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml {"+" XML}]] + [collection + ["[0]" list ("[1]#[0]" functor)]]] + [math + [number + ["n" nat]]] + ["[0]" time {"+" Time} + ["[0]" instant {"+" Instant}] + ["[0]" date {"+" Date}] + ["[0]" year] + ["[0]" month]] + [world + [net + ["[0]" uri {"+" URI}]]]]] + ["[0]" // + ["/[1]" // "_" + [repository {"+" Repository}] + ["[1][0]" artifact {"+" Group Name Version Artifact} + ["[1]/[0]" time] + ["[1]/[0]" type {"+" Type}] + ["[1]/[0]" versioning {"+" Versioning}] + ["[1]/[0]" snapshot + ["[1]/[0]" version] + ["[1]/[0]" stamp]]]]]) (type: .public Metadata (Record @@ -96,14 +96,14 @@ ///artifact/snapshot/version.#updated ///artifact/time.epoch]] (|> (<xml>.somewhere ///artifact/versioning.parser) (# ! each - (revised@ ///artifact/versioning.#versions - (: (-> (List ///artifact/snapshot/version.Version) - (List ///artifact/snapshot/version.Version)) - (|>> (case> (^ (list)) - (list <default_version>) + (revised ///artifact/versioning.#versions + (: (-> (List ///artifact/snapshot/version.Version) + (List ///artifact/snapshot/version.Version)) + (|>> (case> (^ (list)) + (list <default_version>) - versions - versions))))) + versions + versions))))) (<>.else [///artifact/versioning.#snapshot {///artifact/snapshot.#Local} ///artifact/versioning.#last_updated ///artifact/time.epoch ///artifact/versioning.#versions (list <default_version>)])))] diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 841a0e581..fa0fb33af 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -1,32 +1,32 @@ (.using - [library - [lux {"-" local} - [abstract - [equivalence {"+" Equivalence}]] - [control - ["[0]" try {"+" Try} ("[1]#[0]" functor)] - [parser - ["<[0]>" xml]]] - [data - ["[0]" sum] - ["[0]" product] - ["[0]" binary {"+" Binary}] - [text - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml {"+" XML}]] - [collection - [set {"+" Set}]]]]] - ["[0]" // "_" - ["/" profile] - ["[1][0]" hash] - ["[1][0]" pom] - [dependency {"+" Dependency} - ["[1][0]" status {"+" Status}]] - [repository - [remote {"+" Address}] - ["[1][0]" origin {"+" Origin}]]]) + [library + [lux {"-" local} + [abstract + [equivalence {"+" Equivalence}]] + [control + ["[0]" try {"+" Try} ("[1]#[0]" functor)] + [parser + ["<[0]>" xml]]] + [data + ["[0]" sum] + ["[0]" product] + ["[0]" binary {"+" Binary}] + [text + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml {"+" XML}]] + [collection + [set {"+" Set}]]]]] + ["[0]" // "_" + ["/" profile] + ["[1][0]" hash] + ["[1][0]" pom] + [dependency {"+" Dependency} + ["[1][0]" status {"+" Status}]] + [repository + [remote {"+" Address}] + ["[1][0]" origin {"+" Origin}]]]) (type: .public Package (Record @@ -37,7 +37,7 @@ (template [<name> <tag>] [(def: .public (<name> package) (-> Package Bit) - (case (value@ #origin package) + (case (the #origin package) {<tag> _} true @@ -62,19 +62,19 @@ (def: .public dependencies (-> Package (Try (Set Dependency))) - (|>> (value@ #pom) + (|>> (the #pom) product.left list (<xml>.result //pom.parser) - (try#each (value@ /.#dependencies)))) + (try#each (the /.#dependencies)))) (def: .public repositories (-> Package (Try (Set Address))) - (|>> (value@ #pom) + (|>> (the #pom) product.left list (<xml>.result //pom.parser) - (try#each (value@ /.#repositories)))) + (try#each (the /.#repositories)))) (def: .public equivalence (Equivalence Package) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 26dd35348..ccb7f11ac 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -59,9 +59,9 @@ (def: (artifact value) (-> Artifact (List XML)) - (list (..property ..group_tag (value@ //artifact.#group value)) - (..property ..artifact_tag (value@ //artifact.#name value)) - (..property ..version_tag (value@ //artifact.#version value)))) + (list (..property ..group_tag (the //artifact.#group value)) + (..property ..artifact_tag (the //artifact.#name value)) + (..property ..version_tag (the //artifact.#version value)))) (def: distribution (-> /.Distribution XML) @@ -86,8 +86,8 @@ (-> Dependency XML) {_.#Node ["" ..dependency_tag] _.attributes - (list#composite (..artifact (value@ //dependency.#artifact value)) - (list (..property "type" (value@ //dependency.#type value))))}) + (list#composite (..artifact (the //dependency.#artifact value)) + (list (..property "type" (the //dependency.#type value))))}) (def: (group tag) (-> Text (-> (List XML) XML)) @@ -129,27 +129,27 @@ (def: (info value) (-> /.Info (List XML)) ($_ list#composite - (|> value (value@ /.#url) (maybe#each (..property ..url_tag)) maybe.list) - (|> value (value@ /.#description) (maybe#each (..property "description")) maybe.list) - (|> value (value@ /.#licenses) (list#each ..license) (..group "licenses") list) - (|> value (value@ /.#scm) (maybe#each ..scm) maybe.list) - (|> value (value@ /.#organization) (maybe#each ..organization) maybe.list) - (|> value (value@ /.#developers) (list#each ..developer) (..group "developers") list) - (|> value (value@ /.#contributors) (list#each ..contributor) (..group "contributors") list) + (|> value (the /.#url) (maybe#each (..property ..url_tag)) maybe.list) + (|> value (the /.#description) (maybe#each (..property "description")) maybe.list) + (|> value (the /.#licenses) (list#each ..license) (..group "licenses") list) + (|> value (the /.#scm) (maybe#each ..scm) maybe.list) + (|> value (the /.#organization) (maybe#each ..organization) maybe.list) + (|> value (the /.#developers) (list#each ..developer) (..group "developers") list) + (|> value (the /.#contributors) (list#each ..contributor) (..group "contributors") list) )) ) (def: .public (write value) (-> /.Profile (Try XML)) - (case (value@ /.#identity value) + (case (the /.#identity value) {.#Some identity} {try.#Success {_.#Node ["" ..project_tag] _.attributes ($_ list#composite (list ..version) (..artifact identity) - (|> value (value@ /.#repositories) set.list (list#each ..repository) (..group "repositories") list) - (|> value (value@ /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list) + (|> value (the /.#repositories) set.list (list#each ..repository) (..group "repositories") list) + (|> value (the /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list) )}} _ @@ -226,7 +226,7 @@ (<>.else (list))) _ (<>.some <xml>.any)] (in (|> (# /.monoid identity) - (revised@ /.#dependencies (function (_ empty) - (list#mix set.has empty dependencies))) - (revised@ /.#repositories (function (_ empty) - (list#mix set.has empty repositories))))))))) + (revised /.#dependencies (function (_ empty) + (list#mix set.has empty dependencies))) + (revised /.#repositories (function (_ empty) + (list#mix set.has empty repositories))))))))) diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux index 43887caa4..048aabf27 100644 --- a/stdlib/source/program/aedifex/profile.lux +++ b/stdlib/source/program/aedifex/profile.lux @@ -247,26 +247,26 @@ (def: (composite override baseline) (template.let [(!runtime <tag> <runtime>) - [(if (runtime#= <runtime> (value@ <tag> override)) - (value@ <tag> baseline) - (value@ <tag> override))]] - [#parents (list#composite (value@ #parents baseline) (value@ #parents override)) - #identity (maybe#composite (value@ #identity override) (value@ #identity baseline)) - #info (maybe#composite (value@ #info override) (value@ #info baseline)) - #repositories (set.union (value@ #repositories baseline) (value@ #repositories override)) - #dependencies (set.union (value@ #dependencies baseline) (value@ #dependencies override)) - #lux (if (dependency#= ..default_compiler (value@ #lux override)) - (value@ #lux baseline) - (value@ #lux override)) - #compilers (list#composite (value@ #compilers baseline) (value@ #compilers override)) - #sources (set.union (value@ #sources baseline) (value@ #sources override)) - #target (if (text#= ..default_target (value@ #target baseline)) - (value@ #target override) - (value@ #target baseline)) - #program (maybe#composite (value@ #program override) (value@ #program baseline)) - #test (maybe#composite (value@ #test override) (value@ #test baseline)) - #deploy_repositories (dictionary.merged (value@ #deploy_repositories override) (value@ #deploy_repositories baseline)) - #configuration (plist#composite (value@ #configuration override) (value@ #configuration baseline)) + [(if (runtime#= <runtime> (the <tag> override)) + (the <tag> baseline) + (the <tag> override))]] + [#parents (list#composite (the #parents baseline) (the #parents override)) + #identity (maybe#composite (the #identity override) (the #identity baseline)) + #info (maybe#composite (the #info override) (the #info baseline)) + #repositories (set.union (the #repositories baseline) (the #repositories override)) + #dependencies (set.union (the #dependencies baseline) (the #dependencies override)) + #lux (if (dependency#= ..default_compiler (the #lux override)) + (the #lux baseline) + (the #lux override)) + #compilers (list#composite (the #compilers baseline) (the #compilers override)) + #sources (set.union (the #sources baseline) (the #sources override)) + #target (if (text#= ..default_target (the #target baseline)) + (the #target override) + (the #target baseline)) + #program (maybe#composite (the #program override) (the #program baseline)) + #test (maybe#composite (the #test override) (the #test baseline)) + #deploy_repositories (dictionary.merged (the #deploy_repositories override) (the #deploy_repositories baseline)) + #configuration (plist#composite (the #configuration override) (the #configuration baseline)) #java (!runtime #java runtime.default_java) #js (!runtime #js runtime.default_js) #python (!runtime #python runtime.default_python) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index e576797b4..9741cc731 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -1,22 +1,22 @@ (.using - [library - [lux "*" - [abstract - [equivalence {"+" Equivalence}] - [monoid {"+" Monoid}] - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - ["[0]" exception {"+" exception:}]] - [data - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" dictionary {"+" Dictionary}] - ["[0]" set {"+" Set}] - ["[0]" list ("[1]#[0]" mix)]]]]] - ["[0]" // "_" - ["[1]" profile {"+" Name Profile}]]) + [library + [lux "*" + [abstract + [equivalence {"+" Equivalence}] + [monoid {"+" Monoid}] + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + ["[0]" exception {"+" exception:}]] + [data + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" dictionary {"+" Dictionary}] + ["[0]" set {"+" Set}] + ["[0]" list ("[1]#[0]" mix)]]]]] + ["[0]" // "_" + ["[1]" profile {"+" Name Profile}]]) (def: .public file "project.lux") @@ -56,17 +56,17 @@ (case (dictionary.value name project) {.#Some profile} (case (list.example (set.member? lineage) - (value@ //.#parents profile)) + (the //.#parents profile)) {.#Some ouroboros} (exception.except ..circular_dependency [ouroboros name]) {.#None} (do [! try.monad] [parents (monad.each ! (profile' (set.has name lineage) project) - (value@ //.#parents profile))] + (the //.#parents profile))] (in (list#mix (function (_ parent child) (# //.monoid composite child parent)) - (with@ //.#parents (list) profile) + (has //.#parents (list) profile) parents)))) {.#None} diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index 7f1a735b8..6252d75f2 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -68,11 +68,11 @@ http))] (case status (^ (static http/status.ok)) - (# ! each product.right ((value@ @http.#body message) {.#None})) + (# ! each product.right ((the @http.#body message) {.#None})) _ (do ! - [_ ((value@ @http.#body message) {.#Some 0})] + [_ ((the @http.#body message) {.#Some 0})] (# io.monad in (exception.except ..download_failure [(format address uri) status])))))) (def: (upload uri content) @@ -88,7 +88,7 @@ ..base_headers))) {.#Some content} http)) - _ ((value@ @http.#body message) {.#Some 0})] + _ ((the @http.#body message) {.#Some 0})] (case status (^ (static http/status.created)) (in []) diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux index 3e972edcb..78b17c8ea 100644 --- a/stdlib/source/program/aedifex/runtime.lux +++ b/stdlib/source/program/aedifex/runtime.lux @@ -1,18 +1,18 @@ (.using - [library - [lux {"-" for} - [abstract - [equivalence {"+" Equivalence}]] - [data - ["[0]" product] - ["[0]" text - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" monoid)]]] - [macro - ["[0]" template]] - [world - ["[0]" file]]]]) + [library + [lux {"-" for} + [abstract + [equivalence {"+" Equivalence}]] + [data + ["[0]" product] + ["[0]" text + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" monoid)]]] + [macro + ["[0]" template]] + [world + ["[0]" file]]]]) (type: .public Runtime (Record @@ -41,7 +41,7 @@ (def: .public (for runtime path) (-> Runtime file.Path Runtime) - (revised@ #parameters - (function (_ parameters) - (list#composite parameters (list path))) - runtime)) + (revised #parameters + (function (_ parameters) + (list#composite parameters (list path))) + runtime)) diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 082ad0db9..69bae4f82 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -156,7 +156,7 @@ ..timed (do (try.with async.monad) [.let [[compilation_host_dependencies compilation_libraries compilation_compilers compilation_sources compilation_target compilation_module compilation_configuration] compilation] - import (import.import (value@ platform.#&file_system platform) compilation_libraries) + import (import.import (the platform.#&file_system platform) compilation_libraries) [state archive phase_wrapper] (:sharing [<parameters>] (Platform <parameters>) platform @@ -172,8 +172,8 @@ (Async (Try [Archive (directive.State+ <parameters>)])) (:expected (platform.compile lux_compiler phase_wrapper import file_context expander platform compilation [archive state]))) - _ (cache.cache! (value@ platform.#&file_system platform) file_context archive) - host_dependencies (..load_host_dependencies (value@ platform.#&file_system platform) compilation_host_dependencies) + _ (cache.cache! (the platform.#&file_system platform) file_context archive) + host_dependencies (..load_host_dependencies (the platform.#&file_system platform) compilation_host_dependencies) _ (..package! (for [@.old (file.async file.default) @.jvm (file.async file.default) ... TODO: Handle this in a safer manner. @@ -188,7 +188,7 @@ {cli.#Export export} (<| (or_crash! "Export failed:") (do (try.with async.monad) - [_ (export.export (value@ platform.#&file_system platform) + [_ (export.export (the platform.#&file_system platform) export)] (in (debug.log! "Export complete!")))) diff --git a/stdlib/source/specification/aedifex/repository.lux b/stdlib/source/specification/aedifex/repository.lux index 3c9dd8f2c..9e22c1ac4 100644 --- a/stdlib/source/specification/aedifex/repository.lux +++ b/stdlib/source/specification/aedifex/repository.lux @@ -1,27 +1,27 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - ["[0]" binary - ["_[1]" \\test]]] - [math - ["[0]" random]]]] - [\\program - ["[0]" / - ["[1][0]" remote] - ["/[1]" // "_" - ["[1][0]" artifact {"+" Artifact} - ["[1]/[0]" extension]]]]] - [\\test - ["_[0]" // "_" - ["[1][0]" artifact]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + ["[0]" binary + ["_[1]" \\test]]] + [math + ["[0]" random]]]] + [\\program + ["[0]" / + ["[1][0]" remote] + ["/[1]" // "_" + ["[1][0]" artifact {"+" Artifact} + ["[1]/[0]" extension]]]]] + [\\test + ["_[0]" // "_" + ["[1][0]" artifact]]]) (def: .public (spec valid_artifact invalid_artifact subject) (-> Artifact Artifact (/.Repository Async) Test) @@ -29,11 +29,11 @@ [expected (_binary.random 100)] (in ($_ _.and' (do async.monad - [.let [good_uri (/remote.uri (value@ //artifact.#version valid_artifact) valid_artifact //artifact/extension.lux_library)] + [.let [good_uri (/remote.uri (the //artifact.#version valid_artifact) valid_artifact //artifact/extension.lux_library)] good_upload! (# subject upload good_uri expected) good_download! (# subject download good_uri) - .let [bad_uri (/remote.uri (value@ //artifact.#version invalid_artifact) invalid_artifact //artifact/extension.lux_library)] + .let [bad_uri (/remote.uri (the //artifact.#version invalid_artifact) invalid_artifact //artifact/extension.lux_library)] bad_upload! (# subject upload bad_uri expected) bad_download! (# subject download bad_uri)] (_.cover' [/.Repository] diff --git a/stdlib/source/specification/compositor.lux b/stdlib/source/specification/compositor.lux index aa2239cf7..f2af26161 100644 --- a/stdlib/source/specification/compositor.lux +++ b/stdlib/source/specification/compositor.lux @@ -1,33 +1,33 @@ (.using - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" io {"+" IO}] - ["[0]" try]] - [math - ["r" random]] - [tool - [compiler - ["[0]" analysis] - ["[0]" directive] - [phase - [macro {"+" Expander}] - [generation {"+" Bundle}]] - [default - [platform {"+" Platform}]]]]] - ["[0]" / "_" - ["[1][0]" common {"+" Runner Definer}] - ["[1]./" analysis "_" - ["[1][0]" type]] - ["[1]./" generation "_" - ["[1][0]" primitive] - ["[1][0]" structure] - ["[1][0]" reference] - ["[1][0]" case] - ["[1][0]" function] - ["[1][0]" common]]]) + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" io {"+" IO}] + ["[0]" try]] + [math + ["r" random]] + [tool + [compiler + ["[0]" analysis] + ["[0]" directive] + [phase + [macro {"+" Expander}] + [generation {"+" Bundle}]] + [default + [platform {"+" Platform}]]]]] + ["[0]" / "_" + ["[1][0]" common {"+" Runner Definer}] + ["[1]./" analysis "_" + ["[1][0]" type]] + ["[1]./" generation "_" + ["[1][0]" primitive] + ["[1][0]" structure] + ["[1][0]" reference] + ["[1][0]" case] + ["[1][0]" function] + ["[1][0]" common]]]) (def: (test runner definer state expander) (-> Runner Definer analysis.State+ Expander Test) @@ -60,7 +60,7 @@ (case ?state,runner,definer {try.#Success [[directive_bundle directive_state] runner definer]} (..test runner definer - (value@ [directive.#analysis directive.#state] directive_state) + (the [directive.#analysis directive.#state] directive_state) expander) {try.#Failure error} diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux index d9a7e1e24..f97ca894e 100644 --- a/stdlib/source/specification/compositor/common.lux +++ b/stdlib/source/specification/compositor/common.lux @@ -1,23 +1,23 @@ (.using - [lux "*" - [abstract - [monad {"+" do}]] - [control - ["[0]" io {"+" IO}] - ["[0]" try {"+" Try}]] - [tool - [compiler - ["[0]" reference] - ["[0]" analysis] - ["[0]" synthesis {"+" Synthesis}] - ["[0]" directive] - ["[0]" phase - ["[0]" macro {"+" Expander}] - ["[0]" generation {"+" Operation}] - [extension {"+" Extender} - ["[0]" bundle]]] - [default - ["[0]" platform {"+" Platform}]]]]]) + [lux "*" + [abstract + [monad {"+" do}]] + [control + ["[0]" io {"+" IO}] + ["[0]" try {"+" Try}]] + [tool + [compiler + ["[0]" reference] + ["[0]" analysis] + ["[0]" synthesis {"+" Synthesis}] + ["[0]" directive] + ["[0]" phase + ["[0]" macro {"+" Expander}] + ["[0]" generation {"+" Operation}] + [extension {"+" Extender} + ["[0]" bundle]]] + [default + ["[0]" platform {"+" Platform}]]]]]) (type: .public Runner (-> Text Synthesis (Try Any))) @@ -72,9 +72,9 @@ [?state (platform.initialize target expander analysis_bundle platform generation_bundle directive_bundle program extender)] (in (do try.monad [[directive_bundle directive_state] ?state - .let [generation_state (value@ [directive.#generation - directive.#state] - directive_state)]] + .let [generation_state (the [directive.#generation + directive.#state] + directive_state)]] (in [[directive_bundle directive_state] (..runner platform generation_state) (..definer platform generation_state)]))))) diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux index 6e7947aff..fba89a430 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux @@ -1,32 +1,32 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" try ("[1]#[0]" functor)] - [parser - ["<[0]>" text]]] - [data - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat] - ["i" int]]] - [time - ["[0]" instant]]]] - ["$[0]" /// "_" - ["[1][0]" stamp]] - [\\program - ["[0]" / - ["//[1]" /// - ["[1][0]" stamp] - ["[1][0]" time]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" try ("[1]#[0]" functor)] + [parser + ["<[0]>" text]]] + [data + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat] + ["i" int]]] + [time + ["[0]" instant]]]] + ["$[0]" /// "_" + ["[1][0]" stamp]] + [\\program + ["[0]" / + ["//[1]" /// + ["[1][0]" stamp] + ["[1][0]" time]]]]) (def: .public random (Random /.Value) @@ -47,18 +47,18 @@ (do random.monad [sample random stamp $///stamp.random] - (let [version (value@ /.#version sample) + (let [version (the /.#version sample) local! (text#= version - (/.format (with@ /.#snapshot {///.#Local} sample))) + (/.format (has /.#snapshot {///.#Local} sample))) remote_format (/.format [/.#version (format version /.snapshot) /.#snapshot {///.#Remote stamp}]) remote! - (and (text.starts_with? (format version (///time.format (value@ ///stamp.#time stamp))) + (and (text.starts_with? (format version (///time.format (the ///stamp.#time stamp))) remote_format) - (text.ends_with? (%.nat (value@ ///stamp.#build stamp)) + (text.ends_with? (%.nat (the ///stamp.#build stamp)) remote_format))] (_.cover [/.snapshot /.format] (and local! diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux index 2b10fe559..64155f029 100644 --- a/stdlib/source/test/aedifex/artifact/time/time.lux +++ b/stdlib/source/test/aedifex/artifact/time/time.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - ["[0]" time] - [abstract - [monad {"+" do}]] - [control - ["[0]" try ("[1]#[0]" functor)] - [parser - ["<[0]>" text]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat] - ["i" int]]]]] - [\\program - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + ["[0]" time] + [abstract + [monad {"+" do}]] + [control + ["[0]" try ("[1]#[0]" functor)] + [parser + ["<[0]>" text]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat] + ["i" int]]]]] + [\\program + ["[0]" /]]) (def: .public random (Random /.Time) (random.one (|>> time.clock - (with@ time.#milli_second 0) + (has time.#milli_second 0) time.time) random.time)) diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux index a392d6ae5..9888e2f58 100644 --- a/stdlib/source/test/aedifex/cache.lux +++ b/stdlib/source/test/aedifex/cache.lux @@ -1,49 +1,49 @@ (.using - [library - [lux {"-" Type type} - ["_" test {"+" Test}] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["[0]" environment]]] - [data - [binary {"+" Binary}] - ["[0]" text] - [format - [xml {"+" XML}]] - [collection - ["[0]" set] - ["[0]" dictionary]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]] - [world - ["[0]" file] - ["[0]" program]]]] + [library + [lux {"-" Type type} + ["_" test {"+" Test}] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["[0]" environment]]] + [data + [binary {"+" Binary}] + ["[0]" text] + [format + [xml {"+" XML}]] + [collection + ["[0]" set] + ["[0]" dictionary]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]] + [world + ["[0]" file] + ["[0]" program]]]] + [// + ["@[0]" profile] + ["@[0]" artifact] [// - ["@[0]" profile] - ["@[0]" artifact] - [// - [lux - [data - ["_[0]" binary]]]]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile {"+" Profile}] - ["[1][0]" package {"+" Package}] - ["[1][0]" pom] - ["[1][0]" dependency {"+" Dependency} - ["[1]/[0]" resolution {"+" Resolution}]] - ["[1][0]" artifact {"+" Artifact} - ["[1]/[0]" type {"+" Type}]] - ["[1][0]" repository "_" - ["[1]/[0]" origin]]]]]) + [lux + [data + ["_[0]" binary]]]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile {"+" Profile}] + ["[1][0]" package {"+" Package}] + ["[1][0]" pom] + ["[1][0]" dependency {"+" Dependency} + ["[1]/[0]" resolution {"+" Resolution}]] + ["[1][0]" artifact {"+" Artifact} + ["[1]/[0]" type {"+" Type}]] + ["[1][0]" repository "_" + ["[1]/[0]" origin]]]]]) (def: type (Random Type) @@ -57,7 +57,7 @@ (try.maybe (do try.monad [pom (//pom.write profile) - identity (try.of_maybe (value@ //.#identity profile))] + identity (try.of_maybe (the //.#identity profile))] (in [identity profile pom])))) @profile.random)) @@ -75,7 +75,7 @@ content ..content] (in [[//dependency.#artifact identity //dependency.#type type] - (with@ //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))]))) + (has //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))]))) (def: resolution (Random Resolution) @@ -88,14 +88,14 @@ (do ! [pom (random.one (function (_ [identity profile pom]) (|> profile - (with@ //.#dependencies (set.empty //dependency.hash)) - (with@ //.#identity {.#Some (value@ //dependency.#artifact dependency)}) + (has //.#dependencies (set.empty //dependency.hash)) + (has //.#identity {.#Some (the //dependency.#artifact dependency)}) //pom.write try.maybe)) ..profile) content ..content] (in [dependency - (with@ //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))))] + (has //package.#origin {//repository/origin.#Remote ""} (//package.local pom content))])))))] (in (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies))))) (def: singular @@ -116,7 +116,7 @@ [_ wrote! actual_package read!] (in (# //package.equivalence = - (with@ //package.#origin {//repository/origin.#Local ""} expected_package) + (has //package.#origin {//repository/origin.#Local ""} expected_package) actual_package))))))))) (def: plural @@ -138,7 +138,7 @@ actual read!] (in (# //dependency/resolution.equivalence = (# dictionary.functor each - (with@ //package.#origin {//repository/origin.#Local ""}) + (has //package.#origin {//repository/origin.#Local ""}) expected) actual))))))))) diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux index 9e315ebde..a9e9c56fb 100644 --- a/stdlib/source/test/aedifex/command/auto.lux +++ b/stdlib/source/test/aedifex/command/auto.lux @@ -1,48 +1,48 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - [pipe {"+" case>}] - ["[0]" try] - [parser - ["[0]" environment]] - [concurrency - ["[0]" atom {"+" Atom}] - ["[0]" async {"+" Async}]]] - [data - ["[0]" binary] - ["[0]" text - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [collection - ["[0]" set]]] - [math - ["[0]" random] - [number - ["n" nat]]] - [time - ["[0]" instant]] - [world - [console {"+" Console}] - ["[0]" shell {"+" Exit Shell}] - ["[0]" program {"+" Program}] - ["[0]" file - ["[0]" watch]]]]] - ["[0]" // "_" - ["$[0]" version] - ["$[0]" build]] - [\\program - ["[0]" / - ["//[1]" /// "_" - [command {"+" Command}] - ["[1]" profile {"+" Profile}] - ["[1][0]" action] - [dependency - [resolution {"+" Resolution}]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + [pipe {"+" case>}] + ["[0]" try] + [parser + ["[0]" environment]] + [concurrency + ["[0]" atom {"+" Atom}] + ["[0]" async {"+" Async}]]] + [data + ["[0]" binary] + ["[0]" text + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [collection + ["[0]" set]]] + [math + ["[0]" random] + [number + ["n" nat]]] + [time + ["[0]" instant]] + [world + [console {"+" Console}] + ["[0]" shell {"+" Exit Shell}] + ["[0]" program {"+" Program}] + ["[0]" file + ["[0]" watch]]]]] + ["[0]" // "_" + ["$[0]" version] + ["$[0]" build]] + [\\program + ["[0]" / + ["//[1]" /// "_" + [command {"+" Command}] + ["[1]" profile {"+" Profile}] + ["[1][0]" action] + [dependency + [resolution {"+" Resolution}]]]]]) (def: (command expected_runs end_signal fs dummy_file) (-> Nat Text (file.System Async) file.Path @@ -77,14 +77,14 @@ .let [empty_profile (: Profile (# ///.monoid identity)) with_target (: (-> Profile Profile) - (with@ ///.#target target)) + (has ///.#target target)) with_program (: (-> Profile Profile) - (with@ ///.#program {.#Some program})) + (has ///.#program {.#Some program})) profile (|> empty_profile with_program with_target - (with@ ///.#sources (set.of_list text.hash (list source))))] + (has ///.#sources (set.of_list text.hash (list source))))] home (random.ascii/alpha 5) working_directory (random.ascii/alpha 5) @@ -103,7 +103,7 @@ _ (# watcher poll [])] (do [! async.monad] [no_dangling_process! (|> profile - (with@ ///.#compiler compiler) + (has ///.#compiler compiler) ((/.do! 1 watcher command) ($version.echo "") (program.async (program.mock environment.empty home working_directory)) diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux index 4237bc8af..0b8eac768 100644 --- a/stdlib/source/test/aedifex/command/build.lux +++ b/stdlib/source/test/aedifex/command/build.lux @@ -1,41 +1,41 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - [pipe {"+" case>}] - [io {"+" IO}] - ["[0]" try] - ["[0]" exception] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["[0]" environment]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" dictionary]]] - [math - ["[0]" random {"+" Random}]] - [world - ["[0]" file] - ["[0]" shell {"+" Shell}] - ["[0]" program]]]] - ["[0]" // "_" - ["@[0]" version] - ["$/[1]" // "_" - ["[1][0]" package]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile {"+" Profile}] - ["[1][0]" action] - ["[1][0]" artifact - ["[1]/[0]" type]] - ["[1][0]" dependency {"+" Dependency} - ["[1]/[0]" resolution {"+" Resolution}]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + [pipe {"+" case>}] + [io {"+" IO}] + ["[0]" try] + ["[0]" exception] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["[0]" environment]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" dictionary]]] + [math + ["[0]" random {"+" Random}]] + [world + ["[0]" file] + ["[0]" shell {"+" Shell}] + ["[0]" program]]]] + ["[0]" // "_" + ["@[0]" version] + ["$/[1]" // "_" + ["[1][0]" package]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile {"+" Profile}] + ["[1][0]" action] + ["[1][0]" artifact + ["[1]/[0]" type]] + ["[1][0]" dependency {"+" Dependency} + ["[1]/[0]" resolution {"+" Resolution}]]]]]) (def: .public good_shell (-> Any (Shell IO)) @@ -151,9 +151,9 @@ .let [empty_profile (: Profile (# ///.monoid identity)) with_target (: (-> Profile Profile) - (with@ ///.#target target)) + (has ///.#target target)) with_program (: (-> Profile Profile) - (with@ ///.#program {.#Some program})) + (has ///.#program {.#Some program})) profile (|> empty_profile with_program @@ -185,7 +185,7 @@ [verdict (do ///action.monad [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs shell resolution - (with@ ///.#compiler compiler profile)) + (has ///.#compiler compiler profile)) start (# console read_line []) end (# console read_line [])] (in (and (text#= /.start start) @@ -207,7 +207,7 @@ [verdict (do ///action.monad [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async (..bad_shell [])) resolution - (with@ ///.#compiler compiler profile)) + (has ///.#compiler compiler profile)) start (# console read_line []) end (# console read_line [])] (in (and (text#= /.start start) diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux index c66150d63..6a2210f1b 100644 --- a/stdlib/source/test/aedifex/command/clean.lux +++ b/stdlib/source/test/aedifex/command/clean.lux @@ -1,40 +1,40 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - [binary {"+" Binary}] - ["[0]" product] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor)] - ["[0]" set]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]] - [world - ["[0]" file {"+" Path}]]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + [binary {"+" Binary}] + ["[0]" product] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor)] + ["[0]" set]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]] + [world + ["[0]" file {"+" Path}]]]] + [// + ["@[0]" version] [// - ["@[0]" version] + ["@[0]" profile] [// - ["@[0]" profile] - [// - [lux - [data - ["$[0]" binary]]]]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile] - ["[1][0]" action {"+" Action}]]]]) + [lux + [data + ["$[0]" binary]]]]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile] + ["[1][0]" action {"+" Action}]]]]) (def: node_name (Random Text) @@ -103,7 +103,7 @@ context_exists!/pre (..directory_exists? fs context) target_exists!/pre (..assets_exist? fs target_path direct_files) sub_exists!/pre (..assets_exist? fs sub_path sub_files) - _ (/.do! console fs (with@ ///.#target target_path dummy)) + _ (/.do! console fs (has ///.#target target_path dummy)) context_exists!/post (..directory_exists? fs context) target_exists!/post (..assets_exist? fs target_path direct_files) sub_exists!/post (..assets_exist? fs sub_path sub_files) diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux index 62c1ef931..7cdba510d 100644 --- a/stdlib/source/test/aedifex/command/deploy.lux +++ b/stdlib/source/test/aedifex/command/deploy.lux @@ -1,53 +1,53 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" maybe] - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["[0]" environment]]] - [data - ["[0]" binary ("[1]#[0]" equivalence)] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - ["[0]" format "_" - ["[1]" binary] - ["[0]" tar] - ["[0]" xml]] - [collection - ["[0]" set]]] - [math - ["[0]" random]] - [world - ["[0]" file] - ["[0]" program {"+" Program}]]]] - [program - [compositor - ["[0]" export]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" maybe] + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["[0]" environment]]] + [data + ["[0]" binary ("[1]#[0]" equivalence)] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + ["[0]" format "_" + ["[1]" binary] + ["[0]" tar] + ["[0]" xml]] + [collection + ["[0]" set]]] + [math + ["[0]" random]] + [world + ["[0]" file] + ["[0]" program {"+" Program}]]]] + [program + [compositor + ["[0]" export]]] + [// + ["$[0]" install] + ["$[0]" version] [// - ["$[0]" install] - ["$[0]" version] - [// - ["$[0]" profile] - ["$[0]" repository]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile] - ["[1][0]" action] - ["[1][0]" pom] - ["[1][0]" hash] - ["[1][0]" repository {"+" Repository} - ["[1]/[0]" remote]] - ["[1][0]" artifact {"+" Artifact} - ["[1]/[0]" extension]]]]]) + ["$[0]" profile] + ["$[0]" repository]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile] + ["[1][0]" action] + ["[1][0]" pom] + ["[1][0]" hash] + ["[1][0]" repository {"+" Repository} + ["[1]/[0]" remote]] + ["[1][0]" artifact {"+" Artifact} + ["[1]/[0]" extension]]]]]) (def: (execute! program repository fs artifact profile) (-> (Program Async) (Repository Async) (file.System Async) @@ -55,7 +55,7 @@ (Async (Try Text))) (do ///action.monad [.let [console ($version.echo "")] - _ ($install.make_sources! fs (value@ ///.#sources profile)) + _ ($install.make_sources! fs (the ///.#sources profile)) _ (/.do! console repository fs artifact profile)] (# console read_line []))) @@ -66,7 +66,7 @@ [[artifact expected_pom profile] (random.one (function (_ profile) (do maybe.monad - [artifact (value@ ///.#identity profile) + [artifact (the ///.#identity profile) expected_pom (try.maybe (///pom.write profile))] (in [artifact expected_pom profile]))) $profile.random) @@ -81,19 +81,19 @@ [verdict (do [! ///action.monad] [logging (..execute! program repository fs artifact profile) expected_library (|> profile - (value@ ///.#sources) + (the ///.#sources) set.list (export.library fs) (# ! each (format.result tar.writer))) - actual_pom (# repository download (///repository/remote.uri (value@ ///artifact.#version artifact) artifact ///artifact/extension.pom)) - actual_library (# repository download (///repository/remote.uri (value@ ///artifact.#version artifact) artifact ///artifact/extension.lux_library)) - actual_sha-1 (# repository download (///repository/remote.uri (value@ ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1))) + actual_pom (# repository download (///repository/remote.uri (the ///artifact.#version artifact) artifact ///artifact/extension.pom)) + actual_library (# repository download (///repository/remote.uri (the ///artifact.#version artifact) artifact ///artifact/extension.lux_library)) + actual_sha-1 (# repository download (///repository/remote.uri (the ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1))) actual_sha-1 (# async.monad in (do try.monad [actual_sha-1 (# utf8.codec decoded actual_sha-1)] (# ///hash.sha-1_codec decoded actual_sha-1))) - actual_md5 (# repository download (///repository/remote.uri (value@ ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5))) + actual_md5 (# repository download (///repository/remote.uri (the ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5))) actual_md5 (# async.monad in (do try.monad [actual_md5 (# utf8.codec decoded actual_md5)] diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux index 0362bce14..5b6c42a9c 100644 --- a/stdlib/source/test/aedifex/command/deps.lux +++ b/stdlib/source/test/aedifex/command/deps.lux @@ -1,56 +1,56 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - ["[0]" predicate]] - [control - ["[0]" try] - [concurrency - ["[0]" async]] - [parser - ["[0]" environment]]] - [data - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [collection - ["[0]" dictionary] - ["[0]" set]] - [format - ["[0]" xml]]] - [math - ["[0]" random {"+" Random}]] - [world - ["[0]" program] - ["[0]" file]]]] - ["[0]" // "_" - ["@[0]" version] - ["$/[1]" // "_" - ["[1][0]" package] - ["[1][0]" artifact] - ["[1][0]" dependency "_" - ["[1]/[0]" resolution]]]] - [\\program - ["[0]" / + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + ["[0]" predicate]] + [control + ["[0]" try] + [concurrency + ["[0]" async]] + [parser + ["[0]" environment]]] + [data + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [collection + ["[0]" dictionary] + ["[0]" set]] + [format + ["[0]" xml]]] + [math + ["[0]" random {"+" Random}]] + [world + ["[0]" program] + ["[0]" file]]]] + ["[0]" // "_" + ["@[0]" version] + ["$/[1]" // "_" + ["[1][0]" package] + ["[1][0]" artifact] + ["[1][0]" dependency "_" + ["[1]/[0]" resolution]]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1][0]" clean] ["/[1]" // "_" - ["[1][0]" clean] - ["/[1]" // "_" - ["[1]" profile] - ["[1][0]" action] - ["[1][0]" pom] - ["[1][0]" package] - ["[1][0]" artifact - ["[1]/[0]" type]] - ["[1][0]" dependency - ["[1]/[0]" resolution] - ["[1]/[0]" deployment] - ["[1]/[0]" status]] - ["[1][0]" repository - ["[1]/[0]" origin] - ["[1]/[0]" local]]]]]]) + ["[1]" profile] + ["[1][0]" action] + ["[1][0]" pom] + ["[1][0]" package] + ["[1][0]" artifact + ["[1]/[0]" type]] + ["[1][0]" dependency + ["[1]/[0]" resolution] + ["[1]/[0]" deployment] + ["[1]/[0]" status]] + ["[1][0]" repository + ["[1]/[0]" origin] + ["[1]/[0]" local]]]]]]) (def: .public test Test @@ -73,25 +73,25 @@ ///dependency.#type ///artifact/type.lux_library] dependee_pom (|> (# ///.monoid identity) - (with@ ///.#identity {.#Some dependee_artifact}) + (has ///.#identity {.#Some dependee_artifact}) ///pom.write try.trusted) depender_pom (|> (# ///.monoid identity) - (with@ ///.#identity {.#Some depender_artifact}) - (with@ ///.#dependencies (set.of_list ///dependency.hash (list dependee))) + (has ///.#identity {.#Some depender_artifact}) + (has ///.#dependencies (set.of_list ///dependency.hash (list dependee))) ///pom.write try.trusted) dependee_package (|> dependee_package - (with@ ///package.#origin {///repository/origin.#Remote ""}) - (with@ ///package.#pom [dependee_pom - (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}])) + (has ///package.#origin {///repository/origin.#Remote ""}) + (has ///package.#pom [dependee_pom + (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}])) depender_package (|> depender_package - (with@ ///package.#origin {///repository/origin.#Remote ""}) - (with@ ///package.#pom [depender_pom - (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}])) + (has ///package.#origin {///repository/origin.#Remote ""}) + (has ///package.#pom [depender_pom + (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}])) fs (file.mock (# file.default separator)) program (program.async (program.mock environment.empty home working_directory))]] @@ -103,7 +103,7 @@ (dictionary.has dependee dependee_package) (///dependency/deployment.all local)) post (|> (# ///.monoid identity) - (with@ ///.#dependencies (set.of_list ///dependency.hash (list dependee depender))) + (has ///.#dependencies (set.of_list ///dependency.hash (list dependee depender))) (/.do! console local (list (///repository.mock ($///dependency/resolution.single depender_artifact depender_package) [])) diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux index 4d1509924..fd4780195 100644 --- a/stdlib/source/test/aedifex/command/install.lux +++ b/stdlib/source/test/aedifex/command/install.lux @@ -1,43 +1,43 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" try {"+" Try} ("[1]#[0]" functor)] - ["[0]" exception] - [concurrency - ["[0]" async {"+" Async}]] - [parser - ["[0]" environment]]] - [data - ["[0]" binary] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]] - [collection - ["[0]" set {"+" Set}]]] - [math - ["[0]" random]] - [world - ["[0]" file] - ["[0]" program {"+" Program}]]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" try {"+" Try} ("[1]#[0]" functor)] + ["[0]" exception] + [concurrency + ["[0]" async {"+" Async}]] + [parser + ["[0]" environment]]] + [data + ["[0]" binary] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]] + [collection + ["[0]" set {"+" Set}]]] + [math + ["[0]" random]] + [world + ["[0]" file] + ["[0]" program {"+" Program}]]]] + [// + ["$[0]" version] [// - ["$[0]" version] - [// - ["$[0]" profile] - ["$[0]" artifact]]] - [\\program - ["[0]" / + ["$[0]" profile] + ["$[0]" artifact]]] + [\\program + ["[0]" / + ["/[1]" // "_" ["/[1]" // "_" - ["/[1]" // "_" - ["[1]" profile] - ["[1][0]" action {"+" Action}] - ["[1][0]" local] - ["[1][0]" artifact - ["[1]/[0]" extension]] - ["[1][0]" repository "_" - ["[1]/[0]" local]]]]]]) + ["[1]" profile] + ["[1][0]" action {"+" Action}] + ["[1][0]" local] + ["[1][0]" artifact + ["[1]/[0]" extension]] + ["[1][0]" repository "_" + ["[1]/[0]" local]]]]]]) (def: .public (make_sources! fs sources) (-> (file.System Async) (Set file.Path) (Action (List Any))) @@ -56,7 +56,7 @@ (-> (Program Async) (file.System Async) ///.Profile (Async (Try Text))) (do ///action.monad [.let [console ($version.echo "")] - _ (..make_sources! fs (value@ ///.#sources sample)) + _ (..make_sources! fs (the ///.#sources sample)) _ (/.do! console fs (///repository/local.repository program fs) sample)] (# console read_line []))) @@ -65,7 +65,7 @@ (<| (_.covering /._) (do [! random.monad] [identity $artifact.random - sample (# ! each (with@ ///.#identity {.#Some identity}) + sample (# ! each (has ///.#identity {.#Some identity}) $profile.random) home (random.ascii/alpha 5) working_directory (random.ascii/alpha 5) @@ -75,7 +75,7 @@ [.let [fs (file.mock /) program (program.async (program.mock environment.empty home working_directory)) - artifact_path (///local.uri (value@ ///artifact.#version identity) identity) + artifact_path (///local.uri (the ///artifact.#version identity) identity) library_path (format artifact_path ///artifact/extension.lux_library) pom_path (format artifact_path ///artifact/extension.pom)] verdict (do [! ///action.monad] @@ -97,7 +97,7 @@ (in (do [! async.monad] [.let [fs (file.mock /) program (program.async (program.mock environment.empty home working_directory))] - logging (..execute! program fs (with@ ///.#identity {.#None} sample))] + logging (..execute! program fs (has ///.#identity {.#None} sample))] (_.cover' [/.failure] (|> logging (try#each (text#= /.failure)) diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux index 82ca558ae..464189af0 100644 --- a/stdlib/source/test/aedifex/command/pom.lux +++ b/stdlib/source/test/aedifex/command/pom.lux @@ -1,34 +1,34 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try ("[1]#[0]" functor)] - [concurrency - ["[0]" async]]] - [data - ["[0]" binary ("[1]#[0]" equivalence)] - ["[0]" text ("[1]#[0]" equivalence) - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml]]] - [math - ["[0]" random]] - [world - ["[0]" file]]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try ("[1]#[0]" functor)] + [concurrency + ["[0]" async]]] + [data + ["[0]" binary ("[1]#[0]" equivalence)] + ["[0]" text ("[1]#[0]" equivalence) + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml]]] + [math + ["[0]" random]] + [world + ["[0]" file]]]] + [// + ["@[0]" version] [// - ["@[0]" version] - [// - ["@[0]" profile]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile] - ["[1][0]" action] - ["[1][0]" pom]]]]) + ["@[0]" profile]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile] + ["[1][0]" action] + ["[1][0]" pom]]]]) (def: .public test Test @@ -62,7 +62,7 @@ {try.#Failure error} (_.cover' [/.do!] - (case (value@ ///.#identity sample) + (case (the ///.#identity sample) {.#Some _} false diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux index 7be97a8bb..e992f87bc 100644 --- a/stdlib/source/test/aedifex/command/test.lux +++ b/stdlib/source/test/aedifex/command/test.lux @@ -1,43 +1,43 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try] - ["[0]" exception] - [concurrency - ["[0]" async]] - [parser - ["[0]" environment]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" dictionary] - ["[0]" list]]] - [math - ["[0]" random]] - [world - ["[0]" file] - ["[0]" shell] - ["[0]" program]]]] - ["[0]" // "_" - ["@[0]" version] - ["@[0]" build] - ["$/[1]" // "_" - ["[1][0]" package]]] - [\\program - ["[0]" / + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try] + ["[0]" exception] + [concurrency + ["[0]" async]] + [parser + ["[0]" environment]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" dictionary] + ["[0]" list]]] + [math + ["[0]" random]] + [world + ["[0]" file] + ["[0]" shell] + ["[0]" program]]]] + ["[0]" // "_" + ["@[0]" version] + ["@[0]" build] + ["$/[1]" // "_" + ["[1][0]" package]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1][0]" build] ["/[1]" // "_" - ["[1][0]" build] - ["/[1]" // "_" - ["[1]" profile {"+" Profile}] - ["[1][0]" action] - ["[1][0]" artifact - ["[1]/[0]" type]] - ["[1][0]" dependency - ["[1]/[0]" resolution]]]]]]) + ["[1]" profile {"+" Profile}] + ["[1][0]" action] + ["[1][0]" artifact + ["[1]/[0]" type]] + ["[1][0]" dependency + ["[1]/[0]" resolution]]]]]]) (def: .public test Test @@ -50,9 +50,9 @@ .let [empty_profile (: Profile (# ///.monoid identity)) with_target (: (-> Profile Profile) - (with@ ///.#target target)) + (has ///.#target target)) with_test (: (-> Profile Profile) - (with@ ///.#test {.#Some test})) + (has ///.#test {.#Some test})) profile (|> empty_profile with_test @@ -65,7 +65,7 @@ [verdict (do ///action.monad [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async (@build.good_shell [])) resolution - (with@ ///.#compiler compiler profile)) + (has ///.#compiler compiler profile)) build_start (# console read_line []) build_end (# console read_line []) test_start (# console read_line []) @@ -101,7 +101,7 @@ [])] _ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async bad_shell) resolution - (with@ ///.#compiler compiler profile)) + (has ///.#compiler compiler profile)) build_start (# console read_line []) build_end (# console read_line []) test_start (# console read_line []) diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux index 4a3946a53..c22121755 100644 --- a/stdlib/source/test/aedifex/dependency/deployment.lux +++ b/stdlib/source/test/aedifex/dependency/deployment.lux @@ -79,20 +79,20 @@ (-> Nat URL Package (Dictionary URL Binary) Artifact Artifact Bit) (let [url (: (-> URI URL) (|>> (format address))) - library_url (url (format (artifact.uri (value@ artifact.#version expected_artifact) + library_url (url (format (artifact.uri (the artifact.#version expected_artifact) expected_artifact) artifact/extension.lux_library)) - pom_url (url (format (artifact.uri (value@ artifact.#version expected_artifact) + pom_url (url (format (artifact.uri (the artifact.#version expected_artifact) expected_artifact) artifact/extension.pom)) artifact_metadata_url (url (metadata.remote_artifact_uri expected_artifact)) project_metadata_url (url (metadata.remote_project_uri expected_artifact)) expected_library (|> package - (value@ package.#library) + (the package.#library) product.left) expected_pom (|> package - (value@ package.#pom) + (the package.#pom) product.right product.left) @@ -136,7 +136,7 @@ (do random.monad [[profile package] $///package.random .let [artifact (|> profile - (value@ profile.#identity) + (the profile.#identity) maybe.trusted) dependency (: Dependency [artifact diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux index 3165a659d..5ea995021 100644 --- a/stdlib/source/test/aedifex/dependency/resolution.lux +++ b/stdlib/source/test/aedifex/dependency/resolution.lux @@ -1,52 +1,52 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - ["[0]" predicate] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" try] - ["[0]" exception] - [concurrency - ["[0]" async]]] - [data - [binary {"+" Binary}] - ["[0]" product] - ["[0]" text - ["%" format {"+" format}] - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml]] - [collection - ["[0]" dictionary] - ["[0]" set] - ["[0]" list]]] - [math - ["[0]" random {"+" Random}]]]] - ["$[0]" /// "_" - ["[1][0]" package] - ["[1][0]" repository] - ["[1][0]" artifact] - [command - ["[1][0]" version]]] - [\\program - ["[0]" / - ["//[1]" /// "_" - ["[1]" profile] - ["[1][0]" package {"+" Package}] - ["[1][0]" hash] - ["[1][0]" dependency {"+" Dependency} ("[1]#[0]" equivalence) - ["[1]/[0]" status]] - ["[1][0]" pom] - ["[1][0]" artifact {"+" Artifact} - ["[1]/[0]" type] - ["[1]/[0]" extension]] - ["[1][0]" repository {"+" Mock} - ["[1]/[0]" origin]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + ["[0]" predicate] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" try] + ["[0]" exception] + [concurrency + ["[0]" async]]] + [data + [binary {"+" Binary}] + ["[0]" product] + ["[0]" text + ["%" format {"+" format}] + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml]] + [collection + ["[0]" dictionary] + ["[0]" set] + ["[0]" list]]] + [math + ["[0]" random {"+" Random}]]]] + ["$[0]" /// "_" + ["[1][0]" package] + ["[1][0]" repository] + ["[1][0]" artifact] + [command + ["[1][0]" version]]] + [\\program + ["[0]" / + ["//[1]" /// "_" + ["[1]" profile] + ["[1][0]" package {"+" Package}] + ["[1][0]" hash] + ["[1][0]" dependency {"+" Dependency} ("[1]#[0]" equivalence) + ["[1]/[0]" status]] + ["[1][0]" pom] + ["[1][0]" artifact {"+" Artifact} + ["[1]/[0]" type] + ["[1]/[0]" extension]] + ["[1][0]" repository {"+" Mock} + ["[1]/[0]" origin]]]]]) (def: random (Random /.Resolution) @@ -98,7 +98,7 @@ (def: .public (single artifact package) (-> Artifact Package (Mock Any)) - (let [expected (///artifact.uri (value@ ///artifact.#version artifact) artifact)] + (let [expected (///artifact.uri (the ///artifact.#version artifact) artifact)] (implementation (def: the_description "[1]") @@ -106,11 +106,11 @@ (if (text.contains? expected uri) (let [library (: Binary (|> package - (value@ ///package.#library) + (the ///package.#library) product.left)) pom (: Binary (|> package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded)))] @@ -144,34 +144,34 @@ (def: the_description "[~SHA-1]") (def: (on_download uri state) - (if (text.contains? (///artifact.uri (value@ ///artifact.#version expected_artifact) expected_artifact) uri) + (if (text.contains? (///artifact.uri (the ///artifact.#version expected_artifact) expected_artifact) uri) (cond (text.ends_with? ///artifact/extension.lux_library uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left)]} (text.ends_with? ..lux_sha-1 uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left ..sha-1)]} (text.ends_with? ..lux_md5 uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left ..md5)]} (text.ends_with? ///artifact/extension.pom uri) {try.#Success [state (|> expected_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded))]} (text.ends_with? ..pom_sha-1 uri) {try.#Success [state (|> dummy_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded) @@ -179,7 +179,7 @@ (text.ends_with? ..pom_md5 uri) {try.#Success [state (|> expected_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded) @@ -197,34 +197,34 @@ (def: the_description "[~MD5]") (def: (on_download uri state) - (if (text.contains? (///artifact.uri (value@ ///artifact.#version expected_artifact) expected_artifact) uri) + (if (text.contains? (///artifact.uri (the ///artifact.#version expected_artifact) expected_artifact) uri) (cond (text.ends_with? ///artifact/extension.lux_library uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left)]} (text.ends_with? ..lux_sha-1 uri) {try.#Success [state (|> expected_package - (value@ ///package.#library) + (the ///package.#library) product.left ..sha-1)]} (text.ends_with? ..lux_md5 uri) {try.#Success [state (|> dummy_package - (value@ ///package.#library) + (the ///package.#library) product.left ..md5)]} (text.ends_with? ///artifact/extension.pom uri) {try.#Success [state (|> expected_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded))]} (text.ends_with? ..pom_sha-1 uri) {try.#Success [state (|> expected_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded) @@ -232,7 +232,7 @@ (text.ends_with? ..pom_md5 uri) {try.#Success [state (|> dummy_package - (value@ ///package.#pom) + (the ///package.#pom) product.left (# xml.codec encoded) (# utf8.codec encoded) @@ -250,7 +250,7 @@ [expected_artifact $///artifact.random [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right - (with@ ///package.#pom (value@ ///package.#pom expected_package)) + (has ///package.#pom (the ///package.#pom expected_package)) (# ///package.equivalence = expected_package) not) $///package.random) @@ -266,7 +266,7 @@ (case actual_package {try.#Success actual_package} (# ///package.equivalence = - (with@ ///package.#origin {///repository/origin.#Remote ""} expected_package) + (has ///package.#origin {///repository/origin.#Remote ""} expected_package) actual_package) {try.#Failure _} @@ -295,7 +295,7 @@ [expected_artifact $///artifact.random [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right - (with@ ///package.#pom (value@ ///package.#pom expected_package)) + (has ///package.#pom (the ///package.#pom expected_package)) (# ///package.equivalence = expected_package) not) $///package.random) @@ -315,7 +315,7 @@ (case actual_package {try.#Success actual_package} (# ///package.equivalence = - (with@ ///package.#origin {///repository/origin.#Remote ""} expected_package) + (has ///package.#origin {///repository/origin.#Remote ""} expected_package) actual_package) {try.#Failure _} @@ -366,34 +366,34 @@ ///dependency.#type ///artifact/type.lux_library] dependee_pom (|> (# ///.monoid identity) - (with@ ///.#identity {.#Some dependee_artifact}) + (has ///.#identity {.#Some dependee_artifact}) ///pom.write try.trusted) depender_pom (|> (# ///.monoid identity) - (with@ ///.#identity {.#Some depender_artifact}) - (with@ ///.#dependencies (set.of_list ///dependency.hash (list dependee))) + (has ///.#identity {.#Some depender_artifact}) + (has ///.#dependencies (set.of_list ///dependency.hash (list dependee))) ///pom.write try.trusted) ignored_pom (|> (# ///.monoid identity) - (with@ ///.#identity {.#Some ignored_artifact}) + (has ///.#identity {.#Some ignored_artifact}) ///pom.write try.trusted) - dependee_package (with@ ///package.#pom - [dependee_pom - (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}] - dependee_package) - depender_package (with@ ///package.#pom - [depender_pom - (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}] - depender_package) - ignored_package (with@ ///package.#pom - [ignored_pom - (|> ignored_pom (# xml.codec encoded) (# utf8.codec encoded)) - {///dependency/status.#Unverified}] - ignored_package)]] + dependee_package (has ///package.#pom + [dependee_pom + (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}] + dependee_package) + depender_package (has ///package.#pom + [depender_pom + (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}] + depender_package) + ignored_package (has ///package.#pom + [ignored_pom + (|> ignored_pom (# xml.codec encoded) (# utf8.codec encoded)) + {///dependency/status.#Unverified}] + ignored_package)]] (in [[dependee depender ignored] [dependee_package depender_package ignored_package]]))) diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux index 01db3538c..dedb9b33c 100644 --- a/stdlib/source/test/aedifex/input.lux +++ b/stdlib/source/test/aedifex/input.lux @@ -1,35 +1,35 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try {"+" Try}] - [concurrency - ["[0]" async {"+" Async}]]] - [data - [text - ["%" format] - [encoding - ["[0]" utf8]]] - [collection - ["[0]" set {"+" Set}]]] - [math - ["[0]" random]] - [world - ["[0]" file]]]] - [// - ["$[0]" profile]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile {"+" Profile}] - ["[1][0]" project] - ["[1][0]" action] - ["[1][0]" format] - [repository - [remote {"+" Address}]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try {"+" Try}] + [concurrency + ["[0]" async {"+" Async}]]] + [data + [text + ["%" format] + [encoding + ["[0]" utf8]]] + [collection + ["[0]" set {"+" Set}]]] + [math + ["[0]" random]] + [world + ["[0]" file]]]] + [// + ["$[0]" profile]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile {"+" Profile}] + ["[1][0]" project] + ["[1][0]" action] + ["[1][0]" format] + [repository + [remote {"+" Address}]]]]]) (def: (with_default_source sources) (-> (Set //.Source) (Set //.Source)) @@ -45,7 +45,7 @@ Test (<| (_.covering /._) (do [! random.monad] - [expected (# ! each (with@ //.#parents (list)) $profile.random) + [expected (# ! each (has //.#parents (list)) $profile.random) .let [fs (: (file.System Async) (file.mock (# file.default separator)))]] (in (do async.monad @@ -60,8 +60,8 @@ (/.read async.monad fs (list //.default)))] (in (# //.equivalence = (|> expected - (revised@ //.#sources ..with_default_source) - (revised@ //.#repositories ..with_default_repository)) + (revised //.#sources ..with_default_source) + (revised //.#repositories ..with_default_repository)) actual)))] (_.cover' [/.read] (try.else false verdict))))))) diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux index babf58808..241915579 100644 --- a/stdlib/source/test/aedifex/local.lux +++ b/stdlib/source/test/aedifex/local.lux @@ -1,19 +1,19 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [data - ["[0]" text]] - [math - ["[0]" random {"+" Random}]]]] - [// - ["@[0]" artifact]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1][0]" artifact]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [data + ["[0]" text]] + [math + ["[0]" random {"+" Random}]]]] + [// + ["@[0]" artifact]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1][0]" artifact]]]]) (def: .public test Test @@ -23,5 +23,5 @@ ($_ _.and (_.cover [/.repository /.uri] (text.starts_with? /.repository - (/.uri (value@ //artifact.#version sample) sample))) + (/.uri (the //artifact.#version sample) sample))) )))) diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux index a77881197..bf94bf600 100644 --- a/stdlib/source/test/aedifex/metadata/artifact.lux +++ b/stdlib/source/test/aedifex/metadata/artifact.lux @@ -1,45 +1,45 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" maybe] - ["[0]" try ("[1]#[0]" functor)] - [parser - ["[0]" environment] - ["<[0]>" xml]] - [concurrency - ["[0]" async]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" list]]] - [macro - ["[0]" code]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]] - ["[0]" time - ["[0]" date] - ["[0]" year] - ["[0]" month] - ["[0]" instant] - ["[0]" duration]] - [world - ["[0]" file] - ["[0]" program]]]] - [\\program - ["[0]" / - ["/[1]" // - ["/[1]" // "_" - ["[1][0]" artifact] - ["[1][0]" repository "_" - ["[1]/[0]" local]]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" maybe] + ["[0]" try ("[1]#[0]" functor)] + [parser + ["[0]" environment] + ["<[0]>" xml]] + [concurrency + ["[0]" async]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" list]]] + [macro + ["[0]" code]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]] + ["[0]" time + ["[0]" date] + ["[0]" year] + ["[0]" month] + ["[0]" instant] + ["[0]" duration]] + [world + ["[0]" file] + ["[0]" program]]]] + [\\program + ["[0]" / + ["/[1]" // + ["/[1]" // "_" + ["[1][0]" artifact] + ["[1][0]" repository "_" + ["[1]/[0]" local]]]]]]) (def: .public random (Random /.Metadata) @@ -72,10 +72,10 @@ (_.for [/.Metadata]) (do random.monad [expected ..random - .let [artifact [///artifact.#group (value@ /.#group expected) - ///artifact.#name (value@ /.#name expected) + .let [artifact [///artifact.#group (the /.#group expected) + ///artifact.#name (the /.#name expected) ///artifact.#version (|> expected - (value@ /.#versions) + (the /.#versions) list.head (maybe.else ""))]]] ($_ _.and diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux index d59e79809..4735a6994 100644 --- a/stdlib/source/test/aedifex/metadata/snapshot.lux +++ b/stdlib/source/test/aedifex/metadata/snapshot.lux @@ -1,53 +1,53 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" maybe] - ["[0]" try ("[1]#[0]" functor)] - [parser - ["[0]" environment] - ["<[0]>" xml]] - [concurrency - ["[0]" async]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" list]]] - [macro - ["[0]" code]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]] - ["[0]" time - ["[0]" date] - ["[0]" year] - ["[0]" month] - ["[0]" instant {"+" Instant}] - ["[0]" duration]] - [world - ["[0]" file] - ["[0]" program]]]] - ["$[0]" /// "_" - ["[1][0]" artifact - ["[1]/[0]" type] - ["[1]/[0]" time] - ["[1]/[0]" snapshot "_" - ["[1]/[0]" version]]]] - [\\program - ["[0]" / - ["/[1]" // - ["/[1]" // "_" - [artifact - [versioning {"+" Versioning}] - ["[1][0]" snapshot]] - ["[1][0]" repository "_" - ["[1]/[0]" local]]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" maybe] + ["[0]" try ("[1]#[0]" functor)] + [parser + ["[0]" environment] + ["<[0]>" xml]] + [concurrency + ["[0]" async]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" list]]] + [macro + ["[0]" code]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]] + ["[0]" time + ["[0]" date] + ["[0]" year] + ["[0]" month] + ["[0]" instant {"+" Instant}] + ["[0]" duration]] + [world + ["[0]" file] + ["[0]" program]]]] + ["$[0]" /// "_" + ["[1][0]" artifact + ["[1]/[0]" type] + ["[1]/[0]" time] + ["[1]/[0]" snapshot "_" + ["[1]/[0]" version]]]] + [\\program + ["[0]" / + ["/[1]" // + ["/[1]" // "_" + [artifact + [versioning {"+" Versioning}] + ["[1][0]" snapshot]] + ["[1][0]" repository "_" + ["[1]/[0]" local]]]]]]) (def: random_instant (Random Instant) @@ -91,7 +91,7 @@ (_.for [/.Metadata]) (do random.monad [expected ..random - .let [artifact (value@ /.#artifact expected)]] + .let [artifact (the /.#artifact expected)]] ($_ _.and (_.for [/.equivalence] ($equivalence.spec /.equivalence ..random)) diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux index 9579f82db..af51453dd 100644 --- a/stdlib/source/test/aedifex/package.lux +++ b/stdlib/source/test/aedifex/package.lux @@ -1,44 +1,44 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" try]] - [data - ["[0]" product] - ["[0]" text - [encoding - ["[0]" utf8]]] - [format - ["[0]" xml {"+" XML}]] - [collection - ["[0]" set {"+" Set}]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]] - [world - ["[0]" file]]]] + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" try]] + [data + ["[0]" product] + ["[0]" text + [encoding + ["[0]" utf8]]] + [format + ["[0]" xml {"+" XML}]] + [collection + ["[0]" set {"+" Set}]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]] + [world + ["[0]" file]]]] + [// + ["$[0]" profile] [// - ["$[0]" profile] - [// - [lux - [data - ["$[0]" binary]]]]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile] - ["[1][0]" hash ("[1]#[0]" equivalence)] - ["[1][0]" pom] - [dependency - ["[1][0]" status]] - [repository - ["[1][0]" origin]]]]]) + [lux + [data + ["$[0]" binary]]]]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile] + ["[1][0]" hash ("[1]#[0]" equivalence)] + ["[1][0]" pom] + [dependency + ["[1][0]" status]] + [repository + ["[1][0]" origin]]]]]) (def: .public random (Random [//.Profile /.Package]) @@ -64,18 +64,18 @@ ($equivalence.spec /.equivalence (# ! each product.right ..random))) (_.cover [/.local?] - (/.local? (with@ /.#origin {//origin.#Local "~/yolo"} package))) + (/.local? (has /.#origin {//origin.#Local "~/yolo"} package))) (_.cover [/.remote?] - (/.remote? (with@ /.#origin {//origin.#Remote "https://example.com"} package))) + (/.remote? (has /.#origin {//origin.#Remote "https://example.com"} package))) (_.cover [/.local] - (let [expected_pom (|> package (value@ /.#pom) product.left) - expected_library (|> package (value@ /.#library) product.left) + (let [expected_pom (|> package (the /.#pom) product.left) + expected_library (|> package (the /.#library) product.left) local (/.local expected_pom expected_library) - [actual_pom binary_pom pom_status] (value@ /.#pom local) - [actual_library library_status] (value@ /.#library local)] - (and (case (value@ /.#origin local) + [actual_pom binary_pom pom_status] (the /.#pom local) + [actual_library library_status] (the /.#library local)] + (and (case (the /.#origin local) {//origin.#Local ""} true _ false) (let [expected_sha1 (//hash.sha-1 expected_library) @@ -104,7 +104,7 @@ _ false)))))) (_.cover [/.dependencies] - (let [expected (value@ //.#dependencies profile)] + (let [expected (the //.#dependencies profile)] (case (/.dependencies package) {try.#Success actual} (# set.equivalence = expected actual) @@ -112,7 +112,7 @@ {try.#Failure error} false))) (_.cover [/.repositories] - (let [expected (value@ //.#repositories profile)] + (let [expected (the //.#repositories profile)] (case (/.repositories package) {try.#Success actual} (# set.equivalence = expected actual) diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux index 5565875fb..1d3168d93 100644 --- a/stdlib/source/test/aedifex/parser.lux +++ b/stdlib/source/test/aedifex/parser.lux @@ -1,37 +1,37 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [hash {"+" Hash}]] - [control - [pipe {"+" case>}] - ["[0]" try] - [parser - ["<[0]>" code]]] - [data - ["[0]" text] - [collection - ["[0]" set {"+" Set}] - ["[0]" dictionary {"+" Dictionary}] - ["[0]" list ("[1]#[0]" functor)]]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]] - [macro - ["[0]" code]]]] - [// - ["@[0]" profile]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile] - ["[1][0]" project {"+" Project}] - ["[1][0]" artifact {"+" Artifact}] - ["[1][0]" dependency {"+" Dependency}] - ["[1][0]" format]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [hash {"+" Hash}]] + [control + [pipe {"+" case>}] + ["[0]" try] + [parser + ["<[0]>" code]]] + [data + ["[0]" text] + [collection + ["[0]" set {"+" Set}] + ["[0]" dictionary {"+" Dictionary}] + ["[0]" list ("[1]#[0]" functor)]]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]] + [macro + ["[0]" code]]]] + [// + ["@[0]" profile]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile] + ["[1][0]" project {"+" Project}] + ["[1][0]" artifact {"+" Artifact}] + ["[1][0]" dependency {"+" Dependency}] + ["[1][0]" format]]]]) (def: name (Random //.Name) @@ -55,16 +55,16 @@ (def: with_default_sources (-> //.Profile //.Profile) - (revised@ //.#sources - (: (-> (Set //.Source) (Set //.Source)) - (function (_ sources) - (if (set.empty? sources) - (set.of_list text.hash (list //.default_source)) - sources))))) + (revised //.#sources + (: (-> (Set //.Source) (Set //.Source)) + (function (_ sources) + (if (set.empty? sources) + (set.of_list text.hash (list //.default_source)) + sources))))) (def: with_default_repository (-> //.Profile //.Profile) - (revised@ //.#repositories (set.has //.default_repository))) + (revised //.#repositories (set.has //.default_repository))) (def: (with_empty_profile project) (-> Project Project) diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux index 5f5e351d9..e6d5340e2 100644 --- a/stdlib/source/test/aedifex/pom.lux +++ b/stdlib/source/test/aedifex/pom.lux @@ -1,26 +1,26 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try] - ["[0]" exception] - ["<>" parser - ["<[0]>" xml]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [format - ["[0]" xml]]] - [math - ["[0]" random]]]] - [// - ["@[0]" profile]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try] + ["[0]" exception] + ["<>" parser + ["<[0]>" xml]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [format + ["[0]" xml]]] + [math + ["[0]" random]]]] + [// + ["@[0]" profile]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile]]]]) (def: .public test Test @@ -34,15 +34,15 @@ [expected @profile.random] (_.cover [/.write /.parser] (case [(/.write expected) - (value@ //.#identity expected)] + (the //.#identity expected)] [{try.#Success pom} {.#Some _}] (case (<xml>.result /.parser (list pom)) {try.#Success actual} (# //.equivalence = (|> (# //.monoid identity) - (with@ //.#dependencies (value@ //.#dependencies expected)) - (with@ //.#repositories (value@ //.#repositories expected))) + (has //.#dependencies (the //.#dependencies expected)) + (has //.#repositories (the //.#repositories expected))) actual) {try.#Failure error} diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index ff9cc4ab2..1cfc7eb40 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -1,38 +1,38 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [hash {"+" Hash}] - [\\specification - ["$[0]" equivalence] - ["$[0]" monoid]]] - [control - [pipe {"+" case>}] - ["[0]" try] - [parser - ["[0]" cli]]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" set {"+" Set}] - ["[0]" dictionary {"+" Dictionary}]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]]]] - [// - ["@[0]" artifact] - ["@[0]" dependency]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1][0]" runtime] - ["[1][0]" dependency {"+" Dependency}] - ["[1][0]" format] - [repository - [remote {"+" Address}]]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [hash {"+" Hash}] + [\\specification + ["$[0]" equivalence] + ["$[0]" monoid]]] + [control + [pipe {"+" case>}] + ["[0]" try] + [parser + ["[0]" cli]]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" set {"+" Set}] + ["[0]" dictionary {"+" Dictionary}]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]]]] + [// + ["@[0]" artifact] + ["@[0]" dependency]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1][0]" runtime] + ["[1][0]" dependency {"+" Dependency}] + ["[1][0]" format] + [repository + [remote {"+" Address}]]]]]) (def: distribution (Random /.Distribution) @@ -154,10 +154,10 @@ (text#= "" /.default)) (_.cover [/.default_compiler] (|> (# /.monoid identity) - (value@ /.#compiler) + (the /.#compiler) (same? /.default_compiler))) (_.cover [/.default_target] (|> (# /.monoid identity) - (value@ /.#target) + (the /.#target) (same? /.default_target))) ))))) diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux index fdf778f28..c7bbe62c0 100644 --- a/stdlib/source/test/aedifex/project.lux +++ b/stdlib/source/test/aedifex/project.lux @@ -1,33 +1,33 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence] - ["$[0]" monoid]]] - [control - ["[0]" try ("[1]#[0]" functor)] - ["[0]" exception]] - [data - ["[0]" product] - ["[0]" text ("[1]#[0]" equivalence)]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]]]] - [// - ["@[0]" profile]] - [\\program - ["[0]" / - ["/[1]" // "_" - ["[1]" profile]]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence] + ["$[0]" monoid]]] + [control + ["[0]" try ("[1]#[0]" functor)] + ["[0]" exception]] + [data + ["[0]" product] + ["[0]" text ("[1]#[0]" equivalence)]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]]]] + [// + ["@[0]" profile]] + [\\program + ["[0]" / + ["/[1]" // "_" + ["[1]" profile]]]]) (def: profile (Random [//.Name //.Profile]) (|> @profile.random - (random#each (with@ //.#parents (list))) + (random#each (has //.#parents (list))) (random.and (random.ascii/alpha 1)))) (def: .public random @@ -66,11 +66,11 @@ .let [project ($_ (# /.monoid composite) (/.project super_name super_profile) (/.project dummy_name dummy_profile) - (/.project sub_name (with@ //.#parents (list super_name) sub_profile))) + (/.project sub_name (has //.#parents (list super_name) sub_profile))) circular ($_ (# /.monoid composite) - (/.project super_name (with@ //.#parents (list sub_name) super_profile)) + (/.project super_name (has //.#parents (list sub_name) super_profile)) (/.project dummy_name dummy_profile) - (/.project sub_name (with@ //.#parents (list super_name) sub_profile)))]] + (/.project sub_name (has //.#parents (list super_name) sub_profile)))]] ($_ _.and (_.cover [/.profile] (and (|> (/.profile project super_name) diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux index ec86419c2..99c1bd92d 100644 --- a/stdlib/source/test/aedifex/runtime.lux +++ b/stdlib/source/test/aedifex/runtime.lux @@ -1,24 +1,24 @@ - (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" maybe ("[1]#[0]" functor)]] - [data - ["[0]" text ("[1]#[0]" equivalence)] - [collection - ["[0]" list ("[1]#[0]" functor)] - ["[0]" set]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]]]] - [\\program - ["[0]" /]]) +(.using + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" maybe ("[1]#[0]" functor)]] + [data + ["[0]" text ("[1]#[0]" equivalence)] + [collection + ["[0]" list ("[1]#[0]" functor)] + ["[0]" set]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]]]] + [\\program + ["[0]" /]]) (def: .public random (Random /.Runtime) @@ -44,7 +44,7 @@ (~~ (template [<command>] [(_.cover [/.default_java /.default_js /.default_python /.default_lua /.default_ruby] (let [listing (|> (list /.default_java /.default_js /.default_python /.default_lua /.default_ruby) - (list#each (value@ /.#program))) + (list#each (the /.#program))) unique (set.of_list text.hash listing)] (n.= (list.size listing) (set.size unique))))] @@ -57,10 +57,10 @@ )) (_.cover [/.for] (let [runtime' (/.for runtime path)] - (and (text#= (value@ /.#program runtime) - (value@ /.#program runtime')) + (and (text#= (the /.#program runtime) + (the /.#program runtime')) (|> runtime' - (value@ /.#parameters) + (the /.#parameters) list.last (maybe#each (text#= path)) (maybe.else false))))) diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index e8a6a482d..743c108f7 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -371,7 +371,7 @@ )) (_.cover [/.Ann] (|> example - (value@ /.#meta) + (the /.#meta) (location#= location.dummy))) ))) @@ -382,7 +382,7 @@ "This is an arbitrary text whose only purpose is to be found, somewhere, in the source-code.") (/.macro: (found_crosshair? tokens lux) - (let [[_ _ source_code] (value@ .#source lux)] + (let [[_ _ source_code] (the .#source lux)] {.#Right [lux (list (code.bit (text.contains? ..crosshair source_code)))]})) (/.macro: (sum tokens) @@ -762,72 +762,72 @@ #big_right [#small_left start/s #small_right text]]]] ($_ _.and - (_.cover [/.value@] + (_.cover [/.the] (and (and (|> sample - (/.value@ #big_left) + (/.the #big_left) (same? start/b)) (|> sample - ((/.value@ #big_left)) + ((/.the #big_left)) (same? start/b))) (and (|> sample - (/.value@ [#big_right #small_left]) + (/.the [#big_right #small_left]) (same? start/s)) (|> sample - ((/.value@ [#big_right #small_left])) + ((/.the [#big_right #small_left])) (same? start/s))))) - (_.cover [/.with@] + (_.cover [/.has] (and (and (|> sample - (/.with@ #big_left shift/b) - (/.value@ #big_left) + (/.has #big_left shift/b) + (/.the #big_left) (same? shift/b)) (|> sample - ((/.with@ #big_left shift/b)) - (/.value@ #big_left) + ((/.has #big_left shift/b)) + (/.the #big_left) (same? shift/b)) (|> sample - ((/.with@ #big_left) shift/b) - (/.value@ #big_left) + ((/.has #big_left) shift/b) + (/.the #big_left) (same? shift/b))) (and (|> sample - (/.with@ [#big_right #small_left] shift/s) - (/.value@ [#big_right #small_left]) + (/.has [#big_right #small_left] shift/s) + (/.the [#big_right #small_left]) (same? shift/s)) (|> sample - ((/.with@ [#big_right #small_left] shift/s)) - (/.value@ [#big_right #small_left]) + ((/.has [#big_right #small_left] shift/s)) + (/.the [#big_right #small_left]) (same? shift/s)) (|> sample - ((/.with@ [#big_right #small_left]) shift/s) - (/.value@ [#big_right #small_left]) + ((/.has [#big_right #small_left]) shift/s) + (/.the [#big_right #small_left]) (same? shift/s))))) - (_.cover [/.revised@] + (_.cover [/.revised] (and (and (|> sample - (/.revised@ #big_left (n.+ shift/b)) - (/.value@ #big_left) + (/.revised #big_left (n.+ shift/b)) + (/.the #big_left) (n.= expected/b)) (|> sample - ((/.revised@ #big_left (n.+ shift/b))) - (/.value@ #big_left) + ((/.revised #big_left (n.+ shift/b))) + (/.the #big_left) (n.= expected/b)) (|> sample ((: (-> (-> Nat Nat) (-> Big Big)) - (/.revised@ #big_left)) + (/.revised #big_left)) (n.+ shift/b)) - (/.value@ #big_left) + (/.the #big_left) (n.= expected/b))) (and (|> sample - (/.revised@ [#big_right #small_left] (n.+ shift/s)) - (/.value@ [#big_right #small_left]) + (/.revised [#big_right #small_left] (n.+ shift/s)) + (/.the [#big_right #small_left]) (n.= expected/s)) (|> sample - ((/.revised@ [#big_right #small_left] (n.+ shift/s))) - (/.value@ [#big_right #small_left]) + ((/.revised [#big_right #small_left] (n.+ shift/s))) + (/.the [#big_right #small_left]) (n.= expected/s)) (|> sample ((: (-> (-> Nat Nat) (-> Big Big)) - (/.revised@ [#big_right #small_left])) + (/.revised [#big_right #small_left])) (n.+ shift/s)) - (/.value@ [#big_right #small_left]) + (/.the [#big_right #small_left]) (n.= expected/s))))) ))) @@ -1042,11 +1042,11 @@ (/.case [..#left expected_nat ..#right expected_int] (/.^ (!pair 0 +0)) true _ false)) - (_.cover [/.^@] + (_.cover [/.^let] (let [expected_pair (: (Pair Nat Int) [..#left expected_nat ..#right expected_int])] (/.case expected_pair - (/.^@ actual_pair (/.^ (!pair actual_left actual_right))) + (/.^let actual_pair (/.^ (!pair actual_left actual_right))) (and (/.same? expected_pair actual_pair) (/.same? expected_nat actual_left) (/.same? expected_int actual_right))))) @@ -1140,13 +1140,13 @@ (syntax: (for_meta|Info []) (function (_ lux) - (let [info (value@ .#info lux) + (let [info (the .#info lux) conforming_target! - (set.member? ..possible_targets (value@ .#target info)) + (set.member? ..possible_targets (the .#target info)) compiling! - (case (value@ .#mode info) + (case (the .#mode info) {.#Build} true _ false)] {.#Right [lux (list (code.bit (and conforming_target! @@ -1155,7 +1155,7 @@ (syntax: (for_meta|Module_State []) (do meta.monad [prelude_module (meta.module .prelude_module)] - (in (list (code.bit (case (value@ .#module_state prelude_module) + (in (list (code.bit (case (the .#module_state prelude_module) {.#Active} false _ true)))))) @@ -1192,22 +1192,22 @@ let/2 <code>.local_symbol let/3 <code>.local_symbol]) - (in (list (code.bit (case (value@ .#scopes *lux*) + (in (list (code.bit (case (the .#scopes *lux*) (^ (list& scope/2 _)) - (let [locals/2 (value@ .#locals scope/2) + (let [locals/2 (the .#locals scope/2) expected_locals/2 (set.of_list text.hash (list fn/2 var/2 let/2 let/3)) actual_locals/2 (|> locals/2 - (value@ .#mappings) + (the .#mappings) (list#each product.left) (set.of_list text.hash)) correct_locals! - (and (n.= 4 (value@ .#counter locals/2)) + (and (n.= 4 (the .#counter locals/2)) (set#= expected_locals/2 actual_locals/2)) - captured/2 (value@ .#captured scope/2) + captured/2 (the .#captured scope/2) local? (: (-> Ref Bit) (function (_ ref) @@ -1219,13 +1219,13 @@ binding? (: (-> (-> Ref Bit) Text Bit) (function (_ is? name) (|> captured/2 - (value@ .#mappings) + (the .#mappings) (plist.value name) (maybe#each (|>> product.right is?)) (maybe.else false)))) correct_closure! - (and (n.= 6 (value@ .#counter captured/2)) + (and (n.= 6 (the .#counter captured/2)) (binding? local? fn/1) (binding? local? var/1) (binding? local? let/1) diff --git a/stdlib/source/test/lux/control/function/contract.lux b/stdlib/source/test/lux/control/function/contract.lux index dfad51e47..21c152053 100644 --- a/stdlib/source/test/lux/control/function/contract.lux +++ b/stdlib/source/test/lux/control/function/contract.lux @@ -1,20 +1,20 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" try] - ["[0]" exception]] - [data - ["[0]" text]] - [math - ["[0]" random] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" try] + ["[0]" exception]] + [data + ["[0]" text]] + [math + ["[0]" random] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) (def: .public test Test @@ -29,7 +29,7 @@ output {try.#Failure error} - (and (text.contains? (value@ exception.#label /.pre_condition_failed) + (and (text.contains? (the exception.#label /.pre_condition_failed) error) (not (n.even? expected))))) (_.cover [/.post /.post_condition_failed] @@ -39,7 +39,7 @@ (same? expected actual) {try.#Failure error} - (and (text.contains? (value@ exception.#label /.post_condition_failed) + (and (text.contains? (the exception.#label /.post_condition_failed) error) (not (n.odd? expected))))) ))) diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux index 37b231188..34b24c1f4 100644 --- a/stdlib/source/test/lux/control/security/policy.lux +++ b/stdlib/source/test/lux/control/security/policy.lux @@ -1,22 +1,22 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [hash {"+" Hash}] - [monad {"+" do}] - [\\specification - ["$[0]" functor {"+" Injection Comparison}] - ["$[0]" apply] - ["$[0]" monad]]] - [data - ["[0]" text ("[1]#[0]" equivalence)]] - [math - ["[0]" random] - [number - ["n" nat]]]]] - [\\library - ["[0]" / {"+" Context Privacy Can_Conceal Can_Reveal Privilege Private}]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [hash {"+" Hash}] + [monad {"+" do}] + [\\specification + ["$[0]" functor {"+" Injection Comparison}] + ["$[0]" apply] + ["$[0]" monad]]] + [data + ["[0]" text ("[1]#[0]" equivalence)]] + [math + ["[0]" random] + [number + ["n" nat]]]]] + [\\library + ["[0]" / {"+" Context Privacy Can_Conceal Can_Reveal Privilege Private}]]) (def: (injection can_conceal) (All (_ label) @@ -48,7 +48,7 @@ (Ex (_ %) (-> Any (Policy %))) (/.with_policy (: (Context Privacy Policy) - (function (_ (^@ privilege (^open "%[0]"))) + (function (_ (^let privilege (^open "%[0]"))) (implementation (def: &hash (implementation diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux index b2af39ece..9bb1e6ea0 100644 --- a/stdlib/source/test/lux/data/format/tar.lux +++ b/stdlib/source/test/lux/data/format/tar.lux @@ -1,40 +1,40 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" maybe] - ["[0]" try] - ["[0]" exception] - ["<>" parser - ["<b>" binary]]] - [data - ["[0]" product] - ["[0]" binary ("[1]#[0]" equivalence monoid)] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}] - [encoding - ["[0]" utf8]] - ["[0]" unicode "_" - ["[1]" set] - ["[1]/[0]" block]]] - [collection - ["[0]" sequence] - ["[0]" list ("[1]#[0]" mix)]] - ["[0]" format "_" - ["[1]" binary]]] - [time - ["[0]" instant {"+" Instant}] - ["[0]" duration]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat] - ["i" int]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" maybe] + ["[0]" try] + ["[0]" exception] + ["<>" parser + ["<b>" binary]]] + [data + ["[0]" product] + ["[0]" binary ("[1]#[0]" equivalence monoid)] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}] + [encoding + ["[0]" utf8]] + ["[0]" unicode "_" + ["[1]" set] + ["[1]/[0]" block]]] + [collection + ["[0]" sequence] + ["[0]" list ("[1]#[0]" mix)]] + ["[0]" format "_" + ["[1]" binary]]] + [time + ["[0]" instant {"+" Instant}] + ["[0]" duration]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat] + ["i" int]]]]] + [\\library + ["[0]" /]]) (def: path Test @@ -354,9 +354,9 @@ (in (case (sequence.list tar) (^ (list {/.#Normal [_ _ _ actual_ownership _]})) (and (text#= (/.from_name expected) - (/.from_name (value@ [/.#user /.#name] actual_ownership))) + (/.from_name (the [/.#user /.#name] actual_ownership))) (text#= (/.from_name /.anonymous) - (/.from_name (value@ [/.#group /.#name] actual_ownership)))) + (/.from_name (the [/.#group /.#name] actual_ownership)))) _ false))) @@ -378,13 +378,13 @@ (in (case (sequence.list tar) (^ (list {/.#Normal [_ _ _ actual_ownership _]})) (and (text#= (/.from_name /.anonymous) - (/.from_name (value@ [/.#user /.#name] actual_ownership))) + (/.from_name (the [/.#user /.#name] actual_ownership))) (n.= (/.from_small /.no_id) - (/.from_small (value@ [/.#user /.#id] actual_ownership))) + (/.from_small (the [/.#user /.#id] actual_ownership))) (text#= (/.from_name /.anonymous) - (/.from_name (value@ [/.#group /.#name] actual_ownership))) + (/.from_name (the [/.#group /.#name] actual_ownership))) (n.= (/.from_small /.no_id) - (/.from_small (value@ [/.#group /.#id] actual_ownership)))) + (/.from_small (the [/.#group /.#id] actual_ownership)))) _ false))) diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux index 59f273652..0ee929ca7 100644 --- a/stdlib/source/test/lux/data/format/xml.lux +++ b/stdlib/source/test/lux/data/format/xml.lux @@ -1,32 +1,32 @@ (.using - [library - [lux {"-" char symbol} - ["_" test {"+" Test}] - [abstract - [monad {"+" Monad do}] - [\\specification - ["$[0]" equivalence] - ["$[0]" codec]]] - [control - pipe - ["[0]" maybe] - ["[0]" try] - ["p" parser - ["</>" xml]]] - [data - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]] - [collection - ["[0]" dictionary] - ["[0]" list ("[1]#[0]" functor)]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]] - [meta - ["[0]" symbol]]]] - [\\library - ["[0]" / {"+" XML}]]) + [library + [lux {"-" char symbol} + ["_" test {"+" Test}] + [abstract + [monad {"+" Monad do}] + [\\specification + ["$[0]" equivalence] + ["$[0]" codec]]] + [control + pipe + ["[0]" maybe] + ["[0]" try] + ["p" parser + ["</>" xml]]] + [data + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]] + [collection + ["[0]" dictionary] + ["[0]" list ("[1]#[0]" functor)]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]] + [meta + ["[0]" symbol]]]] + [\\library + ["[0]" / {"+" XML}]]) (def: char_range Text @@ -78,7 +78,7 @@ ($codec.spec /.equivalence /.codec ..random)) (do [! random.monad] - [(^@ symbol [namespace name]) ..symbol] + [(^let symbol [namespace name]) ..symbol] (`` ($_ _.and (~~ (template [<type> <format>] [(_.cover [<type> <format>] diff --git a/stdlib/source/test/lux/documentation.lux b/stdlib/source/test/lux/documentation.lux index 4993ceeb4..692b28b43 100644 --- a/stdlib/source/test/lux/documentation.lux +++ b/stdlib/source/test/lux/documentation.lux @@ -1,24 +1,24 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - ["[0]" meta] - [control - ["[0]" try] - ["[0]" exception] - [parser - ["<[0]>" code]]] - [data - ["[0]" text ("[1]#[0]" equivalence) - ["%" format]] - [format - ["md" markdown]]] - ["[0]" macro - [syntax {"+" syntax:}] - ["[0]" template] - ["[0]" code]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + ["[0]" meta] + [control + ["[0]" try] + ["[0]" exception] + [parser + ["<[0]>" code]]] + [data + ["[0]" text ("[1]#[0]" equivalence) + ["%" format]] + [format + ["md" markdown]]] + ["[0]" macro + [syntax {"+" syntax:}] + ["[0]" template] + ["[0]" code]]]] + [\\library + ["[0]" /]]) (syntax: (macro_error [macro <code>.any]) (function (_ compiler) @@ -55,10 +55,10 @@ (case (`` (/.default (~~ (template.symbol [.._] [g!default])))) (^ (list definition)) (and (|> definition - (value@ /.#definition) + (the /.#definition) (text#= (template.text [g!default]))) (|> definition - (value@ /.#documentation) + (the /.#documentation) md.markdown (text#= "") not)) @@ -69,10 +69,10 @@ (case ..documentation: (^ (list documentation:)) (and (|> documentation: - (value@ /.#definition) + (the /.#definition) (text#= (template.text [/.documentation:]))) (|> documentation: - (value@ /.#documentation) + (the /.#documentation) md.markdown (text.contains? 'definition_description'))) @@ -98,7 +98,7 @@ (/.documentation super)) (case ..documentation: (^ (list documentation:)) - (text.contains? (md.markdown (value@ /.#documentation documentation:)) + (text.contains? (md.markdown (the /.#documentation documentation:)) (/.documentation super)) _ diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 2a988f398..a7d5c88bb 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -135,7 +135,7 @@ (|> array /.length ..macro_error - (text.contains? (value@ exception.#label /.cannot_convert_to_jvm_type)))))))) + (text.contains? (the exception.#label /.cannot_convert_to_jvm_type)))))))) (def: for_miscellaneous Test @@ -228,7 +228,7 @@ /.of_string (text#= it)))) (_.cover [/.cannot_cast_to_non_object] - (text.contains? (value@ exception.#label /.cannot_cast_to_non_object) + (text.contains? (the exception.#label /.cannot_cast_to_non_object) (macro_error (/.:as boolean (: /.Boolean boolean))))) (_.cover [/.:as] (|> string diff --git a/stdlib/source/test/lux/locale/language.lux b/stdlib/source/test/lux/locale/language.lux index 9b03b8308..f3bf54cad 100644 --- a/stdlib/source/test/lux/locale/language.lux +++ b/stdlib/source/test/lux/locale/language.lux @@ -1,27 +1,27 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [hash {"+" Hash}] - [\\specification - ["$[0]" hash]]] - [control - ["[0]" maybe]] - [data - ["[0]" text] - [collection - ["[0]" set {"+" Set}] - ["[0]" list ("[1]#[0]" functor mix)]]] - [macro - ["[0]" template]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [hash {"+" Hash}] + [\\specification + ["$[0]" hash]]] + [control + ["[0]" maybe]] + [data + ["[0]" text] + [collection + ["[0]" set {"+" Set}] + ["[0]" list ("[1]#[0]" functor mix)]]] + [macro + ["[0]" template]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) (type: Bundle (Record @@ -190,7 +190,7 @@ (List Bundle) [Nat (Set a)])) (list#mix (function (_ bundle [amount set]) - [(n.+ amount (value@ #amount bundle)) + [(n.+ amount (the #amount bundle)) (set.union set (lens bundle))]) [0 (set.empty hash)] territories)) @@ -199,11 +199,11 @@ Test (|> ..languages list.reversed - (list#each (value@ #test)) + (list#each (the #test)) (list#mix _.and (`` ($_ _.and (~~ (template [<lens> <tag> <hash>] - [(let [[amount set] (..aggregate (value@ <tag>) <hash> ..languages)] + [(let [[amount set] (..aggregate (the <tag>) <hash> ..languages)] (_.cover [<lens>] (n.= amount (set.size set))))] @@ -279,7 +279,7 @@ (def: .public random (Random /.Language) (let [options (|> ..languages - (list#each (|>> (value@ #languages) set.list)) + (list#each (|>> (the #languages) set.list)) list.together)] (do [! random.monad] [choice (# ! each (n.% (list.size options)) diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/locale/territory.lux index dd869a5f1..e16562e3c 100644 --- a/stdlib/source/test/lux/locale/territory.lux +++ b/stdlib/source/test/lux/locale/territory.lux @@ -1,27 +1,27 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [hash {"+" Hash}] - [\\specification - ["$[0]" hash]]] - [control - ["[0]" maybe]] - [data - ["[0]" text] - [collection - ["[0]" set {"+" Set}] - ["[0]" list ("[1]#[0]" functor mix)]]] - [macro - ["[0]" template]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [hash {"+" Hash}] + [\\specification + ["$[0]" hash]]] + [control + ["[0]" maybe]] + [data + ["[0]" text] + [collection + ["[0]" set {"+" Set}] + ["[0]" list ("[1]#[0]" functor mix)]]] + [macro + ["[0]" template]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) (type: Bundle (Record @@ -145,7 +145,7 @@ (List Bundle) [Nat (Set a)])) (list#mix (function (_ bundle [amount set]) - [(n.+ amount (value@ #amount bundle)) + [(n.+ amount (the #amount bundle)) (set.union set (lens bundle))]) [0 (set.empty hash)] territories)) @@ -154,11 +154,11 @@ Test (|> ..territories list.reversed - (list#each (value@ #test)) + (list#each (the #test)) (list#mix _.and (`` ($_ _.and (~~ (template [<lens> <tag> <hash>] - [(let [[amount set] (..aggregate (value@ <tag>) <hash> ..territories)] + [(let [[amount set] (..aggregate (the <tag>) <hash> ..territories)] (_.cover [<lens>] (n.= amount (set.size set))))] @@ -205,7 +205,7 @@ (def: .public random (Random /.Territory) (let [options (|> ..territories - (list#each (|>> (value@ #territories) set.list)) + (list#each (|>> (the #territories) set.list)) list.together)] (do [! random.monad] [choice (# ! each (n.% (list.size options)) diff --git a/stdlib/source/test/lux/macro/local.lux b/stdlib/source/test/lux/macro/local.lux index db3decc44..b9b996461 100644 --- a/stdlib/source/test/lux/macro/local.lux +++ b/stdlib/source/test/lux/macro/local.lux @@ -1,31 +1,31 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - ["[0]" meta] - [abstract - [monad {"+" do}]] - [control - ["[0]" try] - ["[0]" exception] - ["<>" parser - ["<[0]>" code]]] - [data - [text - ["%" format]] - [collection - ["[0]" list] - [dictionary - ["[0]" plist]]]] - ["[0]" macro - [syntax {"+" syntax:}] - ["[0]" code]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + ["[0]" meta] + [abstract + [monad {"+" do}]] + [control + ["[0]" try] + ["[0]" exception] + ["<>" parser + ["<[0]>" code]]] + [data + [text + ["%" format]] + [collection + ["[0]" list] + [dictionary + ["[0]" plist]]]] + ["[0]" macro + [syntax {"+" syntax:}] + ["[0]" code]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) (syntax: (macro_error [macro <code>.any]) (function (_ compiler) @@ -52,9 +52,9 @@ [module short] (meta.normal name) _ (if pre_remove (let [remove_macro! (: (-> .Module .Module) - (revised@ .#definitions (plist.lacks short)))] + (revised .#definitions (plist.lacks short)))] (function (_ lux) - {try.#Success [(revised@ .#modules (plist.revised module remove_macro!) lux) + {try.#Success [(revised .#modules (plist.revised module remove_macro!) lux) []]})) (in []))] (let [pre_expansion (` (let [(~ g!output) (~ body)] diff --git a/stdlib/source/test/lux/macro/syntax/check.lux b/stdlib/source/test/lux/macro/syntax/check.lux index 452254f43..378fe6b35 100644 --- a/stdlib/source/test/lux/macro/syntax/check.lux +++ b/stdlib/source/test/lux/macro/syntax/check.lux @@ -1,23 +1,23 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" try] - ["<>" parser - ["<[0]>" code]]] - [math - ["[0]" random {"+" Random}]] - [macro - ["[0]" code ("[1]#[0]" equivalence)]]]] - [\\library - ["[0]" /]] - ["$[0]" /// "_" - ["[1][0]" code]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" try] + ["<>" parser + ["<[0]>" code]]] + [math + ["[0]" random {"+" Random}]] + [macro + ["[0]" code ("[1]#[0]" equivalence)]]]] + [\\library + ["[0]" /]] + ["$[0]" /// "_" + ["[1][0]" code]]) (def: .public random (Random /.Check) @@ -44,5 +44,5 @@ false {try.#Success check} - (and (code#= type (value@ /.#type check)) - (code#= value (value@ /.#value check))))))))) + (and (code#= type (the /.#type check)) + (code#= value (the /.#value check))))))))) diff --git a/stdlib/source/test/lux/macro/syntax/definition.lux b/stdlib/source/test/lux/macro/syntax/definition.lux index faf667534..bd8e41b38 100644 --- a/stdlib/source/test/lux/macro/syntax/definition.lux +++ b/stdlib/source/test/lux/macro/syntax/definition.lux @@ -1,28 +1,28 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence]]] - [control - ["[0]" try] - ["[0]" exception] - ["<>" parser - ["<[0]>" code]]] - [macro - ["[0]" code ("[1]#[0]" equivalence)]] - [math - ["[0]" random {"+" Random}]] - [meta - ["[0]" location]]]] - [\\library - ["[0]" /]] - ["$[0]"// "_" - ["[1][0]" check] - ["[1]/" // "_" - ["[1][0]" code]]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence]]] + [control + ["[0]" try] + ["[0]" exception] + ["<>" parser + ["<[0]>" code]]] + [macro + ["[0]" code ("[1]#[0]" equivalence)]] + [math + ["[0]" random {"+" Random}]] + [meta + ["[0]" location]]]] + [\\library + ["[0]" /]] + ["$[0]"// "_" + ["[1][0]" check] + ["[1]/" // "_" + ["[1][0]" code]]]) (def: .public random (Random /.Definition) @@ -76,7 +76,7 @@ {try.#Success actual} (# /.equivalence = expected actual))) (_.cover [/.typed] - (let [expected (with@ /.#value {.#Left [type untyped_value]} expected)] + (let [expected (has /.#value {.#Left [type untyped_value]} expected)] (case (<code>.result (/.typed compiler) (list (/.format expected))) {try.#Failure error} @@ -85,7 +85,7 @@ {try.#Success actual} (# /.equivalence = expected actual)))) (_.cover [/.lacks_type] - (let [expected (with@ /.#value {.#Right untyped_value} expected)] + (let [expected (has /.#value {.#Right untyped_value} expected)] (case (<code>.result (/.typed compiler) (list (/.format expected))) {try.#Failure error} diff --git a/stdlib/source/test/lux/math/number/complex.lux b/stdlib/source/test/lux/math/number/complex.lux index 0dca828c9..53b8982a2 100644 --- a/stdlib/source/test/lux/math/number/complex.lux +++ b/stdlib/source/test/lux/math/number/complex.lux @@ -1,25 +1,25 @@ (.using - [library - [lux "*" - ["%" data/text/format {"+" format}] - ["_" test {"+" Test}] - [abstract - [monad {"+" do}] - [\\specification - ["$[0]" equivalence] - ["$[0]" order] - ["$[0]" codec]]] - [data - [collection - ["[0]" list ("[1]#[0]" functor)]]] - ["[0]" math - ["[0]" random {"+" Random}]]]] - [\\library - ["[0]" / - [// - ["n" nat] - ["f" frac] - ["[0]" int]]]]) + [library + [lux "*" + ["%" data/text/format {"+" format}] + ["_" test {"+" Test}] + [abstract + [monad {"+" do}] + [\\specification + ["$[0]" equivalence] + ["$[0]" order] + ["$[0]" codec]]] + [data + [collection + ["[0]" list ("[1]#[0]" functor)]]] + ["[0]" math + ["[0]" random {"+" Random}]]]] + [\\library + ["[0]" / + [// + ["n" nat] + ["f" frac] + ["[0]" int]]]]) ... This margin of error is necessary because floating-point arithmetic is not exact. (def: margin_of_error @@ -43,8 +43,8 @@ (def: angle (Random /.Complex) (# random.monad each - (|>> (revised@ /.#real (f.% +1.0)) - (revised@ /.#imaginary (f.% +1.0))) + (|>> (revised /.#real (f.% +1.0)) + (revised /.#imaginary (f.% +1.0))) ..random)) (def: construction @@ -55,11 +55,11 @@ ($_ _.and (_.cover [/.complex] (and (let [r+i (/.complex real imaginary)] - (and (f.= real (value@ /.#real r+i)) - (f.= imaginary (value@ /.#imaginary r+i)))) + (and (f.= real (the /.#real r+i)) + (f.= imaginary (the /.#imaginary r+i)))) (let [r+i (/.complex real)] - (and (f.= real (value@ /.#real r+i)) - (f.= +0.0 (value@ /.#imaginary r+i)))))) + (and (f.= real (the /.#real r+i)) + (f.= +0.0 (the /.#imaginary r+i)))))) (_.cover [/.approximately?] (/.approximately? ..margin_of_error (/.complex real imaginary) @@ -135,18 +135,18 @@ (_.cover [/.+] (let [z (/.+ y x)] (and (/.= z - (/.complex (f.+ (value@ /.#real y) - (value@ /.#real x)) - (f.+ (value@ /.#imaginary y) - (value@ /.#imaginary x))))))) + (/.complex (f.+ (the /.#real y) + (the /.#real x)) + (f.+ (the /.#imaginary y) + (the /.#imaginary x))))))) (_.cover [/.-] (let [normal! (let [z (/.- y x)] (and (/.= z - (/.complex (f.- (value@ /.#real y) - (value@ /.#real x)) - (f.- (value@ /.#imaginary y) - (value@ /.#imaginary x)))))) + (/.complex (f.- (the /.#real y) + (the /.#real x)) + (f.- (the /.#imaginary y) + (the /.#imaginary x)))))) inverse! (and (|> x (/.+ y) (/.- y) (/.approximately? ..margin_of_error x)) @@ -161,8 +161,8 @@ (let [rem (/.% y x) quotient (|> x (/.- rem) (/./ y)) floored (|> quotient - (revised@ /.#real math.floor) - (revised@ /.#imaginary math.floor))] + (revised /.#real math.floor) + (revised /.#imaginary math.floor))] (/.approximately? +0.000000000001 x (|> quotient (/.* y) (/.+ rem))))) @@ -175,10 +175,10 @@ ($_ _.and (_.cover [/.conjugate] (let [cx (/.conjugate x)] - (and (f.= (value@ /.#real x) - (value@ /.#real cx)) - (f.= (f.opposite (value@ /.#imaginary x)) - (value@ /.#imaginary cx))))) + (and (f.= (the /.#real x) + (the /.#real cx)) + (f.= (f.opposite (the /.#imaginary x)) + (the /.#imaginary cx))))) (_.cover [/.reciprocal] (let [reciprocal! (|> x (/.* (/.reciprocal x)) (/.approximately? ..margin_of_error /.+one)) diff --git a/stdlib/source/test/lux/meta/configuration.lux b/stdlib/source/test/lux/meta/configuration.lux index 9776472d5..c96a5593d 100644 --- a/stdlib/source/test/lux/meta/configuration.lux +++ b/stdlib/source/test/lux/meta/configuration.lux @@ -83,8 +83,8 @@ false] true)))) (_.cover [/.invalid] - (and (text.contains? (value@ exception.#label /.invalid) + (and (text.contains? (the exception.#label /.invalid) (..failure (/.for []))) - (text.contains? (value@ exception.#label /.invalid) + (text.contains? (the exception.#label /.invalid) (..failure (/.for [["left" "yolo"] false]))))) )))) diff --git a/stdlib/source/test/lux/meta/symbol.lux b/stdlib/source/test/lux/meta/symbol.lux index 3e4233939..2ce0ba52b 100644 --- a/stdlib/source/test/lux/meta/symbol.lux +++ b/stdlib/source/test/lux/meta/symbol.lux @@ -32,11 +32,11 @@ [... First Symbol sizeM1 (|> random.nat (# ! each (n.% 100))) sizeS1 (|> random.nat (# ! each (|>> (n.% 100) (n.max 1)))) - (^@ symbol1 [module1 short1]) (..random sizeM1 sizeS1) + (^let symbol1 [module1 short1]) (..random sizeM1 sizeS1) ... Second Symbol sizeM2 (|> random.nat (# ! each (n.% 100))) sizeS2 (|> random.nat (# ! each (|>> (n.% 100) (n.max 1)))) - (^@ symbol2 [module2 short2]) (..random sizeM2 sizeS2)] + (^let symbol2 [module2 short2]) (..random sizeM2 sizeS2)] (_.for [.Symbol] ($_ _.and (_.for [/.equivalence] diff --git a/stdlib/source/test/lux/meta/version.lux b/stdlib/source/test/lux/meta/version.lux index a279158ab..ca219323a 100644 --- a/stdlib/source/test/lux/meta/version.lux +++ b/stdlib/source/test/lux/meta/version.lux @@ -48,8 +48,8 @@ (/.for [<fake> false] true))) (_.cover [/.invalid] - (and (text.contains? (value@ exception.#label /.invalid) + (and (text.contains? (the exception.#label /.invalid) (..failure (/.for []))) - (text.contains? (value@ exception.#label /.invalid) + (text.contains? (the exception.#label /.invalid) (..failure (/.for [<fake> false]))))) ))) diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux index a10c0e0e1..cdeefb573 100644 --- a/stdlib/source/test/lux/target/jvm.lux +++ b/stdlib/source/test/lux/target/jvm.lux @@ -1,58 +1,58 @@ (.using - [library - [lux {"-" Type Primitive Label type int} - ["[0]" ffi {"+" import:}] - ["@" target] - [abstract - ["[0]" monad {"+" do}]] - [control - ["[0]" function] - ["[0]" io] - ["[0]" maybe] - ["[0]" try] - [concurrency - ["[0]" atom]]] - [data - ["[0]" bit ("[1]#[0]" equivalence)] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]] - ["[0]" format "_" - ["[1]" binary]] - [collection - ["[0]" array] - ["[0]" dictionary] - ["[0]" sequence] - ["[0]" set] - ["[0]" list ("[1]#[0]" functor)]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat] - ["i" int] - ["f" frac] - ["[0]" i32 {"+" I32}] - ["[0]" i64]]] - ["_" test {"+" Test}]]] - [\\library - ["[0]" / "_" - ["[1][0]" loader {"+" Library}] - ["[1][0]" version] - ["[1][0]" modifier ("[1]#[0]" monoid)] - ["[1][0]" field] - ["[1][0]" method {"+" Method}] - ["[1][0]" class] - ["[1][0]" attribute - ["[1]/[0]" code]] - ["[1][0]" constant - ["[1]/[0]" pool {"+" Resource}]] - [encoding - ["[1][0]" name] - ["[1][0]" signed] - ["[1][0]" unsigned]] - ["[1]" bytecode {"+" Label Bytecode} - ["[1][0]" instruction]] - ["[1][0]" type {"+" Type} - ["[0]" category {"+" Value Object Class}]]]]) + [library + [lux {"-" Type Primitive Label type int} + ["[0]" ffi {"+" import:}] + ["@" target] + [abstract + ["[0]" monad {"+" do}]] + [control + ["[0]" function] + ["[0]" io] + ["[0]" maybe] + ["[0]" try] + [concurrency + ["[0]" atom]]] + [data + ["[0]" bit ("[1]#[0]" equivalence)] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]] + ["[0]" format "_" + ["[1]" binary]] + [collection + ["[0]" array] + ["[0]" dictionary] + ["[0]" sequence] + ["[0]" set] + ["[0]" list ("[1]#[0]" functor)]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat] + ["i" int] + ["f" frac] + ["[0]" i32 {"+" I32}] + ["[0]" i64]]] + ["_" test {"+" Test}]]] + [\\library + ["[0]" / "_" + ["[1][0]" loader {"+" Library}] + ["[1][0]" version] + ["[1][0]" modifier ("[1]#[0]" monoid)] + ["[1][0]" field] + ["[1][0]" method {"+" Method}] + ["[1][0]" class] + ["[1][0]" attribute + ["[1]/[0]" code]] + ["[1][0]" constant + ["[1]/[0]" pool {"+" Resource}]] + [encoding + ["[1][0]" name] + ["[1][0]" signed] + ["[1][0]" unsigned]] + ["[1]" bytecode {"+" Label Bytecode} + ["[1][0]" instruction]] + ["[1][0]" type {"+" Type} + ["[0]" category {"+" Value Object Class}]]]]) (def: method_modifier ($_ /modifier#composite @@ -1054,13 +1054,13 @@ (-> (Primitive a) (Primitive z) (Bytecode Any) (-> a z) (-> z Any Bit) (Random Bit))) (function (_ from to instruction convert test) (do random.monad - [input (value@ #random from) + [input (the #random from) .let [expected (convert input)]] (..bytecode (test expected) (do /.monad - [_ ((value@ #literal from) input) + [_ ((the #literal from) input) _ instruction] - (value@ #wrap to)))))) + (the #wrap to)))))) int::= (!::= java/lang/Integer "jvm ieq" "jvm int =") long::= (!::= java/lang/Long "jvm leq" "jvm long =") float::= (!::= java/lang/Float "jvm feq" "jvm float =") @@ -1324,10 +1324,10 @@ (do random.monad [class_name ..class_name primitive_method_name (random.ascii/upper 10) - .let [primitive_method_type (/type.method [(list) (list) (value@ #unboxed primitive) (list)])] + .let [primitive_method_type (/type.method [(list) (list) (the #unboxed primitive) (list)])] object_method_name (|> (random.ascii/upper 10) (random.only (|>> (text#= primitive_method_name) not))) - expected (value@ #random primitive) + expected (the #random primitive) .let [$Self (/type.class class_name (list))]] (in (case (do try.monad [class (/class.class /version.v6_0 /class.public @@ -1341,11 +1341,11 @@ #0 primitive_method_type (list) {.#Some (do /.monad - [_ ((value@ #literal primitive) expected)] + [_ ((the #literal primitive) expected)] return)}) (/method.method ..method_modifier object_method_name - #0 (/type.method [(list) (list) (value@ #boxed primitive) (list)]) + #0 (/type.method [(list) (list) (the #boxed primitive) (list)]) (list) {.#Some (do /.monad [_ (/.invokestatic $Self primitive_method_name primitive_method_type) @@ -1355,7 +1355,7 @@ {.#Some substitute} (substitute expected)) - _ (value@ #wrap primitive)] + _ (the #wrap primitive)] /.areturn)})) (sequence.sequence)) .let [bytecode (format.result /class.writer class) diff --git a/stdlib/source/test/lux/test.lux b/stdlib/source/test/lux/test.lux index feec778bb..4e9638e6d 100644 --- a/stdlib/source/test/lux/test.lux +++ b/stdlib/source/test/lux/test.lux @@ -26,8 +26,8 @@ (-> Text Text Nat Nat [/.Tally Text] Bit) (and (text.contains? expected_message/0 message) (text.contains? expected_message/1 message) - (n.= successes (value@ /.#successes tally)) - (n.= failures (value@ /.#failures tally)))) + (n.= successes (the /.#successes tally)) + (n.= failures (the /.#failures tally)))) (def: assertion /.Test @@ -42,10 +42,10 @@ (/.cover' [/.assertion /.Tally] (and (text.ends_with? expected_message/0 success_message) (text.ends_with? expected_message/0 failure_message) - (and (n.= 1 (value@ /.#successes success_tally)) - (n.= 0 (value@ /.#failures success_tally))) - (and (n.= 0 (value@ /.#successes failure_tally)) - (n.= 1 (value@ /.#failures failure_tally))))))) + (and (n.= 1 (the /.#successes success_tally)) + (n.= 0 (the /.#failures success_tally))) + (and (n.= 0 (the /.#successes failure_tally)) + (n.= 1 (the /.#failures failure_tally))))))) (in (do async.monad [tt (/.and' (/.assertion expected_message/0 true) (/.assertion expected_message/1 true)) @@ -83,10 +83,10 @@ [[pre_tally pre_message] pre [post_tally post_message] post] (/.cover' [/.seed] - (and (and (n.= 1 (value@ /.#successes pre_tally)) - (n.= 0 (value@ /.#failures pre_tally))) - (and (n.= 1 (value@ /.#successes post_tally)) - (n.= 0 (value@ /.#failures post_tally))))))))) + (and (and (n.= 1 (the /.#successes pre_tally)) + (n.= 0 (the /.#failures pre_tally))) + (and (n.= 1 (the /.#successes post_tally)) + (n.= 0 (the /.#failures post_tally))))))))) (def: times /.Test @@ -96,9 +96,9 @@ (in (do async.monad [[tally error] times_assertion] (/.cover' [/.must_try_test_at_least_once] - (and (text.contains? (value@ exception.#label /.must_try_test_at_least_once) error) - (n.= 0 (value@ /.#successes tally)) - (n.= 1 (value@ /.#failures tally))))))) + (and (text.contains? (the exception.#label /.must_try_test_at_least_once) error) + (n.= 0 (the /.#successes tally)) + (n.= 1 (the /.#failures tally))))))) (do [! random.monad] [expected (# ! each (|>> (n.% 10) ++) random.nat) .let [counter (: (Atom Nat) @@ -113,8 +113,8 @@ actual (async.future (atom.read! counter))] (/.cover' [/.times] (and (n.= expected actual) - (n.= 1 (value@ /.#successes tally)) - (n.= 0 (value@ /.#failures tally))))))) + (n.= 1 (the /.#successes tally)) + (n.= 0 (the /.#failures tally))))))) )) (def: in_parallel @@ -136,8 +136,8 @@ actual (async.future (atom.read! counter))] (/.cover' [/.in_parallel] (and (n.= expected actual) - (n.= expected (value@ /.#successes tally)) - (n.= 0 (value@ /.#failures tally))))))) + (n.= expected (the /.#successes tally)) + (n.= 0 (the /.#failures tally))))))) (do [! random.monad] [expected (# ! each (|>> (n.% 10) ++) random.nat) .let [counter (: (Atom Nat) @@ -154,10 +154,10 @@ [[tally error] assertion actual (async.future (atom.read! counter))] (/.cover' [/.error_during_execution] - (let [correct_error! (text.contains? (value@ exception.#label /.error_during_execution) error) + (let [correct_error! (text.contains? (the exception.#label /.error_during_execution) error) no_complete_run! (n.= 0 actual) - no_successes! (n.= 0 (value@ /.#successes tally)) - ran_all_tests! (n.= expected (value@ /.#failures tally))] + no_successes! (n.= 0 (the /.#successes tally)) + ran_all_tests! (n.= expected (the /.#failures tally))] (and correct_error! no_complete_run! no_successes! @@ -177,10 +177,10 @@ [[not_covering _] not_covering [covering _] covering] (/.cover' [/.covering] - (and (and (set.empty? (value@ /.#expected_coverage not_covering)) - (set.empty? (value@ /.#actual_coverage not_covering))) - (and (not (set.empty? (value@ /.#expected_coverage covering))) - (set.empty? (value@ /.#actual_coverage covering)))))))) + (and (and (set.empty? (the /.#expected_coverage not_covering)) + (set.empty? (the /.#actual_coverage not_covering))) + (and (not (set.empty? (the /.#expected_coverage covering))) + (set.empty? (the /.#actual_coverage covering)))))))) (do random.monad [not_covering (/.covering .._ (/.test "" true)) covering (/.covering .._ (/.cover [..dummy_target] true))] @@ -188,10 +188,10 @@ [[not_covering _] not_covering [covering _] covering] (/.cover' [/.cover] - (and (and (not (set.empty? (value@ /.#expected_coverage not_covering))) - (not (set.member? (value@ /.#actual_coverage not_covering) (symbol ..dummy_target)))) - (and (not (set.empty? (value@ /.#expected_coverage covering))) - (set.member? (value@ /.#actual_coverage covering) (symbol ..dummy_target)))))))) + (and (and (not (set.empty? (the /.#expected_coverage not_covering))) + (not (set.member? (the /.#actual_coverage not_covering) (symbol ..dummy_target)))) + (and (not (set.empty? (the /.#expected_coverage covering))) + (set.member? (the /.#actual_coverage covering) (symbol ..dummy_target)))))))) (do random.monad [not_covering (/.covering .._ (/.test "" true)) covering (/.covering .._ (in (/.cover' [..dummy_target] true)))] @@ -199,10 +199,10 @@ [[not_covering _] not_covering [covering _] covering] (/.cover' [/.cover'] - (and (and (not (set.empty? (value@ /.#expected_coverage not_covering))) - (not (set.member? (value@ /.#actual_coverage not_covering) (symbol ..dummy_target)))) - (and (not (set.empty? (value@ /.#expected_coverage covering))) - (set.member? (value@ /.#actual_coverage covering) (symbol ..dummy_target)))))))) + (and (and (not (set.empty? (the /.#expected_coverage not_covering))) + (not (set.member? (the /.#actual_coverage not_covering) (symbol ..dummy_target)))) + (and (not (set.empty? (the /.#expected_coverage covering))) + (set.member? (the /.#actual_coverage covering) (symbol ..dummy_target)))))))) (do random.monad [not_covering (/.covering .._ (/.test "" true)) covering (/.covering .._ (/.for [..dummy_target] (/.test "" true)))] @@ -210,10 +210,10 @@ [[not_covering _] not_covering [covering _] covering] (/.cover' [/.for] - (and (and (not (set.empty? (value@ /.#expected_coverage not_covering))) - (not (set.member? (value@ /.#actual_coverage not_covering) (symbol ..dummy_target)))) - (and (not (set.empty? (value@ /.#expected_coverage covering))) - (set.member? (value@ /.#actual_coverage covering) (symbol ..dummy_target)))))))) + (and (and (not (set.empty? (the /.#expected_coverage not_covering))) + (not (set.member? (the /.#actual_coverage not_covering) (symbol ..dummy_target)))) + (and (not (set.empty? (the /.#expected_coverage covering))) + (set.member? (the /.#actual_coverage covering) (symbol ..dummy_target)))))))) )) (def: .public test @@ -240,10 +240,10 @@ (/.cover' [/.test] (and (text.ends_with? (%.text expected_message/0) success_message) (text.ends_with? (%.text expected_message/0) failure_message) - (and (n.= 1 (value@ /.#successes success_tally)) - (n.= 0 (value@ /.#failures success_tally))) - (and (n.= 0 (value@ /.#successes failure_tally)) - (n.= 1 (value@ /.#failures failure_tally)))))))) + (and (n.= 1 (the /.#successes success_tally)) + (n.= 0 (the /.#failures success_tally))) + (and (n.= 0 (the /.#successes failure_tally)) + (n.= 1 (the /.#failures failure_tally)))))))) (do ! [tt (/.and (/.test expected_message/0 true) (/.test expected_message/1 true)) @@ -274,18 +274,18 @@ (text.contains? expected_message/0 success_message)) (and (text.contains? expected_context failure_message) (text.contains? expected_message/0 failure_message)) - (and (n.= 1 (value@ /.#successes success_tally)) - (n.= 0 (value@ /.#failures success_tally))) - (and (n.= 0 (value@ /.#successes failure_tally)) - (n.= 1 (value@ /.#failures failure_tally)))))))) + (and (n.= 1 (the /.#successes success_tally)) + (n.= 0 (the /.#failures success_tally))) + (and (n.= 0 (the /.#successes failure_tally)) + (n.= 1 (the /.#failures failure_tally)))))))) (do ! [failure_assertion (/.failure expected_message/0)] (in (do async.monad [[failure_tally failure_message] failure_assertion] (/.cover' [/.failure] (and (text.contains? expected_message/0 failure_message) - (and (n.= 0 (value@ /.#successes failure_tally)) - (n.= 1 (value@ /.#failures failure_tally)))))))) + (and (n.= 0 (the /.#successes failure_tally)) + (n.= 1 (the /.#failures failure_tally)))))))) (do ! [success_assertion (/.lifted expected_message/0 (in true)) failure_assertion (/.lifted expected_message/0 (in false))] @@ -295,10 +295,10 @@ (/.cover' [/.lifted] (and (text.contains? expected_message/0 success_message) (text.contains? expected_message/0 failure_message) - (and (n.= 1 (value@ /.#successes success_tally)) - (n.= 0 (value@ /.#failures success_tally))) - (and (n.= 0 (value@ /.#successes failure_tally)) - (n.= 1 (value@ /.#failures failure_tally)))))))) + (and (n.= 1 (the /.#successes success_tally)) + (n.= 0 (the /.#failures success_tally))) + (and (n.= 0 (the /.#successes failure_tally)) + (n.= 1 (the /.#failures failure_tally)))))))) ..times ..in_parallel ..coverage diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux index ee058760a..7ca3c4b12 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux @@ -253,10 +253,10 @@ location/0 /location.random location/1 /location.random configuration ($configuration.random 5) - .let [state/0 (with@ .#location location/0 - (/.state (/.info version/0 host/0 configuration))) - state/1 (with@ .#location location/1 - (/.state (/.info version/1 host/1 configuration)))]] + .let [state/0 (has .#location location/0 + (/.state (/.info version/0 host/0 configuration))) + state/1 (has .#location location/1 + (/.state (/.info version/1 host/1 configuration)))]] ($_ _.and (_.cover [/.set_state] (|> (do phase.monad @@ -335,30 +335,30 @@ expected_code (random.ascii/lower 13) configuration ($configuration.random 5) - .let [state (with@ .#location location - (/.state (/.info version host configuration)))]] + .let [state (has .#location location + (/.state (/.info version host configuration)))]] ($_ _.and (_.cover [/.info] (let [it (/.info version host configuration)] (and (text#= (version.format version) - (value@ .#version it)) + (the .#version it)) (same? host - (value@ .#target it)) - (..tagged? .#Build (value@ .#mode it)) - (same? configuration (value@ .#configuration it))))) + (the .#target it)) + (..tagged? .#Build (the .#mode it)) + (same? configuration (the .#configuration it))))) (_.cover [/.state] (let [info (/.info version host configuration) it (/.state info)] (and (same? info - (value@ .#info it)) + (the .#info it)) (same? location.dummy - (value@ .#location it)) - (..tagged? .#None (value@ .#current_module it)) - (..tagged? .#None (value@ .#expected it)) - (list.empty? (value@ .#modules it)) - (list.empty? (value@ .#scopes it)) - (list.empty? (value@ [.#type_context .#var_bindings] it)) - (case (value@ .#source it) + (the .#location it)) + (..tagged? .#None (the .#current_module it)) + (..tagged? .#None (the .#expected it)) + (list.empty? (the .#modules it)) + (list.empty? (the .#scopes it)) + (list.empty? (the [.#type_context .#var_bindings] it)) + (case (the .#source it) [location 0 ""] (same? location.dummy location) @@ -367,7 +367,7 @@ (_.cover [/.set_current_module] (|> (do phase.monad [_ (/.set_current_module expected_module)] - (extension.read (|>> (value@ .#current_module) (maybe.else "")))) + (extension.read (|>> (the .#current_module) (maybe.else "")))) (phase.result [extension.#bundle extension.empty extension.#state state]) (case> {try.#Success actual} @@ -376,7 +376,7 @@ _ false))) (_.cover [/.with_current_module] - (let [current_module (extension.read (|>> (value@ .#current_module) (maybe.else "")))] + (let [current_module (extension.read (|>> (the .#current_module) (maybe.else "")))] (|> (do phase.monad [_ (/.set_current_module expected_module) pre current_module @@ -393,7 +393,7 @@ (let [expected (/.location expected_file)] (|> (do phase.monad [_ (/.set_location expected)] - (extension.read (value@ .#location))) + (extension.read (the .#location))) (phase.result [extension.#bundle extension.empty extension.#state state]) (case> {try.#Success actual} @@ -404,7 +404,7 @@ (_.cover [/.with_location] (let [expected (/.location expected_file) dummy (/.location expected_code) - location (extension.read (value@ .#location))] + location (extension.read (the .#location))] (|> (do phase.monad [_ (/.set_location expected) pre location @@ -421,7 +421,7 @@ (let [expected (/.source expected_file expected_code)] (|> (do phase.monad [_ (/.set_source_code expected)] - (extension.read (value@ .#source))) + (extension.read (the .#source))) (phase.result [extension.#bundle extension.empty extension.#state state]) (case> {try.#Success actual} @@ -432,7 +432,7 @@ (_.cover [/.with_source_code] (let [expected (/.source expected_file expected_code) dummy (/.source expected_code expected_file) - source (extension.read (value@ .#source))] + source (extension.read (the .#source))] (|> (do phase.monad [_ (/.set_source_code expected) pre source diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux index 63038413d..aa9f91e78 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux @@ -79,7 +79,7 @@ false {try.#Failure error} - (text.contains? (value@ exception.#label exception) error))) + (text.contains? (the exception.#label exception) error))) (def: .public simple_parameter (Random [Type Code]) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux index d3f1ff62d..e3dd8a53f 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux @@ -89,7 +89,7 @@ (meta.result lux) (case> {try.#Failure it} (and (text.contains? expected_error it) - (text.contains? (value@ exception.#label /.expansion_failed) it)) + (text.contains? (the exception.#label /.expansion_failed) it)) _ false))) @@ -102,7 +102,7 @@ (|> (/.single_expansion ..expander name multiple (list mono)) (meta.result lux) (case> {try.#Failure it} - (text.contains? (value@ exception.#label /.must_have_single_expansion) it) + (text.contains? (the exception.#label /.must_have_single_expansion) it) _ false))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux index 69e7970f8..904bd4dd7 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux @@ -46,11 +46,11 @@ (def: (new? hash it) (-> Nat .Module Bit) - (and (same? hash (value@ .#module_hash it)) - (list.empty? (value@ .#module_aliases it)) - (list.empty? (value@ .#definitions it)) - (list.empty? (value@ .#imports it)) - (case (value@ .#module_state it) + (and (same? hash (the .#module_hash it)) + (list.empty? (the .#module_aliases it)) + (list.empty? (the .#definitions it)) + (list.empty? (the .#imports it)) + (case (the .#module_state it) {.#Active} true @@ -120,7 +120,7 @@ (/.alias expected_alias expected_import)))] (in it)) (/phase.result state) - (try#each (|>> (value@ .#module_aliases) + (try#each (|>> (the .#module_aliases) (case> (^ (list [actual_alias actual_import])) (and (same? expected_alias actual_alias) (same? expected_import actual_import)) @@ -168,7 +168,7 @@ false {try.#Failure error} - (text.contains? (value@ exception.#label /.can_only_change_state_of_active_module) error)))] + (text.contains? (the exception.#label /.can_only_change_state_of_active_module) error)))] [/.set_compiled /.set_active] [/.set_compiled /.set_compiled] @@ -185,7 +185,7 @@ false {try.#Failure error} - (text.contains? (value@ exception.#label /.unknown_module) error)))] + (text.contains? (the exception.#label /.unknown_module) error)))] [/.set_active] [/.set_compiled] @@ -310,7 +310,7 @@ false {try.#Failure error} - (text.contains? (value@ exception.#label /.cannot_declare_labels_for_anonymous_type) error)))] + (text.contains? (the exception.#label /.cannot_declare_labels_for_anonymous_type) error)))] [.#Left false] [.#Right true]))))) @@ -326,7 +326,7 @@ false {try.#Failure error} - (text.contains? (value@ exception.#label /.cannot_declare_labels_for_foreign_type) error)))] + (text.contains? (the exception.#label /.cannot_declare_labels_for_foreign_type) error)))] [.#Left false] [.#Right true]))))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/scope.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/scope.lux index 3338cc9a2..db4902b2b 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/scope.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/scope.lux @@ -127,7 +127,7 @@ (try.else false)))) (_.cover [/.drained] (|> (function (_ [bundle state]) - {try.#Success [[bundle (with@ .#scopes (list) state)] + {try.#Success [[bundle (has .#scopes (list) state)] false]}) (/.with_local [name/0 type/0]) /.with @@ -149,12 +149,12 @@ (//phase.result state) (try#each (function (_ [scope/0 var/0' scope/1 var/0'']) (and (local? type/0 0 var/0') - (n.= 0 (list.size (value@ [.#locals .#mappings] scope/0))) - (n.= 0 (list.size (value@ [.#captured .#mappings] scope/0))) + (n.= 0 (list.size (the [.#locals .#mappings] scope/0))) + (n.= 0 (list.size (the [.#captured .#mappings] scope/0))) (foreign? type/0 0 var/0'') - (n.= 0 (list.size (value@ [.#locals .#mappings] scope/1))) - (n.= 1 (list.size (value@ [.#captured .#mappings] scope/1)))))) + (n.= 0 (list.size (the [.#locals .#mappings] scope/1))) + (n.= 1 (list.size (the [.#captured .#mappings] scope/1)))))) (try.else false))) (_.cover [/.environment] (let [(^open "list#[0]") (list.equivalence //variable.equivalence)] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux index e2ee0a546..6c1e342ec 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux @@ -945,7 +945,7 @@ (//module.with 0 module/0) (phase#each (|>> product.right product.right)) (phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.invalid))))] + (exception.otherwise (text.contains? (the exception.#label /.invalid))))] [(` ({#0} (~ (code.bit bit/0))))] [(` ({#0 [] #1} (~ (code.bit bit/0))))] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux index 8ade96d8a..b08ab36de 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux @@ -120,25 +120,25 @@ _ (/.tuple :var:)] (in false)) (check.result check.fresh_context) - (exception.otherwise (text.contains? (value@ exception.#label /.non_tuple)))) + (exception.otherwise (text.contains? (the exception.#label /.non_tuple)))) (|> (do check.monad [[@var :var:] check.var _ (/.tuple (type (:var: input/0 input/1 input/2)))] (in false)) (check.result check.fresh_context) - (exception.otherwise (text.contains? (value@ exception.#label /.non_tuple)))) + (exception.otherwise (text.contains? (the exception.#label /.non_tuple)))) (|> (do check.monad [_ (/.tuple (type (input/0 input/1 input/2)))] (in false)) (check.result check.fresh_context) - (exception.otherwise (text.contains? (value@ exception.#label /.non_tuple)))) + (exception.otherwise (text.contains? (the exception.#label /.non_tuple)))) (|> (do check.monad [[@var :var:] check.var _ (check.bind input/0 @var) _ (/.tuple (type (:var: input/1 input/2)))] (in false)) (check.result check.fresh_context) - (exception.otherwise (text.contains? (value@ exception.#label /.non_tuple)))))) + (exception.otherwise (text.contains? (the exception.#label /.non_tuple)))))) ))) (def: (test|case lux [module/0 name/0] [input/0 simple/0] [input/1 simple/1] [input/2 simple/2] [$binding/0 $binding/1 $binding/2] [output/0 body/0] [output/1 body/1] [bit/0 nat/0]) @@ -262,7 +262,7 @@ (//module.with 0 module/0) (//phase#each (|>> product.right product.right)) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label //coverage.redundancy))))))] + (exception.otherwise (text.contains? (the exception.#label //coverage.redundancy))))))] (and (redundant? (` []) (list [(` []) body/0] [(` []) body/0])) @@ -530,7 +530,7 @@ (//module.with 0 module/0) (//phase#each (|>> product.right product.right)) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.empty_branches))))) + (exception.otherwise (text.contains? (the exception.#label /.empty_branches))))) (_.cover [/.non_exhaustive] (let [non_exhaustive? (: (-> (List [Code Code]) Bit) (function (_ branches) @@ -542,7 +542,7 @@ (//module.with 0 module/0) (//phase#each (|>> product.right product.right)) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.non_exhaustive))))))] + (exception.otherwise (text.contains? (the exception.#label /.non_exhaustive))))))] (and (non_exhaustive? (list [simple/0 body/0])) (not (non_exhaustive? (list [simple/0 body/0] [$binding/0 body/0])))))) @@ -557,7 +557,7 @@ (//module.with 0 module/0) (//phase#each (|>> product.right product.right)) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.invalid))))))] + (exception.otherwise (text.contains? (the exception.#label /.invalid))))))] (and (invalid? (list [(` ((~ extension/0) (~ $binding/0) (~ $binding/1) (~ $binding/2))) body/0])) (invalid? (list [(` {(~ extension/0) (~ $binding/0) (~ $binding/1) (~ $binding/2)}) @@ -590,7 +590,7 @@ (//module.with 0 module/0) (//phase#each (|>> product.right product.right)) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.sum_has_no_case)))))) + (exception.otherwise (text.contains? (the exception.#label /.sum_has_no_case)))))) (_.cover [/.mismatch] (let [slot/0 (%.code $binding/0) slot/1 (%.code $binding/1) @@ -615,7 +615,7 @@ (//module.with 0 module/0) (//phase#each (|>> product.right product.right)) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.mismatch)))) + (exception.otherwise (text.contains? (the exception.#label /.mismatch)))) (|> (do //phase.monad [_ (//module.declare_labels true slots/* false :record:) analysis (|> (` (~ simple/0)) @@ -630,7 +630,7 @@ (//module.with 0 module/0) (//phase#each (|>> product.right product.right)) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.mismatch))))))) + (exception.otherwise (text.contains? (the exception.#label /.mismatch))))))) ..test|tuple )))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux index 546aa1c39..203c7a46f 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux @@ -84,7 +84,7 @@ false {try.#Failure error} - (text.contains? (value@ exception.#label exception) error))) + (text.contains? (the exception.#label exception) error))) (def: simple_parameter (Random [Type Code]) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux index a5f5953e6..dfc9ba28d 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux @@ -191,7 +191,7 @@ (//module.with 0 module/0) (//phase#each product.right) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.cannot_analyse))))) + (exception.otherwise (text.contains? (the exception.#label /.cannot_analyse))))) ))) (def: test|apply @@ -247,7 +247,7 @@ (//module.with 0 module/0) (//phase#each product.right) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.cannot_apply))))) + (exception.otherwise (text.contains? (the exception.#label /.cannot_apply))))) ))) (def: .public test diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux index af84eb488..3c215c00b 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux @@ -173,7 +173,7 @@ (//module.with 0 expected_module) (//phase#each product.right) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.foreign_module_has_not_been_imported))) + (exception.otherwise (text.contains? (the exception.#label /.foreign_module_has_not_been_imported))) )))] (and (scenario expected_type {.#Definition [#1 expected_type []]}) (scenario .Type {.#Type [#1 expected_type @@ -192,7 +192,7 @@ (//module.with 0 expected_module) (//phase#each product.right) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.definition_has_not_been_exported))) + (exception.otherwise (text.contains? (the exception.#label /.definition_has_not_been_exported))) )))] (and (scenario expected_type {.#Definition [#0 expected_type []]}) (scenario .Type {.#Type [#0 expected_type @@ -211,7 +211,7 @@ (//module.with 0 expected_module) (//phase#each product.right) (//phase.result state) - (exception.otherwise (text.contains? (value@ exception.#label /.labels_are_not_definitions))))))] + (exception.otherwise (text.contains? (the exception.#label /.labels_are_not_definitions))))))] (and (scenario expected_type {.#Tag [#1 expected_type (list) 0]}) (scenario expected_type {.#Slot [#1 expected_type (list) 0]})))) )))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux index 2d5073ecf..55a187083 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux @@ -1,30 +1,30 @@ (.using - [lux "*" - ["_" test {"+" Test}] - [abstract - ["[0]" monad {"+" do}]] - [math - ["[0]" random {"+" Random}]] - [control - [pipe {"+" case>}] - ["[0]" try]] - [data - ["[0]" product] - ["[0]" text - ["%" format {"+" format}]] - [number - ["n" nat]] - [collection - ["[0]" list ("[1]#[0]" functor mix)] - ["[0]" dictionary {"+" Dictionary}]]]] - [\\ - ["[0]" / - [//// - ["[0]" analysis] - ["[0]" synthesis {"+" Side Member Path Synthesis}] - [/// - [reference - ["[0]" variable]]]]]]) + [lux "*" + ["_" test {"+" Test}] + [abstract + ["[0]" monad {"+" do}]] + [math + ["[0]" random {"+" Random}]] + [control + [pipe {"+" case>}] + ["[0]" try]] + [data + ["[0]" product] + ["[0]" text + ["%" format {"+" format}]] + [number + ["n" nat]] + [collection + ["[0]" list ("[1]#[0]" functor mix)] + ["[0]" dictionary {"+" Dictionary}]]]] + [\\ + ["[0]" / + [//// + ["[0]" analysis] + ["[0]" synthesis {"+" Side Member Path Synthesis}] + [/// + [reference + ["[0]" variable]]]]]]) (template: (!expect <pattern> <value>) (case <value> @@ -70,9 +70,9 @@ (do ! [let? random.bit [expected_input actual_input] (..primitive_scenario context) - .let [fake_register (n.+ (value@ #redundants context) - (dictionary.size (value@ #necessary context)))] - [expected_output actual_output] (scenario (revised@ #redundants ++ context))] + .let [fake_register (n.+ (the #redundants context) + (dictionary.size (the #necessary context)))] + [expected_output actual_output] (scenario (revised #redundants ++ context))] (in [(synthesis.branch/case [expected_input {synthesis.#Seq {synthesis.#Pop} {synthesis.#Then expected_output}}]) @@ -95,7 +95,7 @@ (def: (tuple_scenario context) (Scenario Synthesis) - (let [registers (dictionary.entries (value@ #necessary context))] + (let [registers (dictionary.entries (the #necessary context))] (# random.monad in [(synthesis.tuple (list#each (|>> product.left synthesis.variable/local) registers)) (synthesis.tuple (list#each (|>> product.right synthesis.variable/local) registers))]))) @@ -110,10 +110,10 @@ (do random.monad [_ (in []) [expected_input actual_input] (scenario context) - .let [real_register (dictionary.size (value@ #necessary context)) - fake_register (n.+ (value@ #redundants context) - (dictionary.size (value@ #necessary context)))] - [expected_output actual_output] (scenario (revised@ #necessary (dictionary.has real_register fake_register) context))] + .let [real_register (dictionary.size (the #necessary context)) + fake_register (n.+ (the #redundants context) + (dictionary.size (the #necessary context)))] + [expected_output actual_output] (scenario (revised #necessary (dictionary.has real_register fake_register) context))] (in [(synthesis.branch/let [expected_input real_register expected_output]) (synthesis.branch/let [actual_input fake_register actual_output])]))) @@ -166,10 +166,10 @@ {synthesis.#Then actual_then}}])) (do [! random.monad] [_ (in []) - .let [real_register (dictionary.size (value@ #necessary context)) - fake_register (n.+ (value@ #redundants context) - (dictionary.size (value@ #necessary context)))] - [expected_then actual_then] (scenario (revised@ #necessary (dictionary.has real_register fake_register) context))] + .let [real_register (dictionary.size (the #necessary context)) + fake_register (n.+ (the #redundants context) + (dictionary.size (the #necessary context)))] + [expected_then actual_then] (scenario (revised #necessary (dictionary.has real_register fake_register) context))] (in [{synthesis.#Seq {synthesis.#Bind real_register} {synthesis.#Seq {synthesis.#Pop} {synthesis.#Then expected_then}}} @@ -238,19 +238,19 @@ (-> (Scenario Synthesis) (Scenario Synthesis)) (do [! random.monad] [_ (in []) - .let [real_start (dictionary.size (value@ #necessary context)) - fake_start (n.+ (value@ #redundants context) + .let [real_start (dictionary.size (the #necessary context)) + fake_start (n.+ (the #redundants context) real_start)] inits (random.list ..scope_arity (scenario context)) - [expected_iteration actual_iteration] (scenario (revised@ #necessary - (function (_ necessary) - (list#mix (function (_ [idx _] context) - (dictionary.has (n.+ real_start idx) - (n.+ fake_start idx) - context)) - necessary - (list.enumeration inits))) - context))] + [expected_iteration actual_iteration] (scenario (revised #necessary + (function (_ necessary) + (list#mix (function (_ [idx _] context) + (dictionary.has (n.+ real_start idx) + (n.+ fake_start idx) + context)) + necessary + (list.enumeration inits))) + context))] (in [(synthesis.loop/scope [real_start (list#each product.left inits) expected_iteration]) (synthesis.loop/scope [fake_start (list#each product.right inits) actual_iteration])]))) @@ -273,7 +273,7 @@ (-> (Scenario Synthesis) (Scenario Synthesis)) (do [! random.monad] [_ (in []) - .let [registers (dictionary.entries (value@ #necessary context)) + .let [registers (dictionary.entries (the #necessary context)) expected_environment (list#each (|>> product.left {variable.#Local}) registers) actual_environment (list#each (|>> product.right {variable.#Local}) registers)] [expected_body actual_body] (..primitive_scenario context)] diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive.lux b/stdlib/source/test/lux/tool/compiler/meta/archive.lux index 3afb5c406..7cbd76e8a 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/archive.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/archive.lux @@ -53,7 +53,7 @@ [module/0 (random.ascii/lower 1) module/1 (random.ascii/lower 2) signature $/signature.random - .let [version (value@ /signature.#version signature)] + .let [version (the /signature.#version signature)] fake_version (random.only (|>> (n.= version) not) random.nat) content/0 random.nat content/1 (random.only (|>> (n.= content/0) not) random.nat) diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/module/descriptor.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/module/descriptor.lux index 95a290b11..37c1af940 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/archive/module/descriptor.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/archive/module/descriptor.lux @@ -54,6 +54,6 @@ (|> expected (binary.result /.writer) (<binary>.result /.parser) - (try#each (|>> (# /.equivalence = (with@ /.#state {.#Cached} expected)))) + (try#each (|>> (# /.equivalence = (has /.#state {.#Cached} expected)))) (try.else false))) ))) diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux index 893f1da72..b26e16b6a 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux @@ -71,9 +71,9 @@ (let [[@it registry] (/.resource mandatory? expected_dependencies /.empty)] (case (sequence.list (/.artifacts registry)) (^ (list [artifact actual_dependencies])) - (and (same? @it (value@ artifact.#id artifact)) - (same? mandatory? (value@ artifact.#mandatory? artifact)) - (tagged? category.#Anonymous (value@ artifact.#category artifact)) + (and (same? @it (the artifact.#id artifact)) + (same? mandatory? (the artifact.#mandatory? artifact)) + (tagged? category.#Anonymous (the artifact.#category artifact)) (same? expected_dependencies actual_dependencies)) _ @@ -91,9 +91,9 @@ false) (case (sequence.list (/.artifacts registry)) (^ (list [artifact actual_dependencies])) - (and (same? @it (value@ artifact.#id artifact)) - (same? mandatory? (value@ artifact.#mandatory? artifact)) - (case (value@ artifact.#category artifact) + (and (same? @it (the artifact.#id artifact)) + (same? mandatory? (the artifact.#mandatory? artifact)) + (case (the artifact.#category artifact) {<tag> actual_name} (same? <expected> actual_name) @@ -145,7 +145,7 @@ it (/.artifacts registry)] (and (n.= expected_amount (sequence.size it)) (list.every? (function (_ [@it [it dependencies]]) - (same? @it (value@ artifact.#id it))) + (same? @it (the artifact.#id it))) (list.zipped/2 (sequence.list ids) (sequence.list it))) (# (list.equivalence <equivalence>) = expected/* (<query> registry))))] diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux index 9a190448a..700cf75d7 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux @@ -52,14 +52,14 @@ content/0 ($binary.random 1) name/1 (random.ascii/lower 2) module/1 (|> ($module.random random.nat) - (# ! each (with@ [module.#descriptor descriptor.#references] - (set.of_list text.hash (list name/0))))) + (# ! each (has [module.#descriptor descriptor.#references] + (set.of_list text.hash (list name/0))))) content/1 ($binary.random 2) - .let [id/0 (value@ module.#id module/0) - id/1 (value@ module.#id module/1) - input [////.#module (value@ descriptor.#name descriptor) - ////.#file (value@ descriptor.#file descriptor) - ////.#hash (value@ descriptor.#hash descriptor) + .let [id/0 (the module.#id module/0) + id/1 (the module.#id module/1) + input [////.#module (the descriptor.#name descriptor) + ////.#file (the descriptor.#file descriptor) + ////.#hash (the descriptor.#hash descriptor) ////.#code source_code] / "/" fs (file.mock /)] @@ -69,9 +69,9 @@ ($_ _.and (_.cover [/.valid?] (and (/.valid? descriptor input) - (not (/.valid? descriptor (with@ ////.#module source_code input))) - (not (/.valid? descriptor (with@ ////.#file source_code input))) - (not (/.valid? descriptor (revised@ ////.#hash ++ input))))) + (not (/.valid? descriptor (has ////.#module source_code input))) + (not (/.valid? descriptor (has ////.#file source_code input))) + (not (/.valid? descriptor (revised ////.#hash ++ input))))) )) (_.for [/.Purge] ($_ _.and diff --git a/stdlib/source/test/lux/tool/compiler/meta/cli.lux b/stdlib/source/test/lux/tool/compiler/meta/cli.lux index b90b8a0b3..48aa9c079 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cli.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cli.lux @@ -63,7 +63,7 @@ (<cli>.result /.service) (try#each (|>> (case> {/.#Compilation it} (|> it - (value@ <slot>) + (the <slot>) <?>) _ @@ -85,7 +85,7 @@ (<cli>.result /.service) (try#each (|>> (case> {/.#Interpretation it} (|> it - (value@ <slot>) + (the <slot>) <?>) _ diff --git a/stdlib/source/test/lux/tool/compiler/meta/context.lux b/stdlib/source/test/lux/tool/compiler/meta/context.lux index 1d9d5b67d..30e6aa280 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/context.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/context.lux @@ -43,7 +43,7 @@ maximum (list.size contexts)] (`` (and (~~ (template [<amount> <slot>] [(|> contexts - (list#each (value@ <slot>)) + (list#each (the <slot>)) (set.of_list text.hash) set.size (n.= <amount>))] diff --git a/stdlib/source/test/lux/type/abstract.lux b/stdlib/source/test/lux/type/abstract.lux index 85b2a89cd..770fc60a4 100644 --- a/stdlib/source/test/lux/type/abstract.lux +++ b/stdlib/source/test/lux/type/abstract.lux @@ -1,34 +1,34 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - ["[0]" meta] - [abstract - [monad {"+" do}]] - [control - ["[0]" try] - ["[0]" exception] - [parser - ["<[0]>" code]]] - [data - ["[0]" text ("[1]#[0]" equivalence)]] - ["[0]" macro - [syntax {"+" syntax:}] - ["[0]" code] - ["[0]" template]] - ["[0]" math - ["[0]" random] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + ["[0]" meta] + [abstract + [monad {"+" do}]] + [control + ["[0]" try] + ["[0]" exception] + [parser + ["<[0]>" code]]] + [data + ["[0]" text ("[1]#[0]" equivalence)]] + ["[0]" macro + [syntax {"+" syntax:}] + ["[0]" code] + ["[0]" template]] + ["[0]" math + ["[0]" random] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) (template.with_locals [g!Foo g!Bar] (as_is (template [<syntax> <meta>] [(syntax: (<syntax> []) (do meta.monad [frame <meta>] - (in (list (code.text (value@ /.#name frame))))))] + (in (list (code.text (the /.#name frame))))))] [current /.current] [specific (/.specific (template.text [g!Foo]))] diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux index 818441adf..a99a19f5d 100644 --- a/stdlib/source/test/lux/type/check.lux +++ b/stdlib/source/test/lux/type/check.lux @@ -1,33 +1,33 @@ (.using - [library - [lux {"-" type symbol} - ["_" test {"+" Test}] - ["[0]" type ("[1]#[0]" equivalence)] - [abstract - ["[0]" monad {"+" do}] - [\\specification - ["$[0]" functor {"+" Injection Comparison}] - ["$[0]" apply] - ["$[0]" monad]]] - [control - [pipe {"+" case>}] - ["[0]" function] - ["[0]" try] - ["[0]" exception {"+" exception:}]] - [data - ["[0]" bit ("[1]#[0]" equivalence)] - ["[0]" product] - ["[0]" text ("[1]#[0]" equivalence) - ["%" format {"+" format}]] - [collection - ["[0]" list ("[1]#[0]" functor monoid)] - ["[0]" set]]] - [math - ["[0]" random {"+" Random} ("[1]#[0]" monad)] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux {"-" type symbol} + ["_" test {"+" Test}] + ["[0]" type ("[1]#[0]" equivalence)] + [abstract + ["[0]" monad {"+" do}] + [\\specification + ["$[0]" functor {"+" Injection Comparison}] + ["$[0]" apply] + ["$[0]" monad]]] + [control + [pipe {"+" case>}] + ["[0]" function] + ["[0]" try] + ["[0]" exception {"+" exception:}]] + [data + ["[0]" bit ("[1]#[0]" equivalence)] + ["[0]" product] + ["[0]" text ("[1]#[0]" equivalence) + ["%" format {"+" format}]] + [collection + ["[0]" list ("[1]#[0]" functor monoid)] + ["[0]" set]]] + [math + ["[0]" random {"+" Random} ("[1]#[0]" monad)] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) ... TODO: Remove the following 3 definitions ASAP. //.type already exists... (def: short @@ -189,7 +189,7 @@ (scenario {.#Ex ex} left) ))) (_.cover [/.invalid_type_application] - (let [scenario (scenario (text.contains? (value@ exception.#label /.invalid_type_application)))] + (let [scenario (scenario (text.contains? (the exception.#label /.invalid_type_application)))] (scenario {.#Apply left right} left))))) ))) @@ -326,9 +326,9 @@ Test ($_ _.and (_.cover [/.fresh_context] - (and (n.= 0 (value@ .#var_counter /.fresh_context)) - (n.= 0 (value@ .#ex_counter /.fresh_context)) - (list.empty? (value@ .#var_bindings /.fresh_context)))) + (and (n.= 0 (the .#var_counter /.fresh_context)) + (n.= 0 (the .#ex_counter /.fresh_context)) + (list.empty? (the .#var_bindings /.fresh_context)))) (_.cover [/.context] (and (case (/.result /.fresh_context /.context) {try.#Success actual} @@ -341,9 +341,9 @@ [_ /.var] /.context)) {try.#Success actual} - (and (n.= 1 (value@ .#var_counter actual)) - (n.= 0 (value@ .#ex_counter actual)) - (n.= 1 (list.size (value@ .#var_bindings actual)))) + (and (n.= 1 (the .#var_counter actual)) + (n.= 0 (the .#ex_counter actual)) + (n.= 1 (list.size (the .#var_bindings actual)))) {try.#Failure error} false))) @@ -353,9 +353,9 @@ [_ /.existential] /.context)) {try.#Success actual} - (and (n.= 0 (value@ .#var_counter actual)) - (n.= 1 (value@ .#ex_counter actual)) - (n.= 0 (list.size (value@ .#var_bindings actual)))) + (and (n.= 0 (the .#var_counter actual)) + (n.= 1 (the .#ex_counter actual)) + (n.= 0 (list.size (the .#var_bindings actual)))) {try.#Failure error} false)) diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux index 4240376fe..d378cb0ee 100644 --- a/stdlib/source/test/lux/world/input/keyboard.lux +++ b/stdlib/source/test/lux/world/input/keyboard.lux @@ -1,24 +1,24 @@ (.using - [library - [lux "*" - ["_" test {"+" Test}] - [abstract - [monad {"+" do}]] - [control - ["[0]" maybe]] - [data - ["[0]" bit ("[1]#[0]" equivalence)] - [collection - ["[0]" list] - ["[0]" set {"+" Set}]]] - [macro - ["[0]" template]] - [math - ["[0]" random {"+" Random}] - [number - ["n" nat]]]]] - [\\library - ["[0]" /]]) + [library + [lux "*" + ["_" test {"+" Test}] + [abstract + [monad {"+" do}]] + [control + ["[0]" maybe]] + [data + ["[0]" bit ("[1]#[0]" equivalence)] + [collection + ["[0]" list] + ["[0]" set {"+" Set}]]] + [macro + ["[0]" template]] + [math + ["[0]" random {"+" Random}] + [number + ["n" nat]]]]] + [\\library + ["[0]" /]]) (with_expansions [<groups> (as_is [keys/commands [/.back_space @@ -160,8 +160,8 @@ [key ..random .let [sample (<function> key)]] (_.cover [<function>] - (and (bit#= <pressed?> (value@ /.#pressed? sample)) - (n.= key (value@ /.#input sample)))))] + (and (bit#= <pressed?> (the /.#pressed? sample)) + (n.= key (the /.#input sample)))))] [#0 /.release] [#1 /.press] diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux index fdc32834b..919f7249e 100644 --- a/stdlib/source/test/lux/world/net/http/client.lux +++ b/stdlib/source/test/lux/world/net/http/client.lux @@ -39,7 +39,7 @@ {try.#Success response} (|> response product.right - (value@ //.#body) + (the //.#body) (function.on {.#None}) (# ! each (|>> (do> try.monad [] |