diff options
522 files changed, 3776 insertions, 3769 deletions
diff --git a/licentia/source/program/licentia.lux b/licentia/source/program/licentia.lux index aaa392ec3..518922e7c 100644 --- a/licentia/source/program/licentia.lux +++ b/licentia/source/program/licentia.lux @@ -65,16 +65,16 @@ (do io.monad [?done (is (IO (Try Any)) (do (try.with io.monad) - [blob (# file.default read input) + [blob (at file.default read input) document (io#wrap (do [! try.monad] - [raw_json (# utf8.codec decoded blob) + [raw_json (at utf8.codec decoded blob) json (|> raw_json java/lang/String::trim - (# json.codec decoded))] + (at json.codec decoded))] (|> json (<json>.result /input.license) - (# ! each /output.license))))] - (# file.default write (# utf8.codec encoded document) output)))] + (at ! each /output.license))))] + (at file.default write (at utf8.codec encoded document) output)))] (wrap (debug.log! (case ?done {try.#Success _} (success_message output) diff --git a/licentia/source/test/licentia.lux b/licentia/source/test/licentia.lux index 0e40d75bb..a76149e42 100644 --- a/licentia/source/test/licentia.lux +++ b/licentia/source/test/licentia.lux @@ -50,9 +50,9 @@ [start (random.filter (|>> (n.= n#top) not) random.nat) #let [wiggle_room (n.- start n#top)] - end (# ! each - (|>> (n.% wiggle_room) (n.max 1)) - random.nat)] + end (at ! each + (|>> (n.% wiggle_room) (n.max 1)) + random.nat)] (wrap [time.#start start time.#end end]))) @@ -109,8 +109,8 @@ (def: (variable_list max_size gen_element) (All (_ a) (-> Nat (Random a) (Random (List a)))) (do [! random.monad] - [amount (# ! each (n.% (n.max 1 max_size)) - random.nat)] + [amount (at ! each (n.% (n.max 1 max_size)) + random.nat)] (random.list amount gen_element))) (def: black_list diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux index 83d5af3d9..2d56463d8 100644 --- a/lux-cl/source/program.lux +++ b/lux-cl/source/program.lux @@ -328,7 +328,7 @@ (wrap [global value definition])))) (def: (ingest context content) - (|> content (# encoding.utf8 decoded) try.trusted (as (_.Expression Any)))) + (|> content (at encoding.utf8 decoded) try.trusted (as (_.Expression Any)))) (def: (re_learn context content) (run! content)) @@ -347,7 +347,7 @@ platform.#host host platform.#phase common_lisp.generate platform.#runtime runtime.generate - platform.#write (|>> _.code (# encoding.utf8 encoded))]))) + platform.#write (|>> _.code (at encoding.utf8 encoded))]))) (def: get_ecl_cli_inputs (let [@idx (_.var "i")] @@ -396,7 +396,7 @@ (def: (declare_success! _) (-> Any (Promise Any)) - (promise.future (# world/program.default exit +0))) + (promise.future (at world/program.default exit +0))) (def: (then pre post) (-> (_.Expression Any) (_.Expression Any) (_.Expression Any)) @@ -435,7 +435,7 @@ ..then ..scope) (format (/cli.target service) - (# file.default separator) + (at file.default separator) "program" extension)])] (..declare_success! [])) diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux index c0c3cf99e..c3f7cd311 100644 --- a/lux-js/source/program.lux +++ b/lux-js/source/program.lux @@ -541,7 +541,7 @@ (def: (define context custom [_ input]) (..define! interpreter context custom input)) (def: (ingest context content) - (|> content (# utf8.codec decoded) try.trusted (as _.Statement))) + (|> content (at utf8.codec decoded) try.trusted (as _.Statement))) (def: (re_learn context custom content) (..execute! interpreter content)) @@ -600,7 +600,7 @@ (def: (define context custom [_ input]) (..define! context custom input)) (def: (ingest context content) - (|> content (# utf8.codec decoded) try.trusted (as _.Statement))) + (|> content (at utf8.codec decoded) try.trusted (as _.Statement))) (def: (re_learn context custom content) (..execute! content)) @@ -640,7 +640,7 @@ platform.#phase js.generate platform.#runtime runtime.generate platform.#phase_wrapper ..phase_wrapper - platform.#write (|>> _.code (# utf8.codec encoded))]))) + platform.#write (|>> _.code (at utf8.codec encoded))]))) (def: (program context program) (Program _.Expression _.Statement) @@ -696,7 +696,7 @@ (def: (declare_success! _) (-> Any (Async Any)) - (async.future (# world/program.default exit +0))) + (async.future (at world/program.default exit +0))) (def: (scope body) (-> _.Statement _.Statement) @@ -725,7 +725,7 @@ service [(packager.package _.use_strict _.code _.then ..scope) (format (cli.target service) - (# (the platform.#file_system platform) separator) + (at (the platform.#file_system platform) separator) "program" (the context.#artifact_extension context))])] (..declare_success! [])) diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux index adcbbfb86..46ee6efda 100644 --- a/lux-jvm/source/program.lux +++ b/lux-jvm/source/program.lux @@ -108,7 +108,7 @@ (def: (phase_wrapper archive) (-> Archive (Operation Anchor (Bytecode Any) Definition phase.Wrapper)) - (# phase.monad in (|>>))) + (at phase.monad in (|>>))) (def: .public platform (IO [java/lang/ClassLoader @@ -158,7 +158,7 @@ (def: (declare_success! _) (-> Any (Async Any)) - (async.future (# world/program.default exit +0))) + (async.future (at world/program.default exit +0))) (def: (lux_compiler it) (-> Any platform.Custom) @@ -181,6 +181,6 @@ ..extender service [(packager.package context) - (format (cli.target service) (# file.default separator) "program.jar")])] + (format (cli.target service) (at file.default separator) "program.jar")])] (..declare_success! [])) (io.io [])))) diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index 23fac65c1..a37606d7c 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -730,7 +730,7 @@ (def: (ingest context content) (|> content - (# utf8.codec decoded) + (at utf8.codec decoded) try.trusted (as _.Statement))) @@ -772,7 +772,7 @@ (in [global value definition])))) (def: (ingest context content) - (|> content (# utf8.codec decoded) try.trusted (as _.Statement))) + (|> content (at utf8.codec decoded) try.trusted (as _.Statement))) (def: (re_learn context custom content) (run! content)) @@ -854,7 +854,7 @@ platform.#phase lua.generate platform.#runtime runtime.generate platform.#phase_wrapper ..phase_wrapper - platform.#write (|>> _.code (# utf8.codec encoded))]])))] + platform.#write (|>> _.code (at utf8.codec encoded))]])))] (for @.old <jvm> @.jvm <jvm> @.lua (def: platform @@ -866,7 +866,7 @@ platform.#phase lua.generate platform.#runtime runtime.generate platform.#phase_wrapper ..phase_wrapper - platform.#write (|>> _.code (# utf8.codec encoded))]))))) + platform.#write (|>> _.code (at utf8.codec encoded))]))))) (def: (program context program) (Program _.Expression _.Statement) @@ -877,7 +877,7 @@ (def: (declare_success! _) (-> Any (Async Any)) - (async.future (# world/program.default exit +0))) + (async.future (at world/program.default exit +0))) (def: (lux_compiler it) (-> Any platform.Custom) @@ -913,7 +913,7 @@ _.then (|>>)) (format (cli.target service) - (# file.default separator) + (at file.default separator) "program" (the context.#artifact_extension context))])] (..declare_success! [])) diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el index 10d4a89d2..b50d4ac55 100644 --- a/lux-mode/lux-mode.el +++ b/lux-mode/lux-mode.el @@ -381,8 +381,8 @@ Called by `imenu--generic-function'." (type//capability (altRE "capability:")) ;; Data (data//record (altRE "the" "has" "revised")) - (data//interface (altRE "open:" "implementation" "#")) - (data//implicit (altRE "implicit:" "##")) + (data//interface (altRE "open:" "implementation" "at")) + (data//implicit (altRE "implicit:" "a/an" "a" "an")) (data//collection (altRE "list" "partial_list" "sequence" "tree")) ;; Code (code//quotation (altRE "`" "`'" "'" "~" "~\\+" "~!" "~'")) diff --git a/lux-php/source/program.lux b/lux-php/source/program.lux index d3316e1c4..2c004bc29 100644 --- a/lux-php/source/program.lux +++ b/lux-php/source/program.lux @@ -492,7 +492,7 @@ (wrap [global value definition])))) (def: (ingest context content) - (|> content (# utf8.codec decoded) try.trusted (as _.Statement))) + (|> content (at utf8.codec decoded) try.trusted (as _.Statement))) (def: (re_learn context content) (run! content)) @@ -510,7 +510,7 @@ platform.#host host platform.#phase php.generate platform.#runtime runtime.generate - platform.#write (|>> _.code (# utf8.codec encoded))]))) + platform.#write (|>> _.code (at utf8.codec encoded))]))) (def: (program context program) (Program _.Expression _.Statement) @@ -556,7 +556,7 @@ (def: (declare_success! _) (-> Any (Promise Any)) - (promise.future (# world/program.default exit +0))) + (promise.future (at world/program.default exit +0))) (`` (program: [service /cli.service] (let [extension ".php"] @@ -581,7 +581,7 @@ _.then (|>>)) (format (/cli.target service) - (# file.default separator) + (at file.default separator) "program" extension)])] (..declare_success! [])) diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux index 9669f3fc9..b8cd43d0b 100644 --- a/lux-python/source/program.lux +++ b/lux-python/source/program.lux @@ -433,7 +433,7 @@ (def: (ingest context content) (|> content - (# utf8.codec decoded) + (at utf8.codec decoded) try.trusted (as (_.Statement Any)))) @@ -476,7 +476,7 @@ (def: define! define!) (def: (ingest context content) - (|> content (# utf8.codec decoded) try.trusted (as (_.Statement Any)))) + (|> content (at utf8.codec decoded) try.trusted (as (_.Statement Any)))) (def: (re_learn context content) (execute! content)) @@ -533,7 +533,7 @@ platform.#phase python.generate platform.#runtime runtime.generate platform.#phase_wrapper ..phase_wrapper - platform.#write (|>> _.code (# utf8.codec encoded))]))) + platform.#write (|>> _.code (at utf8.codec encoded))]))) (def: (program context program) (Program (_.Expression Any) (_.Statement Any)) @@ -550,7 +550,7 @@ (def: (declare_success! _) (-> Any (Async Any)) - (async.future (# world/program.default exit +0))) + (async.future (at world/program.default exit +0))) (def: (scope body) (-> (_.Statement Any) (_.Statement Any)) @@ -595,7 +595,7 @@ _.then ..scope) (format (cli.target service) - (# file.default separator) + (at file.default separator) "program" extension)])] (..declare_success! [])) diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux index 71d8a6677..c9cd4e17f 100644 --- a/lux-r/source/program.lux +++ b/lux-r/source/program.lux @@ -533,7 +533,7 @@ (wrap [global value definition])))) (def: (ingest context content) - (|> content (# utf8.codec decoded) try.trusted (as _.Expression))) + (|> content (at utf8.codec decoded) try.trusted (as _.Expression))) (def: (re_learn context content) (run! content)) @@ -554,7 +554,7 @@ platform.#host host platform.#phase r.generate platform.#runtime runtime.generate - platform.#write (|>> _.code (# utf8.codec encoded))]]))) + platform.#write (|>> _.code (at utf8.codec encoded))]]))) (def: (program context program) (Program _.Expression _.Expression) @@ -586,7 +586,7 @@ (def: (declare_success! _) (-> Any (Promise Any)) - (promise.future (# world/program.default exit +0))) + (promise.future (at world/program.default exit +0))) (def: (scope body) (-> _.Expression _.Expression) @@ -619,7 +619,7 @@ _.then ..scope) (format (/cli.target service) - (# file.default separator) + (at file.default separator) "program" extension)])] (..declare_success! [])) diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux index 69109108b..50934cf91 100644 --- a/lux-ruby/source/program.lux +++ b/lux-ruby/source/program.lux @@ -761,7 +761,7 @@ (def: (ingest context content) (|> content - (# utf8.codec decoded) + (at utf8.codec decoded) try.trusted (as _.Statement))) @@ -966,7 +966,7 @@ platform.#phase ruby.generate platform.#runtime runtime.generate platform.#phase_wrapper ..phase_wrapper - platform.#write (|>> _.code (# utf8.codec encoded))]))) + platform.#write (|>> _.code (at utf8.codec encoded))]))) (def: (program context program) (Program _.Expression _.Statement) @@ -983,7 +983,7 @@ (def: (declare_success! _) (-> Any (Async Any)) - (async.future (# world/program.default exit +0))) + (async.future (at world/program.default exit +0))) (def: (lux_compiler it) (-> Any platform.Custom) @@ -1005,7 +1005,7 @@ service [packager.package (format (cli.target service) - (# file.default separator) + (at file.default separator) "program")])] (..declare_success! [])) (io.io []))) diff --git a/lux-scheme/source/program.lux b/lux-scheme/source/program.lux index b35fd049f..b91b74727 100644 --- a/lux-scheme/source/program.lux +++ b/lux-scheme/source/program.lux @@ -390,7 +390,7 @@ (wrap [global value definition])))) (def: (ingest context content) - (|> content (# encoding.utf8 decoded) try.trusted (as _.Expression))) + (|> content (at encoding.utf8 decoded) try.trusted (as _.Expression))) (def: (re_learn context content) (run! content)) @@ -409,7 +409,7 @@ platform.#host host platform.#phase scheme.generate platform.#runtime runtime.generate - platform.#write (|>> _.code (# encoding.utf8 encoded))]))) + platform.#write (|>> _.code (at encoding.utf8 encoded))]))) (def: (program context program) (Program _.Expression _.Expression) @@ -452,7 +452,7 @@ (def: (declare_success! _) (-> Any (Promise Any)) - (promise.future (# world/program.default exit +0))) + (promise.future (at world/program.default exit +0))) (`` (program: [service /cli.service] (let [extension ".scm"] @@ -475,7 +475,7 @@ service [(packager.package now) (format (/cli.target service) - (# file.default separator) + (at file.default separator) "program.tar")])] (..declare_success! [])) (io.io [])))))) diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux index 8969f1dcd..2f5090611 100644 --- a/stdlib/source/documentation/lux.lux +++ b/stdlib/source/documentation/lux.lux @@ -565,8 +565,8 @@ "Opens a implementation and generates a definition for each of its members (including nested members)." [(open: "i:[0]" order) "=>" - (def: i:= (# order =)) - (def: i:< (# order <))]) + (def: i:= (at order =)) + (def: i:< (at order <))]) (documentation: /.|>> "Similar to the piping macro, but rather than taking an initial object to work on, creates a function for taking it." @@ -607,9 +607,9 @@ (documentation: /.# "Allows accessing the value of a implementation's member." - [(# codec encoded)] + [(at codec encoded)] ["Also allows using that value as a function." - (# codec encoded +123)]) + (at codec encoded +123)]) (documentation: /.has "Sets the value of a record at a given tag." @@ -701,7 +701,7 @@ [<tests> (template [<function> <parameter> <expected>] [(cover [<function>] (compare <text> - (# codec encoded <function> <parameter>)))] + (at codec encoded <function> <parameter>)))] [bit #1 "#1"] [int +123 "+123"] @@ -790,7 +790,7 @@ ... [(def: (hash (^let set [member_hash _])) ... (list#mix (function (_ elem acc) ... (+ acc -... (# member_hash hash elem))) +... (at member_hash hash elem))) ... 0 ... (set.list set)))]) diff --git a/stdlib/source/documentation/lux/extension.lux b/stdlib/source/documentation/lux/extension.lux index 06fa4e43a..d76d278d5 100644 --- a/stdlib/source/documentation/lux/extension.lux +++ b/stdlib/source/documentation/lux/extension.lux @@ -39,9 +39,9 @@ "" [(generation: ("my generation" self phase archive [pass_through <synthesis>.any]) (for @.jvm - (# phase.monad each (|>> {jvm.#Embedded} - sequence.sequence) - (phase archive pass_through)) + (at phase.monad each (|>> {jvm.#Embedded} + sequence.sequence) + (phase archive pass_through)) (phase archive pass_through)))]) (documentation: /.directive: diff --git a/stdlib/source/documentation/lux/type/implicit.lux b/stdlib/source/documentation/lux/type/implicit.lux index 8035de629..be1b19999 100644 --- a/stdlib/source/documentation/lux/type/implicit.lux +++ b/stdlib/source/documentation/lux/type/implicit.lux @@ -13,7 +13,7 @@ [\\library ["[0]" /]]) -(documentation: /.## +(documentation: /.a/an (format "Automatic implementation selection (for type-class style polymorphism)." \n "This feature layers type-class style polymorphism on top of Lux's signatures and implementations." \n "When calling a polymorphic function, or using a polymorphic constant," @@ -26,35 +26,35 @@ \n \n "Caveat emptor: You need to make sure to import the module of any implementation you want to use." \n "Otherwise, this macro will not find it.") ["Nat equivalence" - (# number.equivalence = x y) - (## = x y)] + (at number.equivalence = x y) + (a/an = x y)] ["Can optionally add the prefix of the module where the signature was defined." - (## equivalence.= x y)] + (a/an equivalence.= x y)] ["(List Nat) equivalence" - (## = - (list.indices 10) - (list.indices 10))] + (a/an = + (list.indices 10) + (list.indices 10))] ["(Functor List) each" - (## each ++ (list.indices 10))]) + (a/an each ++ (list.indices 10))]) (documentation: /.with "Establish lexical bindings for implementations that will be prioritized over non-lexically-bound implementations." [(with [n.addition] - (n.= (# n.addition composite left right) - (## composite left right)))]) + (n.= (at n.addition composite left right) + (a/an composite left right)))]) (documentation: /.implicit: "Establish local definitions for implementations that will be prioritized over foreign definitions." [(implicit: [n.multiplication]) - (n.= (# n.multiplication composite left right) - (## composite left right))]) + (n.= (at n.multiplication composite left right) + (a/an composite left right))]) (.def: .public documentation (.List $.Module) ($.module /._ "" - [..## + [..a/an ..with ..implicit:] [])) diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux index 13ff44b45..cdcb304a0 100644 --- a/stdlib/source/library/lux.lux +++ b/stdlib/source/library/lux.lux @@ -2711,7 +2711,7 @@ _ {#None})) -(def:' .private (globalP tokens) +(def:' .private (symbolP tokens) (-> (List Code) (Maybe [(List Code) Symbol])) (case tokens (pattern (partial_list [_ {#Symbol it}] tokens')) @@ -3479,7 +3479,7 @@ (def: referral_parser (Parser Referral) - (formP (andP globalP (someP anyP)))) + (formP (andP symbolP (someP anyP)))) (def: (referrals_parser aliased?) (-> Bit (Parser (List Referral))) @@ -4168,7 +4168,7 @@ ..textP ..textP)) ..textP - (..orP (..manyP ..globalP) + (..orP (..manyP ..symbolP) (..manyP ..anyP))) tokens) {.#Some [current_module,imported_module,import_alias alias implementations]} @@ -4262,19 +4262,19 @@ referrals))) _ - (failure "Wrong syntax for refer"))) + (failure (..wrong_syntax_error (symbol ..refer))))) -(macro: .public (# tokens) +(macro: .public (at tokens) (case tokens (pattern (list struct [_ {#Symbol member}])) (meta#in (list (` (..let [(..open (~ (text$ (alias_stand_in 0)))) (~ struct)] (~ (symbol$ member)))))) (pattern (partial_list struct member args)) - (meta#in (list (` ((..# (~ struct) (~ member)) (~+ args))))) + (meta#in (list (` ((..at (~ struct) (~ member)) (~+ args))))) _ - (failure "Wrong syntax for #"))) + (failure (..wrong_syntax_error (symbol ..at))))) (macro: .public (has tokens) (case tokens @@ -4601,7 +4601,7 @@ (again &rest (plist#with var_name expansion map))) {#End} - (# meta_monad #in (list#conjoint (list#each normal bodies)))))) + (at meta_monad #in (list#conjoint (list#each normal bodies)))))) {#None} (failure "Wrong syntax for with_expansions"))) @@ -4666,7 +4666,7 @@ _ (meta#in token) ... TODO: Figure out why this doesn't work: - ... (# meta_monad in token) + ... (at meta_monad in token) )) (macro: .public (static tokens) diff --git a/stdlib/source/library/lux/abstract/apply.lux b/stdlib/source/library/lux/abstract/apply.lux index 7e531efe4..1bf1c84ce 100644 --- a/stdlib/source/library/lux/abstract/apply.lux +++ b/stdlib/source/library/lux/abstract/apply.lux @@ -26,18 +26,18 @@ (def: (on fgx fgf) ... TODO: Switch from this version to the one below (in comments) ASAP. - (for @.old (let [fgf' (# f_apply on - fgf - (# f_monad in (function (_ gf gx) (# g_apply on gx gf))))] - (as_expected (# f_apply on (as_expected fgx) (as_expected fgf')))) - (let [fgf' (# f_apply on - fgf - (# f_monad in (function (_ gf gx) (# g_apply on gx gf))))] - (# f_apply on fgx fgf'))) - ... (let [applyF (# f_apply on) - ... applyG (# g_apply on)] + (for @.old (let [fgf' (at f_apply on + fgf + (at f_monad in (function (_ gf gx) (at g_apply on gx gf))))] + (as_expected (at f_apply on (as_expected fgx) (as_expected fgf')))) + (let [fgf' (at f_apply on + fgf + (at f_monad in (function (_ gf gx) (at g_apply on gx gf))))] + (at f_apply on fgx fgf'))) + ... (let [applyF (at f_apply on) + ... applyG (at g_apply on)] ... (all applyF ... fgf - ... (# f_monad in applyG) + ... (at f_monad in applyG) ... fgx)) )) diff --git a/stdlib/source/library/lux/abstract/codec.lux b/stdlib/source/library/lux/abstract/codec.lux index 6c0cc0a12..d24ac4c93 100644 --- a/stdlib/source/library/lux/abstract/codec.lux +++ b/stdlib/source/library/lux/abstract/codec.lux @@ -19,10 +19,10 @@ (-> (Codec c b) (Codec b a) (Codec c a))) (def: encoded - (|>> (# ba_codec encoded) - (# cb_codec encoded))) + (|>> (at ba_codec encoded) + (at cb_codec encoded))) (def: (decoded cy) (do try.monad - [by (# cb_codec decoded cy)] - (# ba_codec decoded by)))) + [by (at cb_codec decoded cy)] + (at ba_codec decoded by)))) diff --git a/stdlib/source/library/lux/abstract/comonad/cofree.lux b/stdlib/source/library/lux/abstract/comonad/cofree.lux index d07b3e67c..2b4ec2b4e 100644 --- a/stdlib/source/library/lux/abstract/comonad/cofree.lux +++ b/stdlib/source/library/lux/abstract/comonad/cofree.lux @@ -12,7 +12,7 @@ (All (_ F) (-> (Functor F) (Functor (CoFree F)))) (def: (each f [head tail]) - [(f head) (# dsl each (each f) tail)])) + [(f head) (at dsl each (each f) tail)])) (implementation: .public (comonad dsl) (All (_ F) (-> (Functor F) (CoMonad (CoFree F)))) @@ -24,4 +24,4 @@ (def: (disjoint [head tail]) [[head tail] - (# dsl each disjoint tail)])) + (at dsl each disjoint tail)])) diff --git a/stdlib/source/library/lux/abstract/equivalence.lux b/stdlib/source/library/lux/abstract/equivalence.lux index 5c613a725..ca5b8cc96 100644 --- a/stdlib/source/library/lux/abstract/equivalence.lux +++ b/stdlib/source/library/lux/abstract/equivalence.lux @@ -23,4 +23,4 @@ (def: (each f equivalence) (implementation (def: (= reference sample) - (# equivalence = (f reference) (f sample)))))) + (at equivalence = (f reference) (f sample)))))) diff --git a/stdlib/source/library/lux/abstract/hash.lux b/stdlib/source/library/lux/abstract/hash.lux index 18806daea..8a47a8b59 100644 --- a/stdlib/source/library/lux/abstract/hash.lux +++ b/stdlib/source/library/lux/abstract/hash.lux @@ -19,8 +19,8 @@ (def: (each f super) (implementation (def: equivalence - (# equivalence.functor each f - (# super equivalence))) + (at equivalence.functor each f + (at super equivalence))) (def: hash - (|>> f (# super hash)))))) + (|>> f (at super hash)))))) diff --git a/stdlib/source/library/lux/abstract/interval.lux b/stdlib/source/library/lux/abstract/interval.lux index 452121f5e..c38e3a75b 100644 --- a/stdlib/source/library/lux/abstract/interval.lux +++ b/stdlib/source/library/lux/abstract/interval.lux @@ -77,29 +77,29 @@ (All (_ a) (-> (Interval a) (Interval a) (Interval a))) (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)))) + (def: bottom (order.min (at right order) (at left bottom) (at right bottom))) + (def: top (order.max (at right order) (at left top) (at right top)))) (implementation: .public (intersection left right) (All (_ a) (-> (Interval a) (Interval a) (Interval a))) (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)))) + (def: bottom (order.max (at right order) (at left bottom) (at right bottom))) + (def: top (order.min (at right order) (at left top) (at right top)))) (implementation: .public (complement interval) (All (_ a) (-> (Interval a) (Interval a))) (def: enum (the enum interval)) - (def: bottom (# interval succ (# interval top))) - (def: top (# interval pred (# interval bottom)))) + (def: bottom (at interval succ (at interval top))) + (def: top (at interval pred (at interval bottom)))) (def: .public (precedes? reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) (let [(open "[0]") reference - limit (# reference bottom)] - (and (< limit (# sample bottom)) - (< limit (# sample top))))) + limit (at reference bottom)] + (and (< limit (at sample bottom)) + (< limit (at sample top))))) (def: .public (succeeds? reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) @@ -119,9 +119,9 @@ (def: .public (meets? reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) (let [(open ",#[0]") reference - limit (# reference bottom)] - (and (,#= limit (# sample top)) - (order.<= ,#order limit (# sample bottom))))) + limit (at reference bottom)] + (and (,#= limit (at sample top)) + (order.<= ,#order limit (at sample bottom))))) (def: .public (touches? reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) @@ -132,11 +132,11 @@ [(def: .public (<name> reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) (let [(open ",#[0]") reference] - (and (,#= (# reference <eq_side>) - (# sample <eq_side>)) + (and (,#= (at reference <eq_side>) + (at sample <eq_side>)) (<ineq> ,#order - (# reference <ineq_side>) - (# sample <ineq_side>)))))] + (at reference <ineq_side>) + (at sample <ineq_side>)))))] [starts? ,#bottom order.<= ,#top] [finishes? ,#top order.>= ,#bottom] @@ -147,8 +147,8 @@ (def: (= reference sample) (let [(open ",#[0]") reference] - (and (,#= ,#bottom (# sample bottom)) - (,#= ,#top (# sample top)))))) + (and (,#= ,#bottom (at sample bottom)) + (,#= ,#top (at sample top)))))) (def: .public (nested? reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) @@ -156,8 +156,8 @@ (and (inner? reference) (inner? sample)) (and (outer? reference) (outer? sample))) (let [(open ",#[0]") reference] - (and (order.>= ,#order (# reference bottom) (# sample bottom)) - (order.<= ,#order (# reference top) (# sample top)))) + (and (order.>= ,#order (at reference bottom) (at sample bottom)) + (order.<= ,#order (at reference top) (at sample top)))) (or (singleton? reference) (and (inner? reference) (outer? sample))) @@ -165,16 +165,16 @@ ... (and (outer? reference) (inner? sample)) (let [(open ",#[0]") reference] - (or (and (order.>= ,#order (# reference bottom) (# sample bottom)) - (order.> ,#order (# reference bottom) (# sample top))) - (and (,#< (# reference top) (# sample bottom)) - (order.<= ,#order (# reference top) (# sample top))))) + (or (and (order.>= ,#order (at reference bottom) (at sample bottom)) + (order.> ,#order (at reference bottom) (at sample top))) + (and (,#< (at reference top) (at sample bottom)) + (order.<= ,#order (at reference top) (at sample top))))) )) (def: .public (overlaps? reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) (let [(open ",#[0]") reference] - (and (not (# ..equivalence = reference sample)) + (and (not (at ..equivalence = reference sample)) (cond (singleton? sample) #0 @@ -183,8 +183,8 @@ (or (and (inner? sample) (outer? reference)) (and (outer? sample) (inner? reference))) - (or (order.>= ,#order (# reference bottom) (# sample top)) - (order.<= ,#order (# reference top) (# sample bottom))) + (or (order.>= ,#order (at reference bottom) (at sample top)) + (order.<= ,#order (at reference top) (at sample bottom))) ... both inner (inner? sample) diff --git a/stdlib/source/library/lux/abstract/monad.lux b/stdlib/source/library/lux/abstract/monad.lux index 3f32a24f7..c4de9243c 100644 --- a/stdlib/source/library/lux/abstract/monad.lux +++ b/stdlib/source/library/lux/abstract/monad.lux @@ -110,8 +110,8 @@ (All (_ ! a b) (-> (Monad !) (-> a (! b)) (-> (! a) (! b)))) - (|>> (# monad each f) - (# monad conjoint))) + (|>> (at monad each f) + (at monad conjoint))) (def: .public (all monad) (All (_ ! a) @@ -171,7 +171,7 @@ (M a))) (case xs {.#End} - (# monad in init) + (at monad in init) {.#Item x xs'} (do monad diff --git a/stdlib/source/library/lux/abstract/monad/free.lux b/stdlib/source/library/lux/abstract/monad/free.lux index 70cbeb72d..f7ca07159 100644 --- a/stdlib/source/library/lux/abstract/monad/free.lux +++ b/stdlib/source/library/lux/abstract/monad/free.lux @@ -20,7 +20,7 @@ {#Pure (f a)} {#Effect value} - {#Effect (# dsl each (each f) value)}))) + {#Effect (at dsl each (each f) value)}))) (implementation: .public (apply dsl) (All (_ F) (-> (Functor F) (Apply (Free F)))) @@ -34,12 +34,12 @@ {#Pure (f a)} [{#Pure f} {#Effect fa}] - {#Effect (# dsl each - (# (..functor dsl) each f) - fa)} + {#Effect (at dsl each + (at (..functor dsl) each f) + fa)} [{#Effect ff} _] - {#Effect (# dsl each (on ea) ff)} + {#Effect (at dsl each (on ea) ff)} ))) (implementation: .public (monad dsl) @@ -61,7 +61,7 @@ {#Effect fa}) {#Effect fefa} - {#Effect (# dsl each - (# (monad dsl) conjoint) - fefa)} + {#Effect (at dsl each + (at (monad dsl) conjoint) + fefa)} ))) diff --git a/stdlib/source/library/lux/abstract/monad/indexed.lux b/stdlib/source/library/lux/abstract/monad/indexed.lux index 0894b4021..212b190f4 100644 --- a/stdlib/source/library/lux/abstract/monad/indexed.lux +++ b/stdlib/source/library/lux/abstract/monad/indexed.lux @@ -55,11 +55,11 @@ (def: named_monad (Parser [(Maybe Text) Code]) - (<>.either (<code>.tuple (<>.and (# <>.monad each (|>> {.#Some}) - <code>.local) + (<>.either (<code>.tuple (<>.and (at <>.monad each (|>> {.#Some}) + <code>.local) <code>.any)) - (# <>.monad each (|>> [{.#None}]) - <code>.any))) + (at <>.monad each (|>> [{.#None}]) + <code>.any))) (syntax: .public (do [[?name monad] ..named_monad context (<code>.tuple (<>.some context)) diff --git a/stdlib/source/library/lux/abstract/monoid.lux b/stdlib/source/library/lux/abstract/monoid.lux index b64a1254b..a93d844a8 100644 --- a/stdlib/source/library/lux/abstract/monoid.lux +++ b/stdlib/source/library/lux/abstract/monoid.lux @@ -13,9 +13,9 @@ (All (_ l r) (-> (Monoid l) (Monoid r) (Monoid [l r]))) (implementation (def: identity - [(# left identity) - (# right identity)]) + [(at left identity) + (at right identity)]) (def: (composite [lL rL] [lR rR]) - [(# left composite lL lR) - (# right composite rL rR)]))) + [(at left composite lL lR) + (at right composite rL rR)]))) diff --git a/stdlib/source/library/lux/abstract/order.lux b/stdlib/source/library/lux/abstract/order.lux index 31770b95b..e5931d694 100644 --- a/stdlib/source/library/lux/abstract/order.lux +++ b/stdlib/source/library/lux/abstract/order.lux @@ -21,28 +21,28 @@ (def: .public (<= order parameter subject) Comparison - (or (# order < parameter subject) - (# order = parameter subject))) + (or (at order < parameter subject) + (at order = parameter subject))) (def: .public (> order parameter subject) Comparison - (# order < subject parameter)) + (at order < subject parameter)) (def: .public (>= order parameter subject) Comparison - (or (# order < subject parameter) - (# order = subject parameter))) + (or (at order < subject parameter) + (at order = subject parameter))) (type: .public (Choice a) (-> (Order a) a a a)) (def: .public (min order x y) Choice - (if (# order < y x) x y)) + (if (at order < y x) x y)) (def: .public (max order x y) Choice - (if (# order < y x) y x)) + (if (at order < y x) y x)) (implementation: .public functor (contravariant.Functor Order) @@ -50,7 +50,7 @@ (def: (each f order) (implementation (def: equivalence - (# equivalence.functor each f (# order equivalence))) + (at equivalence.functor each f (at order equivalence))) (def: (< reference sample) - (# order < (f reference) (f sample)))))) + (at order < (f reference) (f sample)))))) diff --git a/stdlib/source/library/lux/control/concurrency/actor.lux b/stdlib/source/library/lux/control/concurrency/actor.lux index b1d80473c..c4dd58b5e 100644 --- a/stdlib/source/library/lux/control/concurrency/actor.lux +++ b/stdlib/source/library/lux/control/concurrency/actor.lux @@ -55,8 +55,8 @@ [current (async.value read)] (case current {.#Some [head tail]} - (# ! each (|>> {.#Item head}) - (pending tail)) + (at ! each (|>> {.#Item head}) + (pending tail)) {.#None} (in {.#End})))) @@ -111,13 +111,13 @@ (let [[obituary _] (the #obituary (representation actor))] (|> obituary async.value - (# io.functor each - (|>> (pipe.case - {.#None} - bit.yes + (at io.functor each + (|>> (pipe.case + {.#None} + bit.yes - _ - bit.no)))))) + _ + bit.no)))))) (def: .public (obituary' actor) (All (_ s) (-> (Actor s) (IO (Maybe (Obituary s))))) @@ -214,7 +214,7 @@ (def: actor_decl^ (Parser [Text (List Text)]) (<>.either (<code>.form (<>.and <code>.local (<>.some <code>.local))) - (<>.and <code>.local (# <>.monad in (list))))) + (<>.and <code>.local (at <>.monad in (list))))) (type: On_MailC [[Text Text Text] Code]) @@ -306,7 +306,7 @@ (def: reference^ (Parser [Symbol (List Text)]) (<>.either (<code>.form (<>.and <code>.symbol (<>.some <code>.local))) - (<>.and <code>.symbol (# <>.monad in (list))))) + (<>.and <code>.symbol (at <>.monad in (list))))) (def: messageP (Parser [Code Signature Code Code]) @@ -361,6 +361,6 @@ (if continue? (|> actor (..mail! (action event stop)) - (# ! each try.maybe)) + (at ! each try.maybe)) (in {.#None})))) channel))) diff --git a/stdlib/source/library/lux/control/concurrency/async.lux b/stdlib/source/library/lux/control/concurrency/async.lux index 6fff72d48..b933ea350 100644 --- a/stdlib/source/library/lux/control/concurrency/async.lux +++ b/stdlib/source/library/lux/control/concurrency/async.lux @@ -67,8 +67,8 @@ (All (_ r w) (-> (Async' r w) (IO (Maybe r)))) (|>> representation atom.read! - (# io.functor each (|>> product.left - (maybe#each (|>> variance.read)))))) + (at io.functor each (|>> product.left + (maybe#each (|>> variance.read)))))) (def: .public (upon! f async) (All (_ r w) (-> (-> r (IO Any)) (Async' r w) (IO Any))) @@ -90,13 +90,13 @@ (def: .public resolved? (All (_ r w) (-> (Async' r w) (IO Bit))) (|>> ..value - (# io.functor each - (|>> (pipe.case - {.#None} - #0 + (at io.functor each + (|>> (pipe.case + {.#None} + #0 - {.#Some _} - #1))))) + {.#Some _} + #1))))) (implementation: .public functor (Functor Async) diff --git a/stdlib/source/library/lux/control/concurrency/frp.lux b/stdlib/source/library/lux/control/concurrency/frp.lux index 252b8f0ce..15f599f8f 100644 --- a/stdlib/source/library/lux/control/concurrency/frp.lux +++ b/stdlib/source/library/lux/control/concurrency/frp.lux @@ -149,7 +149,7 @@ (case ?ma {.#Some [a ma']} (exec - (io.run! (# sink feed (variance.read a))) + (io.run! (at sink feed (variance.read a))) (again (variance.write ma'))) {.#None} @@ -157,7 +157,7 @@ (again mma')) {.#None} - (in (is Any (io.run! (# sink close)))))))) + (in (is Any (io.run! (at sink close)))))))) output)))) (type: .public (Subscriber a) @@ -244,7 +244,7 @@ (io.run! (loop (again [_ []]) (do io.monad [value action - _ (# sink feed value)] + _ (at sink feed value)] (async.upon! again (async.delay milli_seconds))))) [output sink]))) @@ -269,7 +269,7 @@ [item channel] (case item {.#Some [head tail]} - (if (# equivalence = previous (variance.read head)) + (if (at equivalence = previous (variance.read head)) (distinct' equivalence previous tail) (in {.#Some [head (distinct' equivalence (variance.read head) tail)]})) @@ -293,8 +293,8 @@ [item channel] (case item {.#Some [head tail]} - (# ! each (|>> {.#Item (variance.read head)}) - (list tail)) + (at ! each (|>> {.#Item (variance.read head)}) + (list tail)) {.#None} (in {.#End})))) diff --git a/stdlib/source/library/lux/control/concurrency/semaphore.lux b/stdlib/source/library/lux/control/concurrency/semaphore.lux index d200c9d52..a9c93433a 100644 --- a/stdlib/source/library/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/library/lux/control/concurrency/semaphore.lux @@ -34,7 +34,7 @@ (Atom State) (def: most_positions_possible - (.nat (# i.interval top))) + (.nat (at i.interval top))) (def: .public (semaphore initial_open_positions) (-> Nat Semaphore) @@ -145,7 +145,7 @@ (do async.monad [outcome (..signal! turnstile)] (again (++ step))) - (# async.monad in [])))) + (at async.monad in [])))) (template [<phase> <update> <goal> <turnstile>] [(def: (<phase> barrier) diff --git a/stdlib/source/library/lux/control/concurrency/stm.lux b/stdlib/source/library/lux/control/concurrency/stm.lux index 16463523a..a17527e5f 100644 --- a/stdlib/source/library/lux/control/concurrency/stm.lux +++ b/stdlib/source/library/lux/control/concurrency/stm.lux @@ -53,7 +53,7 @@ (do ! [banned (monad.only ! (function (_ sink) (do ! - [result (# sink feed (variance.write new_value))] + [result (at sink feed (variance.write new_value))] (in (case result {try.#Success _} false @@ -81,8 +81,8 @@ (frp.channel []))] _ (atom.update! (function (_ [value observers]) [value {.#Item (implementation - (def: close (# sink close)) - (def: feed (|>> variance.read (# sink feed)))) + (def: close (at sink close)) + (def: feed (|>> variance.read (at sink feed)))) observers}]) (representation target))] (in [channel sink]))) @@ -106,8 +106,8 @@ (list.example (function (_ [_var _original _current]) (same? (as (Var Any) var) (as (Var Any) _var)))) - (# maybe.monad each (function (_ [_var _original _current]) - _current)) + (at maybe.monad each (function (_ [_var _original _current]) + _current)) as_expected)) (def: .public (read var) diff --git a/stdlib/source/library/lux/control/concurrency/thread.lux b/stdlib/source/library/lux/control/concurrency/thread.lux index 6853c0829..c102d4bbf 100644 --- a/stdlib/source/library/lux/control/concurrency/thread.lux +++ b/stdlib/source/library/lux/control/concurrency/thread.lux @@ -146,7 +146,7 @@ ... Default (do [! io.monad] - [now (# ! each (|>> instant.millis .nat) instant.now) + [now (at ! each (|>> instant.millis .nat) instant.now) _ (atom.update! (|>> {.#Item [#creation now #delay milli_seconds #action action]}) @@ -181,7 +181,7 @@ _ (do ! - [now (# ! each (|>> instant.millis .nat) instant.now) + [now (at ! each (|>> instant.millis .nat) instant.now) .let [[ready pending] (list.partition (function (_ thread) (|> (the #creation thread) (n.+ (the #delay thread)) diff --git a/stdlib/source/library/lux/control/function/inline.lux b/stdlib/source/library/lux/control/function/inline.lux index ac13d65df..d65fd1f41 100644 --- a/stdlib/source/library/lux/control/function/inline.lux +++ b/stdlib/source/library/lux/control/function/inline.lux @@ -47,4 +47,4 @@ (list parameter (` (~! <code>.any))))) list#conjoint)]] (in (list (` ((~! syntax:) (~ privacy) ((~ (code.local name)) [(~+ g!parameters)]) - (.# (~! meta.monad) (~' in) (.list (.`' (~ inlined)))))))))) + (.at (~! meta.monad) (~' in) (.list (.`' (~ inlined)))))))))) diff --git a/stdlib/source/library/lux/control/function/mutual.lux b/stdlib/source/library/lux/control/function/mutual.lux index 03ea12a04..6f6ff6280 100644 --- a/stdlib/source/library/lux/control/function/mutual.lux +++ b/stdlib/source/library/lux/control/function/mutual.lux @@ -50,7 +50,7 @@ (<| (as Macro) (is Macro') (function (_ parameters) - (# meta.monad in (list (` (((~ g!self) (~ g!context)) (~+ parameters)))))))) + (at meta.monad in (list (` (((~ g!self) (~ g!context)) (~+ parameters)))))))) (syntax: .public (let [functions (<code>.tuple (<>.some ..mutual)) body <code>.any]) diff --git a/stdlib/source/library/lux/control/maybe.lux b/stdlib/source/library/lux/control/maybe.lux index 0ed072ea2..72b1f30aa 100644 --- a/stdlib/source/library/lux/control/maybe.lux +++ b/stdlib/source/library/lux/control/maybe.lux @@ -80,7 +80,7 @@ #1 [{.#Some x} {.#Some y}] - (# super = x y) + (at super = x y) _ #0))) @@ -89,7 +89,7 @@ (All (_ a) (-> (Hash a) (Hash (Maybe a)))) (def: equivalence - (..equivalence (# super equivalence))) + (..equivalence (at super equivalence))) (def: (hash value) (case value @@ -97,7 +97,7 @@ 1 {.#Some value} - (# super hash value)))) + (at super hash value)))) (implementation: .public (with monad) (All (_ M) (-> (Monad M) (Monad (All (_ a) (M (Maybe a)))))) @@ -107,8 +107,8 @@ ..functor)) (def: in - (|>> (# ..monad in) - (# monad in))) + (|>> (at ..monad in) + (at monad in))) (def: (conjoint MmMma) (do monad @@ -123,7 +123,7 @@ (def: .public (lifted monad) (All (_ M a) (-> (Monad M) (-> (M a) (M (Maybe a))))) - (# monad each (# ..monad in))) + (at monad each (at ..monad in))) (macro: .public (else tokens state) (case tokens diff --git a/stdlib/source/library/lux/control/parser.lux b/stdlib/source/library/lux/control/parser.lux index c842910c7..31fe9ad6a 100644 --- a/stdlib/source/library/lux/control/parser.lux +++ b/stdlib/source/library/lux/control/parser.lux @@ -96,7 +96,7 @@ (-> (Parser s a) (Parser s b) (Parser s [a b]))) (do [! ..monad] [head first] - (# ! each (|>> [head]) second))) + (at ! each (|>> [head]) second))) (def: .public (or left right) (All (_ s a b) @@ -134,8 +134,8 @@ {try.#Success [input (list)]} {try.#Success [input' head]} - (..result (# ..monad each (|>> (partial_list head)) - (some parser)) + (..result (at ..monad each (|>> (partial_list head)) + (some parser)) input')))) (def: .public (many parser) @@ -143,36 +143,36 @@ (-> (Parser s a) (Parser s (List a)))) (|> (..some parser) (..and parser) - (# ..monad each (|>> {.#Item})))) + (at ..monad each (|>> {.#Item})))) (def: .public (exactly amount parser) (All (_ s a) (-> Nat (Parser s a) (Parser s (List a)))) (case amount - 0 (# ..monad in (list)) + 0 (at ..monad in (list)) _ (do [! ..monad] [x parser] (|> parser (exactly (-- amount)) - (# ! each (|>> {.#Item x})))))) + (at ! each (|>> {.#Item x})))))) (def: .public (at_least amount parser) (All (_ s a) (-> Nat (Parser s a) (Parser s (List a)))) (do [! ..monad] [minimum (..exactly amount parser)] - (# ! each (list#composite minimum) (..some parser)))) + (at ! each (list#composite minimum) (..some parser)))) (def: .public (at_most amount parser) (All (_ s a) (-> Nat (Parser s a) (Parser s (List a)))) (case amount - 0 (# ..monad in (list)) + 0 (at ..monad in (list)) _ (function (_ input) (case (parser input) {try.#Failure msg} {try.#Success [input (list)]} {try.#Success [input' x]} - (..result (# ..monad each (|>> {.#Item x}) - (at_most (-- amount) parser)) + (..result (at ..monad each (|>> {.#Item x}) + (at_most (-- amount) parser)) input'))))) (def: .public (between minimum additional parser) @@ -181,8 +181,8 @@ [minimum (..exactly minimum parser)] (case additional 0 (in minimum) - _ (# ! each (list#composite minimum) - (..at_most additional parser))))) + _ (at ! each (list#composite minimum) + (..at_most additional parser))))) (def: .public (separated_by separator parser) (All (_ s a b) (-> (Parser s b) (Parser s a) (Parser s (List a)))) @@ -196,7 +196,7 @@ (|> parser (..and separator) ..some - (# ! each (|>> (list#each product.right) {.#Item x})))))) + (at ! each (|>> (list#each product.right) {.#Item x})))))) (def: .public (not parser) (All (_ s a) (-> (Parser s a) (Parser s Any))) @@ -301,7 +301,7 @@ {try.#Failure error} {try.#Success [input' to_decode]} - (case (# codec decoded to_decode) + (case (at codec decoded to_decode) {try.#Failure error} {try.#Failure error} diff --git a/stdlib/source/library/lux/control/parser/analysis.lux b/stdlib/source/library/lux/control/parser/analysis.lux index 60b8edb63..e23cc495e 100644 --- a/stdlib/source/library/lux/control/parser/analysis.lux +++ b/stdlib/source/library/lux/control/parser/analysis.lux @@ -104,7 +104,7 @@ (function (_ input) (case input (pattern (partial_list (<tag> actual) input')) - (if (# <eq> = expected actual) + (if (at <eq> = expected actual) {try.#Success [input' []]} (exception.except ..cannot_parse input)) diff --git a/stdlib/source/library/lux/control/parser/binary.lux b/stdlib/source/library/lux/control/parser/binary.lux index f9871b53b..36f70c1e0 100644 --- a/stdlib/source/library/lux/control/parser/binary.lux +++ b/stdlib/source/library/lux/control/parser/binary.lux @@ -137,7 +137,7 @@ (with_expansions [<case>+' (template.spliced <case>+)] (case flag (^.template [<number> <tag> <parser>] - [<number> (`` (# ! each (|>> {(~~ (template.spliced <tag>))}) <parser>))]) + [<number> (`` (at ! each (|>> {(~~ (template.spliced <tag>))}) <parser>))]) (<case>+') _ (//.lifted (exception.except ..invalid_tag [(template.amount [<case>+]) flag])))))]) @@ -203,7 +203,7 @@ (Parser Text) (do //.monad [utf8 <binary>] - (//.lifted (# utf8.codec decoded utf8)))))] + (//.lifted (at utf8.codec decoded utf8)))))] [08 utf8_8 ..binary_8] [16 utf8_16 ..binary_16] diff --git a/stdlib/source/library/lux/control/parser/code.lux b/stdlib/source/library/lux/control/parser/code.lux index 8ac364a2a..e2b1b9c9e 100644 --- a/stdlib/source/library/lux/control/parser/code.lux +++ b/stdlib/source/library/lux/control/parser/code.lux @@ -74,7 +74,7 @@ (function (_ tokens) (case tokens {.#Item [[_ {<tag> actual}] tokens']} - (if (# <eq> = expected actual) + (if (at <eq> = expected actual) {try.#Success [tokens' []]} <failure>) @@ -119,7 +119,7 @@ (function (_ tokens) (case tokens {.#Item [[_ {.#Symbol ["" actual]}] tokens']} - (if (# text.equivalence = expected actual) + (if (at text.equivalence = expected actual) {try.#Success [tokens' []]} <failure>) @@ -148,7 +148,7 @@ <failure> {.#Item [[_ {.#Symbol it}] tokens']} - (if (# symbol.equivalence = expected it) + (if (at symbol.equivalence = expected it) {try.#Success [tokens' []]} <failure>) diff --git a/stdlib/source/library/lux/control/parser/environment.lux b/stdlib/source/library/lux/control/parser/environment.lux index 484671355..03051bf2b 100644 --- a/stdlib/source/library/lux/control/parser/environment.lux +++ b/stdlib/source/library/lux/control/parser/environment.lux @@ -41,4 +41,4 @@ (def: .public (result parser environment) (All (_ a) (-> (Parser a) Environment (Try a))) - (# try.monad each product.right (parser environment))) + (at try.monad each product.right (parser environment))) diff --git a/stdlib/source/library/lux/control/parser/json.lux b/stdlib/source/library/lux/control/parser/json.lux index 61bad3146..1887b387b 100644 --- a/stdlib/source/library/lux/control/parser/json.lux +++ b/stdlib/source/library/lux/control/parser/json.lux @@ -90,7 +90,7 @@ [head ..any] (case head {<tag> value} - (in (# <equivalence> = test value)) + (in (at <equivalence> = test value)) _ (//.failure (exception.error ..unexpected_value [head]))))) @@ -101,7 +101,7 @@ [head ..any] (case head {<tag> value} - (if (# <equivalence> = test value) + (if (at <equivalence> = test value) (in []) (//.failure (exception.error ..value_mismatch [{<tag> test} {<tag> value}]))) diff --git a/stdlib/source/library/lux/control/parser/synthesis.lux b/stdlib/source/library/lux/control/parser/synthesis.lux index 47179c5d8..2fd9942fb 100644 --- a/stdlib/source/library/lux/control/parser/synthesis.lux +++ b/stdlib/source/library/lux/control/parser/synthesis.lux @@ -103,7 +103,7 @@ (.function (_ input) (case input (pattern (partial_list (<tag> actual) input')) - (if (# <eq> = expected actual) + (if (at <eq> = expected actual) {try.#Success [input' []]} (exception.except ..cannot_parse input)) diff --git a/stdlib/source/library/lux/control/parser/text.lux b/stdlib/source/library/lux/control/parser/text.lux index 4b8ab6e24..c03a62dae 100644 --- a/stdlib/source/library/lux/control/parser/text.lux +++ b/stdlib/source/library/lux/control/parser/text.lux @@ -331,7 +331,7 @@ (template [<name> <base> <doc_modifier>] [(def: .public (<name> parser) (-> (Parser Text) (Parser Text)) - (|> parser <base> (# //.monad each /.together)))] + (|> parser <base> (at //.monad each /.together)))] [some //.some "some"] [many //.many "many"] @@ -351,7 +351,7 @@ (-> Nat (Parser Text) (Parser Text)) (|> parser (<base> amount) - (# //.monad each /.together)))] + (at //.monad each /.together)))] [exactly //.exactly "exactly"] [at_most //.at_most "at most"] @@ -373,7 +373,7 @@ (-> Nat Nat (Parser Text) (Parser Text)) (|> parser (//.between minimum additional) - (# //.monad each /.together))) + (at //.monad each /.together))) (def: .public (between! minimum additional parser) (-> Nat Nat (Parser Slice) (Parser Slice)) diff --git a/stdlib/source/library/lux/control/parser/type.lux b/stdlib/source/library/lux/control/parser/type.lux index 944e687c7..4b2e9cd90 100644 --- a/stdlib/source/library/lux/control/parser/type.lux +++ b/stdlib/source/library/lux/control/parser/type.lux @@ -180,7 +180,7 @@ (All (_ a) (-> (Parser a) (Parser [Code (List Code) a]))) (do [! //.monad] [headT any - funcI (# ! each dictionary.size ..env) + funcI (at ! each dictionary.size ..env) [num_args non_poly] (local (list headT) ..polymorphic') env ..env .let [funcL (label funcI) diff --git a/stdlib/source/library/lux/control/parser/xml.lux b/stdlib/source/library/lux/control/parser/xml.lux index 6853965af..5f5c42d23 100644 --- a/stdlib/source/library/lux/control/parser/xml.lux +++ b/stdlib/source/library/lux/control/parser/xml.lux @@ -38,7 +38,7 @@ (exception: .public (unconsumed_inputs [inputs (List XML)]) (exception.report - "Inputs" (exception.listing (# /.codec encoded) inputs))) + "Inputs" (exception.listing (at /.codec encoded) inputs))) (def: (result' parser attrs documents) (All (_ a) (-> (Parser a) Attrs (List XML) (Try a))) diff --git a/stdlib/source/library/lux/control/reader.lux b/stdlib/source/library/lux/control/reader.lux index 6aa225aeb..651ce0eb8 100644 --- a/stdlib/source/library/lux/control/reader.lux +++ b/stdlib/source/library/lux/control/reader.lux @@ -57,8 +57,8 @@ (functor.composite ..functor (the monad.functor monad))) (def: in - (|>> (# monad in) - (# ..monad in))) + (|>> (at monad in) + (at ..monad in))) (def: (conjoint eMeMa) (function (_ env) @@ -68,4 +68,4 @@ (def: .public lifted (All (_ ! e a) (-> (! a) (Reader e (! a)))) - (# ..monad in)) + (at ..monad in)) diff --git a/stdlib/source/library/lux/control/region.lux b/stdlib/source/library/lux/control/region.lux index f744c5cef..6d7038b2e 100644 --- a/stdlib/source/library/lux/control/region.lux +++ b/stdlib/source/library/lux/control/region.lux @@ -59,15 +59,15 @@ [[cleaners output] (computation [[] (list)])] (|> cleaners (monad.each ! (function (_ cleaner) (cleaner []))) - (# ! each (list#mix clean output))))) + (at ! each (list#mix clean output))))) (def: .public (acquire! monad cleaner value) (All (_ ! a) (-> (Monad !) (-> a (! (Try Any))) a (All (_ r) (Region r ! a)))) (function (_ [region cleaners]) - (# monad in [{.#Item (function (_ region) (cleaner value)) - cleaners} - {try.#Success value}]))) + (at monad in [{.#Item (function (_ region) (cleaner value)) + cleaners} + {try.#Success value}]))) (implementation: .public (functor super) (All (_ !) @@ -77,15 +77,15 @@ (def: (each f) (function (_ fa) (function (_ region+cleaners) - (# super each - (function (_ [cleaners' temp]) - [cleaners' (case temp - {try.#Success value} - {try.#Success (f value)} + (at super each + (function (_ [cleaners' temp]) + [cleaners' (case temp + {try.#Success value} + {try.#Success (f value)} - {try.#Failure error} - {try.#Failure error})]) - (fa region+cleaners)))))) + {try.#Failure error} + {try.#Failure error})]) + (fa region+cleaners)))))) (implementation: .public (apply super) (All (_ !) @@ -122,7 +122,7 @@ (def: (in value) (function (_ [region cleaners]) - (# super in [cleaners {try.#Success value}]))) + (at super in [cleaners {try.#Success value}]))) (def: (conjoint ffa) (function (_ [region cleaners]) @@ -140,7 +140,7 @@ (-> (Monad !) Text (All (_ r) (Region r ! a)))) (function (_ [region cleaners]) - (# monad in [cleaners {try.#Failure error}]))) + (at monad in [cleaners {try.#Failure error}]))) (def: .public (except monad exception message) (All (_ ! e a) @@ -153,6 +153,6 @@ (-> (Monad !) (! a) (All (_ r) (Region r ! a)))) (function (_ [region cleaners]) - (# monad each - (|>> {try.#Success} [cleaners]) - operation))) + (at monad each + (|>> {try.#Success} [cleaners]) + operation))) diff --git a/stdlib/source/library/lux/control/remember.lux b/stdlib/source/library/lux/control/remember.lux index 4f4bd74f2..02e6c5011 100644 --- a/stdlib/source/library/lux/control/remember.lux +++ b/stdlib/source/library/lux/control/remember.lux @@ -43,7 +43,7 @@ <c>.int) (do <>.monad [raw <c>.text] - (case (# date.codec decoded raw) + (case (at date.codec decoded raw) {try.#Success date} (in date) diff --git a/stdlib/source/library/lux/control/security/capability.lux b/stdlib/source/library/lux/control/security/capability.lux index 82b7a9a86..84a605e26 100644 --- a/stdlib/source/library/lux/control/security/capability.lux +++ b/stdlib/source/library/lux/control/security/capability.lux @@ -48,8 +48,8 @@ (do [! meta.monad] [this_module meta.current_module_name .let [[name vars] declaration] - g!brand (# ! each (|>> %.code code.text) - (macro.symbol (format (%.symbol [this_module name])))) + g!brand (at ! each (|>> %.code code.text) + (macro.symbol (format (%.symbol [this_module name])))) .let [capability (` (..Capability (.Primitive (~ g!brand)) (~ input) (~ output)))]] (in (list (` (type: (~ export_policy) (~ (|declaration|.format declaration)) diff --git a/stdlib/source/library/lux/control/state.lux b/stdlib/source/library/lux/control/state.lux index 33e99c665..b5a87549d 100644 --- a/stdlib/source/library/lux/control/state.lux +++ b/stdlib/source/library/lux/control/state.lux @@ -93,13 +93,13 @@ (def: (each f sfa) (function (_ state) - (# functor each (function (_ [s a]) [s (f a)]) - (sfa state))))) + (at functor each (function (_ [s a]) [s (f a)]) + (sfa state))))) (implementation: (with//apply monad) (All (_ M s) (-> (Monad M) (Apply (All (_ a) (-> s (M [s a])))))) - (def: functor (with//functor (# monad functor))) + (def: functor (with//functor (at monad functor))) (def: (on sFa sFf) (function (_ state) @@ -118,11 +118,11 @@ (implementation: .public (with monad) (All (_ M s) (-> (Monad M) (Monad (+State M s)))) - (def: functor (with//functor (# monad functor))) + (def: functor (with//functor (at monad functor))) (def: (in a) (function (_ state) - (# monad in [state a]))) + (at monad in [state a]))) (def: (conjoint sMsMa) (function (_ state) diff --git a/stdlib/source/library/lux/control/try.lux b/stdlib/source/library/lux/control/try.lux index 2a5c9bb03..dd43a0ea1 100644 --- a/stdlib/source/library/lux/control/try.lux +++ b/stdlib/source/library/lux/control/try.lux @@ -73,8 +73,8 @@ ..functor)) (def: in - (|>> (# ..monad in) - (# monad in))) + (|>> (at ..monad in) + (at monad in))) (def: (conjoint MeMea) (do monad @@ -89,7 +89,7 @@ (def: .public (lifted monad) (All (_ ! a) (-> (Monad !) (-> (! a) (! (Try a))))) - (# monad each (# ..monad in))) + (at monad each (at ..monad in))) (implementation: .public (equivalence (open "_#[0]")) (All (_ a) (-> (Equivalence a) (Equivalence (Try a)))) diff --git a/stdlib/source/library/lux/control/writer.lux b/stdlib/source/library/lux/control/writer.lux index 118d41ee0..40540eb04 100644 --- a/stdlib/source/library/lux/control/writer.lux +++ b/stdlib/source/library/lux/control/writer.lux @@ -34,7 +34,7 @@ (def: (on fa ff) (let [[log1 f] ff [log2 a] fa] - [(# monoid composite log1 log2) (f a)]))) + [(at monoid composite log1 log2) (f a)]))) (implementation: .public (monad monoid) (All (_ l) @@ -43,11 +43,11 @@ (def: functor ..functor) (def: in - (|>> [(# monoid identity)])) + (|>> [(at monoid identity)])) (def: (conjoint mma) (let [[log1 [log2 a]] mma] - [(# monoid composite log1 log2) a]))) + [(at monoid composite log1 log2) a]))) (implementation: .public (with monoid monad) (All (_ l M) (-> (Monoid l) (Monad M) (Monad (All (_ a) (M (Writer l a)))))) @@ -58,7 +58,7 @@ (def: in (let [writer (..monad monoid)] - (|>> (# writer in) (# monad in)))) + (|>> (at writer in) (at monad in)))) (def: (conjoint MlMla) (do monad @@ -72,10 +72,10 @@ ... On new compiler MlMla) [l2 a] Mla] - (in [(# monoid composite l1 l2) a])))) + (in [(at monoid composite l1 l2) a])))) (def: .public (lifted monoid monad) (All (_ l M a) (-> (Monoid l) (Monad M) (-> (M a) (M (Writer l a))))) - (# monad each (|>> [(# monoid identity)]))) + (at monad each (|>> [(at monoid identity)]))) diff --git a/stdlib/source/library/lux/data/collection/dictionary.lux b/stdlib/source/library/lux/data/collection/dictionary.lux index 5fc1d3ebb..a4b122919 100644 --- a/stdlib/source/library/lux/data/collection/dictionary.lux +++ b/stdlib/source/library/lux/data/collection/dictionary.lux @@ -232,10 +232,10 @@ ... Produces the index of a KV-pair within a #Collisions node. (def: (collision_index key_hash key colls) (All (_ k v) (-> (Hash k) k (Collisions k v) (Maybe Index))) - (# maybe.monad each product.left - (array.example' (function (_ idx [key' val']) - (# key_hash = key key')) - colls))) + (at maybe.monad each product.left + (array.example' (function (_ idx [key' val']) + (at key_hash = key key')) + colls))) ... When #Hierarchy nodes grow too small, they're demoted to #Base ... nodes to save space. @@ -276,7 +276,7 @@ {.#Right [key' val']} (array.has! hierarchy_idx - (node#has (level_up level) (# key_hash hash key') key' val' key_hash ..empty_node) + (node#has (level_up level) (at key_hash hash key') key' val' key_hash ..empty_node) h_array))] default)) [0 @@ -325,11 +325,11 @@ ... Otherwise, if it's being used by a KV, compare the keys. {.#Right key' val'} (array#revised idx - (if (# key_hash = key key') + (if (at key_hash = key key') ... If the same key is found, replace the value. {.#Right key val} ... Otherwise, compare the hashes of the keys. - {.#Left (let [hash' (# key_hash hash key')] + {.#Left (let [hash' (at key_hash hash key')] (if (n.= hash hash') ... If the hashes are ... the same, a new @@ -432,7 +432,7 @@ node ... But if it came out empty... (if (node#empty? sub_node') - ...# ... figure out whether that's the only position left. + ...at ... figure out whether that's the only position left. (if (only_bit_position? bit bitmap) ... If so, removing it leaves this node empty too. ..empty_node @@ -448,7 +448,7 @@ ... If, however, there was a KV-pair instead of a sub-node. {.#Right [key' val']} ... Check if the keys match. - (if (# key_hash = key key') + (if (at key_hash = key key') ... If so, remove the KV-pair and unset the Bit_Position. {#Base (without_bit_position bit bitmap) (array#lacks idx base)} @@ -493,16 +493,16 @@ (node#value (level_up level) hash key key_hash sub_node) {.#Right [key' val']} - (if (# key_hash = key key') + (if (at key_hash = key key') {.#Some val'} {.#None})) {.#None})) ... For #Collisions nodes, do a linear scan of all the known KV-pairs. {#Collisions _hash _colls} - (# maybe.monad each product.right - (array.example (|>> product.left (# key_hash = key)) - _colls)) + (at maybe.monad each product.right + (array.example (|>> product.left (at key_hash = key)) + _colls)) )) (def: (node#size node) @@ -577,17 +577,17 @@ (def: .public (has key val dict) (All (_ k v) (-> k v (Dictionary k v) (Dictionary k v))) (let [[key_hash node] dict] - [key_hash (node#has root_level (# key_hash hash key) key val key_hash node)])) + [key_hash (node#has root_level (at key_hash hash key) key val key_hash node)])) (def: .public (lacks key dict) (All (_ k v) (-> k (Dictionary k v) (Dictionary k v))) (let [[key_hash node] dict] - [key_hash (node#lacks root_level (# key_hash hash key) key key_hash node)])) + [key_hash (node#lacks root_level (at key_hash hash key) key key_hash node)])) (def: .public (value key dict) (All (_ k v) (-> k (Dictionary k v) (Maybe v))) (let [[key_hash node] dict] - (node#value root_level (# key_hash hash key) key key_hash node))) + (node#value root_level (at key_hash hash key) key key_hash node))) (def: .public (key? dict key) (All (_ k v) (-> (Dictionary k v) k Bit)) @@ -732,7 +732,7 @@ (All (_ k) (Functor (Dictionary k))) (def: (each f fa) - (.revised #root (# ..node_functor each f) fa))) + (.revised #root (at ..node_functor each f) fa))) (implementation: .public (monoid hash) (All (_ k v) (-> (Hash k) (Monoid (Dictionary k v)))) diff --git a/stdlib/source/library/lux/data/collection/dictionary/ordered.lux b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux index 46889f723..76e5939be 100644 --- a/stdlib/source/library/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux @@ -69,11 +69,11 @@ {.#Some node} (let [node_key (the #key node)] - (cond (# dict = node_key key) + (cond (at dict = node_key key) ... (_#= node_key key) {.#Some (the #value node)} - (# dict < node_key key) + (at dict < node_key key) ... (_#< node_key key) (again (the #left node)) @@ -94,9 +94,9 @@ {.#Some node} (let [node_key (the #key node)] - (or (# dict = node_key key) + (or (at dict = node_key key) ... (_#= node_key key) - (if (# dict < node_key key) + (if (at dict < node_key key) ... (_#< node_key key) (again (the #left node)) (again (the #right node))))))))) @@ -357,7 +357,7 @@ {.#Some (right_balanced (the #key right) (the #value right) (the #right right>>left) - (# maybe.functor each reddened (the #right right)))}) + (at maybe.functor each reddened (the #right right)))}) _ (panic! error_message)) @@ -384,7 +384,7 @@ (the #value left>>right) {.#Some (left_balanced (the #key left) (the #value left) - (# maybe.functor each reddened (the #left left)) + (at maybe.functor each reddened (the #left left)) (the #left left>>right))} {.#Some (black key value (the #right left>>right) ?right)}) diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux index 4f64f9ddf..903d5ae3f 100644 --- a/stdlib/source/library/lux/data/collection/list.lux +++ b/stdlib/source/library/lux/data/collection/list.lux @@ -298,7 +298,7 @@ #1 [{.#Item x xs'} {.#Item y ys'}] - (and (# Equivalence<a> = x y) + (and (at Equivalence<a> = x y) (= xs' ys')) [_ _] @@ -309,13 +309,13 @@ (All (_ a) (-> (Hash a) (Hash (List a)))) (def: equivalence - (..equivalence (# super equivalence))) + (..equivalence (at super equivalence))) (def: hash - (# ..mix mix - (function (_ member hash) - (n.+ (# super hash member) hash)) - 0))) + (at ..mix mix + (function (_ member hash) + (n.+ (at super hash member) hash)) + 0))) (implementation: .public monoid (All (_ a) (Monoid (List a))) @@ -405,7 +405,7 @@ #0 {.#Item x' xs'} - (or (# eq = x x') + (or (at eq = x x') (member? eq xs' x)))) (template [<name> <output> <side>] @@ -569,7 +569,7 @@ (def: .public together (All (_ a) (-> (List (List a)) (List a))) - (# ..monad conjoint)) + (at ..monad conjoint)) (implementation: .public (with monad) (All (_ M) (-> (Monad M) (Monad (All (_ a) (M (List a)))))) @@ -579,7 +579,7 @@ ..functor)) (def: in - (|>> (# ..monad in) (# monad in))) + (|>> (at ..monad in) (at monad in))) (def: (conjoint MlMla) (do [! monad] @@ -593,7 +593,7 @@ (def: .public (lifted monad) (All (_ M a) (-> (Monad M) (-> (M a) (M (List a))))) - (# monad each (# ..monad in))) + (at monad each (at ..monad in))) (def: .public (enumeration xs) (All (_ a) (-> (List a) (List [Nat a]))) diff --git a/stdlib/source/library/lux/data/collection/queue.lux b/stdlib/source/library/lux/data/collection/queue.lux index 103e38506..0d11963cd 100644 --- a/stdlib/source/library/lux/data/collection/queue.lux +++ b/stdlib/source/library/lux/data/collection/queue.lux @@ -82,9 +82,9 @@ (All (_ a) (-> (Equivalence a) (Equivalence (Queue a)))) (def: (= reference subject) - (# (list.equivalence super) = - (..list reference) - (..list subject)))) + (at (list.equivalence super) = + (..list reference) + (..list subject)))) (implementation: .public functor (Functor Queue) diff --git a/stdlib/source/library/lux/data/collection/queue/priority.lux b/stdlib/source/library/lux/data/collection/queue/priority.lux index 7ff7d3195..f62ff3c6a 100644 --- a/stdlib/source/library/lux/data/collection/queue/priority.lux +++ b/stdlib/source/library/lux/data/collection/queue/priority.lux @@ -76,7 +76,7 @@ (loop (again [node tree]) (case (tree.root node) {0 #0 reference} - (# equivalence = reference member) + (at equivalence = reference member) {0 #1 [left right]} (or (again left) @@ -102,24 +102,24 @@ {.#Some right} {.#Some =left} - {.#Some (# ..builder branch =left right)}) + {.#Some (at ..builder branch =left right)}) (case (again right) {.#None} {.#Some left} {.#Some =right} - {.#Some (# ..builder branch left =right)}))))))) + {.#Some (at ..builder branch left =right)}))))))) (def: .public (end priority value queue) (All (_ a) (-> Priority a (Queue a) (Queue a))) - (let [addition (# ..builder leaf priority value)] + (let [addition (at ..builder leaf priority value)] (abstraction (case (representation queue) {.#None} {.#Some addition} {.#Some tree} - {.#Some (# ..builder branch tree addition)})))) + {.#Some (at ..builder branch tree addition)})))) ) (def: .public empty? diff --git a/stdlib/source/library/lux/data/collection/sequence.lux b/stdlib/source/library/lux/data/collection/sequence.lux index 2c8fdadaa..74654008c 100644 --- a/stdlib/source/library/lux/data/collection/sequence.lux +++ b/stdlib/source/library/lux/data/collection/sequence.lux @@ -244,8 +244,8 @@ (exception: .public [a] (index_out_of_bounds [sequence (Sequence a) index Nat]) (exception.report - "Size" (# n.decimal encoded (the #size sequence)) - "Index" (# n.decimal encoded index))) + "Size" (at n.decimal encoded (the #size sequence)) + "Index" (at n.decimal encoded index))) (exception: base_was_not_found) @@ -445,7 +445,7 @@ [#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 $)] + $ (at node_functor each $)] (|> xs (the #root) (array.each $))) #tail (|> xs (the #tail) (array.each $))])) diff --git a/stdlib/source/library/lux/data/collection/set.lux b/stdlib/source/library/lux/data/collection/set.lux index bd82175ab..1d32060b9 100644 --- a/stdlib/source/library/lux/data/collection/set.lux +++ b/stdlib/source/library/lux/data/collection/set.lux @@ -78,7 +78,7 @@ (def: (hash set) (|> set ..list - (# (list.hash (..member_hash set)) hash)))) + (at (list.hash (..member_hash set)) hash)))) (implementation: .public (monoid hash) (All (_ a) (-> (Hash a) (Monoid (Set a)))) diff --git a/stdlib/source/library/lux/data/collection/set/multi.lux b/stdlib/source/library/lux/data/collection/set/multi.lux index 30ca10e23..ac422fd99 100644 --- a/stdlib/source/library/lux/data/collection/set/multi.lux +++ b/stdlib/source/library/lux/data/collection/set/multi.lux @@ -135,7 +135,7 @@ (let [set (representation set) [hash _] set] (list#mix (function (_ [elem multiplicity] acc) - (|> elem (# hash hash) (n.* multiplicity) (n.+ acc))) + (|> elem (at hash hash) (n.* multiplicity) (n.+ acc))) 0 (dictionary.entries set))))) ) diff --git a/stdlib/source/library/lux/data/collection/set/ordered.lux b/stdlib/source/library/lux/data/collection/set/ordered.lux index f55418053..9e83655b9 100644 --- a/stdlib/source/library/lux/data/collection/set/ordered.lux +++ b/stdlib/source/library/lux/data/collection/set/ordered.lux @@ -70,8 +70,8 @@ (All (_ a) (Equivalence (Set a))) (def: (= reference sample) - (# (list.equivalence (# (representation reference) equivalence)) - = (..list reference) (..list sample)))) + (at (list.equivalence (at (representation reference) equivalence)) + = (..list reference) (..list sample)))) ) (def: .public (sub? super sub) diff --git a/stdlib/source/library/lux/data/collection/stack.lux b/stdlib/source/library/lux/data/collection/stack.lux index 4994baf67..1b52dfdaa 100644 --- a/stdlib/source/library/lux/data/collection/stack.lux +++ b/stdlib/source/library/lux/data/collection/stack.lux @@ -53,7 +53,7 @@ (Equivalence (Stack a)))) (def: (= reference subject) - (# (//.equivalence super) = (representation reference) (representation subject)))) + (at (//.equivalence super) = (representation reference) (representation subject)))) (implementation: .public functor (Functor Stack) @@ -61,6 +61,6 @@ (def: (each f value) (|> value representation - (# //.functor each f) + (at //.functor each f) abstraction))) ) diff --git a/stdlib/source/library/lux/data/collection/tree.lux b/stdlib/source/library/lux/data/collection/tree.lux index f7dfcf617..43f2f16c9 100644 --- a/stdlib/source/library/lux/data/collection/tree.lux +++ b/stdlib/source/library/lux/data/collection/tree.lux @@ -63,8 +63,8 @@ (All (_ a) (-> (Equivalence a) (Equivalence (Tree a)))) (def: (= tx ty) - (and (# super = (the #value tx) (the #value ty)) - (# (list.equivalence (equivalence super)) = (the #children tx) (the #children ty))))) + (and (at super = (the #value tx) (the #value ty)) + (at (list.equivalence (equivalence super)) = (the #children tx) (the #children ty))))) (implementation: .public functor (Functor Tree) diff --git a/stdlib/source/library/lux/data/collection/tree/finger.lux b/stdlib/source/library/lux/data/collection/tree/finger.lux index 1e2b87d25..1a559f2ef 100644 --- a/stdlib/source/library/lux/data/collection/tree/finger.lux +++ b/stdlib/source/library/lux/data/collection/tree/finger.lux @@ -50,7 +50,7 @@ (def: (branch left right) (abstraction [#monoid monoid - #tag (# monoid composite (..tag left) (..tag right)) + #tag (at monoid composite (..tag left) (..tag right)) #root {.#Right [left right]}]))) (def: .public (value tree) diff --git a/stdlib/source/library/lux/data/format/binary.lux b/stdlib/source/library/lux/data/format/binary.lux index c1c4707cc..1f257ea7e 100644 --- a/stdlib/source/library/lux/data/format/binary.lux +++ b/stdlib/source/library/lux/data/format/binary.lux @@ -112,7 +112,7 @@ (def: .public (and pre post) (All (_ a b) (-> (Writer a) (Writer b) (Writer [a b]))) (function (_ [preV postV]) - (# ..monoid composite (pre preV) (post postV)))) + (at ..monoid composite (pre preV) (post postV)))) (def: .public (rec body) (All (_ a) (-> (-> (Writer a) (Writer a)) (Writer a))) @@ -174,7 +174,7 @@ (template [<name> <binary>] [(def: .public <name> (Writer Text) - (|>> (# utf8.codec encoded) <binary>))] + (|>> (at utf8.codec encoded) <binary>))] [utf8_8 ..binary_8] [utf8_16 ..binary_16] @@ -197,10 +197,10 @@ (open "specification#[0]") ..monoid [size mutation] (|> value (sequence#each valueW) - (# sequence.mix mix - (function (_ post pre) - (specification#composite pre post)) - specification#identity))] + (at sequence.mix mix + (function (_ post pre) + (specification#composite pre post)) + specification#identity))] [(n#+ <size> size) (function (_ [offset binary]) (|> binary diff --git a/stdlib/source/library/lux/data/format/css.lux b/stdlib/source/library/lux/data/format/css.lux index 093cc785f..75013483b 100644 --- a/stdlib/source/library/lux/data/format/css.lux +++ b/stdlib/source/library/lux/data/format/css.lux @@ -56,8 +56,8 @@ (-> Font (CSS Special)) (let [with_unicode (case (the /font.#unicode_range font) {.#Some unicode_range} - (let [unicode_range' (format "U+" (# nat.hex encoded (the /font.#start unicode_range)) - "-" (# nat.hex encoded (the /font.#end unicode_range)))] + (let [unicode_range' (format "U+" (at nat.hex encoded (the /font.#start unicode_range)) + "-" (at nat.hex encoded (the /font.#end unicode_range)))] (list ["unicode-range" unicode_range'])) {.#None} diff --git a/stdlib/source/library/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux index 07369e1dc..633ffde55 100644 --- a/stdlib/source/library/lux/data/format/css/value.lux +++ b/stdlib/source/library/lux/data/format/css/value.lux @@ -835,7 +835,7 @@ (..apply "rgba" (list (%.nat red) (%.nat green) (%.nat blue) - (if (r.= (# r.interval top) _#alpha) + (if (r.= (at r.interval top) _#alpha) "1.0" (format "0" (%.rev _#alpha))))))) diff --git a/stdlib/source/library/lux/data/format/html.lux b/stdlib/source/library/lux/data/format/html.lux index 44ff23595..8a3a964c1 100644 --- a/stdlib/source/library/lux/data/format/html.lux +++ b/stdlib/source/library/lux/data/format/html.lux @@ -219,7 +219,7 @@ (def: .public (svg attributes content) (-> Attributes XML Element) (|> content - (# xml.codec encoded) + (at xml.codec encoded) (..raw "svg" attributes))) (type: .public Coord diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux index 14127b8ef..54ef372f1 100644 --- a/stdlib/source/library/lux/data/format/json.lux +++ b/stdlib/source/library/lux/data/format/json.lux @@ -187,7 +187,7 @@ (^.template [<tag> <struct>] [[{<tag> x'} {<tag> y'}] - (# <struct> = x' y')]) + (at <struct> = x' y')]) ([#Boolean bit.equivalence] [#Number f.equivalence] [#String text.equivalence]) @@ -238,7 +238,7 @@ "0.0" value - (let [raw (# f.decimal encoded value)] + (let [raw (at f.decimal encoded value)] (if (f.< +0.0 value) raw (|> raw (text.split_at 1) maybe.trusted product.right)))))) diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux index 9dd84b4e8..42088c430 100644 --- a/stdlib/source/library/lux/data/format/tar.lux +++ b/stdlib/source/library/lux/data/format/tar.lux @@ -94,10 +94,10 @@ (let [suffix <suffix> padded_size (n.+ (text.size suffix) <size>)] (|>> representation - (# n.octal encoded) + (at n.octal encoded) (..octal_padding <size>) (text.suffix suffix) - (# utf8.codec encoded) + (at utf8.codec encoded) (format.segment padded_size)))) (def: <coercion> @@ -140,25 +140,25 @@ (Parser Small) (do <>.monad [digits (<binary>.segment ..small_size) - digits (<>.lifted (# utf8.codec decoded digits)) + digits (<>.lifted (at utf8.codec decoded digits)) _ ..small_suffix] (<>.lifted (do [! try.monad] - [value (# n.octal decoded digits)] + [value (at n.octal decoded digits)] (..small value))))) (def: big_parser (Parser Big) (do <>.monad [digits (<binary>.segment ..big_size) - digits (<>.lifted (# utf8.codec decoded digits)) + digits (<>.lifted (at utf8.codec decoded digits)) end <binary>.bits_8 _ (let [expected (`` (char (~~ (static ..blank))))] (<>.assertion (exception.error ..wrong_character [expected end]) (n.= expected end)))] (<>.lifted (do [! try.monad] - [value (# n.octal decoded digits)] + [value (at n.octal decoded digits)] (..big value))))) (primitive: Checksum @@ -182,7 +182,7 @@ (def: checksum_checksum (|> ..dummy_checksum representation - (# utf8.codec encoded) + (at utf8.codec encoded) ..checksum)) (def: checksum_code @@ -190,7 +190,7 @@ (|>> ..checksum ..as_small ..from_small - (# n.octal encoded) + (at n.octal encoded) (..octal_padding ..small_size) (text.suffix ..checksum_suffix) abstraction)) @@ -200,17 +200,17 @@ (let [padded_size (n.+ (text.size ..checksum_suffix) ..small_size)] (|>> representation - (# utf8.codec encoded) + (at utf8.codec encoded) (format.segment padded_size)))) (def: checksum_parser (Parser [Nat Checksum]) (do <>.monad [ascii (<binary>.segment ..small_size) - digits (<>.lifted (# utf8.codec decoded ascii)) + digits (<>.lifted (at utf8.codec decoded ascii)) _ ..small_suffix value (<>.lifted - (# n.octal decoded digits))] + (at n.octal decoded digits))] (in [value (abstraction (format digits ..checksum_suffix))]))) ) @@ -221,7 +221,7 @@ (def: ascii? (-> Text Bit) - (|>> (# utf8.codec encoded) + (|>> (at utf8.codec encoded) (binary.mix (function (_ char verdict) (.and verdict (n.<= ..last_ascii char))) @@ -240,7 +240,7 @@ 0 string size (loop (again [end (-- size)]) (case end - 0 (# utf8.codec encoded "") + 0 (at utf8.codec encoded "") _ (let [last_char (binary!.bits_8 end string)] (`` (case (.nat last_char) (pattern (char (~~ (static ..null)))) @@ -263,7 +263,7 @@ (-> <representation> (Try <type>)) (if (..ascii? value) (if (|> value - (# utf8.codec encoded) + (at utf8.codec encoded) binary!.size (n.> <size>)) (exception.except <exception> [value]) @@ -280,7 +280,7 @@ padded_size (n.+ (text.size suffix) <size>)] (|>> representation (text.suffix suffix) - (# utf8.codec encoded) + (at utf8.codec encoded) (format.segment padded_size)))) (def: <parser> @@ -293,7 +293,7 @@ (n.= expected end))] (<>.lifted (do [! try.monad] - [text (# utf8.codec decoded (..un_padded string))] + [text (at utf8.codec decoded (..un_padded string))] (<in> text))))) (def: .public <none> @@ -322,7 +322,7 @@ (let [padded_size (n.+ (text.size ..null) ..magic_size)] (|>> representation - (# utf8.codec encoded) + (at utf8.codec encoded) (format.segment padded_size)))) (def: magic_parser @@ -334,8 +334,8 @@ _ (<>.assertion (exception.error ..wrong_character [expected end]) (n.= expected end))] (<>.lifted - (# try.monad each (|>> abstraction) - (# utf8.codec decoded string))))) + (at try.monad each (|>> abstraction) + (at utf8.codec decoded string))))) ) (def: block_size Size 512) @@ -516,7 +516,7 @@ (def: mode_parser (Parser Mode) (do [! <>.monad] - [value (# ! each ..from_small ..small_parser)] + [value (at ! each ..from_small ..small_parser)] (if (n.> (representation ..maximum_mode) value) (<>.lifted @@ -765,7 +765,7 @@ (-> Checksum Binary Nat) (let [|checksum| (|> checksum ..from_checksum - (# utf8.codec encoded) + (at utf8.codec encoded) ..checksum)] (|> (..checksum header) (n.- |checksum|) @@ -837,7 +837,7 @@ (do [! <>.monad] [header ..header_parser] (cond (same? ..contiguous (the #link_flag header)) - (# ! each (|>> {..#Contiguous}) (..file_parser header)) + (at ! each (|>> {..#Contiguous}) (..file_parser header)) (same? ..symbolic_link (the #link_flag header)) (in {..#Symbolic_Link (the #link_name header)}) @@ -847,7 +847,7 @@ ... (or (same? ..normal (the #link_flag header)) ... (same? ..old_normal (the #link_flag header))) - (# ! each (|>> {..#Normal}) (..file_parser header))))) + (at ! each (|>> {..#Normal}) (..file_parser header))))) ... It's safe to implement the parser this way because the range of values for Nat is 2^64 ... Whereas the maximum possible value for the checksum of a 512 block is (256 × 512) = 131,072 @@ -874,5 +874,5 @@ (def: .public parser (Parser Tar) (|> (<>.some ..entry_parser) - (# <>.monad each sequence.of_list) + (at <>.monad each sequence.of_list) (<>.before ..end_of_archive_parser))) diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux index 89a8eccad..1fa0a04ac 100644 --- a/stdlib/source/library/lux/data/format/xml.lux +++ b/stdlib/source/library/lux/data/format/xml.lux @@ -58,7 +58,7 @@ (Parser Text) (|> (do [! <>.monad] [hex? (<>.maybe (<text>.this "x"))] - (<| (# ! each (|>> .nat text.of_char)) + (<| (at ! each (|>> .nat text.of_char)) (<>.codec int.decimal) <text>.slice <text>.many! @@ -119,7 +119,7 @@ (def: attrs^ (Parser Attrs) - (<| (# <>.monad each (dictionary.of_list symbol.hash)) + (<| (at <>.monad each (dictionary.of_list symbol.hash)) <>.some (<>.and (..spaced^ attr_name^)) (<>.after (<text>.this "=")) @@ -289,7 +289,7 @@ [{#Node reference/tag reference/attrs reference/children} {#Node sample/tag sample/attrs sample/children}] (and (symbol#= reference/tag sample/tag) - (# (dictionary.equivalence text.equivalence) = reference/attrs sample/attrs) + (at (dictionary.equivalence text.equivalence) = reference/attrs sample/attrs) (n.= (list.size reference/children) (list.size sample/children)) (|> (list.zipped_2 reference/children sample/children) diff --git a/stdlib/source/library/lux/data/product.lux b/stdlib/source/library/lux/data/product.lux index 2221052bf..669f58e4f 100644 --- a/stdlib/source/library/lux/data/product.lux +++ b/stdlib/source/library/lux/data/product.lux @@ -53,16 +53,16 @@ (All (_ l r) (-> (Equivalence l) (Equivalence r) (Equivalence [l r]))) (def: (= [rl rr] [sl sr]) - (and (# left = rl sl) - (# right = rr sr)))) + (and (at left = rl sl) + (at right = rr sr)))) (def: .public (hash left right) (All (_ l r) (-> (Hash l) (Hash r) (Hash [l r]))) (implementation (def: equivalence - (..equivalence (# left equivalence) - (# right equivalence))) + (..equivalence (at left equivalence) + (at right equivalence))) (def: (hash [leftV rightV]) ("lux i64 +" - (# left hash leftV) - (# right hash rightV))))) + (at left hash leftV) + (at right hash rightV))))) diff --git a/stdlib/source/library/lux/data/store.lux b/stdlib/source/library/lux/data/store.lux index af43c01f2..035128d02 100644 --- a/stdlib/source/library/lux/data/store.lux +++ b/stdlib/source/library/lux/data/store.lux @@ -22,7 +22,7 @@ (def: (each f fa) (extend (function (_ store) - (f (# store peek (# store cursor)))) + (f (at store peek (at store cursor)))) fa))) (implementation: .public comonad @@ -32,23 +32,23 @@ ..functor) (def: (out wa) - (## peek (## cursor))) + (a/an peek (a/an cursor))) (def: disjoint (extend id))) (def: .public (peeks trans store) (All (_ s a) (-> (-> s s) (Store s a) a)) - (|> (## cursor) trans (## peek))) + (|> (a/an cursor) trans (a/an peek))) (def: .public (seek cursor store) (All (_ s a) (-> s (Store s a) (Store s a))) - (# (## disjoint store) peek cursor)) + (at (a/an disjoint store) peek cursor)) (def: .public (seeks change store) (All (_ s a) (-> (-> s s) (Store s a) (Store s a))) - (|> store (## disjoint) (peeks change))) + (|> store (a/an disjoint) (peeks change))) (def: .public (experiment Functor<f> change store) (All (_ f s a) (-> (Functor f) (-> s (f s)) (Store s a) (f a))) - (# Functor<f> each (## peek) (change (## cursor)))) + (at Functor<f> each (a/an peek) (change (a/an cursor)))) diff --git a/stdlib/source/library/lux/data/sum.lux b/stdlib/source/library/lux/data/sum.lux index 461d492bc..a021449c0 100644 --- a/stdlib/source/library/lux/data/sum.lux +++ b/stdlib/source/library/lux/data/sum.lux @@ -67,10 +67,10 @@ (def: (= reference sample) (case [reference sample] [{.#Left reference} {.#Left sample}] - (# left = reference sample) + (at left = reference sample) [{.#Right reference} {.#Right sample}] - (# right = reference sample) + (at right = reference sample) _ false)))) @@ -79,12 +79,12 @@ (All (_ l r) (-> (Hash l) (Hash r) (Hash (Or l r)))) (implementation (def: equivalence - (..equivalence (# left equivalence) - (# right equivalence))) + (..equivalence (at left equivalence) + (at right equivalence))) (def: (hash value) (.nat (case value {.#Left value} - ("lux i64 *" +2 (.int (# left hash value))) + ("lux i64 *" +2 (.int (at left hash value))) {.#Right value} - ("lux i64 *" +3 (.int (# right hash value)))))))) + ("lux i64 *" +3 (.int (at right hash value)))))))) diff --git a/stdlib/source/library/lux/data/text/escape.lux b/stdlib/source/library/lux/data/text/escape.lux index a9c922aff..c1dc7a17f 100644 --- a/stdlib/source/library/lux/data/text/escape.lux +++ b/stdlib/source/library/lux/data/text/escape.lux @@ -95,7 +95,7 @@ (def: (unicode_escaped char pre_offset pre_limit previous current) (-> Char Nat Nat Text Text [Text Text Nat]) - (let [code (# n.hex encoded char) + (let [code (at n.hex encoded char) replacement (format ..sigil "u" (case ("lux text size" code) 1 (format "000" code) @@ -182,7 +182,7 @@ (-> Nat Text Text Nat (Try [Text Text Nat])) (case (|> current ("lux text clip" (n.+ ..ascii_escape_offset offset) ..code_size) - (# n.hex decoded)) + (at n.hex decoded)) {try.#Success char} (let [limit' (|> limit (n.- offset) (n.- ..unicode_escape_offset))] {try.#Success [(format previous diff --git a/stdlib/source/library/lux/data/text/format.lux b/stdlib/source/library/lux/data/text/format.lux index c6dac322e..2da8de70b 100644 --- a/stdlib/source/library/lux/data/text/format.lux +++ b/stdlib/source/library/lux/data/text/format.lux @@ -56,35 +56,35 @@ (Format <type>) <formatter>)] - [bit Bit (# bit.codec encoded)] - [nat Nat (# nat.decimal encoded)] - [int Int (# int.decimal encoded)] - [rev Rev (# rev.decimal encoded)] - [frac Frac (# frac.decimal encoded)] + [bit Bit (at bit.codec encoded)] + [nat Nat (at nat.decimal encoded)] + [int Int (at int.decimal encoded)] + [rev Rev (at rev.decimal encoded)] + [frac Frac (at frac.decimal encoded)] [text Text text.format] - [ratio ratio.Ratio (# ratio.codec encoded)] - [symbol Symbol (# symbol.codec encoded)] + [ratio ratio.Ratio (at ratio.codec encoded)] + [symbol Symbol (at symbol.codec encoded)] [location Location location.format] [code Code code.format] [type Type type.format] - [instant instant.Instant (# instant.codec encoded)] - [duration duration.Duration (# duration.codec encoded)] - [date date.Date (# date.codec encoded)] - [time time.Time (# time.codec encoded)] - [day day.Day (# day.codec encoded)] - [month month.Month (# month.codec encoded)] + [instant instant.Instant (at instant.codec encoded)] + [duration duration.Duration (at duration.codec encoded)] + [date date.Date (at date.codec encoded)] + [time time.Time (at time.codec encoded)] + [day day.Day (at day.codec encoded)] + [month month.Month (at month.codec encoded)] - [xml xml.XML (# xml.codec encoded)] - [json json.JSON (# json.codec encoded)] + [xml xml.XML (at xml.codec encoded)] + [json json.JSON (at json.codec encoded)] ) (template [<type> <format>,<codec>] [(`` (template [<format> <codec>] [(def: .public <format> (Format <type>) - (# <codec> encoded))] + (at <codec> encoded))] (~~ (template.spliced <format>,<codec>))))] @@ -113,7 +113,7 @@ (def: .public (mod modular) (All (_ m) (Format (modular.Mod m))) (let [codec (modular.codec (modular.modulus modular))] - (# codec encoded modular))) + (at codec encoded modular))) (def: .public (list formatter) (All (_ a) (-> (Format a) (Format (List a)))) diff --git a/stdlib/source/library/lux/data/text/regex.lux b/stdlib/source/library/lux/data/text/regex.lux index af653dbdf..010dbd815 100644 --- a/stdlib/source/library/lux/data/text/regex.lux +++ b/stdlib/source/library/lux/data/text/regex.lux @@ -55,7 +55,7 @@ (def: together^ (-> (Parser (List Text)) (Parser Text)) - (# <>.monad each //.together)) + (at <>.monad each //.together)) (def: symbol_char^ (Parser Text) @@ -86,9 +86,9 @@ (def: re_range^ (Parser Code) (do [! <>.monad] - [from (|> regex_char^ (# ! each (|>> (//.char 0) maybe.trusted))) + [from (|> regex_char^ (at ! each (|>> (//.char 0) maybe.trusted))) _ (<text>.this "-") - to (|> regex_char^ (# ! each (|>> (//.char 0) maybe.trusted)))] + to (|> regex_char^ (at ! each (|>> (//.char 0) maybe.trusted)))] (in (` ((~! <text>.range) (~ (code.nat from)) (~ (code.nat to))))))) (def: re_char^ @@ -296,7 +296,7 @@ [idx names (partial_list (list g!temp complex - (` .let) (` [(~ g!total) (# (~! //.monoid) (~' composite) (~ g!total) (~ g!temp))])) + (` .let) (` [(~ g!total) (at (~! //.monoid) (~' composite) (~ g!total) (~ g!temp))])) steps)] {.#Right [{#Capturing [?name num_captures]} scoped]} @@ -312,7 +312,7 @@ [idx! (partial_list name! names) (partial_list (list name! scoped - (` .let) (` [(~ g!total) (# (~! //.monoid) (~' composite) (~ g!total) (~ access))])) + (` .let) (` [(~ g!total) (at (~! //.monoid) (~' composite) (~ g!total) (~ access))])) steps)]) ))) [0 @@ -330,7 +330,7 @@ (def: (unflatten^ lexer) (-> (Parser Text) (Parser [Text Any])) - (<>.and lexer (# <>.monad in []))) + (<>.and lexer (at <>.monad in []))) (def: (|||^ left right) (All (_ l r) (-> (Parser [Text l]) (Parser [Text r]) (Parser [Text (Or l r)]))) @@ -412,7 +412,7 @@ (def: (regex^ current_module) (-> Text (Parser Code)) - (# <>.monad each product.right (re_alternative^ #1 re_scoped^ current_module))) + (at <>.monad each product.right (re_alternative^ #1 re_scoped^ current_module))) (syntax: .public (regex [pattern <code>.text]) (do meta.monad diff --git a/stdlib/source/library/lux/data/text/unicode/block.lux b/stdlib/source/library/lux/data/text/unicode/block.lux index 45729b8ba..e016e68bb 100644 --- a/stdlib/source/library/lux/data/text/unicode/block.lux +++ b/stdlib/source/library/lux/data/text/unicode/block.lux @@ -29,10 +29,10 @@ right (representation right)] (abstraction (interval.between n.enum - (n.min (# left bottom) - (# right bottom)) - (n.max (# left top) - (# right top))))))) + (n.min (at left bottom) + (at right bottom)) + (n.max (at left top) + (at right top))))))) (def: .public (block start additional) (-> Char Nat Block) diff --git a/stdlib/source/library/lux/data/text/unicode/set.lux b/stdlib/source/library/lux/data/text/unicode/set.lux index 58730c36f..92f5d26c6 100644 --- a/stdlib/source/library/lux/data/text/unicode/set.lux +++ b/stdlib/source/library/lux/data/text/unicode/set.lux @@ -32,14 +32,14 @@ (def: .public (composite left right) (-> Set Set Set) (abstraction - (# builder branch - (representation left) - (representation right)))) + (at builder branch + (representation left) + (representation right)))) (def: (singleton block) (-> Block Set) (abstraction - (# builder leaf block []))) + (at builder leaf block []))) (def: .public (set [head tail]) (-> [Block (List Block)] Set) diff --git a/stdlib/source/library/lux/data/trace.lux b/stdlib/source/library/lux/data/trace.lux index 0e34b07b9..ada33d1da 100644 --- a/stdlib/source/library/lux/data/trace.lux +++ b/stdlib/source/library/lux/data/trace.lux @@ -34,8 +34,8 @@ [#monoid monoid #trace (function (_ t2) ((the #trace wa) - (# monoid composite t1 t2)))])]))) + (at monoid composite t1 t2)))])]))) (def: .public (result context tracer) (All (_ t a) (-> t (Trace t a) a)) - (# tracer trace context)) + (at tracer trace context)) diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux index 765cb6079..ca5cc1e67 100644 --- a/stdlib/source/library/lux/debug.lux +++ b/stdlib/source/library/lux/debug.lux @@ -550,9 +550,9 @@ (def: target (<code>.Parser Target) (<>.either (<>.and <code>.local - (# <>.monad in {.#None})) + (at <>.monad in {.#None})) (<code>.tuple (<>.and <code>.local - (# <>.monad each (|>> {.#Some}) <code>.any))))) + (at <>.monad each (|>> {.#Some}) <code>.any))))) (exception: .public (unknown_local_binding [name Text]) (exception.report diff --git a/stdlib/source/library/lux/documentation.lux b/stdlib/source/library/lux/documentation.lux index f71f812df..b4bdbecbe 100644 --- a/stdlib/source/library/lux/documentation.lux +++ b/stdlib/source/library/lux/documentation.lux @@ -638,9 +638,9 @@ (list#each product.left) ..expected_format)))) ..#definitions ((~! list.together) (list (~+ definitions)))] - (all (# (~! list.monoid) (~' composite)) + (all (at (~! list.monoid) (~' composite)) (is (List Module) - (# (~! list.monoid) (~' identity))) + (at (~! list.monoid) (~' identity))) (~+ subs))))))))) (def: listing diff --git a/stdlib/source/library/lux/extension.lux b/stdlib/source/library/lux/extension.lux index 4ad6c5592..0acba2133 100644 --- a/stdlib/source/library/lux/extension.lux +++ b/stdlib/source/library/lux/extension.lux @@ -49,7 +49,7 @@ ((~! monad.do) (~! <>.monad) [(~+ inputs) (~ g!_) <end>] - (.# (~! <>.monad) (~' in) (~ body))) + (.at (~! <>.monad) (~' in) (~ body))) (~ g!inputs)) {.#Right (~ g!_)} (~ g!_) diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 6f22bfb29..297b11715 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -328,32 +328,32 @@ (-> Primitive_Mode (Type Primitive) Code) (case mode {#ManualPrM} - (cond (# jvm.equivalence = jvm.boolean type) (` ..Boolean) - (# jvm.equivalence = jvm.byte type) (` ..Byte) - (# jvm.equivalence = jvm.short type) (` ..Short) - (# jvm.equivalence = jvm.int type) (` ..Integer) - (# jvm.equivalence = jvm.long type) (` ..Long) - (# jvm.equivalence = jvm.float type) (` ..Float) - (# jvm.equivalence = jvm.double type) (` ..Double) - (# jvm.equivalence = jvm.char type) (` ..Character) + (cond (at jvm.equivalence = jvm.boolean type) (` ..Boolean) + (at jvm.equivalence = jvm.byte type) (` ..Byte) + (at jvm.equivalence = jvm.short type) (` ..Short) + (at jvm.equivalence = jvm.int type) (` ..Integer) + (at jvm.equivalence = jvm.long type) (` ..Long) + (at jvm.equivalence = jvm.float type) (` ..Float) + (at jvm.equivalence = jvm.double type) (` ..Double) + (at jvm.equivalence = jvm.char type) (` ..Character) ... else (undefined)) {#AutoPrM} - (cond (# jvm.equivalence = jvm.boolean type) + (cond (at jvm.equivalence = jvm.boolean type) (` .Bit) - (or (# jvm.equivalence = jvm.short type) - (# jvm.equivalence = jvm.byte type) - (# jvm.equivalence = jvm.int type) - (# jvm.equivalence = jvm.long type)) + (or (at jvm.equivalence = jvm.short type) + (at jvm.equivalence = jvm.byte type) + (at jvm.equivalence = jvm.int type) + (at jvm.equivalence = jvm.long type)) (` .Int) - (or (# jvm.equivalence = jvm.float type) - (# jvm.equivalence = jvm.double type)) + (or (at jvm.equivalence = jvm.float type) + (at jvm.equivalence = jvm.double type)) (` .Frac) - (# jvm.equivalence = jvm.char type) + (at jvm.equivalence = jvm.char type) (` .Nat) ... else @@ -613,7 +613,7 @@ (|>> (<>.after (<code>.this (' <comparison>))) (<>.after ..wildcard^) <code>.tuple - (# <>.monad each <constructor>)))] + (at <>.monad each <constructor>)))] [upper^ < jvm.upper] [lower^ > jvm.lower] @@ -656,7 +656,7 @@ (def: array^ (-> (Parser (Type Value)) (Parser (Type Array))) (|>> <code>.tuple - (# <>.monad each jvm.array))) + (at <>.monad each jvm.array))) (def: (type^ type_vars) (-> (List (Type Var)) (Parser (Type Value))) @@ -681,7 +681,7 @@ (def: var^ (Parser (Type Var)) - (# <>.monad each jvm.var <code>.local)) + (at <>.monad each jvm.var <code>.local)) (def: vars^ (Parser (List (Type Var))) @@ -748,7 +748,7 @@ (all <>.or (<code>.this (' "volatile")) (<code>.this (' "final")) - (# <>.monad in []))) + (at <>.monad in []))) (def: (field_decl^ type_vars) (-> (List (Type Var)) (Parser [Member_Declaration FieldDecl])) @@ -1198,7 +1198,7 @@ (syntax: .public (class: [.let [! <>.monad] im inheritance_modifier^ - [full_class_name class_vars] (# ! each parser.declaration ..declaration^) + [full_class_name class_vars] (at ! each parser.declaration ..declaration^) super (<>.else $Object (class^ class_vars)) interfaces (<>.else (list) @@ -1222,7 +1222,7 @@ [(~+ (list#each (method_def$ fully_qualified_class_name method_parser super fields) methods))])))))) (syntax: .public (interface: [.let [! <>.monad] - [full_class_name class_vars] (# ! each parser.declaration ..declaration^) + [full_class_name class_vars] (at ! each parser.declaration ..declaration^) supers (<>.else (list) (<code>.tuple (<>.some (class^ class_vars)))) annotations ..annotations^ @@ -1355,7 +1355,7 @@ (in [arg_inputs input_jvm_types arg_types]))) _ - (# meta.monad in [(list) (list) (list)]))) + (at meta.monad in [(list) (list) (list)]))) (def: (with_return_maybe member never_null? unboxed return_term) (-> Import_Member_Declaration Bit (Type Value) Code Code) @@ -1406,7 +1406,7 @@ {#AutoPrM} (with_expansions [<special+>' (template.spliced <special+>) <cond_cases> (template [<primitive> <pre> <post>] - [(# jvm.equivalence = <primitive> unboxed) + [(at jvm.equivalence = <primitive> unboxed) (with_expansions [<post>' (template.spliced <post>)] [<primitive> (` (.|> (~ raw) (~+ <pre>))) @@ -1652,9 +1652,9 @@ (let [[class_name _] (parser.declaration declaration)] (case (load_class class_name) {.#Right class} - (# meta.monad in (if (interface? class) - {#Interface} - {#Class})) + (at meta.monad in (if (interface? class) + {#Interface} + {#Class})) {.#Left _} (meta.failure (format "Unknown class: " class_name))))) @@ -1678,7 +1678,7 @@ "jvm object cast" "jvm conversion long-to-int"))] (`` (cond (~~ (template [<primitive> <array_op>] - [(# jvm.equivalence = <primitive> type) + [(at jvm.equivalence = <primitive> type) (in (list (` (<array_op> (~ g!size)))))] [jvm.boolean "jvm array new boolean"] @@ -1702,14 +1702,14 @@ (def: (lux_type->jvm_type context type) (-> Type_Context .Type (Meta (Type Value))) (if (type#= .Any type) - (# meta.monad in $Object) + (at meta.monad in $Object) (case type {.#Primitive name params} (`` (cond (~~ (template [<type>] [(text#= (..reflection <type>) name) (case params {.#End} - (# meta.monad in <type>) + (at meta.monad in <type>) _ <failure>)] @@ -1727,7 +1727,7 @@ [(text#= (..reflection (jvm.array <type>)) name) (case params {.#End} - (# meta.monad in (jvm.array <type>)) + (at meta.monad in (jvm.array <type>)) _ <failure>)] @@ -1744,8 +1744,8 @@ (text#= array.type_name name) (case params {.#Item {.#Apply writeLT {.#Apply readLT _Mutable}} {.#End}} - (# meta.monad each jvm.array - (lux_type->jvm_type context readLT)) + (at meta.monad each jvm.array + (lux_type->jvm_type context readLT)) _ <failure>) @@ -1754,26 +1754,26 @@ (case params {.#End} (let [[_ unprefixed] (maybe.trusted (text.split_by descriptor.array_prefix name))] - (# meta.monad each jvm.array - (lux_type->jvm_type context {.#Primitive unprefixed (list)}))) + (at meta.monad each jvm.array + (lux_type->jvm_type context {.#Primitive unprefixed (list)}))) _ <failure>) ... else - (# meta.monad each (jvm.class name) - (.is (Meta (List (Type Parameter))) - (monad.each meta.monad - (function (_ paramLT) - (do meta.monad - [paramJT (lux_type->jvm_type context paramLT)] - (case (parser.parameter? paramJT) - {.#Some paramJT} - (in paramJT) - - {.#None} - <failure>))) - params))))) + (at meta.monad each (jvm.class name) + (.is (Meta (List (Type Parameter))) + (monad.each meta.monad + (function (_ paramLT) + (do meta.monad + [paramJT (lux_type->jvm_type context paramLT)] + (case (parser.parameter? paramJT) + {.#Some paramJT} + (in paramJT) + + {.#None} + <failure>))) + params))))) {.#Apply A F} (case (type.applied (list A) F) @@ -1805,9 +1805,9 @@ context meta.type_context array_jvm_type (lux_type->jvm_type context array_type) .let [g!extension (code.text (`` (cond (~~ (template [<primitive> <extension>] - [(# jvm.equivalence = - (jvm.array <primitive>) - array_jvm_type) + [(at jvm.equivalence = + (jvm.array <primitive>) + array_jvm_type) <extension>] [jvm.boolean "jvm array length boolean"] @@ -1846,9 +1846,9 @@ "jvm object cast" "jvm conversion long-to-int"))]] (`` (cond (~~ (template [<primitive> <extension> <box>] - [(# jvm.equivalence = - (jvm.array <primitive>) - array_jvm_type) + [(at jvm.equivalence = + (jvm.array <primitive>) + array_jvm_type) (in (list (` (.|> (<extension> (~ g!idx) (~ array)) "jvm object cast" (.is (.Primitive (~ (code.text <box>))))))))] @@ -1885,9 +1885,9 @@ "jvm object cast" "jvm conversion long-to-int"))]] (`` (cond (~~ (template [<primitive> <extension> <box>] - [(# jvm.equivalence = - (jvm.array <primitive>) - array_jvm_type) + [(at jvm.equivalence = + (jvm.array <primitive>) + array_jvm_type) (let [g!value (` (.|> (~ value) (.as (.Primitive (~ (code.text <box>)))) "jvm object cast"))] diff --git a/stdlib/source/library/lux/ffi.lux b/stdlib/source/library/lux/ffi.lux index 2ad70d784..709ba8592 100644 --- a/stdlib/source/library/lux/ffi.lux +++ b/stdlib/source/library/lux/ffi.lux @@ -191,10 +191,10 @@ (Parser (Member a)))) (do [! <>.monad] [static? (<>.parses? ..static!)] - (# ! each - (|>> [#static? static? - #member]) - it))) + (at ! each + (|>> [#static? static? + #member]) + it))) (type: Field (Member (Named Output))) @@ -472,15 +472,15 @@ code.local) :field: (the #anonymous it)] (` ((~! syntax:) ((~ g!it) []) - (.# (~! meta.monad) (~' in) - (.list (`' (.exec - (~+ import!) - (.as (~ (..output_type :field:)) - (~ (<| (lux_optional :field:) - (for @.js (` (<constant> (~ (code.text (%.format (..host_path class_name) "." field))))) - @.ruby (` (<constant> (~ (code.text (%.format (..host_path class_name) "::" field))))) - (` (<get> (~ (code.text field)) - (~ (..imported class_name)))))))))))))))) + (.at (~! meta.monad) (~' in) + (.list (`' (.exec + (~+ import!) + (.as (~ (..output_type :field:)) + (~ (<| (lux_optional :field:) + (for @.js (` (<constant> (~ (code.text (%.format (..host_path class_name) "." field))))) + @.ruby (` (<constant> (~ (code.text (%.format (..host_path class_name) "::" field))))) + (` (<get> (~ (code.text field)) + (~ (..imported class_name)))))))))))))))) (def: (virtual_field_definition [class_name class_parameters] alias namespace it) (-> Declaration Alias Namespace (Named Output) Code) diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux index 596d588e2..486f1ade4 100644 --- a/stdlib/source/library/lux/ffi.old.lux +++ b/stdlib/source/library/lux/ffi.old.lux @@ -721,7 +721,7 @@ (all <>.or (<code>.this (' "volatile")) (<code>.this (' "final")) - (# <>.monad in []))) + (at <>.monad in []))) (def: (field_decl^ type_vars) (-> (List Type_Parameter) (Parser [Member_Declaration FieldDecl])) @@ -1362,7 +1362,7 @@ (in [arg_inputs arg_classes arg_types]))) _ - (# meta.monad in [(list) (list) (list)]))) + (at meta.monad in [(list) (list) (list)]))) (def: (decorate_return_maybe class member return_term) (-> Class_Declaration Import_Member_Declaration Code Code) @@ -1603,9 +1603,9 @@ (let [class_name (..safe class_name)] (case (..load_class class_name) {try.#Success class} - (# meta.monad in (if (interface? class) - {#Interface} - {#Class})) + (at meta.monad in (if (interface? class) + {#Interface} + {#Class})) {try.#Failure error} (meta.failure (format "Cannot load class: " class_name text.new_line @@ -1645,10 +1645,10 @@ (def: (type_class_name type) (-> Type (Meta Text)) (if (type#= Any type) - (# meta.monad in "java.lang.Object") + (at meta.monad in "java.lang.Object") (case type {.#Primitive name params} - (# meta.monad in name) + (at meta.monad in name) {.#Apply A F} (case (type.applied (list A) F) diff --git a/stdlib/source/library/lux/ffi.php.lux b/stdlib/source/library/lux/ffi.php.lux index 2f7350849..9efd76f66 100644 --- a/stdlib/source/library/lux/ffi.php.lux +++ b/stdlib/source/library/lux/ffi.php.lux @@ -256,9 +256,9 @@ {#Field [static? field alias fieldT]} (if static? (` ((~! syntax:) ((~ (qualify (maybe.else field alias))) []) - (# (~! meta.monad) (~' in) - (list (` (.as (~ (nullable_type fieldT)) - ("php constant" (~ (code.text (%.format class "::" field)))))))))) + (at (~! meta.monad) (~' in) + (list (` (.as (~ (nullable_type fieldT)) + ("php constant" (~ (code.text (%.format class "::" field)))))))))) (` (def: ((~ (qualify field)) (~ g!object)) (-> (~ g!type) @@ -313,6 +313,6 @@ {#Constant [_ name alias fieldT]} (let [imported (` ("php constant" (~ (code.text name))))] (in (list (` ((~! syntax:) ((~ (code.local (maybe.else name alias))) []) - (# (~! meta.monad) (~' in) - (list (` (.as (~ (nullable_type fieldT)) (~ imported)))))))))) + (at (~! meta.monad) (~' in) + (list (` (.as (~ (nullable_type fieldT)) (~ imported)))))))))) ))) diff --git a/stdlib/source/library/lux/ffi.scm.lux b/stdlib/source/library/lux/ffi.scm.lux index 6903adb4c..c913bb20a 100644 --- a/stdlib/source/library/lux/ffi.scm.lux +++ b/stdlib/source/library/lux/ffi.scm.lux @@ -217,6 +217,6 @@ {#Constant [_ name alias fieldT]} (let [imported (` ("scheme constant" (~ (code.text name))))] (in (list (` ((~! syntax:) ((~ (code.local (maybe.else name alias)))) - (# (~! meta.monad) (~' in) - (list (` (.as (~ (nilable_type fieldT)) (~ imported)))))))))) + (at (~! meta.monad) (~' in) + (list (` (.as (~ (nilable_type fieldT)) (~ imported)))))))))) ))) diff --git a/stdlib/source/library/lux/ffi/export.js.lux b/stdlib/source/library/lux/ffi/export.js.lux index ac23e6b6b..9cf794d8e 100644 --- a/stdlib/source/library/lux/ffi/export.js.lux +++ b/stdlib/source/library/lux/ffi/export.js.lux @@ -89,8 +89,8 @@ (let [! meta.monad] (|> exports (monad.each ! macro.expansion) - (# ! each (|>> list#conjoint - (monad.each ! ..definition))) - (# ! conjoint) - (# ! each (list#each (function (_ [name term]) - (` (<extension> (~ (code.text name)) (~ term)))))))))) + (at ! each (|>> list#conjoint + (monad.each ! ..definition))) + (at ! conjoint) + (at ! each (list#each (function (_ [name term]) + (` (<extension> (~ (code.text name)) (~ term)))))))))) diff --git a/stdlib/source/library/lux/ffi/export.lua.lux b/stdlib/source/library/lux/ffi/export.lua.lux index adcb632ab..60f5d24d3 100644 --- a/stdlib/source/library/lux/ffi/export.lua.lux +++ b/stdlib/source/library/lux/ffi/export.lua.lux @@ -105,8 +105,8 @@ (let [! meta.monad] (|> exports (monad.each ! macro.expansion) - (# ! each (|>> list#conjoint - (monad.each ! ..definition))) - (# ! conjoint) - (# ! each (list#each (function (_ [name term]) - (` (<extension> (~ (code.text name)) (~ term)))))))))) + (at ! each (|>> list#conjoint + (monad.each ! ..definition))) + (at ! conjoint) + (at ! each (list#each (function (_ [name term]) + (` (<extension> (~ (code.text name)) (~ term)))))))))) diff --git a/stdlib/source/library/lux/ffi/export.py.lux b/stdlib/source/library/lux/ffi/export.py.lux index b9abc8a7a..40a5be6b7 100644 --- a/stdlib/source/library/lux/ffi/export.py.lux +++ b/stdlib/source/library/lux/ffi/export.py.lux @@ -82,8 +82,8 @@ (let [! meta.monad] (|> exports (monad.each ! macro.expansion) - (# ! each (|>> list#conjoint - (monad.each ! ..definition))) - (# ! conjoint) - (# ! each (list#each (function (_ [name term]) - (` (<extension> (~ (code.text name)) (~ term)))))))))) + (at ! each (|>> list#conjoint + (monad.each ! ..definition))) + (at ! conjoint) + (at ! each (list#each (function (_ [name term]) + (` (<extension> (~ (code.text name)) (~ term)))))))))) diff --git a/stdlib/source/library/lux/ffi/export.rb.lux b/stdlib/source/library/lux/ffi/export.rb.lux index b23a85dc7..16dd315a9 100644 --- a/stdlib/source/library/lux/ffi/export.rb.lux +++ b/stdlib/source/library/lux/ffi/export.rb.lux @@ -131,14 +131,14 @@ (let [! meta.monad] (|> exports (monad.each ! macro.expansion) - (# ! each (|>> list#conjoint - (monad.each ! ..definition))) - (# ! conjoint) - (# ! each (list#each (function (_ [name term]) - (` (<extension> (~+ (case name - {#Method name} - (list (code.bit #0) (code.text name)) - - {#Global name} - (list (code.bit #1) (code.text name)))) - (~ term)))))))))) + (at ! each (|>> list#conjoint + (monad.each ! ..definition))) + (at ! conjoint) + (at ! each (list#each (function (_ [name term]) + (` (<extension> (~+ (case name + {#Method name} + (list (code.bit #0) (code.text name)) + + {#Global name} + (list (code.bit #1) (code.text name)))) + (~ term)))))))))) diff --git a/stdlib/source/library/lux/locale.lux b/stdlib/source/library/lux/locale.lux index 0d5117c48..3805cbc74 100644 --- a/stdlib/source/library/lux/locale.lux +++ b/stdlib/source/library/lux/locale.lux @@ -38,9 +38,9 @@ (def: .public hash (Hash Locale) - (# hash.functor each ..code text.hash)) + (at hash.functor each ..code text.hash)) (def: .public equivalence (Equivalence Locale) - (# ..hash equivalence)) + (at ..hash equivalence)) ) diff --git a/stdlib/source/library/lux/locale/language.lux b/stdlib/source/library/lux/locale/language.lux index 8484972e2..cfc25fe7d 100644 --- a/stdlib/source/library/lux/locale/language.lux +++ b/stdlib/source/library/lux/locale/language.lux @@ -570,5 +570,5 @@ (def: hash (|>> ..code - (# text.hash hash)))) + (at text.hash hash)))) ) diff --git a/stdlib/source/library/lux/locale/territory.lux b/stdlib/source/library/lux/locale/territory.lux index 1e9058a59..06e1d3b4a 100644 --- a/stdlib/source/library/lux/locale/territory.lux +++ b/stdlib/source/library/lux/locale/territory.lux @@ -309,5 +309,5 @@ (def: hash (|>> representation (the #long) - (# text.hash hash)))) + (at text.hash hash)))) ) diff --git a/stdlib/source/library/lux/macro.lux b/stdlib/source/library/lux/macro.lux index e455b55f4..4df6e733d 100644 --- a/stdlib/source/library/lux/macro.lux +++ b/stdlib/source/library/lux/macro.lux @@ -29,10 +29,10 @@ ((as Macro' macro) args) {.#None} - (# //.monad in (list syntax)))) + (at //.monad in (list syntax)))) _ - (# //.monad in (list syntax)))) + (at //.monad in (list syntax)))) (def: .public (expansion syntax) (-> Code (Meta (List Code))) @@ -46,13 +46,13 @@ [top_level_expansion ((as Macro' macro) args)] (|> top_level_expansion (monad.each //.monad expansion) - (# ! each list#conjoint))) + (at ! each list#conjoint))) {.#None} - (# //.monad in (list syntax)))) + (at //.monad in (list syntax)))) _ - (# //.monad in (list syntax)))) + (at //.monad in (list syntax)))) (def: .public (full_expansion syntax) (-> Code (Meta (List Code))) @@ -89,14 +89,14 @@ (in (list (code.tuple (list#conjoint members'))))) _ - (# //.monad in (list syntax)))) + (at //.monad in (list syntax)))) (def: .public (symbol prefix) (-> Text (Meta Code)) (do //.monad [id //.seed] (in (|> id - (# nat.decimal encoded) + (at nat.decimal encoded) (all text#composite "__gensym__" prefix) [""] code.symbol)))) @@ -104,7 +104,7 @@ (-> Code (Meta Text)) (case ast [_ {.#Symbol [_ name]}] - (# //.monad in name) + (at //.monad in name) _ (//.failure (text#composite "Code is not a local symbol: " (code.format ast))))) @@ -184,13 +184,13 @@ before terms]) (case times 0 - (# //.monad in before) + (at //.monad in before) _ (do [! //.monad] [after (|> before (monad.each ! ..single_expansion) - (# ! each list#conjoint))] + (at ! each list#conjoint))] (again (-- times) after)))) _ @@ -198,4 +198,6 @@ (macro: .public (final it) (let [! //.monad] - (# ! each list#conjoint (monad.each ! ..expansion it)))) + (|> it + (monad.each ! ..expansion) + (at ! each list#conjoint)))) diff --git a/stdlib/source/library/lux/macro/code.lux b/stdlib/source/library/lux/macro/code.lux index 74cab5a40..6dc56c320 100644 --- a/stdlib/source/library/lux/macro/code.lux +++ b/stdlib/source/library/lux/macro/code.lux @@ -67,7 +67,7 @@ (case [x y] (^.template [<tag> <eq>] [[[_ {<tag> x'}] [_ {<tag> y'}]] - (# <eq> = x' y')]) + (at <eq> = x' y')]) ([.#Bit bit.equivalence] [.#Nat nat.equivalence] [.#Int int.equivalence] @@ -78,7 +78,7 @@ (^.template [<tag>] [[[_ {<tag> xs'}] [_ {<tag> ys'}]] - (# (list.equivalence =) = xs' ys')]) + (at (list.equivalence =) = xs' ys')]) ([.#Form] [.#Variant] [.#Tuple]) @@ -91,7 +91,7 @@ (case ast (^.template [<tag> <struct>] [[_ {<tag> value}] - (# <struct> encoded value)]) + (at <struct> encoded value)]) ([.#Bit bit.codec] [.#Nat nat.decimal] [.#Int int.decimal] @@ -121,7 +121,7 @@ (def: .public (replaced original substitute ast) (-> Code Code Code Code) - (if (# ..equivalence = original ast) + (if (at ..equivalence = original ast) substitute (case ast (^.template [<tag>] diff --git a/stdlib/source/library/lux/macro/template.lux b/stdlib/source/library/lux/macro/template.lux index 6f4124596..a7046844d 100644 --- a/stdlib/source/library/lux/macro/template.lux +++ b/stdlib/source/library/lux/macro/template.lux @@ -126,8 +126,8 @@ (exception: .public (irregular_arguments [expected Nat actual Nat]) (exception.report - "Expected" (# nat.decimal encoded expected) - "Actual" (# nat.decimal encoded actual))) + "Expected" (at nat.decimal encoded expected) + "Actual" (at nat.decimal encoded actual))) (def: (macro (open "_[0]")) (-> Local Macro) diff --git a/stdlib/source/library/lux/math/number.lux b/stdlib/source/library/lux/math/number.lux index ac4452b82..e3dfe5a3b 100644 --- a/stdlib/source/library/lux/math/number.lux +++ b/stdlib/source/library/lux/math/number.lux @@ -38,22 +38,22 @@ (if (..separator_prefixed? repr') {try.#Failure <error>} (let [repr (..without_separators repr')] - (case (# <nat> decoded repr) + (case (at <nat> decoded repr) {try.#Success value} {try.#Success [state (list [meta {.#Nat value}])]} (^.multi {try.#Failure _} - [(# <int> decoded repr) + [(at <int> decoded repr) {try.#Success value}]) {try.#Success [state (list [meta {.#Int value}])]} (^.multi {try.#Failure _} - [(# <rev> decoded repr) + [(at <rev> decoded repr) {try.#Success value}]) {try.#Success [state (list [meta {.#Rev value}])]} (^.multi {try.#Failure _} - [(# <frac> decoded repr) + [(at <frac> decoded repr) {try.#Success value}]) {try.#Success [state (list [meta {.#Frac value}])]} diff --git a/stdlib/source/library/lux/math/number/frac.lux b/stdlib/source/library/lux/math/number/frac.lux index 34fe47d52..aa58c684f 100644 --- a/stdlib/source/library/lux/math/number/frac.lux +++ b/stdlib/source/library/lux/math/number/frac.lux @@ -633,7 +633,7 @@ (template [<cast> <hex> <name>] [(def: <name> (|> <hex> - (# //nat.hex decoded) + (at //nat.hex decoded) try.trusted <cast>))] @@ -763,7 +763,7 @@ after_length (//nat.- after_offset ("lux text size" representation))] exponent (|> representation ("lux text clip" after_offset after_length) - (# codec decoded))] + (at codec decoded))] (in [("lux text clip" 0 split_index representation) (//int.* <factor> (.int exponent))]))]) ([+1 (^.or [{.#Some split_index} {.#None} {.#None} {.#None}] @@ -788,9 +788,9 @@ 1 "-" 0 "+" _ (undefined)) - (# <nat> encoded (.nat mantissa)) + (at <nat> encoded (.nat mantissa)) ".0E" - (# <int> encoded exponent)))) + (at <int> encoded exponent)))) (def: (decoded representation) (let [negative? (text.starts_with? "-" representation) @@ -805,16 +805,16 @@ after_length (//nat.- after_offset ("lux text size" mantissa))] decimal (|> mantissa ("lux text clip" after_offset after_length) - (# <nat> decoded))] + (at <nat> decoded))] (in [("lux text clip" 0 split_index mantissa) decimal])) {.#None} {try.#Failure ("lux text concat" <error> representation)}) .let [whole ("lux text clip" 1 (-- ("lux text size" whole)) whole)] - mantissa (# <nat> decoded (case decimal - 0 whole - _ ("lux text concat" whole (# <nat> encoded decimal)))) + mantissa (at <nat> decoded (case decimal + 0 whole + _ ("lux text concat" whole (at <nat> encoded decimal)))) .let [sign (if negative? 1 0)]] (in (..of_bits (all //i64.or diff --git a/stdlib/source/library/lux/math/number/i16.lux b/stdlib/source/library/lux/math/number/i16.lux index 84aa58ca0..50f4290d8 100644 --- a/stdlib/source/library/lux/math/number/i16.lux +++ b/stdlib/source/library/lux/math/number/i16.lux @@ -28,7 +28,7 @@ ... (I64 size)) ) -(def: .public equivalence (Equivalence I16) (# ..sub sub_equivalence)) -(def: .public width Nat (# ..sub bits)) -(def: .public i16 (-> I64 I16) (# ..sub narrow)) -(def: .public i64 (-> I16 I64) (# ..sub wide)) +(def: .public equivalence (Equivalence I16) (at ..sub sub_equivalence)) +(def: .public width Nat (at ..sub bits)) +(def: .public i16 (-> I64 I16) (at ..sub narrow)) +(def: .public i64 (-> I16 I64) (at ..sub wide)) diff --git a/stdlib/source/library/lux/math/number/i32.lux b/stdlib/source/library/lux/math/number/i32.lux index a54857230..11c2dc77a 100644 --- a/stdlib/source/library/lux/math/number/i32.lux +++ b/stdlib/source/library/lux/math/number/i32.lux @@ -30,7 +30,7 @@ ... (I64 size)) ) -(def: .public equivalence (Equivalence I32) (# ..sub sub_equivalence)) -(def: .public width Nat (# ..sub bits)) -(def: .public i32 (-> I64 I32) (# ..sub narrow)) -(def: .public i64 (-> I32 I64) (# ..sub wide)) +(def: .public equivalence (Equivalence I32) (at ..sub sub_equivalence)) +(def: .public width Nat (at ..sub bits)) +(def: .public i32 (-> I64 I32) (at ..sub narrow)) +(def: .public i64 (-> I32 I64) (at ..sub wide)) diff --git a/stdlib/source/library/lux/math/number/i64.lux b/stdlib/source/library/lux/math/number/i64.lux index eadb6d5d0..36a50c5fe 100644 --- a/stdlib/source/library/lux/math/number/i64.lux +++ b/stdlib/source/library/lux/math/number/i64.lux @@ -159,7 +159,7 @@ (repetitions size "1") (repetitions size "0"))) - high (try.trusted (# n.binary decoded pattern)) + high (try.trusted (at n.binary decoded pattern)) low (..right_rotated size high)] (function (_ value) (..or (..right_shifted size (..and high value)) diff --git a/stdlib/source/library/lux/math/number/i8.lux b/stdlib/source/library/lux/math/number/i8.lux index 9959bae6d..2467318e0 100644 --- a/stdlib/source/library/lux/math/number/i8.lux +++ b/stdlib/source/library/lux/math/number/i8.lux @@ -28,7 +28,7 @@ ... (I64 size)) ) -(def: .public equivalence (Equivalence I8) (# ..sub sub_equivalence)) -(def: .public width Nat (# ..sub bits)) -(def: .public i8 (-> I64 I8) (# ..sub narrow)) -(def: .public i64 (-> I8 I64) (# ..sub wide)) +(def: .public equivalence (Equivalence I8) (at ..sub sub_equivalence)) +(def: .public width Nat (at ..sub bits)) +(def: .public i8 (-> I64 I8) (at ..sub narrow)) +(def: .public i64 (-> I8 I64) (at ..sub wide)) diff --git a/stdlib/source/library/lux/math/number/int.lux b/stdlib/source/library/lux/math/number/int.lux index 7a3e0a8a8..f4953d6b0 100644 --- a/stdlib/source/library/lux/math/number/int.lux +++ b/stdlib/source/library/lux/math/number/int.lux @@ -199,8 +199,8 @@ [addition ..+ +0] [multiplication ..* +1] - [maximum ..max (# ..interval bottom)] - [minimum ..min (# ..interval top)] + [maximum ..max (at ..interval bottom)] + [minimum ..min (at ..interval top)] ) (def: -sign "-") @@ -212,8 +212,8 @@ (def: (encoded value) (if (..< +0 value) - (|> value ++ ..opposite .nat ++ (# <codec> encoded) ("lux text concat" ..-sign)) - (|> value .nat (# <codec> encoded) ("lux text concat" ..+sign)))) + (|> value ++ ..opposite .nat ++ (at <codec> encoded) ("lux text concat" ..-sign)) + (|> value .nat (at <codec> encoded) ("lux text concat" ..+sign)))) (def: (decoded repr) (let [input_size ("lux text size" repr)] @@ -222,14 +222,14 @@ (pattern (static ..+sign)) (|> repr ("lux text clip" 1 (-- input_size)) - (# <codec> decoded) - (# try.functor each (|>> .int))) + (at <codec> decoded) + (at try.functor each (|>> .int))) (pattern (static ..-sign)) (|> repr ("lux text clip" 1 (-- input_size)) - (# <codec> decoded) - (# try.functor each (|>> -- .int ..opposite --))) + (at <codec> decoded) + (at try.functor each (|>> -- .int ..opposite --))) _ {try.#Failure <error>}) diff --git a/stdlib/source/library/lux/math/number/nat.lux b/stdlib/source/library/lux/math/number/nat.lux index 4034ea783..0e5d5f6d4 100644 --- a/stdlib/source/library/lux/math/number/nat.lux +++ b/stdlib/source/library/lux/math/number/nat.lux @@ -176,8 +176,8 @@ [addition ..+ 0] [multiplication ..* 1] - [minimum ..min (# ..interval top)] - [maximum ..max (# ..interval bottom)] + [minimum ..min (at ..interval top)] + [maximum ..max (at ..interval bottom)] ) (def: (binary_character value) diff --git a/stdlib/source/library/lux/math/number/rev.lux b/stdlib/source/library/lux/math/number/rev.lux index f8f24b3e5..d919af0b4 100644 --- a/stdlib/source/library/lux/math/number/rev.lux +++ b/stdlib/source/library/lux/math/number/rev.lux @@ -210,7 +210,7 @@ [(implementation: .public <name> (Monoid Rev) - (def: identity (# interval <identity>)) + (def: identity (at interval <identity>)) (def: composite <composite>))] [addition ..+ bottom] @@ -228,7 +228,7 @@ (Codec Text Rev) (def: (encoded value) - (let [raw_output (# <codec> encoded (.nat value)) + (let [raw_output (at <codec> encoded (.nat value)) max_num_chars (//nat.+ (//nat./ <char_bit_size> //i64.width) (case (//nat.% <char_bit_size> //i64.width) 0 0 @@ -250,7 +250,7 @@ (if (//nat.> 1 repr_size) (case ("lux text char" 0 repr) (pattern (char ".")) - (case (# <codec> decoded (..decimals repr)) + (case (at <codec> decoded (..decimals repr)) {try.#Success output} {try.#Success (.rev output)} @@ -333,7 +333,7 @@ (again (-- idx) false ("lux text concat" - (# //nat.decimal encoded digit) + (at //nat.decimal encoded digit) output))))))) (def: (digits#+! param subject) diff --git a/stdlib/source/library/lux/math/random.lux b/stdlib/source/library/lux/math/random.lux index d60ba29bc..f22cc5647 100644 --- a/stdlib/source/library/lux/math/random.lux +++ b/stdlib/source/library/lux/math/random.lux @@ -126,7 +126,7 @@ (template [<name> <type> <cast>] [(def: .public <name> (Random <type>) - (# ..functor each (|>> <cast>) ..i64))] + (at ..functor each (|>> <cast>) ..i64))] [nat Nat .nat] [int Int .int] @@ -135,17 +135,17 @@ (def: .public frac (Random Frac) - (# ..functor each (|>> .i64 f.of_bits) ..nat)) + (at ..functor each (|>> .i64 f.of_bits) ..nat)) (def: .public safe_frac (Random Frac) (let [mantissa_range (.int (i64.left_shifted 53 1)) mantissa_max (i.frac (-- mantissa_range))] - (# ..functor each - (|>> (i.% mantissa_range) - i.frac - (f./ mantissa_max)) - ..int))) + (at ..functor each + (|>> (i.% mantissa_range) + i.frac + (f./ mantissa_max)) + ..int))) (def: .public (char set) (-> unicode.Set (Random Char)) @@ -155,13 +155,13 @@ in_range (is (-> Char Char) (|>> (n.% size) (n.+ start)))] (|> ..nat - (# ..functor each in_range) + (at ..functor each in_range) (..only (unicode.member? set))))) (def: .public (text char_gen size) (-> (Random Char) Nat (Random Text)) (if (n.= 0 size) - (# ..monad in "") + (at ..monad in "") (do ..monad [x char_gen xs (text char_gen (-- size))] @@ -241,7 +241,7 @@ [x value_gen xs (list (-- size) value_gen)] (in {.#Item x xs})) - (# ..monad in (.list)))) + (at ..monad in (.list)))) (def: .public (sequence size value_gen) (All (_ a) (-> Nat (Random a) (Random (Sequence a)))) @@ -250,7 +250,7 @@ [x value_gen xs (sequence (-- size) value_gen)] (in (sequence.suffix x xs))) - (# ..monad in sequence.empty))) + (at ..monad in sequence.empty))) (template [<name> <type> <ctor>] [(def: .public (<name> size value_gen) @@ -276,7 +276,7 @@ (if (n.= size (set.size xs+)) (in xs+) (again []))))) - (# ..monad in (set.empty hash)))) + (at ..monad in (set.empty hash)))) (def: .public (dictionary hash size key_gen value_gen) (All (_ k v) (-> (Hash k) Nat (Random k) (Random v) (Random (Dictionary k v)))) @@ -291,23 +291,23 @@ (if (n.= size (dictionary.size kv+)) (in kv+) (again []))))) - (# ..monad in (dictionary.empty hash)))) + (at ..monad in (dictionary.empty hash)))) (def: .public instant (Random Instant) - (# ..functor each instant.of_millis ..int)) + (at ..functor each instant.of_millis ..int)) (def: .public date (Random Date) - (# ..functor each instant.date ..instant)) + (at ..functor each instant.date ..instant)) (def: .public time (Random Time) - (# ..functor each instant.time ..instant)) + (at ..functor each instant.time ..instant)) (def: .public duration (Random Duration) - (# ..functor each duration.of_millis ..int)) + (at ..functor each duration.of_millis ..int)) (def: .public month (Random Month) diff --git a/stdlib/source/library/lux/meta.lux b/stdlib/source/library/lux/meta.lux index 7ceec5bcd..093f352e0 100644 --- a/stdlib/source/library/lux/meta.lux +++ b/stdlib/source/library/lux/meta.lux @@ -160,7 +160,7 @@ (in [module_name name])) _ - (# ..monad in name))) + (at ..monad in name))) (def: .public (macro full_name) (-> Symbol (Meta (Maybe Macro))) @@ -251,7 +251,7 @@ {try.#Success [lux type']})) _ - (# ..monad in type))) + (at ..monad in type))) (def: .public (var_type name) (-> Text (Meta Type)) @@ -437,9 +437,9 @@ {.#Definition [exported? def_type def_value]} (let [type_code (`` ("lux in-module" (~~ (static .prelude_module)) .type_code))] (if (or (same? .Type def_type) - (# code.equivalence = - (type_code .Type) - (type_code def_type))) + (at code.equivalence = + (type_code .Type) + (type_code def_type))) (in (as Type def_value)) (..failure (all text#composite "Definition is not a type: " (symbol#encoded name))))) @@ -464,24 +464,24 @@ (def: .public (definitions module) (-> Text (Meta (List [Text Definition]))) - (# ..monad each - (list.all (function (_ [name global]) - (case global - {.#Alias de_aliased} - {.#None} - - {.#Definition definition} - {.#Some [name definition]} + (at ..monad each + (list.all (function (_ [name global]) + (case global + {.#Alias de_aliased} + {.#None} + + {.#Definition definition} + {.#Some [name definition]} - {.#Type [exported? type labels]} - {.#Some [name [exported? .Type type]]} + {.#Type [exported? type labels]} + {.#Some [name [exported? .Type type]]} - {.#Tag _} - {.#None} + {.#Tag _} + {.#None} - {.#Slot _} - {.#None}))) - (..globals module))) + {.#Slot _} + {.#None}))) + (..globals module))) (def: .public (exports module_name) (-> Text (Meta (List [Text Definition]))) @@ -546,9 +546,9 @@ (def: .public (imported? import) (-> Text (Meta Bit)) - (# ..functor each - (|>> (the .#imports) (list.any? (text#= import))) - ..current_module)) + (at ..functor each + (|>> (the .#imports) (list.any? (text#= import))) + ..current_module)) (template [<name> <tag> <description>] [(def: .public (<name> label_name) @@ -644,7 +644,7 @@ (All (_ a) (-> (Try a) (Meta a))) (case result {try.#Success output} - (# ..monad in output) + (at ..monad in output) {try.#Failure error} (..failure error))) @@ -652,8 +652,8 @@ (def: .public (eval type code) (-> Type Code (Meta Any)) (do [! ..monad] - [eval (# ! each (the .#eval) - ..compiler_state)] + [eval (at ! each (the .#eval) + ..compiler_state)] (eval type code))) (def: .public (try computation) diff --git a/stdlib/source/library/lux/meta/symbol.lux b/stdlib/source/library/lux/meta/symbol.lux index b5819f76a..43d2277af 100644 --- a/stdlib/source/library/lux/meta/symbol.lux +++ b/stdlib/source/library/lux/meta/symbol.lux @@ -28,7 +28,7 @@ (def: .public equivalence (Equivalence Symbol) - (# ..hash equivalence)) + (at ..hash equivalence)) (implementation: .public order (Order Symbol) @@ -36,8 +36,8 @@ (def: equivalence ..equivalence) (def: (< [moduleP shortP] [moduleS shortS]) (if (text#= moduleP moduleS) - (# text.order < shortP shortS) - (# text.order < moduleP moduleS)))) + (at text.order < shortP shortS) + (at text.order < moduleP moduleS)))) (def: .public separator ".") diff --git a/stdlib/source/library/lux/static.lux b/stdlib/source/library/lux/static.lux index c9d94bd35..590776b04 100644 --- a/stdlib/source/library/lux/static.lux +++ b/stdlib/source/library/lux/static.lux @@ -19,9 +19,9 @@ (template [<name> <type> <format>] [(syntax: .public (<name> [expression <code>.any]) - (# meta.monad each - (|>> (as <type>) <format> list) - (meta.eval <type> expression)))] + (at meta.monad each + (|>> (as <type>) <format> list) + (meta.eval <type> expression)))] [bit .Bit code.bit] [nat .Nat code.nat] diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux index 708ba4abe..e1d894f56 100644 --- a/stdlib/source/library/lux/target/js.lux +++ b/stdlib/source/library/lux/target/js.lux @@ -1,6 +1,6 @@ (.using [library - [lux (.except Location Code Label or and function if undefined for comment not int try ++ -- the type_of) + [lux (.except Location Code Label or and function if undefined for comment not int try ++ -- the type_of at) [control ["[0]" pipe]] [data diff --git a/stdlib/source/library/lux/target/jvm/attribute.lux b/stdlib/source/library/lux/target/jvm/attribute.lux index 4819f19ea..2d356943d 100644 --- a/stdlib/source/library/lux/target/jvm/attribute.lux +++ b/stdlib/source/library/lux/target/jvm/attribute.lux @@ -135,7 +135,7 @@ (-> (Signature category) (Resource Attribute))) (do [! //pool.monad] [it (|> it //signature.signature //pool.utf8)] - (# ! each (signature' it) (//pool.utf8 "Signature")))) + (at ! each (signature' it) (//pool.utf8 "Signature")))) (def: .public (writer it) (Writer Attribute) diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux index 4963f5151..5eb093897 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode.lux @@ -105,7 +105,7 @@ (function (_ resolver) (<| (try|do [left_exceptions left_instruction] (left resolver)) (try|do [right_exceptions right_instruction] (right resolver)) - (try|in [(# sequence.monoid composite left_exceptions right_exceptions) + (try|in [(at sequence.monoid composite left_exceptions right_exceptions) (_#composite left_instruction right_instruction)]))))) (implementation: relative_monoid @@ -683,7 +683,7 @@ (-> Nat (Bytecode Register)) (case (//unsigned.u1 id) {try.#Success register} - (# ..monad in register) + (at ..monad in register) {try.#Failure error} (..except ..invalid_register [id]))) @@ -851,7 +851,7 @@ [(function (_ resolver) (<| (try|do [expected @to] (..resolve_label label resolver)) (try|do _ (exception.assertion ..mismatched_environments [(symbol <instruction>) label @here expected actual] - (# /stack.equivalence = expected actual))) + (at /stack.equivalence = expected actual))) (try|do jump (..jump @from @to)) (case jump {.#Left jump} @@ -900,7 +900,7 @@ (case (dictionary.value label resolver) {.#Some [expected {.#Some @to}]} (<| (try|do _ (exception.assertion ..mismatched_environments [(symbol <instruction>) label @here expected actual] - (# /stack.equivalence = expected actual))) + (at /stack.equivalence = expected actual))) (try|do jump (..jump @from @to)) (case jump {.#Left jump} @@ -959,7 +959,7 @@ (|> afterwards (monad.each ! get) (monad.then ! (monad.each ! product.right)) - (# ! each (|>> [@default @at_minimum])))) + (at ! each (|>> [@default @at_minimum])))) {.#Some [@default @at_minimum @afterwards]} (<| (try|do >default (try#each ..big_jump (..jump @from @default))) (try|do >at_minimum (try#each ..big_jump (..jump @from @at_minimum))) @@ -1000,7 +1000,7 @@ (|> cases (monad.each ! (|>> product.right get)) (monad.then ! (monad.each ! product.right)) - (# ! each (|>> [@default])))) + (at ! each (|>> [@default])))) {.#Some [@default @cases]} (<| (try|do >default (try#each ..big_jump (..jump @from @default))) (try|do >cases (|> @cases diff --git a/stdlib/source/library/lux/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/target/jvm/bytecode/address.lux index cf35e0da3..eac99cd2c 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/address.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/address.lux @@ -38,7 +38,7 @@ (-> U2 (-> Address (Try Address))) (|>> representation (///unsigned.+/2 distance) - (# try.functor each (|>> abstraction)))) + (at try.functor each (|>> abstraction)))) (def: with_sign (-> Address (Try S4)) @@ -60,9 +60,9 @@ (Equivalence Address) (def: (= reference subject) - (# ///unsigned.equivalence = - (representation reference) - (representation subject)))) + (at ///unsigned.equivalence = + (representation reference) + (representation subject)))) (def: .public writer (Writer Address) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux index 7b354ce1e..f2ff4b9f9 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux @@ -74,7 +74,7 @@ (-> Stack Environment (Try [Stack Environment])) (case (the ..#stack environment) {.#Some actual} - (if (# /stack.equivalence = expected actual) + (if (at /stack.equivalence = expected actual) {try.#Success [actual environment]} (exception.except ..mismatched_stacks [expected actual])) 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 b8ae7a3c3..336ab6035 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 @@ -60,9 +60,9 @@ (def: .public equivalence (Equivalence Registry) - (# equivalence.functor each - (|>> representation) - /////unsigned.equivalence)) + (at equivalence.functor each + (|>> representation) + /////unsigned.equivalence)) (def: .public writer (Writer Registry) diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux index 9de0d677b..3c8e419fb 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux @@ -31,9 +31,9 @@ (def: .public equivalence (Equivalence Stack) - (# equivalence.functor each - (|>> representation) - /////unsigned.equivalence)) + (at equivalence.functor each + (|>> representation) + /////unsigned.equivalence)) (def: .public writer (Writer Stack) @@ -48,7 +48,7 @@ (-> U2 (-> Stack (Try Stack))) (|>> representation (<op> amount) - (# try.functor each ..stack)))] + (at try.functor each ..stack)))] [/////unsigned.+/2 push] [/////unsigned.-/2 pop] diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux index 04756e267..028a60f47 100644 --- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux @@ -597,8 +597,8 @@ tableswitch_size (try.trusted (do [! try.monad] [size (///unsigned.u2 size)] - (# ! each (|>> estimator ///unsigned.value) - (//address.move size //address.start)))) + (at ! each (|>> estimator ///unsigned.value) + (//address.move size //address.start)))) tableswitch_mutation (is Mutation (function (_ [offset binary]) [(n.+ tableswitch_size offset) @@ -661,8 +661,8 @@ lookupswitch_size (try.trusted (do [! try.monad] [size (///unsigned.u2 size)] - (# ! each (|>> estimator ///unsigned.value) - (//address.move size //address.start)))) + (at ! each (|>> estimator ///unsigned.value) + (//address.move size //address.start)))) lookupswitch_mutation (is Mutation (function (_ [offset binary]) [(n.+ lookupswitch_size offset) diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux index 6c4531ed5..9c224c715 100644 --- a/stdlib/source/library/lux/target/jvm/class.lux +++ b/stdlib/source/library/lux/target/jvm/class.lux @@ -104,7 +104,7 @@ =methods (monad.all ! methods) @signature (case signature {.#Some signature} - (# ! each (|>> {.#Some}) (//attribute.signature signature)) + (at ! each (|>> {.#Some}) (//attribute.signature signature)) {.#None} (in {.#None}))] diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux index 98fb0ba60..0ce71dfb1 100644 --- a/stdlib/source/library/lux/target/jvm/constant.lux +++ b/stdlib/source/library/lux/target/jvm/constant.lux @@ -53,9 +53,9 @@ (def: .public class_equivalence (Equivalence Class) - (# equivalence.functor each - ..index - //index.equivalence)) + (at equivalence.functor each + ..index + //index.equivalence)) (def: class_writer (Writer Class) @@ -93,9 +93,9 @@ (All (_ kind) (-> (Equivalence kind) (Equivalence (Value kind)))) - (# equivalence.functor each - (|>> representation) - Equivalence<kind>)) + (at equivalence.functor each + (|>> representation) + Equivalence<kind>)) (template [<constructor> <type> <marker>] [(type: .public <type> @@ -186,7 +186,7 @@ (case [reference sample] (^.template [<tag> <equivalence>] [[{<tag> reference} {<tag> sample}] - (# <equivalence> = reference sample)]) + (at <equivalence> = reference sample)]) ([#UTF8 text.equivalence] [#Integer (..value_equivalence i32.equivalence)] [#Long (..value_equivalence int.equivalence)] diff --git a/stdlib/source/library/lux/target/jvm/constant/pool.lux b/stdlib/source/library/lux/target/jvm/constant/pool.lux index 2d6c1e4e5..129659e05 100644 --- a/stdlib/source/library/lux/target/jvm/constant/pool.lux +++ b/stdlib/source/library/lux/target/jvm/constant/pool.lux @@ -97,7 +97,7 @@ {try.#Success entry} (case entry [index {<tag> reference}] - (if (# <equivalence> = reference <value>') + (if (at <equivalence> = reference <value>') {try.#Success [[current pool] index]} <try_again>) @@ -112,7 +112,7 @@ (|> current //index.value (//unsigned.+/2 @new) - (# try.monad each //index.index)))) + (at try.monad each //index.index)))) (try|in [[next (sequence.suffix [current new] pool)] current]))))))]) diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux index 1b8407723..196bd76f2 100644 --- a/stdlib/source/library/lux/target/jvm/field.lux +++ b/stdlib/source/library/lux/target/jvm/field.lux @@ -67,7 +67,7 @@ [@name (//constant/pool.utf8 name) @descriptor (//constant/pool.descriptor (//type.descriptor type)) @signature (if with_signature? - (# ! each (|>> {.#Some}) (//attribute.signature (//type.signature type))) + (at ! each (|>> {.#Some}) (//attribute.signature (//type.signature type))) (in {.#None}))] (in [#modifier modifier #name @name diff --git a/stdlib/source/library/lux/target/jvm/index.lux b/stdlib/source/library/lux/target/jvm/index.lux index 9874c56aa..22f4645e3 100644 --- a/stdlib/source/library/lux/target/jvm/index.lux +++ b/stdlib/source/library/lux/target/jvm/index.lux @@ -28,9 +28,9 @@ (def: .public equivalence (All (_ kind) (Equivalence (Index kind))) - (# equivalence.functor each - ..value - //unsigned.equivalence)) + (at equivalence.functor each + ..value + //unsigned.equivalence)) (def: .public writer (All (_ kind) (Writer (Index kind))) diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux index bf2b73cdb..261ae04f6 100644 --- a/stdlib/source/library/lux/target/jvm/method.lux +++ b/stdlib/source/library/lux/target/jvm/method.lux @@ -60,7 +60,7 @@ (partial_list (//attribute.signature (//type.signature type)) attributes) attributes) (monad.all !) - (# ! each sequence.of_list)) + (at ! each sequence.of_list)) attributes (case code {.#Some code} (do ! diff --git a/stdlib/source/library/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/target/jvm/modifier.lux index c15029f4e..d1cb2807b 100644 --- a/stdlib/source/library/lux/target/jvm/modifier.lux +++ b/stdlib/source/library/lux/target/jvm/modifier.lux @@ -34,9 +34,9 @@ (All (_ of) (Equivalence (Modifier of))) (def: (= reference sample) - (# //unsigned.equivalence = - (representation reference) - (representation sample)))) + (at //unsigned.equivalence = + (representation reference) + (representation sample)))) (template: (!wrap value) [(|> value @@ -54,7 +54,7 @@ (let [sub (!unwrap sub)] (|> (!unwrap super) (i64.and sub) - (# i64.equivalence = sub)))) + (at i64.equivalence = sub)))) (implementation: .public monoid (All (_ of) (Monoid (Modifier of))) @@ -67,7 +67,7 @@ (def: .public empty Modifier - (# ..monoid identity)) + (at ..monoid identity)) (def: .public writer (All (_ of) (Writer (Modifier of))) diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux index 0941e09b1..4bc91291b 100644 --- a/stdlib/source/library/lux/target/jvm/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/reflection.lux @@ -161,9 +161,9 @@ java/lang/reflect/ParameterizedType::getActualTypeArguments (array.list {.#None}) (monad.each ! parameter) - (# ! each (/.class (|> raw' - (as (java/lang/Class java/lang/Object)) - java/lang/Class::getName))) + (at ! each (/.class (|> raw' + (as (java/lang/Class java/lang/Object)) + java/lang/Class::getName))) (exception.with ..cannot_convert_to_a_lux_type [reflection]))) _ @@ -194,7 +194,7 @@ {try.#Success /.wildcard} _ - (# try.monad each <kind> (parameter type bound)))]) + (at try.monad each <kind> (parameter type bound)))]) ([[_ {.#Some bound}] /.upper] [[{.#Some bound} _] /.lower]) @@ -206,7 +206,7 @@ (|> reflection java/lang/reflect/GenericArrayType::getGenericComponentType type - (# try.monad each /.array)) + (at try.monad each /.array)) _) (case (ffi.as java/lang/Class reflection) {.#Some class} @@ -376,8 +376,8 @@ <then?> (|> fieldJ java/lang/reflect/Field::getGenericType ..type - (# ! each (|>> [(java/lang/reflect/Modifier::isFinal modifiers) - (..deprecated? (java/lang/reflect/Field::getDeclaredAnnotations fieldJ))]))) + (at ! each (|>> [(java/lang/reflect/Modifier::isFinal modifiers) + (..deprecated? (java/lang/reflect/Field::getDeclaredAnnotations fieldJ))]))) <else?> (exception.except <exception> [field class]))))] [static_field ..not_a_static_field #1 #0] diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux index 21528b3a3..cdf8690e9 100644 --- a/stdlib/source/library/lux/target/jvm/type.lux +++ b/stdlib/source/library/lux/target/jvm/type.lux @@ -153,21 +153,21 @@ (All (_ category) (Equivalence (Type category))) (def: (= parameter subject) - (# /signature.equivalence = - (..signature parameter) - (..signature subject)))) + (at /signature.equivalence = + (..signature parameter) + (..signature subject)))) (implementation: .public hash (All (_ category) (Hash (Type category))) (def: equivalence ..equivalence) - (def: hash (|>> ..signature (# /signature.hash hash)))) + (def: hash (|>> ..signature (at /signature.hash hash)))) (def: .public (primitive? type) (-> (Type Value) (Either (Type Object) (Type Primitive))) (if (`` (or (~~ (template [<type>] - [(# ..equivalence = (is (Type Value) <type>) type)] + [(at ..equivalence = (is (Type Value) <type>) type)] [..boolean] [..byte] @@ -184,7 +184,7 @@ (-> (Type Return) (Either (Type Value) (Type Void))) (if (`` (or (~~ (template [<type>] - [(# ..equivalence = (is (Type Return) <type>) type)] + [(at ..equivalence = (is (Type Return) <type>) type)] [..void])))) (|> type (as (Type Void)) {.#Right}) @@ -203,7 +203,7 @@ (n.- suffix_size))] (|> repr (text.clip prefix_size name_size) - (# maybe.monad each (|>> //name.internal //name.external)))) + (at maybe.monad each (|>> //name.internal //name.external)))) {.#None}))) (def: .public format diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux index 7313b1e8b..26462ac28 100644 --- a/stdlib/source/library/lux/target/jvm/type/alias.lux +++ b/stdlib/source/library/lux/target/jvm/type/alias.lux @@ -56,7 +56,7 @@ [(def: <name> (-> (Parser (Type Class)) (Parser (Type Parameter))) (|>> (<>.after (<text>.this <prefix>)) - (# <>.monad each <bound>)))] + (at <>.monad each <bound>)))] [lower //signature.lower_prefix //.lower ..Lower] [upper //signature.upper_prefix //.upper ..Upper] @@ -112,7 +112,7 @@ (def: (bound_type_var aliasing) (-> Aliasing (Parser (Type Var))) (|> //parser.var_name - (# <>.monad each //.var) + (at <>.monad each //.var) (<>.before (<>.many (..bound aliasing))))) (def: .public (method aliasing) diff --git a/stdlib/source/library/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/target/jvm/type/descriptor.lux index 7ded981d8..ba72068a8 100644 --- a/stdlib/source/library/lux/target/jvm/type/descriptor.lux +++ b/stdlib/source/library/lux/target/jvm/type/descriptor.lux @@ -119,6 +119,6 @@ (|> (text.size repr) (n.- prefix_size) (n.- suffix_size))) - (# maybe.monad each ///name.internal) + (at maybe.monad each ///name.internal) maybe.trusted)))))) ) diff --git a/stdlib/source/library/lux/target/jvm/type/parser.lux b/stdlib/source/library/lux/target/jvm/type/parser.lux index a58a6d8d7..54be9b30b 100644 --- a/stdlib/source/library/lux/target/jvm/type/parser.lux +++ b/stdlib/source/library/lux/target/jvm/type/parser.lux @@ -68,9 +68,9 @@ (template [<type> <name> <head> <tail> <adapter>] [(def: .public <name> (Parser <type>) - (# <>.functor each <adapter> - (<text>.slice (<text>.and! (<text>.one_of! <head>) - (<text>.some! (<text>.one_of! <tail>))))))] + (at <>.functor each <adapter> + (<text>.slice (<text>.and! (<text>.one_of! <head>) + (<text>.some! (<text>.one_of! <tail>))))))] [External class_name class/set class/set (|>> //name.internal //name.external)] [Text var_name var/head var/tail function.identity] @@ -125,7 +125,7 @@ (def: class' (-> (Parser (Type Parameter)) (Parser (Type Class))) (|>> ..class'' - (# <>.monad each (product.uncurried //.class)))) + (at <>.monad each (product.uncurried //.class)))) (def: .public array' (-> (Parser (Type Value)) (Parser (Type Array))) diff --git a/stdlib/source/library/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/target/jvm/type/reflection.lux index 47c5d7d73..de9afb234 100644 --- a/stdlib/source/library/lux/target/jvm/type/reflection.lux +++ b/stdlib/source/library/lux/target/jvm/type/reflection.lux @@ -63,7 +63,7 @@ element' (~~ (template [<primitive> <descriptor>] - [(# ..equivalence = <primitive> element) + [(at ..equivalence = <primitive> element) (//descriptor.descriptor <descriptor>)] [..boolean //descriptor.boolean] diff --git a/stdlib/source/library/lux/target/lua.lux b/stdlib/source/library/lux/target/lua.lux index f334dbc83..9ececec5f 100644 --- a/stdlib/source/library/lux/target/lua.lux +++ b/stdlib/source/library/lux/target/lua.lux @@ -47,13 +47,13 @@ (All (_ brand) (Equivalence (Code brand))) (def: (= reference subject) - (# text.equivalence = (representation reference) (representation subject)))) + (at text.equivalence = (representation reference) (representation subject)))) (implementation: .public hash (All (_ brand) (Hash (Code brand))) (def: equivalence ..equivalence) - (def: hash (|>> representation (# text.hash hash)))) + (def: hash (|>> representation (at text.hash hash)))) (def: .public manual (-> Text Code) @@ -100,7 +100,7 @@ (-> Int Literal) ... Integers must be turned into hexadecimal to avoid quirks in how Lua parses integers. ... In particular, the number -9223372036854775808 will be incorrectly parsed as a float by Lua. - (.let [to_hex (# n.hex encoded)] + (.let [to_hex (at n.hex encoded)] (|>> .nat to_hex (format "0x") diff --git a/stdlib/source/library/lux/target/php.lux b/stdlib/source/library/lux/target/php.lux index 52f872a04..efb4674c4 100644 --- a/stdlib/source/library/lux/target/php.lux +++ b/stdlib/source/library/lux/target/php.lux @@ -55,13 +55,13 @@ (All (_ brand) (Equivalence (Code brand))) (def: (= reference subject) - (# text.equivalence = (representation reference) (representation subject)))) + (at text.equivalence = (representation reference) (representation subject)))) (implementation: .public hash (All (_ brand) (Hash (Code brand))) (def: equivalence ..equivalence) - (def: hash (|>> representation (# text.hash hash)))) + (def: hash (|>> representation (at text.hash hash)))) (def: .public manual (-> Text Code) @@ -141,7 +141,7 @@ (def: .public int (-> Int Literal) - (.let [to_hex (# n.hex encoded)] + (.let [to_hex (at n.hex encoded)] (|>> .nat to_hex (format "0x") diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux index ae5014d34..ba1007f07 100644 --- a/stdlib/source/library/lux/target/python.lux +++ b/stdlib/source/library/lux/target/python.lux @@ -64,13 +64,13 @@ (All (_ brand) (Equivalence (Code brand))) (def: (= reference subject) - (# text.equivalence = (representation reference) (representation subject)))) + (at text.equivalence = (representation reference) (representation subject)))) (implementation: .public hash (All (_ brand) (Hash (Code brand))) (def: equivalence ..equivalence) - (def: hash (|>> representation (# text.hash hash)))) + (def: hash (|>> representation (at text.hash hash)))) (def: .public manual (-> Text Code) diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux index 356906d27..e48a96d1b 100644 --- a/stdlib/source/library/lux/target/ruby.lux +++ b/stdlib/source/library/lux/target/ruby.lux @@ -47,7 +47,7 @@ (All (_ brand) (Equivalence (Code brand))) (def: (= reference subject) - (# text.equivalence = (representation reference) (representation subject)))) + (at text.equivalence = (representation reference) (representation subject)))) (def: .public manual (-> Text Code) diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux index e77a76d6d..09d717980 100644 --- a/stdlib/source/library/lux/target/scheme.lux +++ b/stdlib/source/library/lux/target/scheme.lux @@ -38,13 +38,13 @@ (All (_ brand) (Equivalence (Code brand))) (def: (= reference subject) - (# text.equivalence = (representation reference) (representation subject)))) + (at text.equivalence = (representation reference) (representation subject)))) (implementation: .public hash (All (_ brand) (Hash (Code brand))) (def: equivalence ..equivalence) - (def: hash (|>> representation (# text.hash hash)))) + (def: hash (|>> representation (at text.hash hash)))) (template [<type> <brand> <super>+] [(primitive: .public (<brand> brand) Any) diff --git a/stdlib/source/library/lux/test.lux b/stdlib/source/library/lux/test.lux index 71c7c1a53..a3ab5b1c0 100644 --- a/stdlib/source/library/lux/test.lux +++ b/stdlib/source/library/lux/test.lux @@ -101,7 +101,7 @@ (-> Test Test Test) (do [! random.monad] [left left] - (# ! each (..and' left) right))) + (at ! each (..and' left) right))) (def: (context' description) (-> Text Test Test) @@ -195,7 +195,7 @@ (the #actual_coverage tally)) report (is (-> (Set Symbol) Text) (|>> set.list - (list.sorted (# symbol.order <)) + (list.sorted (at symbol.order <)) (exception.listing %.symbol))) expected_definitions_to_cover (set.size (the #expected_coverage tally)) unexpected_definitions_covered (set.size unexpected) @@ -259,10 +259,10 @@ {.#Some console} (console.write_line report console)) <else>))] - (async.future (# program.default exit - (case (the #failures tally) - 0 ..success_exit_code - _ ..failure_exit_code))))) + (async.future (at program.default exit + (case (the #failures tally) + 0 ..success_exit_code + _ ..failure_exit_code))))) (def: definition_separator " & ") diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/time.lux index d0f07d610..8ccbec9dc 100644 --- a/stdlib/source/library/lux/time.lux +++ b/stdlib/source/library/lux/time.lux @@ -54,7 +54,7 @@ (<>.either (|> (<text>.at_most 3 <text>.decimal) (<>.codec n.decimal) (<>.after (<text>.this "."))) - (# <>.monad in 0))) + (at <>.monad in 0))) (template [<maximum> <parser> <exception> <sub_parser>] [(exception: .public (<exception> [value Nat]) diff --git a/stdlib/source/library/lux/time/date.lux b/stdlib/source/library/lux/time/date.lux index 3327f15e8..52ac839bd 100644 --- a/stdlib/source/library/lux/time/date.lux +++ b/stdlib/source/library/lux/time/date.lux @@ -56,7 +56,7 @@ "Value" (n#encoded day) "Minimum" (n#encoded ..minimum_day) "Maximum" (n#encoded (..month_days year month)) - "Year" (# //year.codec encoded year) + "Year" (at //year.codec encoded year) "Month" (n#encoded (//month.number month)))) (def: (padded value) @@ -108,12 +108,12 @@ (def: (= reference sample) (let [reference (representation reference) sample (representation sample)] - (and (# //year.equivalence = - (the #year reference) - (the #year sample)) - (# //month.equivalence = - (the #month reference) - (the #month sample)) + (and (at //year.equivalence = + (the #year reference) + (the #year sample)) + (at //month.equivalence = + (the #month reference) + (the #month sample)) (n.= (the #day reference) (the #day sample)))))) @@ -125,18 +125,18 @@ (def: (< reference sample) (let [reference (representation reference) sample (representation sample)] - (or (# //year.order < - (the #year reference) - (the #year sample)) - (and (# //year.equivalence = - (the #year reference) - (the #year sample)) - (or (# //month.order < - (the #month reference) - (the #month sample)) - (and (# //month.order = - (the #month reference) - (the #month sample)) + (or (at //year.order < + (the #year reference) + (the #year sample)) + (and (at //year.equivalence = + (the #year reference) + (the #year sample)) + (or (at //month.order < + (the #month reference) + (the #month sample)) + (and (at //month.order = + (the #month reference) + (the #month sample)) (n.< (the #day reference) (the #day sample))))))))) ) @@ -150,7 +150,7 @@ (<>.either (|> (<text>.at_most 3 <text>.decimal) (<>.codec n.decimal) (<>.after (<text>.this "."))) - (# <>.monad in 0))) + (at <>.monad in 0))) (template [<minimum> <maximum> <parser> <exception>] [(exception: .public (<exception> [value Nat]) @@ -185,7 +185,7 @@ (def: (format value) (-> Date Text) (all text#composite - (# //year.codec encoded (..year value)) + (at //year.codec encoded (..year value)) ..separator (..padded (|> value ..month //month.number)) ..separator (..padded (..day_of_month value)))) diff --git a/stdlib/source/library/lux/time/day.lux b/stdlib/source/library/lux/time/day.lux index a245c924b..38d71e7fd 100644 --- a/stdlib/source/library/lux/time/day.lux +++ b/stdlib/source/library/lux/time/day.lux @@ -152,11 +152,11 @@ (exception: .public (invalid_day [number Nat]) (exception.report - "Number" (# n.decimal encoded number) + "Number" (at n.decimal encoded number) "Valid range" (all "lux text concat" - (# n.decimal encoded (..number {#Sunday})) + (at n.decimal encoded (..number {#Sunday})) " ~ " - (# n.decimal encoded (..number {#Saturday}))))) + (at n.decimal encoded (..number {#Saturday}))))) (def: .public (by_number number) (-> Nat (Try Day)) diff --git a/stdlib/source/library/lux/time/duration.lux b/stdlib/source/library/lux/time/duration.lux index 75fcddefd..e2ba78067 100644 --- a/stdlib/source/library/lux/time/duration.lux +++ b/stdlib/source/library/lux/time/duration.lux @@ -126,7 +126,7 @@ ) (def: (encoded duration) - (if (# ..equivalence = ..empty duration) + (if (at ..equivalence = ..empty duration) (all text#composite ..positive_sign (nat#encoded 0) diff --git a/stdlib/source/library/lux/time/instant.lux b/stdlib/source/library/lux/time/instant.lux index 3a6071f59..1c6ea5458 100644 --- a/stdlib/source/library/lux/time/instant.lux +++ b/stdlib/source/library/lux/time/instant.lux @@ -61,14 +61,14 @@ (Equivalence Instant) (def: (= param subject) - (# i.equivalence = (representation param) (representation subject)))) + (at i.equivalence = (representation param) (representation subject)))) (implementation: .public order (Order Instant) (def: equivalence ..equivalence) (def: (< param subject) - (# i.order < (representation param) (representation subject)))) + (at i.order < (representation param) (representation subject)))) (`` (implementation: .public enum (Enum Instant) @@ -76,7 +76,7 @@ (def: order ..order) (~~ (template [<name>] [(def: <name> - (|>> representation (# i.enum <name>) abstraction))] + (|>> representation (at i.enum <name>) abstraction))] [succ] [pred] )))) @@ -111,7 +111,7 @@ (def: (clock_time duration) (-> Duration Time) - (|> (if (# duration.order < duration.empty duration) + (|> (if (at duration.order < duration.empty duration) (duration.composite duration.day duration) duration) duration.millis @@ -124,15 +124,15 @@ (let [[date time] (..date_time instant) time (..clock_time time)] (all text#composite - (# date.codec encoded date) ..date_suffix - (# //.codec encoded time) ..time_suffix))) + (at date.codec encoded date) ..date_suffix + (at //.codec encoded time) ..time_suffix))) (def: parser (Parser Instant) (do [! <>.monad] - [days (# ! each date.days date.parser) + [days (at ! each date.days date.parser) _ (<text>.this ..date_suffix) - time (# ! each //.millis //.parser) + time (at ! each //.millis //.parser) _ (<text>.this ..time_suffix)] (in (|> (if (i.< +0 days) (|> duration.day diff --git a/stdlib/source/library/lux/time/month.lux b/stdlib/source/library/lux/time/month.lux index 0b8d8b8a8..99d5ae4bc 100644 --- a/stdlib/source/library/lux/time/month.lux +++ b/stdlib/source/library/lux/time/month.lux @@ -80,11 +80,11 @@ (exception: .public (invalid_month [number Nat]) (exception.report - "Number" (# n.decimal encoded number) + "Number" (at n.decimal encoded number) "Valid range" (all "lux text concat" - (# n.decimal encoded (..number {#January})) + (at n.decimal encoded (..number {#January})) " ~ " - (# n.decimal encoded (..number {#December}))))) + (at n.decimal encoded (..number {#December}))))) (def: .public (by_number number) (-> Nat (Try Month)) diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux index 680a6a759..81653a205 100644 --- a/stdlib/source/library/lux/tool/compiler/default/platform.lux +++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux @@ -131,8 +131,8 @@ sequence.list (monad.each ..monad write_artifact!) (is (Action (List Any))))) - document (# async.monad in - (document.marked? key (the [archive.#module module.#document] entry)))] + document (at async.monad in + (document.marked? key (the [archive.#module module.#document] entry)))] (is (Async (Try Any)) (|> [(|> entry (the archive.#module) @@ -222,7 +222,7 @@ _ (extension.with extender (as_expected directives))] (in []))) (///phase.result' state) - (# try.monad each product.left))) + (at try.monad each product.left))) (def: (phase_wrapper archive platform state) (All (_ <type_vars>) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux.lux index b5feed723..754b9321f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux.lux @@ -96,7 +96,7 @@ ... #imports (<binary>.list <binary>.text) ... #module_state - (# <>.monad in {.#Cached})))) + (at <>.monad in {.#Cached})))) (def: .public key (Key .Module) 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 0c8e86526..7274cbe00 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux @@ -76,8 +76,8 @@ (-> (Equivalence Analysis) (Equivalence Branch)) (def: (= [reference_pattern reference_body] [sample_pattern sample_body]) - (and (# /pattern.equivalence = reference_pattern sample_pattern) - (# equivalence = reference_body sample_body)))) + (and (at /pattern.equivalence = reference_pattern sample_pattern) + (at equivalence = reference_body sample_body)))) (implementation: .public equivalence (Equivalence Analysis) @@ -85,23 +85,23 @@ (def: (= reference sample) (.case [reference sample] [{#Simple reference} {#Simple sample}] - (# /simple.equivalence = reference sample) + (at /simple.equivalence = reference sample) [{#Structure reference} {#Structure sample}] - (# (/complex.equivalence =) = reference sample) + (at (/complex.equivalence =) = reference sample) [{#Reference reference} {#Reference sample}] - (# reference.equivalence = reference sample) + (at reference.equivalence = reference sample) [{#Case [reference_analysis reference_match]} {#Case [sample_analysis sample_match]}] (and (= reference_analysis sample_analysis) - (# (list.equivalence (branch_equivalence =)) = {.#Item reference_match} {.#Item sample_match})) + (at (list.equivalence (branch_equivalence =)) = {.#Item reference_match} {.#Item sample_match})) [{#Function [reference_environment reference_analysis]} {#Function [sample_environment sample_analysis]}] (and (= reference_analysis sample_analysis) - (# (list.equivalence =) = reference_environment sample_environment)) + (at (list.equivalence =) = reference_environment sample_environment)) [{#Apply [reference_input reference_abstraction]} {#Apply [sample_input sample_abstraction]}] @@ -109,7 +109,7 @@ (= reference_abstraction sample_abstraction)) [{#Extension reference} {#Extension sample}] - (# (extension.equivalence =) = reference sample) + (at (extension.equivalence =) = reference sample) _ false))) @@ -308,7 +308,7 @@ (def: .public (assertion exception parameters condition) (All (_ e) (-> (Exception e) e Bit (Operation Any))) (if condition - (# phase.monad in []) + (at phase.monad in []) (..except exception parameters))) (def: .public (with_exception exception message action) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/complex.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/complex.lux index 65c8db0cb..8727b6852 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/complex.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/complex.lux @@ -61,7 +61,7 @@ (/#= reference_value sample_value)) [{#Tuple reference} {#Tuple sample}] - (# (list.equivalence /#=) = reference sample) + (at (list.equivalence /#=) = reference sample) _ false))) @@ -70,19 +70,19 @@ (All (_ a) (-> (Hash a) (Hash (Complex a)))) (def: equivalence - (..equivalence (# super equivalence))) + (..equivalence (at super equivalence))) (def: (hash value) (case value {#Variant [lefts right? value]} (all n.* 2 - (# n.hash hash lefts) - (# bit.hash hash right?) - (# super hash value)) + (at n.hash hash lefts) + (at bit.hash hash right?) + (at super hash value)) {#Tuple members} (all n.* 3 - (# (list.hash super) hash members)) + (at (list.hash super) hash members)) ))) (def: .public (format %it it) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux index 4573ad571..b4b554a4f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux @@ -100,8 +100,8 @@ [#Text]) [{#Variant allR casesR} {#Variant allS casesS}] - (and (# (maybe.equivalence n.equivalence) = allR allS) - (# (dictionary.equivalence =) = casesR casesS)) + (and (at (maybe.equivalence n.equivalence) = allR allS) + (at (dictionary.equivalence =) = casesR casesS)) [{#Seq leftR rightR} {#Seq leftS rightS}] (and (= leftR leftS) @@ -298,7 +298,7 @@ (n.> so_far_cases (..minimum addition'))))) (exception.except ..variant_mismatch [so_far_cases addition_cases]) - (# (dictionary.equivalence ..equivalence) = casesSF casesA) + (at (dictionary.equivalence ..equivalence) = casesSF casesA) <redundancy> ... else diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux index 7ac9ebff8..1baaf5e1d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/inference.lux @@ -181,7 +181,7 @@ ... (in (++ level)))))) ... 0 ... vars) - ... :inference:' (# ! each (type.univ_q quantifications) (check.clean vars :inference:)) + ... :inference:' (at ! each (type.univ_q quantifications) (check.clean vars :inference:)) ... _ (check.with just_before)] ... (in :inference:'))) ... _ (/type.inference :inference:)] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/pattern.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/pattern.lux index 45fe43d56..a462e62d1 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/pattern.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/pattern.lux @@ -29,10 +29,10 @@ (def: (= reference sample) (case [reference sample] [{#Simple reference} {#Simple sample}] - (# //simple.equivalence = reference sample) + (at //simple.equivalence = reference sample) [{#Complex reference} {#Complex sample}] - (# (//complex.equivalence =) = reference sample) + (at (//complex.equivalence =) = reference sample) [{#Bind reference} {#Bind sample}] (n.= reference sample) 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 1499d8081..42ad80162 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux @@ -190,7 +190,7 @@ (def: .public (symbol prefix) (All (_ anchor expression directive) (-> Text (Operation anchor expression directive Text))) - (# phase.monad each (|>> %.nat (format prefix)) ..next)) + (at phase.monad each (|>> %.nat (format prefix)) ..next)) (def: .public (enter_module module) (All (_ anchor expression directive) @@ -206,7 +206,7 @@ (All (_ anchor expression directive) (-> unit.ID [(Maybe unit.ID) expression] (Operation anchor expression directive Any))) (function (_ (^.let state+ [bundle state])) - (case (# (the #host state) evaluate label code) + (case (at (the #host state) evaluate label code) {try.#Success output} {try.#Success [state+ output]} @@ -217,7 +217,7 @@ (All (_ anchor expression directive) (-> directive (Operation anchor expression directive Any))) (function (_ (^.let state+ [bundle state])) - (case (# (the #host state) execute code) + (case (at (the #host state) execute code) {try.#Success output} {try.#Success [state+ output]} @@ -228,7 +228,7 @@ (All (_ anchor expression directive) (-> unit.ID (Maybe Text) [(Maybe unit.ID) expression] (Operation anchor expression directive [Text Any directive]))) (function (_ (^.let stateE [bundle state])) - (case (# (the #host state) define context custom code) + (case (at (the #host state) define context custom code) {try.#Success output} {try.#Success [stateE output]} diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux index 70dd51a99..bb9d617f6 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux @@ -144,10 +144,10 @@ (list#each (..quantified envs)) type.tuple [(list)] - (# check.monad in)) + (at check.monad in)) _ - (# check.monad in [(list) (..quantified envs :it:)])))) + (at check.monad in [(list) (..quantified envs :it:)])))) (def: (simple_pattern_analysis type :input: location output next) (All (_ a) (-> Type Type Location Pattern (Operation a) (Operation [Pattern a]))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux index eeb30664f..7e33dfdd9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux @@ -110,7 +110,7 @@ (case expectedT {.#Sum _} (|> (analyse archive valueC) - (# ! each (|>> [lefts right?] /.variant)) + (at ! each (|>> [lefts right?] /.variant)) (/type.expecting (|> expectedT type.flat_variant (list.item tag) @@ -191,23 +191,23 @@ (def: (typed_product analyse expectedT archive members) (-> Phase Type Archive (List Code) (Operation Analysis)) (<| (let [! ///.monad]) - (# ! each (|>> /.tuple)) + (at ! each (|>> /.tuple)) (is (Operation (List Analysis))) (loop (again [membersT+ (type.flat_tuple expectedT) membersC+ members]) (case [membersT+ membersC+] [{.#Item memberT {.#End}} {.#Item memberC {.#End}}] - (<| (# ! each (|>> list)) + (<| (at ! each (|>> list)) (/type.expecting memberT) (analyse archive memberC)) [{.#Item memberT {.#End}} _] (<| (/type.expecting memberT) - (# ! each (|>> list) (analyse archive (code.tuple membersC+)))) + (at ! each (|>> list) (analyse archive (code.tuple membersC+)))) [_ {.#Item memberC {.#End}}] (<| (/type.expecting (type.tuple membersT+)) - (# ! each (|>> list) (analyse archive memberC))) + (at ! each (|>> list) (analyse archive memberC))) [{.#Item memberT membersT+'} {.#Item memberC membersC+'}] (do ! @@ -316,9 +316,9 @@ (def: (local_binding? name) (-> Text (Meta Bit)) - (# meta.monad each - (list.any? (list.any? (|>> product.left (text#= name)))) - meta.locals)) + (at meta.monad each + (list.any? (list.any? (|>> product.left (text#= name)))) + meta.locals)) ... Lux already possesses the means to analyse tuples, so ... re-implementing the same functionality for records makes no sense. diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux index 19e415b29..b0e6131e4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux @@ -61,10 +61,10 @@ (/.with_exception ..cannot_analyse [expectedT function_name arg_name body] (case expectedT {.#Function :input: :output:} - (<| (# ! each (.function (_ [scope bodyA]) - {/.#Function (list#each (|>> /.variable) - (/scope.environment scope)) - bodyA})) + (<| (at ! each (.function (_ [scope bodyA]) + {/.#Function (list#each (|>> /.variable) + (/scope.environment scope)) + bodyA})) /scope.with ... Functions have access not only to their argument, but ... also to themselves, through a local variable. 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 be4a0fd6f..c72e90e51 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 @@ -116,7 +116,7 @@ (case expansion (pattern (partial_list <lux_def_module> referrals)) (|> (again archive <lux_def_module>) - (# ! each (revised /.#referrals (list#composite referrals)))) + (at ! each (revised /.#referrals (list#composite referrals)))) _ (..requiring again archive expansion))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux index b7feef155..2d0bee2fc 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux @@ -621,8 +621,8 @@ (text.starts_with? descriptor.array_prefix name) (let [[_ unprefixed] (maybe.trusted (text.split_by descriptor.array_prefix name))] - (# phase.monad each jvm.array - (check_jvm {.#Primitive unprefixed (list)}))) + (at phase.monad each jvm.array + (check_jvm {.#Primitive unprefixed (list)}))) ... else (phase#in (jvm.class name (list))))) @@ -961,7 +961,7 @@ (monad.each phase.monad (function (_ superT) (do [! phase.monad] - [super_name (# ! each ..reflection (check_jvm superT)) + [super_name (at ! each ..reflection (check_jvm superT)) super_class (phase.lifted (reflection!.load class_loader super_name))] (in [[super_name superT] (java/lang/Class::isAssignableFrom super_class target_class)]))) @@ -977,10 +977,10 @@ (pattern (list fromC)) (do [! phase.monad] [toT (///.lifted meta.expected_type) - target_name (# ! each ..reflection (check_jvm toT)) + target_name (at ! each ..reflection (check_jvm toT)) [fromT fromA] (typeA.inferring (analyse archive fromC)) - source_name (# ! each ..reflection (check_jvm fromT)) + source_name (at ! each ..reflection (check_jvm fromT)) can_cast? (is (Operation Bit) (`` (cond (~~ (template [<primitive> <object>] [(let [=primitive (reflection.reflection <primitive>)] @@ -1440,10 +1440,10 @@ aliasing (dictionary.composite (..aliasing expected_class_tvars actual_class_tvars) (..aliasing expected_method_tvars actual_method_tvars))] passes? (check_method aliasing class method_name method_style inputsJT method)] - (# ! each (if passes? - (|>> {#Pass}) - (|>> {#Hint})) - (method_signature method_style method)))))))] + (at ! each (if passes? + (|>> {#Pass}) + (|>> {#Hint})) + (method_signature method_style method)))))))] (case (list.all pass candidates) {.#Item method {.#End}} (in method) @@ -1473,11 +1473,11 @@ aliasing (dictionary.composite (..aliasing expected_class_tvars actual_class_tvars) (..aliasing expected_method_tvars actual_method_tvars))] passes? (check_constructor aliasing class inputsJT constructor)] - (# ! each - (if passes? - (|>> {#Pass}) - (|>> {#Hint})) - (constructor_signature constructor))))))] + (at ! each + (if passes? + (|>> {#Pass}) + (|>> {#Hint})) + (constructor_signature constructor))))))] (case (list.all pass candidates) {.#Item constructor {.#End}} (in constructor) @@ -2187,7 +2187,7 @@ phase.lifted)] (|> super_parameters (monad.each ! (..reflection_type mapping)) - (# ! each (|>> (list.zipped_2 parent_parameters))))) + (at ! each (|>> (list.zipped_2 parent_parameters))))) (phase.lifted (exception.except ..mismatched_super_parameters [parent_name expected_count actual_count])))) {.#None} @@ -2284,7 +2284,7 @@ (def: (matched? [sub sub_method subJT] [super super_method superJT]) (-> [(Type Class) Text (Type Method)] [(Type Class) Text (Type Method)] Bit) - (and (# descriptor.equivalence = (jvm.descriptor super) (jvm.descriptor sub)) + (and (at descriptor.equivalence = (jvm.descriptor super) (jvm.descriptor sub)) (text#= super_method sub_method) (jvm#= superJT subJT))) @@ -2465,13 +2465,13 @@ _.aconst_null {.#Right primitiveT} - (cond (# jvm.equivalence = jvm.long primitiveT) + (cond (at jvm.equivalence = jvm.long primitiveT) _.lconst_0 - (# jvm.equivalence = jvm.float primitiveT) + (at jvm.equivalence = jvm.float primitiveT) _.fconst_0 - (# jvm.equivalence = jvm.double primitiveT) + (at jvm.equivalence = jvm.double primitiveT) _.dconst_0 ... jvm.boolean jvm.byte jvm.short jvm.int jvm.char @@ -2491,13 +2491,13 @@ _.areturn {.#Right primitiveT} - (cond (# jvm.equivalence = jvm.long primitiveT) + (cond (at jvm.equivalence = jvm.long primitiveT) _.lreturn - (# jvm.equivalence = jvm.float primitiveT) + (at jvm.equivalence = jvm.float primitiveT) _.freturn - (# jvm.equivalence = jvm.double primitiveT) + (at jvm.equivalence = jvm.double primitiveT) _.dreturn ... jvm.boolean jvm.byte jvm.short jvm.int jvm.char @@ -2622,7 +2622,7 @@ (list) (list#each (|>> {#Overriden_Method}) methods))) ... Necessary for reflection to work properly during analysis. - _ (phase.lifted (# host execute mock)) + _ (phase.lifted (at host execute mock)) mapping (typeA.check (..class_mapping parameters)) super_classT (typeA.check (luxT.check (luxT.class mapping) (..signature super_class))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux index 76f36e336..2a5ad85ad 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux @@ -145,7 +145,7 @@ (|> opC (analyse archive) (typeA.expecting (type (-> .Any :var:))) - (# ! each (|>> list {////analysis.#Extension extension_name}))))) + (at ! each (|>> list {////analysis.#Extension extension_name}))))) _ (////analysis.except ///.incorrect_arity [extension_name 1 (list.size args)])))) @@ -167,8 +167,8 @@ (case args (pattern (list typeC valueC)) (do [! ////.monad] - [actualT (# ! each (|>> (as Type)) - (eval archive Type typeC)) + [actualT (at ! each (|>> (as Type)) + (eval archive Type typeC)) _ (typeA.inference actualT)] (<| (typeA.expecting actualT) (analyse archive valueC))) @@ -182,8 +182,8 @@ (case args (pattern (list typeC valueC)) (do [! ////.monad] - [actualT (# ! each (|>> (as Type)) - (eval archive Type typeC)) + [actualT (at ! each (|>> (as Type)) + (eval archive Type typeC)) _ (typeA.inference actualT) [valueT valueA] (typeA.inferring (analyse archive valueC))] 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 025e863d3..5158193ae 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 @@ -431,7 +431,7 @@ (value.wrap <type>) (_.astore lux_register))]]] (`` (cond (~~ (template [<shift> <load> <type>] - [(# type.equivalence = <type> argumentT) + [(at type.equivalence = <type> argumentT) (wrap_primitive <shift> <load> <type>)] [1 _.iload type.boolean] @@ -442,7 +442,7 @@ [1 _.fload type.float] [2 _.lload type.long])) - ... (# type.equivalence = type.double argumentT) + ... (at type.equivalence = type.double argumentT) (wrap_primitive 2 _.dload type.double)))))) (def: .public (method_arguments offset types) @@ -514,7 +514,7 @@ (value.unwrap <type>) <return>)]] (`` (cond (~~ (template [<return> <type>] - [(# type.equivalence = <type> returnT) + [(at type.equivalence = <type> returnT) (unwrap_primitive <return> <type>)] [_.ireturn type.boolean] @@ -525,7 +525,7 @@ [_.freturn type.float] [_.lreturn type.long])) - ... (# type.equivalence = type.double returnT) + ... (at type.equivalence = type.double returnT) (unwrap_primitive _.dreturn type.double))))))) (def: (overriden_method_generation archive method) @@ -632,7 +632,7 @@ (..static_method_generation archive method) {#Abstract_Method method} - (# phase.monad in (..abstract_method_generation method)))) + (at phase.monad in (..abstract_method_generation method)))) (def: (method_definition archive super interfaces [mapping selfT] [analyse synthesize generate]) (-> Archive @@ -705,13 +705,13 @@ _.aconst_null {.#Right primitiveT} - (cond (# type.equivalence = type.long primitiveT) + (cond (at type.equivalence = type.long primitiveT) _.lconst_0 - (# type.equivalence = type.float primitiveT) + (at type.equivalence = type.float primitiveT) _.fconst_0 - (# type.equivalence = type.double primitiveT) + (at type.equivalence = type.double primitiveT) _.dconst_0 ... type.boolean type.byte type.short type.int type.char @@ -731,13 +731,13 @@ _.areturn {.#Right primitiveT} - (cond (# type.equivalence = type.long primitiveT) + (cond (at type.equivalence = type.long primitiveT) _.lreturn - (# type.equivalence = type.float primitiveT) + (at type.equivalence = type.float primitiveT) _.freturn - (# type.equivalence = type.double primitiveT) + (at type.equivalence = type.double primitiveT) _.dreturn ... type.boolean type.byte type.short type.int type.char @@ -901,7 +901,7 @@ (the [directive.#generation directive.#phase] state)]) methods) .let [all_dependencies (cache.all (list#each product.left methods))] - bytecode (<| (# ! each (format.result class.writer)) + bytecode (<| (at ! each (format.result class.writer)) phase.lifted (class.class version.v6_0 (all modifier#composite @@ -940,7 +940,7 @@ (function (_ extension_name phase archive [[name parameters] supers annotations method_declarations]) (directive.lifted_generation (do [! phase.monad] - [bytecode (<| (# ! each (format.result class.writer)) + [bytecode (<| (at ! each (format.result class.writer)) phase.lifted (class.class version.v6_0 (all modifier#composite diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux index 355dd5182..111d1d4aa 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux @@ -64,7 +64,7 @@ ... <s>.any)))) ... (function (_ extension_name phase archive [input else conditionals]) ... (do [! /////.monad] -... [@input (# ! each _.var (generation.symbol "input")) +... [@input (at ! each _.var (generation.symbol "input")) ... inputG (phase archive input) ... elseG (phase archive else) ... conditionalsG (is (Operation (List [Expression Expression])) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux index f9ad9a81e..db527fbd2 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux @@ -57,10 +57,10 @@ (template [<name> <op>] [(def: (<name> [paramG subjectG]) (Binary Expression) - (<op> subjectG (//runtime.i64##number paramG)))] + (<op> subjectG (//runtime.i64::number paramG)))] - [i64##left_shifted //runtime.i64##left_shifted] - [i64##right_shifted //runtime.i64##right_shifted] + [i64::left_shifted //runtime.i64::left_shifted] + [i64::right_shifted //runtime.i64::right_shifted] ) ... [[Numbers]] @@ -72,9 +72,9 @@ (_.closure (list)) //runtime.lux//try)) -(def: i64##char +(def: i64::char (Unary Expression) - (|>> //runtime.i64##number + (|>> //runtime.i64::number (list) (_.apply (_.var "String.fromCharCode")))) @@ -190,20 +190,20 @@ Bundle (<| (/.prefix "i64") (|> /.empty - (/.install "and" (binary (product.uncurried //runtime.i64##and))) - (/.install "or" (binary (product.uncurried //runtime.i64##or))) - (/.install "xor" (binary (product.uncurried //runtime.i64##xor))) - (/.install "left-shift" (binary i64##left_shifted)) - (/.install "right-shift" (binary i64##right_shifted)) - (/.install "=" (binary (product.uncurried //runtime.i64##=))) - (/.install "<" (binary (product.uncurried //runtime.i64##<))) - (/.install "+" (binary (product.uncurried //runtime.i64##+))) - (/.install "-" (binary (product.uncurried //runtime.i64##-))) - (/.install "*" (binary (product.uncurried //runtime.i64##*))) - (/.install "/" (binary (product.uncurried //runtime.i64##/))) - (/.install "%" (binary (product.uncurried //runtime.i64##%))) - (/.install "f64" (unary //runtime.i64##number)) - (/.install "char" (unary i64##char)) + (/.install "and" (binary (product.uncurried //runtime.i64::and))) + (/.install "or" (binary (product.uncurried //runtime.i64::or))) + (/.install "xor" (binary (product.uncurried //runtime.i64::xor))) + (/.install "left-shift" (binary i64::left_shifted)) + (/.install "right-shift" (binary i64::right_shifted)) + (/.install "=" (binary (product.uncurried //runtime.i64::=))) + (/.install "<" (binary (product.uncurried //runtime.i64::<))) + (/.install "+" (binary (product.uncurried //runtime.i64::+))) + (/.install "-" (binary (product.uncurried //runtime.i64::-))) + (/.install "*" (binary (product.uncurried //runtime.i64::*))) + (/.install "/" (binary (product.uncurried //runtime.i64::/))) + (/.install "%" (binary (product.uncurried //runtime.i64::%))) + (/.install "f64" (unary //runtime.i64::number)) + (/.install "char" (unary i64::char)) ))) (def: f64_procs @@ -217,7 +217,7 @@ (/.install "%" (binary (product.uncurried _.%))) (/.install "=" (binary (product.uncurried _.=))) (/.install "<" (binary (product.uncurried _.<))) - (/.install "i64" (unary //runtime.i64##of_number)) + (/.install "i64" (unary //runtime.i64::of_number)) (/.install "encode" (unary (_.do "toString" (list)))) (/.install "decode" (unary f64//decode))))) @@ -229,7 +229,7 @@ (/.install "<" (binary (product.uncurried _.<))) (/.install "concat" (binary text//concat)) (/.install "index" (trinary text//index)) - (/.install "size" (unary (|>> (_.the "length") //runtime.i64##of_number))) + (/.install "size" (unary (|>> (_.the "length") //runtime.i64::of_number))) (/.install "char" (binary (product.uncurried //runtime.text//char))) (/.install "clip" (trinary text//clip)) ))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux index 3d61566c2..44674faf0 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux @@ -36,7 +36,7 @@ (def: array::length (Unary Expression) - (|>> (_.the "length") //runtime.i64##of_number)) + (|>> (_.the "length") //runtime.i64::of_number)) (def: (array::read [indexG arrayG]) (Binary Expression) @@ -115,7 +115,7 @@ (custom [<s>.text (function (_ extension phase archive name) - (# ////////phase.monad in (_.var name)))])) + (at ////////phase.monad in (_.var name)))])) (def: js::apply (custom @@ -134,7 +134,7 @@ [abstractionG (phase archive abstractionS) .let [variable (is (-> Text (Operation Var)) (|>> generation.symbol - (# ! each _.var)))] + (at ! each _.var)))] g!inputs (monad.each ! (function (_ _) (variable "input")) (list.repeated (.nat arity) [])) g!abstraction (variable "abstraction")] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux index 4e60e6693..d9b809f6c 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux @@ -649,7 +649,7 @@ (..custom [(all <>.and <synthesis>.text <synthesis>.text ..value) (function (_ extension_name generate archive [class field :unboxed:]) - (# //////.monad in (_.getstatic (type.class class (list)) field :unboxed:)))])) + (at //////.monad in (_.getstatic (type.class class (list)) field :unboxed:)))])) (def: unitG (_.string //////synthesis.unit)) @@ -1054,7 +1054,7 @@ (///value.unwrap <type>) <return>)]] (`` (cond (~~ (template [<return> <type>] - [(# type.equivalence = <type> returnT) + [(at type.equivalence = <type> returnT) (unwrap_primitive <return> <type>)] [_.ireturn type.boolean] @@ -1065,7 +1065,7 @@ [_.freturn type.float] [_.lreturn type.long])) - ... (# type.equivalence = type.double returnT) + ... (at type.equivalence = type.double returnT) (unwrap_primitive _.dreturn type.double))))))) (def: (method_dependencies archive method) @@ -1109,7 +1109,7 @@ (///value.wrap <type>) (_.astore lux_register))]]] (`` (cond (~~ (template [<shift> <load> <type>] - [(# type.equivalence = <type> argumentT) + [(at type.equivalence = <type> argumentT) (wrap_primitive <shift> <load> <type>)] [1 _.iload type.boolean] @@ -1120,7 +1120,7 @@ [1 _.fload type.float] [2 _.lload type.long])) - ... (# type.equivalence = type.double argumentT) + ... (at type.equivalence = type.double argumentT) (wrap_primitive 2 _.dload type.double)))))) (def: .public (prepare_arguments offset types) @@ -1222,7 +1222,7 @@ methods! (|> overriden_methods (list#each (normalized_method global_mapping)) (monad.each ! (method_definition generate archive artifact_id))) - bytecode (<| (# ! each (format.result class.writer)) + bytecode (<| (at ! each (format.result class.writer)) //////.lifted (class.class version.v6_0 (all modifier#composite class.public class.final) (name.internal anonymous_class_name) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux index 834d3448c..5d9753b87 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux @@ -138,7 +138,7 @@ {synthesis.#Then else}) [input] (//case.case! statement phase archive) - (# /////.monad each (|>> (as Expression)))))])) + (at /////.monad each (|>> (as Expression)))))])) (def: lux_procs Bundle diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux index c5401856a..365fbe663 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux @@ -137,7 +137,7 @@ (custom [<s>.text (function (_ extension phase archive name) - (# ////////phase.monad in (_.var name)))])) + (at ////////phase.monad in (_.var name)))])) (def: lua::apply (custom @@ -161,8 +161,8 @@ (custom [<s>.text (function (_ extension phase archive module) - (# ////////phase.monad in - (_.require/1 (_.string module))))])) + (at ////////phase.monad in + (_.require/1 (_.string module))))])) (def: lua::function (custom @@ -172,7 +172,7 @@ [abstractionG (phase archive abstractionS) .let [variable (is (-> Text (Operation Var)) (|>> generation.symbol - (# ! each _.var)))] + (at ! each _.var)))] g!inputs (monad.each ! (function (_ _) (variable "input")) (list.repeated (.nat arity) []))] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux index ef05fe70f..911e63531 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux @@ -67,7 +67,7 @@ [inputG (phase archive input) [[context_module context_artifact] elseG] (generation.with_new_context archive (phase archive else)) - @input (# ! each _.var (generation.symbol "input")) + @input (at ! each _.var (generation.symbol "input")) conditionalsG (is (Operation (List [Expression Expression])) (monad.each ! (function (_ [chars branch]) (do ! diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux index a3ea6010c..073c49818 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux @@ -109,7 +109,7 @@ (custom [<s>.text (function (_ extension phase archive name) - (# ////////phase.monad in (_.constant name)))])) + (at ////////phase.monad in (_.constant name)))])) (def: php::apply (custom diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux index 22ffda36e..e48f139a3 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux @@ -113,7 +113,7 @@ (do [! /////.monad] [inputG (phase archive input) else! (..statement phase archive else) - @input (# ! each _.var (generation.symbol "input")) + @input (at ! each _.var (generation.symbol "input")) conditionals! (is (Operation (List [(Expression Any) (Statement Any)])) (monad.each ! (function (_ [chars branch]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux index 902be185c..0b00fd778 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux @@ -134,7 +134,7 @@ [abstractionG (phase archive abstractionS) .let [variable (is (-> Text (Operation SVar)) (|>> generation.symbol - (# ! each _.var)))] + (at ! each _.var)))] g!inputs (monad.each ! (function (_ _) (variable "input")) (list.repeated (.nat arity) []))] (in (_.lambda g!inputs diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux index 35e433e8e..8f1a0c53e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux @@ -64,7 +64,7 @@ ... ... <s>.any)))) ... ... (function (_ extension_name phase archive [input else conditionals]) ... ... (do [! /////.monad] -... ... [@input (# ! each _.var (generation.symbol "input")) +... ... [@input (at ! each _.var (generation.symbol "input")) ... ... inputG (phase archive input) ... ... elseG (phase archive else) ... ... conditionalsG (is (Operation (List [Expression Expression])) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux index e7395899b..bee06eb6a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux @@ -112,7 +112,7 @@ (do [! /////.monad] [inputG (phase archive input) else! (statement phase archive else) - @input (# ! each _.local (generation.symbol "input")) + @input (at ! each _.local (generation.symbol "input")) conditionals! (is (Operation (List [Expression Statement])) (monad.each ! (function (_ [chars branch]) (do ! @@ -154,23 +154,23 @@ Bundle (<| (/.prefix "i64") (|> /.empty - (/.install "and" (binary (product.uncurried //runtime.i64##and))) - (/.install "or" (binary (product.uncurried //runtime.i64##or))) - (/.install "xor" (binary (product.uncurried //runtime.i64##xor))) - (/.install "left-shift" (binary (product.uncurried //runtime.i64##left_shifted))) - (/.install "right-shift" (binary (product.uncurried //runtime.i64##right_shifted))) + (/.install "and" (binary (product.uncurried //runtime.i64::and))) + (/.install "or" (binary (product.uncurried //runtime.i64::or))) + (/.install "xor" (binary (product.uncurried //runtime.i64::xor))) + (/.install "left-shift" (binary (product.uncurried //runtime.i64::left_shifted))) + (/.install "right-shift" (binary (product.uncurried //runtime.i64::right_shifted))) (/.install "<" (binary (product.uncurried _.<))) (/.install "=" (binary (product.uncurried _.=))) - (/.install "+" (binary (product.uncurried //runtime.i64##+))) - (/.install "-" (binary (product.uncurried //runtime.i64##-))) - (/.install "*" (binary (product.uncurried //runtime.i64##*))) - (/.install "/" (binary (product.uncurried //runtime.i64##/))) + (/.install "+" (binary (product.uncurried //runtime.i64::+))) + (/.install "-" (binary (product.uncurried //runtime.i64::-))) + (/.install "*" (binary (product.uncurried //runtime.i64::*))) + (/.install "/" (binary (product.uncurried //runtime.i64::/))) (/.install "%" (binary (function (_ [parameter subject]) (_.do "remainder" (list parameter) {.#None} subject)))) (/.install "f64" (unary (_./ (_.float +1.0)))) - (/.install "char" (unary //runtime.i64##char)) + (/.install "char" (unary //runtime.i64::char)) ))) (def: f64_procs diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux index 803de7582..4895535d5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux @@ -104,7 +104,7 @@ (custom [<s>.text (function (_ extension phase archive name) - (# ////////phase.monad in (is _.CVar (_.manual name))))])) + (at ////////phase.monad in (is _.CVar (_.manual name))))])) (def: ruby::apply (custom @@ -119,8 +119,8 @@ (custom [<s>.text (function (_ extension phase archive module) - (# ////////phase.monad in - (_.require/1 (_.string module))))])) + (at ////////phase.monad in + (_.require/1 (_.string module))))])) (def: .public bundle Bundle diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux index 9dbea2892..a3235673f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux @@ -64,7 +64,7 @@ <s>.any)))) (function (_ extension_name phase archive [input else conditionals]) (do [! /////.monad] - [@input (# ! each _.var (generation.symbol "input")) + [@input (at ! each _.var (generation.symbol "input")) inputG (phase archive input) elseG (phase archive else) conditionalsG (is (Operation (List [Expression Expression])) 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 7a5c774c4..3a94f56d6 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 @@ -143,11 +143,11 @@ (function (again [$output @done @fail pathP]) (.case pathP (pattern (/////synthesis.path/then bodyS)) - (# ///////phase.monad each - (function (_ outputV) - (_.progn (list (_.setq $output outputV) - (_.go @done)))) - (expression archive bodyS)) + (at ///////phase.monad each + (function (_ outputV) + (_.progn (list (_.setq $output outputV) + (_.go @done)))) + (expression archive bodyS)) {/////synthesis.#Pop} (///////phase#in ..pop!) @@ -197,7 +197,7 @@ (pattern (<simple> idx nextP)) (|> nextP [$output @done @fail] again - (# ///////phase.monad each (|>> {.#Some} (<choice> @fail true idx))))]) + (at ///////phase.monad each (|>> {.#Some} (<choice> @fail true idx))))]) ([/////synthesis.side/left /////synthesis.simple_left_side ..left_choice] [/////synthesis.side/right /////synthesis.simple_right_side ..right_choice]) @@ -219,7 +219,7 @@ (pattern (/////synthesis.path/alt preP postP)) (do [! ///////phase.monad] - [@otherwise (# ! each (|>> %.nat (format "lux_case_otherwise") _.tag) /////generation.next) + [@otherwise (at ! each (|>> %.nat (format "lux_case_otherwise") _.tag) /////generation.next) pre! (again [$output @done @otherwise preP]) post! (again [$output @done @fail postP])] (in (..alternation @otherwise pre! post!))) @@ -233,8 +233,8 @@ (def: (pattern_matching $output expression archive pathP) (-> Var/1 (Generator Path)) (do [! ///////phase.monad] - [@done (# ! each (|>> %.nat (format "lux_case_done") _.tag) /////generation.next) - @fail (# ! each (|>> %.nat (format "lux_case_fail") _.tag) /////generation.next) + [@done (at ! each (|>> %.nat (format "lux_case_done") _.tag) /////generation.next) + @fail (at ! each (|>> %.nat (format "lux_case_fail") _.tag) /////generation.next) pattern_matching! (pattern_matching' expression archive [$output @done @fail pathP])] (in (_.tagbody (list pattern_matching! @@ -246,7 +246,7 @@ (Generator [Synthesis Path]) (do [! ///////phase.monad] [initG (expression archive valueS) - $output (# ! each (|>> %.nat (format "lux_case_output") _.var) /////generation.next) + $output (at ! each (|>> %.nat (format "lux_case_output") _.var) /////generation.next) pattern_matching! (pattern_matching $output expression archive pathP) .let [storage (|> pathP ////synthesis/case.storage diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux index 77569b17e..a046cf31e 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux @@ -44,11 +44,11 @@ (-> (List (Expression Any)) (Expression Any) (Operation (Expression Any))) (case inits {.#End} - (# ///////phase.monad in function_definition) + (at ///////phase.monad in function_definition) _ (do [! ///////phase.monad] - [@closure (# ! each _.var (/////generation.symbol "closure"))] + [@closure (at ! each _.var (/////generation.symbol "closure"))] (in (_.labels (list [@closure [(|> (list.enumeration inits) (list#each (|>> product.left ..capture)) _.args) @@ -61,8 +61,8 @@ (def: .public (function expression archive [environment arity bodyS]) (Generator (Abstraction Synthesis)) (do [! ///////phase.monad] - [@scope (# ! each (|>> %.nat (format "function_scope") _.tag) /////generation.next) - @output (# ! each (|>> %.nat (format "loop_output") _.var) /////generation.next) + [@scope (at ! each (|>> %.nat (format "function_scope") _.tag) /////generation.next) + @output (at ! each (|>> %.nat (format "loop_output") _.var) /////generation.next) [function_name bodyG] (/////generation.with_new_context archive (/////generation.with_anchor [@scope 1] (expression archive bodyS))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux index 287d9a6c3..619496a21 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux @@ -42,8 +42,8 @@ ... true loop _ (do [! ///////phase.monad] - [@scope (# ! each (|>> %.nat (format "loop_scope") _.tag) /////generation.next) - @output (# ! each (|>> %.nat (format "loop_output") _.var) /////generation.next) + [@scope (at ! each (|>> %.nat (format "loop_scope") _.tag) /////generation.next) + @output (at ! each (|>> %.nat (format "loop_output") _.var) /////generation.next) initsG+ (monad.each ! (expression archive) initsS+) bodyG (/////generation.with_anchor [@scope start] (expression archive bodyS))] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux index e9bbd9a5c..1257c661a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux @@ -290,4 +290,4 @@ (sequence.sequence [(%.nat ..module_id) (|> ..runtime _.code - (# encoding.utf8 encoded))])]))) + (at encoding.utf8 encoded))])]))) 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 9afe42e0c..963d0574b 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 @@ -185,7 +185,7 @@ [(pattern (<simple> idx nextP)) (|> nextP again - (# ///////phase.monad each (|>> (_.then (<choice> true idx)) {.#Some})))]) + (at ///////phase.monad each (|>> (_.then (<choice> true idx)) {.#Some})))]) ([/////synthesis.simple_left_side ..left_choice] [/////synthesis.simple_right_side ..right_choice]) @@ -276,7 +276,7 @@ [clauses (monad.each ! (function (_ [match then]) (do ! [then! (again then)] - (in [(//runtime.i64##= (//primitive.i64 (.int match)) + (in [(//runtime.i64::= (//primitive.i64 (.int match)) ..peek_cursor) then!]))) {.#Item item})] @@ -289,7 +289,7 @@ [{<tag> item} (do [! ///////phase.monad] [cases (monad.each ! (function (_ [match then]) - (# ! each (|>> [(list (<format> match))]) (again then))) + (at ! each (|>> [(list (<format> match))]) (again then))) {.#Item item})] (in (_.switch ..peek_cursor cases diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux index 69b575162..ff96c9fe7 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux @@ -77,8 +77,8 @@ [dependencies (cache.dependencies archive bodyS) [function_name body!] (/////generation.with_new_context archive dependencies (do ! - [scope (# ! each ..@scope - (/////generation.context archive))] + [scope (at ! each ..@scope + (/////generation.context archive))] (/////generation.with_anchor [1 scope] (statement expression archive bodyS)))) .let [arityO (|> arity .int _.i32) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux index 9849f3981..929b2a2e0 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux @@ -70,11 +70,11 @@ ... true loop _ (do [! ///////phase.monad] - [@scope (# ! each ..@scope /////generation.next) + [@scope (at ! each ..@scope /////generation.next) initsO+ (monad.each ! (expression archive) initsS+) body! (/////generation.with_anchor [start @scope] (statement expression archive bodyS)) - $iteration (# ! each ..$iteration /////generation.next)] + $iteration (at ! each ..$iteration /////generation.next)] (in (..setup $iteration true start initsO+ @@ -103,7 +103,7 @@ (do [! ///////phase.monad] [[offset @scope] /////generation.anchor argsO+ (monad.each ! (expression archive) argsS+) - $iteration (# ! each ..$iteration /////generation.next)] + $iteration (at ! each ..$iteration /////generation.next)] (in (all _.then (_.define @temp (_.array argsO+)) (..setup $iteration diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux index 12359b713..532f3c826 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux @@ -186,32 +186,32 @@ (-> Expression Expression Expression Computation) (_.new ..variant//new (list tag last? value))) -(runtime: (sum//get sum expected##right? expected##lefts) +(runtime: (sum//get sum expected::right? expected::lefts) (let [mismatch! (_.return _.null) - actual##lefts (|> sum (_.the ..variant_tag_field)) - actual##right? (|> sum (_.the ..variant_flag_field)) - actual##value (|> sum (_.the ..variant_value_field)) - is_last? (_.= ..unit actual##right?) + actual::lefts (|> sum (_.the ..variant_tag_field)) + actual::right? (|> sum (_.the ..variant_flag_field)) + actual::value (|> sum (_.the ..variant_value_field)) + is_last? (_.= ..unit actual::right?) recur! (all _.then - (_.set expected##lefts (|> expected##lefts - (_.- actual##lefts) + (_.set expected::lefts (|> expected::lefts + (_.- actual::lefts) (_.- (_.i32 +1)))) - (_.set sum actual##value))] + (_.set sum actual::value))] (<| (_.while (_.boolean true)) - (_.if (_.= expected##lefts actual##lefts) - (_.if (_.= expected##right? actual##right?) - (_.return actual##value) + (_.if (_.= expected::lefts actual::lefts) + (_.if (_.= expected::right? actual::right?) + (_.return actual::value) mismatch!)) - (_.if (_.< expected##lefts actual##lefts) - (_.if (_.= ..unit actual##right?) + (_.if (_.< expected::lefts actual::lefts) + (_.if (_.= ..unit actual::right?) recur! mismatch!)) - (_.if (_.= ..unit expected##right?) - (_.return (..variant (|> actual##lefts - (_.- expected##lefts) + (_.if (_.= ..unit expected::right?) + (_.return (..variant (|> actual::lefts + (_.- expected::lefts) (_.- (_.i32 +1))) - actual##right? - actual##value))) + actual::right? + actual::value))) mismatch!))) (def: left @@ -266,7 +266,7 @@ (def: .public i64_low_field Text "_lux_low") (def: .public i64_high_field Text "_lux_high") -(runtime: i64##new +(runtime: i64::new (let [@this (_.var "this")] (with_vars [high low] (_.closure (list high low) @@ -277,7 +277,7 @@ (def: .public (i64 high low) (-> Expression Expression Computation) - (_.new ..i64##new (list high low))) + (_.new ..i64::new (list high low))) (template [<name> <op>] [(runtime: (<name> subject parameter) @@ -286,12 +286,12 @@ (<op> (_.the ..i64_low_field subject) (_.the ..i64_low_field parameter)))))] - [i64##xor _.bit_xor] - [i64##or _.bit_or] - [i64##and _.bit_and] + [i64::xor _.bit_xor] + [i64::or _.bit_or] + [i64::and _.bit_and] ) -(runtime: (i64##not value) +(runtime: (i64::not value) (_.return (..i64 (_.bit_not (_.the ..i64_high_field value)) (_.bit_not (_.the ..i64_low_field value))))) @@ -308,7 +308,7 @@ (-> Var Expression) (|>> (_.< (_.i32 +32)))) -(runtime: (i64##left_shifted input shift) +(runtime: (i64::left_shifted input shift) (all _.then (..cap_shift! shift) (_.return (<| (..no_shift! shift input) @@ -321,7 +321,7 @@ (..i64 high (_.i32 +0))))) )) -(runtime: (i64##arithmetic_right_shifted input shift) +(runtime: (i64::arithmetic_right_shifted input shift) (all _.then (..cap_shift! shift) (_.return (<| (..no_shift! shift input) @@ -336,7 +336,7 @@ low (|> input (_.the ..i64_high_field) (_.arithmetic_right_shift (_.- (_.i32 +32) shift)))] (..i64 high low)))))) -(runtime: (i64##right_shifted input shift) +(runtime: (i64::right_shifted input shift) (all _.then (..cap_shift! shift) (_.return (<| (..no_shift! shift input) @@ -353,59 +353,59 @@ (def: runtime//bit Statement (all _.then - @i64##and - @i64##or - @i64##xor - @i64##not - @i64##left_shifted - @i64##arithmetic_right_shifted - @i64##right_shifted + @i64::and + @i64::or + @i64::xor + @i64::not + @i64::left_shifted + @i64::arithmetic_right_shifted + @i64::right_shifted )) -(runtime: i64##2^16 +(runtime: i64::2^16 (_.left_shift (_.i32 +16) (_.i32 +1))) -(runtime: i64##2^32 - (_.* i64##2^16 i64##2^16)) +(runtime: i64::2^32 + (_.* i64::2^16 i64::2^16)) -(runtime: i64##2^64 - (_.* i64##2^32 i64##2^32)) +(runtime: i64::2^64 + (_.* i64::2^32 i64::2^32)) -(runtime: i64##2^63 - (|> i64##2^64 (_./ (_.i32 +2)))) +(runtime: i64::2^63 + (|> i64::2^64 (_./ (_.i32 +2)))) -(runtime: (i64##unsigned_low i64) +(runtime: (i64::unsigned_low i64) (_.return (_.? (|> i64 (_.the ..i64_low_field) (_.>= (_.i32 +0))) (|> i64 (_.the ..i64_low_field)) - (|> i64 (_.the ..i64_low_field) (_.+ i64##2^32))))) + (|> i64 (_.the ..i64_low_field) (_.+ i64::2^32))))) -(runtime: (i64##number i64) +(runtime: (i64::number i64) (_.return (|> i64 (_.the ..i64_high_field) - (_.* i64##2^32) - (_.+ (i64##unsigned_low i64))))) + (_.* i64::2^32) + (_.+ (i64::unsigned_low i64))))) -(runtime: i64##zero +(runtime: i64::zero (..i64 (_.i32 +0) (_.i32 +0))) -(runtime: i64##min +(runtime: i64::min (..i64 (_.i32 (.int (hex "80,00,00,00"))) (_.i32 +0))) -(runtime: i64##max +(runtime: i64::max (..i64 (_.i32 (.int (hex "7F,FF,FF,FF"))) (_.i32 (.int (hex "FF,FF,FF,FF"))))) -(runtime: i64##one +(runtime: i64::one (..i64 (_.i32 +0) (_.i32 +1))) -(runtime: (i64##= reference sample) +(runtime: (i64::= reference sample) (_.return (_.and (_.= (_.the ..i64_high_field reference) (_.the ..i64_high_field sample)) (_.= (_.the ..i64_low_field reference) (_.the ..i64_low_field sample))))) -(runtime: (i64##+ parameter subject) +(runtime: (i64::+ parameter subject) (let [up_16 (_.left_shift (_.i32 +16)) high_16 (_.logic_right_shift (_.i32 +16)) low_16 (_.bit_and (_.i32 (.int (hex "FFFF")))) @@ -449,30 +449,30 @@ (_.bit_or (up_16 x16) x00))) )))) -(runtime: (i64##opposite value) - (_.return (_.? (i64##= i64##min value) - i64##min - (i64##+ i64##one (i64##not value))))) +(runtime: (i64::opposite value) + (_.return (_.? (i64::= i64::min value) + i64::min + (i64::+ i64::one (i64::not value))))) -(runtime: i64##-one - (i64##opposite i64##one)) +(runtime: i64::-one + (i64::opposite i64::one)) -(runtime: (i64##of_number value) +(runtime: (i64::of_number value) (_.return (<| (_.? (_.not_a_number? value) - i64##zero) - (_.? (_.<= (_.opposite i64##2^63) value) - i64##min) - (_.? (|> value (_.+ (_.i32 +1)) (_.>= i64##2^63)) - i64##max) + i64::zero) + (_.? (_.<= (_.opposite i64::2^63) value) + i64::min) + (_.? (|> value (_.+ (_.i32 +1)) (_.>= i64::2^63)) + i64::max) (_.? (|> value (_.< (_.i32 +0))) - (|> value _.opposite i64##of_number i64##opposite)) - (..i64 (|> value (_./ i64##2^32) _.to_i32) - (|> value (_.% i64##2^32) _.to_i32))))) + (|> value _.opposite i64::of_number i64::opposite)) + (..i64 (|> value (_./ i64::2^32) _.to_i32) + (|> value (_.% i64::2^32) _.to_i32))))) -(runtime: (i64##- parameter subject) - (_.return (i64##+ (i64##opposite parameter) subject))) +(runtime: (i64::- parameter subject) + (_.return (i64::+ (i64::opposite parameter) subject))) -(runtime: (i64##* parameter subject) +(runtime: (i64::* parameter subject) (let [up_16 (_.left_shift (_.i32 +16)) high_16 (_.logic_right_shift (_.i32 +16)) low_16 (_.bit_and (_.i32 (.int (hex "FFFF")))) @@ -521,7 +521,7 @@ (_.bit_or (up_16 x16) x00))) )))) -(runtime: (i64##< parameter subject) +(runtime: (i64::< parameter subject) (let [negative? (|>> (_.the ..i64_high_field) (_.< (_.i32 +0)))] (with_vars [-subject? -parameter?] (all _.then @@ -531,65 +531,65 @@ (_.boolean true)) (_.? (_.and (_.not -subject?) -parameter?) (_.boolean false)) - (negative? (i64##- parameter subject)))) + (negative? (i64::- parameter subject)))) )))) -(def: (i64##<= param subject) +(def: (i64::<= param subject) (-> Expression Expression Expression) - (|> (i64##< param subject) - (_.or (i64##= param subject)))) + (|> (i64::< param subject) + (_.or (i64::= param subject)))) (def: negative? - (i64##< i64##zero)) + (i64::< i64::zero)) -(runtime: (i64##/ parameter subject) - (<| (_.if (i64##= i64##zero parameter) +(runtime: (i64::/ parameter subject) + (<| (_.if (i64::= i64::zero parameter) (_.throw (_.string "Cannot divide by zero!"))) - (_.if (i64##= i64##zero subject) - (_.return i64##zero)) - (_.if (i64##= i64##min subject) - (<| (_.if (_.or (i64##= i64##one parameter) - (i64##= i64##-one parameter)) - (_.return i64##min)) - (_.if (i64##= i64##min parameter) - (_.return i64##one)) + (_.if (i64::= i64::zero subject) + (_.return i64::zero)) + (_.if (i64::= i64::min subject) + (<| (_.if (_.or (i64::= i64::one parameter) + (i64::= i64::-one parameter)) + (_.return i64::min)) + (_.if (i64::= i64::min parameter) + (_.return i64::one)) (with_vars [approximation] - (let [subject/2 (..i64##arithmetic_right_shifted subject (_.i32 +1))] + (let [subject/2 (..i64::arithmetic_right_shifted subject (_.i32 +1))] (all _.then - (_.define approximation (i64##left_shifted (i64##/ parameter + (_.define approximation (i64::left_shifted (i64::/ parameter subject/2) (_.i32 +1))) - (_.if (i64##= i64##zero approximation) + (_.if (i64::= i64::zero approximation) (_.return (_.? (..negative? parameter) - i64##one - i64##-one)) - (let [remainder (i64##- (i64##* approximation + i64::one + i64::-one)) + (let [remainder (i64::- (i64::* approximation parameter) subject)] - (_.return (i64##+ (i64##/ parameter + (_.return (i64::+ (i64::/ parameter remainder) approximation))))))))) - (_.if (i64##= i64##min parameter) - (_.return i64##zero)) + (_.if (i64::= i64::min parameter) + (_.return i64::zero)) (_.if (..negative? subject) (_.return (_.? (..negative? parameter) - (i64##/ (i64##opposite parameter) - (i64##opposite subject)) - (i64##opposite (i64##/ parameter - (i64##opposite subject)))))) + (i64::/ (i64::opposite parameter) + (i64::opposite subject)) + (i64::opposite (i64::/ parameter + (i64::opposite subject)))))) (_.if (..negative? parameter) - (_.return (i64##opposite (i64##/ (i64##opposite parameter) subject)))) + (_.return (i64::opposite (i64::/ (i64::opposite parameter) subject)))) (with_vars [result remainder] (all _.then - (_.define result i64##zero) + (_.define result i64::zero) (_.define remainder subject) - (_.while (i64##<= remainder parameter) + (_.while (i64::<= remainder parameter) (with_vars [approximate approximate_result approximate_remainder log2 delta] - (let [approximate_result' (i64##of_number approximate) - approx_remainder (i64##* parameter approximate_result)] + (let [approximate_result' (i64::of_number approximate) + approx_remainder (i64::* parameter approximate_result)] (all _.then - (_.define approximate (|> (i64##number remainder) - (_./ (i64##number parameter)) + (_.define approximate (|> (i64::number remainder) + (_./ (i64::number parameter)) (_.apply_1 (_.var "Math.floor")) (_.apply_2 (_.var "Math.max") (_.i32 +1)))) (_.define log2 (|> approximate @@ -605,60 +605,60 @@ (_.define approximate_result approximate_result') (_.define approximate_remainder approx_remainder) (_.while (_.or (..negative? approximate_remainder) - (i64##< approximate_remainder + (i64::< approximate_remainder remainder)) (all _.then (_.set approximate (_.- delta approximate)) (_.set approximate_result approximate_result') (_.set approximate_remainder approx_remainder))) - (_.set result (i64##+ (_.? (i64##= i64##zero approximate_result) - i64##one + (_.set result (i64::+ (_.? (i64::= i64::zero approximate_result) + i64::one approximate_result) result)) - (_.set remainder (i64##- approximate_remainder remainder)))))) + (_.set remainder (i64::- approximate_remainder remainder)))))) (_.return result))))) -(runtime: (i64##% parameter subject) +(runtime: (i64::% parameter subject) (let [flat (|> subject - (i64##/ parameter) - (i64##* parameter))] - (_.return (i64##- flat subject)))) + (i64::/ parameter) + (i64::* parameter))] + (_.return (i64::- flat subject)))) (def: runtime//i64 Statement (all _.then ..runtime//bit - @i64##2^16 - @i64##2^32 - @i64##2^64 - @i64##2^63 - @i64##unsigned_low - @i64##new - @i64##zero - @i64##min - @i64##max - @i64##one - @i64##= - @i64##+ - @i64##opposite - @i64##-one - @i64##number - @i64##of_number - @i64##- - @i64##* - @i64##< - @i64##/ - @i64##% + @i64::2^16 + @i64::2^32 + @i64::2^64 + @i64::2^63 + @i64::unsigned_low + @i64::new + @i64::zero + @i64::min + @i64::max + @i64::one + @i64::= + @i64::+ + @i64::opposite + @i64::-one + @i64::number + @i64::of_number + @i64::- + @i64::* + @i64::< + @i64::/ + @i64::% )) (runtime: (text//index start part text) (with_vars [idx] (all _.then - (_.define idx (|> text (_.do "indexOf" (list part (i64##number start))))) + (_.define idx (|> text (_.do "indexOf" (list part (i64::number start))))) (_.return (_.? (_.= (_.i32 -1) idx) ..none - (..some (i64##of_number idx))))))) + (..some (i64::of_number idx))))))) (runtime: (text//clip offset length text) (_.return (|> text (_.do "substring" (list (_.the ..i64_low_field offset) @@ -671,7 +671,7 @@ (_.define result (|> text (_.do "charCodeAt" (list (_.the ..i64_low_field idx))))) (_.if (_.not_a_number? result) (_.throw (_.string "[Lux Error] Cannot get char from text.")) - (_.return (i64##of_number result)))))) + (_.return (i64::of_number result)))))) (def: runtime//text Statement @@ -779,4 +779,4 @@ {.#None} (|> ..runtime _.code - (# utf8.codec encoded))])]))) + (at utf8.codec encoded))])]))) 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 8fb2dcd0c..6857dae20 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 @@ -154,7 +154,7 @@ [path|i64_fork (I64 Any) (//value.unwrap type.long) _.dup2 _.pop2 ..long _.lcmp _.ifne] [path|f64_fork Frac (//value.unwrap type.double) _.dup2 _.pop2 _.double _.dcmpl _.ifne] - [path|text_fork Text (# _.monad in []) _.dup _.pop _.string ..equals@Object _.ifeq] + [path|text_fork Text (at _.monad in []) _.dup _.pop _.string ..equals@Object _.ifeq] ) (def: (path' stack_depth @else @end phase archive) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux index ac744121f..020956cf5 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux @@ -22,7 +22,7 @@ [outcome (do (try.with @) [file (is (IO (Try (File IO))) (file.get_file io.monad file.default file_path))] - (# file over_write bytecode))] + (at file over_write bytecode))] (in (case outcome {try.#Success definition} file_path diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux index ebd1008a1..ef7876953 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux @@ -132,11 +132,11 @@ _.return)})) (sequence.sequence))] (io.run! (do [! (try.with io.monad)] - [bytecode (# ! each (format.result class.writer) - (io.io bytecode)) + [bytecode (at ! each (format.result class.writer) + (io.io bytecode)) _ (loader.store eval_class bytecode library) class (loader.load eval_class loader) - value (# io.monad in (class_value eval_class class))] + value (at io.monad in (class_value eval_class class))] (in [value [eval_class bytecode]]))))) @@ -144,8 +144,8 @@ (-> Library java/lang/ClassLoader Definition (Try Any)) (io.run! (do (try.with io.monad) [existing_class? (|> (atom.read! library) - (# io.monad each (function (_ library) - (dictionary.key? library class_name))) + (at io.monad each (function (_ library) + (dictionary.key? library class_name))) (try.lifted io.monad) (is (IO (Try Bit)))) _ (if existing_class? @@ -169,8 +169,8 @@ (is //runtime.Host (implementation (def: (evaluate context @it,valueG) - (# try.monad each product.left - (..evaluate! library loader (format "E" (//runtime.class_name context)) @it,valueG))) + (at try.monad each product.left + (..evaluate! library loader (format "E" (//runtime.class_name context)) @it,valueG))) (def: execute (..execute! library loader)) @@ -191,5 +191,5 @@ custom)] _ (loader.store class_name bytecode library) class (loader.load class_name loader)] - (# io.monad in (..class_value class_name class))))) + (at io.monad in (..class_value class_name class))))) ))]))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux index 2848eab59..11db49aed 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux @@ -42,8 +42,8 @@ (def: (foreign archive variable) (-> Archive Register (Operation (Bytecode Any))) (do [! ////.monad] - [bytecode_name (# ! each //runtime.class_name - (generation.context archive))] + [bytecode_name (at ! each //runtime.class_name + (generation.context archive))] (in (all _.composite ..this (_.getfield (type.class bytecode_name (list)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux index d923ea65d..4c6a232f9 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux @@ -657,4 +657,4 @@ ... This shift is done to avoid the possibility of forged labels ... to be in the range of the labels that are generated automatically ... during the evaluation of Bytecode expressions. - (# ////.monad each (|>> ++ (i64.left_shifted shift)) generation.next))) + (at ////.monad each (|>> ++ (i64.left_shifted shift)) generation.next))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux index 43d48e1c3..f4b885825 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux @@ -32,7 +32,7 @@ (Generator (Tuple Synthesis)) (case membersS {.#End} - (# phase.monad in //runtime.unit) + (at phase.monad in //runtime.unit) {.#Item singletonS {.#End}} (phase archive singletonS) 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 c65093838..fd878a2b7 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 @@ -55,7 +55,7 @@ (do [! ///////phase.monad] [this (expression archive this) that (statement expression archive that) - $dummy (# ! each _.var (/////generation.symbol "_exec"))] + $dummy (at ! each _.var (/////generation.symbol "_exec"))] (in (all _.then (_.set (list $dummy) this) that)))) @@ -298,6 +298,6 @@ (-> Phase! (Generator [Synthesis Path])) (|> [valueS pathP] (..case! statement expression archive) - (# ///////phase.monad each - (|>> (_.closure (list)) - (_.apply (list)))))) + (at ///////phase.monad each + (|>> (_.closure (list)) + (_.apply (list)))))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux index a8757090a..1c8bfca9b 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux @@ -73,8 +73,8 @@ [dependencies (cache.dependencies archive bodyS) [function_name body!] (/////generation.with_new_context archive dependencies (do ! - [@scope (# ! each ..@scope - (/////generation.context archive))] + [@scope (at ! each ..@scope + (/////generation.context archive))] (/////generation.with_anchor [1 @scope] (statement expression archive bodyS)))) closureO+ (monad.each ! (expression archive) environment) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux index c79123870..5e3a16128 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux @@ -59,12 +59,12 @@ {.#End} (|> bodyS (statement expression archive) - (# ///////phase.monad each (|>> [(list)]))) + (at ///////phase.monad each (|>> [(list)]))) ... true loop _ (do [! ///////phase.monad] - [@scope (# ! each ..@scope /////generation.next) + [@scope (at ! each ..@scope /////generation.next) initsO+ (monad.each ! (expression archive) initsS+) body! (/////generation.with_anchor [start @scope] (statement expression archive bodyS))] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux index 9b72bdf74..a286396f4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux @@ -199,31 +199,31 @@ (_.var "table.move")))) ))))) -(runtime: (sum//get sum expected##right? expected##lefts) +(runtime: (sum//get sum expected::right? expected::lefts) (let [mismatch! (_.return _.nil) - actual##lefts (_.the ..variant_tag_field sum) - actual##right? (_.the ..variant_flag_field sum) - actual##value (_.the ..variant_value_field sum) + actual::lefts (_.the ..variant_tag_field sum) + actual::right? (_.the ..variant_flag_field sum) + actual::value (_.the ..variant_value_field sum) recur! (all _.then - (_.set (list expected##lefts) (|> expected##lefts - (_.- actual##lefts) + (_.set (list expected::lefts) (|> expected::lefts + (_.- actual::lefts) (_.- (_.int +1)))) - (_.set (list sum) actual##value))] + (_.set (list sum) actual::value))] (<| (_.while (_.boolean true)) - (_.if (_.= expected##lefts actual##lefts) - (_.if (_.= expected##right? actual##right?) - (_.return actual##value) + (_.if (_.= expected::lefts actual::lefts) + (_.if (_.= expected::right? actual::right?) + (_.return actual::value) mismatch!)) - (_.if (_.< expected##lefts actual##lefts) - (_.if (_.= ..unit actual##right?) + (_.if (_.< expected::lefts actual::lefts) + (_.if (_.= ..unit actual::right?) recur! mismatch!)) - (_.if (_.= ..unit expected##right?) - (_.return (variant' (|> actual##lefts - (_.- expected##lefts) + (_.if (_.= ..unit expected::right?) + (_.return (variant' (|> actual::lefts + (_.- expected::lefts) (_.- (_.int +1))) - actual##right? - actual##value))) + actual::right? + actual::value))) mismatch!))) (def: runtime//adt @@ -433,4 +433,4 @@ {.#None} (|> ..runtime _.code - (# utf8.codec encoded))])]))) + (at utf8.codec encoded))])]))) 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 9815d9e3e..c05a3813d 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 @@ -213,7 +213,7 @@ (pattern (<simple> idx nextP)) (|> nextP again - (# ///////phase.monad each (_.then (<choice> true idx))))]) + (at ///////phase.monad each (_.then (<choice> true idx))))]) ([/////synthesis.side/left /////synthesis.simple_left_side ..left_choice] [/////synthesis.side/right /////synthesis.simple_right_side ..right_choice]) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux index b6c9d1ab2..ff3335b50 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux @@ -72,8 +72,8 @@ (do [! ///////phase.monad] [[function_name body!] (/////generation.with_new_context archive (do ! - [@scope (# ! each ..@scope - (/////generation.context archive))] + [@scope (at ! each ..@scope + (/////generation.context archive))] (/////generation.with_anchor [1 @scope] (statement expression archive bodyS)))) closureG+ (monad.each ! (expression archive) environment) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux index 633b2c724..c275144ac 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux @@ -58,7 +58,7 @@ ... true loop _ (do [! ///////phase.monad] - [@scope (# ! each ..@scope /////generation.next) + [@scope (at ! each ..@scope /////generation.next) initsO+ (monad.each ! (expression archive) initsS+) body! (/////generation.with_anchor [start @scope] (statement expression archive bodyS))] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux index 649463554..cb5b3c882 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux @@ -607,4 +607,4 @@ (sequence.sequence [..module_id (|> ..runtime _.code - (# utf8.codec encoded))])]))) + (at utf8.codec encoded))])]))) 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 dbb669dd8..d05828a5f 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 @@ -222,10 +222,10 @@ [{<tag> item} (do [! ///////phase.monad] [clauses (monad.each ! (function (_ [match then]) - (# ! each - (|>> [(_.= (|> match <format>) - ..peek)]) - (again then))) + (at ! each + (|>> [(_.= (|> match <format>) + ..peek)]) + (again then))) {.#Item item})] (in {.#Some (list#mix (function (_ [when then] else) (_.if when then else)) @@ -236,7 +236,7 @@ [/////synthesis.#Text_Fork (<| //primitive.text)]) _ - (# ///////phase.monad in {.#None}))) + (at ///////phase.monad in {.#None}))) (def: (pattern_matching' in_closure? statement expression archive) (-> Bit Phase! Phase Archive Path (Operation (Statement Any))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux index bc10a524b..1530c23eb 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux @@ -236,31 +236,31 @@ (_.return (_.slice_from right_index tuple)))) {.#None})))) -(runtime: (sum::get sum expected##right? expected##lefts) +(runtime: (sum::get sum expected::right? expected::lefts) (let [mismatch! (_.return _.none) - actual##lefts (_.item (_.int +0) sum) - actual##right? (_.item (_.int +1) sum) - actual##value (_.item (_.int +2) sum) + actual::lefts (_.item (_.int +0) sum) + actual::right? (_.item (_.int +1) sum) + actual::value (_.item (_.int +2) sum) recur! (all _.then - (_.set (list expected##lefts) (|> expected##lefts - (_.- actual##lefts) + (_.set (list expected::lefts) (|> expected::lefts + (_.- actual::lefts) (_.- (_.int +1)))) - (_.set (list sum) actual##value))] + (_.set (list sum) actual::value))] (_.while (_.bool true) - (<| (_.if (_.= expected##lefts actual##lefts) - (_.if (_.= expected##right? actual##right?) - (_.return actual##value) + (<| (_.if (_.= expected::lefts actual::lefts) + (_.if (_.= expected::right? actual::right?) + (_.return actual::value) mismatch!)) - (_.if (_.< expected##lefts actual##lefts) - (_.if (_.= ..unit actual##right?) + (_.if (_.< expected::lefts actual::lefts) + (_.if (_.= ..unit actual::right?) recur! mismatch!)) - (_.if (_.= ..unit expected##right?) - (_.return (variant' (|> actual##lefts - (_.- expected##lefts) + (_.if (_.= ..unit expected::right?) + (_.return (variant' (|> actual::lefts + (_.- expected::lefts) (_.- (_.int +1))) - actual##right? - actual##value))) + actual::right? + actual::value))) mismatch!) {.#None}))) @@ -460,4 +460,4 @@ {.#None} (|> ..runtime _.code - (# utf8.codec encoded))])]))) + (at utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux index 1ad75fe08..52626fefb 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux @@ -234,8 +234,8 @@ (Generator [Synthesis Path]) (do [! ///////phase.monad] [valueO (expression archive valueS)] - (<| (# ! each (|>> (all _.then - (_.set! $cursor (_.list (list valueO))) - (_.set! $savepoint (_.list (list)))) - _.block)) + (<| (at ! each (|>> (all _.then + (_.set! $cursor (_.list (list valueO))) + (_.set! $savepoint (_.list (list)))) + _.block)) (pattern_matching expression archive pathP)))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux index 59b92e776..2e9a49cef 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux @@ -76,8 +76,8 @@ (do [! ///////phase.monad] [[[function_module function_artifact] bodyO] (/////generation.with_new_context archive (do ! - [$self (# ! each (|>> ///reference.artifact _.var) - (/////generation.context archive))] + [$self (at ! each (|>> ///reference.artifact _.var) + (/////generation.context archive))] (/////generation.with_anchor $self (expression archive bodyS)))) closureO+ (monad.each ! (expression archive) environment) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux index f3756aad8..3b154ef14 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux @@ -43,7 +43,7 @@ ... true loop _ (do [! ///////phase.monad] - [$scope (# ! each _.var (/////generation.symbol "loop_scope")) + [$scope (at ! each _.var (/////generation.symbol "loop_scope")) initsO+ (monad.each ! (expression archive) initsS+) bodyO (/////generation.with_anchor $scope (expression archive bodyS))] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux index e430bfaff..8e4686a3d 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux @@ -842,4 +842,4 @@ (sequence.sequence [(%.nat ..module_id) (|> ..runtime _.code - (# utf8.codec encoded))])]))) + (at utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux index f93648d04..94f243273 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux @@ -64,7 +64,7 @@ (All (_ anchor expression directive) (-> (System expression) Archive Symbol (////generation.Operation anchor expression directive expression))) - (phase#each (|>> ..artifact (# system constant')) + (phase#each (|>> ..artifact (at system constant')) (////generation.remember archive name))) (template [<sigil> <name>] @@ -72,7 +72,7 @@ (All (_ expression) (-> (System expression) (-> Register expression))) - (|>> %.nat (format <sigil>) (# system variable')))] + (|>> %.nat (format <sigil>) (at system variable')))] ["f" foreign] ["l" local] 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 0f805e277..56b9b11f6 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 @@ -231,10 +231,10 @@ [{<tag> item} (do [! ///////phase.monad] [clauses (monad.each ! (function (_ [match then]) - (# ! each - (|>> [(_.= (|> match <format>) - ..peek)]) - (again then))) + (at ! each + (|>> [(_.= (|> match <format>) + ..peek)]) + (again then))) {.#Item item})] (in {.#Some (list#mix (function (_ [when then] else) (_.if when then else)) @@ -245,7 +245,7 @@ [/////synthesis.#Text_Fork (<| //primitive.text)]) _ - (# ///////phase.monad in {.#None}))) + (at ///////phase.monad in {.#None}))) (def: (pattern_matching' in_closure? statement expression archive) (-> Bit (Generator! Path)) @@ -288,10 +288,10 @@ [{<tag> item} (do [! ///////phase.monad] [clauses (monad.each ! (function (_ [match then]) - (# ! each - (|>> [(_.= (|> match <format>) - ..peek)]) - (again then))) + (at ! each + (|>> [(_.= (|> match <format>) + ..peek)]) + (again then))) {.#Item item})] (in (list#mix (function (_ [when then] else) (_.if when then else)) @@ -378,6 +378,6 @@ (-> Phase! (Generator [Synthesis Path])) (|> case (case! true statement expression archive) - (# ///////phase.monad each - (|>> [(list)] (_.lambda {.#None}) - (_.apply_lambda (list)))))) + (at ///////phase.monad each + (|>> [(list)] (_.lambda {.#None}) + (_.apply_lambda (list)))))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux index e309396f2..f21273b23 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux @@ -214,31 +214,31 @@ (-> Expression Computation) ..right) -(runtime: (sum//get sum expected##right? expected##lefts) +(runtime: (sum//get sum expected::right? expected::lefts) (let [mismatch! (_.return _.nil) - actual##lefts (_.item (_.string ..variant_tag_field) sum) - actual##right? (_.item (_.string ..variant_flag_field) sum) - actual##value (_.item (_.string ..variant_value_field) sum) + actual::lefts (_.item (_.string ..variant_tag_field) sum) + actual::right? (_.item (_.string ..variant_flag_field) sum) + actual::value (_.item (_.string ..variant_value_field) sum) recur! (all _.then - (_.set (list expected##lefts) (|> expected##lefts - (_.- actual##lefts) + (_.set (list expected::lefts) (|> expected::lefts + (_.- actual::lefts) (_.- (_.int +1)))) - (_.set (list sum) actual##value))] + (_.set (list sum) actual::value))] (<| (_.while (_.bool true)) - (_.if (_.= expected##lefts actual##lefts) - (_.if (_.= expected##right? actual##right?) - (_.return actual##value) + (_.if (_.= expected::lefts actual::lefts) + (_.if (_.= expected::right? actual::right?) + (_.return actual::value) mismatch!)) - (_.if (_.< expected##lefts actual##lefts) - (_.if (_.= ..unit actual##right?) + (_.if (_.< expected::lefts actual::lefts) + (_.if (_.= ..unit actual::right?) recur! mismatch!)) - (_.if (_.= ..unit expected##right?) - (_.return (sum//make (|> actual##lefts - (_.- expected##lefts) + (_.if (_.= ..unit expected::right?) + (_.return (sum//make (|> actual::lefts + (_.- expected::lefts) (_.- (_.int +1))) - actual##right? - actual##value))) + actual::right? + actual::value))) mismatch!))) (def: runtime//adt @@ -273,15 +273,15 @@ @lux//program_args )) -(def: i64##+limit (_.manual "+0x7FFFFFFFFFFFFFFF")) -(def: i64##-limit (_.manual "-0x8000000000000000")) -(def: i64##+cap (_.manual "+0x8000000000000000")) -(def: i64##-cap (_.manual "-0x8000000000000001")) +(def: i64::+limit (_.manual "+0x7FFFFFFFFFFFFFFF")) +(def: i64::-limit (_.manual "-0x8000000000000000")) +(def: i64::+cap (_.manual "+0x8000000000000000")) +(def: i64::-cap (_.manual "-0x8000000000000001")) -(runtime: i64##+iteration (_.manual "(+1<<64)")) -(runtime: i64##-iteration (_.manual "(-1<<64)")) +(runtime: i64::+iteration (_.manual "(+1<<64)")) +(runtime: i64::-iteration (_.manual "(-1<<64)")) -(runtime: (i64##i64 input) +(runtime: (i64::i64 input) [..mruby? (_.return input)] (with_vars [temp] (`` (<| (~~ (template [<scenario> <iteration> <cap> <entrance>] @@ -292,49 +292,49 @@ (|> temp (_.- <cap>) (_.+ <entrance>)) temp))))] - [(_.> ..i64##+limit) ..i64##+iteration ..i64##+cap ..i64##-limit] - [(_.< ..i64##-limit) ..i64##-iteration ..i64##-cap ..i64##+limit] + [(_.> ..i64::+limit) ..i64::+iteration ..i64::+cap ..i64::-limit] + [(_.< ..i64::-limit) ..i64::-iteration ..i64::-cap ..i64::+limit] )) (_.return input))))) -(def: i32##low +(def: i32::low (|>> (_.bit_and (_.manual "+0xFFFFFFFF")))) -(def: i32##high +(def: i32::high (|>> (_.bit_shr (_.int +32)) - ..i32##low)) + ..i32::low)) -(def: i32##positive? +(def: i32::positive? (|>> (_.bit_and (_.manual "+0x80000000")) (_.= (_.int +0)))) -(def: i32##up +(def: i32::up (_.bit_shl (_.int +32))) (template: (i64 @high @low) - [(|> (_.? (i32##positive? @high) + [(|> (_.? (i32::positive? @high) @high (|> (_.manual "+0xFFFFFFFF") (_.- @high) _.bit_not)) - i32##up + i32::up (_.bit_or @low))]) (def: as_nat - (_.% ..i64##+iteration)) + (_.% ..i64::+iteration)) (template [<runtime> <host>] [(runtime: (<runtime> left right) - [..normal_ruby? (_.return (..i64##i64 (<host> (..as_nat left) (..as_nat right))))] + [..normal_ruby? (_.return (..i64::i64 (<host> (..as_nat left) (..as_nat right))))] (with_vars [high low] (all _.then - (_.set (list high) (<host> (i32##high left) (..i32##high right))) - (_.set (list low) (<host> (i32##low left) (..i32##low right))) + (_.set (list high) (<host> (i32::high left) (..i32::high right))) + (_.set (list low) (<host> (i32::low left) (..i32::low right))) (_.return (..i64 high low)))))] - [i64##and _.bit_and] - [i64##or _.bit_or] - [i64##xor _.bit_xor] + [i64::and _.bit_and] + [i64::or _.bit_or] + [i64::xor _.bit_xor] ) (def: (cap_shift! shift) @@ -350,28 +350,28 @@ (-> LVar Expression) (|>> (_.< (_.int +32)))) -(runtime: (i64##left_shifted shift input) +(runtime: (i64::left_shifted shift input) [..normal_ruby? (_.return (|> input (_.bit_shl (_.% (_.int +64) shift)) - ..i64##i64))] + ..i64::i64))] (with_vars [high low] (all _.then (..cap_shift! shift) (<| (..handle_no_shift! shift input) (_.if (..small_shift? shift) (all _.then - (_.set (list high) (_.bit_or (|> input i32##high (_.bit_shl shift)) - (|> input i32##low (_.bit_shr (_.- shift (_.int +32)))))) - (_.set (list low) (|> input i32##low (_.bit_shl shift))) - (_.return (..i64 (i32##low high) - (i32##low low))))) + (_.set (list high) (_.bit_or (|> input i32::high (_.bit_shl shift)) + (|> input i32::low (_.bit_shr (_.- shift (_.int +32)))))) + (_.set (list low) (|> input i32::low (_.bit_shl shift))) + (_.return (..i64 (i32::low high) + (i32::low low))))) (all _.then - (_.set (list high) (|> input i32##low (_.bit_shl (_.- (_.int +32) shift)))) - (_.return (..i64 (i32##low high) + (_.set (list high) (|> input i32::low (_.bit_shl (_.- (_.int +32) shift)))) + (_.return (..i64 (i32::low high) (_.int +0))))) ))) -(runtime: (i64##right_shifted shift input) +(runtime: (i64::right_shifted shift input) [..normal_ruby? (all _.then (_.set (list shift) (_.% (_.int +64) shift)) (_.return (_.? (_.= (_.int +0) shift) @@ -385,15 +385,15 @@ (<| (..handle_no_shift! shift input) (_.if (..small_shift? shift) (all _.then - (_.set (list high) (|> input i32##high (_.bit_shr shift))) - (_.set (list low) (|> input i32##low (_.bit_shr shift) - (_.bit_or (|> input i32##high (_.bit_shl (_.- shift (_.int +32))))))) + (_.set (list high) (|> input i32::high (_.bit_shr shift))) + (_.set (list low) (|> input i32::low (_.bit_shr shift) + (_.bit_or (|> input i32::high (_.bit_shl (_.- shift (_.int +32))))))) (_.return (..i64 high low)))) (_.return (_.? (|> shift (_.= (_.int +32))) - (i32##high input) - (|> input i32##high (_.bit_shr (_.- (_.int +32) shift))))))))) + (i32::high input) + (|> input i32::high (_.bit_shr (_.- (_.int +32) shift))))))))) -(runtime: (i64##/ parameter subject) +(runtime: (i64::/ parameter subject) (_.return (_.? (_.and (_.= (_.int -1) parameter) (_.= (_.int int#bottom) subject)) subject @@ -402,47 +402,47 @@ (_.- extra) (_./ parameter)))))) -(runtime: (i64##+ parameter subject) - [..normal_ruby? (_.return (i64##i64 (_.+ parameter subject)))] +(runtime: (i64::+ parameter subject) + [..normal_ruby? (_.return (i64::i64 (_.+ parameter subject)))] (with_vars [high low] (all _.then - (_.set (list low) (_.+ (i32##low subject) - (i32##low parameter))) - (_.set (list high) (|> (i32##high low) - (_.+ (i32##high subject)) - (_.+ (i32##high parameter)) - i32##low)) - - (_.return (..i64 high (i32##low low))) + (_.set (list low) (_.+ (i32::low subject) + (i32::low parameter))) + (_.set (list high) (|> (i32::high low) + (_.+ (i32::high subject)) + (_.+ (i32::high parameter)) + i32::low)) + + (_.return (..i64 high (i32::low low))) ))) -(def: i64##min +(def: i64::min (_.manual "-0x8000000000000000")) -(def: (i64##opposite value) - (_.? (_.= i64##min value) - i64##min - (i64##+ (_.int +1) (_.bit_not value)))) +(def: (i64::opposite value) + (_.? (_.= i64::min value) + i64::min + (i64::+ (_.int +1) (_.bit_not value)))) -(runtime: (i64##- parameter subject) - [..normal_ruby? (_.return (i64##i64 (_.- parameter subject)))] - (_.return (i64##+ (i64##opposite parameter) subject))) +(runtime: (i64::- parameter subject) + [..normal_ruby? (_.return (i64::i64 (_.- parameter subject)))] + (_.return (i64::+ (i64::opposite parameter) subject))) -(def: i16##high +(def: i16::high (_.bit_shr (_.int +16))) -(def: i16##low +(def: i16::low (_.bit_and (_.manual "+0xFFFF"))) -(def: i16##up +(def: i16::up (_.bit_shl (_.int +16))) -(runtime: (i64##* parameter subject) - [..normal_ruby? (_.return (i64##i64 (_.* parameter subject)))] - (let [hh (|>> i32##high i16##high) - hl (|>> i32##high i16##low) - lh (|>> i32##low i16##high) - ll (|>> i32##low i16##low)] +(runtime: (i64::* parameter subject) + [..normal_ruby? (_.return (i64::i64 (_.* parameter subject)))] + (let [hh (|>> i32::high i16::high) + hl (|>> i32::high i16::low) + lh (|>> i32::low i16::high) + ll (|>> i32::low i16::low)] (with_vars [l48 l32 l16 l00 r48 r32 r16 r00 x48 x32 x16 x00 @@ -459,54 +459,54 @@ (_.set (list r00) (ll parameter)) (_.set (list x00) (_.* l00 r00)) - (_.set (list x16) (i16##high x00)) - (_.set (list x00) (i16##low x00)) + (_.set (list x16) (i16::high x00)) + (_.set (list x00) (i16::low x00)) (_.set (list x16) (|> x16 (_.+ (_.* l16 r00)))) - (_.set (list x32) (i16##high x16)) (_.set (list x16) (i16##low x16)) + (_.set (list x32) (i16::high x16)) (_.set (list x16) (i16::low x16)) (_.set (list x16) (|> x16 (_.+ (_.* l00 r16)))) - (_.set (list x32) (|> x32 (_.+ (i16##high x16)))) (_.set (list x16) (i16##low x16)) + (_.set (list x32) (|> x32 (_.+ (i16::high x16)))) (_.set (list x16) (i16::low x16)) (_.set (list x32) (|> x32 (_.+ (_.* l32 r00)))) - (_.set (list x48) (i16##high x32)) (_.set (list x32) (i16##low x32)) + (_.set (list x48) (i16::high x32)) (_.set (list x32) (i16::low x32)) (_.set (list x32) (|> x32 (_.+ (_.* l16 r16)))) - (_.set (list x48) (|> x48 (_.+ (i16##high x32)))) (_.set (list x32) (i16##low x32)) + (_.set (list x48) (|> x48 (_.+ (i16::high x32)))) (_.set (list x32) (i16::low x32)) (_.set (list x32) (|> x32 (_.+ (_.* l00 r32)))) - (_.set (list x48) (|> x48 (_.+ (i16##high x32)))) (_.set (list x32) (i16##low x32)) + (_.set (list x48) (|> x48 (_.+ (i16::high x32)))) (_.set (list x32) (i16::low x32)) (_.set (list x48) (|> x48 (_.+ (_.* l48 r00)) (_.+ (_.* l32 r16)) (_.+ (_.* l16 r32)) (_.+ (_.* l00 r48)) - i16##low)) + i16::low)) - (_.set (list high) (_.bit_or (i16##up x48) x32)) - (_.set (list low) (_.bit_or (i16##up x16) x00)) + (_.set (list high) (_.bit_or (i16::up x48) x32)) + (_.set (list low) (_.bit_or (i16::up x16) x00)) (_.return (..i64 high low)) ))) ) -(runtime: (i64##char subject) +(runtime: (i64::char subject) [..mruby? (_.return (_.do "chr" (list) {.#None} subject))] (_.return (_.do "chr" (list (_.string "UTF-8")) {.#None} subject))) (def: runtime//i64 Statement (all _.then - @i64##+iteration - @i64##-iteration - @i64##i64 - @i64##left_shifted - @i64##right_shifted - @i64##and - @i64##or - @i64##xor - @i64##+ - @i64##- - @i64##* - @i64##/ - @i64##char + @i64::+iteration + @i64::-iteration + @i64::i64 + @i64::left_shifted + @i64::right_shifted + @i64::and + @i64::or + @i64::xor + @i64::+ + @i64::- + @i64::* + @i64::/ + @i64::char )) (runtime: (f64//decode inputG) @@ -601,4 +601,4 @@ {.#None} (|> ..runtime _.code - (# utf8.codec encoded))])]))) + (at utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux index 0c5465e96..9a7db7f48 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux @@ -211,14 +211,14 @@ (def: (pattern_matching expression archive pathP) (Generator Path) - (# ///////phase.monad each - (try_pm (_.raise/1 (_.string "Invalid expression for pattern-matching."))) - (pattern_matching' expression archive pathP))) + (at ///////phase.monad each + (try_pm (_.raise/1 (_.string "Invalid expression for pattern-matching."))) + (pattern_matching' expression archive pathP))) (def: .public (case expression archive [valueS pathP]) (Generator [Synthesis Path]) (do [! ///////phase.monad] [valueO (expression archive valueS)] - (<| (# ! each (_.let (list [@cursor (_.list/* (list valueO))] - [@savepoint (_.list/* (list))]))) + (<| (at ! each (_.let (list [@cursor (_.list/* (list valueO))] + [@savepoint (_.list/* (list))]))) (pattern_matching expression archive pathP)))) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux index c937c11e7..6f5654056 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux @@ -65,8 +65,8 @@ (do [! ///////phase.monad] [[function_name bodyO] (/////generation.with_new_context archive (do ! - [@self (# ! each (|>> ///reference.artifact _.var) - (/////generation.context archive))] + [@self (at ! each (|>> ///reference.artifact _.var) + (/////generation.context archive))] (/////generation.with_anchor @self (expression archive bodyS)))) closureO+ (monad.each ! (expression archive) environment) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux index 94b77f919..c147bf10a 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux @@ -367,4 +367,4 @@ (sequence.sequence [(%.nat ..module_id) (|> ..runtime _.code - (# utf8.codec encoded))])]))) + (at utf8.codec encoded))])]))) 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 bdbcdeb02..a24d6f7d4 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 @@ -66,7 +66,7 @@ [///simple.#Text /.#Text_Fork |>])) {///pattern.#Bind register} - (<| (# ///.monad each (|>> {/.#Seq {/.#Bind register}})) + (<| (at ///.monad each (|>> {/.#Seq {/.#Bind register}})) /.with_new_local thenC) @@ -106,7 +106,7 @@ (All (_ a) (-> (-> Path Path Path) (Equivalence a) [a Path] (/.Fork a Path) (/.Fork a Path))) - (if (# equivalence = new_test old_test) + (if (at equivalence = new_test old_test) [[old_test (weave new_then old_then)] old_tail] [[old_test old_then] (case old_tail 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 dec9a0177..ac7a81a73 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 @@ -113,7 +113,7 @@ [then (grow_path grow then) else (case else {.#Some else} - (# ! each (|>> {.#Some}) (grow_path grow else)) + (at ! each (|>> {.#Some}) (grow_path grow else)) {.#None} (in {.#None}))] @@ -266,10 +266,10 @@ (pattern (/.function/abstraction [env' down_arity' bodyS'])) (|> bodyS' (grow env') - (# ! each (function (_ body) - [/.#environment environment - /.#arity (++ down_arity') - /.#body body]))) + (at ! each (function (_ body) + [/.#environment environment + /.#arity (++ down_arity') + /.#body body]))) _ (in [/.#environment environment 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 b3cb4d704..d57b85be1 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 @@ -49,7 +49,7 @@ [then (again then) else (case else {.#Some else} - (# ! each (|>> {.#Some}) (again else)) + (at ! each (|>> {.#Some}) (again else)) {.#None} (in {.#None}))] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux index 584612bbb..1ea006203 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux @@ -265,10 +265,10 @@ [[redundancy then] (again [redundancy then]) [redundancy else] (case else {.#Some else} - (# ! each - (function (_ [redundancy else]) - [redundancy {.#Some else}]) - (again [redundancy else])) + (at ! each + (function (_ [redundancy else]) + [redundancy {.#Some else}]) + (again [redundancy else])) {.#None} (in [redundancy {.#None}]))] @@ -453,4 +453,4 @@ (-> Synthesis (Try Synthesis)) (|>> [..initial] optimization' - (# try.monad each product.right))) + (at try.monad each product.right))) 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 cd3910d49..3b7d560b4 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux @@ -324,7 +324,7 @@ [(case (|> <source_code> (!clip <start> <end>) (text.replaced ..digit_separator "") - (# <codec> decoded)) + (at <codec> decoded)) {.#Right output} {.#Right [[(let [[where::file where::line where::column] where] [where::file where::line (!n/+ (!n/- <start> <end>) where::column)]) 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 d1cad0503..2f9b007dd 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux @@ -420,21 +420,21 @@ {#Bit_Fork sample_when sample_then sample_else}] (and (bit#= reference_when sample_when) (= reference_then sample_then) - (# (maybe.equivalence =) = reference_else sample_else)) + (at (maybe.equivalence =) = reference_else sample_else)) (^.template [<tag> <equivalence>] [[{<tag> reference_item} {<tag> sample_item}] - (# (list.equivalence (product.equivalence <equivalence> =)) = - {.#Item reference_item} - {.#Item sample_item})]) + (at (list.equivalence (product.equivalence <equivalence> =)) = + {.#Item reference_item} + {.#Item sample_item})]) ([#I64_Fork (is (Equivalence I64) i64.equivalence)] [#F64_Fork f.equivalence] [#Text_Fork text.equivalence]) (^.template [<tag> <equivalence>] [[{<tag> reference'} {<tag> sample'}] - (# <equivalence> = reference' sample')]) + (at <equivalence> = reference' sample')]) ([#Access /access.equivalence] [#Then equivalence]) @@ -455,7 +455,7 @@ (All (_ a) (-> (Hash a) (Hash (Path' a)))) (def: equivalence - (..path'_equivalence (# super equivalence))) + (..path'_equivalence (at super equivalence))) (def: (hash value) (case value @@ -463,23 +463,23 @@ 2 {#Access access} - (n.* 3 (# /access.hash hash access)) + (n.* 3 (at /access.hash hash access)) {#Bind register} - (n.* 5 (# n.hash hash register)) + (n.* 5 (at n.hash hash register)) {#Bit_Fork when then else} (all n.* 7 - (# bit.hash hash when) + (at bit.hash hash when) (hash then) - (# (maybe.hash (path'_hash super)) hash else)) + (at (maybe.hash (path'_hash super)) hash else)) (^.template [<factor> <tag> <hash>] [{<tag> item} (let [case_hash (product.hash <hash> (path'_hash super)) item_hash (product.hash case_hash (list.hash case_hash))] - (n.* <factor> (# item_hash hash item)))]) + (n.* <factor> (at item_hash hash item)))]) ([11 #I64_Fork i64.hash] [13 #F64_Fork f.hash] [17 #Text_Fork text.hash]) @@ -488,12 +488,12 @@ [{<tag> fork} (let [again_hash (path'_hash super) fork_hash (product.hash again_hash again_hash)] - (n.* <factor> (# fork_hash hash fork)))]) + (n.* <factor> (at fork_hash hash fork)))]) ([19 #Alt] [23 #Seq]) {#Then body} - (n.* 29 (# super hash body)) + (n.* 29 (at super hash body)) ))) (implementation: (branch_equivalence (open "#[0]")) @@ -515,13 +515,13 @@ [{#Get [reference_path reference_record]} {#Get [sample_path sample_record]}] - (and (# (list.equivalence /member.equivalence) = reference_path sample_path) + (and (at (list.equivalence /member.equivalence) = reference_path sample_path) (#= reference_record sample_record)) [{#Case [reference_input reference_path]} {#Case [sample_input sample_path]}] (and (#= reference_input sample_input) - (# (path'_equivalence #=) = reference_path sample_path)) + (at (path'_equivalence #=) = reference_path sample_path)) _ false))) @@ -530,36 +530,36 @@ (All (_ a) (-> (Hash a) (Hash (Branch a)))) (def: equivalence - (..branch_equivalence (# super equivalence))) + (..branch_equivalence (at super equivalence))) (def: (hash value) (case value {#Exec this that} (all n.* 2 - (# super hash this) - (# super hash that)) + (at super hash this) + (at super hash that)) {#Let [input register body]} (all n.* 3 - (# super hash input) - (# n.hash hash register) - (# super hash body)) + (at super hash input) + (at n.hash hash register) + (at super hash body)) {#If [test then else]} (all n.* 5 - (# super hash test) - (# super hash then) - (# super hash else)) + (at super hash test) + (at super hash then) + (at super hash else)) {#Get [path record]} (all n.* 7 - (# (list.hash /member.hash) hash path) - (# super hash record)) + (at (list.hash /member.hash) hash path) + (at super hash record)) {#Case [input path]} (all n.* 11 - (# super hash input) - (# (..path'_hash super) hash path)) + (at super hash input) + (at (..path'_hash super) hash path)) ))) (implementation: (loop_equivalence (open "/#[0]")) @@ -570,11 +570,11 @@ [{#Scope [reference_start reference_inits reference_iteration]} {#Scope [sample_start sample_inits sample_iteration]}] (and (n.= reference_start sample_start) - (# (list.equivalence /#=) = reference_inits sample_inits) + (at (list.equivalence /#=) = reference_inits sample_inits) (/#= reference_iteration sample_iteration)) [{#Again reference} {#Again sample}] - (# (list.equivalence /#=) = reference sample) + (at (list.equivalence /#=) = reference sample) _ false))) @@ -583,19 +583,19 @@ (All (_ a) (-> (Hash a) (Hash (Loop a)))) (def: equivalence - (..loop_equivalence (# super equivalence))) + (..loop_equivalence (at super equivalence))) (def: (hash value) (case value {#Scope [start inits iteration]} (all n.* 2 - (# n.hash hash start) - (# (list.hash super) hash inits) - (# super hash iteration)) + (at n.hash hash start) + (at (list.hash super) hash inits) + (at super hash iteration)) {#Again resets} (all n.* 3 - (# (list.hash super) hash resets)) + (at (list.hash super) hash resets)) ))) (implementation: (function_equivalence (open "#[0]")) @@ -605,14 +605,14 @@ (case [reference sample] [{#Abstraction [reference_environment reference_arity reference_body]} {#Abstraction [sample_environment sample_arity sample_body]}] - (and (# (list.equivalence #=) = reference_environment sample_environment) + (and (at (list.equivalence #=) = reference_environment sample_environment) (n.= reference_arity sample_arity) (#= reference_body sample_body)) [{#Apply [reference_abstraction reference_arguments]} {#Apply [sample_abstraction sample_arguments]}] (and (#= reference_abstraction sample_abstraction) - (# (list.equivalence #=) = reference_arguments sample_arguments)) + (at (list.equivalence #=) = reference_arguments sample_arguments)) _ false))) @@ -621,20 +621,20 @@ (All (_ a) (-> (Hash a) (Hash (Function a)))) (def: equivalence - (..function_equivalence (# super equivalence))) + (..function_equivalence (at super equivalence))) (def: (hash value) (case value {#Abstraction [environment arity body]} (all n.* 2 - (# (list.hash super) hash environment) - (# n.hash hash arity) - (# super hash body)) + (at (list.hash super) hash environment) + (at n.hash hash arity) + (at super hash body)) {#Apply [abstraction arguments]} (all n.* 3 - (# super hash abstraction) - (# (list.hash super) hash arguments)) + (at super hash abstraction) + (at (list.hash super) hash arguments)) ))) (implementation: (control_equivalence (open "#[0]")) @@ -644,7 +644,7 @@ (case [reference sample] (^.template [<tag> <equivalence>] [[{<tag> reference} {<tag> sample}] - (# (<equivalence> #=) = reference sample)]) + (at (<equivalence> #=) = reference sample)]) ([#Branch ..branch_equivalence] [#Loop ..loop_equivalence] [#Function ..function_equivalence]) @@ -656,13 +656,13 @@ (All (_ a) (-> (Hash a) (Hash (Control a)))) (def: equivalence - (..control_equivalence (# super equivalence))) + (..control_equivalence (at super equivalence))) (def: (hash value) (case value (^.template [<factor> <tag> <hash>] [{<tag> value} - (n.* <factor> (# (<hash> super) hash value))]) + (n.* <factor> (at (<hash> super) hash value))]) ([2 #Branch ..branch_hash] [3 #Loop ..loop_hash] [5 #Function ..function_hash]) @@ -675,7 +675,7 @@ (case [reference sample] (^.template [<tag> <equivalence>] [[{<tag> reference'} {<tag> sample'}] - (# <equivalence> = reference' sample')]) + (at <equivalence> = reference' sample')]) ([#Simple /simple.equivalence] [#Structure (analysis/complex.equivalence =)] [#Reference reference.equivalence] @@ -699,7 +699,7 @@ (case value (^.template [<tag> <hash>] [{<tag> value} - (# <hash> hash value)]) + (at <hash> hash value)]) ([#Simple /simple.hash] [#Structure (analysis/complex.hash again_hash)] [#Reference reference.hash] diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux index 55750f9e1..3d211344f 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/access.lux @@ -35,4 +35,4 @@ (def: .public equivalence (Equivalence Access) - (# ..hash equivalence)) + (at ..hash equivalence)) 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 683be67f9..9c06a680a 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 @@ -31,4 +31,4 @@ (def: .public equivalence (Equivalence Member) - (# ..hash equivalence)) + (at ..hash equivalence)) 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 8b3c71bee..0ba13495a 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 @@ -31,4 +31,4 @@ (def: .public equivalence (Equivalence Side) - (# ..hash equivalence)) + (at ..hash equivalence)) diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux index 17419d58f..a0fdb6e67 100644 --- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux +++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis/simple.lux @@ -66,7 +66,7 @@ (|>> (pipe.case (^.template [<factor> <tag> <hash>] [{<tag> value'} - (n.* <factor> (# <hash> hash value'))]) + (n.* <factor> (at <hash> hash value'))]) ([2 #Bit bit.hash] [3 #F64 f.hash] [5 #Text text.hash] diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/archive.lux index b88b57053..cf56ab7f3 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive.lux @@ -138,7 +138,7 @@ (the #resolver) dictionary.entries (list.all (function (_ [module [module_id entry]]) - (# maybe.monad each (|>> [module_id] [module]) entry))))) + (at maybe.monad each (|>> [module_id] [module]) entry))))) (def: .public (find module archive) (-> descriptor.Module Archive (Try (Entry Any))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux index 146b2d12d..d6dc3c74f 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact/category.lux @@ -49,7 +49,7 @@ true [{#Definition left} {#Definition right}] - (# definition_equivalence = left right) + (at definition_equivalence = left right) (^.template [<tag>] [[{<tag> left} {<tag> right}] diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux index 8cb500cc6..dade0e5d8 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/module/descriptor.lux @@ -77,6 +77,6 @@ <binary>.text <binary>.text <binary>.nat - (# <>.monad in {.#Cached}) + (at <>.monad in {.#Cached}) (<binary>.set text.hash <binary>.text) )) 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 7f0f4faeb..30404cc59 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 @@ -33,9 +33,9 @@ (def: .public (content key document) (All (_ d) (-> (Key d) (Document Any) (Try d))) (let [[document//signature document//content] (representation document)] - (if (# signature.equivalence = - (key.signature key) - document//signature) + (if (at signature.equivalence = + (key.signature key) + document//signature) {try.#Success (sharing [e] (Key e) key 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 3b849a479..7206a2f6c 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux @@ -166,7 +166,7 @@ (case tag (^.template [<nat> <tag> <parser>] [<nat> - (# ! each (|>> {<tag>}) <parser>)]) + (at ! each (|>> {<tag>}) <parser>)]) ([0 //category.#Anonymous <binary>.any] [1 //category.#Definition definition] [2 //category.#Analyser <binary>.text] @@ -182,21 +182,21 @@ dependencies (is (Parser (Set unit.ID)) (<binary>.set unit.hash dependency))] (|> (<binary>.sequence_64 (all <>.and category mandatory? dependencies)) - (# <>.monad each (sequence#mix (function (_ [category mandatory? dependencies] registry) - (product.right - (case category - {//category.#Anonymous} - (..resource mandatory? dependencies registry) + (at <>.monad each (sequence#mix (function (_ [category mandatory? dependencies] registry) + (product.right + (case category + {//category.#Anonymous} + (..resource mandatory? dependencies registry) - (^.template [<tag> <create>] - [{<tag> name} - (<create> name mandatory? dependencies registry)]) - ([//category.#Definition ..definition] - [//category.#Analyser ..analyser] - [//category.#Synthesizer ..synthesizer] - [//category.#Generator ..generator] - [//category.#Directive ..directive] - [//category.#Custom ..custom]) - ))) - ..empty))))) + (^.template [<tag> <create>] + [{<tag> name} + (<create> name mandatory? dependencies registry)]) + ([//category.#Definition ..definition] + [//category.#Analyser ..analyser] + [//category.#Synthesizer ..synthesizer] + [//category.#Generator ..generator] + [//category.#Directive ..directive] + [//category.#Custom ..custom]) + ))) + ..empty))))) ) 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 2af463186..db55f4e1f 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/archive/unit.lux @@ -30,7 +30,7 @@ (def: .public equivalence (Equivalence ID) - (# ..hash equivalence)) + (at ..hash equivalence)) (def: .public none (Set ID) diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache.lux b/stdlib/source/library/lux/tool/compiler/meta/cache.lux index f3b0380b7..da7a95abf 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache.lux @@ -17,14 +17,14 @@ (def: .public (path fs context) (All (_ !) (-> (file.System !) Context file.Path)) - (let [/ (# fs separator)] + (let [/ (at fs separator)] (format (the context.#target context) / (the context.#host context) / (version.format //.version)))) (def: .public (enabled? fs context) (All (_ !) (-> (file.System !) Context (! Bit))) - (# fs directory? (..path fs context))) + (at fs directory? (..path fs context))) (def: .public (enable! ! fs context) (All (_ !) (-> (Monad !) (file.System !) Context (! (Try Any)))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/archive.lux index b1a331672..8a60f6d41 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/archive.lux @@ -16,9 +16,9 @@ (def: .public (descriptor fs context) (All (_ !) (-> (file.System !) Context file.Path)) (%.format (//.path fs context) - (# fs separator) + (at fs separator) "descriptor")) (def: .public (cache! fs context it) (All (_ !) (-> (file.System !) Context Archive (! (Try Any)))) - (# fs write (..descriptor fs context) (archive.export ///.version it))) + (at fs write (..descriptor fs context) (archive.export ///.version it))) 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 9ea2a1dd3..66e347398 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/artifact.lux @@ -24,16 +24,16 @@ (All (_ !) (-> (file.System !) Context module.ID artifact.ID file.Path)) (format (//module.path fs context @module) - (# fs separator) + (at fs separator) (%.nat @artifact) (the context.#artifact_extension context))) (def: .public (cache fs context @module @artifact) (All (_ !) (-> (file.System !) Context module.ID artifact.ID (! (Try Binary)))) - (# fs read (..path fs context @module @artifact))) + (at fs read (..path fs context @module @artifact))) (def: .public (cache! fs context @module @artifact content) (All (_ !) (-> (file.System !) Context module.ID artifact.ID Binary (! (Try Any)))) - (# fs write (..path fs context @module @artifact) content)) + (at fs write (..path fs context @module @artifact) content)) 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 8008fe5a6..6e5f46df9 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 @@ -171,7 +171,7 @@ (set.of_list symbol.hash) set.list (monad.each ! (generation.remember archive)) - (# ! each (set.of_list unit.hash))))) + (at ! each (set.of_list unit.hash))))) (def: .public (path_dependencies archive value) (All (_ anchor expression directive) @@ -182,7 +182,7 @@ (set.of_list symbol.hash) set.list (monad.each ! (generation.remember archive)) - (# ! each (set.of_list unit.hash))))) + (at ! each (set.of_list unit.hash))))) (def: .public all (-> (List (Set unit.ID)) diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux index 9a4ed2e1b..603aa2ffd 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/module.lux @@ -35,18 +35,18 @@ (def: .public (path fs context @module) (All (_ !) (-> (file.System !) Context module.ID file.Path)) (format (//.path fs context) - (# fs separator) + (at fs separator) (%.nat @module))) (def: .public (enabled? fs context @module) (All (_ !) (-> (file.System !) Context module.ID (! Bit))) - (# fs directory? (..path fs context @module))) + (at fs directory? (..path fs context @module))) (def: .public (enable! ! fs context @module) (All (_ !) (-> (Monad !) (file.System !) Context module.ID (! (Try Any)))) (do ! [.let [path (..path fs context @module)] - module_exists? (# fs directory? path)] + module_exists? (at fs directory? path)] (if module_exists? (in {try.#Success []}) (with_expansions [<failure> (exception.except ..cannot_enable [(//.path fs context) @@ -60,13 +60,13 @@ success (|> path - (# fs make_directory) - (# ! each (|>> (pipe.case - {try.#Failure error} - <failure> + (at fs make_directory) + (at ! each (|>> (pipe.case + {try.#Failure error} + <failure> - success - success)))))))))) + success + success)))))))))) (def: file file.Path @@ -75,28 +75,28 @@ (def: .public (descriptor fs context @module) (All (_ !) (-> (file.System !) Context module.ID file.Path)) (format (..path fs context @module) - (# fs separator) + (at fs separator) ..file)) (def: .public (cache! fs context @module content) (All (_ !) (-> (file.System !) Context module.ID Binary (! (Try Any)))) - (# fs write (..descriptor fs context @module) content)) + (at fs write (..descriptor fs context @module) content)) (def: .public (cache fs context @module) (All (_ !) (-> (file.System !) Context module.ID (! (Try Binary)))) - (# fs read (..descriptor fs context @module))) + (at fs read (..descriptor fs context @module))) (def: .public (artifacts ! fs context @module) (All (_ !) (-> (Monad !) (file.System !) Context module.ID (! (Try (Dictionary Text Binary))))) (do [! (try.with !)] - [files (# fs directory_files (..path fs context @module)) + [files (at fs directory_files (..path fs context @module)) pairs (|> files (list#each (function (_ file) [(file.name fs file) file])) (list.only (|>> product.left (text#= ..file) not)) (monad.each ! (function (_ [name path]) (|> path - (# fs read) - (# ! each (|>> [name]))))))] + (at fs read) + (at ! each (|>> [name]))))))] (in (dictionary.of_list text.hash (for @.old (as (List [Text Binary]) pairs) pairs))))) 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 6ccdcdd56..addb97821 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/cache/purge.lux @@ -43,10 +43,10 @@ (do [! (try.with async.monad)] [.let [cache (//module.path fs context @module)] _ (|> cache - (# fs directory_files) - (# ! each (monad.each ! (# fs delete))) - (# ! conjoint))] - (# fs delete cache))) + (at fs directory_files) + (at ! each (monad.each ! (at fs delete))) + (at ! conjoint))] + (at fs delete cache))) (def: .public (valid? expected actual) (-> Descriptor Input Bit) diff --git a/stdlib/source/library/lux/tool/compiler/meta/export.lux b/stdlib/source/library/lux/tool/compiler/meta/export.lux index 21c75e46c..5446de96d 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/export.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/export.lux @@ -53,7 +53,7 @@ (function (_ [path source_code]) (do try.monad [path (|> path - (text.replaced (# fs separator) .module_separator) + (text.replaced (at fs separator) .module_separator) tar.path)] (try#each (|>> [path (instant.of_millis +0) @@ -69,6 +69,6 @@ (do [! (try.with async.monad)] [tar (|> sources (..library fs) - (# ! each (binary.result tar.writer))) - .let [/ (# fs separator)]] - (# fs write (format target / ..file) tar))) + (at ! each (binary.result tar.writer))) + .let [/ (at fs separator)]] + (at fs write (format target / ..file) tar))) diff --git a/stdlib/source/library/lux/tool/compiler/meta/import.lux b/stdlib/source/library/lux/tool/compiler/meta/import.lux index 5c5be37d4..b752d9f2f 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/import.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/import.lux @@ -44,26 +44,26 @@ (-> (file.System Async) Library Import (Action Import)) (let [! async.monad] (|> library - (# system read) - (# ! each (let [! try.monad] - (|>> (# ! each (<binary>.result tar.parser)) - (# ! conjoint) - (# ! each (|>> sequence.list - (monad.mix ! (function (_ entry import) - (case entry - {tar.#Normal [path instant mode ownership content]} - (let [path (tar.from_path path)] - (case (dictionary.has' path (tar.data content) import) - {try.#Failure error} - (exception.except ..duplicate [library path]) + (at system read) + (at ! each (let [! try.monad] + (|>> (at ! each (<binary>.result tar.parser)) + (at ! conjoint) + (at ! each (|>> sequence.list + (monad.mix ! (function (_ entry import) + (case entry + {tar.#Normal [path instant mode ownership content]} + (let [path (tar.from_path path)] + (case (dictionary.has' path (tar.data content) import) + {try.#Failure error} + (exception.except ..duplicate [library path]) - import' - import')) - - _ - (exception.except ..useless_tar_entry []))) - import))) - (# ! conjoint))))))) + import' + import')) + + _ + (exception.except ..useless_tar_entry []))) + import))) + (at ! conjoint))))))) (def: .public (import system libraries) (-> (file.System Async) (List Library) (Action Import)) diff --git a/stdlib/source/library/lux/tool/compiler/meta/io.lux b/stdlib/source/library/lux/tool/compiler/meta/io.lux index 0ad226608..efbdb599d 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io.lux @@ -14,7 +14,7 @@ (def: .public (safe system) (All (_ m) (-> (System m) Text Text)) - (text.replaced "/" (# system separator))) + (text.replaced "/" (at system separator))) (def: .public lux_context Context 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 435a8d3fb..ff44f3258 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux @@ -125,12 +125,12 @@ (case (do ! [data (try.of_maybe (dictionary.value (format (%.nat @artifact) extension) actual)) .let [context [@module @artifact] - directive (# host ingest context data)]] + directive (at host ingest context data)]] (case artifact_category {category.#Anonymous} (do ! [.let [output (sequence.suffix [@artifact {.#None} data] output)] - _ (# host re_learn context {.#None} directive)] + _ (at host re_learn context {.#None} directive)] (in [definitions [analysers synthesizers @@ -148,7 +148,7 @@ directives] output]) (do ! - [value (# host re_load context {.#None} directive)] + [value (at host re_load context {.#None} directive)] (in [(dictionary.has name value definitions) [analysers synthesizers @@ -159,7 +159,7 @@ {category.#Analyser extension} (do ! [.let [output (sequence.suffix [@artifact {.#None} data] output)] - value (# host re_load context {.#None} directive)] + value (at host re_load context {.#None} directive)] (in [definitions [(dictionary.has extension (as analysis.Handler value) analysers) synthesizers @@ -170,7 +170,7 @@ {category.#Synthesizer extension} (do ! [.let [output (sequence.suffix [@artifact {.#None} data] output)] - value (# host re_load context {.#None} directive)] + value (at host re_load context {.#None} directive)] (in [definitions [analysers (dictionary.has extension (as synthesis.Handler value) synthesizers) @@ -181,7 +181,7 @@ {category.#Generator extension} (do ! [.let [output (sequence.suffix [@artifact {.#None} data] output)] - value (# host re_load context {.#None} directive)] + value (at host re_load context {.#None} directive)] (in [definitions [analysers synthesizers @@ -192,7 +192,7 @@ {category.#Directive extension} (do ! [.let [output (sequence.suffix [@artifact {.#None} data] output)] - value (# host re_load context {.#None} directive)] + value (at host re_load context {.#None} directive)] (in [definitions [analysers synthesizers @@ -203,7 +203,7 @@ {category.#Custom name} (do ! [.let [output (sequence.suffix [@artifact {.#Some name} data] output)] - _ (# host re_learn context {.#Some name} directive)] + _ (at host re_learn context {.#Some name} directive)] (in [definitions [analysers synthesizers @@ -232,16 +232,16 @@ (|> definitions (dictionary.value def_name) try.of_maybe - (# ! each (|>> [exported? type] - {.#Definition} - [def_name]))) + (at ! each (|>> [exported? type] + {.#Definition} + [def_name]))) {.#Type [exported? _ labels]} (|> definitions (dictionary.value def_name) try.of_maybe - (# ! each (function (_ def_value) - [def_name {.#Type [exported? (as .Type def_value) labels]}]))))) + (at ! each (function (_ def_value) + [def_name {.#Type [exported? (as .Type def_value) labels]}]))))) (the .#definitions content))] (in [(document.document $.key (has .#definitions definitions content)) bundles]))) @@ -318,8 +318,8 @@ archive.#registry registry] archive)) archive) - (# try.monad each (dependency.load_order $.key)) - (# try.monad conjoint))) + (at try.monad each (dependency.load_order $.key)) + (at try.monad conjoint))) (def: (loaded_caches host_environment fs context purge load_order) (All (_ expression directive) @@ -379,7 +379,7 @@ (-> (List Custom) Configuration (generation.Host expression directive) (file.System Async) Context Import (List //.Context) (Async (Try [Archive .Lux Bundles])))) (do async.monad - [binary (# fs read (cache/archive.descriptor fs context))] + [binary (at fs read (cache/archive.descriptor fs context))] (case binary {try.#Success binary} (do (try.with async.monad) diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux index 96e91fbd6..4122a31ad 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux @@ -51,7 +51,7 @@ (All (_ m) (-> (file.System m) Context Module file.Path)) (|> module (//.safe fs) - (format context (# fs separator)))) + (format context (at fs separator)))) (def: (find_source_file fs importer contexts module extension) (-> (file.System Async) Module (List Context) Module Extension @@ -63,7 +63,7 @@ {.#Item context contexts'} (let [path (format (..path fs context module) extension)] (do async.monad - [? (# fs file? path)] + [? (at fs file? path)] (if ? (in {try.#Success path}) (find_source_file fs importer contexts' module extension)))))) @@ -82,15 +82,15 @@ (case outcome {try.#Success path} (|> path - (# fs read) - (# (try.with !) each (|>> [path]))) + (at fs read) + (at (try.with !) each (|>> [path]))) {try.#Failure _} (do [! (try.with !)] [path (..find_source_file fs importer contexts module ..lux_extension)] (|> path - (# fs read) - (# ! each (|>> [path]))))))) + (at fs read) + (at ! each (|>> [path]))))))) (def: (find_library_source_file importer import partial_host_extension module) (-> Module Import Extension Module (Try [file.Path Binary])) @@ -127,7 +127,7 @@ (Async (Try Input))) (do (try.with async.monad) [[path binary] (..find_any_source_file fs importer import contexts partial_host_extension module)] - (case (# utf8.codec decoded binary) + (case (at utf8.codec decoded binary) {try.#Success code} (in [////.#module module ////.#file path @@ -144,19 +144,19 @@ (-> (file.System Async) Context file.Path Enumeration (Async (Try Enumeration))) (do [! (try.with async.monad)] [enumeration (|> directory - (# fs directory_files) - (# ! each (monad.mix ! (function (_ file enumeration) - (if (text.ends_with? ..lux_extension file) - (do ! - [source_code (# fs read file)] - (async#in (dictionary.has' (text.replaced_once context "" file) source_code enumeration))) - (in enumeration))) - enumeration)) - (# ! conjoint))] + (at fs directory_files) + (at ! each (monad.mix ! (function (_ file enumeration) + (if (text.ends_with? ..lux_extension file) + (do ! + [source_code (at fs read file)] + (async#in (dictionary.has' (text.replaced_once context "" file) source_code enumeration))) + (in enumeration))) + enumeration)) + (at ! conjoint))] (|> directory - (# fs sub_directories) - (# ! each (monad.mix ! (context_listing fs context) enumeration)) - (# ! conjoint)))) + (at fs sub_directories) + (at ! each (monad.mix ! (context_listing fs context) enumeration)) + (at ! conjoint)))) (def: Action (type (All (_ a) (Async (Try a))))) @@ -164,7 +164,7 @@ (def: (canonical fs context) (-> (file.System Async) Context (Action Context)) (do (try.with async.monad) - [subs (# fs sub_directories context)] + [subs (at fs sub_directories context)] (in (|> subs list.head (maybe.else context) @@ -180,7 +180,7 @@ (do ! [context (..canonical fs context)] (..context_listing fs - (format context (# fs separator)) + (format context (at fs separator)) context enumeration))) (is Enumeration 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 63df754f0..545b80f70 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux @@ -177,7 +177,7 @@ (function (_ [artifact custom content] sink) (if (set.member? necessary_dependencies [module artifact]) (..write_class static module artifact custom content sink) - (# ! in sink))) + (at ! in sink))) sink (sequence.list output)))) 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 1fbd7ddc9..3c4b1abbb 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/ruby.lux @@ -60,15 +60,15 @@ [bundle (monad.mix ! (function (_ [artifact custom_name content] so_far) (|> content - (# utf8.codec decoded) - (# ! each - (|>> as_expected - (sharing [directive] - directive - so_far - - directive) - (_.then so_far))))) + (at utf8.codec decoded) + (at ! each + (|>> as_expected + (sharing [directive] + directive + so_far + + directive) + (_.then so_far))))) (_.comment "Lux module" (_.statement (_.string ""))) artifacts)] @@ -95,7 +95,7 @@ (list#mix _.then bundle) (is _.Statement) _.code - (# utf8.codec encoded))] + (at utf8.codec encoded))] (in (partial_list [module_id [(..module_file module_id) entry_content]] sink)))))) @@ -133,7 +133,7 @@ (_.statement (_.string "")))) (is _.Statement) _.code - (# utf8.codec encoded))]] + (at utf8.codec encoded))]] (in (|> entries (list#each product.right) {.#Item [..main_file imports]} 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 d99635b00..c408bb291 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux @@ -61,15 +61,15 @@ (monad.mix try.monad (function (_ content so_far) (|> content - (# encoding.utf8 decoded) - (# try.monad each - (|>> as_expected - (sharing [directive] - directive - so_far - - directive) - (..then so_far))))) + (at encoding.utf8 decoded) + (at try.monad each + (|>> as_expected + (sharing [directive] + directive + so_far + + directive) + (..then so_far))))) (is _.Expression (_.manual ""))))) (def: module_file @@ -111,7 +111,7 @@ (list#mix ..then bundle) (is _.Expression) _.code - (# encoding.utf8 encoded) + (at encoding.utf8 encoded) tar.content)) module_file (tar.path (..module_file module_id))] (in {tar.#Normal [module_file now ..mode ..ownership entry_content]}))) 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 9c140909d..ddb0ff4cd 100644 --- a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux +++ b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux @@ -47,15 +47,15 @@ (monad.mix try.monad (function (_ content so_far) (|> content - (# utf8.codec decoded) - (# try.monad each - (|>> as_expected - (sharing [directive] - directive - so_far - - directive) - (sequence so_far))))) + (at utf8.codec decoded) + (at try.monad each + (|>> as_expected + (sharing [directive] + directive + so_far + + directive) + (sequence so_far))))) so_far))) (def: .public (package header code sequence scope) @@ -73,7 +73,7 @@ (list#each (function (_ [module [module_id entry]]) [module_id (the archive.#output entry)])) (monad.mix ! (..write_module necessary_dependencies sequence) header) - (# ! each (|>> scope - code - (# utf8.codec encoded) - {.#Left})))))) + (at ! each (|>> scope + code + (at utf8.codec encoded) + {.#Left})))))) diff --git a/stdlib/source/library/lux/tool/compiler/phase.lux b/stdlib/source/library/lux/tool/compiler/phase.lux index 213d40339..e3cf241ba 100644 --- a/stdlib/source/library/lux/tool/compiler/phase.lux +++ b/stdlib/source/library/lux/tool/compiler/phase.lux @@ -69,7 +69,7 @@ (-> s (Operation s o) (Try o))) (|> state operation - (# try.monad each product.right))) + (at try.monad each product.right))) (def: .public state (All (_ s o) @@ -108,7 +108,7 @@ (template: .public (assertion exception message test) [(if test - (# ..monad in []) + (at ..monad in []) (..except exception message))]) (def: .public identity diff --git a/stdlib/source/library/lux/tool/compiler/reference.lux b/stdlib/source/library/lux/tool/compiler/reference.lux index 6c6b7aca1..c20c13688 100644 --- a/stdlib/source/library/lux/tool/compiler/reference.lux +++ b/stdlib/source/library/lux/tool/compiler/reference.lux @@ -34,7 +34,7 @@ (case [reference sample] (^.template [<tag> <equivalence>] [[{<tag> reference} {<tag> sample}] - (# <equivalence> = reference sample)]) + (at <equivalence> = reference sample)]) ([#Variable /variable.equivalence] [#Constant symbol.equivalence]) @@ -52,7 +52,7 @@ (^.template [<factor> <tag> <hash>] [{<tag> value} (|> value - (# <hash> hash) + (at <hash> hash) (n.* <factor>))]) ([2 #Variable /variable.hash] [3 #Constant symbol.hash]) diff --git a/stdlib/source/library/lux/tool/compiler/reference/variable.lux b/stdlib/source/library/lux/tool/compiler/reference/variable.lux index 9978193d7..488901fff 100644 --- a/stdlib/source/library/lux/tool/compiler/reference/variable.lux +++ b/stdlib/source/library/lux/tool/compiler/reference/variable.lux @@ -48,7 +48,7 @@ (^.template [<factor> <tag>] [{<tag> register} (|> register - (# n.hash hash) + (at n.hash hash) (n.* <factor>))]) ([2 #Local] [3 #Foreign]))))) diff --git a/stdlib/source/library/lux/tool/interpreter.lux b/stdlib/source/library/lux/tool/interpreter.lux index 07405ea54..2da1b12f8 100644 --- a/stdlib/source/library/lux/tool/interpreter.lux +++ b/stdlib/source/library/lux/tool/interpreter.lux @@ -82,9 +82,9 @@ .#info .#mode] {.#Interpreter} state)) - [state _] (# (the platform.#file_system platform) - lift (phase.result' state enter_module)) - _ (# Console<!> write ..welcome_message)] + [state _] (at (the platform.#file_system platform) + lift (phase.result' state enter_module)) + _ (at Console<!> write ..welcome_message)] (in state))) (with_expansions [<Interpretation> (these (Operation anchor expression directive [Type Any]))] @@ -211,16 +211,16 @@ multi_line? #0]) (do ! [_ (if multi_line? - (# Console<!> write " ") - (# Console<!> write "> ")) - line (# Console<!> read_line)] + (at Console<!> write " ") + (at Console<!> write "> ")) + line (at Console<!> read_line)] (if (and (not multi_line?) (text#= ..exit_command line)) - (# Console<!> write ..farewell_message) + (at Console<!> write ..farewell_message) (case (read_eval_print (revised #source (add_line line) context)) {try.#Success [context' representation]} (do ! - [_ (# Console<!> write representation)] + [_ (at Console<!> write representation)] (again context' #0)) {try.#Failure error} diff --git a/stdlib/source/library/lux/type.lux b/stdlib/source/library/lux/type.lux index 6976a1df0..8797ee80e 100644 --- a/stdlib/source/library/lux/type.lux +++ b/stdlib/source/library/lux/type.lux @@ -347,7 +347,7 @@ {.#Apply A F} (|> (..applied (list A) F) - (# maybe.monad each quantified?) + (at maybe.monad each quantified?) (maybe.else #0)) (^.or {.#UnivQ _} {.#ExQ _}) @@ -472,7 +472,7 @@ (def: .public (replaced before after) (-> Type Type Type Type) (.function (again it) - (if (# ..equivalence = before it) + (if (at ..equivalence = before it) after (case it {.#Primitive name co_variant} diff --git a/stdlib/source/library/lux/type/check.lux b/stdlib/source/library/lux/type/check.lux index a98b54932..497e0e6cc 100644 --- a/stdlib/source/library/lux/type/check.lux +++ b/stdlib/source/library/lux/type/check.lux @@ -515,7 +515,7 @@ (do ! [ringE (..ring idE) ringA (..ring idA)] - (if (# set.equivalence = ringE ringA) + (if (at set.equivalence = ringE ringA) (in assumptions) ... Fuse 2 rings (do ! diff --git a/stdlib/source/library/lux/type/dynamic.lux b/stdlib/source/library/lux/type/dynamic.lux index 87356c2a6..80bc06a84 100644 --- a/stdlib/source/library/lux/type/dynamic.lux +++ b/stdlib/source/library/lux/type/dynamic.lux @@ -42,8 +42,8 @@ (with_symbols [g!type g!value] (in (list (` (.let [[(~ g!type) (~ g!value)] ((~! ..representation) (~ value))] (.is ((~! try.Try) (~ type)) - (.if (.# (~! type.equivalence) (~' =) - (.type (~ type)) (~ g!type)) + (.if (.at (~! type.equivalence) (~' =) + (.type (~ type)) (~ g!type)) {try.#Success (.as (~ type) (~ g!value))} ((~! exception.except) ..wrong_type [(.type (~ type)) (~ g!type)]))))))))) diff --git a/stdlib/source/library/lux/type/implicit.lux b/stdlib/source/library/lux/type/implicit.lux index 622e308ed..fbe04737a 100644 --- a/stdlib/source/library/lux/type/implicit.lux +++ b/stdlib/source/library/lux/type/implicit.lux @@ -36,7 +36,7 @@ (type_var id' env) _ - (# meta.monad in type)) + (at meta.monad in type)) {.#Some [_ {.#None}]} (meta.failure (format "Unbound type-var " (%.nat id))) @@ -73,12 +73,12 @@ {.#Product left right} (if (n.= 0 idx) - (# check.monad in left) + (at check.monad in left) (member_type (-- idx) right)) _ (if (n.= 0 idx) - (# check.monad in sig_type) + (at check.monad in sig_type) (check.failure (format "Cannot find member type " (%.nat idx) " for " (%.type sig_type)))))) (def: (member_name member) @@ -107,7 +107,7 @@ (meta.failure (format "Too many candidate tags: " (%.list %.symbol candidates)))))) _ - (# meta.monad in member))) + (at meta.monad in member))) (def: (implicit_member member) (-> Symbol (Meta [Nat Type])) @@ -211,7 +211,7 @@ final_output])) _ - (# check.monad in [(list) type]))) + (at check.monad in [(list) type]))) (def: (ensure_function_application! member_type input_types expected_output) (-> Type (List Type) Type (Check [])) @@ -269,7 +269,7 @@ (check.failure (format "No candidates for provisioning: " (%.type dep))) {.#Item winner {.#End}} - (# check.monad in winner) + (at check.monad in winner) _ (check.failure (format "Too many candidates for provisioning: " (%.type dep) " --- " (%.list (|>> product.left %.symbol) candidates)))) @@ -334,9 +334,9 @@ _ (` ((~ (code.symbol constructor)) (~+ (list#each instance$ dependencies)))))) -(syntax: .public (## [member <code>.symbol - args (<>.or (<>.and (<>.some <code>.symbol) <code>.end) - (<>.and (<>.some <code>.any) <code>.end))]) +(syntax: .public (a/an [member <code>.symbol + args (<>.or (<>.and (<>.some <code>.symbol) <code>.end) + (<>.and (<>.some <code>.any) <code>.end))]) (case args {.#Left [args _]} (do [! meta.monad] @@ -349,9 +349,9 @@ (meta.failure (format "No implementation could be found for member: " (%.symbol member))) {.#Item chosen {.#End}} - (in (list (` (# (~ (instance$ chosen)) - (~ (code.local (product.right member))) - (~+ (list#each code.symbol args)))))) + (in (list (` (.at (~ (instance$ chosen)) + (~ (code.local (product.right member))) + (~+ (list#each code.symbol args)))))) _ (meta.failure (format "Too many implementations available: " @@ -362,11 +362,16 @@ {.#Right [args _]} (do [! meta.monad] - [labels (|> (macro.symbol "") (list.repeated (list.size args)) (monad.all !))] + [labels (|> (macro.symbol "g!parameter") + (list.repeated (list.size args)) + (monad.all !))] (in (list (` (let [(~+ (|> args (list.zipped_2 labels) (list#each ..pair_list) list#conjoint))] - (..## (~ (code.symbol member)) (~+ labels))))))) + (..a/an (~ (code.symbol member)) (~+ labels))))))) )) +(def: .public a ..a/an) +(def: .public an ..a/an) + (def: (implicit_bindings amount) (-> Nat (Meta (List Code))) (|> (macro.symbol "g!implicit") diff --git a/stdlib/source/library/lux/type/primitive.lux b/stdlib/source/library/lux/type/primitive.lux index 7486a56fc..601a35f9a 100644 --- a/stdlib/source/library/lux/type/primitive.lux +++ b/stdlib/source/library/lux/type/primitive.lux @@ -208,7 +208,7 @@ (def: declaration (Parser [Text (List Text)]) (<>.either (<code>.form (<>.and <code>.local (<>.some <code>.local))) - (<>.and <code>.local (# <>.monad in (list))))) + (<>.and <code>.local (at <>.monad in (list))))) (def: abstract (Parser [Code [Text (List Text)] Code (List Code)]) diff --git a/stdlib/source/library/lux/type/quotient.lux b/stdlib/source/library/lux/type/quotient.lux index 1df97a184..f41618ae7 100644 --- a/stdlib/source/library/lux/type/quotient.lux +++ b/stdlib/source/library/lux/type/quotient.lux @@ -2,7 +2,7 @@ [library [lux (.except type) [abstract - [equivalence (.only Equivalence)]] + [equivalence (only Equivalence)]] [control [parser ["<[0]>" code]]] @@ -69,4 +69,4 @@ (All (_ t c %) (-> (Equivalence c) (Equivalence (..Quotient t c %)))) (def: (= reference sample) - (# super = (..label reference) (..label sample)))) + (at super = (..label reference) (..label sample)))) diff --git a/stdlib/source/library/lux/type/resource.lux b/stdlib/source/library/lux/type/resource.lux index f2365d0cf..954715760 100644 --- a/stdlib/source/library/lux/type/resource.lux +++ b/stdlib/source/library/lux/type/resource.lux @@ -45,7 +45,7 @@ (def: (in value) (function (_ keys) - (# monad in [keys value]))) + (at monad in [keys value]))) (def: (then f input) (function (_ keysI) @@ -88,7 +88,7 @@ [(def: .public (<name> monad value) (All (_ ! v) (Ex (_ k) (-> (Monad !) v (Affine ! (Key <mode> k) (Res k v))))) (function (_ keys) - (# monad in [[(<key> []) keys] (abstraction value)])))] + (at monad in [[(<key> []) keys] (abstraction value)])))] [ordered Ordered ..ordered_key] [commutative Commutative ..commutative_key] @@ -98,7 +98,7 @@ (All (_ ! v k m) (-> (Monad !) (Res k v) (Relevant ! (Key m k) v))) (function (_ [key keys]) - (# monad in [keys (representation resource)]))) + (at monad in [keys (representation resource)]))) ) (exception: .public (index_cannot_be_repeated [index Nat]) @@ -124,7 +124,7 @@ (def: (no_op monad) (All (_ m) (-> (Monad m) (Linear m Any))) (function (_ context) - (# monad in [context []]))) + (at monad in [context []]))) (syntax: .public (exchange [swaps ..indices]) (macro.with_symbols [g!_ g!context g!!] @@ -154,7 +154,7 @@ [(~+ g!outputsT+) (~ g!context)] .Any))) (function ((~ g!_) (~ g!!) [(~+ g!inputs) (~ g!context)]) - (# (~ g!!) (~' in) [[(~+ g!outputs) (~ g!context)] []])))))))))) + (at (~ g!!) (~' in) [[(~+ g!outputs) (~ g!context)] []])))))))))) (def: amount (Parser Nat) @@ -178,7 +178,7 @@ [<to> (~ g!context)] .Any))) (function ((~ g!_) (~ g!!) [<from> (~ g!context)]) - (# (~ g!!) (~' in) [[<to> (~ g!context)] []])))))))))] + (at (~ g!!) (~' in) [[<to> (~ g!context)] []])))))))))] [group (~+ g!keys) [(~+ g!keys)]] [un_group [(~+ g!keys)] (~+ g!keys)] diff --git a/stdlib/source/library/lux/type/unit.lux b/stdlib/source/library/lux/type/unit.lux index 317dc1848..6fb069d56 100644 --- a/stdlib/source/library/lux/type/unit.lux +++ b/stdlib/source/library/lux/type/unit.lux @@ -147,8 +147,8 @@ (def: .public (re_scaled from to quantity) (All (_ si so u) (-> (Scale si) (Scale so) (Qty (si u)) (Qty (so u)))) - (let [[numerator denominator] (ratio./ (# from ratio) - (# to ratio))] + (let [[numerator denominator] (ratio./ (at from ratio) + (at to ratio))] (|> quantity out' (i.* (.int numerator)) diff --git a/stdlib/source/library/lux/world/console.lux b/stdlib/source/library/lux/world/console.lux index b1d7dac13..27e59b14e 100644 --- a/stdlib/source/library/lux/world/console.lux +++ b/stdlib/source/library/lux/world/console.lux @@ -33,7 +33,7 @@ (`` (implementation (~~ (template [<capability>] [(def: <capability> - (|>> (# console <capability>) async.future))] + (|>> (at console <capability>) async.future))] [read] [read_line] @@ -83,7 +83,7 @@ (def: (read _) (|> jvm_input java/io/InputStream::read - (# (try.with io.monad) each (|>> ffi.of_int .nat)))) + (at (try.with io.monad) each (|>> ffi.of_int .nat)))) (def: (read_line _) (io#each (try#each (|>> ffi.of_string)) @@ -166,7 +166,7 @@ (def: .public (write_line message console) (All (_ !) (-> Text (Console !) (! (Try Any)))) - (# console write (format message text.new_line))) + (at console write (format message text.new_line))) (type: .public (Mock s) (Interface @@ -187,7 +187,7 @@ [(def: (<method> _) (do [! io.monad] [|state| (atom.read! state)] - (case (# mock <mock> |state|) + (case (at mock <mock> |state|) {try.#Success [|state| output]} (do ! [_ (atom.write! |state| state)] @@ -203,7 +203,7 @@ (def: (write input) (do [! io.monad] [|state| (atom.read! state)] - (case (# mock on_write input |state|) + (case (at mock on_write input |state|) {try.#Success |state|} (do ! [_ (atom.write! |state| state)] @@ -215,7 +215,7 @@ (def: (close _) (do [! io.monad] [|state| (atom.read! state)] - (case (# mock on_close |state|) + (case (at mock on_close |state|) {try.#Success |state|} (do ! [_ (atom.write! |state| state)] diff --git a/stdlib/source/library/lux/world/db/jdbc.lux b/stdlib/source/library/lux/world/db/jdbc.lux index c8d453d53..53d1c80f6 100644 --- a/stdlib/source/library/lux/world/db/jdbc.lux +++ b/stdlib/source/library/lux/world/db/jdbc.lux @@ -108,7 +108,7 @@ (-> (DB IO) (DB Async)) (`` (implementation (~~ (template [<name> <forge>] - [(def: <name> (<forge> (|>> (!.use (# db <name>)) async.future)))] + [(def: <name> (<forge> (|>> (!.use (at db <name>)) async.future)))] [execute can_execute] [insert can_insert] @@ -165,7 +165,7 @@ (do (try.with io.monad) [db (..connect creds) result (action db) - _ (!.use (# db close) [])] + _ (!.use (at db close) [])] (in result))) (def: .public (with_async_db creds action) @@ -176,5 +176,5 @@ (do (try.with async.monad) [db (async.future (..connect creds)) result (action (..async db)) - _ (async#in (io.run! (!.use (# db close) [])))] + _ (async#in (io.run! (!.use (at db close) [])))] (in result))) diff --git a/stdlib/source/library/lux/world/file.lux b/stdlib/source/library/lux/world/file.lux index f03256f14..4918001c8 100644 --- a/stdlib/source/library/lux/world/file.lux +++ b/stdlib/source/library/lux/world/file.lux @@ -82,7 +82,7 @@ (def: (un_rooted fs path) (All (_ !) (-> (System !) Path (Maybe [Path Text]))) - (let [/ (# fs separator)] + (let [/ (at fs separator)] (case (text.last_index / path) {.#None} {.#None} @@ -110,11 +110,11 @@ (-> (System IO) (System Async)) (`` (implementation (def: separator - (# fs separator)) + (at fs separator)) (~~ (template [<name>] [(def: <name> - (|>> (# fs <name>) + (|>> (at fs <name>) async.future))] [file?] @@ -132,7 +132,7 @@ (~~ (template [<name>] [(def: (<name> path input) - (async.future (# fs <name> path input)))] + (async.future (at fs <name> path input)))] [modify] [write] @@ -142,7 +142,7 @@ (def: .public (rooted fs parent child) (All (_ !) (-> (System !) Path Text Path)) - (format parent (# fs separator) child)) + (format parent (at fs separator) child)) (template [<name>] [(exception: .public (<name> [file Path]) @@ -230,12 +230,12 @@ {.#Some children} (|> children (array.list {.#None}) - (monad.only ! (|>> <method> (# ! each (|>> ffi.of_boolean)))) - (# ! each (monad.each ! (|>> java/io/File::getAbsolutePath (# ! each (|>> ffi.of_string))))) - (# ! conjoint)) + (monad.only ! (|>> <method> (at ! each (|>> ffi.of_boolean)))) + (at ! each (monad.each ! (|>> java/io/File::getAbsolutePath (at ! each (|>> ffi.of_string))))) + (at ! conjoint)) {.#None} - (# io.monad in (exception.except ..cannot_find_directory [path])))))] + (at io.monad in (exception.except ..cannot_find_directory [path])))))] [directory_files java/io/File::isFile] [sub_directories java/io/File::isDirectory] @@ -245,13 +245,13 @@ (|>> ffi.as_string java/io/File::new java/io/File::length - (# (try.with io.monad) each (|>> ffi.of_long .nat)))) + (at (try.with io.monad) each (|>> ffi.of_long .nat)))) (def: last_modified (|>> ffi.as_string java/io/File::new (java/io/File::lastModified) - (# (try.with io.monad) each (|>> ffi.of_long duration.of_millis instant.absolute)))) + (at (try.with io.monad) each (|>> ffi.of_long duration.of_millis instant.absolute)))) (def: can_execute? (|>> ffi.as_string @@ -428,11 +428,11 @@ (array.list {.#None}) (list#each (|>> (format path js_separator))) (monad.each ! (function (_ sub) - (# ! each (|>> <method> [sub]) - (with_async write! (Try Stats) - (Fs::stat sub (..value_callback write!) node_fs))))) - (# ! each (|>> (list.only product.right) - (list#each product.left))))))] + (at ! each (|>> <method> [sub]) + (with_async write! (Try Stats) + (Fs::stat sub (..value_callback write!) node_fs))))) + (at ! each (|>> (list.only product.right) + (list#each product.left))))))] [directory_files Stats::isFile] [sub_directories Stats::isDirectory] @@ -459,19 +459,19 @@ instant.absolute)))) (def: (can_execute? path) - (# async.monad each - (|>> (pipe.case - {try.#Success _} - true - - {try.#Failure _} - false) - {try.#Success}) - (with_async write! (Try Any) - (Fs::access path - (|> node_fs Fs::constants FsConstants::X_OK) - (..any_callback write!) - node_fs)))) + (at async.monad each + (|>> (pipe.case + {try.#Success _} + true + + {try.#Failure _} + false) + {try.#Success}) + (with_async write! (Try Any) + (Fs::access path + (|> node_fs Fs::constants FsConstants::X_OK) + (..any_callback write!) + node_fs)))) (def: (read path) (with_async write! (Try Binary) @@ -570,13 +570,13 @@ (let [! (try.with io.monad)] (|> path os::listdir - (# ! each (|>> (array.list {.#None}) - (list#each (|>> (format path ..python_separator))) - (monad.each ! (function (_ sub) - (# ! each (|>> [sub]) (<method> sub)))) - (# ! each (|>> (list.only product.right) - (list#each product.left))))) - (# ! conjoint))))] + (at ! each (|>> (array.list {.#None}) + (list#each (|>> (format path ..python_separator))) + (monad.each ! (function (_ sub) + (at ! each (|>> [sub]) (<method> sub)))) + (at ! each (|>> (list.only product.right) + (list#each product.left))))) + (at ! conjoint))))] [directory_files os/path::isfile] [sub_directories os/path::isdir] @@ -584,14 +584,14 @@ (def: file_size (|>> os/path::getsize - (# (try.with io.monad) each (|>> .nat)))) + (at (try.with io.monad) each (|>> .nat)))) (def: last_modified (|>> os/path::getmtime - (# (try.with io.monad) each (|>> f.int - (i.* +1,000) - duration.of_millis - instant.absolute)))) + (at (try.with io.monad) each (|>> f.int + (i.* +1,000) + duration.of_millis + instant.absolute)))) (def: (can_execute? path) (os::access path (os::X_OK))) @@ -722,7 +722,7 @@ [(def: <name> (let [! (try.with io.monad)] (|>> RubyFile::stat - (# ! each (`` (|>> (~~ (template.spliced <pipeline>))))))))] + (at ! each (`` (|>> (~~ (template.spliced <pipeline>))))))))] [file_size [Stat::size .nat]] [last_modified [Stat::mtime @@ -825,7 +825,7 @@ ... (do [! (try.with io.monad)] ... [outcome (..file_put_contents [path ("php pack" ..byte_array_format data) <mode>])] ... (if (bit#= false (as Bit outcome)) - ... (# io.monad in (exception.except ..cannot_write_to_file [path])) + ... (at io.monad in (exception.except ..cannot_write_to_file [path])) ... (in []))))] ... [over_write +0] @@ -836,7 +836,7 @@ ... (do [! (try.with io.monad)] ... [data (..file_get_contents [path])] ... (if (bit#= false (as Bit data)) - ... (# io.monad in (exception.except ..cannot_find_file [path])) + ... (at io.monad in (exception.except ..cannot_find_file [path])) ... (in (..unpack [..byte_array_format data]))))) ... (def: path @@ -847,7 +847,7 @@ ... (do [! (try.with io.monad)] ... [value (<ffi> [path])] ... (if (bit#= false (as Bit value)) - ... (# io.monad in (exception.except ..cannot_find_file [path])) + ... (at io.monad in (exception.except ..cannot_find_file [path])) ... (in (`` (|> value (~~ (template.spliced <pipeline>))))))))] ... [size ..filesize [.nat]] @@ -861,21 +861,21 @@ ... (do [! (try.with io.monad)] ... [verdict (..touch [path (|> moment instant.relative duration.millis (i./ +1,000))])] ... (if (bit#= false (as Bit verdict)) - ... (# io.monad in (exception.except ..cannot_find_file [path])) + ... (at io.monad in (exception.except ..cannot_find_file [path])) ... (in [])))) ... (def: (move destination) ... (do [! (try.with io.monad)] ... [verdict (..rename [path destination])] ... (if (bit#= false (as Bit verdict)) - ... (# io.monad in (exception.except ..cannot_find_file [path])) + ... (at io.monad in (exception.except ..cannot_find_file [path])) ... (in (file destination))))) ... (def: (delete _) ... (do (try.with io.monad) ... [verdict (..unlink [path])] ... (if (bit#= false (as Bit verdict)) - ... (# io.monad in (exception.except ..cannot_find_file [path])) + ... (at io.monad in (exception.except ..cannot_find_file [path])) ... (in [])))) ... )) @@ -915,7 +915,7 @@ ... (do (try.with io.monad) ... [verdict (..rmdir [path])] ... (if (bit#= false (as Bit verdict)) - ... (# io.monad in (exception.except ..cannot_find_directory [path])) + ... (at io.monad in (exception.except ..cannot_find_directory [path])) ... (in [])))) ... )) @@ -926,7 +926,7 @@ ... [(def: (<name> path) ... (do [! (try.with io.monad)] ... [verdict (<test> path)] - ... (# io.monad in + ... (at io.monad in ... (if verdict ... {try.#Success (<constructor> path)} ... (exception.except <exception> [path])))))] @@ -938,7 +938,7 @@ ... (def: (make_file path) ... (do [! (try.with io.monad)] ... [verdict (..touch [path (|> instant.now io.run! instant.relative duration.millis (i./ +1,000))])] - ... (# io.monad in + ... (at io.monad in ... (if verdict ... {try.#Success (..file path)} ... (exception.except ..cannot_make_file [path]))))) @@ -946,7 +946,7 @@ ... (def: (make_directory path) ... (do [! (try.with io.monad)] ... [verdict (..mkdir path)] - ... (# io.monad in + ... (at io.monad in ... (if verdict ... {try.#Success (..directory path)} ... (exception.except ..cannot_make_directory [path]))))) @@ -961,10 +961,10 @@ (def: .public (exists? monad fs path) (All (_ !) (-> (Monad !) (System !) Path (! Bit))) (do monad - [verdict (# fs file? path)] + [verdict (at fs file? path)] (if verdict (in verdict) - (# fs directory? path)))) + (at fs directory? path)))) (type: Mock_File (Record @@ -1156,10 +1156,10 @@ [(def: (<method> path) (|> store stm.read - (# stm.monad each - (|>> (<retrieve> separator path) - (try#each (function.constant true)) - (try.else false))) + (at stm.monad each + (|>> (<retrieve> separator path) + (try#each (function.constant true)) + (try.else false))) stm.commit!))] [file? ..retrieve_mock_file!] @@ -1262,9 +1262,9 @@ (do try.monad [[name file] (..retrieve_mock_file! separator path |store|)] (..update_mock_file! separator path now - (# binary.monoid composite - (the #mock_content file) - content) + (at binary.monoid composite + (the #mock_content file) + content) |store|))) store)))) @@ -1288,26 +1288,26 @@ (def: (check_or_make_directory monad fs path) (All (_ !) (-> (Monad !) (System !) Path (! (Try Any)))) (do monad - [? (# fs directory? path)] + [? (at fs directory? path)] (if ? (in {try.#Success []}) - (# fs make_directory path)))) + (at fs make_directory path)))) (def: .public (make_directories monad fs path) (All (_ !) (-> (Monad !) (System !) Path (! (Try Any)))) - (let [rooted? (text.starts_with? (# fs separator) path) - segments (text.all_split_by (# fs separator) path)] + (let [rooted? (text.starts_with? (at fs separator) path) + segments (text.all_split_by (at fs separator) path)] (case (if rooted? (list.after 1 segments) segments) {.#End} - (# monad in (exception.except ..cannot_make_directory [path])) + (at monad in (exception.except ..cannot_make_directory [path])) {.#Item head tail} (case head - "" (# monad in (exception.except ..cannot_make_directory [path])) + "" (at monad in (exception.except ..cannot_make_directory [path])) _ (loop (again [current (if rooted? - (format (# fs separator) head) + (format (at fs separator) head) head) next tail]) (do monad @@ -1319,7 +1319,7 @@ (in {try.#Success []}) {.#Item head tail} - (again (format current (# fs separator) head) + (again (format current (at fs separator) head) tail)) {try.#Failure error} @@ -1328,7 +1328,7 @@ (def: .public (make_file monad fs content path) (All (_ !) (-> (Monad !) (System !) Binary Path (! (Try Any)))) (do monad - [? (# fs file? path)] + [? (at fs file? path)] (if ? (in (exception.except ..cannot_make_file [path])) - (# fs write path content)))) + (at fs write path content)))) diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux index a3026e8e8..edc65be2f 100644 --- a/stdlib/source/library/lux/world/file/watch.lux +++ b/stdlib/source/library/lux/world/file/watch.lux @@ -123,11 +123,11 @@ (def: (file_tracker fs directory) (-> (//.System Async) //.Path (Async (Try File_Tracker))) (do [! (try.with async.monad)] - [files (# fs directory_files directory)] + [files (at fs directory_files directory)] (monad.mix ! (function (_ file tracker) (do ! - [last_modified (# fs last_modified file)] + [last_modified (at fs last_modified file)] (in (dictionary.has file last_modified tracker)))) (is File_Tracker (dictionary.empty text.hash)) @@ -136,11 +136,11 @@ (def: (available_files fs directory) (-> (//.System Async) //.Path (Async (Try (List [//.Path Instant])))) (do [! (try.with async.monad)] - [files (# fs directory_files directory)] + [files (at fs directory_files directory)] (monad.each ! (function (_ file) (|> file - (# fs last_modified) - (# ! each (|>> [file])))) + (at fs last_modified) + (at ! each (|>> [file])))) files))) (def: (available_directory_changes fs [directory [the_concern file_tracker]]) @@ -191,7 +191,7 @@ (implementation (def: (start new_concern path) (do [! async.monad] - [exists? (# fs directory? path)] + [exists? (at fs directory? path)] (if exists? (do ! [updated? (stm.commit! (..update_watch! new_concern path tracker))] @@ -336,9 +336,9 @@ (def: default_key_concern (-> java/nio/file/WatchKey (IO Concern)) (|>> java/nio/file/WatchKey::pollEvents - (# io.monad each (|>> ..default_list - (list#each default_event_concern) - (list#mix ..also ..none))))) + (at io.monad each (|>> ..default_list + (list#each default_event_concern) + (list#mix ..also ..none))))) (import: java/nio/file/WatchService "[1]::[0]" diff --git a/stdlib/source/library/lux/world/net/http/client.lux b/stdlib/source/library/lux/world/net/http/client.lux index 7f0a1588f..f2e709dbd 100644 --- a/stdlib/source/library/lux/world/net/http/client.lux +++ b/stdlib/source/library/lux/world/net/http/client.lux @@ -45,7 +45,7 @@ (All (_ !) (-> URL //.Headers (Maybe Binary) (Client !) (! (Try (//.Response !))))) - (# client request {<method>} url headers data)))] + (at client request {<method>} url headers data)))] [//.#Post] [//.#Get] @@ -137,8 +137,8 @@ (loop (again [so_far +0]) (do [! (try.with io.monad)] [.let [remaining (i.- so_far (.int buffer_size))] - bytes_read (# ! each (|>> ffi.of_int) - (java/io/BufferedInputStream::read buffer (ffi.as_int so_far) (ffi.as_int remaining) input))] + bytes_read (at ! each (|>> ffi.of_int) + (java/io/BufferedInputStream::read buffer (ffi.as_int so_far) (ffi.as_int remaining) input))] (case bytes_read -1 (do ! [_ (java/lang/AutoCloseable::close input)] @@ -148,11 +148,11 @@ (in [buffer_size buffer]) (again (i.+ bytes_read so_far)))))) (loop (again [so_far +0 - output (# binary.monoid identity)]) + output (at binary.monoid identity)]) (do [! (try.with io.monad)] [.let [remaining (i.- so_far (.int buffer_size))] - bytes_read (# ! each (|>> ffi.of_int) - (java/io/BufferedInputStream::read buffer (ffi.as_int so_far) (ffi.as_int remaining) input))] + bytes_read (at ! each (|>> ffi.of_int) + (java/io/BufferedInputStream::read buffer (ffi.as_int so_far) (ffi.as_int remaining) input))] (case bytes_read -1 (do ! [_ (java/lang/AutoCloseable::close input)] @@ -160,14 +160,14 @@ +0 (in (..body_of output)) _ (|> buffer (binary.slice 0 (.nat so_far)) - (# try.functor each - (|>> (# binary.monoid composite output) - ..body_of)) - (# io.monad in)))) + (at try.functor each + (|>> (at binary.monoid composite output) + ..body_of)) + (at io.monad in)))) +0 (again so_far output) _ (if (i.= remaining bytes_read) (again +0 - (# binary.monoid composite output buffer)) + (at binary.monoid composite output buffer)) (again (i.+ bytes_read so_far) output)))))))))) @@ -215,7 +215,7 @@ headers (..default_headers connection) input (|> connection java/net/URLConnection::getInputStream - (# ! each (|>> java/io/BufferedInputStream::new)))] + (at ! each (|>> java/io/BufferedInputStream::new)))] (in [(.nat (ffi.of_int status)) [//.#headers headers //.#body (..default_body input)]]))))))] @@ -227,18 +227,18 @@ (-> (Client IO) (Client Async)) (def: (request method url headers data) - (|> (# client request method url headers data) + (|> (at client request method url headers data) async.future - (# async.monad each - (|>> (pipe.case - {try.#Success [status message]} - {try.#Success [status (revised //.#body (is (-> (//.Body IO) (//.Body Async)) - (function (_ body) - (|>> body async.future))) - message)]} - - {try.#Failure error} - {try.#Failure error})))))) + (at async.monad each + (|>> (pipe.case + {try.#Success [status message]} + {try.#Success [status (revised //.#body (is (-> (//.Body IO) (//.Body Async)) + (function (_ body) + (|>> body async.future))) + message)]} + + {try.#Failure error} + {try.#Failure error})))))) (def: .public headers (-> (List [Text Text]) //.Headers) diff --git a/stdlib/source/library/lux/world/net/http/query.lux b/stdlib/source/library/lux/world/net/http/query.lux index cccb9e78f..ed115d88f 100644 --- a/stdlib/source/library/lux/world/net/http/query.lux +++ b/stdlib/source/library/lux/world/net/http/query.lux @@ -35,7 +35,7 @@ [_ (l.this "%") code (|> (l.exactly 2 l.hexadecimal) (p.codec nat.hex) - (# ! each text.from_code)) + (at ! each text.from_code)) tail component] (in (format head code tail)))))))) @@ -58,7 +58,7 @@ l.end)] (form (dictionary.has key "" context))))) ... if invalid form data, just stop parsing... - (# p.monad in context))) + (at p.monad in context))) (def: .public (parameters raw) (-> Text (Try Context)) diff --git a/stdlib/source/library/lux/world/net/http/request.lux b/stdlib/source/library/lux/world/net/http/request.lux index 86d74217d..36f0498ea 100644 --- a/stdlib/source/library/lux/world/net/http/request.lux +++ b/stdlib/source/library/lux/world/net/http/request.lux @@ -37,8 +37,8 @@ (monad.mix try.monad (function (_ input [offset output]) (let [amount (binary.size input)] - (# try.functor each (|>> [(n.+ amount offset)]) - (binary.copy amount 0 input offset output)))) + (at try.functor each (|>> [(n.+ amount offset)]) + (binary.copy amount 0 input offset output)))) [0 (|> inputs (list#each binary.size) (list#mix n.+ 0) @@ -50,7 +50,7 @@ (-> Body (Async (Try Text))) (do async.monad [blobs (frp.list body)] - (in (# encoding.utf8 decoded (merge blobs))))) + (in (at encoding.utf8 decoded (merge blobs))))) (def: failure (//response.bad_request "")) @@ -61,7 +61,7 @@ [?raw (read_text_body (the //.#body message))] (case (do try.monad [raw ?raw - content (# json.codec decoded raw)] + content (at json.codec decoded raw)] (json.result content reader)) {try.#Success input} (server input request) diff --git a/stdlib/source/library/lux/world/net/http/response.lux b/stdlib/source/library/lux/world/net/http/response.lux index 4e4542dde..04cd4a695 100644 --- a/stdlib/source/library/lux/world/net/http/response.lux +++ b/stdlib/source/library/lux/world/net/http/response.lux @@ -29,7 +29,7 @@ (def: .public empty (-> Status Response) - (let [body (frp#in (# encoding.utf8 encoded ""))] + (let [body (frp#in (at encoding.utf8 encoded ""))] (function (_ status) [status [//.#headers (|> context.empty @@ -56,7 +56,7 @@ (def: .public bad_request (-> Text Response) - (|>> (# encoding.utf8 encoded) (content status.bad_request mime.utf_8))) + (|>> (at encoding.utf8 encoded) (content status.bad_request mime.utf_8))) (def: .public ok (-> MIME Binary Response) @@ -65,7 +65,7 @@ (template [<name> <type> <mime> <pre>] [(def: .public <name> (-> <type> Response) - (|>> <pre> (# encoding.utf8 encoded) (..ok <mime>)))] + (|>> <pre> (at encoding.utf8 encoded) (..ok <mime>)))] [text Text mime.utf_8 (<|)] [html html.Document mime.html html.html] diff --git a/stdlib/source/library/lux/world/output/video/resolution.lux b/stdlib/source/library/lux/world/output/video/resolution.lux index c733db7f3..08b1c9939 100644 --- a/stdlib/source/library/lux/world/output/video/resolution.lux +++ b/stdlib/source/library/lux/world/output/video/resolution.lux @@ -21,7 +21,7 @@ (def: .public equivalence (Equivalence Resolution) - (# ..hash equivalence)) + (at ..hash equivalence)) ... https://en.wikipedia.org/wiki/Display_resolution#Common_display_resolutions (template [<name> <width> <height>] diff --git a/stdlib/source/library/lux/world/program.lux b/stdlib/source/library/lux/world/program.lux index c78116cbe..985199c64 100644 --- a/stdlib/source/library/lux/world/program.lux +++ b/stdlib/source/library/lux/world/program.lux @@ -56,9 +56,9 @@ (def: .public (environment monad program) (All (_ !) (-> (Monad !) (Program !) (! Environment))) (do [! monad] - [variables (# program available_variables []) + [variables (at program available_variables []) entries (monad.each ! (function (_ name) - (# ! each (|>> [name]) (# program variable name))) + (at ! each (|>> [name]) (at program variable name))) variables)] (in (|> entries (list.all (function (_ [name value]) @@ -75,7 +75,7 @@ (~~ (template [<method>] [(def: <method> - (# program <method>))] + (at program <method>))] [home] [directory] @@ -83,7 +83,7 @@ (~~ (template [<method>] [(def: <method> - (|>> (# program <method>) async.future))] + (|>> (at program <method>) async.future))] [available_variables] [variable] @@ -136,11 +136,11 @@ ("static" getProperty [java/lang/String] "?" java/lang/String) ("static" exit [int] "io" void)) - (def: (jvm##consume iterator) + (def: (jvm::consume iterator) (All (_ a) (-> (java/util/Iterator a) (List a))) (if (ffi.of_boolean (java/util/Iterator::hasNext iterator)) {.#Item (java/util/Iterator::next iterator) - (jvm##consume iterator)} + (jvm::consume iterator)} {.#End})) )] (for @.old (these <jvm>) @@ -290,7 +290,7 @@ (with_expansions [<jvm> (|> (java/lang/System::getenv) java/util/Map::keySet java/util/Set::iterator - ..jvm##consume + ..jvm::consume (list#each (|>> ffi.of_string)) io.io)] (for @.old <jvm> @@ -305,7 +305,7 @@ {.#None} (list)) (list))) - @.python (# io.monad each (array.list {.#None}) (os/environ::keys [])) + @.python (at io.monad each (array.list {.#None}) (os/environ::keys [])) ... Lua offers no way to get all the environment variables available. @.lua (io.io (list)) @.ruby (io.io (array.list {.#None} (Env::keys []))) diff --git a/stdlib/source/library/lux/world/shell.lux b/stdlib/source/library/lux/world/shell.lux index e52d4e0f3..4493832ae 100644 --- a/stdlib/source/library/lux/world/shell.lux +++ b/stdlib/source/library/lux/world/shell.lux @@ -63,7 +63,7 @@ (`` (implementation (~~ (template [<method>] [(def: <method> - (|>> (# process <method>) + (|>> (at process <method>) async.future))] [read] @@ -90,7 +90,7 @@ (def: (execute input) (async.future (do (try.with io.monad) - [process (# shell execute input)] + [process (at shell execute input)] (in (..async_process process))))))) ... https://en.wikipedia.org/wiki/Code_injection#Shell_injection @@ -254,19 +254,19 @@ (in (ffi.of_string output)) {.#None} - (# io.monad in (exception.except ..no_more_output [])))))] + (at io.monad in (exception.except ..no_more_output [])))))] [read jvm_input] [fail jvm_error] )) (def: (write message) - (java/io/OutputStream::write (# utf8.codec encoded message) jvm_output)) + (java/io/OutputStream::write (at utf8.codec encoded message) jvm_output)) (~~ (template [<name> <method>] [(def: (<name> _) (|> process <method>))] [destroy java/lang/Process::destroy] - [await (<| (# ! each (|>> ffi.of_int)) java/lang/Process::waitFor)] + [await (<| (at ! each (|>> ffi.of_int)) java/lang/Process::waitFor)] )))))))) (import: java/io/File @@ -287,9 +287,9 @@ ... https://en.wikipedia.org/wiki/Code_injection#Shell_injection (def: windows? (IO (Try Bit)) - (# (try.with io.monad) each - (|>> java/lang/String::toLowerCase ffi.of_string (text.starts_with? "windows")) - (java/lang/System::getProperty (ffi.as_string "os.name")))) + (at (try.with io.monad) each + (|>> java/lang/String::toLowerCase ffi.of_string (text.starts_with? "windows")) + (java/lang/System::getProperty (ffi.as_string "os.name")))) (implementation: .public default (Shell IO) @@ -302,8 +302,8 @@ (java/lang/ProcessBuilder::directory (java/io/File::new (ffi.as_string working_directory))))] _ (|> builder java/lang/ProcessBuilder::environment - (# try.functor each (..jvm::load_environment environment)) - (# io.monad in)) + (at try.functor each (..jvm::load_environment environment)) + (at io.monad in)) process (java/lang/ProcessBuilder::start builder)] (..default_process process)))) )] @@ -331,7 +331,7 @@ [(def: (<name> _) (do [! io.monad] [|state| (atom.read! state)] - (case (# mock <mock> |state|) + (case (at mock <mock> |state|) {try.#Success [|state| output]} (do ! [_ (atom.write! |state| state)] @@ -347,7 +347,7 @@ (def: (write message) (do [! io.monad] [|state| (atom.read! state)] - (case (# mock on_write message |state|) + (case (at mock on_write message |state|) {try.#Success |state|} (do ! [_ (atom.write! |state| state)] @@ -358,7 +358,7 @@ (def: (destroy _) (do [! io.monad] [|state| (atom.read! state)] - (case (# mock on_destroy |state|) + (case (at mock on_destroy |state|) {try.#Success |state|} (do ! [_ (atom.write! |state| state)] @@ -376,5 +376,5 @@ (def: execute (|>> mock - (# try.monad each (..mock_process (atom.atom init))) + (at try.monad each (..mock_process (atom.atom init))) io.io))) diff --git a/stdlib/source/poly/lux/abstract/equivalence.lux b/stdlib/source/poly/lux/abstract/equivalence.lux index 63a88058e..207e94fc0 100644 --- a/stdlib/source/poly/lux/abstract/equivalence.lux +++ b/stdlib/source/poly/lux/abstract/equivalence.lux @@ -163,6 +163,6 @@ <type>.recursive_call ... If all else fails... (|> <type>.any - (# ! each (|>> %.type (format "Cannot create Equivalence for: ") <>.failure)) - (# ! conjoint)) + (at ! each (|>> %.type (format "Cannot create Equivalence for: ") <>.failure)) + (at ! conjoint)) )))) diff --git a/stdlib/source/poly/lux/data/format/json.lux b/stdlib/source/poly/lux/data/format/json.lux index 2bf11cdc7..a10f632d8 100644 --- a/stdlib/source/poly/lux/data/format/json.lux +++ b/stdlib/source/poly/lux/data/format/json.lux @@ -73,9 +73,9 @@ (codec.Codec JSON Int) (def: encoded - (|>> .nat (# nat_codec encoded))) + (|>> .nat (at nat_codec encoded))) (def: decoded - (|>> (# nat_codec decoded) (# try.functor each (|>> .int))))) + (|>> (at nat_codec decoded) (at try.functor each (|>> .int))))) ... Builds a JSON generator for potentially inexistent values. (def: (nullable writer) @@ -91,10 +91,10 @@ (def: encoded (|>> ((debug.private unit.out')) - (# ..int_codec encoded))) + (at ..int_codec encoded))) (def: decoded - (|>> (# ..int_codec decoded) - (# try.functor each (debug.private unit.in'))))) + (|>> (at ..int_codec decoded) + (at try.functor each (debug.private unit.in'))))) (poly: encoded (with_expansions @@ -107,15 +107,15 @@ [(<type>.exactly Any) (function ((~ g!_) (~ (code.symbol ["" "0"]))) {/.#Null})] [(<type>.sub Bit) (|>> {/.#Boolean})] - [(<type>.sub Nat) (# (~! ..nat_codec) (~' encoded))] - [(<type>.sub Int) (# (~! ..int_codec) (~' encoded))] + [(<type>.sub Nat) (at (~! ..nat_codec) (~' encoded))] + [(<type>.sub Int) (at (~! ..int_codec) (~' encoded))] [(<type>.sub Frac) (|>> {/.#Number})] [(<type>.sub Text) (|>> {/.#String})]) <time> (template [<type> <codec>] [(do ! [_ (<type>.exactly <type>)] (in (` (is (~ (@JSON#encoded inputT)) - (|>> (# (~! <codec>) (~' encoded)) {/.#String})))))] + (|>> (at (~! <codec>) (~' encoded)) {/.#String})))))] ... [duration.Duration duration.codec] ... [instant.Instant instant.codec] @@ -136,7 +136,7 @@ [unitT (<type>.applied (<>.after (<type>.exactly unit.Qty) <type>.any))] (in (` (is (~ (@JSON#encoded inputT)) - (# (~! qty_codec) (~' encoded)))))) + (at (~! qty_codec) (~' encoded)))))) (do ! [.let [g!_ (code.local "_______") g!key (code.local "_______key") diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux index d14e5ba74..1de6b7d30 100644 --- a/stdlib/source/program/aedifex.lux +++ b/stdlib/source/program/aedifex.lux @@ -92,7 +92,7 @@ _ (do async.monad - [_ (# program exit exit_code)] + [_ (at program exit exit_code)] (in {try.#Failure ""})))] (in output))) @@ -106,13 +106,13 @@ (def: succeed! (IO Any) - (# program.default exit shell.normal)) + (at program.default exit shell.normal)) (def: (fail! error) (-> Text (IO Any)) (exec (debug.log! error) - (# program.default exit shell.error))) + (at program.default exit shell.error))) (def: (command action) (All (_ a) (-> (Async (Try a)) (IO Any))) @@ -126,7 +126,7 @@ {try.#Failure error} (..fail! error)))) - (# io.monad in []))) + (at io.monad in []))) (exception: .public invalid_operation) @@ -152,12 +152,12 @@ (program: [[profiles operation] /cli.command] (do [! io.monad] - [console (# ! each (|>> (try.else ..write_only) console.async) - console.default)] + [console (at ! each (|>> (try.else ..write_only) console.async) + console.default)] (case operation {/cli.#Version} (..command - (/command/version.do! console (# /.monoid identity))) + (/command/version.do! console (at /.monoid identity))) _ (do ! diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux index 247e4a5d0..35c7bddb3 100644 --- a/stdlib/source/program/aedifex/artifact.lux +++ b/stdlib/source/program/aedifex/artifact.lux @@ -41,7 +41,7 @@ (def: .public equivalence (Equivalence Artifact) - (# ..hash equivalence)) + (at ..hash equivalence)) (implementation: .public order (Order Artifact) diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux index 0eabd6b7e..e2c7c92e6 100644 --- a/stdlib/source/program/aedifex/cli.lux +++ b/stdlib/source/program/aedifex/cli.lux @@ -98,6 +98,6 @@ [head cli.any [tail command] command] (in [{.#Item head tail} command]))) - (# <>.monad each (|>> [(list)]) - ..command') + (at <>.monad each (|>> [(list)]) + ..command') )))) diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux index dc922b4c1..07842d32e 100644 --- a/stdlib/source/program/aedifex/command/auto.lux +++ b/stdlib/source/program/aedifex/command/auto.lux @@ -29,11 +29,11 @@ (-> (file.System Async) file.Path (Async (List file.Path))) (let [! async.monad] (|> path - (# fs sub_directories) - (# ! each (|>> (try.else (list)) - (monad.each ! (targets fs)))) - (# ! conjoint) - (# ! each (|>> list.together (partial_list path)))))) + (at fs sub_directories) + (at ! each (|>> (try.else (list)) + (monad.each ! (targets fs)))) + (at ! conjoint) + (at ! each (|>> list.together (partial_list path)))))) (def: .public delay Nat @@ -56,14 +56,14 @@ (the ///.#sources) set.list (monad.each ! (..targets fs)) - (# ! each list.together))] + (at ! each list.together))] (do [! ///action.monad] - [_ (monad.each ! (# watcher start watch.modification) targets) + [_ (monad.each ! (at watcher start watch.modification) targets) _ <call>] (loop (again [_ []]) (do ! [_ (..pause delay) - events (# watcher poll [])] + events (at watcher poll [])] (case events {.#Item _} (do ! diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux index d08f7f7b1..0454a4a60 100644 --- a/stdlib/source/program/aedifex/command/build.lux +++ b/stdlib/source/program/aedifex/command/build.lux @@ -122,7 +122,7 @@ (def: (path fs home dependency) (All (_ !) (-> (file.System !) Path Dependency Path)) - (let [/ (# fs separator) + (let [/ (at fs separator) artifact (the ///dependency.#artifact dependency)] (|> artifact (///local.uri (the ///artifact.#version artifact)) @@ -178,7 +178,7 @@ version (the ///artifact.#version artifact)] (case (dictionary.value identity uniques) {.#Some [current_version current_path]} - (if (# version_order < version current_version) + (if (at version_order < version current_version) (dictionary.has identity [version dependency] uniques) uniques) @@ -212,7 +212,7 @@ (let [[read! write!] (is [(Async (Try Any)) (async.Resolver (Try Any))] (async.async [])) - _ (|> (# process <capability> []) + _ (|> (at process <capability> []) (async.upon! (function (again ?line) (case ?line {try.#Failure error} @@ -229,7 +229,7 @@ {try.#Success _} (async.upon! again - (# process <capability> [])))) + (at process <capability> [])))) (is (Async (Try Any)) (console.write_line line console)))))) io.run!)] @@ -287,8 +287,8 @@ {.#Some program_module} (do async.monad [environment (program.environment async.monad program) - .let [home (# program home) - working_directory (# program directory)]] + .let [home (at program home) + working_directory (at program directory)]] (do ///action.monad [[resolution lux] (async#in (..lux resolution (the ///.#lux profile))) .let [host_dependencies (..host_dependencies fs home resolution) @@ -310,7 +310,7 @@ [#Python ///.#java "program.py"] [#Lua ///.#java "program.lua"] [#Ruby ///.#java (file.rooted fs "program" ruby_packager.main_file)])) - / (# fs separator) + / (at fs separator) cache_directory (format working_directory / target)] _ (is (Async (Try Any)) (console.write_line ..start console)) @@ -323,13 +323,13 @@ (..singular "--target" cache_directory) (..singular "--module" program_module) (..singular "--configuration" (configuration.format (the ///.#configuration profile)))))] - process (# shell execute [(dictionary.composite environment command_environment) - working_directory - command - full_parameters]) + process (at shell execute [(dictionary.composite environment command_environment) + working_directory + command + full_parameters]) _ (..log_output! console process) _ (..log_error! console process) - exit (# process await []) + exit (at process await []) _ (is (Async (Try Any)) (console.write_line (if (i.= shell.normal exit) ..success diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux index 3187376e8..7798a2006 100644 --- a/stdlib/source/program/aedifex/command/clean.lux +++ b/stdlib/source/program/aedifex/command/clean.lux @@ -22,9 +22,9 @@ (-> (file.System Async) Path (Async (Try Any))) (do [! ///action.monad] [_ (|> root - (# fs directory_files) - (# ! each (monad.each ! (# fs delete))) - (# ! conjoint))] + (at fs directory_files) + (at ! each (monad.each ! (at fs delete))) + (at ! conjoint))] (in []))) (def: .public success @@ -35,16 +35,16 @@ (-> (Console Async) (file.System Async) (Command Any)) (do [! async.monad] [.let [target (the ///.#target profile)] - ? (# fs directory? target) + ? (at fs directory? target) _ (let [! ///action.monad] (if ? (loop (again [root target]) (do ! [_ (..clean_files! fs root) _ (|> root - (# fs sub_directories) - (# ! each (monad.each ! again)) - (# ! conjoint))] - (# fs delete root))) - (# ! in [])))] + (at fs sub_directories) + (at ! each (monad.each ! again)) + (at ! conjoint))] + (at fs delete root))) + (at ! in [])))] (console.write_line (..success target) console))) diff --git a/stdlib/source/program/aedifex/command/deploy/release.lux b/stdlib/source/program/aedifex/command/deploy/release.lux index 2f7d1e4d7..b6d93b30b 100644 --- a/stdlib/source/program/aedifex/command/deploy/release.lux +++ b/stdlib/source/program/aedifex/command/deploy/release.lux @@ -70,9 +70,9 @@ (def: windows? (IO (Try Bit)) - (# (try.with io.monad) each - (|>> java/lang/String::toLowerCase ffi.of_string (text.starts_with? "windows")) - (java/lang/System::getProperty (ffi.as_string "os.name")))) + (at (try.with io.monad) each + (|>> java/lang/String::toLowerCase ffi.of_string (text.starts_with? "windows")) + (java/lang/System::getProperty (ffi.as_string "os.name")))) (def: dummy_jar Binary @@ -117,9 +117,9 @@ (-> (Program Async) (Repository Async) (file.System Async) Artifact (Async (Try Any))) (do (try.with async.monad) [.let [$artifact (////artifact.uri (the ////artifact.#version artifact) artifact)] - _ (# local upload (..jar $artifact) ..dummy_jar) - _ (# local upload (..javadoc $artifact) ..dummy_jar) - _ (# local upload (..sources $artifact) ..dummy_jar)] + _ (at local upload (..jar $artifact) ..dummy_jar) + _ (at local upload (..javadoc $artifact) ..dummy_jar) + _ (at local upload (..sources $artifact) ..dummy_jar)] (in []))) (def: (signed it) @@ -129,8 +129,8 @@ (def: (release_unsigned_artifact! local remote uri) (-> (Repository Async) (Repository Async) Text (Async (Try Binary))) (do [! ////action.monad] - [it (# local download uri) - _ (# remote upload uri it)] + [it (at local download uri) + _ (at remote upload uri it)] (in it))) (def: (release_signed_artifact! local remote [artifact signature]) @@ -139,9 +139,9 @@ [it (..release_unsigned_artifact! local remote artifact) _ (|> it ////hash.md5 - (# ////hash.md5_codec encoded) - (# utf8.codec encoded) - (# remote upload (..md5 artifact))) + (at ////hash.md5_codec encoded) + (at utf8.codec encoded) + (at remote upload (..md5 artifact))) _ (..release_unsigned_artifact! local remote signature)] (in []))) @@ -150,19 +150,19 @@ (do [! ////action.monad] [_ (///install.do! console fs local profile) _ (install_dummies! program local fs artifact) - .let [working_directory (# program directory) + .let [working_directory (at program directory) @root (////repository/local.root program fs) $bundle (////artifact.bundle (the ////artifact.#version artifact) artifact) - / (# fs separator) + / (at fs separator) @local (%.format @root / $bundle)] windows? (async.future ..windows?) process (is (Async (Try (shell.Process Async))) - (# shell execute [environment.empty @local - (if windows? - ["cmd" (list "/c" "for %file in (.\*) do gpg.exe -ab %file")] - ["sh" (list "-c" "for file in *.*; do gpg -ab $file; done")])])) + (at shell execute [environment.empty @local + (if windows? + ["cmd" (list "/c" "for %file in (.\*) do gpg.exe -ab %file")] + ["sh" (list "-c" "for file in *.*; do gpg -ab $file; done")])])) exit (is (Async (Try shell.Exit)) - (# process await [])) + (at process await [])) .let [$artifact (////artifact.uri (the ////artifact.#version artifact) artifact)] _ (monad.each ! (release_signed_artifact! local remote) (list (..signed (..pom $artifact)) diff --git a/stdlib/source/program/aedifex/command/deploy/snapshot.lux b/stdlib/source/program/aedifex/command/deploy/snapshot.lux index 90251c3bd..1fd2c8793 100644 --- a/stdlib/source/program/aedifex/command/deploy/snapshot.lux +++ b/stdlib/source/program/aedifex/command/deploy/snapshot.lux @@ -50,14 +50,14 @@ (the /.#sources) set.list (export.library fs) - (# ! each (binary.result tar.writer))) - pom (# async.monad in (////pom.write profile)) + (at ! each (binary.result tar.writer))) + pom (at async.monad in (////pom.write profile)) _ (////dependency/deployment.one remote [artifact ////artifact/type.lux_library] (let [pom_data (|> pom - (# xml.codec encoded) - (# utf8.codec encoded))] + (at xml.codec encoded) + (at utf8.codec encoded))] [////package.#origin {////repository/origin.#Remote ""} ////package.#library [library (////dependency/status.verified library)] diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux index 915ac8db0..e113616ef 100644 --- a/stdlib/source/program/aedifex/command/deps.lux +++ b/stdlib/source/program/aedifex/command/deps.lux @@ -59,19 +59,19 @@ (///dependency/deployment.all local)) _ (console.write_line (exception.report "Local successes" (|> local_successes - (list.sorted (# ///dependency.order <)) + (list.sorted (at ///dependency.order <)) (exception.listing ..format)) "Local failures" (|> local_failures - (list.sorted (# ///dependency.order <)) + (list.sorted (at ///dependency.order <)) (exception.listing ..format)) "Remote successes" (|> remote_successes (set.of_list ///dependency.hash) (set.difference (set.of_list ///dependency.hash local_successes)) set.list - (list.sorted (# ///dependency.order <)) + (list.sorted (at ///dependency.order <)) (exception.listing ..format)) "Remote failures" (|> remote_failures - (list.sorted (# ///dependency.order <)) + (list.sorted (at ///dependency.order <)) (exception.listing ..format))) console)] (in resolution)))) diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux index 90ace7b46..e6e85948c 100644 --- a/stdlib/source/program/aedifex/command/install.lux +++ b/stdlib/source/program/aedifex/command/install.lux @@ -61,12 +61,12 @@ (export.library fs)) pom (|> profile ///pom.write - (# async.monad in)) + (at async.monad in)) _ (///dependency/deployment.one local [identity ///artifact/type.lux_library] (let [pom_data (|> pom - (# xml.codec encoded) - (# utf8.codec encoded))] + (at xml.codec encoded) + (at utf8.codec encoded))] [///package.#origin {///origin.#Local ""} ///package.#library (let [library (binary.result tar.writer package)] [library (///dependency/status.verified library)]) diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux index 784a07d9a..2abff6969 100644 --- a/stdlib/source/program/aedifex/command/pom.lux +++ b/stdlib/source/program/aedifex/command/pom.lux @@ -29,9 +29,9 @@ (-> (Console Async) (file.System Async) (Command Any)) (do ///action.monad [content (|> (///pom.write profile) - (try#each (|>> (# xml.codec encoded) - (# utf8.codec encoded))) + (try#each (|>> (at xml.codec encoded) + (at utf8.codec encoded))) async#in) - _ (# fs write ///pom.file content)] + _ (at fs write ///pom.file content)] (is (Async (Try Any)) (console.write_line ..success console)))) diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux index fa3d55d1d..0c6c03db9 100644 --- a/stdlib/source/program/aedifex/command/test.lux +++ b/stdlib/source/program/aedifex/command/test.lux @@ -38,9 +38,9 @@ (-> (Console Async) (Program Async) (file.System Async) (Shell Async) Resolution (Command [Exit Any])) (do async.monad [environment (program.environment async.monad program) - .let [working_directory (# program directory)]] + .let [working_directory (at program directory)]] (do [! ///action.monad] - [.let [home (# program home)] + [.let [home (at program home)] [build_exit compiler program] (//build.do! console program fs shell resolution (has ///.#program (the ///.#test profile) profile))] (if (i.= shell.normal build_exit) @@ -62,13 +62,13 @@ [//build.#Python ///.#python] [//build.#Lua ///.#lua] [//build.#Ruby ///.#ruby]))] - process (# shell execute [(dictionary.composite environment command_environment) - working_directory - test_command - test_parameters]) + process (at shell execute [(dictionary.composite environment command_environment) + working_directory + test_command + test_parameters]) _ (//build.log_output! console process) _ (//build.log_error! console process) - exit (# process await []) + exit (at process await []) _ (is (Async (Try Any)) (console.write_line (if (i.= shell.normal exit) ..success diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux index 9e522fa94..2b207cbcd 100644 --- a/stdlib/source/program/aedifex/dependency.lux +++ b/stdlib/source/program/aedifex/dependency.lux @@ -27,7 +27,7 @@ (def: .public equivalence (Equivalence Dependency) - (# hash equivalence)) + (at hash equivalence)) (implementation: .public order (Order Dependency) diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux index 69d85ef9a..49688ae20 100644 --- a/stdlib/source/program/aedifex/dependency/deployment.lux +++ b/stdlib/source/program/aedifex/dependency/deployment.lux @@ -47,11 +47,11 @@ deploy_hash (is (All (_ h) (-> (Codec Text (Hash h)) Extension (Hash h) (Async (Try Any)))) (function (_ codec extension hash) (|> hash - (# codec encoded) - (# utf8.codec encoded) - (# repository upload (format artifact extension)))))] + (at codec encoded) + (at utf8.codec encoded) + (at repository upload (format artifact extension)))))] (do [! (try.with async.monad)] - [_ (# repository upload artifact data)] + [_ (at repository upload artifact data)] (case status {///dependency/status.#Unverified} (in []) @@ -131,7 +131,7 @@ status])) snapshot (///metadata/snapshot.read repository artifact) - snapshot (# ! in (..update_snapshot [artifact type] now snapshot)) + snapshot (at ! in (..update_snapshot [artifact type] now snapshot)) _ (///metadata/snapshot.write repository artifact snapshot) project (///metadata/artifact.read repository artifact) _ (|> project @@ -146,4 +146,4 @@ (|> (dictionary.entries resolution) (monad.each ! (function (_ [dependency package]) (..one repository dependency package))) - (# ! each (set.of_list ///artifact.hash))))) + (at ! each (set.of_list ///artifact.hash))))) diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux index 568973c47..b79f6c5d9 100644 --- a/stdlib/source/program/aedifex/dependency/resolution.lux +++ b/stdlib/source/program/aedifex/dependency/resolution.lux @@ -82,19 +82,19 @@ (Exception [Artifact Extension Text]) (Async (Try (Maybe (Hash h)))))) (do async.monad - [?actual (# repository download (///repository/remote.uri version_template artifact extension))] + [?actual (at repository download (///repository/remote.uri version_template artifact extension))] (case ?actual {try.#Success actual} (in (do [! try.monad] - [output (# ! each (|>> ffi.as_string java/lang/String::trim ffi.of_string) - (# utf8.codec decoded actual)) + [output (at ! each (|>> ffi.as_string java/lang/String::trim ffi.of_string) + (at utf8.codec decoded actual)) actual (|> output (text.all_split_by " ") list.head (maybe.else output) - (# codec decoded)) + (at codec decoded)) _ (exception.assertion exception [artifact extension output] - (# ///hash.equivalence = (hash library) actual))] + (at ///hash.equivalence = (hash library) actual))] (in {.#Some actual}))) {try.#Failure error} @@ -103,7 +103,7 @@ (def: (hashed repository version_template artifact extension) (-> (Repository Async) Version Artifact Extension (Async (Try [Binary Status]))) (do (try.with async.monad) - [data (# repository download (///repository/remote.uri version_template artifact extension)) + [data (at repository download (///repository/remote.uri version_template artifact extension)) ?sha-1 (..verified_hash data repository version_template artifact (format extension ///artifact/extension.sha-1) ///hash.sha-1 ///hash.sha-1_codec ..sha-1_does_not_match) @@ -135,14 +135,14 @@ 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 - (do try.monad - [pom (# utf8.codec decoded pom_data) - pom (# xml.codec decoded pom) - profile (<xml>.result ///pom.parser (list pom))] - (in [///package.#origin {///repository/origin.#Remote ""} - ///package.#library library_&_status - ///package.#pom [pom pom_data pom_status]])))))) + (at async.monad in + (do try.monad + [pom (at utf8.codec decoded pom_data) + pom (at xml.codec decoded pom) + profile (<xml>.result ///pom.parser (list pom))] + (in [///package.#origin {///repository/origin.#Remote ""} + ///package.#library library_&_status + ///package.#pom [pom pom_data pom_status]])))))) (type: .public Resolution (Dictionary Dependency Package)) @@ -163,12 +163,12 @@ (template [<sigil> <name> <doing> <at>] [(def: (<name> console repository artifact) (-> (Console Async) (Repository Async) Artifact (Async (Try Any))) - (# console write (format "[" <sigil> "]" - " " <doing> - " " (///artifact.format artifact) - " " <at> - " " (%.text (# repository description)) - text.new_line)))] + (at console write (format "[" <sigil> "]" + " " <doing> + " " (///artifact.format artifact) + " " <at> + " " (%.text (at repository description)) + text.new_line)))] ["?" announce_fetching "Fetching" "from"] ["O" announce_success "Found" "at"] @@ -181,7 +181,7 @@ {.#End} (|> dependency (exception.except ..cannot_resolve) - (# async.monad in)) + (at async.monad in)) {.#Item repository alternatives} (do [! async.monad] @@ -210,8 +210,8 @@ resolution resolution]) (case dependencies {.#End} - (# async.monad in - [successes failures resolution]) + (at async.monad in + [successes failures resolution]) {.#Item head tail} (case (the [//.#artifact ///artifact.#version] head) @@ -232,7 +232,7 @@ {try.#Success package} (do ! [.let [redundant? (is (Predicate Dependency) - (predicate.or (# //.equivalence = head) + (predicate.or (at //.equivalence = head) (dictionary.key? resolution))) sub_dependencies (|> package ///package.dependencies diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux index c38f993c4..b566dc5e6 100644 --- a/stdlib/source/program/aedifex/hash.lux +++ b/stdlib/source/program/aedifex/hash.lux @@ -58,7 +58,7 @@ (def: encoded (Format Binary) (binary.mix (function (_ byte representation) - (let [hex (# n.hex encoded byte) + (let [hex (at n.hex encoded byte) hex (case (text.size hex) 1 (format "0" hex) _ hex)] @@ -130,7 +130,7 @@ (case (text.split_at ..hex_per_chunk input) {.#Some [head tail]} (do try.monad - [head (# n.hex decoded head) + [head (at n.hex decoded head) output (binary.has_64! index head output)] (again tail (++ chunk) output)) @@ -140,7 +140,7 @@ (^.template [<size> <write>] [<size> (do try.monad - [head (# n.hex decoded input) + [head (at n.hex decoded input) output (<write> index head output)] (constructor output))]) ([1 binary.has_8!] @@ -164,7 +164,7 @@ (All (_ h) (Equivalence (Hash h))) (def: (= reference subject) - (# binary.equivalence = - (representation reference) - (representation subject)))) + (at binary.equivalence = + (representation reference) + (representation subject)))) ) diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux index 5733fa97a..c85970a5b 100644 --- a/stdlib/source/program/aedifex/input.lux +++ b/stdlib/source/program/aedifex/input.lux @@ -45,18 +45,18 @@ (def: project_parser (-> Binary (Try Project)) (|>> (pipe.do try.monad - [(# utf8.codec decoded)] + [(at utf8.codec decoded)] [..lux_parser] [(list) (<code>.result //parser.project)]))) (def: .public (read monad fs profiles) (All (_ !) (-> (Monad !) (file.System !) (List Name) (! (Try Profile)))) (|> //project.file - (# fs read) - (# monad each - (function (_ it) - (do [! try.monad] - [it it - it (..project_parser it) - it (monad.each ! (//project.profile it) (partial_list //profile.default profiles))] - (in (mix.with_monoid //profile.monoid list.mix it))))))) + (at fs read) + (at monad each + (function (_ it) + (do [! try.monad] + [it it + it (..project_parser it) + it (monad.each ! (//project.profile it) (partial_list //profile.default profiles))] + (in (mix.with_monoid //profile.monoid list.mix it))))))) diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux index 0ba7371b8..e2e363c16 100644 --- a/stdlib/source/program/aedifex/metadata/artifact.lux +++ b/stdlib/source/program/aedifex/metadata/artifact.lux @@ -178,13 +178,13 @@ (def: .public (read repository artifact) (-> (Repository Async) Artifact (Async (Try Metadata))) (do async.monad - [project (# repository download (..uri artifact))] + [project (at repository download (..uri artifact))] (case project {try.#Success binary_metadata} (in (|> binary_metadata (pipe.do try.monad - [(# utf8.codec decoded)] - [(# xml.codec decoded)] + [(at utf8.codec decoded)] + [(at xml.codec decoded)] [list (<xml>.result ..parser)]))) {try.#Failure error} @@ -199,6 +199,6 @@ (-> (Repository Async) Artifact Metadata (Async (Try Any))) (|> metadata ..format - (# xml.codec encoded) - (# utf8.codec encoded) - (# repository upload (..uri artifact)))) + (at xml.codec encoded) + (at utf8.codec encoded) + (at repository upload (..uri artifact)))) diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux index eb2f48c76..caf25a787 100644 --- a/stdlib/source/program/aedifex/metadata/snapshot.lux +++ b/stdlib/source/program/aedifex/metadata/snapshot.lux @@ -95,16 +95,16 @@ ///artifact/snapshot/version.#value version ///artifact/snapshot/version.#updated ///artifact/time.epoch]] (|> (<xml>.somewhere ///artifact/versioning.parser) - (# ! each - (revised ///artifact/versioning.#versions - (is (-> (List ///artifact/snapshot/version.Version) - (List ///artifact/snapshot/version.Version)) - (|>> (pipe.case - (pattern (list)) - (list <default_version>) + (at ! each + (revised ///artifact/versioning.#versions + (is (-> (List ///artifact/snapshot/version.Version) + (List ///artifact/snapshot/version.Version)) + (|>> (pipe.case + (pattern (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>)])))] @@ -127,13 +127,13 @@ (def: .public (read repository artifact) (-> (Repository Async) Artifact (Async (Try Metadata))) (do async.monad - [project (# repository download (..uri artifact))] + [project (at repository download (..uri artifact))] (case project {try.#Success project} (in (|> project (pipe.do try.monad - [(# utf8.codec decoded)] - [(# xml.codec decoded)] + [(at utf8.codec decoded)] + [(at xml.codec decoded)] [list (<xml>.result ..parser)]))) {try.#Failure error} @@ -145,6 +145,6 @@ (-> (Repository Async) Artifact Metadata (Async (Try Any))) (|> metadata ..format - (# xml.codec encoded) - (# utf8.codec encoded) - (# repository upload (..uri artifact)))) + (at xml.codec encoded) + (at utf8.codec encoded) + (at repository upload (..uri artifact)))) diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux index 4706c50ce..a08033b88 100644 --- a/stdlib/source/program/aedifex/package.lux +++ b/stdlib/source/program/aedifex/package.lux @@ -54,7 +54,7 @@ #library [library {//status.#Verified (//hash.sha-1 library) (//hash.md5 library)}] - #pom (let [binary_pom (|> pom (# xml.codec encoded) (# utf8.codec encoded))] + #pom (let [binary_pom (|> pom (at xml.codec encoded) (at utf8.codec encoded))] [pom binary_pom {//status.#Verified (//hash.sha-1 binary_pom) diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux index 7f184b2eb..7fa14fb60 100644 --- a/stdlib/source/program/aedifex/parser.lux +++ b/stdlib/source/program/aedifex/parser.lux @@ -79,10 +79,10 @@ (def: license (Parser /.License) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (<code>.tuple (<>.some (<>.and <code>.text - <code>.any))))] + [input (at ! each + (dictionary.of_list text.hash) + (<code>.tuple (<>.some (<>.and <code>.text + <code>.any))))] (all <>.and (..singular input "name" ..name) (..singular input "url" ..url) @@ -94,10 +94,10 @@ (def: organization (Parser /.Organization) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (<code>.tuple (<>.some (<>.and <code>.text - <code>.any))))] + [input (at ! each + (dictionary.of_list text.hash) + (<code>.tuple (<>.some (<>.and <code>.text + <code>.any))))] (all <>.and (..singular input "name" ..name) (..singular input "url" ..url)))) @@ -105,10 +105,10 @@ (def: developer (Parser /.Developer) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (<code>.tuple (<>.some (<>.and <code>.text - <code>.any))))] + [input (at ! each + (dictionary.of_list text.hash) + (<code>.tuple (<>.some (<>.and <code>.text + <code>.any))))] (all <>.and (..singular input "name" ..name) (..singular input "url" ..url) @@ -122,10 +122,10 @@ (def: info (Parser /.Info) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (<code>.tuple (<>.some (<>.and <code>.text - <code>.any))))] + [input (at ! each + (dictionary.of_list text.hash) + (<code>.tuple (<>.some (<>.and <code>.text + <code>.any))))] (all <>.and (<>.maybe (..singular input "name" ..name)) (<>.maybe (..singular input "url" ..url)) @@ -196,10 +196,10 @@ (def: profile (Parser /.Profile) (do [! <>.monad] - [input (# ! each - (dictionary.of_list text.hash) - (<code>.tuple (<>.some (<>.and <code>.text - <code>.any)))) + [input (at ! each + (dictionary.of_list text.hash) + (<code>.tuple (<>.some (<>.and <code>.text + <code>.any)))) .let [^parents (is (Parser (List /.Name)) (<>.else (list) (..plural input "parents" <code>.text))) @@ -211,12 +211,12 @@ (..singular input "info" ..info))) ^repositories (is (Parser (Set //repository.Address)) (|> (..plural input "repositories" ..repository) - (# ! each (set.of_list text.hash)) + (at ! each (set.of_list text.hash)) (<>.else (set.empty text.hash)) - (# ! each (set.has /.default_repository)))) + (at ! each (set.has /.default_repository)))) ^dependencies (is (Parser (Set //dependency.Dependency)) (|> (..plural input "dependencies" ..dependency) - (# ! each (set.of_list //dependency.hash)) + (at ! each (set.of_list //dependency.hash)) (<>.else (set.empty //dependency.hash)))) ^lux (|> ..dependency (..singular input //format.lux_compiler_label) @@ -226,7 +226,7 @@ (<>.else (list))) ^sources (is (Parser (Set /.Source)) (|> (..plural input "sources" ..source) - (# ! each (set.of_list text.hash)) + (at ! each (set.of_list text.hash)) (<>.else (set.of_list text.hash (list /.default_source))))) ^target (is (Parser /.Target) (|> ..target @@ -239,7 +239,7 @@ (<>.maybe (..singular input "test" ..module))) ^deploy_repositories (is (Parser (Dictionary Text //repository.Address)) - (<| (# ! each (dictionary.of_list text.hash)) + (<| (at ! each (dictionary.of_list text.hash)) (<>.else (list)) (..plural input "deploy_repositories" ..deploy_repository))) ^configuration (is (Parser (PList Text)) @@ -283,7 +283,7 @@ (def: .public project (Parser Project) - (# <>.monad each - (dictionary.of_list text.hash) - (<code>.tuple (<>.many (<>.and <code>.text - ..profile))))) + (at <>.monad each + (dictionary.of_list text.hash) + (<code>.tuple (<>.many (<>.and <code>.text + ..profile))))) diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux index 537fde5e7..9b9cfd998 100644 --- a/stdlib/source/program/aedifex/pom.lux +++ b/stdlib/source/program/aedifex/pom.lux @@ -164,15 +164,15 @@ (do [! <>.monad] [tag <xml>.tag] (<| (<xml>.node tag) - (# ! each (|>> [tag])) + (at ! each (|>> [tag])) <xml>.text))) (def: (dependency_parser own_version parent_version) (-> Text Text (Parser Dependency)) (do [! <>.monad] - [properties (# ! each (dictionary.of_list symbol.hash) - (<| (<xml>.node ["" ..dependency_tag]) - (<>.some ..property_parser)))] + [properties (at ! each (dictionary.of_list symbol.hash) + (<| (<xml>.node ["" ..dependency_tag]) + (<>.some ..property_parser)))] (<| <>.lifted try.of_maybe (do maybe.monad @@ -229,7 +229,7 @@ <xml>.somewhere (<>.else (list))) _ (<>.some <xml>.any)] - (in (|> (# /.monoid identity) + (in (|> (at /.monoid identity) (revised /.#dependencies (function (_ empty) (list#mix set.has empty dependencies))) (revised /.#repositories (function (_ empty) diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux index e4ab5be29..51288af15 100644 --- a/stdlib/source/program/aedifex/project.lux +++ b/stdlib/source/program/aedifex/project.lux @@ -39,7 +39,7 @@ (dictionary.empty text.hash)) (def: composite - (dictionary.composite_with (# //.monoid composite)))) + (dictionary.composite_with (at //.monoid composite)))) (exception: .public (unknown_profile [name Name]) (exception.report @@ -65,7 +65,7 @@ [parents (monad.each ! (profile' (set.has name lineage) project) (the //.#parents profile))] (in (list#mix (function (_ parent child) - (# //.monoid composite child parent)) + (at //.monoid composite child parent)) (has //.#parents (list) profile) parents)))) diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux index 65c13db0f..395eefc20 100644 --- a/stdlib/source/program/aedifex/repository.lux +++ b/stdlib/source/program/aedifex/repository.lux @@ -28,12 +28,12 @@ (-> (Repository IO) (Repository Async)) (implementation (def: description - (# repository description)) + (at repository description)) (def: (download uri) - (async.future (# repository download uri))) + (async.future (at repository download uri))) (def: (upload uri content) - (async.future (# repository upload uri content))) + (async.future (at repository upload uri content))) )) (type: .public (Mock s) @@ -50,13 +50,13 @@ (let [state (stm.var init)] (implementation (def: description - (# mock the_description)) + (at mock the_description)) (def: (download uri) (stm.commit! (do [! stm.monad] [|state| (stm.read state)] - (case (# mock on_download uri |state|) + (case (at mock on_download uri |state|) {try.#Success [|state| output]} (do ! [_ (stm.write |state| state)] @@ -69,7 +69,7 @@ (stm.commit! (do [! stm.monad] [|state| (stm.read state)] - (case (# mock on_upload uri content |state|) + (case (at mock on_upload uri content |state|) {try.#Success |state|} (do ! [_ (stm.write |state| state)] diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux index f3111fed3..5f618e183 100644 --- a/stdlib/source/program/aedifex/repository/identity.lux +++ b/stdlib/source/program/aedifex/repository/identity.lux @@ -39,7 +39,7 @@ (def: .public (basic_auth user password) (-> User Password Text) - (let [credentials (# utf8.codec encoded (format user ":" password))] + (let [credentials (at utf8.codec encoded (format user ":" password))] (|> (java/util/Base64::getEncoder) (java/util/Base64$Encoder::encodeToString credentials) ffi.of_string diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux index e712e1db1..6f031ccfd 100644 --- a/stdlib/source/program/aedifex/repository/local.lux +++ b/stdlib/source/program/aedifex/repository/local.lux @@ -22,10 +22,10 @@ (def: .public (root program fs) (-> (Program Async) (file.System Async) file.Path) - (let [/ (# fs separator)] + (let [/ (at fs separator)] (|> ///local.repository (text.replaced uri.separator /) - (format (# program home) /)))) + (format (at program home) /)))) (def: (path /) (-> Text (-> URI file.Path)) @@ -33,7 +33,7 @@ (def: (absolute_path program fs) (-> (Program Async) (file.System Async) (-> URI file.Path)) - (let [/ (# fs separator)] + (let [/ (at fs separator)] (|>> ///metadata.local_uri (..path /) (format (..root program fs) /)))) @@ -46,12 +46,12 @@ (def: download (|>> (..absolute_path program fs) - (# fs read))) + (at fs read))) (def: (upload uri content) (do [! async.monad] [.let [absolute_path (..absolute_path program fs uri)] - ? (# fs file? absolute_path) + ? (at fs file? absolute_path) _ (is (Async (Try Any)) (if ? (in {try.#Success []}) @@ -61,4 +61,4 @@ _ (in {try.#Success []}))))] - (# fs write absolute_path content)))) + (at fs write absolute_path content)))) diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux index c6aafb221..8a93e4cfd 100644 --- a/stdlib/source/program/aedifex/repository/remote.lux +++ b/stdlib/source/program/aedifex/repository/remote.lux @@ -68,12 +68,12 @@ http))] (case status (pattern (static http/status.ok)) - (# ! each product.right ((the @http.#body message) {.#None})) + (at ! each product.right ((the @http.#body message) {.#None})) _ (do ! [_ ((the @http.#body message) {.#Some 0})] - (# io.monad in (exception.except ..download_failure [(format address uri) status])))))) + (at io.monad in (exception.except ..download_failure [(format address uri) status])))))) (def: (upload uri content) (do (try.with io.monad) @@ -94,5 +94,5 @@ (in []) _ - (# io.monad in (exception.except ..upload_failure [(format address uri) status]))))) + (at io.monad in (exception.except ..upload_failure [(format address uri) status]))))) ) diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux index 543900782..986e1f161 100644 --- a/stdlib/source/program/compositor.lux +++ b/stdlib/source/program/compositor.lux @@ -78,7 +78,7 @@ (console.write_line report console))) (is (Async (Try Any)) <else>)))] - (io.run! (# world/program.default exit +1)))) + (io.run! (at world/program.default exit +1)))) {try.#Success output} (in output)))) @@ -101,18 +101,18 @@ {try.#Success content} (case content {.#Left content} - (# fs write package content) + (at fs write package content) {.#Right content} (do [! (try.with async.monad)] - [_ (# fs make_directory package) + [_ (at fs make_directory package) _ (monad.each ! (function (_ [name content]) - (# fs write (file.rooted fs package name) content)) + (at fs write (file.rooted fs package name) content)) content)] (in []))) {try.#Failure error} - (# async.monad in {try.#Failure error}))) + (at async.monad in {try.#Failure error}))) (def: (load_host_dependencies fs host_dependencies) (-> (file.System Async) (List file.Path) (Async (Try (Dictionary file.Path Binary)))) @@ -127,7 +127,7 @@ {.#Item head tail} (do ! - [content (# fs read head)] + [content (at fs read head)] (again tail (dictionary.has head content output))))))) @@ -201,6 +201,6 @@ ... (do [! async.monad] ... [console (|> console.default ... async.future - ... (# ! each (|>> try.trusted console.async)))] + ... (at ! each (|>> try.trusted console.async)))] ... (interpreter.run! (try.with async.monad) console platform interpretation generation_bundle))) )))) diff --git a/stdlib/source/specification/aedifex/repository.lux b/stdlib/source/specification/aedifex/repository.lux index d35058c45..d71b95e75 100644 --- a/stdlib/source/specification/aedifex/repository.lux +++ b/stdlib/source/specification/aedifex/repository.lux @@ -30,17 +30,17 @@ (in (all _.and' (do async.monad [.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) + good_upload! (at subject upload good_uri expected) + good_download! (at subject download good_uri) .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)] + bad_upload! (at subject upload bad_uri expected) + bad_download! (at subject download bad_uri)] (_.coverage' [/.Repository] (let [successfull_flow! (case [good_upload! good_download!] [{try.#Success _} {try.#Success actual}] - (# binary.equivalence = expected actual) + (at binary.equivalence = expected actual) _ false) diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux index 5e197472b..947131032 100644 --- a/stdlib/source/specification/compositor/common.lux +++ b/stdlib/source/specification/compositor/common.lux @@ -40,7 +40,7 @@ (do phase.monad [_ runtime] (phase expressionS)))] - (# host evaluate! evaluation_name expressionG)))) + (at host evaluate! evaluation_name expressionG)))) (def: (definer (open "[0]") state) (Instancer Definer) @@ -54,7 +54,7 @@ [host_name host_value host_directive] (generation.define! lux_name expressionG) _ (generation.learn lux_name host_name)] (phase (synthesis.constant lux_name))))] - (# host evaluate! "definer" definitionG)))) + (at host evaluate! "definer" definitionG)))) (def: .public (executors target expander platform analysis_bundle generation_bundle directive_bundle diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux index 1fbde2917..05e58e21f 100644 --- a/stdlib/source/specification/compositor/generation/case.lux +++ b/stdlib/source/specification/compositor/generation/case.lux @@ -32,7 +32,7 @@ (def: size (Random Nat) - (|> r.nat (# r.monad each (|>> (n.% ..limit) (n.max 2))))) + (|> r.nat (at r.monad each (|>> (n.% ..limit) (n.max 2))))) (def: (tail? size idx) (-> Nat Nat Bit) @@ -67,7 +67,7 @@ [(r.unicode 5) synthesis.text synthesis.path/text])) (do [! r.monad] [size ..size - idx (|> r.nat (# ! each (n.% size))) + idx (|> r.nat (at ! each (n.% size))) [subS subP] case .let [unitS (synthesis.text synthesis.unit) caseS (synthesis.tuple @@ -82,7 +82,7 @@ (in [caseS caseP])) (do [! r.monad] [size ..size - idx (|> r.nat (# ! each (n.% size))) + idx (|> r.nat (at ! each (n.% size))) [subS subP] case .let [right? (tail? size idx) caseS (synthesis.variant @@ -246,7 +246,7 @@ (_.property "===" (and (text#= (synthesis.%path special_path) (synthesis.%path special_pattern_path)) - (# synthesis.path_equivalence = special_path special_pattern_path))) + (at synthesis.path_equivalence = special_path special_pattern_path))) (_.property "CODE" (|> special_input (run "special_input") diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux index e8d5e6ab4..8012798f8 100644 --- a/stdlib/source/specification/compositor/generation/common.lux +++ b/stdlib/source/specification/compositor/generation/common.lux @@ -124,7 +124,7 @@ (def: simple_frac (Random Frac) - (|> r.nat (# r.monad each (|>> (n.% 1000) .int i.frac)))) + (|> r.nat (at r.monad each (|>> (n.% 1000) .int i.frac)))) (def: (f64 run) (-> Runner Test) @@ -182,12 +182,12 @@ (def: (text run) (-> Runner Test) (do [! r.monad] - [sample_size (|> r.nat (# ! each (|>> (n.% 10) (n.max 1)))) + [sample_size (|> r.nat (at ! each (|>> (n.% 10) (n.max 1)))) sample_lower (r.lower_case_alpha sample_size) sample_upper (r.upper_case_alpha sample_size) sample_alpha (|> (r.alphabetic sample_size) (r.only (|>> (text#= sample_upper) not))) - char_idx (|> r.nat (# ! each (n.% sample_size))) + char_idx (|> r.nat (at ! each (n.% sample_size))) .let [sample_lowerS (synthesis.text sample_lower) sample_upperS (synthesis.text sample_upper) sample_alphaS (synthesis.text sample_alpha) diff --git a/stdlib/source/specification/compositor/generation/function.lux b/stdlib/source/specification/compositor/generation/function.lux index 7e2c6d66f..86c495c3b 100644 --- a/stdlib/source/specification/compositor/generation/function.lux +++ b/stdlib/source/specification/compositor/generation/function.lux @@ -50,7 +50,7 @@ (-> Runner Test) (do [! r.monad] [[arity local functionS] ..function - partial_arity (|> r.nat (# ! each (|>> (n.% arity) (n.max 1)))) + partial_arity (|> r.nat (at ! each (|>> (n.% arity) (n.max 1)))) inputs (r.list arity r.safe_frac) .let [expectation (maybe.trusted (list.item (-- local) inputs)) inputsS (list#each (|>> synthesis.f64) inputs)]] diff --git a/stdlib/source/specification/compositor/generation/reference.lux b/stdlib/source/specification/compositor/generation/reference.lux index e7b9ceeb0..f8f68c51e 100644 --- a/stdlib/source/specification/compositor/generation/reference.lux +++ b/stdlib/source/specification/compositor/generation/reference.lux @@ -41,7 +41,7 @@ (def: (variable run) (-> Runner Test) (do [! r.monad] - [register (|> r.nat (# ! each (n.% 100))) + [register (|> r.nat (at ! each (n.% 100))) expected r.safe_frac] (_.property "Local variables." (|> (synthesis.branch/let [(synthesis.f64 expected) diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux index d914c309f..86054b07e 100644 --- a/stdlib/source/specification/compositor/generation/structure.lux +++ b/stdlib/source/specification/compositor/generation/structure.lux @@ -31,8 +31,8 @@ (def: (variant run) (-> Runner Test) (do [! r.monad] - [num_tags (|> r.nat (# ! each (|>> (n.% 10) (n.max 2)))) - tag_in (|> r.nat (# ! each (n.% num_tags))) + [num_tags (|> r.nat (at ! each (|>> (n.% 10) (n.max 2)))) + tag_in (|> r.nat (at ! each (n.% num_tags))) .let [last?_in (|> num_tags -- (n.= tag_in))] value_in r.i64] (_.property (%.symbol (symbol synthesis.variant)) @@ -67,7 +67,7 @@ (def: (tuple run) (-> Runner Test) (do [! r.monad] - [size (|> r.nat (# ! each (|>> (n.% 10) (n.max 2)))) + [size (|> r.nat (at ! each (|>> (n.% 10) (n.max 2)))) tuple_in (r.list size r.i64)] (_.property (%.symbol (symbol synthesis.tuple)) (|> (synthesis.tuple (list#each (|>> synthesis.i64) tuple_in)) diff --git a/stdlib/source/specification/lux/abstract/apply.lux b/stdlib/source/specification/lux/abstract/apply.lux index fcb51c926..8d0fe390e 100644 --- a/stdlib/source/specification/lux/abstract/apply.lux +++ b/stdlib/source/specification/lux/abstract/apply.lux @@ -19,7 +19,7 @@ (def: (identity injection comparison (open "/#[0]")) (All (_ f) (-> (Injection f) (Comparison f) (Apply f) Test)) (do [! random.monad] - [sample (# ! each injection random.nat)] + [sample (at ! each injection random.nat)] (_.property "Identity." ((comparison n.=) (/#on sample (injection function.identity)) @@ -29,7 +29,7 @@ (All (_ f) (-> (Injection f) (Comparison f) (Apply f) Test)) (do [! random.monad] [sample random.nat - increase (# ! each n.+ random.nat)] + increase (at ! each n.+ random.nat)] (_.property "Homomorphism." ((comparison n.=) (/#on (injection sample) (injection increase)) @@ -39,7 +39,7 @@ (All (_ f) (-> (Injection f) (Comparison f) (Apply f) Test)) (do [! random.monad] [sample random.nat - increase (# ! each n.+ random.nat)] + increase (at ! each n.+ random.nat)] (_.property "Interchange." ((comparison n.=) (/#on (injection sample) (injection increase)) @@ -52,9 +52,9 @@ (do [! random.monad] [sample random.nat increase (is (Random :$/1:) - (# ! each n.+ random.nat)) + (at ! each n.+ random.nat)) decrease (is (Random :$/1:) - (# ! each n.- random.nat))] + (at ! each n.- random.nat))] (_.property "Composition." ((comparison n.=) (|> (injection (is (-> :$/1: :$/1: :$/1:) diff --git a/stdlib/source/specification/lux/abstract/comonad.lux b/stdlib/source/specification/lux/abstract/comonad.lux index 6486cecd8..c9a03c6d3 100644 --- a/stdlib/source/specification/lux/abstract/comonad.lux +++ b/stdlib/source/specification/lux/abstract/comonad.lux @@ -17,9 +17,9 @@ (All (_ f) (-> (Injection f) (CoMonad f) Test)) (do [! random.monad] [sample random.nat - morphism (# ! each (function (_ diff) - (|>> _//out (n.+ diff))) - random.nat) + morphism (at ! each (function (_ diff) + (|>> _//out (n.+ diff))) + random.nat) .let [start (injection sample)]] (_.property "Left identity." (n.= (morphism start) @@ -39,12 +39,12 @@ (All (_ f) (-> (Injection f) (Comparison f) (CoMonad f) Test)) (do [! random.monad] [sample random.nat - increase (# ! each (function (_ diff) - (|>> _//out (n.+ diff))) - random.nat) - decrease (# ! each (function (_ diff) - (|>> _//out(n.- diff))) - random.nat) + increase (at ! each (function (_ diff) + (|>> _//out (n.+ diff))) + random.nat) + decrease (at ! each (function (_ diff) + (|>> _//out(n.- diff))) + random.nat) .let [start (injection sample) == (comparison n.=)]] (_.property "Associativity." diff --git a/stdlib/source/specification/lux/abstract/functor.lux b/stdlib/source/specification/lux/abstract/functor.lux index cc53413ca..8ac207e97 100644 --- a/stdlib/source/specification/lux/abstract/functor.lux +++ b/stdlib/source/specification/lux/abstract/functor.lux @@ -25,7 +25,7 @@ (def: (identity injection comparison (open "@//[0]")) (All (_ f) (-> (Injection f) (Comparison f) (Functor f) Test)) (do [! random.monad] - [sample (# ! each injection random.nat)] + [sample (at ! each injection random.nat)] (_.property "Identity." ((comparison n.=) (@//each function.identity sample) @@ -35,7 +35,7 @@ (All (_ f) (-> (Injection f) (Comparison f) (Functor f) Test)) (do [! random.monad] [sample random.nat - increase (# ! each n.+ random.nat)] + increase (at ! each n.+ random.nat)] (_.property "Homomorphism." ((comparison n.=) (@//each increase (injection sample)) @@ -44,9 +44,9 @@ (def: (composition injection comparison (open "@//[0]")) (All (_ f) (-> (Injection f) (Comparison f) (Functor f) Test)) (do [! random.monad] - [sample (# ! each injection random.nat) - increase (# ! each n.+ random.nat) - decrease (# ! each n.- random.nat)] + [sample (at ! each injection random.nat) + increase (at ! each n.+ random.nat) + decrease (at ! each n.- random.nat)] (_.property "Composition." ((comparison n.=) (|> sample (@//each increase) (@//each decrease)) diff --git a/stdlib/source/specification/lux/abstract/monad.lux b/stdlib/source/specification/lux/abstract/monad.lux index 70911488b..25a2f3e4f 100644 --- a/stdlib/source/specification/lux/abstract/monad.lux +++ b/stdlib/source/specification/lux/abstract/monad.lux @@ -15,9 +15,9 @@ (All (_ f) (-> (Injection f) (Comparison f) (/.Monad f) Test)) (do [! random.monad] [sample random.nat - morphism (# ! each (function (_ diff) - (|>> (n.+ diff) _//in)) - random.nat)] + morphism (at ! each (function (_ diff) + (|>> (n.+ diff) _//in)) + random.nat)] (_.property "Left identity." ((comparison n.=) (|> (injection sample) (_//each morphism) _//conjoint) @@ -36,12 +36,12 @@ (All (_ f) (-> (Injection f) (Comparison f) (/.Monad f) Test)) (do [! random.monad] [sample random.nat - increase (# ! each (function (_ diff) - (|>> (n.+ diff) _//in)) - random.nat) - decrease (# ! each (function (_ diff) - (|>> (n.- diff) _//in)) - random.nat)] + increase (at ! each (function (_ diff) + (|>> (n.+ diff) _//in)) + random.nat) + decrease (at ! each (function (_ diff) + (|>> (n.- diff) _//in)) + random.nat)] (_.property "Associativity." ((comparison n.=) (|> (injection sample) (_//each increase) _//conjoint (_//each decrease) _//conjoint) diff --git a/stdlib/source/specification/lux/world/console.lux b/stdlib/source/specification/lux/world/console.lux index e80610389..fd31486a2 100644 --- a/stdlib/source/specification/lux/world/console.lux +++ b/stdlib/source/specification/lux/world/console.lux @@ -23,11 +23,11 @@ [message (random.alphabetic 10)] (in (do async.monad [console (async.future console) - ?write (# console write (format message text.new_line)) - ?read (# console read []) - ?read_line (# console read_line []) - ?close/good (# console close []) - ?close/bad (# console close []) + ?write (at console write (format message text.new_line)) + ?read (at console read []) + ?read_line (at console read_line []) + ?close/good (at console close []) + ?close/bad (at console close []) .let [can_write! (case ?write diff --git a/stdlib/source/specification/lux/world/file.lux b/stdlib/source/specification/lux/world/file.lux index 0956528de..33c42637d 100644 --- a/stdlib/source/specification/lux/world/file.lux +++ b/stdlib/source/specification/lux/world/file.lux @@ -58,9 +58,9 @@ (def: (directory?&make_directory fs parent) (-> (/.System Async) /.Path (Async Bit)) (do async.monad - [directory_pre! (# fs directory? parent) - made? (# fs make_directory parent) - directory_post! (# fs directory? parent)] + [directory_pre! (at fs directory? parent) + made? (at fs make_directory parent) + directory_post! (at fs directory? parent)] (in (and (not directory_pre!) (case made? {try.#Success _} true @@ -70,9 +70,9 @@ (def: (file?&write fs content path) (-> (/.System Async) Binary /.Path (Async Bit)) (do async.monad - [file_pre! (# fs file? path) - made? (# fs write path content) - file_post! (# fs file? path)] + [file_pre! (at fs file? path) + made? (at fs write path content) + file_post! (at fs file? path)] (in (and (not file_pre!) (case made? {try.#Success _} true @@ -82,26 +82,26 @@ (def: (file_size&read&append fs expected_file_size content appendix path) (-> (/.System Async) Nat Binary Binary /.Path (Async Bit)) (do async.monad - [pre_file_size (# fs file_size path) - pre_content (# fs read path) - appended? (# fs append path appendix) - post_file_size (# fs file_size path) - post_content (# fs read path)] + [pre_file_size (at fs file_size path) + pre_content (at fs read path) + appended? (at fs append path appendix) + post_file_size (at fs file_size path) + post_content (at fs read path)] (in (<| (try.else false) (do [! try.monad] [pre_file_size! - (# ! each (n.= expected_file_size) pre_file_size) + (at ! each (n.= expected_file_size) pre_file_size) pre_content! - (# ! each (binary#= content) pre_content) + (at ! each (binary#= content) pre_content) _ appended? post_file_size! - (# ! each (n.= (n.* 2 expected_file_size)) post_file_size) + (at ! each (n.= (n.* 2 expected_file_size)) post_file_size) post_content! - (# ! each (binary#= (binary#composite content appendix)) post_content)] + (at ! each (binary#= (binary#composite content appendix)) post_content)] (in (and pre_file_size! pre_content! post_file_size! @@ -110,21 +110,21 @@ (def: (modified?&last_modified fs expected_time path) (-> (/.System Async) Instant /.Path (Async Bit)) (do async.monad - [modified? (# fs modify path expected_time) - last_modified (# fs last_modified path)] + [modified? (at fs modify path expected_time) + last_modified (at fs last_modified path)] (in (<| (try.else false) (do [! try.monad] [_ modified?] - (# ! each (instant#= expected_time) last_modified)))))) + (at ! each (instant#= expected_time) last_modified)))))) (def: (directory_files&sub_directories fs parent sub_dir child) (-> (/.System Async) /.Path /.Path /.Path (Async Bit)) (let [sub_dir (/.rooted fs parent sub_dir) child (/.rooted fs parent child)] (do async.monad - [made_sub? (# fs make_directory sub_dir) - directory_files (# fs directory_files parent) - sub_directories (# fs sub_directories parent) + [made_sub? (at fs make_directory sub_dir) + directory_files (at fs directory_files parent) + sub_directories (at fs sub_directories parent) .let [(open "list#[0]") (list.equivalence text.equivalence)]] (in (<| (try.else false) (do try.monad @@ -141,12 +141,12 @@ (let [origin (/.rooted fs parent child) destination (/.rooted fs parent alternate_child)] (do [! async.monad] - [moved? (# fs move origin destination) + [moved? (at fs move origin destination) lost? (|> origin - (# fs file?) - (# ! each not)) - found? (# fs file? destination) - deleted? (# fs delete destination)] + (at fs file?) + (at ! each not)) + found? (at fs file? destination) + deleted? (at fs delete destination)] (in (<| (try.else false) (do try.monad [_ moved? @@ -165,7 +165,7 @@ (|>> (text#= child) not) (|>> (text#= sub_dir) not)) (random.numeric 2)) - expected_file_size (# ! each (|>> (n.% 10) ++) random.nat) + expected_file_size (at ! each (|>> (n.% 10) ++) random.nat) content ($binary.random expected_file_size) appendix ($binary.random expected_file_size) expected_time random.instant]) @@ -188,8 +188,8 @@ can_execute? (|> path - (# fs can_execute?) - (# ! each (|>> (try.else true) not))) + (at fs can_execute?) + (at ! each (|>> (try.else true) not))) directory_files&sub_directories (..directory_files&sub_directories fs parent sub_dir child) @@ -216,16 +216,16 @@ [fs (async.future fs) .let [dir/1 (/.rooted fs dir/0 dir/1) dir/2 (/.rooted fs dir/1 dir/2)] - pre_dir/0 (# fs directory? dir/0) - pre_dir/1 (# fs directory? dir/1) - pre_dir/2 (# fs directory? dir/2) + pre_dir/0 (at fs directory? dir/0) + pre_dir/1 (at fs directory? dir/1) + pre_dir/2 (at fs directory? dir/2) made? (/.make_directories ! fs dir/2) - post_dir/0 (# fs directory? dir/0) - post_dir/1 (# fs directory? dir/1) - post_dir/2 (# fs directory? dir/2) + post_dir/0 (at fs directory? dir/0) + post_dir/1 (at fs directory? dir/1) + post_dir/2 (at fs directory? dir/2) cannot_make_directory!/0 (/.make_directories ! fs "") - cannot_make_directory!/1 (/.make_directories ! fs (# fs separator))]) + cannot_make_directory!/1 (/.make_directories ! fs (at fs separator))]) (all _.and' (_.coverage' [/.make_directories] (and (not pre_dir/0) @@ -292,17 +292,17 @@ (do [! async.monad] [fs (async.future fs) - pre_file/0 (# fs file? file) + pre_file/0 (at fs file? file) pre_file/1 (/.exists? ! fs file) - pre_dir/0 (# fs directory? dir) + pre_dir/0 (at fs directory? dir) pre_dir/1 (/.exists? ! fs dir) made_file? (/.make_file ! fs (utf8#encoded file) file) - made_dir? (# fs make_directory dir) + made_dir? (at fs make_directory dir) - post_file/0 (# fs file? file) + post_file/0 (at fs file? file) post_file/1 (/.exists? ! fs file) - post_dir/0 (# fs directory? dir) + post_dir/0 (at fs directory? dir) post_dir/1 (/.exists? ! fs dir)]) (_.coverage' [/.exists?] (and (not pre_file/0) diff --git a/stdlib/source/specification/lux/world/program.lux b/stdlib/source/specification/lux/world/program.lux index 26371c1e6..3830dfb2a 100644 --- a/stdlib/source/specification/lux/world/program.lux +++ b/stdlib/source/specification/lux/world/program.lux @@ -28,5 +28,5 @@ (and (not (dictionary.empty? environment)) (list.every? (|>> text.empty? not) (dictionary.keys environment)) - (not (text.empty? (# subject home))) - (not (text.empty? (# subject directory))))))))) + (not (text.empty? (at subject home))) + (not (text.empty? (at subject directory))))))))) diff --git a/stdlib/source/specification/lux/world/shell.lux b/stdlib/source/specification/lux/world/shell.lux index 64e31abfe..702d29d97 100644 --- a/stdlib/source/specification/lux/world/shell.lux +++ b/stdlib/source/specification/lux/world/shell.lux @@ -35,7 +35,7 @@ (def: (can_wait! process) (-> (/.Process Async) _.Assertion) - (|> (# process await []) + (|> (at process await []) (async#each (|>> (try#each (i.= /.normal)) (try.else false) (_.coverage' [/.Exit /.normal]))) @@ -43,15 +43,15 @@ (def: (can_read! expected process) (-> Text (/.Process Async) (Async Bit)) - (|> (# process read []) + (|> (at process read []) (async#each (|>> (try#each (text#= expected)) (try.else false))))) (def: (can_destroy! process) (-> (/.Process Async) (Async Bit)) (do async.monad - [?destroy (# process destroy []) - ?await (# process await [])] + [?destroy (at process destroy []) + ?await (at process await [])] (in (and (case ?destroy {try.#Success _} true @@ -71,10 +71,10 @@ (<| (_.for [/.Shell /.Process]) (do [! random.monad] [message (random.alphabetic 10) - seconds (# ! each (|>> (n.% 5) (n.+ 5)) random.nat)] + seconds (at ! each (|>> (n.% 5) (n.+ 5)) random.nat)] (in (do [! async.monad] - [?echo (# shell execute (..echo! message)) - ?sleep (# shell execute (..sleep! seconds))] + [?echo (at shell execute (..echo! message)) + ?sleep (at shell execute (..sleep! seconds))] (case [?echo ?sleep] [{try.#Success echo} {try.#Success sleep}] (do ! diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux index 5379dd8af..628412bee 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot.lux @@ -40,7 +40,7 @@ /.format list (<xml>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) $/build.test diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux index 2775467c9..71024f4d0 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux @@ -34,6 +34,6 @@ /.format list (<xml>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) )))) diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux index e097f5420..ae1ffb7a5 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux @@ -41,6 +41,6 @@ (|> expected /.format (<xml>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) ))) diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux index 28dd249cc..d93d9070c 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux @@ -36,7 +36,7 @@ (|> expected /.format (<text>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) )) ))) diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux index 7ba555256..c5c8f0e71 100644 --- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux +++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux @@ -43,7 +43,7 @@ /.format list (<xml>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) /value.test diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux index 366ec1955..56ffe1ea1 100644 --- a/stdlib/source/test/aedifex/artifact/time.lux +++ b/stdlib/source/test/aedifex/artifact/time.lux @@ -43,7 +43,7 @@ (|> expected /.format (<text>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) (do random.monad [expected ..random] @@ -51,7 +51,7 @@ (|> expected /.instant /.of_instant - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) (_.coverage [/.epoch] (instant#= instant.epoch (/.instant /.epoch))) diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux index 12c4a0da1..ca23a1d2a 100644 --- a/stdlib/source/test/aedifex/artifact/time/date.lux +++ b/stdlib/source/test/aedifex/artifact/time/date.lux @@ -49,13 +49,13 @@ (|> expected /.format (<text>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) (_.coverage [/.value /.date] (|> expected /.value /.date - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) (_.coverage [/.year_is_out_of_range] (case (/.date candidate) diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux index c3b866451..a242ae3a4 100644 --- a/stdlib/source/test/aedifex/artifact/time/time.lux +++ b/stdlib/source/test/aedifex/artifact/time/time.lux @@ -35,6 +35,6 @@ (|> expected /.format (<text>.result /.parser) - (try#each (# time.equivalence = expected)) + (try#each (at time.equivalence = expected)) (try.else false)))) ))) diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux index 006ec6566..d1efdb17f 100644 --- a/stdlib/source/test/aedifex/artifact/versioning.lux +++ b/stdlib/source/test/aedifex/artifact/versioning.lux @@ -42,13 +42,13 @@ /.format list (<xml>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) (_.coverage [/.init] (|> /.init /.format list (<xml>.result /.parser) - (try#each (# /.equivalence = /.init)) + (try#each (at /.equivalence = /.init)) (try.else false))) ))) diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux index de334b03d..b9762e9ee 100644 --- a/stdlib/source/test/aedifex/cache.lux +++ b/stdlib/source/test/aedifex/cache.lux @@ -64,7 +64,7 @@ (def: content (Random Binary) (do [! random.monad] - [content_size (# ! each (n.% 100) random.nat)] + [content_size (at ! each (n.% 100) random.nat)] (_binary.random content_size))) (def: package @@ -82,7 +82,7 @@ (do [! random.monad] [[main_dependency main_package] ..package dependencies (|> (//package.dependencies main_package) - (# try.monad each set.list) + (at try.monad each set.list) (try.else (list)) (monad.each ! (function (_ dependency) (do ! @@ -105,7 +105,7 @@ home (random.alphabetic 5) working_directory (random.alphabetic 5) .let [fs (is (file.System Async) - (file.mock (# file.default separator))) + (file.mock (at file.default separator))) program (program.async (program.mock environment.empty home working_directory))]] (in (do async.monad [wrote! (/.write_one program fs dependency expected_package) @@ -115,9 +115,9 @@ (do try.monad [_ wrote! actual_package read!] - (in (# //package.equivalence = - (has //package.#origin {//repository/origin.#Local ""} expected_package) - actual_package))))))))) + (in (at //package.equivalence = + (has //package.#origin {//repository/origin.#Local ""} expected_package) + actual_package))))))))) (def: plural Test @@ -126,7 +126,7 @@ home (random.alphabetic 5) working_directory (random.alphabetic 5) .let [fs (is (file.System Async) - (file.mock (# file.default separator))) + (file.mock (at file.default separator))) program (program.async (program.mock environment.empty home working_directory))]] (in (do async.monad [wrote! (/.write_all program fs expected) @@ -136,11 +136,11 @@ (do try.monad [_ wrote! actual read!] - (in (# //dependency/resolution.equivalence = - (# dictionary.functor each - (has //package.#origin {//repository/origin.#Local ""}) - expected) - actual))))))))) + (in (at //dependency/resolution.equivalence = + (at dictionary.functor each + (has //package.#origin {//repository/origin.#Local ""}) + expected) + actual))))))))) (def: .public test Test diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux index 9cc571bbe..fe15d204e 100644 --- a/stdlib/source/test/aedifex/cli.lux +++ b/stdlib/source/test/aedifex/cli.lux @@ -78,8 +78,8 @@ (cli.result /.command) (pipe.case {try.#Success [names actual]} - (and (# (list.equivalence text.equivalence) = (list //.default) names) - (# /.equivalence = expected actual)) + (and (at (list.equivalence text.equivalence) = (list //.default) names) + (at /.equivalence = expected actual)) {try.#Failure error} false))))) @@ -96,8 +96,8 @@ (cli.result /.command) (pipe.case {try.#Success [actual_profile actual_command]} - (and (# (list.equivalence text.equivalence) = (list expected_profile //.default) actual_profile) - (# /.equivalence = expected_command actual_command)) + (and (at (list.equivalence text.equivalence) = (list expected_profile //.default) actual_profile) + (at /.equivalence = expected_command actual_command)) {try.#Failure error} false))))) diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux index c057d173d..b483ecd2c 100644 --- a/stdlib/source/test/aedifex/command/auto.lux +++ b/stdlib/source/test/aedifex/command/auto.lux @@ -57,8 +57,8 @@ (if (n.= expected_runs actual_runs) (in {try.#Failure end_signal}) (do (try.with !) - [_ (# fs write dummy_file (# utf8.codec encoded (%.nat actual_runs))) - _ (# fs modify dummy_file (|> actual_runs .int instant.of_millis))] + [_ (at fs write dummy_file (at utf8.codec encoded (%.nat actual_runs))) + _ (at fs modify dummy_file (|> actual_runs .int instant.of_millis))] (in [shell.normal []])))))])) (def: .public test @@ -66,14 +66,14 @@ (<| (_.covering /._) (do [! random.monad] [end_signal (random.alphabetic 5) - .let [/ (# file.default separator) + .let [/ (at file.default separator) [fs watcher] (watch.mock /)] program (random.alphabetic 5) target (random.alphabetic 5) source (random.alphabetic 5) .let [empty_profile (is Profile - (# ///.monoid identity)) + (at ///.monoid identity)) with_target (is (-> Profile Profile) (has ///.#target target)) with_program (is (-> Profile Profile) @@ -87,18 +87,18 @@ home (random.alphabetic 5) working_directory (random.alphabetic 5) - expected_runs (# ! each (|>> (n.% 10) (n.max 2)) random.nat) - dummy_path (# ! each (|>> (format source /)) (random.alphabetic 5)) + expected_runs (at ! each (|>> (n.% 10) (n.max 2)) random.nat) + dummy_path (at ! each (|>> (format source /)) (random.alphabetic 5)) [compiler resolution] $build.resolution] (all _.and (_.coverage [/.delay] (n.> 0 /.delay)) (in (do async.monad [verdict (do ///action.monad - [_ (# fs make_directory source) - _ (# fs write dummy_path (binary.empty 0)) + [_ (at fs make_directory source) + _ (at fs write dummy_path (binary.empty 0)) .let [[@runs command] (..command expected_runs end_signal fs dummy_path)] - _ (# watcher poll [])] + _ (at watcher poll [])] (do [! async.monad] [no_dangling_process! (|> profile (has ///.#lux compiler) @@ -108,16 +108,16 @@ fs (shell.async ($build.good_shell [])) resolution) - (# ! each (|>> (pipe.case - {try.#Failure error} - (same? end_signal error) + (at ! each (|>> (pipe.case + {try.#Failure error} + (same? end_signal error) - {try.#Success _} - false)))) + {try.#Success _} + false)))) correct_number_of_runs! (|> @runs atom.read! async.future - (# ! each (n.= expected_runs)))] + (at ! each (n.= expected_runs)))] (in {try.#Success (and correct_number_of_runs! no_dangling_process!)})))] (_.coverage' [/.do!] diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux index 1bb77d307..25302fa71 100644 --- a/stdlib/source/test/aedifex/command/build.lux +++ b/stdlib/source/test/aedifex/command/build.lux @@ -142,14 +142,14 @@ (do [! random.monad] [last_read (random.alphabetic 5) last_error (random.alphabetic 5) - .let [fs (file.mock (# file.default separator)) + .let [fs (file.mock (at file.default separator)) shell (shell.async (..good_shell []))] program (random.alphabetic 5) target (random.alphabetic 5) home (random.alphabetic 5) working_directory (random.alphabetic 5) .let [empty_profile (is Profile - (# ///.monoid identity)) + (at ///.monoid identity)) with_target (is (-> Profile Profile) (has ///.#target target)) with_program (is (-> Profile Profile) @@ -186,8 +186,8 @@ [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs shell resolution (has ///.#lux compiler profile)) - start (# console read_line []) - end (# console read_line [])] + start (at console read_line []) + end (at console read_line [])] (in (and (text#= /.start start) (text#= /.success end))))] (_.coverage' [/.do! @@ -208,8 +208,8 @@ [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async (..bad_shell [])) resolution (has ///.#lux compiler profile)) - start (# console read_line []) - end (# console read_line [])] + start (at console read_line []) + end (at console read_line [])] (in (and (text#= /.start start) (text#= /.failure end))))] (_.coverage' [/.failure] @@ -228,17 +228,17 @@ [verdict (do ///action.monad [process (shell [environment.empty working_directory "" (list "")]) _ (<log!> console process) - actual/0 (# console read_line []) - actual/1 (# console read_line []) - actual/2 (# console read_line []) - end! (|> (# console read_line []) - (# ! each (|>> (pipe.case - {try.#Failure error} - true - - {try.#Success _} - false) - {try.#Success})))] + actual/0 (at console read_line []) + actual/1 (at console read_line []) + actual/2 (at console read_line []) + end! (|> (at console read_line []) + (at ! each (|>> (pipe.case + {try.#Failure error} + true + + {try.#Success _} + false) + {try.#Success})))] (in (and (text#= expected/0 actual/0) (text#= expected/1 actual/1) (text#= expected/2 actual/2) diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux index e7bf81855..4ead63063 100644 --- a/stdlib/source/test/aedifex/command/clean.lux +++ b/stdlib/source/test/aedifex/command/clean.lux @@ -43,7 +43,7 @@ (def: (files prefix) (-> Path (Random (List [Path Binary]))) (do [! random.monad] - [count (# ! each (n.% 10) random.nat) + [count (at ! each (n.% 10) random.nat) names (random.set text.hash count ..node_name) contents (random.list count ($binary.random 100))] (in (list.zipped_2 (list#each (|>> (format prefix)) (set.list names)) @@ -51,7 +51,7 @@ (def: (create_file! fs [path content]) (-> (file.System Async) [Path Binary] (Async (Try Any))) - (# fs write path content)) + (at fs write path content)) (def: (create_directory! fs path files) (-> (file.System Async) Path (List [Path Binary]) (Async (Try Any))) @@ -63,11 +63,11 @@ (def: (directory_exists? fs) (-> (file.System Async) Path (Async (Try Bit))) - (|>> (# fs directory?) (try.lifted async.monad))) + (|>> (at fs directory?) (try.lifted async.monad))) (def: (file_exists? fs) (-> (file.System Async) Path (Async (Try Bit))) - (|>> (# fs file?) (try.lifted async.monad))) + (|>> (at fs file?) (try.lifted async.monad))) (def: (assets_exist? fs directory_path files) (-> (file.System Async) Path (List [Path Binary]) (Async (Try Bit))) @@ -87,8 +87,8 @@ [context ..node_name target ..node_name sub ..node_name - .let [fs (file.mock (# file.default separator)) - / (# fs separator) + .let [fs (file.mock (at file.default separator)) + / (at fs separator) target_path (format context / target) sub_path (format target_path / sub)] direct_files (..files (format target_path /)) @@ -107,7 +107,7 @@ 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) - logging (# console read_line [])] + logging (at console read_line [])] (in (and (and context_exists!/pre context_exists!/post) (and target_exists!/pre diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux index 0a4e08166..d62e027dd 100644 --- a/stdlib/source/test/aedifex/command/deploy.lux +++ b/stdlib/source/test/aedifex/command/deploy.lux @@ -62,7 +62,7 @@ shell (shell.async ($build.bad_shell []))] _ ($install.make_sources! fs (the ///.#sources profile)) _ (/.do! program shell console local remote fs artifact profile)] - (# console read_line []))) + (at console read_line []))) (def: .public test Test @@ -78,7 +78,7 @@ home (random.alphabetic 5) working_directory (random.alphabetic 5) - .let [fs (file.mock (# file.default separator)) + .let [fs (file.mock (at file.default separator)) program (program.async (program.mock environment.empty home working_directory)) local (///repository/local.repository program fs) remote (///repository.mock $repository.mock @@ -90,20 +90,20 @@ (the ///.#sources) set.list (export.library fs) - (# ! each (format.result tar.writer))) + (at ! each (format.result tar.writer))) - actual_pom (# remote download (///repository/remote.uri (the ///artifact.#version artifact) artifact ///artifact/extension.pom)) - actual_library (# remote download (///repository/remote.uri (the ///artifact.#version artifact) artifact ///artifact/extension.lux_library)) - actual_sha-1 (# remote 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 (# remote 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)] - (# ///hash.md5_codec decoded actual_md5))) + actual_pom (at remote download (///repository/remote.uri (the ///artifact.#version artifact) artifact ///artifact/extension.pom)) + actual_library (at remote download (///repository/remote.uri (the ///artifact.#version artifact) artifact ///artifact/extension.lux_library)) + actual_sha-1 (at remote download (///repository/remote.uri (the ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1))) + actual_sha-1 (at async.monad in + (do try.monad + [actual_sha-1 (at utf8.codec decoded actual_sha-1)] + (at ///hash.sha-1_codec decoded actual_sha-1))) + actual_md5 (at remote download (///repository/remote.uri (the ///artifact.#version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5))) + actual_md5 (at async.monad in + (do try.monad + [actual_md5 (at utf8.codec decoded actual_md5)] + (at ///hash.md5_codec decoded actual_md5))) .let [succeeded! (text#= /.success logging) @@ -113,18 +113,18 @@ actual_library) deployed_pom! - (binary#= (|> expected_pom (# xml.codec encoded) (# utf8.codec encoded)) + (binary#= (|> expected_pom (at xml.codec encoded) (at utf8.codec encoded)) actual_pom) deployed_sha-1! - (# ///hash.equivalence = - (///hash.sha-1 expected_library) - actual_sha-1) + (at ///hash.equivalence = + (///hash.sha-1 expected_library) + actual_sha-1) deployed_md5! - (# ///hash.equivalence = - (///hash.md5 expected_library) - actual_md5)]] + (at ///hash.equivalence = + (///hash.md5 expected_library) + actual_md5)]] (in (and succeeded! deployed_library! deployed_pom! diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux index c5e496e29..d9af2990b 100644 --- a/stdlib/source/test/aedifex/command/deps.lux +++ b/stdlib/source/test/aedifex/command/deps.lux @@ -61,7 +61,7 @@ dependee_artifact $///artifact.random depender_artifact (random.only (predicate.complement - (# ///artifact.equivalence = dependee_artifact)) + (at ///artifact.equivalence = dependee_artifact)) $///artifact.random) [_ dependee_package] $///package.random @@ -72,11 +72,11 @@ depender [///dependency.#artifact depender_artifact ///dependency.#type ///artifact/type.lux_library] - dependee_pom (|> (# ///.monoid identity) + dependee_pom (|> (at ///.monoid identity) (has ///.#identity {.#Some dependee_artifact}) ///pom.write try.trusted) - depender_pom (|> (# ///.monoid identity) + depender_pom (|> (at ///.monoid identity) (has ///.#identity {.#Some depender_artifact}) (has ///.#dependencies (set.of_list ///dependency.hash (list dependee))) ///pom.write @@ -85,15 +85,15 @@ dependee_package (|> dependee_package (has ///package.#origin {///repository/origin.#Remote ""}) (has ///package.#pom [dependee_pom - (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) + (|> dependee_pom (at xml.codec encoded) (at utf8.codec encoded)) {///dependency/status.#Unverified}])) depender_package (|> depender_package (has ///package.#origin {///repository/origin.#Remote ""}) (has ///package.#pom [depender_pom - (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) + (|> depender_pom (at xml.codec encoded) (at utf8.codec encoded)) {///dependency/status.#Unverified}])) - fs (file.mock (# file.default separator)) + fs (file.mock (at file.default separator)) program (program.async (program.mock environment.empty home working_directory))]] (in (do async.monad [verdict (do ///action.monad @@ -102,7 +102,7 @@ pre (|> ///dependency/resolution.empty (dictionary.has dependee dependee_package) (///dependency/deployment.all local)) - post (|> (# ///.monoid identity) + post (|> (at ///.monoid identity) (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 4de5c5226..55bb762d0 100644 --- a/stdlib/source/test/aedifex/command/install.lux +++ b/stdlib/source/test/aedifex/command/install.lux @@ -40,7 +40,7 @@ (def: .public (make_sources! fs sources) (-> (file.System Async) (Set file.Path) (Action (List Any))) - (let [/ (# fs separator) + (let [/ (at fs separator) ! ///action.monad] (|> sources set.list @@ -57,18 +57,18 @@ [.let [console ($version.echo "")] _ (..make_sources! fs (the ///.#sources sample)) _ (/.do! console fs (///repository/local.repository program fs) sample)] - (# console read_line []))) + (at console read_line []))) (def: .public test Test (<| (_.covering /._) (do [! random.monad] [identity $artifact.random - sample (# ! each (has ///.#identity {.#Some identity}) - $profile.random) + sample (at ! each (has ///.#identity {.#Some identity}) + $profile.random) home (random.alphabetic 5) working_directory (random.alphabetic 5) - .let [/ (# file.default separator)]] + .let [/ (at file.default separator)]] (all _.and (in (do [! async.monad] [.let [fs (file.mock /) @@ -78,16 +78,16 @@ library_path (format artifact_path ///artifact/extension.lux_library) pom_path (format artifact_path ///artifact/extension.pom)] verdict (do [! ///action.monad] - [succeeded! (# ! each (text#= /.success) - (..execute! program fs sample)) + [succeeded! (at ! each (text#= /.success) + (..execute! program fs sample)) library_exists! (|> library_path (format home /) - (# fs file?) - (# async.monad each (|>> {try.#Success}))) + (at fs file?) + (at async.monad each (|>> {try.#Success}))) pom_exists! (|> pom_path (format home /) - (# fs file?) - (# async.monad each (|>> {try.#Success})))] + (at fs file?) + (at async.monad each (|>> {try.#Success})))] (in (and succeeded! library_exists! pom_exists!)))] diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux index 75509644d..278d91209 100644 --- a/stdlib/source/test/aedifex/command/pom.lux +++ b/stdlib/source/test/aedifex/command/pom.lux @@ -35,7 +35,7 @@ (<| (_.covering /._) (do random.monad [sample @profile.random - .let [fs (file.mock (# file.default separator))]] + .let [fs (file.mock (at file.default separator))]] (in (do [! async.monad] [.let [console (@version.echo "")] outcome (/.do! console fs sample)] @@ -44,14 +44,14 @@ (do ! [verdict (do ///action.monad [expected (|> (///pom.write sample) - (try#each (|>> (# xml.codec encoded) - (# utf8.codec encoded))) - (# ! in)) - actual (# fs read ///pom.file) + (try#each (|>> (at xml.codec encoded) + (at utf8.codec encoded))) + (at ! in)) + actual (at fs read ///pom.file) - logging! (# ///action.monad each - (text#= /.success) - (# console read_line [])) + logging! (at ///action.monad each + (text#= /.success) + (at console read_line [])) .let [expected_content! (binary#= expected actual)]] diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux index 50bd8e183..9b01c2feb 100644 --- a/stdlib/source/test/aedifex/command/test.lux +++ b/stdlib/source/test/aedifex/command/test.lux @@ -48,7 +48,7 @@ home (random.alphabetic 5) working_directory (random.alphabetic 5) .let [empty_profile (is Profile - (# ///.monoid identity)) + (at ///.monoid identity)) with_target (is (-> Profile Profile) (has ///.#target target)) with_test (is (-> Profile Profile) @@ -59,17 +59,17 @@ with_target)] [compiler resolution] @build.resolution] (all _.and - (let [fs (file.mock (# file.default separator)) + (let [fs (file.mock (at file.default separator)) console (@version.echo "")] (in (do async.monad [verdict (do ///action.monad [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async (@build.good_shell [])) resolution (has ///.#lux compiler profile)) - build_start (# console read_line []) - build_end (# console read_line []) - test_start (# console read_line []) - test_end (# console read_line [])] + build_start (at console read_line []) + build_end (at console read_line []) + test_start (at console read_line []) + test_end (at console read_line [])] (in (and (and (text#= //build.start build_start) (text#= //build.success build_end)) (and (text#= /.start test_start) @@ -77,7 +77,7 @@ (_.coverage' [/.do! /.start /.success] (try.else false verdict))))) - (let [fs (file.mock (# file.default separator)) + (let [fs (file.mock (at file.default separator)) console (@version.echo "")] (in (do async.monad [verdict (do ///action.monad @@ -102,10 +102,10 @@ _ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async bad_shell) resolution (has ///.#lux compiler profile)) - build_start (# console read_line []) - build_end (# console read_line []) - test_start (# console read_line []) - test_end (# console read_line [])] + build_start (at console read_line []) + build_end (at console read_line []) + test_start (at console read_line []) + test_end (at console read_line [])] (in (and (and (text#= //build.start build_start) (text#= //build.success build_end)) (and (text#= /.start test_start) diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux index fbd864d4b..bb92fadfb 100644 --- a/stdlib/source/test/aedifex/command/version.lux +++ b/stdlib/source/test/aedifex/command/version.lux @@ -71,7 +71,7 @@ [.let [console (..echo "")] verdict (do (try.with async.monad) [_ (/.do! console profile) - logging (# console read_line [])] + logging (at console read_line [])] (in (text#= (version.format lux_version.latest) logging)))] (_.coverage' [/.do!] diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux index ab15af81c..794464839 100644 --- a/stdlib/source/test/aedifex/dependency/deployment.lux +++ b/stdlib/source/test/aedifex/dependency/deployment.lux @@ -147,8 +147,8 @@ Test (<| (_.covering /._) (do [! random.monad] - [address (# ! each (text.suffix uri.separator) - (random.upper_case 10))] + [address (at ! each (text.suffix uri.separator) + (random.upper_case 10))] (all _.and (do [! random.monad] [[dependency expected_artifact package] ..bundle @@ -165,12 +165,12 @@ (try.else false)))))) (do [! random.monad] [.let [hash (is (Hash [Dependency Artifact Package]) - (# hash.functor each (|>> product.right product.left product.left) - text.hash))] - num_bundles (# ! each (n.% 10) random.nat) + (at hash.functor each (|>> product.right product.left product.left) + text.hash))] + num_bundles (at ! each (n.% 10) random.nat) bundles (|> ..bundle (random.set hash num_bundles) - (# ! each set.list)) + (at ! each set.list)) .let [resolution (list#mix (function (_ [dependency expected_artifact package] resolution) (dictionary.has dependency package resolution)) resolution.empty diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux index eaec8b475..aeeb49cb2 100644 --- a/stdlib/source/test/aedifex/dependency/resolution.lux +++ b/stdlib/source/test/aedifex/dependency/resolution.lux @@ -77,14 +77,14 @@ (def: sha-1 (-> Binary Binary) (|>> ///hash.sha-1 - (# ///hash.sha-1_codec encoded) - (# utf8.codec encoded))) + (at ///hash.sha-1_codec encoded) + (at utf8.codec encoded))) (def: md5 (-> Binary Binary) (|>> ///hash.md5 - (# ///hash.md5_codec encoded) - (# utf8.codec encoded))) + (at ///hash.md5_codec encoded) + (at utf8.codec encoded))) (def: .public nope (Mock Any) @@ -112,8 +112,8 @@ (|> package (the ///package.#pom) product.left - (# xml.codec encoded) - (# utf8.codec encoded)))] + (at xml.codec encoded) + (at utf8.codec encoded)))] (cond (text.ends_with? ///artifact/extension.lux_library uri) {try.#Success [state library]} @@ -166,23 +166,23 @@ {try.#Success [state (|> expected_package (the ///package.#pom) product.left - (# xml.codec encoded) - (# utf8.codec encoded))]} + (at xml.codec encoded) + (at utf8.codec encoded))]} (text.ends_with? ..pom_sha-1 uri) {try.#Success [state (|> dummy_package (the ///package.#pom) product.left - (# xml.codec encoded) - (# utf8.codec encoded) + (at xml.codec encoded) + (at utf8.codec encoded) ..sha-1)]} (text.ends_with? ..pom_md5 uri) {try.#Success [state (|> expected_package (the ///package.#pom) product.left - (# xml.codec encoded) - (# utf8.codec encoded) + (at xml.codec encoded) + (at utf8.codec encoded) ..md5)]} ... else @@ -219,23 +219,23 @@ {try.#Success [state (|> expected_package (the ///package.#pom) product.left - (# xml.codec encoded) - (# utf8.codec encoded))]} + (at xml.codec encoded) + (at utf8.codec encoded))]} (text.ends_with? ..pom_sha-1 uri) {try.#Success [state (|> expected_package (the ///package.#pom) product.left - (# xml.codec encoded) - (# utf8.codec encoded) + (at xml.codec encoded) + (at utf8.codec encoded) ..sha-1)]} (text.ends_with? ..pom_md5 uri) {try.#Success [state (|> dummy_package (the ///package.#pom) product.left - (# xml.codec encoded) - (# utf8.codec encoded) + (at xml.codec encoded) + (at utf8.codec encoded) ..md5)]} ... else @@ -251,7 +251,7 @@ [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right (has ///package.#pom (the ///package.#pom expected_package)) - (# ///package.equivalence = expected_package) + (at ///package.equivalence = expected_package) not) $///package.random) .let [good (..single expected_artifact expected_package) @@ -265,9 +265,9 @@ (_.coverage' [/.one] (case actual_package {try.#Success actual_package} - (# ///package.equivalence = - (has ///package.#origin {///repository/origin.#Remote ""} expected_package) - actual_package) + (at ///package.equivalence = + (has ///package.#origin {///repository/origin.#Remote ""} expected_package) + actual_package) {try.#Failure _} false)))) @@ -296,7 +296,7 @@ [_ expected_package] $///package.random [_ dummy_package] (random.only (|>> product.right (has ///package.#pom (the ///package.#pom expected_package)) - (# ///package.equivalence = expected_package) + (at ///package.equivalence = expected_package) not) $///package.random) .let [good (..single expected_artifact expected_package) @@ -314,9 +314,9 @@ (_.coverage' [/.any] (case actual_package {try.#Success actual_package} - (# ///package.equivalence = - (has ///package.#origin {///repository/origin.#Remote ""} expected_package) - actual_package) + (at ///package.equivalence = + (has ///package.#origin {///repository/origin.#Remote ""} expected_package) + actual_package) {try.#Failure _} false)))) @@ -341,11 +341,11 @@ (do random.monad [dependee_artifact $///artifact.random depender_artifact (random.only (predicate.complement - (# ///artifact.equivalence = dependee_artifact)) + (at ///artifact.equivalence = dependee_artifact)) $///artifact.random) ignored_artifact (random.only (predicate.complement - (predicate.and (# ///artifact.equivalence = dependee_artifact) - (# ///artifact.equivalence = depender_artifact))) + (predicate.and (at ///artifact.equivalence = dependee_artifact) + (at ///artifact.equivalence = depender_artifact))) $///artifact.random)] (in [dependee_artifact depender_artifact ignored_artifact]))) @@ -365,33 +365,33 @@ ignored [///dependency.#artifact ignored_artifact ///dependency.#type ///artifact/type.lux_library] - dependee_pom (|> (# ///.monoid identity) + dependee_pom (|> (at ///.monoid identity) (has ///.#identity {.#Some dependee_artifact}) ///pom.write try.trusted) - depender_pom (|> (# ///.monoid identity) + depender_pom (|> (at ///.monoid identity) (has ///.#identity {.#Some depender_artifact}) (has ///.#dependencies (set.of_list ///dependency.hash (list dependee))) ///pom.write try.trusted) - ignored_pom (|> (# ///.monoid identity) + ignored_pom (|> (at ///.monoid identity) (has ///.#identity {.#Some ignored_artifact}) ///pom.write try.trusted) dependee_package (has ///package.#pom [dependee_pom - (|> dependee_pom (# xml.codec encoded) (# utf8.codec encoded)) + (|> dependee_pom (at xml.codec encoded) (at utf8.codec encoded)) {///dependency/status.#Unverified}] dependee_package) depender_package (has ///package.#pom [depender_pom - (|> depender_pom (# xml.codec encoded) (# utf8.codec encoded)) + (|> depender_pom (at xml.codec encoded) (at utf8.codec encoded)) {///dependency/status.#Unverified}] depender_package) ignored_package (has ///package.#pom [ignored_pom - (|> ignored_pom (# xml.codec encoded) (# utf8.codec encoded)) + (|> ignored_pom (at xml.codec encoded) (at utf8.codec encoded)) {///dependency/status.#Unverified}] ignored_package)]] (in [[dependee depender ignored] diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux index a8b2e0d80..dfa36217b 100644 --- a/stdlib/source/test/aedifex/hash.lux +++ b/stdlib/source/test/aedifex/hash.lux @@ -30,8 +30,8 @@ (-> (-> Binary (/.Hash h)) (Random (/.Hash h)))) (do [! random.monad] - [size (# ! each (n.% 100) random.nat)] - (# ! each hash (_binary.random size)))) + [size (at ! each (n.% 100) random.nat)] + (at ! each hash (_binary.random size)))) (def: .public test Test @@ -51,13 +51,13 @@ (_.coverage [<hash> <constructor> <exception>] (and (case (<constructor> (/.data expected)) {try.#Success actual} - (# /.equivalence = expected actual) + (at /.equivalence = expected actual) {try.#Failure error} false) - (case (<constructor> (# binary.monoid composite - (/.data expected) - (/.data expected))) + (case (<constructor> (at binary.monoid composite + (/.data expected) + (/.data expected))) {try.#Success actual} false @@ -80,9 +80,9 @@ [(do random.monad [expected (..random <hash>)] (_.coverage [<codec>] - (case (# <codec> decoded - (format (# <codec> encoded expected) - "AABBCC")) + (case (at <codec> decoded + (format (at <codec> encoded expected) + "AABBCC")) {try.#Success actual} false diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux index 16c91c69a..874170bc2 100644 --- a/stdlib/source/test/aedifex/input.lux +++ b/stdlib/source/test/aedifex/input.lux @@ -45,23 +45,23 @@ Test (<| (_.covering /._) (do [! random.monad] - [expected (# ! each (has //.#parents (list)) $profile.random) + [expected (at ! each (has //.#parents (list)) $profile.random) .let [fs (is (file.System Async) - (file.mock (# file.default separator)))]] + (file.mock (at file.default separator)))]] (in (do async.monad [verdict (do //action.monad [.let [profile (|> expected (//project.project //.default) //format.project %.code - (# utf8.codec encoded))] - _ (# fs write //project.file profile) + (at utf8.codec encoded))] + _ (at fs write //project.file profile) actual (is (Async (Try Profile)) (/.read async.monad fs (list //.default)))] - (in (# //.equivalence = - (|> expected - (revised //.#sources ..with_default_source) - (revised //.#repositories ..with_default_repository)) - actual)))] + (in (at //.equivalence = + (|> expected + (revised //.#sources ..with_default_source) + (revised //.#repositories ..with_default_repository)) + actual)))] (_.coverage' [/.read] (try.else false verdict))))))) diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux index 34869e646..041bad539 100644 --- a/stdlib/source/test/aedifex/metadata/artifact.lux +++ b/stdlib/source/test/aedifex/metadata/artifact.lux @@ -48,12 +48,12 @@ (random.alphabetic 5) (random.list 5 (random.alphabetic 5)) (do [! random.monad] - [year (# ! each (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat) - month (# ! each (|>> (n.% 12) (n.+ 1)) random.nat) - day_of_month (# ! each (|>> (n.% 28) (n.+ 1)) random.nat) - hour (# ! each (n.% 24) random.nat) - minute (# ! each (n.% 60) random.nat) - second (# ! each (n.% 60) random.nat)] + [year (at ! each (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat) + month (at ! each (|>> (n.% 12) (n.+ 1)) random.nat) + day_of_month (at ! each (|>> (n.% 28) (n.+ 1)) random.nat) + hour (at ! each (n.% 24) random.nat) + minute (at ! each (n.% 60) random.nat) + second (at ! each (n.% 60) random.nat)] (in (try.trusted (do try.monad [year (year.year year) @@ -89,7 +89,7 @@ /.format list (<xml>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) (_.coverage [/.uri] (text#= (//.remote_project_uri artifact) @@ -98,7 +98,7 @@ [home (random.lower_case 5) working_directory (random.lower_case 5) .let [program (program.async (program.mock environment.empty home working_directory)) - fs (file.mock (# file.default separator)) + fs (file.mock (at file.default separator)) repository (///repository/local.repository program fs)]] (in (do async.monad [wrote? (/.write repository artifact expected) @@ -109,7 +109,7 @@ {try.#Failure _} false) (case actual {try.#Success actual} - (# /.equivalence = expected actual) + (at /.equivalence = expected actual) {try.#Failure _} false)))))) diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux index c45b817cd..7cff9954a 100644 --- a/stdlib/source/test/aedifex/metadata/snapshot.lux +++ b/stdlib/source/test/aedifex/metadata/snapshot.lux @@ -52,12 +52,12 @@ (def: random_instant (Random Instant) (do [! random.monad] - [year (# ! each (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat) - month (# ! each (|>> (n.% 12) (n.+ 1)) random.nat) - day_of_month (# ! each (|>> (n.% 28) (n.+ 1)) random.nat) - hour (# ! each (n.% 24) random.nat) - minute (# ! each (n.% 60) random.nat) - second (# ! each (n.% 60) random.nat)] + [year (at ! each (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat) + month (at ! each (|>> (n.% 12) (n.+ 1)) random.nat) + day_of_month (at ! each (|>> (n.% 28) (n.+ 1)) random.nat) + hour (at ! each (n.% 24) random.nat) + minute (at ! each (n.% 60) random.nat) + second (at ! each (n.% 60) random.nat)] (in (try.trusted (do try.monad [year (year.year year) @@ -101,7 +101,7 @@ /.format list (<xml>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) (_.coverage [/.uri] (text#= (//.remote_artifact_uri artifact) @@ -110,7 +110,7 @@ [home (random.lower_case 5) working_directory (random.lower_case 5) .let [program (program.async (program.mock environment.empty home working_directory)) - fs (file.mock (# file.default separator)) + fs (file.mock (at file.default separator)) repository (///repository/local.repository program fs)]] (in (do async.monad [wrote? (/.write repository artifact expected) @@ -121,7 +121,7 @@ {try.#Failure _} false) (case actual {try.#Success actual} - (# /.equivalence = expected actual) + (at /.equivalence = expected actual) {try.#Failure _} false)))))) diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux index 6a7f0a960..2e669228a 100644 --- a/stdlib/source/test/aedifex/package.lux +++ b/stdlib/source/test/aedifex/package.lux @@ -43,7 +43,7 @@ (def: .public random (Random [//.Profile /.Package]) (do [! random.monad] - [content_size (# ! each (n.% 100) random.nat) + [content_size (at ! each (n.% 100) random.nat) content ($binary.random content_size) [profile pom] (random.one (function (_ profile) (try.maybe @@ -61,7 +61,7 @@ [[profile package] ..random] (all _.and (_.for [/.equivalence] - ($equivalence.spec /.equivalence (# ! each product.right ..random))) + ($equivalence.spec /.equivalence (at ! each product.right ..random))) (_.coverage [/.local?] (/.local? (has /.#origin {//origin.#Local "~/yolo"} package))) @@ -92,9 +92,9 @@ expected_md5 (//hash.md5 binary_pom)] (and (same? expected_pom actual_pom) (|> (do try.monad - [xml_pom (# utf8.codec decoded binary_pom) - decoded_pom (# xml.codec decoded xml_pom)] - (in (# xml.equivalence = actual_pom decoded_pom))) + [xml_pom (at utf8.codec decoded binary_pom) + decoded_pom (at xml.codec decoded xml_pom)] + (in (at xml.equivalence = actual_pom decoded_pom))) (try.else false)) (case pom_status {//status.#Verified actual_sha1 expected_md5} @@ -107,7 +107,7 @@ (let [expected (the //.#dependencies profile)] (case (/.dependencies package) {try.#Success actual} - (# set.equivalence = expected actual) + (at set.equivalence = expected actual) {try.#Failure error} false))) @@ -115,7 +115,7 @@ (let [expected (the //.#repositories profile)] (case (/.repositories package) {try.#Success actual} - (# set.equivalence = expected actual) + (at set.equivalence = expected actual) {try.#Failure error} false))) diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux index 050d3daef..945576470 100644 --- a/stdlib/source/test/aedifex/parser.lux +++ b/stdlib/source/test/aedifex/parser.lux @@ -40,14 +40,14 @@ (def: (list_of random) (All (_ a) (-> (Random a) (Random (List a)))) (do [! random.monad] - [size (# ! each (n.% 5) random.nat)] + [size (at ! each (n.% 5) random.nat)] (random.list size random))) (def: (dictionary_of key_hash key_random value_random) (All (_ k v) (-> (Hash k) (Random k) (Random v) (Random (Dictionary k v)))) - (# random.functor each - (dictionary.of_list key_hash) - (..list_of (random.and key_random value_random)))) + (at random.functor each + (dictionary.of_list key_hash) + (..list_of (random.and key_random value_random)))) (def: random (Random Project) @@ -69,7 +69,7 @@ (def: (with_empty_profile project) (-> Project Project) (if (dictionary.empty? project) - (//project.project //.default (# //.monoid identity)) + (//project.project //.default (at //.monoid identity)) project)) (def: .public test @@ -94,7 +94,7 @@ ..with_default_sources ..with_default_repository)])) (dictionary.of_list text.hash) - (# //project.equivalence = actual)) + (at //project.equivalence = actual)) {try.#Failure error} false)))))) diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux index 3a58b340c..ab19c1c7f 100644 --- a/stdlib/source/test/aedifex/pom.lux +++ b/stdlib/source/test/aedifex/pom.lux @@ -39,11 +39,11 @@ {.#Some _}] (case (<xml>.result /.parser (list pom)) {try.#Success actual} - (# //.equivalence = - (|> (# //.monoid identity) - (has //.#dependencies (the //.#dependencies expected)) - (has //.#repositories (the //.#repositories expected))) - actual) + (at //.equivalence = + (|> (at //.monoid identity) + (has //.#dependencies (the //.#dependencies expected)) + (has //.#repositories (the //.#repositories expected))) + actual) {try.#Failure error} false) diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux index d45ac5fa9..5a040973e 100644 --- a/stdlib/source/test/aedifex/profile.lux +++ b/stdlib/source/test/aedifex/profile.lux @@ -79,20 +79,20 @@ (def: (list_of random) (All (_ a) (-> (Random a) (Random (List a)))) (do [! random.monad] - [size (# ! each (n.% 5) random.nat)] + [size (at ! each (n.% 5) random.nat)] (random.list size random))) (def: (set_of hash random) (All (_ a) (-> (Hash a) (Random a) (Random (Set a)))) - (# random.functor each - (set.of_list hash) - (..list_of random))) + (at random.functor each + (set.of_list hash) + (..list_of random))) (def: (dictionary_of key_hash key_random value_random) (All (_ k v) (-> (Hash k) (Random k) (Random v) (Random (Dictionary k v)))) - (# random.functor each - (dictionary.of_list key_hash) - (..list_of (random.and key_random value_random)))) + (at random.functor each + (dictionary.of_list key_hash) + (..list_of (random.and key_random value_random)))) (def: info (Random /.Info) @@ -162,11 +162,11 @@ (_.coverage [/.default] (text#= "" /.default)) (_.coverage [/.default_lux] - (|> (# /.monoid identity) + (|> (at /.monoid identity) (the /.#lux) (same? /.default_lux))) (_.coverage [/.default_target] - (|> (# /.monoid identity) + (|> (at /.monoid identity) (the /.#target) (same? /.default_target))) ))))) diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux index 61afbc9da..d0f658040 100644 --- a/stdlib/source/test/aedifex/project.lux +++ b/stdlib/source/test/aedifex/project.lux @@ -63,24 +63,24 @@ (not (text#= dummy_name name)) (not (text#= sub_name name)))) (random.alphabetic 1)) - .let [project (all (# /.monoid composite) + .let [project (all (at /.monoid composite) (/.project super_name super_profile) (/.project dummy_name dummy_profile) (/.project sub_name (has //.#parents (list super_name) sub_profile))) - circular (all (# /.monoid composite) + circular (all (at /.monoid composite) (/.project super_name (has //.#parents (list sub_name) super_profile)) (/.project dummy_name dummy_profile) (/.project sub_name (has //.#parents (list super_name) sub_profile)))]] (all _.and (_.coverage [/.profile] (and (|> (/.profile project super_name) - (try#each (# //.equivalence = super_profile)) + (try#each (at //.equivalence = super_profile)) (try.else false)) (|> (/.profile project dummy_name) - (try#each (# //.equivalence = dummy_profile)) + (try#each (at //.equivalence = dummy_profile)) (try.else false)) (|> (/.profile project sub_name) - (try#each (# //.equivalence = (# //.monoid composite sub_profile super_profile))) + (try#each (at //.equivalence = (at //.monoid composite sub_profile super_profile))) (try.else false)))) (_.coverage [/.unknown_profile] (case (/.profile project fake_name) diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux index 160410bc4..93bb28f1d 100644 --- a/stdlib/source/test/aedifex/repository/local.lux +++ b/stdlib/source/test/aedifex/repository/local.lux @@ -35,13 +35,13 @@ repo (/.repository program fs)] uri (random.lower_case 10) - expected (# ! each (# utf8.codec encoded) - (random.lower_case 10))] + expected (at ! each (at utf8.codec encoded) + (random.lower_case 10))] (all _.and (in (do async.monad - [before_upload (# repo download uri) - _ (# repo upload uri expected) - actual (# repo download uri)] + [before_upload (at repo download uri) + _ (at repo upload uri expected) + actual (at repo download uri)] (_.coverage' [/.repository] (and (case before_upload {try.#Success _} false diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux index 50ae42a09..440a74ac5 100644 --- a/stdlib/source/test/aedifex/repository/remote.lux +++ b/stdlib/source/test/aedifex/repository/remote.lux @@ -33,7 +33,7 @@ (def: (url_body url) (-> URL (@http.Body IO)) - (let [url (# utf8.codec encoded url)] + (let [url (at utf8.codec encoded url)] (function (_ _) (io.io {try.#Success [(binary.size url) url]})))) @@ -90,21 +90,21 @@ user (random.lower_case 10) password (random.lower_case 10) - content (# ! each (# utf8.codec encoded) - (random.lower_case 10))] + content (at ! each (at utf8.codec encoded) + (random.lower_case 10))] (all _.and (_.coverage [/.repository /.user_agent /.Address] (let [repo (/.repository (..good_http user password) {.#Some [//identity.#user user //identity.#password password]} address)] - (and (|> (# repo download uri) + (and (|> (at repo download uri) io.run! - (try#each (# utf8.codec decoded)) + (try#each (at utf8.codec decoded)) try#conjoint (try#each (text#= (format address uri))) (try.else false)) - (|> (# repo upload uri content) + (|> (at repo upload uri content) io.run! (try#each (function.constant true)) (try.else false))))) @@ -112,7 +112,7 @@ (let [repo (/.repository (..good_http user password) {.#None} address)] - (case (io.run! (# repo upload uri content)) + (case (io.run! (at repo upload uri content)) {try.#Failure error} (exception.match? /.upload_failure error) @@ -122,7 +122,7 @@ (let [repo (/.repository ..bad_http {.#None} address)] - (case (io.run! (# repo download uri)) + (case (io.run! (at repo download uri)) {try.#Failure error} (exception.match? /.download_failure error) diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index 9fed6be1a..ac59df0cc 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -216,16 +216,16 @@ (_.for [/.Interface] (all _.and (_.coverage [/.implementation:] - (n.= expected (# (global_returner expected) return []))) + (n.= expected (at (global_returner expected) return []))) (_.coverage [/.implementation] - (n.= expected (# local_returner return []))) + (n.= expected (at local_returner return []))) (_.coverage [/.open:] (n.= static_return (global#return []))) (_.coverage [/.open] (let [(/.open "local#[0]") local_returner] (n.= expected (local#return [])))) - (_.coverage [/.#] - (n.= expected (/.# local_returner return []))) + (_.coverage [/.at] + (n.= expected (/.at local_returner return []))) )))) (def: for_module @@ -361,7 +361,7 @@ (def: for_code Test (do [! random.monad] - [example (# ! each code.nat random.nat)] + [example (at ! each code.nat random.nat)] (all _.and (_.for [/.Code /.Code'] (all _.and @@ -376,7 +376,7 @@ ))) (/.macro: (identity_macro tokens) - (# meta.monad in tokens)) + (at meta.monad in tokens)) (def: crosshair "This is an arbitrary text whose only purpose is to be found, somewhere, in the source-code.") @@ -557,7 +557,7 @@ expected_left random.nat expected_right random.nat - .let [existential_type (# ! each (|>> {.#Ex}) random.nat)] + .let [existential_type (at ! each (|>> {.#Ex}) random.nat)] expected/0 existential_type expected/1 existential_type] (<| (_.for [/.Type]) @@ -970,8 +970,8 @@ (def: for_case Test (do [! random.monad] - [expected_nat (# ! each (n.% 1) random.nat) - expected_int (# ! each (i.% +1) random.int) + [expected_nat (at ! each (n.% 1) random.nat) + expected_int (at ! each (i.% +1) random.int) expected_rev (random.either (in .5) (in .25)) expected_frac (random.either (in +0.5) diff --git a/stdlib/source/test/lux/abstract/apply.lux b/stdlib/source/test/lux/abstract/apply.lux index 8eacc827a..d7845ae47 100644 --- a/stdlib/source/test/lux/abstract/apply.lux +++ b/stdlib/source/test/lux/abstract/apply.lux @@ -25,9 +25,9 @@ (all _.and (_.coverage [/.composite] (let [expected (n.+ left right)] - (case (# (/.composite maybe.monad maybe.apply list.apply) on - {.#Some (list right)} - {.#Some (list (n.+ left))}) + (case (at (/.composite maybe.monad maybe.apply list.apply) on + {.#Some (list right)} + {.#Some (list (n.+ left))}) (pattern {.#Some (list actual)}) (n.= expected actual) diff --git a/stdlib/source/test/lux/abstract/codec.lux b/stdlib/source/test/lux/abstract/codec.lux index 970045e7c..6169669c5 100644 --- a/stdlib/source/test/lux/abstract/codec.lux +++ b/stdlib/source/test/lux/abstract/codec.lux @@ -39,7 +39,7 @@ [expected random.bit] (<| (_.covering /._) (_.coverage [/.composite] - (case (|> expected (# ..codec encoded) (# ..codec decoded)) + (case (|> expected (at ..codec encoded) (at ..codec decoded)) {try.#Success actual} (bit#= expected actual) diff --git a/stdlib/source/test/lux/abstract/comonad/cofree.lux b/stdlib/source/test/lux/abstract/comonad/cofree.lux index 8e8c2998d..2f2b7569b 100644 --- a/stdlib/source/test/lux/abstract/comonad/cofree.lux +++ b/stdlib/source/test/lux/abstract/comonad/cofree.lux @@ -26,16 +26,16 @@ (def: (interpret [head tail]) (All (_ a) (-> (/.CoFree Stream a) (Stream a))) (|> tail - (stream#each (# (/.comonad stream.functor) out)) + (stream#each (at (/.comonad stream.functor) out)) [head] //.pending)) (def: comparison (Comparison (/.CoFree Stream)) (function (_ == left right) - (# (list.equivalence ==) = - (stream.first 100 (..interpret left)) - (stream.first 100 (..interpret right))))) + (at (list.equivalence ==) = + (stream.first 100 (..interpret left)) + (stream.first 100 (..interpret right))))) (def: .public test Test diff --git a/stdlib/source/test/lux/abstract/enum.lux b/stdlib/source/test/lux/abstract/enum.lux index d33a9aee8..9848653ba 100644 --- a/stdlib/source/test/lux/abstract/enum.lux +++ b/stdlib/source/test/lux/abstract/enum.lux @@ -20,7 +20,7 @@ (def: .public test Test (let [limit (is (Random Nat) - (# random.monad each (n.% 20) random.nat))] + (at random.monad each (n.% 20) random.nat))] (do random.monad [start limit end limit @@ -34,14 +34,14 @@ (let [expected_size (|> end (n.- start) ++) expected_start? (|> range list.head (maybe#each (n.= start)) (maybe.else false)) expected_end? (|> range list.last (maybe#each (n.= end)) (maybe.else false)) - can_be_backwards? (# (list.equivalence n.equivalence) = - (/.range n.enum start end) - (list.reversed (/.range n.enum end start))) + can_be_backwards? (at (list.equivalence n.equivalence) = + (/.range n.enum start end) + (list.reversed (/.range n.enum end start))) every_element_is_a_successor? (case range {.#Item head tail} (|> (list#mix (function (_ next [verdict prev]) [(and verdict - (n.= next (# n.enum succ prev))) + (n.= next (at n.enum succ prev))) next]) [true head] tail) diff --git a/stdlib/source/test/lux/abstract/equivalence.lux b/stdlib/source/test/lux/abstract/equivalence.lux index 2ca34e885..f3be4cd4a 100644 --- a/stdlib/source/test/lux/abstract/equivalence.lux +++ b/stdlib/source/test/lux/abstract/equivalence.lux @@ -29,12 +29,12 @@ .let [equivalence (is (Equivalence (Equivalence Nat)) (implementation (def: (= left right) - (and (bit#= (# left = leftN leftN) - (# right = leftN leftN)) - (bit#= (# left = rightN rightN) - (# right = rightN rightN)) - (bit#= (# left = leftN rightN) - (# right = leftN rightN))))))]] + (and (bit#= (at left = leftN leftN) + (at right = leftN leftN)) + (bit#= (at left = rightN rightN) + (at right = rightN rightN)) + (bit#= (at left = leftN rightN) + (at right = leftN rightN))))))]] (<| (_.covering /._) (all _.and (_.for [/.functor] @@ -50,11 +50,11 @@ [{.#Item leftH lefT} {.#Item rightH rightT}] (and (n.= leftH rightH) - (# equivalence = lefT rightT)) + (at equivalence = lefT rightT)) _ false))))))] - (and (# equivalence = (list sample sample) (list sample sample)) - (not (# equivalence = (list sample sample) (list sample))) - (not (# equivalence = (list sample sample) (list different different)))))) + (and (at equivalence = (list sample sample) (list sample sample)) + (not (at equivalence = (list sample sample) (list sample))) + (not (at equivalence = (list sample sample) (list different different)))))) )))) diff --git a/stdlib/source/test/lux/abstract/functor.lux b/stdlib/source/test/lux/abstract/functor.lux index cf44e7b12..9249ba171 100644 --- a/stdlib/source/test/lux/abstract/functor.lux +++ b/stdlib/source/test/lux/abstract/functor.lux @@ -25,26 +25,26 @@ (<| (_.covering /._) (all _.and (_.coverage [/.Or /.sum] - (and (case (# (/.sum maybe.functor list.functor) each - (n.+ shift) - {.#Left {.#Some left}}) + (and (case (at (/.sum maybe.functor list.functor) each + (n.+ shift) + {.#Left {.#Some left}}) {.#Left {.#Some actual}} (n.= (n.+ shift left) actual) _ false) - (case (# (/.sum maybe.functor list.functor) each - (n.+ shift) - {.#Right (list right)}) + (case (at (/.sum maybe.functor list.functor) each + (n.+ shift) + {.#Right (list right)}) (pattern {.#Right (list actual)}) (n.= (n.+ shift right) actual) _ false))) (_.coverage [/.And /.product] - (case (# (/.product maybe.functor list.functor) each - (n.+ shift) - [{.#Some left} (list right)]) + (case (at (/.product maybe.functor list.functor) each + (n.+ shift) + [{.#Some left} (list right)]) (pattern [{.#Some actualL} (list actualR)]) (and (n.= (n.+ shift left) actualL) (n.= (n.+ shift right) actualR)) @@ -52,9 +52,9 @@ _ false)) (_.coverage [/.Then /.composite] - (case (# (/.composite maybe.functor list.functor) each - (n.+ shift) - {.#Some (list left)}) + (case (at (/.composite maybe.functor list.functor) each + (n.+ shift) + {.#Some (list left)}) (pattern {.#Some (list actual)}) (n.= (n.+ shift left) actual) diff --git a/stdlib/source/test/lux/abstract/interval.lux b/stdlib/source/test/lux/abstract/interval.lux index 74579b53a..18387288e 100644 --- a/stdlib/source/test/lux/abstract/interval.lux +++ b/stdlib/source/test/lux/abstract/interval.lux @@ -139,14 +139,14 @@ Test (do [! random.monad] [[l m r] (|> (random.set n.hash 3 random.nat) - (# ! each (|>> set.list - (list.sorted n.<) - (pipe.case - (pattern (list b t1 t2)) - [b t1 t2] + (at ! each (|>> set.list + (list.sorted n.<) + (pipe.case + (pattern (list b t1 t2)) + [b t1 t2] - _ - (undefined))))) + _ + (undefined))))) .let [left (/.singleton n.enum l) right (/.singleton n.enum r)]] (all _.and @@ -162,14 +162,14 @@ Test (do [! random.monad] [[b t1 t2] (|> (random.set n.hash 3 random.nat) - (# ! each (|>> set.list - (list.sorted n.<) - (pipe.case - (pattern (list b t1 t2)) - [b t1 t2] + (at ! each (|>> set.list + (list.sorted n.<) + (pipe.case + (pattern (list b t1 t2)) + [b t1 t2] - _ - (undefined))))) + _ + (undefined))))) .let [int_left (/.between n.enum t1 t2) int_right (/.between n.enum b t1)]] (all _.and @@ -190,14 +190,14 @@ (do [! random.monad] [some_interval ..interval [x0 x1 x2 x3] (|> (random.set n.hash 4 random.nat) - (# ! each (|>> set.list - (list.sorted n.<) - (pipe.case - (pattern (list x0 x1 x2 x3)) - [x0 x1 x2 x3] + (at ! each (|>> set.list + (list.sorted n.<) + (pipe.case + (pattern (list x0 x1 x2 x3)) + [x0 x1 x2 x3] - _ - (undefined)))))] + _ + (undefined)))))] (all _.and (_.property "Every interval is nested into itself." (/.nested? some_interval some_interval)) @@ -224,14 +224,14 @@ (do [! random.monad] [some_interval ..interval [x0 x1 x2 x3] (|> (random.set n.hash 4 random.nat) - (# ! each (|>> set.list - (list.sorted n.<) - (pipe.case - (pattern (list x0 x1 x2 x3)) - [x0 x1 x2 x3] + (at ! each (|>> set.list + (list.sorted n.<) + (pipe.case + (pattern (list x0 x1 x2 x3)) + [x0 x1 x2 x3] - _ - (undefined)))))] + _ + (undefined)))))] (all _.and (_.property "No interval overlaps with itself." (not (/.overlaps? some_interval some_interval))) diff --git a/stdlib/source/test/lux/abstract/mix.lux b/stdlib/source/test/lux/abstract/mix.lux index 8d46273b8..42fba9a6c 100644 --- a/stdlib/source/test/lux/abstract/mix.lux +++ b/stdlib/source/test/lux/abstract/mix.lux @@ -21,6 +21,6 @@ (<| (_.covering /._) (all _.and (_.coverage [/.with_monoid] - (n.= (# list.mix mix (# n.addition composite) (# n.addition identity) samples) + (n.= (at list.mix mix (at n.addition composite) (at n.addition identity) samples) (/.with_monoid n.addition list.mix samples))) )))) diff --git a/stdlib/source/test/lux/abstract/monad.lux b/stdlib/source/test/lux/abstract/monad.lux index b0dc3f1cc..7ea1093aa 100644 --- a/stdlib/source/test/lux/abstract/monad.lux +++ b/stdlib/source/test/lux/abstract/monad.lux @@ -30,35 +30,35 @@ (n.= (++ mono) (is (Identity Nat) (/.then identity.monad - (|>> ++ (# identity.monad in)) - (# identity.monad in mono))))) + (|>> ++ (at identity.monad in)) + (at identity.monad in mono))))) (_.coverage [/.all] - (# (list.equivalence n.equivalence) = - (list#each ++ poly) - (|> poly - (list#each (|>> ++ (# identity.monad in))) - (is (List (Identity Nat))) - (/.all identity.monad) - (is (Identity (List Nat)))))) + (at (list.equivalence n.equivalence) = + (list#each ++ poly) + (|> poly + (list#each (|>> ++ (at identity.monad in))) + (is (List (Identity Nat))) + (/.all identity.monad) + (is (Identity (List Nat)))))) (_.coverage [/.each] - (# (list.equivalence n.equivalence) = - (list#each ++ poly) - (|> poly - (/.each identity.monad (|>> ++ (# identity.monad in))) - (is (Identity (List Nat)))))) + (at (list.equivalence n.equivalence) = + (list#each ++ poly) + (|> poly + (/.each identity.monad (|>> ++ (at identity.monad in))) + (is (Identity (List Nat)))))) (_.coverage [/.only] - (# (list.equivalence n.equivalence) = - (list.only n.even? poly) - (|> poly - (/.only identity.monad (|>> n.even? (# identity.monad in))) - (is (Identity (List Nat)))))) + (at (list.equivalence n.equivalence) = + (list.only n.even? poly) + (|> poly + (/.only identity.monad (|>> n.even? (at identity.monad in))) + (is (Identity (List Nat)))))) (_.coverage [/.mix] (n.= (list#mix n.+ 0 poly) (|> poly (/.mix identity.monad (function (_ part whole) - (# identity.monad in - (n.+ part whole))) + (at identity.monad in + (n.+ part whole))) 0) (is (Identity Nat))))) )))) diff --git a/stdlib/source/test/lux/abstract/monad/free.lux b/stdlib/source/test/lux/abstract/monad/free.lux index 9d9329a6c..d98fb1cbd 100644 --- a/stdlib/source/test/lux/abstract/monad/free.lux +++ b/stdlib/source/test/lux/abstract/monad/free.lux @@ -36,9 +36,9 @@ (def: comparison (Comparison (/.Free List)) (function (_ == left right) - (# (list.equivalence ==) = - (..interpret left) - (..interpret right)))) + (at (list.equivalence ==) = + (..interpret left) + (..interpret right)))) (def: .public test Test diff --git a/stdlib/source/test/lux/abstract/monoid.lux b/stdlib/source/test/lux/abstract/monoid.lux index 3525de5bc..0b30b882c 100644 --- a/stdlib/source/test/lux/abstract/monoid.lux +++ b/stdlib/source/test/lux/abstract/monoid.lux @@ -24,10 +24,10 @@ (<| (_.covering /._) (all _.and (_.coverage [/.and] - (let [[natLR intLR] (# (/.and nat.addition int.multiplication) composite - [natL intL] [natR intR])] - (and (nat.= (# nat.addition composite natL natR) + (let [[natLR intLR] (at (/.and nat.addition int.multiplication) composite + [natL intL] [natR intR])] + (and (nat.= (at nat.addition composite natL natR) natLR) - (int.= (# int.multiplication composite intL intR) + (int.= (at int.multiplication composite intL intR) intLR)))) )))) diff --git a/stdlib/source/test/lux/abstract/order.lux b/stdlib/source/test/lux/abstract/order.lux index 68eedeeba..d8792eafa 100644 --- a/stdlib/source/test/lux/abstract/order.lux +++ b/stdlib/source/test/lux/abstract/order.lux @@ -27,12 +27,12 @@ .let [equivalence (is (Equivalence (/.Order Nat)) (implementation (def: (= leftO rightO) - (and (bit#= (# leftO < left left) - (# rightO < left left)) - (bit#= (# leftO < right right) - (# rightO < right right)) - (bit#= (# leftO < left right) - (# rightO < left right))))))]]) + (and (bit#= (at leftO < left left) + (at rightO < left left)) + (bit#= (at leftO < right right) + (at rightO < right right)) + (bit#= (at leftO < left right) + (at rightO < left right))))))]]) (all _.and (_.for [/.functor] ($contravariant.spec equivalence n.order /.functor)) @@ -45,7 +45,7 @@ (_.coverage [/.<=] (and (/.<= n.order left left) (/.<= n.order right right) - (bit#= (# n.order < left right) + (bit#= (at n.order < left right) (/.<= n.order left right)))) (_.coverage [/.>=] (and (/.>= n.order left left) diff --git a/stdlib/source/test/lux/abstract/predicate.lux b/stdlib/source/test/lux/abstract/predicate.lux index 46c44ceea..9fb8bd1a5 100644 --- a/stdlib/source/test/lux/abstract/predicate.lux +++ b/stdlib/source/test/lux/abstract/predicate.lux @@ -46,7 +46,7 @@ (let [generator (is (Random (/.Predicate Nat)) (|> random.nat (random.only (|>> (n.= 0) not)) - (# ! each multiple?)))] + (at ! each multiple?)))] (all _.and (_.for [/.union] ($monoid.spec equivalence /.union generator)) diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux index 5713f1599..3149e3873 100644 --- a/stdlib/source/test/lux/control/concurrency/actor.lux +++ b/stdlib/source/test/lux/control/concurrency/actor.lux @@ -198,9 +198,9 @@ verdict))) (do ! - [num_events (# ! each (|>> (n.% 10) ++) random.nat) + [num_events (at ! each (|>> (n.% 10) ++) random.nat) events (random.list num_events random.nat) - num_observations (# ! each (n.% num_events) random.nat) + num_observations (at ! each (n.% num_events) random.nat) .let [expected (list.first num_observations events) sink (is (Atom (Sequence Nat)) (atom.atom sequence.empty))]] @@ -224,5 +224,5 @@ _ (/.obituary agent) actual (async.future (atom.read! sink))] (_.coverage' [/.Stop /.observe! /.obituary] - (# (list.equivalence n.equivalence) = expected (sequence.list actual)))))) + (at (list.equivalence n.equivalence) = expected (sequence.list actual)))))) )))) diff --git a/stdlib/source/test/lux/control/concurrency/async.lux b/stdlib/source/test/lux/control/concurrency/async.lux index 95647d607..1e343c32d 100644 --- a/stdlib/source/test/lux/control/concurrency/async.lux +++ b/stdlib/source/test/lux/control/concurrency/async.lux @@ -52,7 +52,7 @@ Test (<| (_.covering /._) (do [! random.monad] - [waiting_time (|> random.nat (# ! each (|>> (n.% ..delay) (n.+ ..delay)))) + [waiting_time (|> random.nat (at ! each (|>> (n.% ..delay) (n.+ ..delay)))) expected random.nat dummy random.nat .let [not_dummy (|> random.nat (random.only (|>> (n.= dummy) not)))] diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux index 79d2fe727..004659886 100644 --- a/stdlib/source/test/lux/control/concurrency/frp.lux +++ b/stdlib/source/test/lux/control/concurrency/frp.lux @@ -52,7 +52,7 @@ (All (_ a) (-> Nat [(/.Channel a) (/.Sink a)] (Async (List a)))) (case amount_of_polls 0 (do async.monad - [_ (async.future (# sink close))] + [_ (async.future (at sink close))] (in {.#End})) _ (do [! async.monad] [event channel] @@ -61,8 +61,8 @@ (in {.#End}) {.#Some [head tail]} - (# ! each (|>> {.#Item (variance.read head)}) - (take_amount (-- amount_of_polls) [channel sink])))))) + (at ! each (|>> {.#Item (variance.read head)}) + (take_amount (-- amount_of_polls) [channel sink])))))) (def: .public test Test @@ -90,8 +90,8 @@ (do (try.with io.monad) [.let [[channel sink] (is [(/.Channel Nat) (/.Sink Nat)] (/.channel []))] - _ (# sink feed sample) - _ (# sink close)] + _ (at sink feed sample) + _ (at sink close)] (in channel))) {try.#Success channel} (io.run! @@ -111,8 +111,8 @@ (do (try.with io.monad) [.let [[channel sink] (is [(/.Channel Nat) (/.Sink Nat)] (/.channel []))] - _ (# sink close)] - (# sink feed sample))) + _ (at sink close)] + (at sink feed sample))) {try.#Success _} false @@ -161,7 +161,7 @@ listened (|> sink atom.read! async.future - (# ! each sequence.list))] + (at ! each sequence.list))] (_.coverage' [/.Subscriber /.subscribe!] (list#= inputs listened)))) (in (do async.monad @@ -193,8 +193,8 @@ (list#= (list distinct/0 distinct/1 distinct/2) actual)))) (do ! - [polling_delay (# ! each (|>> (n.% 10) ++) random.nat) - amount_of_polls (# ! each (|>> (n.% 10) ++) random.nat)] + [polling_delay (at ! each (|>> (n.% 10) ++) random.nat) + amount_of_polls (at ! each (|>> (n.% 10) ++) random.nat)] (all _.and (in (do [! async.monad] [actual (..take_amount amount_of_polls (/.poll polling_delay (is (IO Nat) (io.io sample)))) diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux index 1df21f823..64a5cd067 100644 --- a/stdlib/source/test/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux @@ -38,7 +38,7 @@ (_.for [/.Semaphore] (all _.and (do [! random.monad] - [initial_open_positions (|> random.nat (# ! each (|>> (n.% 10) (n.max 1)))) + [initial_open_positions (|> random.nat (at ! each (|>> (n.% 10) (n.max 1)))) .let [semaphore (/.semaphore initial_open_positions)]] (in (do async.monad [result (async.within ..delay (/.wait! semaphore))] @@ -50,7 +50,7 @@ {.#None} false))))) (do [! random.monad] - [initial_open_positions (|> random.nat (# ! each (|>> (n.% 10) (n.max 1)))) + [initial_open_positions (|> random.nat (at ! each (|>> (n.% 10) (n.max 1)))) .let [semaphore (/.semaphore initial_open_positions)]] (in (do [! async.monad] [_ (monad.each ! /.wait! (list.repeated initial_open_positions semaphore)) @@ -63,7 +63,7 @@ {.#None} true))))) (do [! random.monad] - [initial_open_positions (|> random.nat (# ! each (|>> (n.% 10) (n.max 1)))) + [initial_open_positions (|> random.nat (at ! each (|>> (n.% 10) (n.max 1)))) .let [semaphore (/.semaphore initial_open_positions)]] (in (do [! async.monad] [_ (monad.each ! /.wait! (list.repeated initial_open_positions semaphore)) @@ -79,7 +79,7 @@ _ false))))) (do [! random.monad] - [initial_open_positions (|> random.nat (# ! each (|>> (n.% 10) (n.max 1)))) + [initial_open_positions (|> random.nat (at ! each (|>> (n.% 10) (n.max 1)))) .let [semaphore (/.semaphore initial_open_positions)]] (in (do async.monad [outcome (/.signal! semaphore)] @@ -97,7 +97,7 @@ (_.for [/.Mutex] (all _.and (do [! random.monad] - [repetitions (|> random.nat (# ! each (|>> (n.% 100) (n.max 10)))) + [repetitions (|> random.nat (at ! each (|>> (n.% 100) (n.max 10)))) .let [resource (atom.atom "") expected_As (text.together (list.repeated repetitions "A")) expected_Bs (text.together (list.repeated repetitions "B")) @@ -154,7 +154,7 @@ _ false))) (do [! random.monad] - [limit (# ! each (|>> (n.% 9) ++) random.nat) + [limit (at ! each (|>> (n.% 9) ++) random.nat) .let [barrier (/.barrier (maybe.trusted (/.limit limit))) resource (atom.atom "")]] (in (do [! async.monad] diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux index 05d6f33da..a06248ba1 100644 --- a/stdlib/source/test/lux/control/concurrency/stm.lux +++ b/stdlib/source/test/lux/control/concurrency/stm.lux @@ -27,7 +27,7 @@ (def: injection (Injection /.STM) - (# /.monad in)) + (at /.monad in)) (def: comparison (Comparison /.STM) @@ -41,7 +41,7 @@ (do [! random.monad] [dummy random.nat expected random.nat - iterations_per_process (|> random.nat (# ! each (n.% 100)))] + iterations_per_process (|> random.nat (at ! each (n.% 100)))] (all _.and (_.for [/.functor] ($functor.spec ..injection ..comparison /.functor)) @@ -51,7 +51,7 @@ ($monad.spec ..injection ..comparison /.monad)) (in (do async.monad - [actual (/.commit! (# /.monad in expected))] + [actual (/.commit! (at /.monad in expected))] (_.coverage' [/.commit!] (n.= expected actual)))) (in (do async.monad @@ -84,13 +84,13 @@ [follower sink] (io.run! (/.changes box))] _ (/.commit! (/.write expected box)) _ (/.commit! (/.update (n.* 2) box)) - _ (async.future (# sink close)) + _ (async.future (at sink close)) _ (/.commit! (/.update (n.* 3) box)) changes (frp.list follower)] (_.coverage' [/.changes] - (# (list.equivalence n.equivalence) = - (list expected (n.* 2 expected)) - changes)))) + (at (list.equivalence n.equivalence) = + (list expected (n.* 2 expected)) + changes)))) (in (let [var (/.var 0)] (do [! async.monad] [_ (|> (list.repeated iterations_per_process []) diff --git a/stdlib/source/test/lux/control/concurrency/thread.lux b/stdlib/source/test/lux/control/concurrency/thread.lux index 9f9611c42..7ed7aff8c 100644 --- a/stdlib/source/test/lux/control/concurrency/thread.lux +++ b/stdlib/source/test/lux/control/concurrency/thread.lux @@ -26,8 +26,8 @@ (do [! random.monad] [dummy random.nat expected random.nat - delay (# ! each (|>> (n.% 5) (n.+ 5)) - random.nat)] + delay (at ! each (|>> (n.% 5) (n.+ 5)) + random.nat)] (all _.and (_.coverage [/.parallelism] (n.> 0 /.parallelism)) diff --git a/stdlib/source/test/lux/control/exception.lux b/stdlib/source/test/lux/control/exception.lux index 459e7101a..34756195a 100644 --- a/stdlib/source/test/lux/control/exception.lux +++ b/stdlib/source/test/lux/control/exception.lux @@ -29,7 +29,7 @@ [expected random.nat wrong (|> random.nat (random.only (|>> (n.= expected) not))) assertion_succeeded? random.bit - .let [report_element (# ! each %.nat random.nat)] + .let [report_element (at ! each %.nat random.nat)] field0 report_element value0 report_element field1 report_element diff --git a/stdlib/source/test/lux/control/function.lux b/stdlib/source/test/lux/control/function.lux index d122bbd39..4a95a0065 100644 --- a/stdlib/source/test/lux/control/function.lux +++ b/stdlib/source/test/lux/control/function.lux @@ -24,8 +24,8 @@ Test (do [! random.monad] [expected random.nat - f0 (# ! each n.+ random.nat) - f1 (# ! each n.* random.nat) + f0 (at ! each n.+ random.nat) + f1 (at ! each n.* random.nat) dummy random.nat extra (|> random.nat (random.only (|>> (n.= expected) not)))] (<| (_.covering /._) @@ -36,7 +36,7 @@ (n.= (left extra) (right extra))))) generator (is (Random (-> Nat Nat)) - (# ! each n.- random.nat))] + (at ! each n.- random.nat))] (_.for [/.monoid] ($monoid.spec equivalence /.monoid generator))) diff --git a/stdlib/source/test/lux/control/function/inline.lux b/stdlib/source/test/lux/control/function/inline.lux index 67245f8cc..54cbeabc7 100644 --- a/stdlib/source/test/lux/control/function/inline.lux +++ b/stdlib/source/test/lux/control/function/inline.lux @@ -22,7 +22,7 @@ Test (<| (_.covering /._) (do [! random.monad] - [.let [measurement (# ! each (i.% +1000) random.int)] + [.let [measurement (at ! each (i.% +1000) random.int)] m0 measurement m1 measurement]) (all _.and diff --git a/stdlib/source/test/lux/control/function/memo.lux b/stdlib/source/test/lux/control/function/memo.lux index b16902c88..3a74921cf 100644 --- a/stdlib/source/test/lux/control/function/memo.lux +++ b/stdlib/source/test/lux/control/function/memo.lux @@ -60,7 +60,7 @@ Test (<| (_.covering /._) (do [! random.monad] - [input (|> random.nat (# ! each (|>> (n.% 5) (n.+ 21))))]) + [input (|> random.nat (at ! each (|>> (n.% 5) (n.+ 21))))]) (_.for [/.Memo]) (all _.and (_.coverage [/.closed /.none] @@ -108,7 +108,7 @@ (is (//.Mixin Nat (State (Dictionary Nat Nat) Nat)) (function (factorial delegate again input) (case input - (^.or 0 1) (# state.monad in 1) + (^.or 0 1) (at state.monad in 1) _ (do state.monad [output' (again (-- input))] (in (n.* input output'))))))) diff --git a/stdlib/source/test/lux/control/function/mixin.lux b/stdlib/source/test/lux/control/function/mixin.lux index c19295365..02ea34ad3 100644 --- a/stdlib/source/test/lux/control/function/mixin.lux +++ b/stdlib/source/test/lux/control/function/mixin.lux @@ -27,7 +27,7 @@ Test (<| (_.covering /._) (do [! random.monad] - [input (|> random.nat (# ! each (|>> (n.% 6) (n.+ 20)))) + [input (|> random.nat (at ! each (|>> (n.% 6) (n.+ 20)))) dummy random.nat shift (|> random.nat (random.only (|>> (n.= dummy) not))) .let [equivalence (is (Equivalence (/.Mixin Nat Nat)) diff --git a/stdlib/source/test/lux/control/function/mutual.lux b/stdlib/source/test/lux/control/function/mutual.lux index 698685d0c..3d936c6dd 100644 --- a/stdlib/source/test/lux/control/function/mutual.lux +++ b/stdlib/source/test/lux/control/function/mutual.lux @@ -18,7 +18,7 @@ (def: test_let Test (do [! random.monad] - [sample (# ! each (n.% 10) random.nat) + [sample (at ! each (n.% 10) random.nat) .let [expected (n.even? sample)]] (<| (_.coverage [/.let]) (/.let [(even? number) @@ -51,7 +51,7 @@ (def: test_def Test (do [! random.monad] - [sample (# ! each (n.% 10) random.nat) + [sample (at ! each (n.% 10) random.nat) .let [expected (n.even? sample)]] (<| (_.coverage [/.def:]) (and (bit#= expected (..even? sample)) diff --git a/stdlib/source/test/lux/control/lazy.lux b/stdlib/source/test/lux/control/lazy.lux index d205eebb2..26e1baba6 100644 --- a/stdlib/source/test/lux/control/lazy.lux +++ b/stdlib/source/test/lux/control/lazy.lux @@ -25,11 +25,11 @@ (def: comparison (Comparison Lazy) (function (_ ==) - (# (/.equivalence ==) =))) + (at (/.equivalence ==) =))) (def: .public lazy (All (_ a) (-> (Random a) (Random (Lazy a)))) - (# random.functor each (|>> /.lazy))) + (at random.functor each (|>> /.lazy))) (def: .public test Test diff --git a/stdlib/source/test/lux/control/maybe.lux b/stdlib/source/test/lux/control/maybe.lux index b986c2fbc..7b5c61659 100644 --- a/stdlib/source/test/lux/control/maybe.lux +++ b/stdlib/source/test/lux/control/maybe.lux @@ -34,7 +34,7 @@ ($equivalence.spec (/.equivalence n.equivalence) (random.maybe random.nat))) (_.for [/.hash] (|> random.nat - (# random.monad each (|>> {.#Some})) + (at random.monad each (|>> {.#Some})) ($hash.spec (/.hash n.hash)))) (_.for [/.monoid] ($monoid.spec (/.equivalence n.equivalence) /.monoid (random.maybe random.nat))) @@ -78,9 +78,9 @@ (do random.monad [value random.nat] (_.coverage [/.list] - (# (list.equivalence n.equivalence) = - (list value) - (/.list {.#Some value})))) + (at (list.equivalence n.equivalence) = + (list value) + (/.list {.#Some value})))) (do random.monad [expected random.nat .let [(open "/#[0]") (/.equivalence n.equivalence)]] diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux index c5fdb888a..c0f1d05f6 100644 --- a/stdlib/source/test/lux/control/parser.lux +++ b/stdlib/source/test/lux/control/parser.lux @@ -90,7 +90,7 @@ Test (do [! random.monad] [expected0 random.nat - variadic (# ! each (|>> (n.max 1) (n.min 20)) random.nat) + variadic (at ! each (|>> (n.max 1) (n.min 20)) random.nat) expected+ (random.list variadic random.nat) even0 (random.only n.even? random.nat) odd0 (random.only n.odd? random.nat) @@ -109,7 +109,7 @@ (and (|> (list#each code.nat expected+) (/.result (/.some <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = expected+ actual))) + (at (list.equivalence n.equivalence) = expected+ actual))) (|> (list#each (|>> .int code.int) expected+) (/.result (/.some <code>.nat)) (match {.#End} @@ -118,7 +118,7 @@ (and (|> (list#each code.nat expected+) (/.result (/.many <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = expected+ actual))) + (at (list.equivalence n.equivalence) = expected+ actual))) (|> (list (code.nat expected0)) (/.result (/.many <code>.nat)) (match (list actual) @@ -180,8 +180,8 @@ (def: combinators_1 Test (do [! random.monad] - [variadic (# ! each (|>> (n.max 1) (n.min 20)) random.nat) - times (# ! each (n.% variadic) random.nat) + [variadic (at ! each (|>> (n.max 1) (n.min 20)) random.nat) + times (at ! each (n.% variadic) random.nat) expected random.nat wrong (|> random.nat (random.only (|>> (n.= expected) not))) expected+ (random.list variadic random.nat) @@ -191,9 +191,9 @@ (and (|> (list#each code.nat expected+) (/.result (/.exactly times <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = - (list.first times expected+) - actual))) + (at (list.equivalence n.equivalence) = + (list.first times expected+) + actual))) (|> (list#each code.nat expected+) (/.result (/.exactly (++ variadic) <code>.nat)) fails?))) @@ -201,9 +201,9 @@ (and (|> (list#each code.nat expected+) (/.result (/.at_least times <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = - expected+ - actual))) + (at (list.equivalence n.equivalence) = + expected+ + actual))) (|> (list#each code.nat expected+) (/.result (/.at_least (++ variadic) <code>.nat)) fails?))) @@ -211,44 +211,44 @@ (and (|> (list#each code.nat expected+) (/.result (/.at_most times <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = - (list.first times expected+) - actual))) + (at (list.equivalence n.equivalence) = + (list.first times expected+) + actual))) (|> (list#each code.nat expected+) (/.result (/.at_most (++ variadic) <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = - expected+ - actual))))) + (at (list.equivalence n.equivalence) = + expected+ + actual))))) (_.coverage [/.between] (and (|> (list#each code.nat expected+) (/.result (/.between times (n.- times variadic) <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = - expected+ - actual))) + (at (list.equivalence n.equivalence) = + expected+ + actual))) (|> (list#each code.nat (list.first times expected+)) (/.result (/.between times (n.- times variadic) <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = - (list.first times expected+) - actual))))) + (at (list.equivalence n.equivalence) = + (list.first times expected+) + actual))))) (_.coverage [/.separated_by] (|> (list.interposed (code.text separator) (list#each code.nat expected+)) (/.result (/.separated_by (<code>.this (code.text separator)) <code>.nat)) (match actual - (# (list.equivalence n.equivalence) = - expected+ - actual)))) + (at (list.equivalence n.equivalence) = + expected+ + actual)))) (_.coverage [/.remaining] (|> (list#each code.nat expected+) (/.result /.remaining) (match actual - (# (list.equivalence code.equivalence) = - (list#each code.nat expected+) - actual)))) + (at (list.equivalence code.equivalence) = + (list#each code.nat expected+) + actual)))) (_.coverage [/.else] - (and (|> (/.result (/.else wrong (# /.monad in expected)) (list)) + (and (|> (/.result (/.else wrong (at /.monad in expected)) (list)) (match actual (n.= expected actual))) (|> (/.result (/.else expected (/.failure "yolo")) (list)) @@ -332,7 +332,7 @@ (def: injection (Injection (All (_ a i) (Parser i a))) - (# /.monad in)) + (at /.monad in)) (def: comparison (Comparison (All (_ a i) (Parser i a))) @@ -361,7 +361,7 @@ ($monad.spec ..injection ..comparison /.monad)) (_.coverage [/.result] - (|> (/.result (# /.monad in expected) (list)) + (|> (/.result (at /.monad in expected) (list)) (match actual (n.= expected actual)))) (_.coverage [/.failure] (|> (list) diff --git a/stdlib/source/test/lux/control/parser/analysis.lux b/stdlib/source/test/lux/control/parser/analysis.lux index 1e1a288b2..6f79c1dcb 100644 --- a/stdlib/source/test/lux/control/parser/analysis.lux +++ b/stdlib/source/test/lux/control/parser/analysis.lux @@ -54,13 +54,13 @@ [] (`` (all _.and (do [! random.monad] - [expected (# ! each (|>> analysis.bit) random.bit)] + [expected (at ! each (|>> analysis.bit) random.bit)] (_.coverage [/.result /.any] (|> (list expected) (/.result /.any) (pipe.case {try.#Success actual} - (# analysis.equivalence = expected actual) + (at analysis.equivalence = expected actual) {try.#Failure _} false)))) diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux index 41d2cec10..f2198c2d5 100644 --- a/stdlib/source/test/lux/control/parser/binary.lux +++ b/stdlib/source/test/lux/control/parser/binary.lux @@ -56,8 +56,8 @@ (def: (utf8_conversion_does_not_alter? value) (Predicate Text) (|> value - (# utf8.codec encoded) - (# utf8.codec decoded) + (at utf8.codec encoded) + (at utf8.codec decoded) (pipe.case {try.#Success converted} (text#= value converted) @@ -95,7 +95,7 @@ (random.rec (function (_ again) (let [random_sequence (do [! random.monad] - [size (# ! each (n.% 2) random.nat)] + [size (at ! each (n.% 2) random.nat)] (random.list size again))] (all random.and ..random_location @@ -128,8 +128,8 @@ (`` (all _.and (~~ (template [<size> <parser> <format>] [(do [! random.monad] - [expected (# ! each (i64.and (i64.mask <size>)) - random.nat)] + [expected (at ! each (i64.and (i64.mask <size>)) + random.nat)] (_.coverage [<size> <parser> <format>] (|> (format.result <format> expected) (/.result <parser>) @@ -148,12 +148,12 @@ (`` (all _.and (~~ (template [<parser> <format>] [(do [! random.monad] - [expected (# ! each (# utf8.codec encoded) (random.ascii ..segment_size))] + [expected (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] (_.coverage [<parser> <format>] (|> (format.result <format> expected) (/.result <parser>) (!expect (^.multi {try.#Success actual} - (# binary.equivalence = expected actual))))))] + (at binary.equivalence = expected actual))))))] [/.binary_8 format.binary_8] [/.binary_16 format.binary_16] @@ -171,7 +171,7 @@ (|> (format.result <format> expected) (/.result <parser>) (!expect (^.multi {try.#Success actual} - (# text.equivalence = expected actual))))))] + (at text.equivalence = expected actual))))))] [/.utf8_8 format.utf8_8] [/.utf8_16 format.utf8_16] @@ -191,7 +191,7 @@ (format.result (<format> format.nat)) (/.result (<parser> /.nat)) (!expect (^.multi {try.#Success actual} - (# (sequence.equivalence n.equivalence) = expected actual))))))] + (at (sequence.equivalence n.equivalence) = expected actual))))))] [/.sequence_8 format.sequence_8] [/.sequence_16 format.sequence_16] @@ -210,7 +210,7 @@ (format.result <format>) (/.result <parser>) (!expect (^.multi {try.#Success actual} - (# <equivalence> = expected actual))))))] + (at <equivalence> = expected actual))))))] [/.bit format.bit random.bit bit.equivalence] [/.nat format.nat random.nat n.equivalence] @@ -223,13 +223,13 @@ (format.result format.frac) (/.result /.frac) (!expect (^.multi {try.#Success actual} - (or (# frac.equivalence = expected actual) + (or (at frac.equivalence = expected actual) (and (frac.not_a_number? expected) (frac.not_a_number? actual)))))))) (do [! random.monad] - [expected (# ! each (|>> (i64.and (i64.mask /.size_8)) - (n.max 2)) - random.nat)] + [expected (at ! each (|>> (i64.and (i64.mask /.size_8)) + (n.max 2)) + random.nat)] (_.coverage [/.not_a_bit] (|> expected (format.result format.bits_8) @@ -249,7 +249,7 @@ (format.result <format>) (/.result <parser>) (!expect (^.multi {try.#Success actual} - (# <equivalence> = expected actual))))))] + (at <equivalence> = expected actual))))))] [/.location format.location random_location location_equivalence] [/.code format.code random_code code.equivalence] @@ -263,14 +263,14 @@ (format.result <format>) (/.result <parser>) (!expect (^.multi {try.#Success actual} - (# <equivalence> = expected actual))))))] + (at <equivalence> = expected actual))))))] [/.maybe (/.maybe /.nat) format.maybe (format.maybe format.nat) (random.maybe random.nat) (maybe.equivalence n.equivalence)] [/.list (/.list /.nat) format.list (format.list format.nat) (random.list ..segment_size random.nat) (list.equivalence n.equivalence)] [/.set (/.set n.hash /.nat) format.set (format.set format.nat) (random.set n.hash ..segment_size random.nat) set.equivalence] [/.symbol /.symbol format.symbol format.symbol ..random_symbol symbol.equivalence])) (do [! random.monad] - [expected (# ! each (list.repeated ..segment_size) random.nat)] + [expected (at ! each (list.repeated ..segment_size) random.nat)] (_.coverage [/.set_elements_are_not_unique] (|> expected (format.result (format.list format.nat)) @@ -285,13 +285,13 @@ (/.result (is (/.Parser (Either Bit Nat)) (/.or /.bit /.nat))) (!expect (^.multi {try.#Success actual} - (# (sum.equivalence bit.equivalence n.equivalence) = - expected - actual)))))) + (at (sum.equivalence bit.equivalence n.equivalence) = + expected + actual)))))) (do [! random.monad] - [tag (# ! each (|>> (i64.and (i64.mask /.size_8)) - (n.max 2)) - random.nat) + [tag (at ! each (|>> (i64.and (i64.mask /.size_8)) + (n.max 2)) + random.nat) value random.bit] (_.coverage [/.invalid_tag] (|> [tag value] @@ -313,9 +313,9 @@ (<>.and /.nat again)))))) (!expect (^.multi {try.#Success actual} - (# (list.equivalence n.equivalence) = - expected - actual)))))) + (at (list.equivalence n.equivalence) = + expected + actual)))))) ))) (def: .public test @@ -329,22 +329,22 @@ (/.result /.any) (!expect {try.#Success _}))) (do [! random.monad] - [data (# ! each (# utf8.codec encoded) (random.ascii ..segment_size))] + [data (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] (_.coverage [/.binary_was_not_fully_read] (|> data (/.result /.any) (!expect (^.multi {try.#Failure error} (exception.match? /.binary_was_not_fully_read error)))))) (do [! random.monad] - [expected (# ! each (# utf8.codec encoded) (random.ascii ..segment_size))] + [expected (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] (_.coverage [/.segment format.segment format.result] (|> expected (format.result (format.segment ..segment_size)) (/.result (/.segment ..segment_size)) (!expect (^.multi {try.#Success actual} - (# binary.equivalence = expected actual)))))) + (at binary.equivalence = expected actual)))))) (do [! random.monad] - [data (# ! each (# utf8.codec encoded) (random.ascii ..segment_size))] + [data (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] (_.coverage [/.end?] (|> data (/.result (do <>.monad @@ -355,8 +355,8 @@ post)))) (!expect {try.#Success #1})))) (do [! random.monad] - [to_read (# ! each (n.% (++ ..segment_size)) random.nat) - data (# ! each (# utf8.codec encoded) (random.ascii ..segment_size))] + [to_read (at ! each (n.% (++ ..segment_size)) random.nat) + data (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] (_.coverage [/.Offset /.offset] (|> data (/.result (do <>.monad @@ -370,8 +370,8 @@ (n.= ..segment_size nothing_left))))) (!expect {try.#Success #1})))) (do [! random.monad] - [to_read (# ! each (n.% (++ ..segment_size)) random.nat) - data (# ! each (# utf8.codec encoded) (random.ascii ..segment_size))] + [to_read (at ! each (n.% (++ ..segment_size)) random.nat) + data (at ! each (at utf8.codec encoded) (random.ascii ..segment_size))] (_.coverage [/.remaining] (|> data (/.result (do <>.monad diff --git a/stdlib/source/test/lux/control/parser/cli.lux b/stdlib/source/test/lux/control/parser/cli.lux index 28e5fb4a2..9e12a51aa 100644 --- a/stdlib/source/test/lux/control/parser/cli.lux +++ b/stdlib/source/test/lux/control/parser/cli.lux @@ -33,7 +33,7 @@ (<| (_.covering /._) (_.for [/.Parser]) (do [! random.monad] - [expected (# ! each n#encoded random.nat) + [expected (at ! each n#encoded random.nat) .let [random_dummy (random.only (|>> (text#= expected) not) (random.unicode 5))] dummy random_dummy diff --git a/stdlib/source/test/lux/control/parser/code.lux b/stdlib/source/test/lux/control/parser/code.lux index ad59d2ba3..01837874f 100644 --- a/stdlib/source/test/lux/control/parser/code.lux +++ b/stdlib/source/test/lux/control/parser/code.lux @@ -61,7 +61,7 @@ (_.for [/.Parser]) (`` (all _.and (do [! random.monad] - [expected (# ! each code.bit random.bit)] + [expected (at ! each code.bit random.bit)] (_.coverage [/.result] (and (|> (/.result /.any (list expected)) (!expect {try.#Success _})) @@ -70,12 +70,12 @@ (~~ (template [<query> <check> <random> <code> <equivalence>] [(do [! random.monad] [expected <random> - dummy (|> <random> (random.only (|>> (# <equivalence> = expected) not)))] + dummy (|> <random> (random.only (|>> (at <equivalence> = expected) not)))] (all _.and (_.coverage [<query>] (|> (/.result <query> (list (<code> expected))) (!expect (^.multi {try.#Success actual} - (# <equivalence> = expected actual))))) + (at <equivalence> = expected actual))))) (_.coverage [<check>] (and (|> (/.result (<check> expected) (list (<code> expected))) (!expect {try.#Success []})) @@ -83,7 +83,7 @@ (!expect {try.#Failure _})))) ))] - [/.any /.this (# ! each code.bit random.bit) function.identity code.equivalence] + [/.any /.this (at ! each code.bit random.bit) function.identity code.equivalence] [/.bit /.this_bit random.bit code.bit bit.equivalence] [/.nat /.this_nat random.nat code.nat nat.equivalence] [/.int /.this_int random.int code.int int.equivalence] @@ -103,8 +103,8 @@ (list (<code> (list (code.nat expected_left) (code.int expected_right))))) (!expect (^.multi {try.#Success [actual_left actual_right]} - (and (# nat.equivalence = expected_left actual_left) - (# int.equivalence = expected_right actual_right)))))))] + (and (at nat.equivalence = expected_left actual_left) + (at int.equivalence = expected_right actual_right)))))))] [/.form code.form] [/.variant code.variant] @@ -118,10 +118,10 @@ /.int) (list (code.int expected_global))) (!expect (^.multi {try.#Success [actual_local actual_global]} - (and (# nat.equivalence = expected_local actual_local) - (# int.equivalence = expected_global actual_global))))))) + (and (at nat.equivalence = expected_local actual_local) + (at int.equivalence = expected_global actual_global))))))) (do [! random.monad] - [dummy (# ! each code.bit random.bit)] + [dummy (at ! each code.bit random.bit)] (_.coverage [/.end?] (|> (/.result (do <>.monad [pre /.end? @@ -133,14 +133,14 @@ (!expect (^.multi {try.#Success verdict} verdict))))) (do [! random.monad] - [dummy (# ! each code.bit random.bit)] + [dummy (at ! each code.bit random.bit)] (_.coverage [/.end] (and (|> (/.result /.end (list)) (!expect {try.#Success []})) (|> (/.result /.end (list dummy)) (!expect {try.#Failure _}))))) (do [! random.monad] - [expected (# ! each code.bit random.bit)] + [expected (at ! each code.bit random.bit)] (_.coverage [/.next] (|> (/.result (do <>.monad [pre /.next @@ -150,7 +150,7 @@ (list expected)) (!expect {try.#Success _})))) (do [! random.monad] - [expected (# ! each code.bit random.bit)] + [expected (at ! each code.bit random.bit)] (_.coverage [/.not] (and (|> (/.result (/.not /.nat) (list expected)) (!expect (^.multi {try.#Success actual} diff --git a/stdlib/source/test/lux/control/parser/environment.lux b/stdlib/source/test/lux/control/parser/environment.lux index 9b098cf1a..d009918c4 100644 --- a/stdlib/source/test/lux/control/parser/environment.lux +++ b/stdlib/source/test/lux/control/parser/environment.lux @@ -30,7 +30,7 @@ [expected random.nat] (_.coverage [/.result] (|> (/.result (//#in expected) /.empty) - (# try.functor each (n.= expected)) + (at try.functor each (n.= expected)) (try.else false)))) (do random.monad [property (random.alphabetic 1) @@ -39,7 +39,7 @@ (|> /.empty (dictionary.has property expected) (/.result (/.property property)) - (# try.functor each (text#= expected)) + (at try.functor each (text#= expected)) (try.else false)))) (do random.monad [property (random.alphabetic 1)] diff --git a/stdlib/source/test/lux/control/parser/json.lux b/stdlib/source/test/lux/control/parser/json.lux index 75a817481..6c2a0753a 100644 --- a/stdlib/source/test/lux/control/parser/json.lux +++ b/stdlib/source/test/lux/control/parser/json.lux @@ -48,23 +48,23 @@ (_.for [/.Parser]) (`` (all _.and (do [! random.monad] - [expected (# ! each (|>> {json.#String}) (random.unicode 1))] + [expected (at ! each (|>> {json.#String}) (random.unicode 1))] (_.coverage [/.result /.any] (|> (/.result /.any expected) (!expect (^.multi {try.#Success actual} - (# json.equivalence = expected actual)))))) + (at json.equivalence = expected actual)))))) (_.coverage [/.null] (|> (/.result /.null {json.#Null}) (!expect {try.#Success _}))) (~~ (template [<query> <test> <check> <random> <json> <equivalence>] [(do [! random.monad] [expected <random> - dummy (|> <random> (random.only (|>> (# <equivalence> = expected) not)))] + dummy (|> <random> (random.only (|>> (at <equivalence> = expected) not)))] (all _.and (_.coverage [<query>] (|> (/.result <query> {<json> expected}) (!expect (^.multi {try.#Success actual} - (# <equivalence> = expected actual))))) + (at <equivalence> = expected actual))))) (_.coverage [<test>] (and (|> (/.result (<test> expected) {<json> expected}) (!expect {try.#Success #1})) @@ -89,7 +89,7 @@ (exception.match? /.unexpected_value error)))))) (do [! random.monad] [expected (random.unicode 1) - dummy (|> (random.unicode 1) (random.only (|>> (# text.equivalence = expected) not)))] + dummy (|> (random.unicode 1) (random.only (|>> (at text.equivalence = expected) not)))] (_.coverage [/.value_mismatch] (|> (/.result (/.this_string expected) {json.#String dummy}) (!expect (^.multi {try.#Failure error} @@ -99,22 +99,22 @@ (_.coverage [/.nullable] (and (|> (/.result (/.nullable /.string) {json.#Null}) (!expect (^.multi {try.#Success actual} - (# (maybe.equivalence text.equivalence) = {.#None} actual)))) + (at (maybe.equivalence text.equivalence) = {.#None} actual)))) (|> (/.result (/.nullable /.string) {json.#String expected}) (!expect (^.multi {try.#Success actual} - (# (maybe.equivalence text.equivalence) = {.#Some expected} actual))))))) + (at (maybe.equivalence text.equivalence) = {.#Some expected} actual))))))) (do [! random.monad] - [size (# ! each (n.% 10) random.nat) + [size (at ! each (n.% 10) random.nat) expected (|> (random.unicode 1) (random.list size) - (# ! each sequence.of_list))] + (at ! each sequence.of_list))] (_.coverage [/.array] (|> (/.result (/.array (<>.some /.string)) {json.#Array (sequence#each (|>> {json.#String}) expected)}) (!expect (^.multi {try.#Success actual} - (# (sequence.equivalence text.equivalence) = expected (sequence.of_list actual))))))) + (at (sequence.equivalence text.equivalence) = expected (sequence.of_list actual))))))) (do [! random.monad] - [expected (# ! each (|>> {json.#String}) (random.unicode 1))] + [expected (at ! each (|>> {json.#String}) (random.unicode 1))] (_.coverage [/.unconsumed_input] (|> (/.result (/.array /.any) {json.#Array (sequence expected expected)}) (!expect (^.multi {try.#Failure error} @@ -128,13 +128,13 @@ expected_number ..safe_frac expected_string (random.unicode 1) [boolean_field number_field string_field] (|> (random.set text.hash 3 (random.unicode 3)) - (# ! each (|>> set.list - (pipe.case - (pattern (list boolean_field number_field string_field)) - [boolean_field number_field string_field] + (at ! each (|>> set.list + (pipe.case + (pattern (list boolean_field number_field string_field)) + [boolean_field number_field string_field] - _ - (undefined)))))] + _ + (undefined)))))] (_.coverage [/.object /.field] (|> (/.result (/.object (all <>.and (/.field boolean_field /.boolean) @@ -146,11 +146,11 @@ [number_field {json.#Number expected_number}] [string_field {json.#String expected_string}]))}) (!expect (^.multi {try.#Success [actual_boolean actual_number actual_string]} - (and (# bit.equivalence = expected_boolean actual_boolean) - (# frac.equivalence = expected_number actual_number) - (# text.equivalence = expected_string actual_string))))))) + (and (at bit.equivalence = expected_boolean actual_boolean) + (at frac.equivalence = expected_number actual_number) + (at text.equivalence = expected_string actual_string))))))) (do [! random.monad] - [size (# ! each (n.% 10) random.nat) + [size (at ! each (n.% 10) random.nat) keys (random.list size (random.unicode 1)) values (random.list size (random.unicode 1)) .let [expected (dictionary.of_list text.hash (list.zipped_2 keys values))]] @@ -162,5 +162,5 @@ (list.zipped_2 keys) (dictionary.of_list text.hash))}) (!expect (^.multi {try.#Success actual} - (# (dictionary.equivalence text.equivalence) = expected actual)))))) + (at (dictionary.equivalence text.equivalence) = expected actual)))))) )))) diff --git a/stdlib/source/test/lux/control/parser/synthesis.lux b/stdlib/source/test/lux/control/parser/synthesis.lux index 8e974ad33..7046d5d1d 100644 --- a/stdlib/source/test/lux/control/parser/synthesis.lux +++ b/stdlib/source/test/lux/control/parser/synthesis.lux @@ -55,9 +55,9 @@ (def: random_environment (Random (Environment Synthesis)) (do [! random.monad] - [size (# ! each (n.% 5) random.nat)] + [size (at ! each (n.% 5) random.nat)] (|> ..random_variable - (# ! each (|>> synthesis.variable)) + (at ! each (|>> synthesis.variable)) (random.list size)))) (def: simple @@ -66,12 +66,12 @@ (~~ (template [<query> <check> <random> <synthesis> <equivalence>] [(do [! random.monad] [expected <random> - dummy (|> <random> (random.only (|>> (# <equivalence> = expected) not)))] + dummy (|> <random> (random.only (|>> (at <equivalence> = expected) not)))] (all _.and (_.coverage [<query>] (|> (/.result <query> (list (<synthesis> expected))) (!expect (^.multi {try.#Success actual} - (# <equivalence> = expected actual))))) + (at <equivalence> = expected actual))))) (_.coverage [<check>] (and (|> (/.result (<check> expected) (list (<synthesis> expected))) (!expect {try.#Success _})) @@ -105,10 +105,10 @@ (synthesis.f64 expected_f64) (synthesis.text expected_text))))) (!expect (^.multi {try.#Success [actual_bit actual_i64 actual_f64 actual_text]} - (and (# bit.equivalence = expected_bit actual_bit) - (# i64.equivalence = expected_i64 actual_i64) - (# frac.equivalence = expected_f64 actual_f64) - (# text.equivalence = expected_text actual_text))))) + (and (at bit.equivalence = expected_bit actual_bit) + (at i64.equivalence = expected_i64 actual_i64) + (at frac.equivalence = expected_f64 actual_f64) + (at text.equivalence = expected_text actual_text))))) (|> (/.result (/.tuple (all <>.and /.bit /.i64 /.f64 /.text)) (list (synthesis.text expected_text))) (!expect (^.multi {try.#Failure error} @@ -121,10 +121,10 @@ (and (|> (/.result (/.function arity /.text) (list (synthesis.function/abstraction [expected_environment arity (synthesis.text expected_body)]))) (!expect (^.multi {try.#Success [actual_environment actual_body]} - (and (# (list.equivalence synthesis.equivalence) = - expected_environment - actual_environment) - (# text.equivalence = expected_body actual_body))))) + (and (at (list.equivalence synthesis.equivalence) = + expected_environment + actual_environment) + (at text.equivalence = expected_body actual_body))))) (|> (/.result (/.function arity /.text) (list (synthesis.text expected_body))) (!expect (^.multi {try.#Failure error} @@ -139,7 +139,7 @@ (!expect (^.multi {try.#Failure error} (exception.match? /.wrong_arity error)))))) (do [! random.monad] - [arity (# ! each (|>> (n.% 10) ++) random.nat) + [arity (at ! each (|>> (n.% 10) ++) random.nat) expected_offset random.nat expected_inits (random.list arity random.bit) expected_body (random.unicode 1)] @@ -149,11 +149,11 @@ (list#each (|>> synthesis.bit) expected_inits) (synthesis.text expected_body)]))) (!expect (^.multi {try.#Success [actual_offset actual_inits actual_body]} - (and (# n.equivalence = expected_offset actual_offset) - (# (list.equivalence bit.equivalence) = - expected_inits - actual_inits) - (# text.equivalence = expected_body actual_body))))) + (and (at n.equivalence = expected_offset actual_offset) + (at (list.equivalence bit.equivalence) = + expected_inits + actual_inits) + (at text.equivalence = expected_body actual_body))))) (|> (/.result (/.loop (<>.many /.bit) /.text) (list (synthesis.text expected_body))) (!expect (^.multi {try.#Failure error} @@ -166,23 +166,23 @@ (_.for [/.Parser]) (all _.and (do [! random.monad] - [expected (# ! each (|>> synthesis.i64) random.i64)] + [expected (at ! each (|>> synthesis.i64) random.i64)] (_.coverage [/.result /.any] (|> (/.result /.any (list expected)) (!expect (^.multi {try.#Success actual} - (# synthesis.equivalence = expected actual)))))) + (at synthesis.equivalence = expected actual)))))) (_.coverage [/.empty_input] (|> (/.result /.any (list)) (!expect (^.multi {try.#Failure error} (exception.match? /.empty_input error))))) (do [! random.monad] - [expected (# ! each (|>> synthesis.i64) random.i64)] + [expected (at ! each (|>> synthesis.i64) random.i64)] (_.coverage [/.unconsumed_input] (|> (/.result /.any (list expected expected)) (!expect (^.multi {try.#Failure error} (exception.match? /.unconsumed_input error)))))) (do [! random.monad] - [dummy (# ! each (|>> synthesis.i64) random.i64)] + [dummy (at ! each (|>> synthesis.i64) random.i64)] (_.coverage [/.end /.expected_empty_input] (and (|> (/.result /.end (list)) (!expect {try.#Success _})) @@ -190,7 +190,7 @@ (!expect (^.multi {try.#Failure error} (exception.match? /.expected_empty_input error))))))) (do [! random.monad] - [dummy (# ! each (|>> synthesis.i64) random.i64)] + [dummy (at ! each (|>> synthesis.i64) random.i64)] (_.coverage [/.end?] (and (|> (/.result /.end? (list)) (!expect {try.#Success #1})) diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux index af56ad878..55a334421 100644 --- a/stdlib/source/test/lux/control/parser/text.lux +++ b/stdlib/source/test/lux/control/parser/text.lux @@ -62,7 +62,7 @@ (-> Text (/.Parser Text) Bit) (|> expected (/.result parser) - (# try.functor each (text#= expected)) + (at try.functor each (text#= expected)) (try.else false))) (def: (should_pass! expected parser) @@ -73,13 +73,13 @@ Test (all _.and (do [! random.monad] - [offset (# ! each (n.% 50) random.nat) - range (# ! each (|>> (n.% 50) (n.+ 10)) random.nat) + [offset (at ! each (n.% 50) random.nat) + range (at ! each (|>> (n.% 50) (n.+ 10)) random.nat) .let [limit (n.+ offset range)] - expected (# ! each (|>> (n.% range) (n.+ offset) text.of_char) random.nat) + expected (at ! each (|>> (n.% range) (n.+ offset) text.of_char) random.nat) out_of_range (case offset - 0 (# ! each (|>> (n.% 10) ++ (n.+ limit) text.of_char) random.nat) - _ (# ! each (|>> (n.% offset) text.of_char) random.nat))] + 0 (at ! each (|>> (n.% 10) ++ (n.+ limit) text.of_char) random.nat) + _ (at ! each (|>> (n.% offset) text.of_char) random.nat))] (_.coverage [/.range] (and (..should_pass expected (/.range offset limit)) (..should_fail out_of_range (/.range offset limit))))) @@ -98,22 +98,22 @@ (and (..should_pass (text.of_char expected) /.lower) (..should_fail (text.of_char invalid) /.lower)))) (do [! random.monad] - [expected (# ! each (n.% 10) random.nat) + [expected (at ! each (n.% 10) random.nat) invalid (random.char (unicode.set [unicode/block.number_forms (list)]))] (_.coverage [/.decimal] - (and (..should_pass (# n.decimal encoded expected) /.decimal) + (and (..should_pass (at n.decimal encoded expected) /.decimal) (..should_fail (text.of_char invalid) /.decimal)))) (do [! random.monad] - [expected (# ! each (n.% 8) random.nat) + [expected (at ! each (n.% 8) random.nat) invalid (random.char (unicode.set [unicode/block.number_forms (list)]))] (_.coverage [/.octal] - (and (..should_pass (# n.octal encoded expected) /.octal) + (and (..should_pass (at n.octal encoded expected) /.octal) (..should_fail (text.of_char invalid) /.octal)))) (do [! random.monad] - [expected (# ! each (n.% 16) random.nat) + [expected (at ! each (n.% 16) random.nat) invalid (random.char (unicode.set [unicode/block.number_forms (list)]))] (_.coverage [/.hexadecimal] - (and (..should_pass (# n.hex encoded expected) /.hexadecimal) + (and (..should_pass (at n.hex encoded expected) /.hexadecimal) (..should_fail (text.of_char invalid) /.hexadecimal)))) (do [! random.monad] [expected (random.char unicode.alphabetic) @@ -156,14 +156,14 @@ [.let [num_options 3] options (|> (random.char unicode.character) (random.set n.hash num_options) - (# ! each (|>> set.list - (list#each text.of_char) - text.together))) - expected (# ! each (function (_ value) - (|> options - (text.char (n.% num_options value)) - maybe.trusted)) - random.nat) + (at ! each (|>> set.list + (list#each text.of_char) + text.together))) + expected (at ! each (function (_ value) + (|> options + (text.char (n.% num_options value)) + maybe.trusted)) + random.nat) invalid (random.only (function (_ char) (not (text.contains? (text.of_char char) options))) (random.char unicode.character))] @@ -182,14 +182,14 @@ [.let [num_options 3] options (|> (random.char unicode.character) (random.set n.hash num_options) - (# ! each (|>> set.list - (list#each text.of_char) - text.together))) - invalid (# ! each (function (_ value) - (|> options - (text.char (n.% num_options value)) - maybe.trusted)) - random.nat) + (at ! each (|>> set.list + (list#each text.of_char) + text.together))) + invalid (at ! each (function (_ value) + (|> options + (text.char (n.% num_options value)) + maybe.trusted)) + random.nat) expected (random.only (function (_ char) (not (text.contains? (text.of_char char) options))) (random.char unicode.character))] @@ -211,26 +211,26 @@ (let [octal! (/.one_of! "01234567")] (all _.and (do [! random.monad] - [left (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat) - right (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat) + [left (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat) + right (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat) .let [expected (format left right)] invalid (|> random.nat - (# ! each (n.% 16)) + (at ! each (n.% 16)) (random.only (n.>= 8)) - (# ! each (# n.hex encoded)))] + (at ! each (at n.hex encoded)))] (_.coverage [/.many /.many!] (and (..should_pass expected (/.many /.octal)) (..should_fail invalid (/.many /.octal)) (..should_pass! expected (/.many! octal!))))) (do [! random.monad] - [left (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat) - right (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat) + [left (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat) + right (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat) .let [expected (format left right)] invalid (|> random.nat - (# ! each (n.% 16)) + (at ! each (n.% 16)) (random.only (n.>= 8)) - (# ! each (# n.hex encoded)))] + (at ! each (at n.hex encoded)))] (_.coverage [/.some /.some!] (and (..should_pass expected (/.some /.octal)) (..should_pass "" (/.some /.octal)) @@ -239,7 +239,7 @@ (..should_pass! expected (/.some! octal!)) (..should_pass! "" (/.some! octal!))))) (do [! random.monad] - [.let [octal (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat)] + [.let [octal (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat)] first octal second octal third octal] @@ -252,7 +252,7 @@ (..should_fail (format first second third) (/.exactly! 2 octal!)) (..should_fail (format first) (/.exactly! 2 octal!))))) (do [! random.monad] - [.let [octal (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat)] + [.let [octal (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat)] first octal second octal third octal] @@ -265,7 +265,7 @@ (..should_pass! (format first) (/.at_most! 2 octal!)) (..should_fail (format first second third) (/.at_most! 2 octal!))))) (do [! random.monad] - [.let [octal (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat)] + [.let [octal (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat)] first octal second octal third octal] @@ -278,7 +278,7 @@ (..should_pass! (format first second third) (/.at_least! 2 octal!)) (..should_fail (format first) (/.at_least! 2 octal!))))) (do [! random.monad] - [.let [octal (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat)] + [.let [octal (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat)] first octal second octal third octal] @@ -390,7 +390,7 @@ (/.this output))) (!expect {try.#Success _})))) (do [! random.monad] - [expected (# ! each (|>> (n.% 8) (# n.octal encoded)) random.nat)] + [expected (at ! each (|>> (n.% 8) (at n.octal encoded)) random.nat)] (_.coverage [/.then] (|> (list (code.text expected)) (<c>.result (/.then /.octal <c>.text)) diff --git a/stdlib/source/test/lux/control/parser/type.lux b/stdlib/source/test/lux/control/parser/type.lux index 779c63cd2..2d871bdef 100644 --- a/stdlib/source/test/lux/control/parser/type.lux +++ b/stdlib/source/test/lux/control/parser/type.lux @@ -36,8 +36,8 @@ (def: primitive (Random Type) (|> (random.alpha_numeric 1) - (# random.monad each (function (_ name) - {.#Primitive name (list)})))) + (at random.monad each (function (_ name) + {.#Primitive name (list)})))) (def: test|matches Test @@ -144,14 +144,14 @@ (/.with_extension argument) /.any) not_parameter) - (!expect (^.multi {try.#Success [quantification##binding argument##binding actual]} + (!expect (^.multi {try.#Success [quantification::binding argument::binding actual]} (same? not_parameter actual))))) (_.coverage [/.parameter] (|> (/.result (<| (/.with_extension quantification) (/.with_extension argument) /.parameter) {.#Parameter 0}) - (!expect {try.#Success [quantification##binding argument##binding _]}))) + (!expect {try.#Success [quantification::binding argument::binding _]}))) (_.coverage [/.argument] (let [argument? (is (-> Nat Nat Bit) (function (_ @ expected) @@ -181,14 +181,14 @@ (/.with_extension argument) (/.this_parameter 0)) {.#Parameter 0}) - (!expect {try.#Success [quantification##binding argument##binding _]}))) + (!expect {try.#Success [quantification::binding argument::binding _]}))) ))) (def: test|polymorphic Test (do [! random.monad] [not_polymorphic ..primitive - expected_inputs (# ! each (|>> (n.% 10) ++) random.nat)] + expected_inputs (at ! each (|>> (n.% 10) ++) random.nat)] (all _.and (_.coverage [/.not_polymorphic] (and (|> (/.result (/.polymorphic /.any) diff --git a/stdlib/source/test/lux/control/parser/xml.lux b/stdlib/source/test/lux/control/parser/xml.lux index 95e6c3713..57833948e 100644 --- a/stdlib/source/test/lux/control/parser/xml.lux +++ b/stdlib/source/test/lux/control/parser/xml.lux @@ -71,7 +71,7 @@ [[(//#in expected) {xml.#Text expected}]]) (do [! random.monad] - [expected (# ! each (|>> {xml.#Text}) (random.alphabetic 1))] + [expected (at ! each (|>> {xml.#Text}) (random.alphabetic 1))] (_.coverage [/.any] (|> (/.result /.any (list expected)) (try#each (xml#= expected)) @@ -161,7 +161,7 @@ (//#in [])) _ (//.some /.any)] (in [])))] - repetitions (# ! each (n.% 10) random.nat)] + repetitions (at ! each (n.% 10) random.nat)] (all _.and (_.coverage [/.somewhere] (|> (/.result parser diff --git a/stdlib/source/test/lux/control/region.lux b/stdlib/source/test/lux/control/region.lux index 458c74381..258436915 100644 --- a/stdlib/source/test/lux/control/region.lux +++ b/stdlib/source/test/lux/control/region.lux @@ -81,7 +81,7 @@ (<| (_.covering /._) (_.for [/.Region]) (do [! random.monad] - [expected_clean_ups (|> random.nat (# ! each (|>> (n.% 100) (n.max 1))))] + [expected_clean_ups (|> random.nat (at ! each (|>> (n.% 100) (n.max 1))))] (all _.and (_.for [/.functor] ($functor.spec ..injection ..comparison (is (All (_ ! r) diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux index efd4a029c..8e188702b 100644 --- a/stdlib/source/test/lux/control/security/policy.lux +++ b/stdlib/source/test/lux/control/security/policy.lux @@ -61,7 +61,7 @@ (%#can_downgrade sample))))) (def: hash (|>> %#can_downgrade - (# text.hash hash))))) + (at text.hash hash))))) (def: password %#can_upgrade) @@ -77,24 +77,24 @@ (do random.monad [.let [policy_0 (policy [])] raw_password (random.ascii 10) - .let [password (# policy_0 password raw_password)]] + .let [password (at policy_0 password raw_password)]] (all _.and (_.for [/.Privacy /.Private /.Can_Conceal /.Can_Reveal /.Safety /.Safe /.Can_Trust /.Can_Distrust] (all _.and (_.for [/.functor] - ($functor.spec (..injection (# policy_0 #can_upgrade)) (..comparison (# policy_0 #can_downgrade)) /.functor)) + ($functor.spec (..injection (at policy_0 #can_upgrade)) (..comparison (at policy_0 #can_downgrade)) /.functor)) (_.for [/.apply] - ($apply.spec (..injection (# policy_0 #can_upgrade)) (..comparison (# policy_0 #can_downgrade)) /.apply)) + ($apply.spec (..injection (at policy_0 #can_upgrade)) (..comparison (at policy_0 #can_downgrade)) /.apply)) (_.for [/.monad] - ($monad.spec (..injection (# policy_0 #can_upgrade)) (..comparison (# policy_0 #can_downgrade)) /.monad)))) + ($monad.spec (..injection (at policy_0 #can_upgrade)) (..comparison (at policy_0 #can_downgrade)) /.monad)))) (_.coverage [/.Privilege /.Context /.with_policy] - (and (# policy_0 = password password) - (n.= (# text.hash hash raw_password) - (# policy_0 hash password)))) + (and (at policy_0 = password password) + (n.= (at text.hash hash raw_password) + (at policy_0 hash password)))) (let [policy_1 (policy []) - delegate (/.delegation (# policy_0 #can_downgrade) (# policy_1 #can_upgrade))] + delegate (/.delegation (at policy_0 #can_downgrade) (at policy_1 #can_upgrade))] (_.coverage [/.Delegation /.delegation] - (# policy_1 = (delegate password) (delegate password)))) + (at policy_1 = (delegate password) (delegate password)))) )))) diff --git a/stdlib/source/test/lux/control/state.lux b/stdlib/source/test/lux/control/state.lux index 8fa9abe69..81c10a970 100644 --- a/stdlib/source/test/lux/control/state.lux +++ b/stdlib/source/test/lux/control/state.lux @@ -81,7 +81,7 @@ (def: loops Test (do [! random.monad] - [limit (|> random.nat (# ! each (n.% 10))) + [limit (|> random.nat (at ! each (n.% 10))) .let [condition (do /.monad [state /.get] (in (n.< limit state)))]] diff --git a/stdlib/source/test/lux/control/thread.lux b/stdlib/source/test/lux/control/thread.lux index a4c2622dc..7d7e9ae43 100644 --- a/stdlib/source/test/lux/control/thread.lux +++ b/stdlib/source/test/lux/control/thread.lux @@ -19,7 +19,7 @@ (def: (injection value) (Injection (All (_ a !) (Thread ! a))) - (# /.monad in value)) + (at /.monad in value)) (def: comparison (Comparison (All (_ a !) (Thread ! a))) @@ -38,12 +38,12 @@ (_.coverage [/.result] (n.= sample (|> sample - (# /.monad in) + (at /.monad in) /.result))) (_.coverage [/.io] (n.= sample (|> sample - (# /.monad in) + (at /.monad in) /.io io.run!))) diff --git a/stdlib/source/test/lux/control/try.lux b/stdlib/source/test/lux/control/try.lux index 043890c39..d448bedc2 100644 --- a/stdlib/source/test/lux/control/try.lux +++ b/stdlib/source/test/lux/control/try.lux @@ -28,7 +28,7 @@ (def: comparison (Comparison Try) (function (_ ==) - (# (/.equivalence ==) =))) + (at (/.equivalence ==) =))) (def: .public (attempt element) (All (_ a) (-> (Random a) (Random (Try a)))) diff --git a/stdlib/source/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux index 78d475ce1..986ffa366 100644 --- a/stdlib/source/test/lux/control/writer.lux +++ b/stdlib/source/test/lux/control/writer.lux @@ -24,7 +24,7 @@ (def: (injection monoid value) (All (_ w) (-> (Monoid w) (Injection (Writer w)))) - [(# monoid identity) value]) + [(at monoid identity) value]) (def: comparison (All (_ w) (Comparison (Writer w))) diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux index 15df63e2e..b0eea56fa 100644 --- a/stdlib/source/test/lux/data/binary.lux +++ b/stdlib/source/test/lux/data/binary.lux @@ -44,7 +44,7 @@ [byte random.nat] (exec (try.trusted (/.has_8! idx byte output)) (again (++ idx)))) - (# random.monad in output))))) + (at random.monad in output))))) (def: (throws? exception try) (All (_ e a) (-> (Exception e) (Try a) Bit)) @@ -84,13 +84,13 @@ (<| (_.covering !._) (_.for [!.Binary]) (do [! random.monad] - [.let [gen_size (|> random.nat (# ! each (|>> (n.% 100) (n.max 8))))] + [.let [gen_size (|> random.nat (at ! each (|>> (n.% 100) (n.max 8))))] size gen_size sample (..random size) value random.nat - .let [gen_idx (|> random.nat (# ! each (n.% size)))] + .let [gen_idx (|> random.nat (at ! each (n.% size)))] offset gen_idx - length (# ! each (n.% (n.- offset size)) random.nat)] + length (at ! each (n.% (n.- offset size)) random.nat)] (`` (all _.and (_.for [!.=] ($equivalence.spec (function (_ left right) @@ -128,9 +128,9 @@ reader (function (_ binary idx) (!.bits_8 idx binary))] (and (n.= length (!.size random_slice)) - (# (list.equivalence n.equivalence) = - (list#each (|>> (n.+ offset) (reader sample)) idxs) - (list#each (reader random_slice) idxs))))) + (at (list.equivalence n.equivalence) = + (list#each (|>> (n.+ offset) (reader sample)) idxs) + (list#each (reader random_slice) idxs))))) (_.coverage [!.copy!] (and (let [it (!.copy! size 0 sample 0 (!.empty size))] (and (not (same? sample it)) @@ -148,26 +148,26 @@ (<| (_.covering /._) (_.for [/.Binary]) (do [! random.monad] - [.let [gen_size (|> random.nat (# ! each (|>> (n.% 100) (n.max 8))))] + [.let [gen_size (|> random.nat (at ! each (|>> (n.% 100) (n.max 8))))] size gen_size sample (..random size) value random.nat - .let [gen_idx (|> random.nat (# ! each (n.% size)))] - offset (# ! each (n.max 1) gen_idx) - length (# ! each (n.% (n.- offset size)) random.nat)] + .let [gen_idx (|> random.nat (at ! each (n.% size)))] + offset (at ! each (n.max 1) gen_idx) + length (at ! each (n.% (n.- offset size)) random.nat)] (all _.and (_.for [/.equivalence] ($equivalence.spec /.equivalence (..random size))) (_.for [/.monoid] ($monoid.spec /.equivalence /.monoid (..random size))) (_.coverage [/.mix] - (n.= (# list.mix mix n.+ 0 (..as_list sample)) + (n.= (at list.mix mix n.+ 0 (..as_list sample)) (/.mix n.+ 0 sample))) (_.coverage [/.empty] - (# /.equivalence = - (/.empty size) - (/.empty size))) + (at /.equivalence = + (/.empty size) + (/.empty size))) (_.coverage [/.size] (|> (/.empty size) /.size (n.= size))) (_.for [/.index_out_of_bounds] @@ -192,7 +192,7 @@ (case [(monad.each try.monad (|>> (n.+ offset) (reader sample)) idxs) (monad.each try.monad (reader random_slice) idxs)] [{try.#Success binary_vals} {try.#Success slice_vals}] - (# (list.equivalence n.equivalence) = binary_vals slice_vals) + (at (list.equivalence n.equivalence) = binary_vals slice_vals) _ #0)))) @@ -203,8 +203,8 @@ 0 (not verdict) _ verdict)))) (_.coverage [/.after] - (and (# /.equivalence = sample (/.after 0 sample)) - (# /.equivalence = (/.empty 0) (/.after size sample)) + (and (at /.equivalence = sample (/.after 0 sample)) + (at /.equivalence = (/.empty 0) (/.after size sample)) (n.= (n.- offset size) (/.size (/.after offset sample))) (case (list.reversed (..as_list sample)) {.#End} @@ -217,7 +217,7 @@ (and (case (/.copy! size 0 sample 0 (/.empty size)) {try.#Success output} (and (not (same? sample output)) - (# /.equivalence = sample output)) + (at /.equivalence = sample output)) {try.#Failure _} false) diff --git a/stdlib/source/test/lux/data/bit.lux b/stdlib/source/test/lux/data/bit.lux index 3ce9f5223..868c673f6 100644 --- a/stdlib/source/test/lux/data/bit.lux +++ b/stdlib/source/test/lux/data/bit.lux @@ -34,12 +34,12 @@ ($codec.spec /.equivalence /.codec random.bit)) (_.coverage [/.no /.yes] - (and (# /.equivalence = false /.no) - (# /.equivalence = true /.yes))) + (and (at /.equivalence = false /.no) + (at /.equivalence = true /.yes))) (_.coverage [/.off /.on] - (and (# /.equivalence = false /.off) - (# /.equivalence = true /.on))) + (and (at /.equivalence = false /.off) + (at /.equivalence = true /.on))) (_.coverage [/.complement] - (and (not (# /.equivalence = value ((/.complement function.identity) value))) - (# /.equivalence = value ((/.complement not) value)))) + (and (not (at /.equivalence = value ((/.complement function.identity) value))) + (at /.equivalence = value ((/.complement not) value)))) )))) diff --git a/stdlib/source/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux index ee06a8073..d62e20981 100644 --- a/stdlib/source/test/lux/data/collection/array.lux +++ b/stdlib/source/test/lux/data/collection/array.lux @@ -34,8 +34,8 @@ (def: bounded_size (Random Nat) - (# random.monad each (|>> (n.% 20) ++) - random.nat)) + (at random.monad each (|>> (n.% 20) ++) + random.nat)) (def: structures Test @@ -66,11 +66,11 @@ choose (is (-> Nat (Maybe Text)) (function (_ value) (if (n.even? value) - {.#Some (# n.decimal encoded value)} + {.#Some (at n.decimal encoded value)} {.#None})))] (_.coverage [/.one] (case [(|> evens - (/#each (# n.decimal encoded)) + (/#each (at n.decimal encoded)) (/.item 0)) (/.one choose evens)] [{.#Some expected} {.#Some actual}] @@ -82,9 +82,9 @@ _ false))) (_.coverage [/.example] - (# (maybe.equivalence n.equivalence) = - (/.example n.even? the_array) - (list.example n.even? (/.list {.#None} the_array)))) + (at (maybe.equivalence n.equivalence) = + (/.example n.even? the_array) + (list.example n.even? (/.list {.#None} the_array)))) (_.coverage [/.example'] (case [(/.example n.even? the_array) (/.example' (function (_ idx member) @@ -105,13 +105,13 @@ _ false)) (_.coverage [/.every?] - (# bit.equivalence = - (list.every? n.even? (/.list {.#None} the_array)) - (/.every? n.even? the_array))) + (at bit.equivalence = + (list.every? n.even? (/.list {.#None} the_array)) + (/.every? n.even? the_array))) (_.coverage [/.any?] - (# bit.equivalence = - (list.any? n.even? (/.list {.#None} the_array)) - (/.any? n.even? the_array))) + (at bit.equivalence = + (list.any? n.even? (/.list {.#None} the_array)) + (/.any? n.even? the_array))) ))) (def: test|unsafe @@ -209,7 +209,7 @@ (and (n.= expected (!.item 0 the_array)) (n.= expected (!.item 1 the_array))))) (do ! - [occupancy (# ! each (n.% (++ size)) random.nat)] + [occupancy (at ! each (n.% (++ size)) random.nat)] (_.coverage [!.occupancy !.vacancy] (let [the_array (loop (again [output (is (Array Nat) (!.empty size)) @@ -231,7 +231,7 @@ random.nat)] (_.coverage [!.of_list !.list] (and (|> the_list !.of_list (!.list {.#None}) - (# (list.equivalence n.equivalence) = the_list)) + (at (list.equivalence n.equivalence) = the_list)) (|> the_array (!.list {.#None}) !.of_list (!.= n.equivalence the_array)) (exec @@ -241,14 +241,14 @@ (same? default value))) (!.list {.#Some default} the_array)))))) (do ! - [amount (# ! each (n.% (++ size)) random.nat)] + [amount (at ! each (n.% (++ size)) random.nat)] (_.coverage [!.copy!] (let [copy (is (Array Nat) (!.empty size))] (exec (!.copy! amount 0 the_array 0 copy) - (# (list.equivalence n.equivalence) = - (list.first amount (!.list {.#None} the_array)) - (!.list {.#None} copy)))))) + (at (list.equivalence n.equivalence) = + (list.first amount (!.list {.#None} the_array)) + (!.list {.#None} copy)))))) (_.coverage [!.clone] (let [clone (!.clone the_array)] (and (not (same? the_array clone)) @@ -262,23 +262,23 @@ (n.= (list.size odds) (!.vacancy the_array)) (|> the_array (!.list {.#None}) - (# (list.equivalence n.equivalence) = evens)))))) + (at (list.equivalence n.equivalence) = evens)))))) (let [choose (is (-> Nat (Maybe Text)) (function (_ value) (if (n.even? value) - {.#Some (# n.decimal encoded value)} + {.#Some (at n.decimal encoded value)} {.#None})))] (_.coverage [!.one] (|> evens (!.one choose) (maybe#each (text#= (|> evens - (!.each (# n.decimal encoded)) + (!.each (at n.decimal encoded)) (!.item 0)))) (maybe.else false)))) (_.coverage [!.example] - (# (maybe.equivalence n.equivalence) = - (!.example n.even? the_array) - (list.example n.even? (!.list {.#None} the_array)))) + (at (maybe.equivalence n.equivalence) = + (!.example n.even? the_array) + (list.example n.even? (!.list {.#None} the_array)))) (_.coverage [!.example'] (case [(!.example n.even? the_array) (!.example' (function (_ idx member) @@ -295,13 +295,13 @@ _ false)) (_.coverage [!.every?] - (# bit.equivalence = - (list.every? n.even? (!.list {.#None} the_array)) - (!.every? n.even? the_array))) + (at bit.equivalence = + (list.every? n.even? (!.list {.#None} the_array)) + (!.every? n.even? the_array))) (_.coverage [!.any?] - (# bit.equivalence = - (list.any? n.even? (!.list {.#None} the_array)) - (!.any? n.even? the_array))) + (at bit.equivalence = + (list.any? n.even? (!.list {.#None} the_array)) + (!.any? n.even? the_array))) ))))) (def: .public test @@ -392,7 +392,7 @@ _ false))) (do ! - [occupancy (# ! each (n.% (++ size)) random.nat)] + [occupancy (at ! each (n.% (++ size)) random.nat)] (_.coverage [/.occupancy /.vacancy] (let [the_array (loop (again [output (is (Array Nat) (/.empty size)) @@ -414,9 +414,9 @@ random.nat)] (_.coverage [/.of_list /.list] (and (|> the_list /.of_list (/.list {.#None}) - (# (list.equivalence n.equivalence) = the_list)) + (at (list.equivalence n.equivalence) = the_list)) (|> the_array (/.list {.#None}) /.of_list - (# (/.equivalence n.equivalence) = the_array)) + (at (/.equivalence n.equivalence) = the_array)) (exec (/.only! n.even? the_array) (list.every? (function (_ value) @@ -424,18 +424,18 @@ (same? default value))) (/.list {.#Some default} the_array)))))) (do ! - [amount (# ! each (n.% (++ size)) random.nat)] + [amount (at ! each (n.% (++ size)) random.nat)] (_.coverage [/.copy!] (let [copy (is (Array Nat) (/.empty size))] (exec (/.copy! amount 0 the_array 0 copy) - (# (list.equivalence n.equivalence) = - (list.first amount (/.list {.#None} the_array)) - (/.list {.#None} copy)))))) + (at (list.equivalence n.equivalence) = + (list.first amount (/.list {.#None} the_array)) + (/.list {.#None} copy)))))) (_.coverage [/.clone] (let [clone (/.clone the_array)] (and (not (same? the_array clone)) - (# (/.equivalence n.equivalence) = the_array clone)))) + (at (/.equivalence n.equivalence) = the_array clone)))) (let [the_array (/.clone the_array) evens (|> the_array (/.list {.#None}) (list.only n.even?)) odds (|> the_array (/.list {.#None}) (list.only n.odd?))] @@ -443,7 +443,7 @@ (exec (/.only! n.even? the_array) (and (n.= (list.size evens) (/.occupancy the_array)) (n.= (list.size odds) (/.vacancy the_array)) - (|> the_array (/.list {.#None}) (# (list.equivalence n.equivalence) = evens)))))) + (|> the_array (/.list {.#None}) (at (list.equivalence n.equivalence) = evens)))))) ..test|unsafe )))) diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux index b03ccee8c..72bd8a31f 100644 --- a/stdlib/source/test/lux/data/collection/bits.lux +++ b/stdlib/source/test/lux/data/collection/bits.lux @@ -17,16 +17,16 @@ (def: (size min max) (-> Nat Nat (Random Nat)) (|> random.nat - (# random.monad each (|>> (n.% (++ max)) (n.max min))))) + (at random.monad each (|>> (n.% (++ max)) (n.max min))))) (def: .public random (Random Bits) (do [! random.monad] - [size (# ! each (n.% 1,000) random.nat)] + [size (at ! each (n.% 1,000) random.nat)] (case size 0 (in /.empty) _ (do [! random.monad] - [idx (|> random.nat (# ! each (n.% size)))] + [idx (|> random.nat (at ! each (n.% size)))] (in (/.one idx /.empty)))))) (def: .public test @@ -47,8 +47,8 @@ (/.empty? /.empty)) (do [! random.monad] - [size (# ! each (|>> (n.% 1,000) ++) random.nat) - idx (# ! each (n.% size) random.nat) + [size (at ! each (|>> (n.% 1,000) ++) random.nat) + idx (at ! each (n.% size) random.nat) sample ..random] (all _.and (_.coverage [/.bit /.one] @@ -79,17 +79,17 @@ (_.coverage [/.not] (and (same? /.empty (/.not /.empty)) (or (same? /.empty sample) - (and (not (# /.equivalence = sample (/.not sample))) - (# /.equivalence = sample (/.not (/.not sample))))))) + (and (not (at /.equivalence = sample (/.not sample))) + (at /.equivalence = sample (/.not (/.not sample))))))) (_.coverage [/.xor] (and (same? /.empty (/.xor sample sample)) (n.= (/.size (/.xor sample (/.not sample))) (/.capacity sample)))) (_.coverage [/.or] - (and (# /.equivalence = sample (/.or sample sample)) + (and (at /.equivalence = sample (/.or sample sample)) (n.= (/.size (/.or sample (/.not sample))) (/.capacity sample)))) (_.coverage [/.and] - (and (# /.equivalence = sample (/.and sample sample)) + (and (at /.equivalence = sample (/.and sample sample)) (same? /.empty (/.and sample (/.not sample))))) ))))) diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux index 11a4da3cb..f5c0b4c9d 100644 --- a/stdlib/source/test/lux/data/collection/dictionary.lux +++ b/stdlib/source/test/lux/data/collection/dictionary.lux @@ -31,7 +31,7 @@ (def: for_dictionaries Test (do [! random.monad] - [.let [capped_nat (# random.monad each (n.% 100) random.nat)] + [.let [capped_nat (at random.monad each (n.% 100) random.nat)] size capped_nat dict (random.dictionary n.hash size random.nat capped_nat) non_key (random.only (|>> (/.key? dict) not) @@ -133,7 +133,7 @@ (def: for_entries Test (do random.monad - [.let [capped_nat (# random.monad each (n.% 100) random.nat)] + [.let [capped_nat (at random.monad each (n.% 100) random.nat)] size capped_nat dict (random.dictionary n.hash size random.nat capped_nat) non_key (random.only (|>> (/.key? dict) not) @@ -253,7 +253,7 @@ (<| (_.covering /._) (_.for [/.Dictionary]) (do random.monad - [.let [capped_nat (# random.monad each (n.% 100) random.nat)] + [.let [capped_nat (at random.monad each (n.% 100) random.nat)] size capped_nat dict (random.dictionary n.hash size random.nat capped_nat) non_key (random.only (|>> (/.key? dict) not) diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux index 75e7a36e2..19454582a 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux @@ -43,7 +43,7 @@ (<| (_.covering /._) (_.for [/.Dictionary]) (do [! random.monad] - [size (# ! each (n.% 100) random.nat) + [size (at ! each (n.% 100) random.nat) keys (random.set n.hash size random.nat) values (random.set n.hash size random.nat) extra_key (random.only (|>> (set.member? keys) not) diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux index 252ca9f85..7cd9ad3aa 100644 --- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux +++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux @@ -36,7 +36,7 @@ (_.for [/.PList]) (do [! random.monad] [.let [gen_key (random.alphabetic 10)] - size (# ! each (n.% 100) random.nat) + size (at ! each (n.% 100) random.nat) sample (..random size gen_key random.nat) .let [keys (|> sample /.keys (set.of_list text.hash))] @@ -61,10 +61,10 @@ (_.coverage [/.empty] (/.empty? /.empty)) (_.coverage [/.keys /.values] - (# (/.equivalence n.equivalence) = - sample - (list.zipped_2 (/.keys sample) - (/.values sample)))) + (at (/.equivalence n.equivalence) = + sample + (list.zipped_2 (/.keys sample) + (/.values sample)))) (_.coverage [/.contains?] (and (list.every? (function (_ key) (/.contains? key sample)) @@ -93,5 +93,5 @@ (|> sample (/.has extra_key extra_value) (/.lacks extra_key) - (# (/.equivalence n.equivalence) = sample))) + (at (/.equivalence n.equivalence) = sample))) )))) diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux index 81e8d76dc..3e05ec3f4 100644 --- a/stdlib/source/test/lux/data/collection/list.lux +++ b/stdlib/source/test/lux/data/collection/list.lux @@ -34,8 +34,8 @@ (def: bounded_size (Random Nat) - (# random.monad each (n.% 100) - random.nat)) + (at random.monad each (n.% 100) + random.nat)) (def: random (Random (List Nat)) @@ -43,7 +43,7 @@ [size ..bounded_size] (|> random.nat (random.set n.hash size) - (# ! each set.list)))) + (at ! each set.list)))) (def: signatures Test @@ -52,7 +52,7 @@ ($equivalence.spec (/.equivalence n.equivalence) ..random)) (_.for [/.hash] (|> random.nat - (# random.monad each (|>> list)) + (at random.monad each (|>> list)) ($hash.spec (/.hash n.hash)))) (_.for [/.monoid] ($monoid.spec (/.equivalence n.equivalence) /.monoid ..random)) @@ -89,14 +89,14 @@ (do [! random.monad] [size ..bounded_size .let [(open "/#[0]") (/.equivalence n.equivalence)] - sample (# ! each set.list (random.set n.hash size random.nat))] + sample (at ! each set.list (random.set n.hash size random.nat))] (all _.and (_.coverage [/.size] (n.= size (/.size sample))) (_.coverage [/.empty?] - (# bit.equivalence = - (/.empty? sample) - (n.= 0 (/.size sample)))) + (at bit.equivalence = + (/.empty? sample) + (n.= 0 (/.size sample)))) (_.coverage [/.repeated] (n.= size (/.size (/.repeated size [])))) (_.coverage [/.reversed] @@ -178,7 +178,7 @@ (do ! [index (case size 0 random.nat - _ (# ! each (n.% size) random.nat)) + _ (at ! each (n.% size) random.nat)) .let [changed? (/#= sample (/.revised index ++ sample)) same? (/#= sample (/.revised size ++ sample))]] (_.coverage [/.revised] @@ -196,8 +196,8 @@ [sample (random.only (|>> /.size (n.> 0)) ..random) .let [size (/.size sample)] - idx (# ! each (n.% size) random.nat) - sub_size (# ! each (|>> (n.% size) ++) random.nat)] + idx (at ! each (n.% size) random.nat) + sub_size (at ! each (|>> (n.% size) ++) random.nat)] (all _.and (_.coverage [/.only] (let [positives (/.only n.even? sample) @@ -341,12 +341,12 @@ (and size_of_smaller_list! can_extract_values!))) (_.coverage [/.zipped] - (and (# (/.equivalence (product.equivalence n.equivalence n.equivalence)) = - (/.zipped_2 sample/0 sample/1) - ((/.zipped 2) sample/0 sample/1)) - (# (/.equivalence (all product.equivalence n.equivalence n.equivalence n.equivalence)) = - (/.zipped_3 sample/0 sample/1 sample/2) - ((/.zipped 3) sample/0 sample/1 sample/2)))) + (and (at (/.equivalence (product.equivalence n.equivalence n.equivalence)) = + (/.zipped_2 sample/0 sample/1) + ((/.zipped 2) sample/0 sample/1)) + (at (/.equivalence (all product.equivalence n.equivalence n.equivalence n.equivalence)) = + (/.zipped_3 sample/0 sample/1 sample/2) + ((/.zipped 3) sample/0 sample/1 sample/2)))) (_.coverage [/.zipped_with_2] (/#= (/#each (function (_ [left right]) @@ -377,7 +377,7 @@ choice (is (-> Nat (Maybe Text)) (function (_ value) (if (n.even? value) - {.#Some (# n.decimal encoded value)} + {.#Some (at n.decimal encoded value)} {.#None})))] (do [! random.monad] [sample ..random] @@ -385,7 +385,7 @@ (_.coverage [/.one] (case [(|> sample (/.only n.even?) - (/#each (# n.decimal encoded)) + (/#each (at n.decimal encoded)) /.head) (/.one choice sample)] [{.#Some expected} {.#Some actual}] @@ -397,11 +397,11 @@ _ false)) (_.coverage [/.all] - (# (/.equivalence text.equivalence) = - (|> sample - (/.only n.even?) - (/#each (# n.decimal encoded))) - (/.all choice sample))) + (at (/.equivalence text.equivalence) = + (|> sample + (/.only n.even?) + (/#each (at n.decimal encoded))) + (/.all choice sample))) (_.coverage [/.example] (case (/.example n.even? sample) {.#Some found} @@ -449,7 +449,7 @@ 0))))) (_.coverage [/.mixes] (/#= (/#each (function (_ index) - (# /.mix mix n.+ 0 (/.first index sample))) + (at /.mix mix n.+ 0 (/.first index sample))) (/.indices (++ (/.size sample)))) (/.mixes n.+ 0 sample))) (do random.monad diff --git a/stdlib/source/test/lux/data/collection/queue.lux b/stdlib/source/test/lux/data/collection/queue.lux index a67697de2..460c64618 100644 --- a/stdlib/source/test/lux/data/collection/queue.lux +++ b/stdlib/source/test/lux/data/collection/queue.lux @@ -28,7 +28,7 @@ (<| (_.covering /._) (_.for [/.Queue]) (do [! random.monad] - [size (# ! each (n.% 100) random.nat) + [size (at ! each (n.% 100) random.nat) members (random.set n.hash size random.nat) non_member (random.only (|>> (set.member? members) not) random.nat) @@ -42,7 +42,7 @@ (_.coverage [/.of_list /.list] (|> members /.of_list /.list - (# (list.equivalence n.equivalence) = members))) + (at (list.equivalence n.equivalence) = members))) (_.coverage [/.size] (n.= size (/.size sample))) (_.coverage [/.empty?] @@ -53,9 +53,9 @@ all_empty_queues_look_the_same! (bit#= (/.empty? sample) - (# (/.equivalence n.equivalence) = - sample - /.empty))] + (at (/.equivalence n.equivalence) = + sample + /.empty))] (and empty_is_empty! all_empty_queues_look_the_same!))) (_.coverage [/.front] @@ -87,9 +87,9 @@ (/.member? n.equivalence pushed non_member) has_expected_order! - (# (list.equivalence n.equivalence) = - (list#composite (/.list sample) (list non_member)) - (/.list pushed))] + (at (list.equivalence n.equivalence) = + (list#composite (/.list sample) (list non_member)) + (/.list pushed))] (and size_increases! new_member_is_identified! has_expected_order!))) @@ -106,9 +106,9 @@ (not (/.member? n.equivalence popped target)) has_expected_order! - (# (list.equivalence n.equivalence) = - expected - (/.list popped))] + (at (list.equivalence n.equivalence) = + expected + (/.list popped))] (and size_decreases! popped_member_is_not_identified! has_expected_order!)) diff --git a/stdlib/source/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux index 624231fb1..106884fa1 100644 --- a/stdlib/source/test/lux/data/collection/queue/priority.lux +++ b/stdlib/source/test/lux/data/collection/queue/priority.lux @@ -31,7 +31,7 @@ (<| (_.covering /._) (_.for [/.Queue]) (do [! random.monad] - [size (# ! each (n.% 100) random.nat) + [size (at ! each (n.% 100) random.nat) sample (..random size) non_member_priority random.nat non_member (random.only (|>> (/.member? n.equivalence sample) not) diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux index 92d59f68d..445d6b033 100644 --- a/stdlib/source/test/lux/data/collection/sequence.lux +++ b/stdlib/source/test/lux/data/collection/sequence.lux @@ -30,7 +30,7 @@ (def: signatures Test (do [! random.monad] - [size (# ! each (n.% 100) random.nat)] + [size (at ! each (n.% 100) random.nat)] (all _.and (_.for [/.equivalence] ($equivalence.spec (/.equivalence n.equivalence) (random.sequence size random.nat))) @@ -49,7 +49,7 @@ (def: whole Test (do [! random.monad] - [size (# ! each (n.% 100) random.nat) + [size (at ! each (n.% 100) random.nat) sample (random.set n.hash size random.nat) .let [sample (|> sample set.list /.of_list)] .let [(open "/#[0]") (/.equivalence n.equivalence)]] @@ -82,10 +82,10 @@ (def: index_based Test (do [! random.monad] - [size (# ! each (|>> (n.% 100) ++) random.nat)] + [size (at ! each (|>> (n.% 100) ++) random.nat)] (all _.and (do ! - [good_index (|> random.nat (# ! each (n.% size))) + [good_index (|> random.nat (at ! each (n.% size))) .let [bad_index (n.+ size good_index)] sample (random.set n.hash size random.nat) non_member (random.only (|>> (set.member? sample) not) @@ -135,7 +135,7 @@ (<| (_.covering /._) (_.for [/.Sequence]) (do [! random.monad] - [size (# ! each (|>> (n.% 100) ++) random.nat)] + [size (at ! each (|>> (n.% 100) ++) random.nat)] (all _.and ..signatures ..whole @@ -198,11 +198,11 @@ choice (is (-> Nat (Maybe Text)) (function (_ value) (if (n.even? value) - {.#Some (# n.decimal encoded value)} + {.#Some (at n.decimal encoded value)} {.#None})))] (case [(|> sample (/.only n.even?) - (/#each (# n.decimal encoded)) + (/#each (at n.decimal encoded)) (/.item 0)) (/.one choice sample)] [{try.#Success expected} {.#Some actual}] diff --git a/stdlib/source/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux index 17617c2dc..be1168ad5 100644 --- a/stdlib/source/test/lux/data/collection/set.lux +++ b/stdlib/source/test/lux/data/collection/set.lux @@ -22,8 +22,8 @@ (def: gen_nat (Random Nat) - (# random.monad each (n.% 100) - random.nat)) + (at random.monad each (n.% 100) + random.nat)) (def: .public test Test @@ -36,7 +36,7 @@ ($equivalence.spec /.equivalence (random.set n.hash size random.nat))) (_.for [/.hash] (|> random.nat - (# random.monad each (|>> list (/.of_list n.hash))) + (at random.monad each (|>> list (/.of_list n.hash))) ($hash.spec /.hash))) (_.for [/.monoid] ($monoid.spec /.equivalence (/.monoid n.hash) (random.set n.hash size random.nat))) @@ -52,14 +52,14 @@ (_.coverage [/.empty] (/.empty? (/.empty n.hash))) (do ! - [hash (# ! each (function (_ constant) - (is (Hash Nat) - (implementation - (def: equivalence n.equivalence) - - (def: (hash _) - constant)))) - random.nat)] + [hash (at ! each (function (_ constant) + (is (Hash Nat) + (implementation + (def: equivalence n.equivalence) + + (def: (hash _) + constant)))) + random.nat)] (_.coverage [/.member_hash] (same? hash (/.member_hash (/.empty hash))))) (_.coverage [/.size] diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux index 555d7e210..8e68d0a63 100644 --- a/stdlib/source/test/lux/data/collection/set/multi.lux +++ b/stdlib/source/test/lux/data/collection/set/multi.lux @@ -23,7 +23,7 @@ (def: count (Random Nat) - (# random.monad each (|>> (n.% 10) ++) random.nat)) + (at random.monad each (|>> (n.% 10) ++) random.nat)) (def: .public (random size hash count element) (All (_ a) (-> Nat (Hash a) (Random Nat) (Random a) (Random (/.Set a)))) @@ -39,21 +39,21 @@ (def: signature Test (do [! random.monad] - [diversity (# ! each (n.% 10) random.nat)] + [diversity (at ! each (n.% 10) random.nat)] (all _.and (_.for [/.equivalence] ($equivalence.spec /.equivalence (..random diversity n.hash ..count random.nat))) (_.for [/.hash] (|> random.nat - (# random.monad each (function (_ single) - (/.has 1 single (/.empty n.hash)))) + (at random.monad each (function (_ single) + (/.has 1 single (/.empty n.hash)))) ($hash.spec /.hash))) ))) (def: composition Test (do [! random.monad] - [diversity (# ! each (n.% 10) random.nat) + [diversity (at ! each (n.% 10) random.nat) sample (..random diversity n.hash ..count random.nat) another (..random diversity n.hash ..count random.nat)] (`` (all _.and @@ -113,19 +113,19 @@ (<| (_.covering /._) (_.for [/.Set]) (do [! random.monad] - [diversity (# ! each (n.% 10) random.nat) + [diversity (at ! each (n.% 10) random.nat) sample (..random diversity n.hash ..count random.nat) non_member (random.only (predicate.complement (set.member? (/.support sample))) random.nat) addition_count ..count - partial_removal_count (# ! each (n.% addition_count) random.nat) + partial_removal_count (at ! each (n.% addition_count) random.nat) another (..random diversity n.hash ..count random.nat)] (all _.and (_.coverage [/.list /.of_list] (|> sample /.list (/.of_list n.hash) - (# /.equivalence = sample))) + (at /.equivalence = sample))) (_.coverage [/.size] (n.= (list.size (/.list sample)) (/.size sample))) @@ -159,7 +159,7 @@ (let [null_scenario! (|> sample (/.has 0 non_member) - (# /.equivalence = sample)) + (at /.equivalence = sample)) normal_scenario! (let [sample+ (/.has addition_count non_member sample)] @@ -170,12 +170,12 @@ normal_scenario!))) (_.coverage [/.lacks] (let [null_scenario! - (# /.equivalence = - (|> sample - (/.has addition_count non_member)) - (|> sample - (/.has addition_count non_member) - (/.lacks 0 non_member))) + (at /.equivalence = + (|> sample + (/.has addition_count non_member)) + (|> sample + (/.has addition_count non_member) + (/.lacks 0 non_member))) partial_scenario! (let [sample* (|> sample @@ -190,7 +190,7 @@ (|> sample (/.has addition_count non_member) (/.lacks addition_count non_member) - (# /.equivalence = sample))] + (at /.equivalence = sample))] (and null_scenario! partial_scenario! total_scenario!))) @@ -202,12 +202,12 @@ (let [unary (|> sample /.support /.of_set)] (and (/.sub? sample unary) (or (not (/.sub? unary sample)) - (# /.equivalence = sample unary))))) + (at /.equivalence = sample unary))))) (_.coverage [/.super?] (let [unary (|> sample /.support /.of_set)] (and (/.super? unary sample) (or (not (/.super? sample unary)) - (# /.equivalence = sample unary))))) + (at /.equivalence = sample unary))))) (_.coverage [/.difference] (let [|sample| (/.support sample) |another| (/.support another) diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux index 64a1dc4bb..d35037fd9 100644 --- a/stdlib/source/test/lux/data/collection/set/ordered.lux +++ b/stdlib/source/test/lux/data/collection/set/ordered.lux @@ -21,7 +21,7 @@ (def: size (random.Random Nat) - (# random.monad each (n.% 100) random.nat)) + (at random.monad each (n.% 100) random.nat)) (def: .public (random size order gen_value) (All (_ a) (-> Nat (Order a) (Random a) (Random (Set a)))) @@ -47,7 +47,7 @@ non_memberL (random.only (|>> (//.member? usetL) not) random.nat) .let [listL (//.list usetL)] - listR (|> (random.set n.hash sizeR random.nat) (# ! each //.list)) + listR (|> (random.set n.hash sizeR random.nat) (at ! each //.list)) .let [(open "/#[0]") /.equivalence setL (/.of_list n.order listL) setR (/.of_list n.order listR) @@ -64,9 +64,9 @@ (_.coverage [/.empty] (/.empty? (/.empty n.order))) (_.coverage [/.list] - (# (list.equivalence n.equivalence) = - (/.list (/.of_list n.order listL)) - (list.sorted (# n.order <) listL))) + (at (list.equivalence n.equivalence) = + (/.list (/.of_list n.order listL)) + (list.sorted (at n.order <) listL))) (_.coverage [/.of_list] (|> setL /.list (/.of_list n.order) @@ -101,7 +101,7 @@ (|> setL (/.has non_memberL) (/.lacks non_memberL) - (# /.equivalence = setL))) + (at /.equivalence = setL))) (_.coverage [/.sub?] (let [self! (/.sub? setL setL) @@ -126,23 +126,23 @@ (~~ (template [<coverage> <relation> <empty?>] [(_.coverage [<coverage>] (let [self! - (# /.equivalence = - setL - (<coverage> setL setL)) + (at /.equivalence = + setL + (<coverage> setL setL)) super! (and (<relation> (<coverage> setL setR) setL) (<relation> (<coverage> setL setR) setR)) empty! - (# /.equivalence = - (if <empty?> empty setL) - (<coverage> setL empty)) + (at /.equivalence = + (if <empty?> empty setL) + (<coverage> setL empty)) idempotence! - (# /.equivalence = - (<coverage> setL (<coverage> setL setR)) - (<coverage> setR (<coverage> setL setR)))] + (at /.equivalence = + (<coverage> setL (<coverage> setL setR)) + (<coverage> setR (<coverage> setL setR)))] (and self! super! empty! @@ -155,21 +155,21 @@ (let [self! (|> setL (/.difference setL) - (# /.equivalence = empty)) + (at /.equivalence = empty)) empty! (|> setL (/.difference empty) - (# /.equivalence = setL)) + (at /.equivalence = setL)) difference! (not (list.any? (/.member? (/.difference setL setR)) (/.list setL))) idempotence! - (# /.equivalence = - (/.difference setL setR) - (/.difference setL (/.difference setL setR)))] + (at /.equivalence = + (/.difference setL setR) + (/.difference setL (/.difference setL setR)))] (and self! empty! difference! diff --git a/stdlib/source/test/lux/data/collection/stack.lux b/stdlib/source/test/lux/data/collection/stack.lux index 337b7de4e..3f600a958 100644 --- a/stdlib/source/test/lux/data/collection/stack.lux +++ b/stdlib/source/test/lux/data/collection/stack.lux @@ -27,7 +27,7 @@ (<| (_.covering /._) (_.for [/.Stack]) (do random.monad - [size (# random.monad each (n.% 100) random.nat) + [size (at random.monad each (n.% 100) random.nat) sample (random.stack size random.nat) expected_top random.nat] (all _.and @@ -56,9 +56,9 @@ (/.empty? sample) {.#Some [top remaining]} - (# (/.equivalence n.equivalence) = - sample - (/.top top remaining)))) + (at (/.equivalence n.equivalence) = + sample + (/.top top remaining)))) (_.coverage [/.top] (case (/.next (/.top expected_top sample)) {.#Some [actual_top actual_sample]} diff --git a/stdlib/source/test/lux/data/collection/stream.lux b/stdlib/source/test/lux/data/collection/stream.lux index ee293cfa8..174cb9041 100644 --- a/stdlib/source/test/lux/data/collection/stream.lux +++ b/stdlib/source/test/lux/data/collection/stream.lux @@ -25,9 +25,9 @@ (All (_ a) (-> (Equivalence a) (Equivalence (/.Stream a)))) (def: (= reference subject) - (# (list.equivalence super) = - (/.first 100 reference) - (/.first 100 subject)))) + (at (list.equivalence super) = + (/.first 100 reference) + (/.first 100 subject)))) (def: (iterations step) (All (_ a) @@ -45,9 +45,9 @@ (let [(open "list#[0]") (list.equivalence n.equivalence)]) (do [! random.monad] [repeated random.nat - index (# ! each (n.% 100) random.nat) - size (# ! each (|>> (n.% 10) ++) random.nat) - offset (# ! each (n.% 100) random.nat) + index (at ! each (n.% 100) random.nat) + size (at ! each (|>> (n.% 10) ++) random.nat) + offset (at ! each (n.% 100) random.nat) cycle_start random.nat cycle_next (random.list size random.nat)] (all _.and diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux index 945c1c6b8..7898b3035 100644 --- a/stdlib/source/test/lux/data/collection/tree.lux +++ b/stdlib/source/test/lux/data/collection/tree.lux @@ -23,7 +23,7 @@ (All (_ a) (-> (Random a) (Random [Nat (Tree a)]))) (do [! random.monad] [value gen_value - num_children (# ! each (n.% 2) random.nat) + num_children (at ! each (n.% 2) random.nat) children (random.list num_children (tree gen_value))] (in [(|> children (list#each product.left) @@ -38,7 +38,7 @@ (all _.and (_.for [/.equivalence] (|> (..tree random.nat) - (# random.monad each product.right) + (at random.monad each product.right) ($equivalence.spec (/.equivalence n.equivalence)))) (_.for [/.mix] ($mix.spec /.leaf /.equivalence /.mix)) @@ -53,17 +53,17 @@ (do random.monad [expected random.nat] (_.coverage [/.leaf] - (# (list.equivalence n.equivalence) = - (list expected) - (/.flat (/.leaf expected))))) + (at (list.equivalence n.equivalence) = + (list expected) + (/.flat (/.leaf expected))))) (do [! random.monad] [value random.nat - num_children (# ! each (n.% 3) random.nat) + num_children (at ! each (n.% 3) random.nat) children (random.list num_children random.nat)] (_.coverage [/.branch] - (# (list.equivalence n.equivalence) = - (partial_list value children) - (/.flat (/.branch value (list#each /.leaf children)))))) + (at (list.equivalence n.equivalence) = + (partial_list value children) + (/.flat (/.branch value (list#each /.leaf children)))))) (do random.monad [expected/0 random.nat expected/1 random.nat @@ -72,20 +72,20 @@ expected/4 random.nat expected/5 random.nat] (_.coverage [/.tree] - (and (# (list.equivalence n.equivalence) = - (list expected/0) - (/.flat (/.tree expected/0))) - (# (list.equivalence n.equivalence) = - (list expected/0 expected/1 expected/2) - (/.flat (/.tree expected/0 - {expected/1 {} - expected/2 {}}))) - (# (list.equivalence n.equivalence) = - (list expected/0 expected/1 expected/2 - expected/3 expected/4 expected/5) - (/.flat (/.tree expected/0 - {expected/1 {} - expected/2 {expected/3 {} - expected/4 {expected/5 {}}}}))) + (and (at (list.equivalence n.equivalence) = + (list expected/0) + (/.flat (/.tree expected/0))) + (at (list.equivalence n.equivalence) = + (list expected/0 expected/1 expected/2) + (/.flat (/.tree expected/0 + {expected/1 {} + expected/2 {}}))) + (at (list.equivalence n.equivalence) = + (list expected/0 expected/1 expected/2 + expected/3 expected/4 expected/5) + (/.flat (/.tree expected/0 + {expected/1 {} + expected/2 {expected/3 {} + expected/4 {expected/5 {}}}}))) ))) ))) diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux index a9e3d68e6..a2a57629a 100644 --- a/stdlib/source/test/lux/data/collection/tree/finger.lux +++ b/stdlib/source/test/lux/data/collection/tree/finger.lux @@ -44,21 +44,21 @@ true)) (_.coverage [/.tag] (and (text#= tag_left - (/.tag (# ..builder leaf tag_left expected_left))) + (/.tag (at ..builder leaf tag_left expected_left))) (text#= (text#composite tag_left tag_right) - (/.tag (# ..builder branch - (# ..builder leaf tag_left expected_left) - (# ..builder leaf tag_right expected_right)))))) + (/.tag (at ..builder branch + (at ..builder leaf tag_left expected_left) + (at ..builder leaf tag_right expected_right)))))) (_.coverage [/.root] - (and (case (/.root (# ..builder leaf tag_left expected_left)) + (and (case (/.root (at ..builder leaf tag_left expected_left)) {.#Left actual} (n.= expected_left actual) {.#Right _} false) - (case (/.root (# ..builder branch - (# ..builder leaf tag_left expected_left) - (# ..builder leaf tag_right expected_right))) + (case (/.root (at ..builder branch + (at ..builder leaf tag_left expected_left) + (at ..builder leaf tag_right expected_right))) {.#Left _} false @@ -73,11 +73,11 @@ false)))) (_.coverage [/.value] (and (n.= expected_left - (/.value (# ..builder leaf tag_left expected_left))) + (/.value (at ..builder leaf tag_left expected_left))) (n.= expected_left - (/.value (# ..builder branch - (# ..builder leaf tag_left expected_left) - (# ..builder leaf tag_right expected_right)))))) + (/.value (at ..builder branch + (at ..builder leaf tag_left expected_left) + (at ..builder leaf tag_right expected_right)))))) (do random.monad [.let [tags_equivalence (list.equivalence text.equivalence) values_equivalence (list.equivalence n.equivalence)] @@ -87,37 +87,37 @@ values/T (random.list 5 random.nat)] (_.coverage [/.tags /.values] (let [tree (list#mix (function (_ [tag value] tree) - (# builder branch tree (# builder leaf tag value))) - (# builder leaf tags/H values/H) + (at builder branch tree (at builder leaf tag value))) + (at builder leaf tags/H values/H) (list.zipped_2 tags/T values/T))] - (and (# tags_equivalence = (partial_list tags/H tags/T) (/.tags tree)) - (# values_equivalence = (partial_list values/H values/T) (/.values tree)))))) + (and (at tags_equivalence = (partial_list tags/H tags/T) (/.tags tree)) + (at values_equivalence = (partial_list values/H values/T) (/.values tree)))))) (_.coverage [/.one] (let [can_find_correct_one! - (|> (# ..builder leaf tag_left expected_left) + (|> (at ..builder leaf tag_left expected_left) (/.one (text.contains? tag_left)) (maybe#each (n.= expected_left)) (maybe.else false)) cannot_find_incorrect_one! - (|> (# ..builder leaf tag_right expected_right) + (|> (at ..builder leaf tag_right expected_right) (/.one (text.contains? tag_left)) (maybe#each (n.= expected_left)) (maybe.else false) not) can_find_left! - (|> (# ..builder branch - (# ..builder leaf tag_left expected_left) - (# ..builder leaf tag_right expected_right)) + (|> (at ..builder branch + (at ..builder leaf tag_left expected_left) + (at ..builder leaf tag_right expected_right)) (/.one (text.contains? tag_left)) (maybe#each (n.= expected_left)) (maybe.else false)) can_find_right! - (|> (# ..builder branch - (# ..builder leaf tag_left expected_left) - (# ..builder leaf tag_right expected_right)) + (|> (at ..builder branch + (at ..builder leaf tag_left expected_left) + (at ..builder leaf tag_right expected_right)) (/.one (text.contains? tag_right)) (maybe#each (n.= expected_right)) (maybe.else false))] @@ -128,23 +128,23 @@ (_.coverage [/.exists?] (let [can_find_correct_one! (/.exists? (text.contains? tag_left) - (# ..builder leaf tag_left expected_left)) + (at ..builder leaf tag_left expected_left)) cannot_find_incorrect_one! (not (/.exists? (text.contains? tag_left) - (# ..builder leaf tag_right expected_right))) + (at ..builder leaf tag_right expected_right))) can_find_left! (/.exists? (text.contains? tag_left) - (# ..builder branch - (# ..builder leaf tag_left expected_left) - (# ..builder leaf tag_right expected_right))) + (at ..builder branch + (at ..builder leaf tag_left expected_left) + (at ..builder leaf tag_right expected_right))) can_find_right! (/.exists? (text.contains? tag_right) - (# ..builder branch - (# ..builder leaf tag_left expected_left) - (# ..builder leaf tag_right expected_right)))] + (at ..builder branch + (at ..builder leaf tag_left expected_left) + (at ..builder leaf tag_right expected_right)))] (and can_find_correct_one! cannot_find_incorrect_one! can_find_left! diff --git a/stdlib/source/test/lux/data/collection/tree/zipper.lux b/stdlib/source/test/lux/data/collection/tree/zipper.lux index 4a2bbac26..eb4a1c553 100644 --- a/stdlib/source/test/lux/data/collection/tree/zipper.lux +++ b/stdlib/source/test/lux/data/collection/tree/zipper.lux @@ -163,7 +163,7 @@ (open "list#[0]") (list.equivalence n.equivalence)]] (all _.and (_.for [/.equivalence] - ($equivalence.spec (/.equivalence n.equivalence) (# ! each (|>> product.right /.zipper) (//.tree random.nat)))) + ($equivalence.spec (/.equivalence n.equivalence) (at ! each (|>> product.right /.zipper) (//.tree random.nat)))) (_.for [/.functor] ($functor.spec (|>> tree.leaf /.zipper) /.equivalence /.functor)) (_.for [/.comonad] diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux index 3c70fd002..9f2534c83 100644 --- a/stdlib/source/test/lux/data/color.lux +++ b/stdlib/source/test/lux/data/color.lux @@ -24,7 +24,7 @@ (def: .public random (Random /.Color) (|> (all random.and random.nat random.nat random.nat) - (# random.monad each /.of_rgb))) + (at random.monad each /.of_rgb))) (def: scale (-> Nat Frac) @@ -71,7 +71,7 @@ (all _.and (_.coverage [/.RGB /.rgb /.of_rgb] (|> expected /.rgb /.of_rgb - (# /.equivalence = expected))) + (at /.equivalence = expected))) (_.coverage [/.HSL /.hsl /.of_hsl] (|> expected /.hsl /.of_hsl (distance/3 expected) @@ -129,16 +129,16 @@ Test (_.for [/.Spread /.Palette] (do [! random.monad] - [eH (# ! each (|>> f.abs (f.% +0.9) (f.+ +0.05)) - random.safe_frac) + [eH (at ! each (|>> f.abs (f.% +0.9) (f.+ +0.05)) + random.safe_frac) .let [eS +0.5] - variations (# ! each (|>> (n.% 3) (n.+ 2)) random.nat) + variations (at ! each (|>> (n.% 3) (n.+ 2)) random.nat) .let [max_spread (f./ (|> variations ++ .int int.frac) +1.0) min_spread (f./ +2.0 max_spread) spread_space (f.- min_spread max_spread)] - spread (# ! each (|>> f.abs (f.% spread_space) (f.+ min_spread)) - random.safe_frac)] + spread (at ! each (|>> f.abs (f.% spread_space) (f.+ min_spread)) + random.safe_frac)] (`` (all _.and (~~ (template [<brightness> <palette>] [(_.coverage [<palette>] @@ -146,7 +146,7 @@ expected (/.of_hsb [eH eS eB]) palette (<palette> spread variations expected)] (and (n.= variations (list.size palette)) - (not (list.any? (# /.equivalence = expected) palette)))))] + (not (list.any? (at /.equivalence = expected) palette)))))] [+1.0 /.analogous] [+0.5 /.monochromatic] )) @@ -154,9 +154,9 @@ [(_.coverage [<palette>] (let [expected (/.of_hsb [eH eS +0.5]) [c0 c1 c2] (<palette> expected)] - (and (# /.equivalence = expected c0) - (not (# /.equivalence = expected c1)) - (not (# /.equivalence = expected c2)))))] + (and (at /.equivalence = expected c0) + (not (at /.equivalence = expected c1)) + (not (at /.equivalence = expected c2)))))] [/.triad] [/.clash] @@ -165,10 +165,10 @@ [(_.coverage [<palette>] (let [expected (/.of_hsb [eH eS +0.5]) [c0 c1 c2 c3] (<palette> expected)] - (and (# /.equivalence = expected c0) - (not (# /.equivalence = expected c1)) - (not (# /.equivalence = expected c2)) - (not (# /.equivalence = expected c3)))))] + (and (at /.equivalence = expected c0) + (not (at /.equivalence = expected c1)) + (not (at /.equivalence = expected c2)) + (not (at /.equivalence = expected c3)))))] [/.square] [/.tetradic])) @@ -197,8 +197,8 @@ (and (not (/#= expected ~expected)) (/#= expected (/.complement ~expected))))) (_.coverage [/.black /.white] - (and (# /.equivalence = /.white (/.complement /.black)) - (# /.equivalence = /.black (/.complement /.white)))) + (and (at /.equivalence = /.white (/.complement /.black)) + (at /.equivalence = /.black (/.complement /.white)))) ..transformation ..palette (_.for [/.Alpha /.Pigment] diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux index 346bc74ed..ce902b16b 100644 --- a/stdlib/source/test/lux/data/color/named.lux +++ b/stdlib/source/test/lux/data/color/named.lux @@ -233,8 +233,8 @@ <colors>)) (_.coverage [/.aqua] - (# //.equivalence = /.cyan /.aqua)) + (at //.equivalence = /.cyan /.aqua)) (_.coverage [/.fuchsia] - (# //.equivalence = /.magenta /.fuchsia)) + (at //.equivalence = /.magenta /.fuchsia)) )))) ) diff --git a/stdlib/source/test/lux/data/format/binary.lux b/stdlib/source/test/lux/data/format/binary.lux index 8c69f0c64..4fa969c57 100644 --- a/stdlib/source/test/lux/data/format/binary.lux +++ b/stdlib/source/test/lux/data/format/binary.lux @@ -23,7 +23,7 @@ (def: random (Random /.Specification) - (# random.monad each /.nat random.nat)) + (at random.monad each /.nat random.nat)) (def: .public test Test diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux index 1fb8f94fa..c0d9f7537 100644 --- a/stdlib/source/test/lux/data/format/json.lux +++ b/stdlib/source/test/lux/data/format/json.lux @@ -36,9 +36,9 @@ (random.rec (function (_ again) (do [! random.monad] - [size (# ! each (n.% 2) random.nat)] + [size (at ! each (n.% 2) random.nat)] (all random.or - (# ! in []) + (at ! in []) random.bit random.safe_frac (random.unicode size) @@ -74,17 +74,17 @@ (do random.monad [sample ..random] (_.coverage [/.Null /.null?] - (# bit.equivalence = - (/.null? sample) - (case sample - {/.#Null} true - _ false)))) + (at bit.equivalence = + (/.null? sample) + (case sample + {/.#Null} true + _ false)))) (do random.monad [expected ..random] (_.coverage [/.format] (|> expected /.format - (# /.codec decoded) + (at /.codec decoded) (try#each (/#= expected)) (try.else false)))) (do random.monad @@ -97,9 +97,9 @@ (_.coverage [/.object /.fields] (case (/.fields object) {try.#Success actual} - (# (list.equivalence text.equivalence) = - (list#each product.left expected) - actual) + (at (list.equivalence text.equivalence) = + (list#each product.left expected) + actual) {try.#Failure error} false)) @@ -112,7 +112,7 @@ )) (do random.monad [key (random.alphabetic 1) - unknown (random.only (|>> (# text.equivalence = key) not) + unknown (random.only (|>> (at text.equivalence = key) not) (random.alphabetic 1)) expected random.safe_frac] (_.coverage [/.has] @@ -141,7 +141,7 @@ (_.coverage [<type> <field>] (|> (/.object (list [key {<tag> value}])) (<field> key) - (try#each (# <equivalence> = value)) + (try#each (at <equivalence> = value)) (try.else false))))] [/.Boolean /.boolean_field /.#Boolean random.bit bit.equivalence] diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux index c30fb086b..4681f3822 100644 --- a/stdlib/source/test/lux/data/format/tar.lux +++ b/stdlib/source/test/lux/data/format/tar.lux @@ -108,8 +108,8 @@ Test (_.for [/.Small] (do [! random.monad] - [expected (|> random.nat (# ! each (n.% /.small_limit))) - invalid (|> random.nat (# ! each (n.max /.small_limit)))] + [expected (|> random.nat (at ! each (n.% /.small_limit))) + invalid (|> random.nat (at ! each (n.max /.small_limit)))] (`` (all _.and (_.coverage [/.small /.from_small] (case (/.small expected) @@ -132,8 +132,8 @@ Test (_.for [/.Big] (do [! random.monad] - [expected (|> random.nat (# ! each (n.% /.big_limit))) - invalid (|> random.nat (# ! each (n.max /.big_limit)))] + [expected (|> random.nat (at ! each (n.% /.big_limit))) + invalid (|> random.nat (at ! each (n.max /.big_limit)))] (`` (all _.and (_.coverage [/.big /.from_big] (case (/.big expected) @@ -158,14 +158,14 @@ Test (do [! random.monad] [expected_path (random.lower_case (-- /.path_size)) - expected_moment (# ! each (|>> (n.% 1,0,00,00,00,00,000) .int instant.of_millis) - random.nat) + expected_moment (at ! each (|>> (n.% 1,0,00,00,00,00,000) .int instant.of_millis) + random.nat) chunk (random.lower_case chunk_size) - chunks (# ! each (n.% 100) random.nat) + chunks (at ! each (n.% 100) random.nat) .let [content (|> chunk (list.repeated chunks) text.together - (# utf8.codec encoded))]] + (at utf8.codec encoded))]] (`` (all _.and (~~ (template [<type> <tag>] [(_.coverage [<type>] @@ -402,7 +402,7 @@ (|> sequence.empty (format.result /.writer) (<b>.result /.parser) - (# try.monad each sequence.empty?) + (at try.monad each sequence.empty?) (try.else false))) (_.coverage [/.invalid_end_of_archive] (let [dump (format.result /.writer sequence.empty)] diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux index dc95a00fe..fffae6ba2 100644 --- a/stdlib/source/test/lux/data/format/xml.lux +++ b/stdlib/source/test/lux/data/format/xml.lux @@ -38,7 +38,7 @@ (def: char (Random Nat) (do [! random.monad] - [idx (|> random.nat (# ! each (n.% (text.size char_range))))] + [idx (|> random.nat (at ! each (n.% (text.size char_range))))] (in (maybe.trusted (text.char idx char_range))))) (def: (size bottom top) diff --git a/stdlib/source/test/lux/data/product.lux b/stdlib/source/test/lux/data/product.lux index 61e7f251e..1cde90959 100644 --- a/stdlib/source/test/lux/data/product.lux +++ b/stdlib/source/test/lux/data/product.lux @@ -32,9 +32,9 @@ right random.nat] (_.coverage [/.hash] (let [hash (/.hash i.hash n.hash)] - (n.= (n.+ (# i.hash hash left) - (# n.hash hash right)) - (# hash hash [left right]))))) + (n.= (n.+ (at i.hash hash left) + (at n.hash hash right)) + (at hash hash [left right]))))) (<| (_.coverage [/.left]) (n.= expected (/.left [expected dummy]))) diff --git a/stdlib/source/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux index 82adfdc49..8543ddba6 100644 --- a/stdlib/source/test/lux/data/sum.lux +++ b/stdlib/source/test/lux/data/sum.lux @@ -67,27 +67,27 @@ (/.then (n.+ shift) (n.- shift)) (pipe.case {0 #1 actual} (n.= (n.- shift expected) actual) _ false)))) (do ! - [size (# ! each (n.% 5) random.nat) + [size (at ! each (n.% 5) random.nat) expected (random.list size random.nat)] (all _.and (_.coverage [/.lefts] (let [actual (is (List (Or Nat Nat)) (list#each /.left expected))] - (and (# (list.equivalence n.equivalence) = - expected - (/.lefts actual)) - (# (list.equivalence n.equivalence) = - (list) - (/.rights actual))))) + (and (at (list.equivalence n.equivalence) = + expected + (/.lefts actual)) + (at (list.equivalence n.equivalence) = + (list) + (/.rights actual))))) (_.coverage [/.rights] (let [actual (is (List (Or Nat Nat)) (list#each /.right expected))] - (and (# (list.equivalence n.equivalence) = - expected - (/.rights actual)) - (# (list.equivalence n.equivalence) = - (list) - (/.lefts actual))))) + (and (at (list.equivalence n.equivalence) = + expected + (/.rights actual)) + (at (list.equivalence n.equivalence) = + (list) + (/.lefts actual))))) (_.coverage [/.partition] (let [[lefts rights] (|> expected (list#each (function (_ value) @@ -96,11 +96,11 @@ (/.right value)))) (is (List (Or Nat Nat))) /.partition)] - (and (# (list.equivalence n.equivalence) = - (list.only n.even? expected) - lefts) - (# (list.equivalence n.equivalence) = - (list.only (|>> n.even? not) expected) - rights)))) + (and (at (list.equivalence n.equivalence) = + (list.only n.even? expected) + lefts) + (at (list.equivalence n.equivalence) = + (list.only (|>> n.even? not) expected) + rights)))) )) )))) diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux index 2a3a3f919..3e1889c04 100644 --- a/stdlib/source/test/lux/data/text.lux +++ b/stdlib/source/test/lux/data/text.lux @@ -34,12 +34,12 @@ (def: bounded_size (random.Random Nat) (|> random.nat - (# random.monad each (|>> (n.% 20) (n.+ 1))))) + (at random.monad each (|>> (n.% 20) (n.+ 1))))) (def: size Test (do [! random.monad] - [size (# ! each (n.% 10) random.nat) + [size (at ! each (n.% 10) random.nat) sample (random.unicode size)] (all _.and (_.coverage [/.size] @@ -52,11 +52,11 @@ Test (do [! random.monad] [inner (random.unicode 1) - outer (random.only (|>> (# /.equivalence = inner) not) + outer (random.only (|>> (at /.equivalence = inner) not) (random.unicode 1)) left (random.unicode 1) right (random.unicode 1) - .let [full (# /.monoid composite inner outer) + .let [full (at /.monoid composite inner outer) fake_index (-- 0)]] (`` (all _.and (~~ (template [<affix> <predicate>] @@ -81,23 +81,23 @@ Test (do [! random.monad] [inner (random.unicode 1) - outer (random.only (|>> (# /.equivalence = inner) not) + outer (random.only (|>> (at /.equivalence = inner) not) (random.unicode 1)) .let [fake_index (-- 0)]] (all _.and (_.coverage [/.contains?] - (let [full (# /.monoid composite inner outer)] + (let [full (at /.monoid composite inner outer)] (and (/.contains? inner full) (/.contains? outer full)))) (_.coverage [/.index] - (and (|> (/.index inner (# /.monoid composite inner outer)) + (and (|> (/.index inner (at /.monoid composite inner outer)) (maybe.else fake_index) (n.= 0)) - (|> (/.index outer (# /.monoid composite inner outer)) + (|> (/.index outer (at /.monoid composite inner outer)) (maybe.else fake_index) (n.= 1)))) (_.coverage [/.index_since] - (let [full (# /.monoid composite inner outer)] + (let [full (at /.monoid composite inner outer)] (and (|> (/.index_since 0 inner full) (maybe.else fake_index) (n.= 0)) @@ -115,7 +115,7 @@ (maybe.else fake_index) (n.= fake_index))))) (_.coverage [/.last_index] - (let [full (all (# /.monoid composite) outer inner outer)] + (let [full (all (at /.monoid composite) outer inner outer)] (and (|> (/.last_index inner full) (maybe.else fake_index) (n.= 1)) @@ -131,7 +131,7 @@ (`` (all _.and (~~ (template [<short> <long>] [(_.coverage [<short> <long>] - (# /.equivalence = <short> <long>))] + (at /.equivalence = <short> <long>))] [/.\0 /.null] [/.\a /.alarm] @@ -143,13 +143,13 @@ [/.\r /.carriage_return] [/.\'' /.double_quote])) (_.coverage [/.line_feed] - (# /.equivalence = /.new_line /.line_feed)) + (at /.equivalence = /.new_line /.line_feed)) ))) (do [! random.monad] - [size (# ! each (|>> (n.% 10) ++) random.nat) + [size (at ! each (|>> (n.% 10) ++) random.nat) characters (random.set /.hash size (random.alphabetic 1)) .let [sample (|> characters set.list /.together)] - expected (# ! each (n.% size) random.nat)] + expected (at ! each (n.% size) random.nat)] (_.coverage [/.char] (case (/.char expected sample) {.#Some char} @@ -178,13 +178,13 @@ (def: manipulation Test (do [! random.monad] - [size (# ! each (|>> (n.% 10) (n.+ 2)) random.nat) + [size (at ! each (|>> (n.% 10) (n.+ 2)) random.nat) characters (random.set /.hash size (random.alphabetic 1)) separator (random.only (|>> (set.member? characters) not) (random.alphabetic 1)) .let [with_no_separator (|> characters set.list /.together)] static (random.alphabetic 1) - .let [dynamic (random.only (|>> (# /.equivalence = static) not) + .let [dynamic (random.only (|>> (at /.equivalence = static) not) (random.alphabetic 1))] pre dynamic post dynamic @@ -200,19 +200,19 @@ (/.interposed separator) (/.all_split_by separator) (set.of_list /.hash) - (# set.equivalence = characters)) - (# /.equivalence = - (/.together (set.list characters)) - (/.interposed "" (set.list characters))))) + (at set.equivalence = characters)) + (at /.equivalence = + (/.together (set.list characters)) + (/.interposed "" (set.list characters))))) (_.coverage [/.replaced_once] - (# /.equivalence = - (# /.monoid composite post static) - (/.replaced_once pre post (# /.monoid composite pre static)))) + (at /.equivalence = + (at /.monoid composite post static) + (/.replaced_once pre post (at /.monoid composite pre static)))) (_.coverage [/.split_by] - (case (/.split_by static (all (# /.monoid composite) pre static post)) + (case (/.split_by static (all (at /.monoid composite) pre static post)) {.#Some [left right]} - (and (# /.equivalence = pre left) - (# /.equivalence = post right)) + (and (at /.equivalence = pre left) + (at /.equivalence = post right)) {.#None} false)) @@ -220,19 +220,19 @@ (let [effectiveness! (|> upper /.lower_cased - (# /.equivalence = upper) + (at /.equivalence = upper) not) idempotence! (|> lower /.lower_cased - (# /.equivalence = lower)) + (at /.equivalence = lower)) inverse! (|> lower /.upper_cased /.lower_cased - (# /.equivalence = lower))] + (at /.equivalence = lower))] (and effectiveness! idempotence! inverse!))) @@ -240,19 +240,19 @@ (let [effectiveness! (|> lower /.upper_cased - (# /.equivalence = lower) + (at /.equivalence = lower) not) idempotence! (|> upper /.upper_cased - (# /.equivalence = upper)) + (at /.equivalence = upper)) inverse! (|> upper /.lower_cased /.upper_cased - (# /.equivalence = upper))] + (at /.equivalence = upper))] (and effectiveness! idempotence! inverse!))) @@ -318,7 +318,7 @@ .let [... The wider unicode charset includes control characters that ... can make text replacement work improperly. ... Because of that, I restrict the charset. - normal_char_gen (|> random.nat (# ! each (|>> (n.% 128) (n.max 1))))] + normal_char_gen (|> random.nat (at ! each (|>> (n.% 128) (n.max 1))))] sep1 (random.text normal_char_gen 1) sep2 (random.text normal_char_gen 1) .let [part_gen (|> (random.text normal_char_gen sizeP) diff --git a/stdlib/source/test/lux/data/text/buffer.lux b/stdlib/source/test/lux/data/text/buffer.lux index b6d868fbd..eb980389d 100644 --- a/stdlib/source/test/lux/data/text/buffer.lux +++ b/stdlib/source/test/lux/data/text/buffer.lux @@ -17,7 +17,7 @@ (def: part (Random Text) (do [! random.monad] - [size (# ! each (|>> (n.% 10) ++) random.nat)] + [size (at ! each (|>> (n.% 10) ++) random.nat)] (random.alphabetic size))) (def: .public test diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux index d56fd8bdc..4e30d8797 100644 --- a/stdlib/source/test/lux/data/text/encoding.lux +++ b/stdlib/source/test/lux/data/text/encoding.lux @@ -214,7 +214,7 @@ (Random /.Encoding) (let [options (list.size ..all_encodings)] (do [! random.monad] - [choice (# ! each (n.% options) random.nat)] + [choice (at ! each (n.% options) random.nat)] (in (maybe.trusted (list.item choice ..all_encodings)))))) (def: .public test diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux index aba3d5948..d1258bf25 100644 --- a/stdlib/source/test/lux/data/text/escape.lux +++ b/stdlib/source/test/lux/data/text/escape.lux @@ -34,9 +34,9 @@ (def: (range max min) (-> Char Char (Random Char)) (let [range (n.- min max)] - (# random.monad each - (|>> (n.% range) (n.+ min)) - random.nat))) + (at random.monad each + (|>> (n.% range) (n.+ min)) + random.nat))) (def: under_range (Random Char) @@ -115,7 +115,7 @@ (text#= expected (/.escaped expected)))))) (do [! random.monad] [dummy (|> (random.char unicode.character) - (# ! each text.of_char))] + (at ! each text.of_char))] (_.coverage [/.dangling_escape] (case (/.un_escaped (format (/.escaped dummy) "\")) {try.#Success _} @@ -126,7 +126,7 @@ (do [! random.monad] [dummy (|> (random.char unicode.character) (random.only (|>> (set.member? ..valid_sigils) not)) - (# ! each text.of_char))] + (at ! each text.of_char))] (_.coverage [/.invalid_escape] (case (/.un_escaped (format "\" dummy)) {try.#Success _} @@ -136,10 +136,10 @@ (exception.match? /.invalid_escape error)))) (do [! random.monad] [too_short (|> (random.char unicode.character) - (# ! each (n.% (hex "1000")))) + (at ! each (n.% (hex "1000")))) code (|> (random.unicode 4) (random.only (function (_ code) - (case (# n.hex decoded code) + (case (at n.hex decoded code) {try.#Failure error} true {try.#Success _} false))))] (_.coverage [/.invalid_unicode_escape] @@ -150,7 +150,7 @@ {try.#Failure error} (exception.match? /.invalid_unicode_escape error))]] - (and (!invalid (# n.hex encoded too_short)) + (and (!invalid (at n.hex encoded too_short)) (!invalid code))))) (_.coverage [/.literal] (with_expansions [<example> (..static_sample)] diff --git a/stdlib/source/test/lux/data/text/format.lux b/stdlib/source/test/lux/data/text/format.lux index 903e13497..13446a8ce 100644 --- a/stdlib/source/test/lux/data/text/format.lux +++ b/stdlib/source/test/lux/data/text/format.lux @@ -77,7 +77,7 @@ [(do random.monad [sample <random>] (_.coverage [<format>] - (text#= (# <codec> encoded sample) + (text#= (at <codec> encoded sample) (<format> sample))))] [/.bit bit.codec random.bit] @@ -178,9 +178,9 @@ [modulus (random.one (|>> modulus.modulus try.maybe) random.int) - sample (# ! each (modular.modular modulus) - random.int)] + sample (at ! each (modular.modular modulus) + random.int)] (_.coverage [/.mod] - (text#= (# (modular.codec modulus) encoded sample) + (text#= (at (modular.codec modulus) encoded sample) (/.mod sample)))) )))) diff --git a/stdlib/source/test/lux/data/text/unicode/block.lux b/stdlib/source/test/lux/data/text/unicode/block.lux index 63ec898c0..00e98bf4d 100644 --- a/stdlib/source/test/lux/data/text/unicode/block.lux +++ b/stdlib/source/test/lux/data/text/unicode/block.lux @@ -25,8 +25,8 @@ (def: .public random (Random /.Block) (do [! random.monad] - [start (# ! each (n.% 1,000,000) random.nat) - additional (# ! each (n.% 1,000,000) random.nat)] + [start (at ! each (n.% 1,000,000) random.nat) + additional (at ! each (n.% 1,000,000) random.nat)] (in (/.block start additional)))) (with_expansions [<blocks> (these [blocks/0 @@ -173,15 +173,15 @@ [.let [top_start (hex "AC00") top_end (hex "D7AF") end_range (n.- top_start top_end)] - start (# ! each (|>> (n.% top_start) ++) random.nat) - end (# ! each (|>> (n.% end_range) (n.+ top_start)) random.nat) + start (at ! each (|>> (n.% top_start) ++) random.nat) + end (at ! each (|>> (n.% end_range) (n.+ top_start)) random.nat) .let [additional (n.- start end) sample (/.block start additional) size (/.size sample)] - inside (# ! each - (|>> (n.% size) - (n.+ (/.start sample))) - random.nat)] + inside (at ! each + (|>> (n.% size) + (n.+ (/.start sample))) + random.nat)] (`` (all _.and (_.for [/.equivalence] ($equivalence.spec /.equivalence ..random)) diff --git a/stdlib/source/test/lux/data/text/unicode/set.lux b/stdlib/source/test/lux/data/text/unicode/set.lux index af36a8463..f2c9808c0 100644 --- a/stdlib/source/test/lux/data/text/unicode/set.lux +++ b/stdlib/source/test/lux/data/text/unicode/set.lux @@ -36,10 +36,10 @@ (_.for [/.Set]) (do [! random.monad] [block //block.random - inside (# ! each - (|>> (n.% (block.size block)) - (n.+ (block.start block))) - random.nat) + inside (at ! each + (|>> (n.% (block.size block)) + (n.+ (block.start block))) + random.nat) left //block.random right //block.random .let [equivalence (product.equivalence n.equivalence diff --git a/stdlib/source/test/lux/documentation.lux b/stdlib/source/test/lux/documentation.lux index 40ad67b42..92248d84c 100644 --- a/stdlib/source/test/lux/documentation.lux +++ b/stdlib/source/test/lux/documentation.lux @@ -30,9 +30,9 @@ false)))]})) (syntax: (description []) - (# meta.monad each - (|>> %.nat code.text list) - meta.seed)) + (at meta.monad each + (|>> %.nat code.text list) + meta.seed)) (template.with_locals [g!default] (with_expansions ['definition_description' (..description) diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux index c8434e1c6..9079d5336 100644 --- a/stdlib/source/test/lux/extension.lux +++ b/stdlib/source/test/lux/extension.lux @@ -96,7 +96,7 @@ (let [! phase.monad] (|> parameters (monad.each ! (phase archive)) - (# ! each (|>> {analysis.#Extension self}))))) + (at ! each (|>> {analysis.#Extension self}))))) (synthesis: (..synthesis self phase archive [pass_through <analysis>.any]) (phase archive pass_through)) @@ -106,32 +106,32 @@ (let [! phase.monad] (|> parameters (monad.each ! (phase archive)) - (# ! each (|>> {analysis.#Extension self}))))) + (at ! each (|>> {analysis.#Extension self}))))) (synthesis: (..generation self phase archive [parameters (<>.some <analysis>.any)]) (let [! phase.monad] (|> parameters (monad.each ! (phase archive)) - (# ! each (|>> {synthesis.#Extension self}))))) + (at ! each (|>> {synthesis.#Extension self}))))) (generation: (..generation self phase archive [pass_through <synthesis>.any]) (phase archive pass_through)) (analysis: (..dummy_generation self phase archive []) - (# phase.monad in {analysis.#Extension self (list)})) + (at phase.monad in {analysis.#Extension self (list)})) (synthesis: (..dummy_generation self phase archive []) - (# phase.monad in {synthesis.#Extension self (list)})) + (at phase.monad in {synthesis.#Extension self (list)})) (generation: (..dummy_generation self phase archive []) - (# phase.monad in - (for @.jvm (jvm.string self) - @.js (js.string self) - @.python (python.unicode self) - @.lua (lua.string self) - @.ruby (ruby.string self) - @.php (php.string self) - @.scheme (scheme.string self)))) + (at phase.monad in + (for @.jvm (jvm.string self) + @.js (js.string self) + @.python (python.unicode self) + @.lua (lua.string self) + @.ruby (ruby.string self) + @.php (php.string self) + @.scheme (scheme.string self)))) ... Directive (directive: (..directive self phase archive [expression <code>.any]) diff --git a/stdlib/source/test/lux/ffi.js.lux b/stdlib/source/test/lux/ffi.js.lux index 6d0946605..166347728 100644 --- a/stdlib/source/test/lux/ffi.js.lux +++ b/stdlib/source/test/lux/ffi.js.lux @@ -49,12 +49,12 @@ Test (do [! random.monad] [boolean random.bit - number (# ! each (|>> (nat.% 100) nat.frac) random.nat) + number (at ! each (|>> (nat.% 100) nat.frac) random.nat) string (random.ascii 5) - function (# ! each (function (_ shift) - (is (-> Nat Nat) - (nat.+ shift))) - random.nat) + function (at ! each (function (_ shift) + (is (-> Nat Nat) + (nat.+ shift))) + random.nat) ... I64s get compiled as JavaScript objects with a specific structure. object random.nat] (<| (_.covering /._) diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 0174a039f..d23e1f326 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -85,13 +85,13 @@ (def: for_conversions Test (do [! random.monad] - [long (# ! each (|>> /.as_long) random.int) - integer (# ! each (|>> /.as_int) random.int) - byte (# ! each (|>> /.as_byte) random.int) - short (# ! each (|>> /.as_short) random.int) + [long (at ! each (|>> /.as_long) random.int) + integer (at ! each (|>> /.as_int) random.int) + byte (at ! each (|>> /.as_byte) random.int) + short (at ! each (|>> /.as_short) random.int) float (|> random.frac (random.only (|>> f.not_a_number? not)) - (# ! each (|>> /.as_float)))] + (at ! each (|>> /.as_float)))] (`` (all _.and (~~ (template [<sample> <=> <to> <from>] [(_.coverage [<to> <from>] @@ -120,9 +120,9 @@ (def: for_arrays Test (do [! random.monad] - [size (|> random.nat (# ! each (|>> (n.% 100) (n.max 1)))) - idx (|> random.nat (# ! each (n.% size))) - value (# ! each (|>> /.as_long) random.int)] + [size (|> random.nat (at ! each (|>> (n.% 100) (n.max 1)))) + idx (|> random.nat (at ! each (n.% size))) + value (at ! each (|>> /.as_long) random.int)] (all _.and (_.coverage [/.array /.length] (|> size @@ -146,22 +146,22 @@ (def: for_miscellaneous Test (`` (do [! random.monad] - [sample (# ! each (|>> (as java/lang/Object)) - (random.ascii 1)) - boolean (# ! each (|>> /.as_boolean) random.bit) - byte (# ! each (|>> /.as_byte) random.int) - short (# ! each (|>> /.as_short) random.int) - integer (# ! each (|>> /.as_int) random.int) - long (# ! each (|>> /.as_long) random.int) + [sample (at ! each (|>> (as java/lang/Object)) + (random.ascii 1)) + boolean (at ! each (|>> /.as_boolean) random.bit) + byte (at ! each (|>> /.as_byte) random.int) + short (at ! each (|>> /.as_short) random.int) + integer (at ! each (|>> /.as_int) random.int) + long (at ! each (|>> /.as_long) random.int) float (|> random.frac (random.only (|>> f.not_a_number? not)) - (# ! each (|>> /.as_float))) + (at ! each (|>> /.as_float))) double (|> random.frac (random.only (|>> f.not_a_number? not)) - (# ! each (|>> /.as_double))) - character (# ! each (|>> /.as_int /.int_to_char) random.int) - string (# ! each (|>> /.as_string) - (random.ascii 1)) + (at ! each (|>> /.as_double))) + character (at ! each (|>> /.as_int /.int_to_char) random.int) + string (at ! each (|>> /.as_string) + (random.ascii 1)) bit/0 random.bit] (all _.and @@ -585,8 +585,8 @@ (/.of_long (test/TestInterface4::actual4 (/.as_long left) (/.as_long right) object_8))))] .let [random_long (is (Random java/lang/Long) - (# ! each (|>> /.as_long) - random.int))] + (at ! each (|>> /.as_long) + random.int))] dummy/0 random_long dummy/1 random_long dummy/2 random_long diff --git a/stdlib/source/test/lux/ffi.old.lux b/stdlib/source/test/lux/ffi.old.lux index e5f5ab8aa..ae5acc8a0 100644 --- a/stdlib/source/test/lux/ffi.old.lux +++ b/stdlib/source/test/lux/ffi.old.lux @@ -92,13 +92,13 @@ Test (do [! random.monad] [long random.int - int (# ! each (|>> /.long_to_int) random.int) - char (# ! each (|>> /.long_to_int /.int_to_char) random.int) + int (at ! each (|>> /.long_to_int) random.int) + char (at ! each (|>> /.long_to_int /.int_to_char) random.int) double (|> random.frac (random.only (|>> f.not_a_number? not))) float (|> random.frac (random.only (|>> f.not_a_number? not)) - (# ! each (|>> /.double_to_float)))] + (at ! each (|>> /.double_to_float)))] (`` (all _.and (~~ (template [<=> <sample> <to> <from>] [(_.coverage [<to> <from>] @@ -159,8 +159,8 @@ (def: arrays Test (do [! random.monad] - [size (|> random.nat (# ! each (|>> (n.% 100) (n.max 1)))) - idx (|> random.nat (# ! each (n.% size))) + [size (|> random.nat (at ! each (|>> (n.% 100) (n.max 1)))) + idx (|> random.nat (at ! each (n.% size))) value random.int] (all _.and (_.coverage [/.array /.length] diff --git a/stdlib/source/test/lux/ffi/export.jvm.lux b/stdlib/source/test/lux/ffi/export.jvm.lux index 7dc0e194d..5fa93e75d 100644 --- a/stdlib/source/test/lux/ffi/export.jvm.lux +++ b/stdlib/source/test/lux/ffi/export.jvm.lux @@ -127,8 +127,8 @@ (<| (_.covering /._) (do [! random.monad] [(~~ (template [<type> <as> <random>] - [(~~ (template.symbol [left_ <type>])) (# ! each (|>> <as>) <random>) - (~~ (template.symbol [right_ <type>])) (# ! each (|>> <as>) <random>)] + [(~~ (template.symbol [left_ <type>])) (at ! each (|>> <as>) <random>) + (~~ (template.symbol [right_ <type>])) (at ! each (|>> <as>) <random>)] [boolean //.as_boolean random.bit] [byte //.as_byte ..tiny_int] diff --git a/stdlib/source/test/lux/locale.lux b/stdlib/source/test/lux/locale.lux index 7f4f183fb..0a05619e8 100644 --- a/stdlib/source/test/lux/locale.lux +++ b/stdlib/source/test/lux/locale.lux @@ -59,16 +59,16 @@ fixed_encoding ..random_encoding] (all _.and (|> ..random_language - (# ! each (function (_ language) - (/.locale language {.#Some fixed_territory} {.#Some fixed_encoding}))) + (at ! each (function (_ language) + (/.locale language {.#Some fixed_territory} {.#Some fixed_encoding}))) ($hash.spec /.hash)) (|> ..random_territory - (# ! each (function (_ territory) - (/.locale fixed_language {.#Some territory} {.#Some fixed_encoding}))) + (at ! each (function (_ territory) + (/.locale fixed_language {.#Some territory} {.#Some fixed_encoding}))) ($hash.spec /.hash)) (|> ..random_encoding - (# ! each (function (_ encoding) - (/.locale fixed_language {.#Some fixed_territory} {.#Some encoding}))) + (at ! each (function (_ encoding) + (/.locale fixed_language {.#Some fixed_territory} {.#Some encoding}))) ($hash.spec /.hash)) ))) diff --git a/stdlib/source/test/lux/locale/language.lux b/stdlib/source/test/lux/locale/language.lux index 6c8b4f6ad..cb2fb5477 100644 --- a/stdlib/source/test/lux/locale/language.lux +++ b/stdlib/source/test/lux/locale/language.lux @@ -215,7 +215,7 @@ (template: (!aliases <reference> <aliases>) [(_.coverage <aliases> - (list.every? (# /.equivalence = <reference>) + (list.every? (at /.equivalence = <reference>) (`` (list (~~ (template.spliced <aliases>))))))]) (def: aliases_test/0 @@ -282,8 +282,8 @@ (list#each (|>> (the #languages) set.list)) list.together)] (do [! random.monad] - [choice (# ! each (n.% (list.size options)) - random.nat)] + [choice (at ! each (n.% (list.size options)) + random.nat)] (in (maybe.trusted (list.item choice options)))))) (def: .public test diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/locale/territory.lux index 067d68595..6a8051f66 100644 --- a/stdlib/source/test/lux/locale/territory.lux +++ b/stdlib/source/test/lux/locale/territory.lux @@ -172,7 +172,7 @@ (template: (!aliases <reference> <aliases>) [(_.coverage <aliases> - (list.every? (# /.equivalence = <reference>) + (list.every? (at /.equivalence = <reference>) (`` (list (~~ (template.spliced <aliases>))))))]) (def: aliases_test @@ -208,8 +208,8 @@ (list#each (|>> (the #territories) set.list)) list.together)] (do [! random.monad] - [choice (# ! each (n.% (list.size options)) - random.nat)] + [choice (at ! each (n.% (list.size options)) + random.nat)] (in (maybe.trusted (list.item choice options)))))) (def: .public test diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/macro.lux index f1f2bce0b..0b6bfe2f3 100644 --- a/stdlib/source/test/lux/macro.lux +++ b/stdlib/source/test/lux/macro.lux @@ -116,9 +116,9 @@ (do [! random.monad] [[seed symbol_prefix lux] ..random_lux - pow/1 (# ! each code.nat random.nat) + pow/1 (at ! each code.nat random.nat) - repetitions (# ! each (n.% 10) random.nat) + repetitions (at ! each (n.% 10) random.nat) .let [single_expansion (` (..pow/2 (..pow/2 (~ pow/1)))) expansion (` (n.* (..pow/2 (~ pow/1)) (..pow/2 (~ pow/1)))) @@ -129,18 +129,18 @@ [(_.coverage [<expander>] (|> (<expander> (` (..pow/4 (~ pow/1)))) (meta.result lux) - (try#each (# (list.equivalence code.equivalence) = - (list <expansion>))) + (try#each (at (list.equivalence code.equivalence) = + (list <expansion>))) (try.else false))) (_.coverage [<logger>] (and (|> (/.single_expansion (` (<logger> "omit" (..pow/4 (~ pow/1))))) (meta.result lux) - (try#each (# (list.equivalence code.equivalence) = (list))) + (try#each (at (list.equivalence code.equivalence) = (list))) (try.else false)) (|> (/.single_expansion (` (<logger> (..pow/4 (~ pow/1))))) (meta.result lux) - (try#each (# (list.equivalence code.equivalence) = (list <expansion>))) + (try#each (at (list.equivalence code.equivalence) = (list <expansion>))) (try.else false))))] [/.single_expansion /.log_single_expansion! single_expansion] @@ -189,7 +189,7 @@ (all _.and (_.coverage [/.symbol] (|> (/.symbol symbol_prefix) - (# meta.monad each %.code) + (at meta.monad each %.code) (meta.result lux) (!expect (^.multi {try.#Success actual_symbol} (and (text.contains? symbol_prefix actual_symbol) @@ -203,7 +203,7 @@ (_.coverage [/.with_symbols] (with_expansions [<expected> (fresh_symbol)] (|> (/.with_symbols [<expected>] - (# meta.monad in <expected>)) + (at meta.monad in <expected>)) (meta.result lux) (!expect (^.multi {try.#Success [_ {.#Symbol ["" actual]}]} (text.contains? (template.text [<expected>]) diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux index f3991eda0..f01a61c3f 100644 --- a/stdlib/source/test/lux/macro/code.lux +++ b/stdlib/source/test/lux/macro/code.lux @@ -38,7 +38,7 @@ (def: (random_sequence random) (All (_ a) (-> (Random a) (Random (List a)))) (do [! random.monad] - [size (|> random.nat (# ! each (n.% 3)))] + [size (|> random.nat (at ! each (n.% 3)))] (random.list size random))) (def: .public random @@ -78,7 +78,7 @@ (function (_ replacement_simulation) (let [for_sequence (is (-> (-> (List Code) Code) (Random [Code Code])) (function (_ to_code) - (random.only (|>> product.left (# /.equivalence = original) not) + (random.only (|>> product.left (at /.equivalence = original) not) (do [! random.monad] [parts (..random_sequence replacement_simulation)] (in [(to_code (list#each product.left parts)) @@ -86,7 +86,7 @@ (all random.either (random#in [original substitute]) (do [! random.monad] - [sample (random.only (|>> (# /.equivalence = original) not) + [sample (random.only (|>> (at /.equivalence = original) not) (all random.either (random#each /.bit random.bit) (random#each /.nat random.nat) @@ -110,15 +110,15 @@ (_.coverage [<coverage>] (and (case (..read (/.format (<coverage> expected))) {try.#Success actual} - (# /.equivalence = - actual - (<coverage> expected)) + (at /.equivalence = + actual + (<coverage> expected)) {try.#Failure error} false) - (# /.equivalence = - [location.dummy {<tag> expected}] - (<coverage> expected)))))] + (at /.equivalence = + [location.dummy {<tag> expected}] + (<coverage> expected)))))] [/.bit random.bit .#Bit] [/.nat random.nat .#Nat] @@ -136,15 +136,15 @@ (_.coverage [<coverage>] (and (case (..read (/.format (<coverage> expected))) {try.#Success actual} - (# /.equivalence = - actual - (<coverage> expected)) + (at /.equivalence = + actual + (<coverage> expected)) {try.#Failure error} false) - (# /.equivalence = - [location.dummy {<tag> ["" expected]}] - (<coverage> expected))) + (at /.equivalence = + [location.dummy {<tag> ["" expected]}] + (<coverage> expected))) ))] [/.local ..random_text .#Symbol] @@ -162,13 +162,13 @@ (do [! random.monad] [[original substitute] (random.only (function (_ [original substitute]) - (not (# /.equivalence = original substitute))) + (not (at /.equivalence = original substitute))) (random.and ..random ..random)) [sample expected] (random.only (function (_ [sample expected]) - (not (# /.equivalence = sample expected))) + (not (at /.equivalence = sample expected))) (..replacement_simulation [original substitute]))] (_.coverage [/.replaced] - (# /.equivalence = - expected - (/.replaced original substitute sample)))) + (at /.equivalence = + expected + (/.replaced original substitute sample)))) ))) diff --git a/stdlib/source/test/lux/macro/pattern.lux b/stdlib/source/test/lux/macro/pattern.lux index 6fb9ef8d0..277d02830 100644 --- a/stdlib/source/test/lux/macro/pattern.lux +++ b/stdlib/source/test/lux/macro/pattern.lux @@ -30,8 +30,8 @@ Test (<| (_.covering /._) (do [! random.monad] - [expected_nat (# ! each (n.% 1) random.nat) - expected_int (# ! each (i.% +1) random.int) + [expected_nat (at ! each (n.% 1) random.nat) + expected_int (at ! each (i.% +1) random.int) expected_rev (random.either (in .5) (in .25)) expected_frac (random.either (in +0.5) @@ -40,7 +40,7 @@ (in "+1.25"))] (all _.and (do [! random.monad] - [sample (# ! each (n.% 5) random.nat)] + [sample (at ! each (n.% 5) random.nat)] (_.coverage [/.template] (case sample (/.template [<case>] diff --git a/stdlib/source/test/lux/macro/syntax/declaration.lux b/stdlib/source/test/lux/macro/syntax/declaration.lux index d3ef34ca2..f6a5a1973 100644 --- a/stdlib/source/test/lux/macro/syntax/declaration.lux +++ b/stdlib/source/test/lux/macro/syntax/declaration.lux @@ -23,7 +23,7 @@ (all random.and word (do [! random.monad] - [size (# ! each (n.% 10) random.nat)] + [size (at ! each (n.% 10) random.nat)] (random.list size word)) ))) @@ -44,4 +44,4 @@ false {try.#Success actual} - (# /.equivalence = expected actual))))))) + (at /.equivalence = expected actual))))))) diff --git a/stdlib/source/test/lux/macro/syntax/definition.lux b/stdlib/source/test/lux/macro/syntax/definition.lux index 7fa3550dd..504ff7e4b 100644 --- a/stdlib/source/test/lux/macro/syntax/definition.lux +++ b/stdlib/source/test/lux/macro/syntax/definition.lux @@ -74,7 +74,7 @@ false {try.#Success actual} - (# /.equivalence = expected actual))) + (at /.equivalence = expected actual))) (_.coverage [/.typed] (let [expected (has /.#value {.#Left [type untyped_value]} expected)] (case (<code>.result (/.typed compiler) @@ -83,7 +83,7 @@ false {try.#Success actual} - (# /.equivalence = expected actual)))) + (at /.equivalence = expected actual)))) (_.coverage [/.lacks_type] (let [expected (has /.#value {.#Right untyped_value} expected)] (case (<code>.result (/.typed compiler) diff --git a/stdlib/source/test/lux/macro/syntax/export.lux b/stdlib/source/test/lux/macro/syntax/export.lux index 151d72ada..3b4e6adb1 100644 --- a/stdlib/source/test/lux/macro/syntax/export.lux +++ b/stdlib/source/test/lux/macro/syntax/export.lux @@ -22,7 +22,7 @@ (Random [(Maybe Code) Nat]) (all random.and (|> random.bit - (# random.monad each code.bit) + (at random.monad each code.bit) random.maybe) random.nat)) diff --git a/stdlib/source/test/lux/macro/syntax/input.lux b/stdlib/source/test/lux/macro/syntax/input.lux index 2035941e8..6de252987 100644 --- a/stdlib/source/test/lux/macro/syntax/input.lux +++ b/stdlib/source/test/lux/macro/syntax/input.lux @@ -45,4 +45,4 @@ false {try.#Success actual} - (# (list.equivalence /.equivalence) = (list expected) actual))))))) + (at (list.equivalence /.equivalence) = (list expected) actual))))))) diff --git a/stdlib/source/test/lux/macro/syntax/type/variable.lux b/stdlib/source/test/lux/macro/syntax/type/variable.lux index 0e1d52f6f..55ab5bcc1 100644 --- a/stdlib/source/test/lux/macro/syntax/type/variable.lux +++ b/stdlib/source/test/lux/macro/syntax/type/variable.lux @@ -32,6 +32,6 @@ (_.coverage [/.format /.parser] (|> (list (/.format expected)) (<code>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) ))) diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/macro/template.lux index 027d45dc8..771c9c082 100644 --- a/stdlib/source/test/lux/macro/template.lux +++ b/stdlib/source/test/lux/macro/template.lux @@ -50,9 +50,9 @@ <short>' "abc#0#12+3-4.5"] (all _.and (_.coverage [/.spliced] - (# (list.equivalence nat.equivalence) = - (list left mid right) - (`` (list (~~ (/.spliced [left mid right])))))) + (at (list.equivalence nat.equivalence) = + (list left mid right) + (`` (list (~~ (/.spliced [left mid right])))))) (_.coverage [/.amount] (case (/.amount [left mid right]) 3 true diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux index 2cfc62142..9ea59ccd4 100644 --- a/stdlib/source/test/lux/math/logic/fuzzy.lux +++ b/stdlib/source/test/lux/math/logic/fuzzy.lux @@ -39,10 +39,10 @@ (do [! random.monad] [sample random.rev - threshold_0 (# ! each (r.% .5) - random.rev) - threshold_1 (# ! each (|>> (r.% .5) (r.+ .5)) - random.rev) + threshold_0 (at ! each (r.% .5) + random.rev) + threshold_1 (at ! each (|>> (r.% .5) (r.+ .5)) + random.rev) .let [bottom (r.min threshold_0 threshold_1) top (r.max threshold_0 threshold_1)]] @@ -89,7 +89,7 @@ [bottom middle_bottom middle_top top] (|> random.rev (random.set r.hash 4) - (# ! each (|>> set.list (list.sorted r.<))) + (at ! each (|>> set.list (list.sorted r.<))) (random.one (function (_ thresholds) (case thresholds (pattern (list threshold_0 threshold_1 threshold_2 threshold_3)) @@ -173,7 +173,7 @@ [bottom middle_bottom middle_top top] (|> random.rev (random.set r.hash 4) - (# ! each (|>> set.list (list.sorted r.<))) + (at ! each (|>> set.list (list.sorted r.<))) (random.one (function (_ thresholds) (case thresholds (pattern (list threshold_0 threshold_1 threshold_2 threshold_3)) diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux index 0137ba9ae..aaf670ba2 100644 --- a/stdlib/source/test/lux/math/modular.lux +++ b/stdlib/source/test/lux/math/modular.lux @@ -30,42 +30,42 @@ (def: .public (random modulus) (All (_ %) (-> (//.Modulus %) (Random (/.Mod %)))) - (# random.monad each - (/.modular modulus) - random.int)) + (at random.monad each + (/.modular modulus) + random.int)) (def: .public test Test (<| (_.covering /._) (_.for [/.Mod]) (do random.monad - [param##% ($//.random +1,000,000) - param (..random param##%) + [param::% ($//.random +1,000,000) + param (..random param::%) - subject##% (random.only (predicate.and (|>> //.divisor (i.> +2)) - (|>> (//.= param##%) not)) + subject::% (random.only (predicate.and (|>> //.divisor (i.> +2)) + (|>> (//.= param::%) not)) ($//.random +1,000,000)) - subject (..random subject##%) - another (..random subject##%)] + subject (..random subject::%) + another (..random subject::%)] (`` (all _.and (_.for [/.equivalence /.=] - ($equivalence.spec /.equivalence (..random subject##%))) + ($equivalence.spec /.equivalence (..random subject::%))) (_.for [/.order /.<] - ($order.spec /.order (..random subject##%))) + ($order.spec /.order (..random subject::%))) (~~ (template [<composite> <monoid>] [(_.for [<monoid> <composite>] - ($monoid.spec /.equivalence (<monoid> subject##%) (..random subject##%)))] + ($monoid.spec /.equivalence (<monoid> subject::%) (..random subject::%)))] [/.+ /.addition] [/.* /.multiplication] )) (_.for [/.codec] - ($codec.spec /.equivalence (/.codec subject##%) (..random subject##%))) + ($codec.spec /.equivalence (/.codec subject::%) (..random subject::%))) (_.coverage [/.incorrect_modulus] (case (|> param - (# (/.codec param##%) encoded) - (# (/.codec subject##%) decoded)) + (at (/.codec param::%) encoded) + (at (/.codec subject::%) decoded)) {try.#Failure error} (exception.match? /.incorrect_modulus error) @@ -107,15 +107,15 @@ (_.coverage [/.adapter] (<| (try.else false) (do try.monad - [copy##% (//.modulus (//.divisor subject##%)) - adapt (/.adapter subject##% copy##%)] + [copy::% (//.modulus (//.divisor subject::%)) + adapt (/.adapter subject::% copy::%)] (in (|> subject /.value - (/.modular copy##%) + (/.modular copy::%) adapt (/.= subject)))))) (_.coverage [/.moduli_are_not_equal] - (case (/.adapter subject##% param##%) + (case (/.adapter subject::% param::%) {try.#Failure error} (exception.match? /.moduli_are_not_equal error) diff --git a/stdlib/source/test/lux/math/modulus.lux b/stdlib/source/test/lux/math/modulus.lux index 029fcbb6d..484a7470a 100644 --- a/stdlib/source/test/lux/math/modulus.lux +++ b/stdlib/source/test/lux/math/modulus.lux @@ -28,7 +28,7 @@ (def: .public (random range) (Ex (_ %) (-> Int (Random (/.Modulus %)))) (|> random.int - (# random.monad each (i.% range)) + (at random.monad each (i.% range)) (random.one (|>> /.modulus try.maybe)))) (def: .public test diff --git a/stdlib/source/test/lux/math/number.lux b/stdlib/source/test/lux/math/number.lux index bda05f0aa..eaa74ac25 100644 --- a/stdlib/source/test/lux/math/number.lux +++ b/stdlib/source/test/lux/math/number.lux @@ -34,7 +34,7 @@ (all _.and (_.coverage [/.bin] (`` (and (~~ (template [<=> <codec> <number>] - [(case (# <codec> decoded (..clean_commas <number>)) + [(case (at <codec> decoded (..clean_commas <number>)) {try.#Success actual} (<=> (/.bin <number>) actual) @@ -53,7 +53,7 @@ ))))) (_.coverage [/.oct] (`` (and (~~ (template [<=> <codec> <number>] - [(case (# <codec> decoded (..clean_commas <number>)) + [(case (at <codec> decoded (..clean_commas <number>)) {try.#Success actual} (<=> (/.oct <number>) actual) @@ -72,7 +72,7 @@ ))))) (_.coverage [/.hex] (`` (and (~~ (template [<=> <codec> <number>] - [(case (# <codec> decoded (..clean_commas <number>)) + [(case (at <codec> decoded (..clean_commas <number>)) {try.#Success actual} (<=> (/.hex <number>) actual) diff --git a/stdlib/source/test/lux/math/number/complex.lux b/stdlib/source/test/lux/math/number/complex.lux index 087ee1245..ee1a6e210 100644 --- a/stdlib/source/test/lux/math/number/complex.lux +++ b/stdlib/source/test/lux/math/number/complex.lux @@ -25,7 +25,7 @@ (def: dimension (Random Frac) (do [! random.monad] - [factor (|> random.nat (# ! each (|>> (n.% 1000) (n.max 1)))) + [factor (|> random.nat (at ! each (|>> (n.% 1000) (n.max 1)))) measure (|> random.safe_frac (random.only (f.> +0.0)))] (in (f.* (|> factor .int int.frac) measure)))) @@ -39,10 +39,10 @@ (def: angle (Random /.Complex) - (# random.monad each - (|>> (revised /.#real (f.% +1.0)) - (revised /.#imaginary (f.% +1.0))) - ..random)) + (at random.monad each + (|>> (revised /.#real (f.% +1.0)) + (revised /.#imaginary (f.% +1.0))) + ..random)) (def: construction Test @@ -257,7 +257,7 @@ Test (do [! random.monad] [sample ..random - degree (|> random.nat (# ! each (|>> (n.max 1) (n.% 5))))] + degree (|> random.nat (at ! each (|>> (n.max 1) (n.% 5))))] (_.coverage [/.roots] (|> sample (/.roots degree) diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux index c302d876c..c2e792e8b 100644 --- a/stdlib/source/test/lux/math/number/frac.lux +++ b/stdlib/source/test/lux/math/number/frac.lux @@ -28,7 +28,7 @@ (def: random (Random Frac) - (# random.monad each (|>> (i.% +1,000,000) i.frac) random.int)) + (at random.monad each (|>> (i.% +1,000,000) i.frac) random.int)) (def: constant Test @@ -54,7 +54,7 @@ Test (do [! random.monad] [sample ..random - shift (# ! each /.abs ..random)] + shift (at ! each /.abs ..random)] (all _.and (_.coverage [/.negative?] (bit#= (/.negative? sample) @@ -79,16 +79,16 @@ Test (all _.and (do [! random.monad] - [expected (# ! each (n.% 1,000,000) random.nat)] + [expected (at ! each (n.% 1,000,000) random.nat)] (_.coverage [/.nat] (|> expected n.frac /.nat (n.= expected)))) (do [! random.monad] - [expected (# ! each (i.% +1,000,000) random.int)] + [expected (at ! each (i.% +1,000,000) random.int)] (_.coverage [/.int] (|> expected i.frac /.int (i.= expected)))) (do [! random.monad] - [expected (# ! each (|>> (i64.left_shifted 52) .rev) - random.nat)] + [expected (at ! each (|>> (i64.left_shifted 52) .rev) + random.nat)] (_.coverage [/.rev] (|> expected r.frac /.rev (r.= expected)))) )) @@ -141,7 +141,7 @@ (all _.and (do [! random.monad] [.let [~= (/.approximately? ..margin_of_error)] - angle (|> random.safe_frac (# ! each (/.* /.tau)))] + angle (|> random.safe_frac (at ! each (/.* /.tau)))] (all _.and (_.coverage [/.sin /.asin] (trigonometric_symmetry /.sin /.asin angle)) @@ -165,7 +165,7 @@ (~= (/./ +2.0 /.tau) /.pi)) )) (do [! random.monad] - [sample (|> random.safe_frac (# ! each (/.* +1000.0)))] + [sample (|> random.safe_frac (at ! each (/.* +1000.0)))] (all _.and (_.coverage [/.ceil] (let [ceil'd (/.ceil sample)] @@ -195,8 +195,8 @@ )) (do [! random.monad] [.let [~= (/.approximately? ..margin_of_error)] - sample (# ! each (/.* +10.0) random.safe_frac) - power (# ! each (|>> (n.% 10) ++ n.frac) random.nat)] + sample (at ! each (/.* +10.0) random.safe_frac) + power (at ! each (|>> (n.% 10) ++ n.frac) random.nat)] (all _.and (_.coverage [/.exp /.log] (|> sample /.exp /.log (/.approximately? +0.000000000000001 sample))) @@ -211,9 +211,9 @@ )) (do [! random.monad] [.let [~= (/.approximately? ..margin_of_error)] - angle (# ! each (/.* /.tau) random.safe_frac) - sample (# ! each /.abs random.safe_frac) - big (# ! each (/.* +1,000,000,000.00) random.safe_frac)] + angle (at ! each (/.* /.tau) random.safe_frac) + sample (at ! each /.abs random.safe_frac) + big (at ! each (/.* +1,000,000,000.00) random.safe_frac)] (template.let [(odd! <function>) [(_.coverage [<function>] (~= (/.opposite (<function> angle)) @@ -241,8 +241,8 @@ (inverse! /.atanh /.acoth big) ))) (do [! random.monad] - [x (# ! each (|>> (/.* +10.0) /.abs) random.safe_frac) - y (# ! each (|>> (/.* +10.0) /.abs) random.safe_frac)] + [x (at ! each (|>> (/.* +10.0) /.abs) random.safe_frac) + y (at ! each (|>> (/.* +10.0) /.abs) random.safe_frac)] (_.coverage [/.hypotenuse] (let [h (/.hypotenuse x y)] (and (/.>= x h) @@ -250,8 +250,8 @@ (do [! random.monad] [.let [~= (/.approximately? ..margin_of_error) tau/4 (/./ +4.0 /.tau)] - x (# ! each (/.* tau/4) random.safe_frac) - y (# ! each (/.* tau/4) random.safe_frac)] + x (at ! each (/.* tau/4) random.safe_frac) + y (at ! each (/.* tau/4) random.safe_frac)] (_.coverage [/.atan_2] (let [expected (/.atan_2 x y) actual (if (/.> +0.0 x) @@ -264,7 +264,7 @@ (~= (/.opposite tau/4) (/.atan_2 +0.0 (/.opposite (/.abs y)))) (/.not_a_number? (/.atan_2 +0.0 +0.0)))))) (do [! random.monad] - [of (# ! each (|>> (n.% 10) ++) random.nat)] + [of (at ! each (|>> (n.% 10) ++) random.nat)] (_.coverage [/.factorial] (and (n.= 1 (/.factorial 0)) (|> (/.factorial of) (n.% of) (n.= 0))))) diff --git a/stdlib/source/test/lux/math/number/i16.lux b/stdlib/source/test/lux/math/number/i16.lux index 65f1c45c0..d8ee85c4a 100644 --- a/stdlib/source/test/lux/math/number/i16.lux +++ b/stdlib/source/test/lux/math/number/i16.lux @@ -16,7 +16,7 @@ (def: .public random (Random /.I16) - (# random.functor each /.i16 random.i64)) + (at random.functor each /.i16 random.i64)) (def: .public test Test @@ -27,12 +27,12 @@ //i64.mask .int ++)] - expected (# ! each (i.% limit) random.int)] + expected (at ! each (i.% limit) random.int)] (all _.and (_.for [/.equivalence] ($equivalence.spec /.equivalence ..random)) (_.coverage [/.i16 /.i64 /.width] (let [actual (|> expected .i64 /.i16 /.i64)] - (# //i64.equivalence = expected actual))) + (at //i64.equivalence = expected actual))) )))) diff --git a/stdlib/source/test/lux/math/number/i32.lux b/stdlib/source/test/lux/math/number/i32.lux index 687621561..189e79b06 100644 --- a/stdlib/source/test/lux/math/number/i32.lux +++ b/stdlib/source/test/lux/math/number/i32.lux @@ -16,7 +16,7 @@ (def: .public random (Random /.I32) - (# random.functor each /.i32 random.i64)) + (at random.functor each /.i32 random.i64)) (def: .public test Test @@ -27,12 +27,12 @@ //i64.mask .int ++)] - expected (# ! each (i.% limit) random.int)] + expected (at ! each (i.% limit) random.int)] (all _.and (_.for [/.equivalence] ($equivalence.spec /.equivalence ..random)) (_.coverage [/.i32 /.i64 /.width] (let [actual (|> expected .i64 /.i32 /.i64)] - (# //i64.equivalence = expected actual))) + (at //i64.equivalence = expected actual))) )))) diff --git a/stdlib/source/test/lux/math/number/i64.lux b/stdlib/source/test/lux/math/number/i64.lux index 550d6f03d..75324e869 100644 --- a/stdlib/source/test/lux/math/number/i64.lux +++ b/stdlib/source/test/lux/math/number/i64.lux @@ -22,7 +22,7 @@ Test (do [! random.monad] [pattern random.nat - idx (# ! each (n.% /.width) random.nat)] + idx (at ! each (n.% /.width) random.nat)] (all _.and (_.coverage [/.one? /.one] (if (/.one? idx pattern) @@ -48,7 +48,7 @@ [pattern random.nat] (all _.and (do ! - [idx (# ! each (|>> (n.% (-- /.width)) ++) random.nat)] + [idx (at ! each (|>> (n.% (-- /.width)) ++) random.nat)] (_.coverage [/.left_shifted /.right_shifted] (let [nullity! (and (/#= pattern (/.left_shifted 0 pattern)) @@ -74,7 +74,7 @@ (<| (_.for [/.Mask]) (do [! random.monad] [pattern random.nat - idx (# ! each (n.% /.width) random.nat) + idx (at ! each (n.% /.width) random.nat) signed random.int] (all _.and (_.coverage [/.sign] @@ -98,9 +98,9 @@ empty! full!))) (do ! - [size (# ! each (n.% /.width) random.nat) + [size (at ! each (n.% /.width) random.nat) .let [spare (n.- size /.width)] - offset (# ! each (n.% spare) random.nat)] + offset (at ! each (n.% spare) random.nat)] (_.coverage [/.region] (case size 0 (/#= /.false (/.region offset size)) @@ -122,7 +122,7 @@ Test (_.for [/.Sub] (do [! random.monad] - [size (# ! each (n.% /.width) random.nat)] + [size (at ! each (n.% /.width) random.nat)] (case (/.sub size) {.#None} (_.coverage [/.sub] @@ -130,19 +130,19 @@ {.#Some sub} (do [! random.monad] - [.let [limit (|> (-- (# sub bits)) + [.let [limit (|> (-- (at sub bits)) /.mask .int ++)] - expected (# ! each (i.% limit) random.int) + expected (at ! each (i.% limit) random.int) .let [random (is (All (_ size) (-> (-> I64 (I64 size)) (Random (I64 size)))) (function (_ narrow) - (# random.functor each narrow random.i64)))]] + (at random.functor each narrow random.i64)))]] (all _.and - ($equivalence.spec (# sub sub_equivalence) (random (# sub narrow))) + ($equivalence.spec (at sub sub_equivalence) (random (at sub narrow))) (_.coverage [/.sub] - (let [actual (|> expected .i64 (# sub narrow) (# sub wide))] + (let [actual (|> expected .i64 (at sub narrow) (at sub wide))] (/#= expected actual))) )))))) @@ -165,7 +165,7 @@ (_.for [.I64]) (do [! random.monad] [pattern random.nat - idx (# ! each (n.% /.width) random.nat)] + idx (at ! each (n.% /.width) random.nat)] (all _.and (_.coverage [/.width /.bits_per_byte /.bytes_per_i64] (and (n.= /.bytes_per_i64 diff --git a/stdlib/source/test/lux/math/number/i8.lux b/stdlib/source/test/lux/math/number/i8.lux index 9f45a2e8c..edf503bf9 100644 --- a/stdlib/source/test/lux/math/number/i8.lux +++ b/stdlib/source/test/lux/math/number/i8.lux @@ -16,7 +16,7 @@ (def: .public random (Random /.I8) - (# random.functor each /.i8 random.i64)) + (at random.functor each /.i8 random.i64)) (def: .public test Test @@ -27,12 +27,12 @@ //i64.mask .int ++)] - expected (# ! each (i.% limit) random.int)] + expected (at ! each (i.% limit) random.int)] (all _.and (_.for [/.equivalence] ($equivalence.spec /.equivalence ..random)) (_.coverage [/.i8 /.i64 /.width] (let [actual (|> expected .i64 /.i8 /.i64)] - (# //i64.equivalence = expected actual))) + (at //i64.equivalence = expected actual))) )))) diff --git a/stdlib/source/test/lux/math/number/int.lux b/stdlib/source/test/lux/math/number/int.lux index 1509a65fc..76ed060da 100644 --- a/stdlib/source/test/lux/math/number/int.lux +++ b/stdlib/source/test/lux/math/number/int.lux @@ -167,7 +167,7 @@ )) (do [! random.monad] [.let [random (|> random.int - (# ! each (/.% +1,000)) + (at ! each (/.% +1,000)) (random.only (|>> (/.= +0) not)))] left random right random] @@ -208,14 +208,14 @@ (and subtraction! inverse!)))) (do [! random.monad] - [expected (# ! each (/.% +1,000,000) random.int) + [expected (at ! each (/.% +1,000,000) random.int) sample random.int] (_.coverage [/.frac] (and (|> expected /.frac f.int (/.= expected)) (f.number? (/.frac sample))))) (do [! random.monad] [pattern random.int - idx (# ! each (n.% i64.width) random.nat)] + idx (at ! each (n.% i64.width) random.nat)] (_.coverage [/.right_shifted] (let [nullity! (/.= pattern (/.right_shifted 0 pattern)) diff --git a/stdlib/source/test/lux/math/number/nat.lux b/stdlib/source/test/lux/math/number/nat.lux index 733b6445e..54471e9b3 100644 --- a/stdlib/source/test/lux/math/number/nat.lux +++ b/stdlib/source/test/lux/math/number/nat.lux @@ -104,7 +104,7 @@ (/.= rem (/.% left right))))) )) (do [! random.monad] - [.let [random (# ! each (|>> (/.% 1,000) ++) random.nat)] + [.let [random (at ! each (|>> (/.% 1,000) ++) random.nat)] left random right random] (all _.and @@ -121,7 +121,7 @@ (/.= 0 (/.% right lcm))))) )) (do [! random.monad] - [expected (# ! each (/.% 1,000,000) random.nat) + [expected (at ! each (/.% 1,000,000) random.nat) sample random.nat] (_.coverage [/.frac] (and (|> expected /.frac f.nat (/.= expected)) diff --git a/stdlib/source/test/lux/math/number/ratio.lux b/stdlib/source/test/lux/math/number/ratio.lux index fe01953dc..7b8d252ef 100644 --- a/stdlib/source/test/lux/math/number/ratio.lux +++ b/stdlib/source/test/lux/math/number/ratio.lux @@ -22,9 +22,9 @@ (def: part (Random Nat) - (# random.monad each - (|>> (n.% 1,000,000) (n.max 1)) - random.nat)) + (at random.monad each + (|>> (n.% 1,000,000) (n.max 1)) + random.nat)) (def: .public random (Random /.Ratio) diff --git a/stdlib/source/test/lux/math/number/rev.lux b/stdlib/source/test/lux/math/number/rev.lux index 82b16e725..72d03d335 100644 --- a/stdlib/source/test/lux/math/number/rev.lux +++ b/stdlib/source/test/lux/math/number/rev.lux @@ -89,27 +89,27 @@ (and (/.< left (/.* left right)) (/.< right (/.* left right))))) (do [! random.monad] - [.let [dividend (# ! each (i64.and (hex "FFFF")) - random.rev) - divisor (# ! each (|>> (i64.and (hex "F")) - (i64.or (hex "1")) - (i64.right_rotated 8) - .rev) - random.nat)] + [.let [dividend (at ! each (i64.and (hex "FFFF")) + random.rev) + divisor (at ! each (|>> (i64.and (hex "F")) + (i64.or (hex "1")) + (i64.right_rotated 8) + .rev) + random.nat)] dividend (random.only (/.> .0) dividend) divisor/0 divisor divisor/1 (random.only (|>> (/.= divisor/0) not) divisor) - scale (# ! each (|>> (n.% 10) ++) - random.nat)] + scale (at ! each (|>> (n.% 10) ++) + random.nat)] (all _.and (_.coverage [/./] (bit#= (/.< divisor/0 divisor/1) (/.> (/./ divisor/0 dividend) (/./ divisor/1 dividend)))) (_.coverage [/.%] - (# i64.equivalence = - (.i64 (n.% (.nat divisor/0) (.nat dividend))) - (.i64 (/.% divisor/0 dividend)))) + (at i64.equivalence = + (.i64 (n.% (.nat divisor/0) (.nat dividend))) + (.i64 (/.% divisor/0 dividend)))) (_.coverage [/.up /.down] (let [symmetry! (|> dividend @@ -156,8 +156,8 @@ (/.= (/.reciprocal sample) (|> sample /.reciprocal .nat /.reciprocal .nat /.reciprocal)))) (do [! random.monad] - [expected (# ! each (|>> f.abs (f.% +1.0)) - random.safe_frac) + [expected (at ! each (|>> f.abs (f.% +1.0)) + random.safe_frac) sample random.rev] (_.coverage [/.frac] (and (|> expected f.rev /.frac (f.= expected)) diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux index 87823e85a..9c162b1fe 100644 --- a/stdlib/source/test/lux/meta.lux +++ b/stdlib/source/test/lux/meta.lux @@ -77,12 +77,12 @@ .#host []]]] (all _.and (_.coverage [/.result] - (|> (# /.monad in expected) + (|> (at /.monad in expected) (/.result expected_lux) (!expect (^.multi {try.#Success actual} (n.= expected actual))))) (_.coverage [/.result'] - (|> (# /.monad in expected) + (|> (at /.monad in expected) (/.result' expected_lux) (!expect (^.multi {try.#Success [actual_lux actual]} (and (same? expected_lux actual_lux) @@ -152,7 +152,7 @@ (!expect (^.multi {try.#Failure actual_error} (text#= expected_error actual_error)))))) (_.coverage [/.either] - (and (|> (/.either (# /.monad in expected) + (and (|> (/.either (at /.monad in expected) (is (Meta Nat) (/.failure expected_error))) (/.result expected_lux) @@ -160,7 +160,7 @@ (n.= expected actual)))) (|> (/.either (is (Meta Nat) (/.failure expected_error)) - (# /.monad in expected)) + (at /.monad in expected)) (/.result expected_lux) (!expect (^.multi {try.#Success actual} (n.= expected actual)))) @@ -172,8 +172,8 @@ (!expect (^.multi {try.#Failure actual_error} (text#= (location.with location.dummy expected_error) actual_error)))) - (|> (/.either (# /.monad in expected) - (# /.monad in dummy)) + (|> (/.either (at /.monad in expected) + (at /.monad in dummy)) (/.result expected_lux) (!expect (^.multi {try.#Success actual} (n.= expected actual)))) @@ -184,7 +184,7 @@ (!expect (^.multi {try.#Success {try.#Failure actual_error}} (text#= (location.with location.dummy expected_error) actual_error)))) - (|> (/.try (# /.monad in expected)) + (|> (/.try (at /.monad in expected)) (/.result expected_lux) (!expect (^.multi {try.#Success {try.#Success actual}} (same? expected actual)))))) @@ -272,13 +272,13 @@ (_.coverage [/.imported_modules] (and (|> (/.imported_modules expected_current_module) (/.result expected_lux) - (try#each (# (list.equivalence text.equivalence) = - (list imported_module_name))) + (try#each (at (list.equivalence text.equivalence) = + (list imported_module_name))) (try.else false)) (|> (/.imported_modules imported_module_name) (/.result expected_lux) - (try#each (# (list.equivalence text.equivalence) = - (list))) + (try#each (at (list.equivalence text.equivalence) = + (list))) (try.else false)))) (_.coverage [/.imported_by?] (|> (/.imported_by? imported_module_name expected_current_module) @@ -314,9 +314,9 @@ version (random.upper_case 1) source_code (random.upper_case 1) expected_current_module (random.upper_case 1) - expected_type (# ! each (function (_ name) - {.#Primitive name (list)}) - (random.upper_case 1)) + expected_type (at ! each (function (_ name) + {.#Primitive name (list)}) + (random.upper_case 1)) expected_seed random.nat expected random.nat dummy (random.only (|>> (n.= expected) not) random.nat) @@ -379,9 +379,9 @@ expected_macro_module (random.only (|>> (text#= expected_current_module) not) (random.upper_case 1)) expected_short (random.upper_case 1) - expected_type (# ! each (function (_ name) - {.#Primitive name (list)}) - (random.upper_case 1)) + expected_type (at ! each (function (_ name) + {.#Primitive name (list)}) + (random.upper_case 1)) expected_value (random.either (in .def:) (in .macro:)) .let [expected_lux @@ -495,9 +495,9 @@ expected_macro_module (random.only (|>> (text#= expected_current_module) not) (random.upper_case 1)) expected_short (random.upper_case 1) - expected_type (# ! each (function (_ name) - {.#Primitive name (list)}) - (random.upper_case 1)) + expected_type (at ! each (function (_ name) + {.#Primitive name (list)}) + (random.upper_case 1)) expected_value (random.either (in .def:) (in .macro:)) .let [expected_lux @@ -672,15 +672,15 @@ name_1 (random.only (|>> (text#= name_0) not) (random.upper_case 1)) - .let [random_tag (# ! each (|>> [label_module]) - (random.upper_case 1)) + .let [random_tag (at ! each (|>> [label_module]) + (random.upper_case 1)) random_labels (is (Random [Text (List Text)]) (do ! [head (random.lower_case 5)] (|> (random.lower_case 5) (random.only (|>> (text#= head) not)) (random.set text.hash 3) - (# ! each set.list) + (at ! each set.list) (random.and (in head)))))] tags_0 random_labels tags_1 (let [set/0 (set.of_list text.hash {.#Item tags_0})] @@ -740,15 +740,15 @@ type.equivalence))] (|> (/.tag_lists label_module) (/.result expected_lux) - (try#each (# equivalence = (list [(list#each (|>> [label_module]) {.#Item tags_0}) - type_0] - [(list#each (|>> [label_module]) {.#Item tags_1}) - type_1]))) + (try#each (at equivalence = (list [(list#each (|>> [label_module]) {.#Item tags_0}) + type_0] + [(list#each (|>> [label_module]) {.#Item tags_1}) + type_1]))) (try.else false)))) (_.coverage [/.tags_of] (|> (/.tags_of [label_module name_1]) (/.result expected_lux) - (try#each (# (maybe.equivalence (list.equivalence symbol.equivalence)) = {.#Some (list#each (|>> [label_module]) {.#Item tags_1})})) + (try#each (at (maybe.equivalence (list.equivalence symbol.equivalence)) = {.#Some (list#each (|>> [label_module]) {.#Item tags_1})})) (try.else false))) (_.coverage [/.tag] (|> {.#Item tags_0} @@ -763,9 +763,9 @@ actual_index) correct_tags! - (# (list.equivalence symbol.equivalence) = - (list#each (|>> [label_module]) {.#Item tags_0}) - actual_tags) + (at (list.equivalence symbol.equivalence) = + (list#each (|>> [label_module]) {.#Item tags_0}) + actual_tags) correct_type! (type#= type_0 @@ -787,9 +787,9 @@ actual_index) correct_tags! - (# (list.equivalence symbol.equivalence) = - (list#each (|>> [label_module]) {.#Item tags_1}) - actual_tags) + (at (list.equivalence symbol.equivalence) = + (list#each (|>> [label_module]) {.#Item tags_1}) + actual_tags) correct_type! (type#= type_1 @@ -806,7 +806,7 @@ [current_module (random.upper_case 1) [name_0 name_1 name_2 name_3 name_4] (|> (random.upper_case 1) (random.set text.hash 5) - (# ! each set.list) + (at ! each set.list) (random.one (function (_ values) (case values (pattern (list name_0 name_1 name_2 name_3 name_4)) @@ -878,57 +878,57 @@ type.equivalence))))] (|> /.locals (/.result expected_lux) - (try#each (# equivalence = (list (list [name_3 type_3]) - (list [name_1 type_1] - [name_2 type_2])))) + (try#each (at equivalence = (list (list [name_3 type_3]) + (list [name_1 type_1] + [name_2 type_2])))) (try.else false)))) (_.coverage [/.var_type] (and (|> (/.var_type name_0) (/.result expected_lux) - (try#each (# type.equivalence = type_0)) + (try#each (at type.equivalence = type_0)) (try.else false)) (|> (/.var_type name_1) (/.result expected_lux) - (try#each (# type.equivalence = type_1)) + (try#each (at type.equivalence = type_1)) (try.else false)) (|> (/.var_type name_2) (/.result expected_lux) - (try#each (# type.equivalence = type_2)) + (try#each (at type.equivalence = type_2)) (try.else false)) (|> (/.var_type name_3) (/.result expected_lux) - (try#each (# type.equivalence = type_3)) + (try#each (at type.equivalence = type_3)) (try.else false)))) (_.coverage [/.type] (and (|> (/.type ["" name_0]) (/.result expected_lux) - (try#each (# type.equivalence = type_0)) + (try#each (at type.equivalence = type_0)) (try.else false)) (|> (/.type ["" name_1]) (/.result expected_lux) - (try#each (# type.equivalence = type_1)) + (try#each (at type.equivalence = type_1)) (try.else false)) (|> (/.type ["" name_2]) (/.result expected_lux) - (try#each (# type.equivalence = type_2)) + (try#each (at type.equivalence = type_2)) (try.else false)) (|> (/.type ["" name_3]) (/.result expected_lux) - (try#each (# type.equivalence = type_3)) + (try#each (at type.equivalence = type_3)) (try.else false)) (|> (/.type [current_module name_4]) (/.result expected_lux) - (try#each (# type.equivalence = type_4)) + (try#each (at type.equivalence = type_4)) (try.else false)) (|> (/.type ["" name_4]) (/.result expected_lux) - (try#each (# type.equivalence = type_4)) + (try#each (at type.equivalence = type_4)) (try.else false)))) ))) (def: injection (Injection Meta) - (# /.monad in)) + (at /.monad in)) (def: (comparison init) (-> Lux (Comparison Meta)) @@ -951,9 +951,9 @@ version (random.upper_case 1) source_code (random.upper_case 1) expected_current_module (random.upper_case 1) - expected_type (# ! each (function (_ name) - {.#Primitive name (list)}) - (random.upper_case 1)) + expected_type (at ! each (function (_ name) + {.#Primitive name (list)}) + (random.upper_case 1)) expected_seed random.nat expected random.nat dummy (random.only (|>> (n.= expected) not) random.nat) diff --git a/stdlib/source/test/lux/meta/configuration.lux b/stdlib/source/test/lux/meta/configuration.lux index a8d7f0169..734fbef82 100644 --- a/stdlib/source/test/lux/meta/configuration.lux +++ b/stdlib/source/test/lux/meta/configuration.lux @@ -33,8 +33,8 @@ _ (do [! random.monad] [feature (random.upper_case amount) value (random.lower_case amount)] - (# ! each (|>> (partial_list [feature value])) - (random (-- amount)))))) + (at ! each (|>> (partial_list [feature value])) + (random (-- amount)))))) (syntax: (failure [it <code>.any]) (function (_ lux) @@ -63,7 +63,7 @@ (|> expected /.format (<text>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) (_.coverage [/.for] (and (and (/.for ["left" "<<<" diff --git a/stdlib/source/test/lux/meta/location.lux b/stdlib/source/test/lux/meta/location.lux index da7065d3b..36de9909c 100644 --- a/stdlib/source/test/lux/meta/location.lux +++ b/stdlib/source/test/lux/meta/location.lux @@ -33,7 +33,7 @@ ($equivalence.spec /.equivalence ..random)) (_.coverage [/.here] - (not (# /.equivalence = (/.here) (/.here)))) + (not (at /.equivalence = (/.here) (/.here)))) (do random.monad [location ..random error (random.alphabetic 10)] @@ -46,5 +46,5 @@ (do random.monad [[location _] $///code.random] (_.coverage [/.dummy] - (# /.equivalence = /.dummy location))) + (at /.equivalence = /.dummy location))) ))) diff --git a/stdlib/source/test/lux/meta/symbol.lux b/stdlib/source/test/lux/meta/symbol.lux index 349aa2cb7..e37dc06a9 100644 --- a/stdlib/source/test/lux/meta/symbol.lux +++ b/stdlib/source/test/lux/meta/symbol.lux @@ -30,12 +30,12 @@ (<| (_.covering /._) (do [! random.monad] [... First Symbol - sizeM1 (|> random.nat (# ! each (n.% 100))) - sizeS1 (|> random.nat (# ! each (|>> (n.% 100) (n.max 1)))) + sizeM1 (|> random.nat (at ! each (n.% 100))) + sizeS1 (|> random.nat (at ! each (|>> (n.% 100) (n.max 1)))) (^.let symbol1 [module1 short1]) (..random sizeM1 sizeS1) ... Second Symbol - sizeM2 (|> random.nat (# ! each (n.% 100))) - sizeS2 (|> random.nat (# ! each (|>> (n.% 100) (n.max 1)))) + sizeM2 (|> random.nat (at ! each (n.% 100))) + sizeS2 (|> random.nat (at ! each (|>> (n.% 100) (n.max 1)))) (^.let symbol2 [module2 short2]) (..random sizeM2 sizeS2)] (_.for [.Symbol] (all _.and @@ -43,7 +43,7 @@ ($equivalence.spec /.equivalence (..random sizeM1 sizeS1))) (_.for [/.hash] (|> (random.ascii 1) - (# ! each (|>> [""])) + (at ! each (|>> [""])) ($hash.spec /.hash))) (_.for [/.order] ($order.spec /.order (..random sizeM1 sizeS1))) @@ -51,11 +51,11 @@ (_.and ($codec.spec /.equivalence /.codec (..random sizeM1 sizeS1)) (_.property "Encoding a symbol without a module component results in text equal to the short of the symbol." (if (text.empty? module1) - (same? short1 (# /.codec encoded symbol1)) + (same? short1 (at /.codec encoded symbol1)) #1)))) (_.coverage [/.separator] - (let [it (# /.codec encoded symbol1)] + (let [it (at /.codec encoded symbol1)] (if (text.empty? module1) (same? short1 it) (text.contains? /.separator it)))) diff --git a/stdlib/source/test/lux/target/js.lux b/stdlib/source/test/lux/target/js.lux index 84cd62bdf..3bdd3ce1d 100644 --- a/stdlib/source/test/lux/target/js.lux +++ b/stdlib/source/test/lux/target/js.lux @@ -55,9 +55,9 @@ (Random Int) (do [! random.monad] [negative? random.bit - mantissa (# ! each (|>> (i64.and (static.nat (-- (i64.left_shifted (-- <range>) 1)))) - .int) - random.nat)] + mantissa (at ! each (|>> (i64.and (static.nat (-- (i64.left_shifted (-- <range>) 1)))) + .int) + random.nat)] (in (if negative? (i.* -1 mantissa) mantissa)))))] @@ -157,7 +157,7 @@ i32 ..int_32 i16 ..int_16 - shift (# ! each (n.% 16) random.nat)] + shift (at ! each (n.% 16) random.nat)] (`` (all _.and (~~ (template [<js> <lux>] [(_.coverage [<js>] @@ -205,8 +205,8 @@ (def: test|array Test (do [! random.monad] - [size (# ! each (|>> (n.% 10) ++) random.nat) - index (# ! each (n.% size) random.nat) + [size (at ! each (|>> (n.% 10) ++) random.nat) + index (at ! each (n.% size) random.nat) items (random.list size random.safe_frac) .let [expected (|> items (list.item index) @@ -230,8 +230,8 @@ dummy (random.only (|>> (text#= field) not) (random.upper_case 5)) - size (# ! each (|>> (n.% 10) ++) random.nat) - index (# ! each (n.% size) random.nat) + size (at ! each (|>> (n.% 10) ++) random.nat) + index (at ! each (n.% size) random.nat) items (random.list size random.safe_frac)] (all _.and (_.coverage [/.object /.the] @@ -356,7 +356,7 @@ (do [! random.monad] [number/0 random.safe_frac int/0 ..int_16 - $foreign (# ! each /.var (random.lower_case 10)) + $foreign (at ! each /.var (random.lower_case 10)) field (random.upper_case 10)] (all _.and (_.coverage [/.set] @@ -447,12 +447,12 @@ (do [! random.monad] [input ..int_16 - full_inner_iterations (# ! each (|>> (n.% 20) ++) random.nat) - expected_inner_iterations (# ! each (n.% full_inner_iterations) random.nat) + full_inner_iterations (at ! each (|>> (n.% 20) ++) random.nat) + expected_inner_iterations (at ! each (n.% full_inner_iterations) random.nat) - @outer (# ! each /.label (random.upper_case 5)) - full_outer_iterations (# ! each (|>> (n.% 10) ++) random.nat) - expected_outer_iterations (# ! each (n.% full_outer_iterations) random.nat) + @outer (at ! each /.label (random.upper_case 5)) + full_outer_iterations (at ! each (|>> (n.% 10) ++) random.nat) + expected_outer_iterations (at ! each (n.% full_outer_iterations) random.nat) .let [$input (/.var "input") $output (/.var "output") @@ -553,7 +553,7 @@ Test (do [! random.monad] [input ..int_16 - iterations (# ! each (n.% 10) random.nat) + iterations (at ! each (n.% 10) random.nat) .let [$input (/.var "input") $output (/.var "output") $index (/.var "index") @@ -607,7 +607,7 @@ [expected random.safe_frac dummy (random.only (|>> (f.= expected) not) random.safe_frac) - $ex (# ! each /.var (random.lower_case 10))] + $ex (at ! each /.var (random.lower_case 10))] (all _.and (_.coverage [/.try] (expression (|>> (as Frac) (f.= expected)) @@ -631,9 +631,9 @@ [number/0 random.safe_frac number/1 random.safe_frac number/2 random.safe_frac - $arg/0 (# ! each /.var (random.lower_case 10)) - $arg/1 (# ! each /.var (random.lower_case 11)) - $arg/2 (# ! each /.var (random.lower_case 12))] + $arg/0 (at ! each /.var (random.lower_case 10)) + $arg/1 (at ! each /.var (random.lower_case 11)) + $arg/2 (at ! each /.var (random.lower_case 12))] (`` (all _.and (_.coverage [/.apply_1] (expression (|>> (as Frac) (f.= number/0)) @@ -662,11 +662,11 @@ Test (do [! random.monad] [number/0 random.safe_frac - iterations (# ! each (n.% 10) random.nat) - $self (# ! each /.var (random.lower_case 1)) - $arg/0 (# ! each /.var (random.lower_case 2)) + iterations (at ! each (n.% 10) random.nat) + $self (at ! each /.var (random.lower_case 1)) + $arg/0 (at ! each /.var (random.lower_case 2)) field (random.lower_case 3) - $class (# ! each /.var (random.upper_case 4))] + $class (at ! each /.var (random.upper_case 4))] (all _.and (_.coverage [/.closure /.return] (expression (|>> (as Frac) (f.= number/0)) @@ -768,9 +768,9 @@ [number/0 random.safe_frac number/1 random.safe_frac number/2 random.safe_frac - $arg/0 (# ! each /.var (random.lower_case 10)) - $arg/1 (# ! each /.var (random.lower_case 11)) - $arg/2 (# ! each /.var (random.lower_case 12)) + $arg/0 (at ! each /.var (random.lower_case 10)) + $arg/1 (at ! each /.var (random.lower_case 11)) + $arg/2 (at ! each /.var (random.lower_case 12)) ??? random.bit int ..int_16] (`` (all _.and diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux index c2c1e49f3..9f93ee4e1 100644 --- a/stdlib/source/test/lux/target/jvm.lux +++ b/stdlib/source/test/lux/target/jvm.lux @@ -184,7 +184,7 @@ (/.invokestatic ..$Byte "valueOf" (/type.method [(list) (list /type.byte) ..$Byte (list)]))) (def: $Byte::random (Random java/lang/Byte) - (# random.monad each (|>> (as java/lang/Long) ffi.long_to_byte) random.int)) + (at random.monad each (|>> (as java/lang/Long) ffi.long_to_byte) random.int)) (def: $Byte::literal (-> java/lang/Byte (Bytecode Any)) (|>> ffi.byte_to_long (as I64) i32.i32 /.int)) @@ -202,7 +202,7 @@ (/.invokestatic ..$Short "valueOf" (/type.method [(list) (list /type.short) ..$Short (list)]))) (def: $Short::random (Random java/lang/Short) - (# random.monad each (|>> (as java/lang/Long) ffi.long_to_short) random.int)) + (at random.monad each (|>> (as java/lang/Long) ffi.long_to_short) random.int)) (def: $Short::literal (-> java/lang/Short (Bytecode Any)) (|>> ffi.short_to_long (as I64) i32.i32 /.int)) @@ -220,7 +220,7 @@ (/.invokestatic ..$Integer "valueOf" (/type.method [(list) (list /type.int) ..$Integer (list)]))) (def: $Integer::random (Random java/lang/Integer) - (# random.monad each (|>> (as java/lang/Long) ffi.long_to_int) random.int)) + (at random.monad each (|>> (as java/lang/Long) ffi.long_to_int) random.int)) (def: $Integer::literal (-> java/lang/Integer (Bytecode Any)) (|>> ffi.int_to_long (as I64) i32.i32 /.int)) @@ -248,9 +248,9 @@ (def: $Float::wrap (/.invokestatic ..$Float "valueOf" (/type.method [(list) (list /type.float) ..$Float (list)]))) (def: $Float::random (Random java/lang/Float) - (# random.monad each - (|>> (as java/lang/Double) ffi.double_to_float) - random.frac)) + (at random.monad each + (|>> (as java/lang/Double) ffi.double_to_float) + random.frac)) (def: $Float::literal /.float) (def: valid_float (Random java/lang/Float) @@ -288,7 +288,7 @@ (/.invokestatic ..$Character "valueOf" (/type.method [(list) (list /type.char) ..$Character (list)]))) (def: $Character::random (Random java/lang/Character) - (# random.monad each (|>> (as java/lang/Long) ffi.long_to_int ffi.int_to_char) random.int)) + (at random.monad each (|>> (as java/lang/Long) ffi.long_to_int ffi.int_to_char) random.int)) (def: $Character::literal (-> java/lang/Character (Bytecode Any)) (|>> ffi.char_to_long (as I64) i32.i32 /.int)) @@ -323,7 +323,7 @@ [(def: <name> Test (do [! random.monad] - [expected (# ! each (i64.and (i64.mask <bits>)) random.nat)] + [expected (at ! each (i64.and (i64.mask <bits>)) random.nat)] (<| (_.lifted <message>) (..bytecode (for @.old (|>> (as <type>) <to_long> ("jvm leq" expected)) @@ -402,7 +402,7 @@ shift (is (-> (-> java/lang/Integer java/lang/Integer java/lang/Integer) (Bytecode Any) (Random Bit)) (function (_ reference instruction) (do [! random.monad] - [parameter (# ! each (|>> (n.% 32) .int (as java/lang/Long) ffi.long_to_int) random.nat) + [parameter (at ! each (|>> (n.% 32) .int (as java/lang/Long) ffi.long_to_int) random.nat) subject ..$Integer::random] (int (reference parameter subject) (do /.monad @@ -481,7 +481,7 @@ shift (is (-> (-> java/lang/Integer java/lang/Long java/lang/Long) (Bytecode Any) (Random Bit)) (function (_ reference instruction) (do [! random.monad] - [parameter (# ! each (|>> (n.% 64) (as java/lang/Long)) random.nat) + [parameter (at ! each (|>> (n.% 64) (as java/lang/Long)) random.nat) subject ..$Long::random] (long (reference (ffi.long_to_int parameter) subject) (do /.monad @@ -963,7 +963,7 @@ Test)) (function (_ constructor random literal [*store *load *wrap] test) (do [! random.monad] - [size (# ! each (|>> (n.% 1024) (n.max 1)) random.nat) + [size (at ! each (|>> (n.% 1024) (n.max 1)) random.nat) value random] (all _.and (<| (_.lifted "length") @@ -1035,8 +1035,8 @@ (function (_ expected) (|>> (as Text) (text#= (as Text expected)))))) (<| (_.context "multi") (do [! random.monad] - [.let [size (# ! each (|>> (n.% 5) (n.+ 1)) - random.nat)] + [.let [size (at ! each (|>> (n.% 5) (n.+ 1)) + random.nat)] dimensions size sizesH size sizesT (random.list (-- dimensions) size) @@ -1148,7 +1148,7 @@ (function (_ random_value literal *wrap [store load] test) (do [! random.monad] [expected random_value - register (# ! each (n.% 128) random.nat)] + register (at ! each (n.% 128) random.nat)] (<| (..bytecode (test expected)) (do /.monad [_ (literal expected) @@ -1172,8 +1172,8 @@ (_.lifted "IINC" (do [! random.monad] [base ..$Byte::random - increment (# ! each (|>> (n.% 100) /unsigned.u1 try.trusted) - random.nat) + increment (at ! each (|>> (n.% 100) /unsigned.u1 try.trusted) + random.nat) .let [expected (is java/lang/Long (for @.old ("jvm ladd" @@ -1497,9 +1497,9 @@ (do [! random.monad] [expected ..$Long::random dummy ..$Long::random - minimum (# ! each (|>> (n.% 100) .int /signed.s4 try.trusted) - random.nat) - afterwards (# ! each (n.% 10) random.nat)]) + minimum (at ! each (|>> (n.% 100) .int /signed.s4 try.trusted) + random.nat) + afterwards (at ! each (n.% 10) random.nat)]) (..bytecode ((!::= java/lang/Long "jvm leq" "jvm long =") expected)) (do /.monad [@right /.new_label @@ -1516,13 +1516,13 @@ ..$Long::wrap)) (<| (_.lifted "LOOKUPSWITCH") (do [! random.monad] - [options (# ! each (|>> (n.% 10) (n.+ 1)) - random.nat) - choice (# ! each (n.% options) random.nat) + [options (at ! each (|>> (n.% 10) (n.+ 1)) + random.nat) + choice (at ! each (n.% options) random.nat) options (|> random.int - (# ! each (|>> (as java/lang/Long) ffi.long_to_int ffi.int_to_long (as Int))) + (at ! each (|>> (as java/lang/Long) ffi.long_to_int ffi.int_to_long (as Int))) (random.set i.hash options) - (# ! each set.list)) + (at ! each set.list)) .let [choice (maybe.trusted (list.item choice options))] expected ..$Long::random dummy ..$Long::random]) diff --git a/stdlib/source/test/lux/target/lua.lux b/stdlib/source/test/lux/target/lua.lux index fbdc7625e..98c79bcd2 100644 --- a/stdlib/source/test/lux/target/lua.lux +++ b/stdlib/source/test/lux/target/lua.lux @@ -108,7 +108,7 @@ (do [! random.monad] [left random.int right random.int - shift (# ! each (n.% 65) random.nat) + shift (at ! each (n.% 65) random.nat) parameter (random.only (|>> (i.= +0) not) random.int) @@ -196,8 +196,8 @@ (def: test|array Test (do [! random.monad] - [size (# ! each (|>> (n.% 10) ++) random.nat) - index (# ! each (n.% size) random.nat) + [size (at ! each (|>> (n.% 10) ++) random.nat) + index (at ! each (n.% size) random.nat) items (random.list size random.safe_frac) .let [expected (|> items (list.item index) @@ -223,13 +223,13 @@ dummy (random.only (|>> (f.= expected) not) random.safe_frac) - size (# ! each (|>> (n.% 10) ++) random.nat) - index (# ! each (n.% size) random.nat) + size (at ! each (|>> (n.% 10) ++) random.nat) + index (at ! each (n.% size) random.nat) items (random.list size random.safe_frac) - $self (# ! each /.var (random.lower_case 10)) - $table (# ! each /.var (random.lower_case 11)) - $arg (# ! each /.var (random.lower_case 12)) + $self (at ! each /.var (random.lower_case 10)) + $table (at ! each /.var (random.lower_case 11)) + $arg (at ! each /.var (random.lower_case 12)) field (random.upper_case 5) non_field (random.only (|>> (text#= field) not) (random.upper_case 5)) @@ -360,9 +360,9 @@ [float/0 random.safe_frac float/1 random.safe_frac int/0 ..int_16 - $foreign (# ! each /.var (random.lower_case 10)) - $arg/0 (# ! each /.var (random.lower_case 11)) - $arg/1 (# ! each /.var (random.lower_case 12)) + $foreign (at ! each /.var (random.lower_case 10)) + $arg/0 (at ! each /.var (random.lower_case 11)) + $arg/1 (at ! each /.var (random.lower_case 12)) field (random.upper_case 10)] (all _.and (_.coverage [/.set] @@ -411,14 +411,14 @@ (do [! random.monad] [input ..int_16 - full_iterations (# ! each (|>> (n.% 20) ++) random.nat) - expected_iterations (# ! each (|>> (n.% full_iterations) .int) random.nat) + full_iterations (at ! each (|>> (n.% 20) ++) random.nat) + expected_iterations (at ! each (|>> (n.% full_iterations) .int) random.nat) - $input (# ! each /.var (random.lower_case 10)) - $output (# ! each /.var (random.lower_case 11)) - $index (# ! each /.var (random.lower_case 12)) + $input (at ! each /.var (random.lower_case 10)) + $output (at ! each /.var (random.lower_case 11)) + $index (at ! each /.var (random.lower_case 12)) - @loop (# ! each /.label (random.lower_case 13)) + @loop (at ! each /.label (random.lower_case 13)) .let [expected (i.* expected_iterations input) expected_iterations (/.int expected_iterations)]] @@ -500,7 +500,7 @@ Test (do [! random.monad] [input ..int_16 - iterations (# ! each (n.% 10) random.nat) + iterations (at ! each (n.% 10) random.nat) .let [$input (/.var "input") $output (/.var "output") $index (/.var "index") @@ -560,8 +560,8 @@ [expected random.safe_frac dummy (random.only (|>> (f.= expected) not) random.safe_frac) - $verdict (# ! each /.var (random.lower_case 10)) - $outcome (# ! each /.var (random.lower_case 11))] + $verdict (at ! each /.var (random.lower_case 10)) + $outcome (at ! each /.var (random.lower_case 11))] (all _.and (_.coverage [/.pcall/1] (expression (|>> (as Frac) (f.= expected)) @@ -603,11 +603,11 @@ Test (do [! random.monad] [float/0 random.safe_frac - iterations (# ! each (n.% 10) random.nat) - $self (# ! each /.var (random.lower_case 1)) - $arg/0 (# ! each /.var (random.lower_case 2)) + iterations (at ! each (n.% 10) random.nat) + $self (at ! each /.var (random.lower_case 1)) + $arg/0 (at ! each /.var (random.lower_case 2)) field (random.lower_case 3) - $class (# ! each /.var (random.upper_case 4))] + $class (at ! each /.var (random.upper_case 4))] (all _.and (_.coverage [/.closure /.return] (expression (|>> (as Frac) (f.= float/0)) @@ -627,9 +627,9 @@ [float/0 random.safe_frac float/1 random.safe_frac float/2 random.safe_frac - $arg/0 (# ! each /.var (random.lower_case 10)) - $arg/1 (# ! each /.var (random.lower_case 11)) - $arg/2 (# ! each /.var (random.lower_case 12))] + $arg/0 (at ! each /.var (random.lower_case 10)) + $arg/1 (at ! each /.var (random.lower_case 11)) + $arg/2 (at ! each /.var (random.lower_case 12))] (`` (all _.and (_.coverage [/.apply] (expression (|>> (as Frac) (f.= (all f.+ float/0 float/1 float/2))) @@ -685,8 +685,8 @@ (do [! random.monad] [float/0 random.safe_frac float/1 random.safe_frac - $arg/0 (# ! each /.var (random.lower_case 10)) - $arg/1 (# ! each /.var (random.lower_case 11))] + $arg/0 (at ! each /.var (random.lower_case 10)) + $arg/1 (at ! each /.var (random.lower_case 11))] (`` (all _.and (_.coverage [/.statement /.then /.print/1] (expression (|>> (as Frac) (f.= float/0)) @@ -702,7 +702,7 @@ (def: .public test Test (do [! random.monad] - [.let [random (# ! each /.int random.int)] + [.let [random (at ! each /.int random.int)] expected random.int] (<| (_.covering /._) (_.for [/.Code /.code]) diff --git a/stdlib/source/test/lux/target/python.lux b/stdlib/source/test/lux/target/python.lux index 35fbf47c8..3dd88db55 100644 --- a/stdlib/source/test/lux/target/python.lux +++ b/stdlib/source/test/lux/target/python.lux @@ -157,8 +157,8 @@ [left random.int right random.int - i16 (# ! each ..int_16 random.int) - shift (# ! each (n.% 16) random.nat)] + i16 (at ! each ..int_16 random.int) + shift (at ! each (n.% 16) random.nat)] (`` (all _.and (~~ (template [</> <lux>] [(_.coverage [</>] @@ -209,7 +209,7 @@ (def: test|text Test (do [! random.monad] - [expected_code (# ! each (n.% 128) random.nat) + [expected_code (at ! each (n.% 128) random.nat) .let [expected_char (text.of_char expected_code)]] (all _.and (_.coverage [/.chr/1 /.ord/1 @@ -227,14 +227,14 @@ (def: test|array Test (do [! random.monad] - [size (# ! each (|>> (n.% 10) ++) random.nat) - index (# ! each (n.% size) random.nat) + [size (at ! each (|>> (n.% 10) ++) random.nat) + index (at ! each (n.% size) random.nat) items (random.list size random.safe_frac) .let [expected (|> items (list.item index) (maybe.else f.not_a_number))] - from (# ! each (n.% size) random.nat) - plus (# ! each (n.% (n.- from size)) random.nat) + from (at ! each (n.% size) random.nat) + plus (at ! each (n.% (n.- from size)) random.nat) .let [slice_from|size (n.- from size) to (/.int (.int (n.+ plus from))) from (/.int (.int from))]] @@ -293,8 +293,8 @@ string (random.upper_case 5) comment (random.upper_case 10) - $arg/0 (# ! each /.var (random.lower_case 10)) - $arg/1 (# ! each /.var (random.lower_case 11))] + $arg/0 (at ! each /.var (random.lower_case 10)) + $arg/1 (at ! each /.var (random.lower_case 11))] (all _.and ..test|bool ..test|float @@ -337,9 +337,9 @@ [float/0 random.safe_frac float/1 random.safe_frac float/2 random.safe_frac - $arg/0 (# ! each /.var (random.lower_case 10)) - $arg/1 (# ! each /.var (random.lower_case 11)) - $arg/2 (# ! each /.var (random.lower_case 12))] + $arg/0 (at ! each /.var (random.lower_case 10)) + $arg/1 (at ! each /.var (random.lower_case 11)) + $arg/2 (at ! each /.var (random.lower_case 12))] (all _.and (_.coverage [/.lambda] (expression (|>> (as Frac) (f.= float/0)) @@ -358,7 +358,7 @@ (do [! random.monad] [expected/0 random.safe_frac expected/1 random.safe_frac - poly_choice (# ! each (n.% 2) random.nat) + poly_choice (at ! each (n.% 2) random.nat) .let [keyword (|>> %.nat (format "k") /.string) keyword/0 (keyword 0) keyword/1 (keyword 1) @@ -366,8 +366,8 @@ .let [expected/? (case poly_choice 0 expected/0 _ expected/1)] - $var (# ! each (|>> %.nat (format "v") /.var) random.nat) - $choice (# ! each (|>> %.nat (format "c") /.var) random.nat)] + $var (at ! each (|>> %.nat (format "v") /.var) random.nat) + $choice (at ! each (|>> %.nat (format "c") /.var) random.nat)] (all _.and (_.coverage [/.Single /.SVar /.var] (expression (|>> (as Frac) (f.= expected/0)) @@ -445,10 +445,10 @@ (def: test|access Test (do [! random.monad] - [$var/0 (# ! each (|>> %.nat (format "v0_") /.var) random.nat) + [$var/0 (at ! each (|>> %.nat (format "v0_") /.var) random.nat) expected/0 random.safe_frac dummy/0 random.safe_frac - field (# ! each /.string (random.upper_case 1))] + field (at ! each /.string (random.upper_case 1))] (all _.and (_.coverage [/.item] (`` (and (~~ (template [<seq>] @@ -483,13 +483,13 @@ (def: test|location Test (do [! random.monad] - [$var/0 (# ! each (|>> %.nat (format "v0_") /.var) random.nat) - $var/1 (# ! each (|>> %.nat (format "v1_") /.var) random.nat) - $def (# ! each (|>> %.nat (format "def_") /.var) random.nat) + [$var/0 (at ! each (|>> %.nat (format "v0_") /.var) random.nat) + $var/1 (at ! each (|>> %.nat (format "v1_") /.var) random.nat) + $def (at ! each (|>> %.nat (format "def_") /.var) random.nat) expected/0 random.safe_frac expected/1 random.safe_frac dummy/0 random.safe_frac - field/0 (# ! each /.string (random.upper_case 1))] + field/0 (at ! each /.string (random.upper_case 1))] (all _.and (_.coverage [/.set] (|> (..statement @@ -598,7 +598,7 @@ expected random.safe_frac dummy (random.only (|>> (f.= expected) not) random.safe_frac) - $ex (# ! each (|>> %.nat (format "ex_") /.var) random.nat)] + $ex (at ! each (|>> %.nat (format "ex_") /.var) random.nat)] (all _.and (_.coverage [/.raise /.Exception/1] (case (try (..statement @@ -640,12 +640,12 @@ (def: test|loop Test (do [! random.monad] - [base (# ! each (n.% 100) random.nat) - factor (# ! each (|>> (n.% 10) ++) random.nat) - extra (# ! each (|>> (n.% 10) ++) random.nat) + [base (at ! each (n.% 100) random.nat) + factor (at ! each (|>> (n.% 10) ++) random.nat) + extra (at ! each (|>> (n.% 10) ++) random.nat) .let [expected (n.* factor base)] - $iteration (# ! each (|>> %.nat (format "iteration_") /.var) random.nat) - $temp (# ! each (|>> %.nat (format "temp_") /.var) random.nat)] + $iteration (at ! each (|>> %.nat (format "iteration_") /.var) random.nat) + $temp (at ! each (|>> %.nat (format "temp_") /.var) random.nat)] (all _.and (_.coverage [/.while] (and (|> (..statement @@ -745,8 +745,8 @@ (def: test|statement Test (do [! random.monad] - [$def (# ! each (|>> %.nat (format "def_") /.var) random.nat) - $input/0 (# ! each (|>> %.nat (format "input_") /.var) random.nat) + [$def (at ! each (|>> %.nat (format "def_") /.var) random.nat) + $input/0 (at ! each (|>> %.nat (format "input_") /.var) random.nat) expected/0 random.safe_frac test random.bit then random.safe_frac diff --git a/stdlib/source/test/lux/target/ruby.lux b/stdlib/source/test/lux/target/ruby.lux index 5e5588be7..3d0e61485 100644 --- a/stdlib/source/test/lux/target/ruby.lux +++ b/stdlib/source/test/lux/target/ruby.lux @@ -148,8 +148,8 @@ [left random.int right random.int - i16 (# ! each ..int_16 random.int) - shift (# ! each (n.% 16) random.nat)] + i16 (at ! each ..int_16 random.int) + shift (at ! each (n.% 16) random.nat)] (`` (all _.and (~~ (template [</> <lux>] [(_.coverage [</>] @@ -182,14 +182,14 @@ (def: test|array Test (do [! random.monad] - [size (# ! each (|>> (n.% 10) ++) random.nat) - index (# ! each (n.% size) random.nat) + [size (at ! each (|>> (n.% 10) ++) random.nat) + index (at ! each (n.% size) random.nat) items (random.list size random.safe_frac) .let [expected (|> items (list.item index) (maybe.else f.not_a_number))] - from (# ! each (n.% size) random.nat) - plus (# ! each (n.% (n.- from size)) random.nat) + from (at ! each (n.% size) random.nat) + plus (at ! each (n.% (n.- from size)) random.nat) .let [to (/.int (.int (n.+ plus from))) from (/.int (.int from))]] (all _.and @@ -230,22 +230,22 @@ (def: test|object Test (do [! random.monad] - [size (# ! each (|>> (n.% 10) ++) random.nat) - index (# ! each (n.% size) random.nat) + [size (at ! each (|>> (n.% 10) ++) random.nat) + index (at ! each (n.% size) random.nat) items (random.list size random.safe_frac) - $class (# ! each (|>> %.nat (format "class_") /.local) - random.nat) - $sub_class (# ! each (|>> %.nat (format "sub_class_") /.local) + $class (at ! each (|>> %.nat (format "class_") /.local) + random.nat) + $sub_class (at ! each (|>> %.nat (format "sub_class_") /.local) + random.nat) + $method/0 (at ! each (|>> %.nat (format "method_") /.local) random.nat) - $method/0 (# ! each (|>> %.nat (format "method_") /.local) - random.nat) $method/1 (|> random.nat - (# ! each (|>> %.nat (format "method_") /.local)) + (at ! each (|>> %.nat (format "method_") /.local)) (random.only (|>> (/#= $method/0) not))) - $arg/0 (# ! each (|>> %.nat (format "arg_") /.local) - random.nat) - $state (# ! each (|>> %.nat (format "instance_") /.instance) - random.nat) + $arg/0 (at ! each (|>> %.nat (format "arg_") /.local) + random.nat) + $state (at ! each (|>> %.nat (format "instance_") /.instance) + random.nat) single random.safe_frac .let [double (/.function $method/0 (list $arg/0) (/.return (/.+ $arg/0 $arg/0)))]] @@ -332,9 +332,9 @@ (<| (do [! random.monad] [left (random.upper_case 5) right (random.upper_case 5) - $old (# ! each /.local (random.upper_case 1)) - $new (# ! each /.local (random.upper_case 2)) - $it (# ! each /.local (random.upper_case 3)) + $old (at ! each /.local (random.upper_case 1)) + $new (at ! each /.local (random.upper_case 2)) + $it (at ! each /.local (random.upper_case 3)) .let [expected (format left right)]]) (all _.and (_.for [/.stdout] @@ -433,8 +433,8 @@ Test (do [! random.monad] [float/0 random.safe_frac - $global (# ! each /.global (random.lower_case 10)) - pattern (# ! each /.string (random.lower_case 11))] + $global (at ! each /.global (random.lower_case 10)) + pattern (at ! each /.string (random.lower_case 11))] (all _.and (_.coverage [/.global] (expression (|>> (as Text) (text#= "global-variable")) @@ -444,7 +444,7 @@ [(list)] (/.lambda {.#None}) (/.apply_lambda (list))))) (_.coverage [/.script_name] - (expression (let [file (format (# file.default separator) packager.main_file)] + (expression (let [file (format (at file.default separator) packager.main_file)] (|>> (as Text) (text.ends_with? file))) /.script_name)) @@ -487,7 +487,7 @@ Test (do [! random.monad] [float/0 random.safe_frac - $foreign (# ! each /.local (random.lower_case 10))] + $foreign (at ! each /.local (random.lower_case 10))] (all _.and (_.coverage [/.local] (expression (|>> (as Frac) (f.= (f.+ float/0 float/0))) @@ -507,15 +507,15 @@ Test (do [! random.monad] [float/0 random.safe_frac - instance (# ! each (|>> %.nat (format "instance_")) - random.nat) + instance (at ! each (|>> %.nat (format "instance_")) + random.nat) .let [$instance (/.instance instance)] - $method (# ! each (|>> %.nat (format "method_") /.local) + $method (at ! each (|>> %.nat (format "method_") /.local) + random.nat) + $class (at ! each (|>> %.nat (format "class_") /.local) random.nat) - $class (# ! each (|>> %.nat (format "class_") /.local) - random.nat) - $object (# ! each (|>> %.nat (format "object_") /.local) - random.nat)] + $object (at ! each (|>> %.nat (format "object_") /.local) + random.nat)] (all _.and (_.coverage [/.instance] (expression (|>> (as Frac) (f.= float/0)) @@ -578,16 +578,16 @@ (def: test|static_var Test (do [! random.monad] - [int/0 (# ! each (|>> (n.% 10) ++ .int) + [int/0 (at ! each (|>> (n.% 10) ++ .int) + random.nat) + $static (at ! each (|>> %.nat (format "static_") /.static) + random.nat) + $arg (at ! each (|>> %.nat /.local) random.nat) - $static (# ! each (|>> %.nat (format "static_") /.static) - random.nat) - $arg (# ! each (|>> %.nat /.local) - random.nat) - $method (# ! each (|>> %.nat (format "method_") /.local) - random.nat) - $class (# ! each (|>> %.nat (format "class_") /.local) - random.nat)] + $method (at ! each (|>> %.nat (format "method_") /.local) + random.nat) + $class (at ! each (|>> %.nat (format "class_") /.local) + random.nat)] (all _.and (_.coverage [/.static /.class_variable_set /.class_variable_get] (expression (|>> (as Int) (i.= int/0)) @@ -604,14 +604,14 @@ (def: test|variadic Test (do [! random.monad] - [$inputs (# ! each /.local (random.lower_case 10)) - arity (# ! each (n.% 10) random.nat) + [$inputs (at ! each /.local (random.lower_case 10)) + arity (at ! each (n.% 10) random.nat) vals (|> random.int - (# ! each /.int) + (at ! each /.int) (random.list arity)) keys (|> (random.lower_case 1) (random.set text.hash arity) - (# ! each (|>> set.list (list#each /.string))))] + (at ! each (|>> set.list (list#each /.string))))] (all _.and (<| (_.for [/.LVar*]) (all _.and @@ -637,9 +637,9 @@ Test (do [! random.monad] [float/0 random.safe_frac - $foreign (# ! each /.local (random.lower_case 10)) + $foreign (at ! each /.local (random.lower_case 10)) - $constant (# ! each /.constant (random.lower_case 10))] + $constant (at ! each /.constant (random.lower_case 10))] (all _.and (_.coverage [/.defined?/1] (and (expression (|>> (as Bit)) @@ -674,8 +674,8 @@ Test (do [! random.monad] [float/0 random.safe_frac - $foreign (# ! each /.local (random.lower_case 10)) - field (# ! each /.string (random.upper_case 10))] + $foreign (at ! each /.local (random.lower_case 10)) + field (at ! each /.string (random.upper_case 10))] (all _.and (<| (_.for [/.Var]) ..test|var) @@ -716,13 +716,13 @@ (def: test|label Test (do [! random.monad] - [input (# ! each ..int_16 random.int) + [input (at ! each ..int_16 random.int) - full_inner_iterations (# ! each (|>> (n.% 20) ++) random.nat) - expected_inner_iterations (# ! each (n.% full_inner_iterations) random.nat) + full_inner_iterations (at ! each (|>> (n.% 20) ++) random.nat) + expected_inner_iterations (at ! each (n.% full_inner_iterations) random.nat) - full_outer_iterations (# ! each (|>> (n.% 10) ++) random.nat) - expected_outer_iterations (# ! each (n.% full_outer_iterations) random.nat) + full_outer_iterations (at ! each (|>> (n.% 10) ++) random.nat) + expected_outer_iterations (at ! each (n.% full_outer_iterations) random.nat) .let [$input (/.local "input") $output (/.local "output") @@ -782,8 +782,8 @@ (def: test|loop Test (do [! random.monad] - [input (# ! each (i.right_shifted 32) random.int) - iterations (# ! each (n.% 10) random.nat) + [input (at ! each (i.right_shifted 32) random.int) + iterations (at ! each (n.% 10) random.nat) .let [$input (/.local "input") $output (/.local "output") $index (/.local "index") @@ -826,7 +826,7 @@ dummy (random.only (|>> (f.= expected) not) random.safe_frac) error (random.lower_case 10) - $ex (# ! each /.local (random.lower_case 10)) + $ex (at ! each /.local (random.lower_case 10)) expected_tag ..random_tag dummy_tag (random.only (|>> (i.= expected_tag) not) @@ -904,17 +904,17 @@ (def: test|function Test (do [! random.monad] - [iterations (# ! each (n.% 10) random.nat) - $self (# ! each /.local (random.lower_case 1)) + [iterations (at ! each (n.% 10) random.nat) + $self (at ! each /.local (random.lower_case 1)) field (random.lower_case 3) - $class (# ! each /.local (random.upper_case 4)) + $class (at ! each /.local (random.upper_case 4)) float/0 random.safe_frac float/1 random.safe_frac float/2 random.safe_frac - $arg/0 (# ! each /.local (random.lower_case 10)) - $arg/1 (# ! each /.local (random.lower_case 11)) - $arg/2 (# ! each /.local (random.lower_case 12))] + $arg/0 (at ! each /.local (random.lower_case 10)) + $arg/1 (at ! each /.local (random.lower_case 11)) + $arg/2 (at ! each /.local (random.lower_case 12))] (all _.and (_.coverage [/.lambda /.return] (and (expression (|>> (as Frac) (f.= float/0)) @@ -992,11 +992,11 @@ [float/0 random.safe_frac float/1 random.safe_frac float/2 random.safe_frac - $arg/0 (# ! each /.local (random.lower_case 10)) - $arg/1 (# ! each /.local (random.lower_case 11)) - $arg/2 (# ! each /.local (random.lower_case 12)) - expected (# ! each (|>> %.int (text.replaced "+" "")) - random.int)] + $arg/0 (at ! each /.local (random.lower_case 10)) + $arg/1 (at ! each /.local (random.lower_case 11)) + $arg/2 (at ! each /.local (random.lower_case 12)) + expected (at ! each (|>> %.int (text.replaced "+" "")) + random.int)] (all _.and (_.coverage [/.statement] (expression (|>> (as Frac) (f.= float/0)) diff --git a/stdlib/source/test/lux/test.lux b/stdlib/source/test/lux/test.lux index b43483870..c8c3d1492 100644 --- a/stdlib/source/test/lux/test.lux +++ b/stdlib/source/test/lux/test.lux @@ -100,7 +100,7 @@ (n.= 0 (the /.#successes tally)) (n.= 1 (the /.#failures tally))))))) (do [! random.monad] - [expected (# ! each (|>> (n.% 10) ++) random.nat) + [expected (at ! each (|>> (n.% 10) ++) random.nat) .let [counter (is (Atom Nat) (atom.atom 0))] times_assertion (<| (/.times expected) @@ -121,7 +121,7 @@ /.Test (all /.and (do [! random.monad] - [expected (# ! each (|>> (n.% 10) ++) random.nat) + [expected (at ! each (|>> (n.% 10) ++) random.nat) .let [counter (is (Atom Nat) (atom.atom 0))] assertion (<| /.in_parallel @@ -139,7 +139,7 @@ (n.= expected (the /.#successes tally)) (n.= 0 (the /.#failures tally))))))) (do [! random.monad] - [expected (# ! each (|>> (n.% 10) ++) random.nat) + [expected (at ! each (|>> (n.% 10) ++) random.nat) .let [counter (is (Atom Nat) (atom.atom 0))] assertion (<| /.in_parallel diff --git a/stdlib/source/test/lux/time.lux b/stdlib/source/test/lux/time.lux index 456409afd..5fe4af48e 100644 --- a/stdlib/source/test/lux/time.lux +++ b/stdlib/source/test/lux/time.lux @@ -53,16 +53,16 @@ (|> expected /.clock /.time - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))))) (def: for_ranges Test (do [! random.monad] - [valid_hour (# ! each (|>> (n.% /.hours) (n.max 10)) random.nat) - valid_minute (# ! each (|>> (n.% /.minutes) (n.max 10)) random.nat) - valid_second (# ! each (|>> (n.% /.seconds) (n.max 10)) random.nat) - valid_milli_second (# ! each (n.% /.milli_seconds) random.nat) + [valid_hour (at ! each (|>> (n.% /.hours) (n.max 10)) random.nat) + valid_minute (at ! each (|>> (n.% /.minutes) (n.max 10)) random.nat) + valid_second (at ! each (|>> (n.% /.seconds) (n.max 10)) random.nat) + valid_milli_second (at ! each (n.% /.milli_seconds) random.nat) .let [invalid_hour (|> valid_hour (n.+ /.hours)) invalid_minute (|> valid_minute (n.+ /.minutes) (n.min 99)) @@ -75,7 +75,7 @@ %.nat (text.prefix <prefix>) (text.suffix <suffix>) - (# /.codec decoded) + (at /.codec decoded) (pipe.case {try.#Success _} true {try.#Failure error} false)) @@ -85,7 +85,7 @@ %.nat (text.prefix <prefix>) (text.suffix <suffix>) - (# /.codec decoded) + (at /.codec decoded) (pipe.case {try.#Success _} false @@ -103,7 +103,7 @@ (|> valid_milli_second %.nat (format "00:00:00.") - (# /.codec decoded) + (at /.codec decoded) (pipe.case {try.#Success _} true {try.#Failure error} false))) @@ -117,8 +117,8 @@ [.let [day (.nat (duration.millis duration.day))] expected random.time - out_of_bounds (# ! each (|>> /.millis (n.+ day)) - random.time)] + out_of_bounds (at ! each (|>> /.millis (n.+ day)) + random.time)] (`` (all _.and ..for_implementation @@ -126,7 +126,7 @@ (|> expected /.millis /.of_millis - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) (_.coverage [/.time_exceeds_a_day] (case (/.of_millis out_of_bounds) @@ -141,9 +141,9 @@ (n.= 0))) (_.coverage [/.parser] (|> expected - (# /.codec encoded) + (at /.codec encoded) (<text>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) ..for_ranges (_.for [/.Clock] diff --git a/stdlib/source/test/lux/time/date.lux b/stdlib/source/test/lux/time/date.lux index 2d9a2486b..beaae5d9d 100644 --- a/stdlib/source/test/lux/time/date.lux +++ b/stdlib/source/test/lux/time/date.lux @@ -45,7 +45,7 @@ (|> (/.date (/.year expected) (/.month expected) (/.day_of_month expected)) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) (do random.monad [expected random.date] @@ -64,7 +64,7 @@ (|> expected /.days /.of_days - (# /.equivalence = expected)))) + (at /.equivalence = expected)))) (_.coverage [/.epoch] (|> /.epoch /.days @@ -72,17 +72,17 @@ (do random.monad [expected random.date] (_.coverage [/.parser] - (|> (# /.codec encoded expected) + (|> (at /.codec encoded expected) (<text>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) (do [! random.monad] - [year (# ! each (|>> (n.% 10,000) ++) - random.nat) - month (# ! each (|>> (n.% 10) (n.+ 13)) + [year (at ! each (|>> (n.% 10,000) ++) random.nat) - day (# ! each (|>> (n.% 10) (n.+ 10)) - random.nat) + month (at ! each (|>> (n.% 10) (n.+ 13)) + random.nat) + day (at ! each (|>> (n.% 10) (n.+ 10)) + random.nat) .let [input (format (%.nat year) "-" (%.nat month) "-" (%.nat day))]] diff --git a/stdlib/source/test/lux/time/day.lux b/stdlib/source/test/lux/time/day.lux index 432012147..0e7e958cc 100644 --- a/stdlib/source/test/lux/time/day.lux +++ b/stdlib/source/test/lux/time/day.lux @@ -59,7 +59,7 @@ (do random.monad [not_a_day (random.upper_case 1)] (_.coverage [/.not_a_day_of_the_week] - (case (# /.codec decoded not_a_day) + (case (at /.codec decoded not_a_day) {try.#Failure error} (exception.match? /.not_a_day_of_the_week error) @@ -69,7 +69,7 @@ (|> expected /.number /.by_number - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) (_.coverage [/.invalid_day] (case (/.by_number invalid) diff --git a/stdlib/source/test/lux/time/duration.lux b/stdlib/source/test/lux/time/duration.lux index d637ebf2f..4abe6f2e6 100644 --- a/stdlib/source/test/lux/time/duration.lux +++ b/stdlib/source/test/lux/time/duration.lux @@ -39,7 +39,7 @@ (do random.monad [duration random.duration] (_.coverage [/.of_millis /.millis] - (|> duration /.millis /.of_millis (# /.equivalence = duration)))) + (|> duration /.millis /.of_millis (at /.equivalence = duration)))) (do random.monad [.let [(open "#[0]") /.equivalence] expected random.duration @@ -67,10 +67,10 @@ [.let [(open "#[0]") /.order positive (|> random.duration (random.only (|>> (#= /.empty) not)) - (# ! each (function (_ duration) - (if (/.positive? duration) - duration - (/.inverse duration)))))] + (at ! each (function (_ duration) + (if (/.positive? duration) + duration + (/.inverse duration)))))] sample positive frame positive] (`` (all _.and @@ -82,7 +82,7 @@ (_.coverage [/.ticks] (i.= +1 (/.ticks sample sample))) (_.coverage [/.milli_second] - (#= /.empty (# /.enum pred /.milli_second))) + (#= /.empty (at /.enum pred /.milli_second))) (~~ (template [<factor> <big> <small>] [(_.coverage [<big>] (|> <big> (/.ticks <small>) (i.= <factor>)))] diff --git a/stdlib/source/test/lux/time/month.lux b/stdlib/source/test/lux/time/month.lux index b1950994b..a791e59a1 100644 --- a/stdlib/source/test/lux/time/month.lux +++ b/stdlib/source/test/lux/time/month.lux @@ -31,7 +31,7 @@ (Random /.Month) (let [december (/.number {/.#December})] (|> random.nat - (# random.monad each (|>> (n.% december) ++)) + (at random.monad each (|>> (n.% december) ++)) (random.one (|>> /.by_number try.maybe))))) (def: .public test @@ -60,7 +60,7 @@ (|> expected /.number /.by_number - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) (_.coverage [/.invalid_month] (case (/.by_number invalid) @@ -91,7 +91,7 @@ (do random.monad [not_a_month (random.upper_case 1)] (_.coverage [/.not_a_month_of_the_year] - (case (# /.codec decoded not_a_month) + (case (at /.codec decoded not_a_month) {try.#Failure error} (exception.match? /.not_a_month_of_the_year error) diff --git a/stdlib/source/test/lux/time/year.lux b/stdlib/source/test/lux/time/year.lux index f80e03838..ef4bebaa3 100644 --- a/stdlib/source/test/lux/time/year.lux +++ b/stdlib/source/test/lux/time/year.lux @@ -73,9 +73,9 @@ (n.= (.nat (//duration.ticks //duration.day //duration.normal_year)) /.days)) (_.coverage [/.epoch] - (# /.equivalence = - (//date.year (//instant.date //instant.epoch)) - /.epoch)) + (at /.equivalence = + (//date.year (//instant.date //instant.epoch)) + /.epoch)) (_.for [/.Period] (_.coverage [/.leap /.century /.era] (n.= /.leap (n./ /.century /.era)))) diff --git a/stdlib/source/test/lux/tool/compiler/arity.lux b/stdlib/source/test/lux/tool/compiler/arity.lux index 7ba4457d0..a53ca8c6d 100644 --- a/stdlib/source/test/lux/tool/compiler/arity.lux +++ b/stdlib/source/test/lux/tool/compiler/arity.lux @@ -18,7 +18,7 @@ (<| (_.covering /._) (_.for [/.Arity]) (do [! random.monad] - [arity (# ! each (n.% 3) random.nat)] + [arity (at ! each (n.% 3) random.nat)] (all _.and (_.coverage [/.nullary?] (bit#= (n.= 0 arity) (/.nullary? arity))) 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 a1f45b42d..c8d3a3c6d 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux @@ -478,7 +478,7 @@ (_.for [/.State+] ..test|state) (_.coverage [/.format] - (bit#= (# /.equivalence = left right) + (bit#= (at /.equivalence = left right) (text#= (/.format left) (/.format right)))) /complex.test diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/complex.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/complex.lux index 6b10cb6ea..0943b9cdf 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/complex.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/complex.lux @@ -21,8 +21,8 @@ (def: test|tag Test (do [! random.monad] - [multiplicity (# ! each (n.max 2) random.nat) - tag (# ! each (n.% multiplicity) random.nat) + [multiplicity (at ! each (n.max 2) random.nat) + tag (at ! each (n.% multiplicity) random.nat) lefts random.nat right? random.bit] (all _.and @@ -71,6 +71,6 @@ [left random right random] (_.coverage [/.format] - (bit#= (# (/.equivalence n.equivalence) = left right) + (bit#= (at (/.equivalence n.equivalence) = left right) (text#= (/.format %.nat left) (/.format %.nat right))))) )))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux index 362d94927..21c47404c 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux @@ -61,8 +61,8 @@ cases (random.set n.hash cases ..random_tag)] (|> cases set.list - (monad.each ! (function (_ case) (# ! each (|>> [case]) again))) - (# ! each (dictionary.of_list n.hash)))) + (monad.each ! (function (_ case) (at ! each (|>> [case]) again))) + (at ! each (dictionary.of_list n.hash)))) ) (random.and again again) (random.and again again) @@ -98,7 +98,7 @@ )) (do [! random.monad] - [tag (# ! each ++ ..random_tag) + [tag (at ! each ++ ..random_tag) right? random.bit .let [lefts (//complex.lefts right? tag)] [sub_coverage sub_pattern] again] @@ -205,7 +205,7 @@ [[expected/0 pattern/0] ..random_partial_pattern [expected/1 pattern/1] (random.only (|>> product.left (/#= expected/0) not) ..random_partial_pattern) - expected_maximum (# ! each (n.+ 2) ..random_tag) + expected_maximum (at ! each (n.+ 2) ..random_tag) .let [random_tag (random#each (n.% expected_maximum) random.nat)] tag/0 random_tag tag/1 (random.only (|>> (n.= tag/0) not) random_tag) @@ -252,7 +252,7 @@ frac random.frac text (random.unicode 1) - arity (# ! each (n.+ 2) ..random_tag) + arity (at ! each (n.+ 2) ..random_tag) .let [random_tag (random#each (n.% arity) random.nat)] tag/0 random_tag tag/1 (random.only (|>> (n.= tag/0) not) random_tag)] 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 f7acc50f8..f69dd6382 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 @@ -105,7 +105,7 @@ expected ..primitive name ($symbol.random 1 1) [type/0 term/0] ..simple_parameter - arity (# ! each (n.% 10) random.nat) + arity (at ! each (n.% 10) random.nat) nats (random.list arity random.nat)] (all _.and (_.coverage [/.general] @@ -125,9 +125,9 @@ (/phase.result state) (try#each (function (_ [actual analysis/*]) (and (type#= expected actual) - (# (list.equivalence //.equivalence) = - (list#each (|>> //.nat) nats) - analysis/*)))) + (at (list.equivalence //.equivalence) = + (list#each (|>> //.nat) nats) + analysis/*)))) (try.else false)) (|> (/.general archive.empty ..analysis (type (-> type/0 expected)) @@ -218,12 +218,12 @@ .let [state [/extension.#bundle (/extension/analysis.bundle ..eval) /extension.#state lux]] name ($symbol.random 1 1) - arity (# ! each (|>> (n.% 5) (n.+ 2)) random.nat) + arity (at ! each (|>> (n.% 5) (n.+ 2)) random.nat) [type/0 term/0] ..simple_parameter [type/1 term/1] (random.only (|>> product.left (same? type/0) not) ..simple_parameter) types/*,terms/* (random.list arity ..simple_parameter) - tag (# ! each (n.% arity) random.nat) + tag (at ! each (n.% arity) random.nat) .let [[lefts right?] (//complex.choice arity tag)] arbitrary_right? random.bit] (all _.and @@ -327,7 +327,7 @@ .let [state [/extension.#bundle (/extension/analysis.bundle ..eval) /extension.#state lux]] name ($symbol.random 1 1) - arity (# ! each (|>> (n.% 5) (n.+ 2)) random.nat) + arity (at ! each (|>> (n.% 5) (n.+ 2)) random.nat) [type/0 term/0] ..simple_parameter [type/1 term/1] (random.only (|>> product.left (same? type/0) not) ..simple_parameter) @@ -404,7 +404,7 @@ [type/0 term/0] ..simple_parameter [type/1 term/1] (random.only (|>> product.left (same? type/0) not) ..simple_parameter) - lefts (# ! each (n.% 10) random.nat) + lefts (at ! each (n.% 10) random.nat) right? random.bit] (all _.and ..test|general 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 684873614..ff54e0902 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 @@ -51,10 +51,10 @@ (<| (_.covering /._) (_.for [/.Expander]) (do [! random.monad] - [multiplicity (# ! each (|>> (n.% 8) (n.+ 2)) - random.nat) - choice (# ! each (n.% multiplicity) - random.nat) + [multiplicity (at ! each (|>> (n.% 8) (n.+ 2)) + random.nat) + choice (at ! each (n.% multiplicity) + random.nat) expected_error (random.upper_case 5) name ($symbol.random 2 2) @@ -81,8 +81,8 @@ (_.coverage [/.expansion] (|> (/.expansion ..expander name multiple (list mono)) (meta.result lux) - (try#each (# (list.equivalence code.equivalence) = - (list.repeated multiplicity mono))) + (try#each (at (list.equivalence code.equivalence) = + (list.repeated multiplicity mono))) (try.else false))) (_.coverage [/.expansion_failed] (|> (/.expansion ..expander name singular (list)) 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 ef24e378b..9f641f906 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 @@ -209,13 +209,13 @@ public? random.bit def_type ..primitive - arity (# ! each (|>> (n.% 10) ++) random.nat) + arity (at ! each (|>> (n.% 10) ++) random.nat) labels|head (random.lower_case 1) labels|tail (|> (random.lower_case 1) (random.only (|>> (text#= labels|head) not)) (random.set text.hash (-- arity)) - (# ! each set.list)) - index (# ! each (n.% arity) random.nat) + (at ! each set.list)) + index (at ! each (n.% arity) random.nat) .let [definition {.#Definition [public? def_type []]} alias {.#Alias [module_name def_name]}]] (all _.and @@ -281,12 +281,12 @@ public? random.bit def_type ..primitive - arity (# ! each (|>> (n.% 10) ++) random.nat) + arity (at ! each (|>> (n.% 10) ++) random.nat) labels|head (random.lower_case 1) labels|tail (|> (random.lower_case 1) (random.only (|>> (text#= labels|head) not)) (random.set text.hash (-- arity)) - (# ! each set.list))] + (at ! each set.list))] (all _.and (_.coverage [/.declare_labels] (`` (and (~~ (template [<side> <record?> <query> <on_success>] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux index b78881b03..b45859c4f 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux @@ -52,7 +52,7 @@ ($equivalence.spec /.equivalence ..random)) (_.coverage [/.format] - (bit#= (# /.equivalence = left right) + (bit#= (at /.equivalence = left right) (text#= (/.format left) (/.format right)))) (_.coverage [/.unit] (case (/.unit) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/simple.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/simple.lux index a918dc13c..656722030 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/simple.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/simple.lux @@ -40,6 +40,6 @@ [left ..random right ..random] (_.coverage [/.format] - (bit#= (# /.equivalence = left right) + (bit#= (at /.equivalence = left right) (text#= (/.format left) (/.format right))))) ))) 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 67c097440..9d7d2abc2 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 @@ -917,10 +917,10 @@ @left (random.lower_case 9) @right (random.lower_case 10) - $abstraction/0 (# ! each code.local (random.lower_case 11)) - $parameter/0 (# ! each code.local (random.lower_case 12)) - $abstraction/1 (# ! each code.local (random.lower_case 13)) - $parameter/1 (# ! each code.local (random.lower_case 14))]) + $abstraction/0 (at ! each code.local (random.lower_case 11)) + $parameter/0 (at ! each code.local (random.lower_case 12)) + $abstraction/1 (at ! each code.local (random.lower_case 13)) + $parameter/1 (at ! each code.local (random.lower_case 14))]) (all _.and (_.coverage [/.phase] (and (..can_analyse_unit! lux module/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 f69c47c4c..f8be52465 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 @@ -59,13 +59,13 @@ .let [state [//extension.#bundle (//extension/analysis.bundle ..eval) //extension.#state lux]] module/0 (random.lower_case 1) - name/0 (# ! each (|>> [module/0]) (random.lower_case 2)) + name/0 (at ! each (|>> [module/0]) (random.lower_case 2)) [input/0 simple/0] $//inference.simple_parameter [input/1 simple/1] $//inference.simple_parameter [input/2 simple/2] $//inference.simple_parameter - $binding/0 (# ! each code.local (random.lower_case 3)) - $binding/1 (# ! each code.local (random.lower_case 4)) - $binding/2 (# ! each code.local (random.lower_case 5))] + $binding/0 (at ! each code.local (random.lower_case 3)) + $binding/1 (at ! each code.local (random.lower_case 4)) + $binding/2 (at ! each code.local (random.lower_case 5))] (all _.and (_.coverage [/.tuple] (let [tuple? (is (-> Type Type Bit) @@ -508,10 +508,10 @@ [output/0 body/0] $//inference.simple_parameter [output/1 body/1] (random.only (|>> product.left (same? output/0) not) $//inference.simple_parameter) - $binding/0 (# ! each code.local (random.lower_case 3)) - $binding/1 (# ! each code.local (random.lower_case 4)) - $binding/2 (# ! each code.local (random.lower_case 5)) - extension/0 (# ! each code.text (random.lower_case 6)) + $binding/0 (at ! each code.local (random.lower_case 3)) + $binding/1 (at ! each code.local (random.lower_case 4)) + $binding/2 (at ! each code.local (random.lower_case 5)) + extension/0 (at ! each code.text (random.lower_case 6)) bit/0 random.bit nat/0 random.nat] (all _.and 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 669d747ff..314dc7e6a 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 @@ -134,9 +134,9 @@ .let [state [//extension.#bundle (//extension/analysis.bundle ..eval) //extension.#state lux]] name ($symbol.random 1 1) - arity (# ! each (|>> (n.% 5) (n.+ 2)) random.nat) + arity (at ! each (|>> (n.% 5) (n.+ 2)) random.nat) types/*,terms/* (random.list arity ..simple_parameter) - tag (# ! each (n.% arity) random.nat) + tag (at ! each (n.% arity) random.nat) .let [[lefts right?] (//complex.choice arity tag) [tagT tagC] (|> types/*,terms/* (list.item tag) @@ -217,13 +217,13 @@ .let [state [//extension.#bundle (//extension/analysis.bundle ..eval) //extension.#state lux]] name ($symbol.random 1 1) - arity (# ! each (|>> (n.% 5) (n.+ 2)) random.nat) + arity (at ! each (|>> (n.% 5) (n.+ 2)) random.nat) types/*,terms/* (random.list arity ..simple_parameter) - tag (# ! each (n.% arity) random.nat) + tag (at ! each (n.% arity) random.nat) .let [[lefts right?] (//complex.choice arity tag)] tags (|> (random.lower_case 1) (random.set text.hash arity) - (# ! each set.list)) + (at ! each set.list)) .let [module (product.left name) sumT (type.variant (list#each product.left types/*,terms/*)) variantT {.#Named name sumT} @@ -290,7 +290,7 @@ .let [state [//extension.#bundle (//extension/analysis.bundle ..eval) //extension.#state lux]] name ($symbol.random 1 1) - arity (# ! each (|>> (n.% 5) (n.+ 2)) random.nat) + arity (at ! each (|>> (n.% 5) (n.+ 2)) random.nat) types/*,terms/* (random.list arity ..simple_parameter) [type/0 term/0] ..simple_parameter [type/1 term/1] ..simple_parameter @@ -434,8 +434,8 @@ .let [state [//extension.#bundle (//extension/analysis.bundle ..eval) //extension.#state lux]] name ($symbol.random 1 1) - arity (# ! each (|>> (n.% 5) (n.+ 2)) random.nat) - slice (# ! each (|>> (n.% (-- arity)) ++) random.nat) + arity (at ! each (|>> (n.% 5) (n.+ 2)) random.nat) + slice (at ! each (|>> (n.% (-- arity)) ++) random.nat) [type/0 term/0] ..simple_parameter slot/0 (random.lower_case 1) types/*,terms/* (random.list arity ..simple_parameter) @@ -513,7 +513,7 @@ (pipe.case {try.#Success {.#Some [actual_arity actual_tuple actual_type]}} (and (n.= arity actual_arity) - (# code.equivalence = (code.tuple tuple) (code.tuple actual_tuple)) + (at code.equivalence = (code.tuple tuple) (code.tuple actual_tuple)) (type#= :record: actual_type)) _ @@ -634,11 +634,11 @@ [lux ..random_state .let [state [//extension.#bundle (//extension/analysis.bundle ..eval) //extension.#state lux]] - arity (# ! each (|>> (n.% 5) (n.+ 2)) random.nat) + arity (at ! each (|>> (n.% 5) (n.+ 2)) random.nat) types/*,terms/* (random.list arity ..simple_parameter) [type/0 term/0] ..simple_parameter [type/1 term/1] ..simple_parameter - tag (# ! each (n.% arity) random.nat) + tag (at ! each (n.% arity) random.nat) .let [[lefts right?] (//complex.choice arity tag)]] (all _.and ..test|sum diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension.lux index 05ddfaaff..ca35902cd 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension.lux @@ -47,7 +47,7 @@ (_.coverage [/.read] (|> (is (/.Operation Int Nat Nat Text) (/.read %.int)) - (# phase.functor each (text#= (%.int state))) + (at phase.functor each (text#= (%.int state))) (phase.result [/.#bundle /.empty /.#state state]) (try.else false))) @@ -56,7 +56,7 @@ (do phase.monad [_ (/.update ++)] (/.read %.int))) - (# phase.functor each (text#= (%.int (++ state)))) + (at phase.functor each (text#= (%.int (++ state)))) (phase.result [/.#bundle /.empty /.#state state]) (try.else false))) @@ -66,7 +66,7 @@ [|state'| (/.temporary ++ (/.read %.int)) |state| (/.read %.int)] (in (format |state'| " " |state|)))) - (# phase.functor each (text#= (format (%.int (++ state)) " " (%.int state)))) + (at phase.functor each (text#= (format (%.int (++ state)) " " (%.int state)))) (phase.result [/.#bundle /.empty /.#state state]) (try.else false))) @@ -74,7 +74,7 @@ (|> (is (/.Operation Int Nat Nat Text) (/.with_state state (/.read %.int))) - (# phase.functor each (text#= (%.int state))) + (at phase.functor each (text#= (%.int state))) (phase.result [/.#bundle /.empty /.#state dummy]) (try.else false))) @@ -87,8 +87,8 @@ (/.read %.int)) |state'| (/.read %.int)] (in (format |state'| " " |state|)))) - (# phase.functor each (text#= (format (%.int (i.+ +2 state)) - " " (%.int (i.+ +1 state))))) + (at phase.functor each (text#= (format (%.int (i.+ +2 state)) + " " (%.int (i.+ +1 state))))) (phase.result [/.#bundle /.empty /.#state state]) (try.else false)))) @@ -101,12 +101,12 @@ (def: handler/0 (/.Handler Int Nat Nat) (function (_ @self phase archive inputs) - (# phase.monad in (list#mix n.+ 0 inputs)))) + (at phase.monad in (list#mix n.+ 0 inputs)))) (def: handler/1 (/.Handler Int Nat Nat) (function (_ @self phase archive inputs) - (# phase.monad in (list#mix n.* 1 inputs)))) + (at phase.monad in (list#mix n.* 1 inputs)))) (def: test|name Test @@ -130,7 +130,7 @@ false))) (_.coverage [/.unknown] (|> (/.apply archive.empty (function (_ archive input) - (# phase.monad in (++ input))) + (at phase.monad in (++ input))) [extension (list left right)]) (phase.result [/.#bundle /.empty /.#state state]) @@ -146,7 +146,7 @@ Test (let [phase (is (/.Phase Int Nat Nat) (function (_ archive input) - (# phase.monad in (++ input))))] + (at phase.monad in (++ input))))] (do [! random.monad] [state random.int @@ -162,7 +162,7 @@ (|> (do phase.monad [_ (/.install extender extension handler/0)] (/.apply archive.empty phase [extension (list left right)])) - (# phase.functor each (n.= (n.+ left right))) + (at phase.functor each (n.= (n.+ left right))) (phase.result [/.#bundle /.empty /.#state state]) (try.else false))) @@ -172,11 +172,11 @@ (let [! phase.monad] (|> inputs (monad.each ! (phase archive)) - (# ! each (list#mix n.+ 0))))))] + (at ! each (list#mix n.+ 0))))))] (|> (do phase.monad [_ (/.install extender extension handler)] (/.apply archive.empty phase [extension (list left right)])) - (# phase.functor each (n.= (n.+ (++ left) (++ right)))) + (at phase.functor each (n.= (n.+ (++ left) (++ right)))) (phase.result [/.#bundle /.empty /.#state state]) (try.else false)))) @@ -184,9 +184,9 @@ (|> (do phase.monad [_ (/.with extender (dictionary.of_list text.hash (list [extension handler/1])))] (/.apply archive.empty (function (_ archive input) - (# phase.monad in (++ input))) + (at phase.monad in (++ input))) [extension (list left right)])) - (# phase.functor each (n.= (n.* left right))) + (at phase.functor each (n.= (n.* left right))) (phase.result [/.#bundle /.empty /.#state state]) (try.else false))) @@ -248,7 +248,7 @@ (/.lifted (do phase.monad [] (in expected)))) - (# phase.functor each (same? expected)) + (at phase.functor each (same? expected)) (phase.result [/.#bundle /.empty /.#state state]) (try.else false)) @@ -269,7 +269,7 @@ (is (/.Operation Int Nat Nat Nat)) /.up (is (phase.Operation Int Nat)) - (# phase.functor each (same? expected)) + (at phase.functor each (same? expected)) (phase.result state) (try.else false))) )) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux index c7d2ba84e..b2e9131ca 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux @@ -75,9 +75,9 @@ (def: i64 Test (do [! r.monad] - [subjectC (|> r.nat (# ! each code.nat)) - signedC (|> r.int (# ! each code.int)) - paramC (|> r.nat (# ! each code.nat))] + [subjectC (|> r.nat (at ! each code.nat)) + signedC (|> r.int (at ! each code.int)) + paramC (|> r.nat (at ! each code.nat))] (all _.and (_.property "i64 'and'." (check_success+ "lux i64 and" (list paramC subjectC) Nat)) @@ -102,8 +102,8 @@ (def: int Test (do [! r.monad] - [subjectC (|> r.int (# ! each code.int)) - paramC (|> r.int (# ! each code.int))] + [subjectC (|> r.int (at ! each code.int)) + paramC (|> r.int (at ! each code.int))] (all _.and (_.property "Can multiply integers." (check_success+ "lux i64 *" (list paramC subjectC) Int)) @@ -122,9 +122,9 @@ (def: frac Test (do [! r.monad] - [subjectC (|> r.safe_frac (# ! each code.frac)) - paramC (|> r.safe_frac (# ! each code.frac)) - encodedC (|> r.safe_frac (# ! each (|>> %.frac code.text)))] + [subjectC (|> r.safe_frac (at ! each code.frac)) + paramC (|> r.safe_frac (at ! each code.frac)) + encodedC (|> r.safe_frac (at ! each (|>> %.frac code.text)))] (all _.and (_.property "Can add frac numbers." (check_success+ "lux f64 +" (list paramC subjectC) Frac)) @@ -157,11 +157,11 @@ (def: text Test (do [! r.monad] - [subjectC (|> (r.unicode 5) (# ! each code.text)) - paramC (|> (r.unicode 5) (# ! each code.text)) - replacementC (|> (r.unicode 5) (# ! each code.text)) - fromC (|> r.nat (# ! each code.nat)) - toC (|> r.nat (# ! each code.nat))] + [subjectC (|> (r.unicode 5) (at ! each code.text)) + paramC (|> (r.unicode 5) (at ! each code.text)) + replacementC (|> (r.unicode 5) (at ! each code.text)) + fromC (|> r.nat (at ! each code.nat)) + toC (|> r.nat (at ! each code.nat))] (all _.and (_.property "Can test text equivalence." (check_success+ "lux text =" (list paramC subjectC) Bit)) @@ -182,8 +182,8 @@ (def: io Test (do [! r.monad] - [logC (|> (r.unicode 5) (# ! each code.text)) - exitC (|> r.int (# ! each code.int))] + [logC (|> (r.unicode 5) (at ! each code.text)) + exitC (|> r.int (at ! each code.int))] (all _.and (_.property "Can log messages to standard output." (check_success+ "lux io log" (list logC) Any)) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux index 351098c03..11cadf681 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux @@ -43,7 +43,7 @@ Test (do [! random.monad] [maskedA //primitive.primitive - temp (|> random.nat (# ! each (n.% 100))) + temp (|> random.nat (at ! each (n.% 100))) .let [maskA (analysis.case [maskedA [[{analysis.#Bind temp} @@ -112,7 +112,7 @@ (def: random_member (Random synthesis.Member) (do [! random.monad] - [lefts (|> random.nat (# ! each (n.% 10))) + [lefts (|> random.nat (at ! each (n.% 10))) right? random.bit] (in (if right? {.#Right lefts} @@ -121,7 +121,7 @@ (def: random_path (Random (analysis.Tuple synthesis.Member)) (do [! random.monad] - [size_1 (|> random.nat (# ! each (|>> (n.% 10) ++)))] + [size_1 (|> random.nat (at ! each (|>> (n.% 10) ++)))] (random.list size_1 ..random_member))) (def: (get_pattern path) @@ -148,9 +148,9 @@ Test (do [! random.monad] [recordA (|> random.nat - (# ! each (|>> analysis.nat)) + (at ! each (|>> analysis.nat)) (random.list 10) - (# ! each (|>> analysis.tuple))) + (at ! each (|>> analysis.tuple))) pathA ..random_path [pattern @member] (get_pattern pathA) .let [getA (analysis.case [recordA [[pattern @@ -162,7 +162,7 @@ (phase.result [///bundle.empty synthesis.init]) (pipe.case (pattern {try.#Success (synthesis.branch/get [pathS recordS])}) - (and (# (list.equivalence (sum.equivalence n.= n.=)) = pathA pathS) + (and (at (list.equivalence (sum.equivalence n.= n.=)) = pathA pathS) (//primitive.corresponds? recordA recordS)) _ @@ -187,13 +187,13 @@ (All (_ a) (-> (Hash a) (Random a) (Random [a a a a a]))) (|> random_element (random.set hash 5) - (# random.monad each (|>> set.list - (pipe.case - (pattern (list s0 s1 s2 s3 s4)) - [s0 s1 s2 s3 s4] + (at random.monad each (|>> set.list + (pipe.case + (pattern (list s0 s1 s2 s3 s4)) + [s0 s1 s2 s3 s4] - _ - (undefined)))))) + _ + (undefined)))))) (template [<name> <hash> <random> <path> <synthesis> <pattern> <analysis>] [(def: <name> @@ -266,7 +266,7 @@ (def: random_tuple (Random [Path Match]) (do [! random.monad] - [mid_size (# ! each (n.% 4) random.nat) + [mid_size (at ! each (n.% 4) random.nat) value/first (random.unicode 1) value/mid (random.list mid_size (random.unicode 1)) @@ -332,15 +332,15 @@ (def: case_test Test (do [! random.monad] - [expected_input (# ! each (|>> .i64 synthesis.i64) random.nat) + [expected_input (at ! each (|>> .i64 synthesis.i64) random.nat) [expected_path match] ..random_case] (_.coverage [/.synthesize_case] (|> (/.synthesize_case //.phase archive.empty expected_input match) (phase.result [///bundle.empty synthesis.init]) (pipe.case (pattern {try.#Success (synthesis.branch/case [actual_input actual_path])}) - (and (# synthesis.equivalence = expected_input actual_input) - (# synthesis.path_equivalence = expected_path actual_path)) + (and (at synthesis.equivalence = expected_input actual_input) + (at synthesis.path_equivalence = expected_path actual_path)) _ false))))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux index 8ab54be6f..9ec225645 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux @@ -82,10 +82,10 @@ (def: (random_unit output?) Scenario - (# random.monad in - [true - (synthesis.text synthesis.unit) - (analysis.unit)])) + (at random.monad in + [true + (synthesis.text synthesis.unit) + (analysis.unit)])) (template [<name> <random> <synthesis> <analysis>] [(def: (<name> output?) @@ -149,7 +149,7 @@ (def: (random_variable arity output?) (-> Arity Scenario) (do [! random.monad] - [register (# ! each (|>> (n.% arity) ++) random.nat)] + [register (at ! each (|>> (n.% arity) ++) random.nat)] (in [(not (n.= 0 register)) (synthesis.variable/local register) (if (n.= arity register) @@ -179,7 +179,7 @@ text_test (random.unicode 1) [loop?_input expected_input actual_input] (random_value false) [loop?_output expected_output actual_output] (random_value output?) - lefts (|> random.nat (# ! each (n.% 10))) + lefts (|> random.nat (at ! each (n.% 10))) right? random.bit .let [side|member (if right? {.#Right lefts} @@ -281,7 +281,7 @@ (def: (random_get random_value output?) (-> Scenario Scenario) (do [! random.monad] - [lefts (|> random.nat (# ! each (n.% 10))) + [lefts (|> random.nat (at ! each (n.% 10))) right? random.bit [loop?_record expected_record actual_record] (random_value false)] (in [loop?_record @@ -345,7 +345,7 @@ Scenario (do [! random.monad] [[loop?_output expected_output actual_output] (..random_nat output?) - arity (|> random.nat (# ! each (|>> (n.% 5) ++))) + arity (|> random.nat (at ! each (|>> (n.% 5) ++))) .let [environment (all list#composite (list#each (|>> {variable.#Foreign}) (list.indices arity)) @@ -365,7 +365,7 @@ (-> Scenario Scenario) (do [! random.monad] [[loop?_abstraction expected_abstraction actual_abstraction] (..random_nat output?) - arity (|> random.nat (# ! each (|>> (n.% 5) ++))) + arity (|> random.nat (at ! each (|>> (n.% 5) ++))) inputs (random.list arity (random_value false))] (in [(list#mix (function (_ new old) (and new old)) @@ -421,7 +421,7 @@ (def: random_abstraction (Random [Synthesis Analysis]) (do [! random.monad] - [arity (|> random.nat (# ! each (|>> (n.% 5) ++))) + [arity (|> random.nat (at ! each (|>> (n.% 5) ++))) [loop? expected_body actual_body] (random_body arity true)] (in [(..n_function loop? arity expected_body) (..n_abstraction arity actual_body)]))) @@ -435,12 +435,12 @@ (//.phase archive.empty) (phase.result [///bundle.empty synthesis.init]) (!expect (^.multi {try.#Success actual} - (# synthesis.equivalence = expected actual))))))) + (at synthesis.equivalence = expected actual))))))) (def: application Test (do [! random.monad] - [arity (|> random.nat (# ! each (|>> (n.% 10) (n.max 1)))) + [arity (|> random.nat (at ! each (|>> (n.% 10) (n.max 1)))) funcA //primitive.primitive argsA (random.list arity //primitive.primitive)] (_.coverage [/.apply] diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux index 96c5116be..6c17b1883 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux @@ -31,13 +31,13 @@ (`` (all random.either (~~ (template [<synthesis> <random>] [(do [! random.monad] - [example (# ! each (|>> <synthesis>) <random>)] + [example (at ! each (|>> <synthesis>) <random>)] (in [next [example example]]))] [//.bit random.bit] - [//.i64 (# ! each .i64 random.nat)] + [//.i64 (at ! each .i64 random.nat)] [//.f64 random.frac] [//.text (random.unicode 1)] )) @@ -55,7 +55,7 @@ (def: (variable offset arity next) (Scenario Variable) (let [local (do [! random.monad] - [register (# ! each (|>> (n.% arity) ++) random.nat)] + [register (at ! each (|>> (n.% arity) ++) random.nat)] (in [next [{variable.#Local (/.register_optimization offset register)} {variable.#Local register}]]))] @@ -64,7 +64,7 @@ _ (all random.either local (do [! random.monad] - [foreign (# ! each (n.% offset) random.nat)] + [foreign (at ! each (n.% offset) random.nat)] (in [next [{variable.#Local foreign} {variable.#Foreign foreign}]])))))) @@ -117,21 +117,21 @@ //.path/pop]]) (~~ (template [<path> <random>] [(do [! random.monad] - [example (# ! each (|>> <path>) <random>)] + [example (at ! each (|>> <path>) <random>)] (in [next [example example]]))] [//.path/bit random.bit] - [//.path/i64 (# ! each .i64 random.nat)] + [//.path/i64 (at ! each .i64 random.nat)] [//.path/f64 random.frac] [//.path/text (random.unicode 1)] )) (~~ (template [<path>] [(do [! random.monad] - [example (# ! each (|>> <path>) - (random.or random.nat - random.nat))] + [example (at ! each (|>> <path>) + (random.or random.nat + random.nat))] (in [next [example example]]))] @@ -182,7 +182,7 @@ (all random.either (do [! random.monad] [[next [recordE recordA]] (..reference offset arity next) - path_length (# ! each (|>> (n.% 5) ++) random.nat) + path_length (at ! each (|>> (n.% 5) ++) random.nat) path (random.list path_length random_member)] (in [next [(//.branch/get [path recordE]) @@ -219,7 +219,7 @@ (do [! random.monad] [[next [firstE firstA]] (..variable offset arity next) [next [secondE secondA]] (..variable offset arity next) - arity (# ! each (n.max 1) random.nat) + arity (at ! each (n.max 1) random.nat) [next [bodyE bodyA]] (..primitive 0 arity next)] (in [next [(//.function/abstraction @@ -266,10 +266,10 @@ (<| (_.covering /._) (all _.and (do [! random.monad] - [expected_offset (# ! each (|>> (n.% 5) (n.+ 2)) random.nat) - arity (# ! each (|>> (n.% 5) ++) random.nat) + [expected_offset (at ! each (|>> (n.% 5) (n.+ 2)) random.nat) + arity (at ! each (|>> (n.% 5) ++) random.nat) expected_inits (|> random.nat - (# ! each (|>> .i64 //.i64)) + (at ! each (|>> .i64 //.i64)) (random.list arity)) [_ [expected iteration]] (..scenario expected_offset arity 0)] (_.coverage [/.Transform /.optimization /.register_optimization] @@ -283,10 +283,10 @@ actual])}) (and (n.= expected_offset actual_offset) - (# (list.equivalence //.equivalence) = - expected_inits - actual_inits) - (# //.equivalence = expected actual)) + (at (list.equivalence //.equivalence) = + expected_inits + actual_inits) + (at //.equivalence = expected actual)) _ false))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux index 954818c48..237a877a4 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux @@ -37,8 +37,8 @@ (def: variant Test (do [! r.monad] - [size (|> r.nat (# ! each (|>> (n.% 10) (n.+ 2)))) - tagA (|> r.nat (# ! each (n.% size))) + [size (|> r.nat (at ! each (|>> (n.% 10) (n.+ 2)))) + tagA (|> r.nat (at ! each (n.% size))) .let [right? (n.= (-- size) tagA) lefts (if right? (-- tagA) @@ -61,7 +61,7 @@ (def: tuple Test (do [! r.monad] - [size (|> r.nat (# ! each (|>> (n.% 10) (n.max 2)))) + [size (|> r.nat (at ! each (|>> (n.% 10) (n.max 2)))) membersA (r.list size //primitive.primitive)] (_.property "Can synthesize tuple." (|> (////analysis.tuple membersA) 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 006790ba4..4f3d1de26 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 @@ -51,7 +51,7 @@ (<synthesis> value)])))] [bit_scenario synthesis.bit random.bit] - [i64_scenario synthesis.i64 (# ! each .i64 random.nat)] + [i64_scenario synthesis.i64 (at ! each .i64 random.nat)] [f64_scenario synthesis.f64 random.frac] [text_scenario synthesis.text (random.unicode 1)] ) @@ -97,9 +97,9 @@ (def: (tuple_scenario context) (Scenario Synthesis) (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))]))) + (at random.monad in + [(synthesis.tuple (list#each (|>> product.left synthesis.variable/local) registers)) + (synthesis.tuple (list#each (|>> product.right synthesis.variable/local) registers))]))) (def: (structure_scenario context) (Scenario Synthesis) @@ -144,7 +144,7 @@ (def: (get_scenario scenario context) (-> (Scenario Synthesis) (Scenario Synthesis)) (do [! random.monad] - [length (# ! each (|>> (n.% 5) ++) random.nat) + [length (at ! each (|>> (n.% 5) ++) random.nat) path (random.list length ..random_member) [expected_record actual_record] (scenario context)] (in [(synthesis.branch/get [path expected_record]) @@ -188,7 +188,7 @@ {synthesis.#Then actual_then}}]))] [synthesis.#Bit random.bit] - [synthesis.#I64 (# ! each .i64 random.nat)] + [synthesis.#I64 (at ! each .i64 random.nat)] [synthesis.#F64 random.frac] [synthesis.#Text (random.unicode 1)] ))) @@ -284,9 +284,9 @@ (def: (apply_scenario scenario context) (-> (Scenario Synthesis) (Scenario Synthesis)) (do [! random.monad] - [abstraction (# ! each (|>> synthesis.constant) - (random.and (random.unicode 1) - (random.unicode 1))) + [abstraction (at ! each (|>> synthesis.constant) + (random.and (random.unicode 1) + (random.unicode 1))) inputs (random.list ..scope_arity (scenario context))] (in [(synthesis.function/apply [abstraction (list#each product.left inputs)]) (synthesis.function/apply [abstraction (list#each product.right inputs)])]))) @@ -332,5 +332,5 @@ (_.coverage [/.optimization] (|> (/.optimization input) (!expect (^.multi {try.#Success actual} - (# synthesis.equivalence = expected actual)))))) + (at synthesis.equivalence = expected actual)))))) ))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux index 7e92f65ae..19ae703cb 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux @@ -27,7 +27,7 @@ (def: symbol_part^ (Random Text) (do [! r.monad] - [size (|> r.nat (# ! each (|>> (n.% 20) (n.max 1))))] + [size (|> r.nat (at ! each (|>> (n.% 20) (n.max 1))))] (r.lower_case_alpha size))) (def: symbol^ @@ -84,7 +84,7 @@ false {.#Right [_ parsed]} - (# code.equivalence = parsed sample))) + (at code.equivalence = parsed sample))) (do ! [other code^] (_.property "Can parse multiple Lux code nodes." @@ -102,8 +102,8 @@ false {.#Right [_ =other]} - (and (# code.equivalence = sample =sample) - (# code.equivalence = other =other))))))) + (and (at code.equivalence = sample =sample) + (at code.equivalence = other =other))))))) ))) (def: comment_text^ @@ -134,7 +134,7 @@ false {.#Right [_ parsed]} - (# code.equivalence = parsed sample))) + (at code.equivalence = parsed sample))) ))) (def: .public test diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/member.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/member.lux index fec861dfd..5ff10e052 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/member.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/member.lux @@ -36,6 +36,6 @@ ($hash.spec /.hash ..random)) (_.coverage [/.format] - (bit#= (# /.equivalence = left right) + (bit#= (at /.equivalence = left right) (text#= (/.format left) (/.format right)))) )))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/side.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/side.lux index 61080fd2c..4d3d12bad 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/side.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access/side.lux @@ -36,6 +36,6 @@ ($hash.spec /.hash ..random)) (_.coverage [/.format] - (bit#= (# /.equivalence = left right) + (bit#= (at /.equivalence = left right) (text#= (/.format left) (/.format right)))) )))) diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/simple.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/simple.lux index cd422dccc..3fc98a592 100644 --- a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/simple.lux +++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/simple.lux @@ -41,5 +41,5 @@ (_.coverage [/.format] (bit#= (text#= (/.format left) (/.format right)) - (# /.equivalence = left right))) + (at /.equivalence = left right))) )))) 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 b62b50e3c..1b6e2af50 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 = (has /.#state {.#Cached} expected)))) + (try#each (|>> (at /.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 7305277cb..8fa2fc9e6 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux @@ -57,10 +57,10 @@ mandatory? random.bit expected_dependencies (..random_dependencies 5) - expected_amount (# ! each (n.% 10) random.nat) + expected_amount (at ! each (n.% 10) random.nat) expected_names (|> (random.lower_case 1) (random.set text.hash expected_amount) - (# ! each set.list))] + (at ! each set.list))] (`` (all _.and (_.coverage [/.empty] (|> /.empty @@ -147,7 +147,7 @@ (list.every? (function (_ [@it [it dependencies]]) (same? @it (the artifact.#id it))) (list.zipped_2 (sequence.list ids) (sequence.list it))) - (# (list.equivalence <equivalence>) = expected/* (<query> registry))))] + (at (list.equivalence <equivalence>) = expected/* (<query> registry))))] [/.definition /.definitions category.definition_equivalence (is (-> Text category.Definition) (function (_ it) diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/signature.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/signature.lux index 23a2d62c9..f127d86e5 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/archive/signature.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/archive/signature.lux @@ -43,7 +43,7 @@ [left ..random right ..random] (_.coverage [/.description] - (bit#= (# /.equivalence = left right) + (bit#= (at /.equivalence = left right) (text#= (/.description left) (/.description right))))) (do random.monad [expected ..random] @@ -51,6 +51,6 @@ (|> expected (binaryF.result /.writer) (<binary>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false)))) ))) diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache.lux b/stdlib/source/test/lux/tool/compiler/meta/cache.lux index c970fbe07..c2ba9e659 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cache.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cache.lux @@ -31,10 +31,10 @@ context $//context.random] (all _.and (in (do [! async.monad] - [pre/0 (# fs directory? (/.path fs context)) + [pre/0 (at fs directory? (/.path fs context)) pre/1 (/.enabled? fs context) outcome (/.enable! ! fs context) - post/0 (# fs directory? (/.path fs context)) + post/0 (at fs directory? (/.path fs context)) post/1 (/.enabled? fs context)] (_.coverage' [/.path /.enabled? /.enable!] (and (not pre/0) diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/archive.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/archive.lux index 3d42ef1e1..b93c34577 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cache/archive.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cache/archive.lux @@ -67,11 +67,11 @@ try.trusted)]] (all _.and (in (do [! async.monad] - [pre/0 (# fs file? (/.descriptor fs context)) + [pre/0 (at fs file? (/.descriptor fs context)) enabled? (//.enable! ! fs context) cached? (/.cache! fs context archive) - actual (# fs read (/.descriptor fs context)) - post/0 (# fs file? (/.descriptor fs context))] + actual (at fs read (/.descriptor fs context)) + post/0 (at fs file? (/.descriptor fs context))] (_.coverage' [/.descriptor /.cache!] (and (not pre/0) (|> (do try.monad diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/artifact.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/artifact.lux index de5344cf1..2fcbf2246 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cache/artifact.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cache/artifact.lux @@ -36,10 +36,10 @@ expected ($binary.random 1)] (all _.and (in (do [! async.monad] - [pre (# fs file? (/.path fs context @module @artifact)) + [pre (at fs file? (/.path fs context @module @artifact)) _ (//module.enable! ! fs context @module) write! (/.cache! fs context @module @artifact expected) - post (# fs file? (/.path fs context @module @artifact)) + post (at fs file? (/.path fs context @module @artifact)) read! (/.cache fs context @module @artifact)] (_.coverage' [/.path /.cache! /.cache] (and (not pre) diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux index 8091e33c8..3975036e0 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux @@ -23,7 +23,7 @@ (~~ (template [<name>] [(def: <name> - (# it <name>))] + (at it <name>))] [separator] [file?] @@ -55,10 +55,10 @@ (in (do [! async.monad] [.let [/ "/" fs (file.mock /)] - pre/0 (# fs directory? (/.path fs context @module)) + pre/0 (at fs directory? (/.path fs context @module)) pre/1 (/.enabled? fs context @module) outcome (/.enable! ! fs context @module) - post/0 (# fs directory? (/.path fs context @module)) + post/0 (at fs directory? (/.path fs context @module)) post/1 (/.enabled? fs context @module)] (_.coverage' [/.path /.enabled? /.enable!] (and (not pre/0) @@ -73,10 +73,10 @@ (in (do [! async.monad] [.let [/ "/" fs (file.mock /)] - pre/0 (# fs directory? (/.path fs context @module)) + pre/0 (at fs directory? (/.path fs context @module)) pre/1 (/.enabled? fs context @module) outcome (/.enable! ! (..bad fs) context @module) - post/0 (# fs directory? (/.path fs context @module)) + post/0 (at fs directory? (/.path fs context @module)) post/1 (/.enabled? fs context @module)] (_.coverage' [/.cannot_enable] (and (not pre/0) 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 bf231eba5..209f97b16 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux @@ -52,8 +52,8 @@ content/0 ($binary.random 1) name/1 (random.lower_case 2) module/1 (|> ($module.random random.nat) - (# ! each (has [module.#descriptor descriptor.#references] - (set.of_list text.hash (list name/0))))) + (at ! each (has [module.#descriptor descriptor.#references] + (set.of_list text.hash (list name/0))))) content/1 ($binary.random 2) .let [id/0 (the module.#id module/0) id/1 (the module.#id module/1) @@ -119,18 +119,18 @@ .let [dir (//module.path fs context id/0) file/0 (%.format dir / name/0) file/1 (%.format dir / name/1)] - _ (# fs write file/0 content/0) - _ (# fs write file/1 content/1) - pre (# fs directory_files dir) + _ (at fs write file/0 content/0) + _ (at fs write file/1 content/1) + pre (at fs directory_files dir) _ (/.purge! fs context id/0) - post (# fs directory_files dir)] + post (at fs directory_files dir)] (_.coverage' [/.purge!] (<| (try.else false) (do try.monad [pre pre] - (in (and (# set.equivalence = - (set.of_list text.hash pre) - (set.of_list text.hash (list file/0 file/1))) + (in (and (at set.equivalence = + (set.of_list text.hash pre) + (set.of_list text.hash (list file/0 file/1))) (case post {try.#Failure error} (exception.match? file.cannot_find_directory error) diff --git a/stdlib/source/test/lux/tool/compiler/meta/cli.lux b/stdlib/source/test/lux/tool/compiler/meta/cli.lux index 6df5fc3dd..cc1951950 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cli.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cli.lux @@ -33,7 +33,7 @@ (_.for [/.Service /.service]) (let [(open "list#[0]") (list.equivalence text.equivalence)]) (do [! random.monad] - [amount (# ! each (|>> (n.% 5) ++) random.nat) + [amount (at ! each (|>> (n.% 5) ++) random.nat) sources (random.list amount (random.lower_case 1)) host_dependencies (random.list amount (random.lower_case 2)) libraries (random.list amount (random.lower_case 3)) @@ -71,7 +71,7 @@ [/.Host_Dependency /.#host_dependencies (list#= host_dependencies)] [/.Library /.#libraries (list#= libraries)] - [/compiler.Compiler /.#compilers (# (list.equivalence /compiler.equivalence) = compilers)] + [/compiler.Compiler /.#compilers (at (list.equivalence /compiler.equivalence) = compilers)] [/.Source /.#sources (list#= sources)] [/.Target /.#target (same? target)] [/.Module /.#module (same? module)] @@ -94,7 +94,7 @@ [/.#host_dependencies (list#= host_dependencies)] [/.#libraries (list#= libraries)] - [/.#compilers (# (list.equivalence /compiler.equivalence) = compilers)] + [/.#compilers (at (list.equivalence /compiler.equivalence) = compilers)] [/.#sources (list#= sources)] [/.#target (same? target)] [/.#module (same? module)] diff --git a/stdlib/source/test/lux/tool/compiler/meta/cli/compiler.lux b/stdlib/source/test/lux/tool/compiler/meta/cli/compiler.lux index 988227519..1a7aacc6d 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/cli/compiler.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/cli/compiler.lux @@ -24,7 +24,7 @@ (Random /.Compiler) (do [! random.monad] [definition ($symbol.random 1 1) - amount (# ! each (n.% 5) random.nat) + amount (at ! each (n.% 5) random.nat) parameters (random.list amount (random.lower_case 2))] (in [/.#definition definition /.#parameters parameters]))) @@ -43,6 +43,6 @@ (|> expected /.format (<text>.result /.parser) - (try#each (# /.equivalence = expected)) + (try#each (at /.equivalence = expected)) (try.else false))) )))) diff --git a/stdlib/source/test/lux/tool/compiler/meta/context.lux b/stdlib/source/test/lux/tool/compiler/meta/context.lux index 46d9c6343..9c993c22a 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/context.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/context.lux @@ -25,7 +25,7 @@ (in /.lua) (in /.python) (in /.ruby))] - (# ! each context (random.lower_case 1)))) + (at ! each context (random.lower_case 1)))) (def: .public test Test diff --git a/stdlib/source/test/lux/tool/compiler/meta/export.lux b/stdlib/source/test/lux/tool/compiler/meta/export.lux index eccebdfe0..c8e9fcb06 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/export.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/export.lux @@ -45,34 +45,34 @@ target (random.lower_case 3) .let [random_file (is (Random file.Path) - (# ! each (text.suffix io.lux_extension) (random.lower_case 4)))] + (at ! each (text.suffix io.lux_extension) (random.lower_case 4)))] file/0' random_file .let [file/0 (format source/0 / file/0')] dir/0 (random.lower_case 5) - file/1' (# ! each (|>> (format dir/0 /)) random_file) + file/1' (at ! each (|>> (format dir/0 /)) random_file) .let [file/1 (format source/1 / file/1')] .let [random_content (is (Random Binary) - (# ! each (|>> %.nat (# utf8.codec encoded)) random.nat))] + (at ! each (|>> %.nat (at utf8.codec encoded)) random.nat))] content/0 random_content content/1 random_content] (all _.and (in (do [! async.monad] [it (do (try.with !) [.let [fs (file.mock /)] - _ (# fs make_directory source/0) - _ (# fs write file/0 content/0) + _ (at fs make_directory source/0) + _ (at fs write file/0 content/0) - _ (# fs make_directory source/1) - _ (# fs make_directory (format source/1 / dir/0)) - _ (# fs write file/1 content/1) + _ (at fs make_directory source/1) + _ (at fs make_directory (format source/1 / dir/0)) + _ (at fs write file/1 content/1) - _ (# fs make_directory target) + _ (at fs make_directory target) library_tar (/.library fs (list source/0 source/1)) _ (/.export fs [(list source/0 source/1) target]) - export_tar (# fs read (format target / /.file)) - export_tar (# ! in (<binary>.result tar.parser export_tar))] + export_tar (at fs read (format target / /.file)) + export_tar (at ! in (<binary>.result tar.parser export_tar))] (in [library_tar export_tar]))] (all _.and' (_.coverage' [/.library /.mode /.ownership] diff --git a/stdlib/source/test/lux/tool/compiler/meta/import.lux b/stdlib/source/test/lux/tool/compiler/meta/import.lux index a055d3408..552be6616 100644 --- a/stdlib/source/test/lux/tool/compiler/meta/import.lux +++ b/stdlib/source/test/lux/tool/compiler/meta/import.lux @@ -49,14 +49,14 @@ .let [/ .module_separator random_file (is (Random file.Path) - (# ! each (text.suffix io.lux_extension) (random.lower_case 3)))] + (at ! each (text.suffix io.lux_extension) (random.lower_case 3)))] file/0 random_file dir/0 (random.lower_case 4) - file/1 (# ! each (|>> (format dir/0 /)) random_file) + file/1 (at ! each (|>> (format dir/0 /)) random_file) .let [random_content (is (Random Binary) - (# ! each (|>> %.nat (# utf8.codec encoded)) random.nat))] + (at ! each (|>> %.nat (at utf8.codec encoded)) random.nat))] now random.instant content/0 random_content content/1 random_content @@ -112,12 +112,12 @@ (in (do [! async.monad] [it/0 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library/0 library_content)] + _ (at fs write library/0 library_content)] (/.import fs (list library/0))) it/1 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library/0 library_content/0) - _ (# fs write library/1 library_content/1)] + _ (at fs write library/0 library_content/0) + _ (at fs write library/1 library_content/1)] (/.import fs (list library/0 library/1)))] (_.coverage' [/.import] (and (|> it/0 @@ -129,7 +129,7 @@ (in (do [! async.monad] [it (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library/0 library_content) + _ (at fs write library/0 library_content) _ (/.import fs (list library/0 library/0))] (in false))] (_.coverage' [/.duplicate] @@ -137,17 +137,17 @@ (in (do [! async.monad] [it/0 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library/0 library_content/-0) + _ (at fs write library/0 library_content/-0) _ (/.import fs (list library/0))] (in false)) it/1 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library/0 library_content/-1) + _ (at fs write library/0 library_content/-1) _ (/.import fs (list library/0))] (in false)) it/2 (do (try.with !) [.let [fs (file.mock /)] - _ (# fs write library/0 library_content/-2) + _ (at fs write library/0 library_content/-2) _ (/.import fs (list library/0))] (in false))] (_.coverage' [/.useless_tar_entry] diff --git a/stdlib/source/test/lux/tool/compiler/phase.lux b/stdlib/source/test/lux/tool/compiler/phase.lux index 6fa17a691..b5d392112 100644 --- a/stdlib/source/test/lux/tool/compiler/phase.lux +++ b/stdlib/source/test/lux/tool/compiler/phase.lux @@ -68,7 +68,7 @@ _ false)) (|> (/.lifted {try.#Success expected}) - (# /.functor each (same? expected)) + (at /.functor each (same? expected)) (/.result state) (try.else false)))) (_.coverage [/.except] @@ -105,24 +105,24 @@ (all _.and (_.coverage [/.state] (|> /.state - (# /.functor each (same? state)) + (at /.functor each (same? state)) (/.result state) (try.else false))) (_.coverage [/.with] (|> (do /.monad [_ (/.with state)] /.state) - (# /.functor each (same? state)) + (at /.functor each (same? state)) (/.result dummy) (try.else false))) (_.coverage [/.sub] - (|> (/.sub [(# n.hex encoded) + (|> (/.sub [(at n.hex encoded) (function (_ new old) - (|> new (# n.hex decoded) (try.else dummy)))] + (|> new (at n.hex decoded) (try.else dummy)))] (do /.monad [state/hex /.state] (in (|> state - (# n.hex encoded) + (at n.hex encoded) (text#= state/hex))))) (/.result' state) (pipe.case {try.#Success [state' verdict]} @@ -145,7 +145,7 @@ ($monad.spec ..injection (..comparison state) /.monad)) (_.coverage [/.result] - (|> (# /.monad in expected) + (|> (at /.monad in expected) (/.result state) (pipe.case {try.#Success actual} (same? expected actual) @@ -153,7 +153,7 @@ _ false))) (_.coverage [/.result'] - (|> (# /.monad in expected) + (|> (at /.monad in expected) (/.result' state) (pipe.case {try.#Success [state' actual]} (and (same? state state') @@ -180,10 +180,10 @@ (_.coverage [/.composite] (let [phase (/.composite (is (/.Phase Nat Int Frac) (function (_ archive input) - (# /.monad in (i.frac input)))) + (at /.monad in (i.frac input)))) (is (/.Phase Rev Frac Text) (function (_ archive input) - (# /.monad in (%.frac input)))))] + (at /.monad in (%.frac input)))))] (|> (phase archive.empty expected) (/.result' [state/0 state/1]) (pipe.case {try.#Success [[state/0' state/1'] actual]} diff --git a/stdlib/source/test/lux/tool/compiler/reference.lux b/stdlib/source/test/lux/tool/compiler/reference.lux index 37e61b319..183e872ff 100644 --- a/stdlib/source/test/lux/tool/compiler/reference.lux +++ b/stdlib/source/test/lux/tool/compiler/reference.lux @@ -63,7 +63,7 @@ )) (_.coverage [/.variable /.self] - (and (# /.equivalence = (/.self) (/.variable (variable.self))) + (and (at /.equivalence = (/.self) (/.variable (variable.self))) (case (/.self) (pattern (/.self)) true diff --git a/stdlib/source/test/lux/type.lux b/stdlib/source/test/lux/type.lux index e93535317..6279c98ac 100644 --- a/stdlib/source/test/lux/type.lux +++ b/stdlib/source/test/lux/type.lux @@ -39,7 +39,7 @@ (def: short (Random Text) (do [! random.monad] - [size (|> random.nat (# ! each (n.% 10)))] + [size (|> random.nat (at ! each (n.% 10)))] (random.unicode size))) (def: symbol @@ -90,11 +90,11 @@ aliasedT {.#Named symbol/1 namedT}]] (all _.and (_.coverage [/.de_aliased] - (# /.equivalence = namedT (/.de_aliased aliasedT))) + (at /.equivalence = namedT (/.de_aliased aliasedT))) (_.coverage [/.anonymous] - (# /.equivalence = anonymousT (/.anonymous aliasedT))))) + (at /.equivalence = anonymousT (/.anonymous aliasedT))))) (do [! random.monad] - [size (|> random.nat (# ! each (n.% 3))) + [size (|> random.nat (at ! each (n.% 3))) members (|> (..random 0) (random.only (function (_ type) (case type @@ -124,11 +124,11 @@ (do maybe.monad [partial (/.applied (list Bit) Ann) full (/.applied (list Int) partial)] - (in (# /.equivalence = full {.#Product Bit Int})))) + (in (at /.equivalence = full {.#Product Bit Int})))) (|> (/.applied (list Bit) Text) (pipe.case {.#None} #1 _ #0)))) (do [! random.monad] - [size (|> random.nat (# ! each (n.% 3))) + [size (|> random.nat (at ! each (n.% 3))) members (monad.all ! (list.repeated size (..random 0))) extra (|> (..random 0) (random.only (function (_ type) @@ -150,7 +150,7 @@ (n.= (list.size members) (list.size tparams)))) )) (do [! random.monad] - [size (|> random.nat (# ! each (|>> (n.% 3) ++))) + [size (|> random.nat (at ! each (|>> (n.% 3) ++))) body_type (|> (..random 0) (random.only (function (_ type) (case type @@ -176,7 +176,7 @@ (|> body_type (/.ex_q size) /.quantified?))) ))) (do [! random.monad] - [depth (|> random.nat (# ! each (|>> (n.% 3) ++))) + [depth (|> random.nat (at ! each (|>> (n.% 3) ++))) element_type (|> (..random 0) (random.only (function (_ type) (case type diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux index d8e92bebc..292cb35c1 100644 --- a/stdlib/source/test/lux/type/check.lux +++ b/stdlib/source/test/lux/type/check.lux @@ -93,7 +93,7 @@ (def: injection (Injection (All (_ a) (/.Check a))) - (# /.monad in)) + (at /.monad in)) (def: comparison (Comparison (All (_ a) (/.Check a))) @@ -666,7 +666,7 @@ [parameter/0 parameter/1] (..non_twins type#= ..nominal) left_name ..symbol right_name ..symbol - ring_tail_size (# ! each (n.% 10) random.nat)] + ring_tail_size (at ! each (n.% 10) random.nat)] (_.coverage [/.check] (and (..handles_nominal_types! name/0 name/1 parameter/0 parameter/1) (..handles_products! name/0 name/1) @@ -888,7 +888,7 @@ [expected random.nat] (_.coverage [/.result] (case (/.result /.fresh_context - (# /.monad in expected)) + (at /.monad in expected)) {try.#Success actual} (same? expected actual) {try.#Failure error} false))) ..error_handling diff --git a/stdlib/source/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux index 7a345cd53..590842360 100644 --- a/stdlib/source/test/lux/type/implicit.lux +++ b/stdlib/source/test/lux/type/implicit.lux @@ -25,7 +25,7 @@ Test (<| (_.covering /._) (do [! random.monad] - [.let [digit (# ! each (n.% 10) random.nat)] + [.let [digit (at ! each (n.% 10) random.nat)] left digit right digit .let [start (n.min left right) @@ -34,31 +34,31 @@ left random.nat right random.nat] (all _.and - (_.coverage [/.##] + (_.coverage [/.a/an] (let [first_order! (let [(open "list#[0]") (list.equivalence n.equivalence)] - (and (bit#= (# n.equivalence = left right) - (/.## = left right)) - (list#= (# list.functor each ++ (enum.range n.enum start end)) - (/.## each ++ (enum.range n.enum start end))))) + (and (bit#= (at n.equivalence = left right) + (/.a/an = left right)) + (list#= (at list.functor each ++ (enum.range n.enum start end)) + (/.a/an each ++ (enum.range n.enum start end))))) second_order! - (/.## = - (enum.range n.enum start end) - (enum.range n.enum start end)) + (/.a/an = + (enum.range n.enum start end) + (enum.range n.enum start end)) third_order! - (let [lln (/.## each (enum.range n.enum start) - (enum.range n.enum start end))] - (/.## = lln lln))] + (let [lln (/.a/an each (enum.range n.enum start) + (enum.range n.enum start end))] + (/.a/an = lln lln))] (and first_order! second_order! third_order!))) (_.coverage [/.with] (/.with [n.addition] - (n.= (# n.addition composite left right) - (/.## composite left right)))) + (n.= (at n.addition composite left right) + (/.a/an composite left right)))) (_.coverage [/.implicit:] - (n.= (# n.multiplication composite left right) - (/.## composite left right))) + (n.= (at n.multiplication composite left right) + (/.a/an composite left right))) )))) diff --git a/stdlib/source/test/lux/type/poly/equivalence.lux b/stdlib/source/test/lux/type/poly/equivalence.lux index 6be8c7ec6..9f353f55a 100644 --- a/stdlib/source/test/lux/type/poly/equivalence.lux +++ b/stdlib/source/test/lux/type/poly/equivalence.lux @@ -57,8 +57,8 @@ (def: random (Random Record) (do [! random.monad] - [size (# ! each (n.% 2) random.nat) - .let [gen_int (|> random.int (# ! each (|>> i.abs (i.% +1,000,000))))]] + [size (at ! each (n.% 2) random.nat) + .let [gen_int (|> random.int (at ! each (|>> i.abs (i.% +1,000,000))))]] (all random.and random.bit gen_int diff --git a/stdlib/source/test/lux/type/poly/json.lux b/stdlib/source/test/lux/type/poly/json.lux index 9ecd3684c..3ec8050a6 100644 --- a/stdlib/source/test/lux/type/poly/json.lux +++ b/stdlib/source/test/lux/type/poly/json.lux @@ -85,12 +85,12 @@ (def: qty (All (_ unit) (Random (unit.Qty unit))) - (# random.monad each (debug.private unit.in') random.int)) + (at random.monad each (debug.private unit.in') random.int)) (def: gen_record (Random Record) (do [! random.monad] - [size (# ! each (n.% 2) random.nat)] + [size (at ! each (n.% 2) random.nat)] (all random.and random.bit random.safe_frac diff --git a/stdlib/source/test/lux/type/quotient.lux b/stdlib/source/test/lux/type/quotient.lux index c8652e8c7..7c4f03923 100644 --- a/stdlib/source/test/lux/type/quotient.lux +++ b/stdlib/source/test/lux/type/quotient.lux @@ -18,7 +18,7 @@ (def: .public (random class super) (All (_ t c %) (-> (/.Class t c %) (Random t) (Random (/.Quotient t c %)))) - (# random.monad each (/.quotient class) super)) + (at random.monad each (/.quotient class) super)) (def: mod_10_class (/.class (|>> (n.% 10) %.nat))) diff --git a/stdlib/source/test/lux/type/refinement.lux b/stdlib/source/test/lux/type/refinement.lux index 514d59e79..29856f4f5 100644 --- a/stdlib/source/test/lux/type/refinement.lux +++ b/stdlib/source/test/lux/type/refinement.lux @@ -29,10 +29,10 @@ (_.for [/.Refined]) (do [! random.monad] [raw random.nat - modulus (# ! each (|>> (n.% 10) (n.+ 2)) random.nat) + modulus (at ! each (|>> (n.% 10) (n.+ 2)) random.nat) .let [predicate (is (Predicate Nat) (|>> (n.% modulus) (n.= 0)))] - total_raws (# ! each (|>> (n.% 20) ++) random.nat) + total_raws (at ! each (|>> (n.% 20) ++) random.nat) raws (random.list total_raws random.nat)] (all _.and (_.for [/.Refiner] @@ -70,9 +70,9 @@ actual (/.only (/.refiner predicate) raws)] (and (n.= (list.size expected) (list.size actual)) - (# (list.equivalence n.equivalence) = - expected - (list#each /.value actual))))) + (at (list.equivalence n.equivalence) = + expected + (list#each /.value actual))))) (_.coverage [/.partition] (let [expected (list.only predicate raws) [actual alternative] (/.partition (/.refiner predicate) raws)] @@ -80,9 +80,9 @@ (list.size actual)) (n.= (n.- (list.size expected) total_raws) (list.size alternative)) - (# (list.equivalence n.equivalence) = - expected - (list#each /.value actual))))) + (at (list.equivalence n.equivalence) = + expected + (list#each /.value actual))))) (_.coverage [/.type] (exec (is (Maybe .._type) (.._refiner raw)) diff --git a/stdlib/source/test/lux/type/resource.lux b/stdlib/source/test/lux/type/resource.lux index a33c4817d..8a42a444e 100644 --- a/stdlib/source/test/lux/type/resource.lux +++ b/stdlib/source/test/lux/type/resource.lux @@ -29,8 +29,8 @@ (def: pure Test (monad.do [! random.monad] - [pre (# ! each %.nat random.nat) - post (# ! each %.nat random.nat) + [pre (at ! each %.nat random.nat) + post (at ! each %.nat random.nat) .let [! identity.monad]] (_.for [/.Linear /.run! /.monad] (`` (all _.and @@ -71,8 +71,8 @@ (def: sync Test (monad.do [! random.monad] - [pre (# ! each %.nat random.nat) - post (# ! each %.nat random.nat) + [pre (at ! each %.nat random.nat) + post (at ! each %.nat random.nat) .let [! io.monad]] (_.for [/.Linear /.run! /.monad] (`` (all _.and @@ -114,8 +114,8 @@ (def: async Test (monad.do [! random.monad] - [pre (# ! each %.nat random.nat) - post (# ! each %.nat random.nat) + [pre (at ! each %.nat random.nat) + post (at ! each %.nat random.nat) .let [! async.monad]] (_.for [/.Linear /.run! /.monad] (`` (all _.and diff --git a/stdlib/source/test/lux/type/unit.lux b/stdlib/source/test/lux/type/unit.lux index 7ea97fc3f..f976aae54 100644 --- a/stdlib/source/test/lux/type/unit.lux +++ b/stdlib/source/test/lux/type/unit.lux @@ -26,9 +26,9 @@ [(def: (<name> range) (-> Nat (Random (/.Qty <type>))) (|> random.int - (# random.monad each (i.% (.int range))) + (at random.monad each (i.% (.int range))) (random.only (|>> (i.= +0) not)) - (# random.monad each (# <unit> in))))] + (at random.monad each (at <unit> in))))] [meter /.Meter /.meter] [second /.Second /.second] @@ -56,8 +56,8 @@ (~~ (template [<type> <unit>] [(_.coverage [<type> <unit>] (|> expected - (# <unit> in) - (# <unit> out) + (at <unit> in) + (at <unit> out) (i.= expected)))] [/.Gram /.gram] @@ -72,15 +72,15 @@ (i.= expected))) (_.coverage [/.unit:] (|> expected - (# ..what in) - (# ..what out) + (at ..what in) + (at ..what out) (i.= expected))) ))))) (syntax: (natural []) - (# meta.monad each - (|>> code.nat list) - meta.seed)) + (at meta.monad each + (|>> code.nat list) + meta.seed)) (with_expansions [<from> (..natural) <to> (..natural)] @@ -95,26 +95,26 @@ Test (do [! random.monad] [small (|> random.int - (# ! each (i.% +1,000)) - (# ! each (# /.meter in))) + (at ! each (i.% +1,000)) + (at ! each (at /.meter in))) large (|> random.int - (# ! each (i.% +1,000)) - (# ! each (i.* +1,000,000,000)) - (# ! each (# /.meter in))) + (at ! each (i.% +1,000)) + (at ! each (i.* +1,000,000,000)) + (at ! each (at /.meter in))) .let [(open "meter#[0]") (is (Equivalence (/.Qty /.Meter)) /.equivalence)] unscaled (|> random.int - (# ! each (i.% +1,000)) - (# ! each (i.* (.int how::to))) - (# ! each (# /.meter in)))] + (at ! each (i.% +1,000)) + (at ! each (i.* (.int how::to))) + (at ! each (at /.meter in)))] (_.for [/.Scale] (`` (all _.and (~~ (template [<type> <scale>] [(_.coverage [<type> <scale>] (|> large - (# <scale> scale) + (at <scale> scale) (is (/.Qty (<type> /.Meter))) - (# <scale> de_scale) + (at <scale> de_scale) (is (/.Qty /.Meter)) (meter#= large)))] @@ -125,9 +125,9 @@ (~~ (template [<type> <scale>] [(_.coverage [<type> <scale>] (|> small - (# <scale> scale) + (at <scale> scale) (is (/.Qty (<type> /.Meter))) - (# <scale> de_scale) + (at <scale> de_scale) (is (/.Qty /.Meter)) (meter#= small)))] @@ -137,25 +137,25 @@ )) (_.coverage [/.re_scaled] (|> large (is (/.Qty /.Meter)) - (# /.kilo scale) (is (/.Qty (/.Kilo /.Meter))) + (at /.kilo scale) (is (/.Qty (/.Kilo /.Meter))) (/.re_scaled /.kilo /.milli) (is (/.Qty (/.Milli /.Meter))) (/.re_scaled /.milli /.kilo) (is (/.Qty (/.Kilo /.Meter))) - (# /.kilo de_scale) (is (/.Qty /.Meter)) + (at /.kilo de_scale) (is (/.Qty /.Meter)) (meter#= large))) (_.coverage [/.scale:] (and (|> unscaled - (# ..how scale) - (# ..how de_scale) + (at ..how scale) + (at ..how de_scale) (meter#= unscaled)) (ratio#= [..how::from ..how::to] - (# ..how ratio)))) + (at ..how ratio)))) ))))) (def: arithmetic Test (do random.monad - [.let [zero (# /.meter in +0) + [.let [zero (at /.meter in +0) (open "meter#[0]") (is (Equivalence (/.Qty /.Meter)) /.equivalence)] left (random.only (|>> (meter#= zero) not) (..meter 1,000)) @@ -164,14 +164,14 @@ (`` (all _.and (~~ (template [<q> <i>] [(_.coverage [<q>] - (i.= (<i> (# /.meter out left) (# /.meter out right)) - (# /.meter out (<q> left right))))] + (i.= (<i> (at /.meter out left) (at /.meter out right)) + (at /.meter out (<q> left right))))] [/.+ i.+] [/.- i.-] )) (_.coverage [/.*] - (let [expected (i.* (# /.meter out left) (# /.meter out right)) + (let [expected (i.* (at /.meter out left) (at /.meter out right)) actual ((debug.private /.out') (is (/.Qty [/.Meter /.Meter]) (/.* left right)))] (i.= expected actual))) diff --git a/stdlib/source/test/lux/world/console.lux b/stdlib/source/test/lux/world/console.lux index cb0978bda..068a67aa7 100644 --- a/stdlib/source/test/lux/world/console.lux +++ b/stdlib/source/test/lux/world/console.lux @@ -61,7 +61,7 @@ (io.run! (do io.monad [?_ (/.write_line expected console) - ?actual (# console read_line [])] + ?actual (at console read_line [])] (in (<| (try.else false) (do try.monad [_ ?_ diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux index 2e06d0af5..5617489b9 100644 --- a/stdlib/source/test/lux/world/file.lux +++ b/stdlib/source/test/lux/world/file.lux @@ -188,7 +188,7 @@ {.#Some {.#Right children}} (|> children (monad.only ! (..file? disk)) - (# ! each (|>> {try.#Success}))) + (at ! each (|>> {try.#Success}))) _ (in {try.#Failure ""})))) @@ -199,7 +199,7 @@ {.#Some {.#Right children}} (|> children (monad.only ! (..directory? disk)) - (# ! each (|>> {try.#Success}))) + (at ! each (|>> {try.#Success}))) _ (in {try.#Failure ""})))) @@ -252,7 +252,7 @@ (in (do async.monad [.let [fs (/.mock /)] - ? (# fs delete file)] + ? (at fs delete file)] (_.coverage' [/.cannot_delete] (case ? {try.#Failure error} @@ -262,7 +262,7 @@ false)))) (in (do async.monad [.let [fs (/.mock /)] - ? (# fs read file)] + ? (at fs read file)] (_.coverage' [/.cannot_find_file] (case ? {try.#Failure error} @@ -272,8 +272,8 @@ false)))) (in (do async.monad [.let [fs (/.mock /)] - ?/0 (# fs directory_files file) - ?/1 (# fs sub_directories file)] + ?/0 (at fs directory_files file) + ?/1 (at fs sub_directories file)] (_.coverage' [/.cannot_find_directory] (case [?/0 ?/1] [{try.#Failure error/0} {try.#Failure error/1}] diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux index 9ab9e68ec..b4d090cbb 100644 --- a/stdlib/source/test/lux/world/file/watch.lux +++ b/stdlib/source/test/lux/world/file/watch.lux @@ -33,7 +33,7 @@ (random#in [/.deletion /.deletion?]) )) -(def: concern##test +(def: concern::test Test (all _.and (_.coverage [/.creation /.creation?] @@ -71,8 +71,8 @@ .let [[fs watcher] (/.mock "/")]] (all _.and (in (do async.monad - [?concern (# watcher concern directory) - ?stop (# watcher stop directory)] + [?concern (at watcher concern directory) + ?stop (at watcher stop directory)] (_.coverage' [/.not_being_watched] (and (case ?concern {try.#Failure error} @@ -91,18 +91,18 @@ (def: (no_events_prior_to_creation! fs watcher directory) (-> (//.System Async) (/.Watcher Async) //.Path (Async (Try Bit))) (do [! (try.with async.monad)] - [_ (# fs make_directory directory) - _ (# watcher start /.all directory)] - (|> (# watcher poll []) - (# ! each list.empty?)))) + [_ (at fs make_directory directory) + _ (at watcher start /.all directory)] + (|> (at watcher poll []) + (at ! each list.empty?)))) (def: (after_creation! fs watcher expected_path) (-> (//.System Async) (/.Watcher Async) //.Path (Async (Try Bit))) (do (try.with async.monad) [_ (is (Async (Try Any)) (//.make_file async.monad fs (binary.empty 0) expected_path)) - poll/pre (# watcher poll []) - poll/post (# watcher poll [])] + poll/pre (at watcher poll []) + poll/post (at watcher poll [])] (in (and (case poll/pre (pattern (list [concern actual_path])) (and (text#= expected_path actual_path) @@ -118,9 +118,9 @@ (-> (//.System Async) (/.Watcher Async) Binary //.Path (Async (Try Bit))) (do (try.with async.monad) [_ (async.after 1 {try.#Success "Delay to make sure the over_write time-stamp always changes."}) - _ (# fs write expected_path data) - poll/2 (# watcher poll []) - poll/2' (# watcher poll [])] + _ (at fs write expected_path data) + poll/2 (at watcher poll []) + poll/2' (at watcher poll [])] (in (and (case poll/2 (pattern (list [concern actual_path])) (and (text#= expected_path actual_path) @@ -135,9 +135,9 @@ (def: (after_deletion! fs watcher expected_path) (-> (//.System Async) (/.Watcher Async) //.Path (Async (Try Bit))) (do (try.with async.monad) - [_ (# fs delete expected_path) - poll/3 (# watcher poll []) - poll/3' (# watcher poll [])] + [_ (at fs delete expected_path) + poll/3 (at watcher poll []) + poll/3' (at watcher poll [])] (in (and (case poll/3 (pattern (list [concern actual_path])) (and (not (/.creation? concern)) @@ -154,15 +154,15 @@ (_.for [/.Watcher]) (all _.and (_.for [/.Concern] - ..concern##test) + ..concern::test) ..exception (do [! random.monad] [directory (random.alphabetic 5) .let [/ "/" [fs watcher] (/.mock /)] - expected_path (# ! each (|>> (format directory /)) - (random.alphabetic 5)) + expected_path (at ! each (|>> (format directory /)) + (random.alphabetic 5)) data ($binary.random 10)] (in (do [! async.monad] [verdict (do (try.with !) @@ -188,7 +188,7 @@ .let [/ "/" [fs watcher] (/.mock /)]] (in (do async.monad - [started? (# watcher start /.all directory)] + [started? (at watcher start /.all directory)] (_.coverage' [/.cannot_poll_a_non_existent_directory] (case started? {try.#Success _} diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux index 3ffd0edf6..4e9db7301 100644 --- a/stdlib/source/test/lux/world/input/keyboard.lux +++ b/stdlib/source/test/lux/world/input/keyboard.lux @@ -140,7 +140,7 @@ (Random /.Key) (let [count (list.size ..listing)] (do [! random.monad] - [choice (# ! each (n.% count) random.nat)] + [choice (at ! each (n.% count) random.nat)] (in (maybe.trusted (list.item choice ..listing)))))) (def: .public test diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux index cf5005977..380e3a257 100644 --- a/stdlib/source/test/lux/world/net/http/client.lux +++ b/stdlib/source/test/lux/world/net/http/client.lux @@ -41,12 +41,12 @@ product.right (the //.#body) (function.on {.#None}) - (# ! each (|>> (pipe.do try.monad - [] - [product.right (# utf8.codec decoded)] - [(# nat.decimal decoded)] - [(nat.= expected) in]) - (try.else false)))) + (at ! each (|>> (pipe.do try.monad + [] + [product.right (at utf8.codec decoded)] + [(at nat.decimal decoded)] + [(nat.= expected) in]) + (try.else false)))) {try.#Failure error} (in false)))) @@ -65,7 +65,7 @@ on_connect random.nat on_options random.nat on_trace random.nat - num_headers (# ! each (nat.% 10) random.nat) + num_headers (at ! each (nat.% 10) random.nat) headers (random.dictionary text.hash num_headers (random.lower_case 3) (random.lower_case 3)) .let [mock (is (/.Client IO) (implementation @@ -81,8 +81,8 @@ {//.#Options} on_options {//.#Trace} on_trace) data (|> value - (# nat.decimal encoded) - (# utf8.codec encoded))] + (at nat.decimal encoded) + (at utf8.codec encoded))] {try.#Success [//status.ok [//.#headers headers //.#body (function (_ ?wanted_bytes) diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux index 347162ff5..f9e679733 100644 --- a/stdlib/source/test/lux/world/output/video/resolution.lux +++ b/stdlib/source/test/lux/world/output/video/resolution.lux @@ -47,7 +47,7 @@ (Random /.Resolution) (let [count (list.size ..listing)] (do [! random.monad] - [choice (# ! each (n.% count) random.nat)] + [choice (at ! each (n.% count) random.nat)] (in (maybe.trusted (list.item choice ..listing)))))) (def: .public test diff --git a/stdlib/source/test/lux/world/program.lux b/stdlib/source/test/lux/world/program.lux index 390a77515..3067422e0 100644 --- a/stdlib/source/test/lux/world/program.lux +++ b/stdlib/source/test/lux/world/program.lux @@ -42,7 +42,7 @@ Test (<| (_.covering /._) (do [! random.monad] - [env_size (# ! each (|>> (n.% 10) ++) random.nat) + [env_size (at ! each (|>> (n.% 10) ++) random.nat) environment (..environment env_size) home ..path directory ..path @@ -68,7 +68,7 @@ (_.coverage [/.unknown_environment_variable] (let [program (/.mock environment home directory)] (|> unknown - (# program variable) + (at program variable) io.run! (pipe.case {try.#Success _} false diff --git a/stdlib/source/test/lux/world/shell.lux b/stdlib/source/test/lux/world/shell.lux index c30aef45d..3ad40e908 100644 --- a/stdlib/source/test/lux/world/shell.lux +++ b/stdlib/source/test/lux/world/shell.lux @@ -98,11 +98,11 @@ .let [shell (/.async (..io_shell command oops input destruction exit))]] (in (do [! async.monad] [verdict (do (try.with !) - [process (# shell execute [environment.empty "~" command (list)]) - read (# process read []) - failure (# process fail []) + [process (at shell execute [environment.empty "~" command (list)]) + read (at process read []) + failure (at process fail []) wrote! (do ! - [write (# process write input)] + [write (at process write input)] (in {try.#Success (case write {try.#Success _} false @@ -110,14 +110,14 @@ {try.#Failure write} (text#= input write))})) destroyed! (do ! - [destroy (# process destroy [])] + [destroy (at process destroy [])] (in {try.#Success (case destroy {try.#Success _} false {try.#Failure destroy} (text#= destruction destroy))})) - await (# process await [])] + await (at process await [])] (in (and (text#= command read) (text#= oops failure) wrote! |