diff options
Diffstat (limited to 'stdlib/source/library')
247 files changed, 1602 insertions, 1595 deletions
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))) |