diff options
Diffstat (limited to '')
261 files changed, 1213 insertions, 1074 deletions
diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux index 17d7d3160..763b1b25f 100644 --- a/stdlib/source/library/lux.lux +++ b/stdlib/source/library/lux.lux @@ -3292,7 +3292,7 @@ _ ... TODO: Figure out why this doesn't work: - ... (at meta#monad in token) + ... (of meta#monad in token) (meta#in token)} token)))) @@ -5135,17 +5135,17 @@ {.#None} (failure (..wrong_syntax_error (symbol ..with)))))) -(def .public at +(def .public of (macro (_ tokens) (when tokens (list implementation [_ {#Symbol member}]) (meta#in (list (` (..with (, implementation) (, (symbol$ member)))))) (list#partial implementation member args) - (meta#in (list (` ((..at (, implementation) (, member)) (,* args))))) + (meta#in (list (` ((..of (, implementation) (, member)) (,* args))))) _ - (failure (..wrong_syntax_error (symbol ..at)))))) + (failure (..wrong_syntax_error (symbol ..of)))))) (def .public has (macro (_ tokens) @@ -5479,7 +5479,7 @@ (again &rest (property#with var_name expansion map))) {#End} - (at meta#monad #in (list#conjoint (list#each normal bodies)))))) + (of meta#monad #in (list#conjoint (list#each normal bodies)))))) {#None} (failure (..wrong_syntax_error (symbol ..with_expansions))))))) diff --git a/stdlib/source/library/lux/abstract/apply.lux b/stdlib/source/library/lux/abstract/apply.lux index 05827b9a9..69526ae86 100644 --- a/stdlib/source/library/lux/abstract/apply.lux +++ b/stdlib/source/library/lux/abstract/apply.lux @@ -26,18 +26,18 @@ (the functor g_apply))) (def (on fgx fgf) ... TODO: Switch from this version to the one below (in comments) ASAP. - (for @.old (let [fgf' (at f_apply on + (for @.old (let [fgf' (of 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 + (of f_monad in (function (_ gf gx) (of g_apply on gx gf))))] + (as_expected (of f_apply on (as_expected fgx) (as_expected fgf')))) + (let [fgf' (of 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)] + (of f_monad in (function (_ gf gx) (of g_apply on gx gf))))] + (of f_apply on fgx fgf'))) + ... (let [applyF (of f_apply on) + ... applyG (of g_apply on)] ... (all applyF ... fgf - ... (at f_monad in applyG) + ... (of f_monad in applyG) ... fgx)) ))) diff --git a/stdlib/source/library/lux/abstract/codec.lux b/stdlib/source/library/lux/abstract/codec.lux index f91e1ff20..e27e338ab 100644 --- a/stdlib/source/library/lux/abstract/codec.lux +++ b/stdlib/source/library/lux/abstract/codec.lux @@ -20,10 +20,10 @@ (Codec c a))) (implementation (def encoded - (|>> (at ba_codec encoded) - (at cb_codec encoded))) + (|>> (of ba_codec encoded) + (of cb_codec encoded))) (def (decoded cy) (do try.monad - [by (at cb_codec decoded cy)] - (at ba_codec decoded by))))) + [by (of cb_codec decoded cy)] + (of ba_codec decoded by))))) diff --git a/stdlib/source/library/lux/abstract/comonad/free.lux b/stdlib/source/library/lux/abstract/comonad/free.lux index b67ad2c55..2e73c415b 100644 --- a/stdlib/source/library/lux/abstract/comonad/free.lux +++ b/stdlib/source/library/lux/abstract/comonad/free.lux @@ -12,7 +12,7 @@ (All (_ F) (-> (Functor F) (Functor (Free F)))) (implementation (def (each f [head tail]) - [(f head) (at dsl each (each f) tail)]))) + [(f head) (of dsl each (each f) tail)]))) (def .public (comonad dsl) (All (_ F) (-> (Functor F) (CoMonad (Free F)))) @@ -24,4 +24,4 @@ (def (disjoint [head tail]) [[head tail] - (at dsl each disjoint tail)]))) + (of dsl each disjoint tail)]))) diff --git a/stdlib/source/library/lux/abstract/equivalence.lux b/stdlib/source/library/lux/abstract/equivalence.lux index aec9896e2..24cf2678e 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) - (at equivalence = (f reference) (f sample))))))) + (of equivalence = (f reference) (f sample))))))) diff --git a/stdlib/source/library/lux/abstract/hash.lux b/stdlib/source/library/lux/abstract/hash.lux index 07361aff2..0056b3223 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 - (at equivalence.functor each f - (at super equivalence))) + (of equivalence.functor each f + (of super equivalence))) (def hash - (|>> f (at super hash))))))) + (|>> f (of super hash))))))) diff --git a/stdlib/source/library/lux/abstract/interval.lux b/stdlib/source/library/lux/abstract/interval.lux index fcad3b26d..8531fc3ca 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))) (implementation (def enum (the enum right)) - (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))))) + (def bottom (order.min (of right order) (of left bottom) (of right bottom))) + (def top (order.max (of right order) (of left top) (of right top))))) (def .public (intersection left right) (All (_ a) (-> (Interval a) (Interval a) (Interval a))) (implementation (def enum (the enum right)) - (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))))) + (def bottom (order.max (of right order) (of left bottom) (of right bottom))) + (def top (order.min (of right order) (of left top) (of right top))))) (def .public (complement interval) (All (_ a) (-> (Interval a) (Interval a))) (implementation (def enum (the enum interval)) - (def bottom (at interval succ (at interval top))) - (def top (at interval pred (at interval bottom))))) + (def bottom (of interval succ (of interval top))) + (def top (of interval pred (of interval bottom))))) (def .public (precedes? reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) (let [(open "[0]") reference - limit (at reference bottom)] - (and (< limit (at sample bottom)) - (< limit (at sample top))))) + limit (of reference bottom)] + (and (< limit (of sample bottom)) + (< limit (of 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 (at reference bottom)] - (and (,#= limit (at sample top)) - (order.<= ,#order limit (at sample bottom))))) + limit (of reference bottom)] + (and (,#= limit (of sample top)) + (order.<= ,#order limit (of 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 (,#= (at reference <eq_side>) - (at sample <eq_side>)) + (and (,#= (of reference <eq_side>) + (of sample <eq_side>)) (<ineq> ,#order - (at reference <ineq_side>) - (at sample <ineq_side>)))))] + (of reference <ineq_side>) + (of sample <ineq_side>)))))] [starts? ,#bottom order.<= ,#top] [finishes? ,#top order.>= ,#bottom] @@ -147,8 +147,8 @@ (implementation (def (= reference sample) (let [(open ",#[0]") reference] - (and (,#= ,#bottom (at sample bottom)) - (,#= ,#top (at sample top))))))) + (and (,#= ,#bottom (of sample bottom)) + (,#= ,#top (of 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 (at reference bottom) (at sample bottom)) - (order.<= ,#order (at reference top) (at sample top)))) + (and (order.>= ,#order (of reference bottom) (of sample bottom)) + (order.<= ,#order (of reference top) (of 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 (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))))) + (or (and (order.>= ,#order (of reference bottom) (of sample bottom)) + (order.> ,#order (of reference bottom) (of sample top))) + (and (,#< (of reference top) (of sample bottom)) + (order.<= ,#order (of reference top) (of sample top))))) )) (def .public (overlaps? reference sample) (All (_ a) (-> (Interval a) (Interval a) Bit)) (let [(open ",#[0]") reference] - (and (not (at ..equivalence = reference sample)) + (and (not (of ..equivalence = reference sample)) (cond (singleton? sample) false @@ -183,8 +183,8 @@ (or (and (inner? sample) (outer? reference)) (and (outer? sample) (inner? reference))) - (or (order.>= ,#order (at reference bottom) (at sample top)) - (order.<= ,#order (at reference top) (at sample bottom))) + (or (order.>= ,#order (of reference bottom) (of sample top)) + (order.<= ,#order (of reference top) (of 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 9b4d74dac..355694d29 100644 --- a/stdlib/source/library/lux/abstract/monad.lux +++ b/stdlib/source/library/lux/abstract/monad.lux @@ -111,8 +111,8 @@ (All (_ ! a b) (-> (Monad !) (-> a (! b)) (-> (! a) (! b)))) - (|>> (at monad each f) - (at monad conjoint))) + (|>> (of monad each f) + (of monad conjoint))) (def .public (all monad) (All (_ ! a) @@ -172,7 +172,7 @@ (M a))) (when xs {.#End} - (at monad in init) + (of 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 081343130..b39bef272 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)} {#Impure value} - {#Impure (at dsl each (each f) value)})))) + {#Impure (of dsl each (each f) value)})))) (def .public (apply dsl) (All (_ F) (-> (Functor F) (Apply (Free F)))) @@ -34,12 +34,12 @@ {#Pure (f a)} [{#Pure f} {#Impure fa}] - {#Impure (at dsl each - (at (..functor dsl) each f) + {#Impure (of dsl each + (of (..functor dsl) each f) fa)} [{#Impure ff} _] - {#Impure (at dsl each (on ea) ff)} + {#Impure (of dsl each (on ea) ff)} )))) (def .public (monad dsl) @@ -61,7 +61,7 @@ {#Impure fa}) {#Impure fefa} - {#Impure (at dsl each - (at (monad dsl) conjoint) + {#Impure (of dsl each + (of (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 c752236c6..5f35ff377 100644 --- a/stdlib/source/library/lux/abstract/monad/indexed.lux +++ b/stdlib/source/library/lux/abstract/monad/indexed.lux @@ -56,10 +56,10 @@ (def named_monad (Parser [(Maybe Text) Code]) - (<>.either (<code>.tuple (<>.and (at <>.monad each (|>> {.#Some}) + (<>.either (<code>.tuple (<>.and (of <>.monad each (|>> {.#Some}) <code>.local) <code>.any)) - (at <>.monad each (|>> [{.#None}]) + (of <>.monad each (|>> [{.#None}]) <code>.any))) (def .public do diff --git a/stdlib/source/library/lux/abstract/monoid.lux b/stdlib/source/library/lux/abstract/monoid.lux index bef824ab0..536776812 100644 --- a/stdlib/source/library/lux/abstract/monoid.lux +++ b/stdlib/source/library/lux/abstract/monoid.lux @@ -15,9 +15,9 @@ (Monoid [left right]))) (implementation (def identity - [(at left identity) - (at right identity)]) + [(of left identity) + (of right identity)]) (def (composite [lL rL] [lR rR]) - [(at left composite lL lR) - (at right composite rL rR)]))) + [(of left composite lL lR) + (of right composite rL rR)]))) diff --git a/stdlib/source/library/lux/abstract/order.lux b/stdlib/source/library/lux/abstract/order.lux index 48bddc4be..e9c34b477 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 (at order < parameter subject) - (at order = parameter subject))) + (or (of order < parameter subject) + (of order = parameter subject))) (def .public (> order parameter subject) Comparison - (at order < subject parameter)) + (of order < subject parameter)) (def .public (>= order parameter subject) Comparison - (or (at order < subject parameter) - (at order = subject parameter))) + (or (of order < subject parameter) + (of order = subject parameter))) (type .public (Choice a) (-> (Order a) a a a)) (def .public (min order x y) Choice - (if (at order < y x) x y)) + (if (of order < y x) x y)) (def .public (max order x y) Choice - (if (at order < y x) y x)) + (if (of order < y x) y x)) (def .public functor (contravariant.Functor Order) @@ -50,7 +50,7 @@ (def (each f order) (implementation (def equivalence - (at equivalence.functor each f (at order equivalence))) + (of equivalence.functor each f (of order equivalence))) (def (< reference sample) - (at order < (f reference) (f sample))))))) + (of 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 47a31df8d..d92c4f463 100644 --- a/stdlib/source/library/lux/control/concurrency/actor.lux +++ b/stdlib/source/library/lux/control/concurrency/actor.lux @@ -44,7 +44,7 @@ [current (async.value read)] (when current {.#Some [head tail]} - (at ! each (|>> {.#Item head}) + (of ! each (|>> {.#Item head}) (pending tail)) {.#None} @@ -97,7 +97,7 @@ (let [[obituary _] (the #obituary (representation actor))] (|> obituary async.value - (at io.functor each + (of io.functor each (|>> (pipe.when {.#None} bit.yes @@ -209,7 +209,7 @@ (if continue? (|> actor (..mail! (action event stop)) - (at ! each try.maybe)) + (of ! 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 31c56c477..95a3cc7ec 100644 --- a/stdlib/source/library/lux/control/concurrency/async.lux +++ b/stdlib/source/library/lux/control/concurrency/async.lux @@ -76,7 +76,7 @@ (All (_ r w) (-> (Async' r w) (IO (Value r)))) (|>> representation atom.read! - (at io.functor each (|>> product.left + (of io.functor each (|>> product.left (maybe#each (|>> variance.read)))))) (def .public (upon! f async) @@ -99,7 +99,7 @@ (def .public resolved? (All (_ r w) (-> (Async' r w) (IO Bit))) (|>> ..value - (at io.functor each + (of io.functor each (|>> (pipe.when {.#None} false diff --git a/stdlib/source/library/lux/control/concurrency/csp.lux b/stdlib/source/library/lux/control/concurrency/csp.lux index f8cd41a77..442fd5f36 100644 --- a/stdlib/source/library/lux/control/concurrency/csp.lux +++ b/stdlib/source/library/lux/control/concurrency/csp.lux @@ -64,12 +64,12 @@ (def .public (write value sink) (All (_ w) (-> w (Sink w) (Process Any))) - (async.future (at sink feed value))) + (async.future (of sink feed value))) (def .public (close sink) (All (_ w) (-> (Sink w) (Process Any))) - (async.future (at sink close))) + (async.future (of sink close))) (def .public try (All (_ a) (-> (Process a) (Process (Try a)))) diff --git a/stdlib/source/library/lux/control/concurrency/frp.lux b/stdlib/source/library/lux/control/concurrency/frp.lux index e5fcac64d..5ad918211 100644 --- a/stdlib/source/library/lux/control/concurrency/frp.lux +++ b/stdlib/source/library/lux/control/concurrency/frp.lux @@ -146,7 +146,7 @@ (when ?ma {.#Some [a ma']} (exec - (io.run! (at sink feed a)) + (io.run! (of sink feed a)) (again ma')) {.#None} @@ -154,7 +154,7 @@ (again mma')) {.#None} - (in (is Any (io.run! (at sink close)))))))) + (in (is Any (io.run! (of sink close)))))))) output))))) (type .public (Subscriber a) @@ -244,7 +244,7 @@ (io.run! (loop (again [_ []]) (do io.monad [value action - _ (at sink feed value)] + _ (of sink feed value)] (async.upon! again (async.delay milli_seconds))))) [output sink]))) @@ -269,7 +269,7 @@ [item it] (when item {.#Some [head tail]} - (if (at equivalence = previous head) + (if (of equivalence = previous head) (distinct' equivalence previous tail) (in {.#Some [head (distinct' equivalence head tail)]})) @@ -293,7 +293,7 @@ [item it] (when item {.#Some [head tail]} - (at ! each (|>> {.#Item head}) + (of ! each (|>> {.#Item head}) (list tail)) {.#None} diff --git a/stdlib/source/library/lux/control/concurrency/semaphore.lux b/stdlib/source/library/lux/control/concurrency/semaphore.lux index 04d4333ff..2e05240f7 100644 --- a/stdlib/source/library/lux/control/concurrency/semaphore.lux +++ b/stdlib/source/library/lux/control/concurrency/semaphore.lux @@ -35,7 +35,7 @@ (Atom State) (def most_positions_possible - (.nat (at i.interval top))) + (.nat (of i.interval top))) (def .public (semaphore initial_open_positions) (-> Nat Semaphore) @@ -147,7 +147,7 @@ (do async.monad [outcome (..signal! turnstile)] (again (++ step))) - (at async.monad in [])))) + (of async.monad in [])))) (with_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 ad1e8d459..979971ee4 100644 --- a/stdlib/source/library/lux/control/concurrency/stm.lux +++ b/stdlib/source/library/lux/control/concurrency/stm.lux @@ -54,7 +54,7 @@ (do ! [banned (monad.only ! (function (_ sink) (do ! - [result (at sink feed (variance.write new_value))] + [result (of sink feed (variance.write new_value))] (in (when result {try.#Success _} false @@ -81,8 +81,8 @@ (frp.channel [])))] _ (atom.update! (function (_ [value observers]) [value {.#Item (implementation - (def close (at sink close)) - (def feed (|>> variance.read (at sink feed)))) + (def close (of sink close)) + (def feed (|>> variance.read (of sink feed)))) observers}]) (representation target))] (in [channel sink]))) @@ -106,7 +106,7 @@ (list.example (function (_ [_var _original _current]) (same? (as (Var Any) var) (as (Var Any) _var)))) - (at maybe.monad each (function (_ [_var _original _current]) + (of maybe.monad each (function (_ [_var _original _current]) _current)) as_expected)) diff --git a/stdlib/source/library/lux/control/exception.lux b/stdlib/source/library/lux/control/exception.lux index 49642bc07..29595d1a0 100644 --- a/stdlib/source/library/lux/control/exception.lux +++ b/stdlib/source/library/lux/control/exception.lux @@ -100,7 +100,7 @@ (let [(, g!descriptor) (, (code.text descriptor))] [..#label (, g!descriptor) ..#constructor (function ((, g!self) (, input)) - (at text.monoid (,' composite) (, g!descriptor) (, body)))])))))))))) + (of text.monoid (,' composite) (, g!descriptor) (, body)))])))))))))) (.def .public (report entries) (-> (List [Text Text]) Text) diff --git a/stdlib/source/library/lux/control/function/inline.lux b/stdlib/source/library/lux/control/function/inline.lux index a75f7688e..975b36f19 100644 --- a/stdlib/source/library/lux/control/function/inline.lux +++ b/stdlib/source/library/lux/control/function/inline.lux @@ -50,4 +50,4 @@ (list parameter (` <code>.any)))) list#conjoint)]] (in (list (` (syntax ((, g!_) [(,* g!parameters)]) - (.at meta.monad (,' in) (.list (.`' (, inlined)))))))))))) + (.of 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 f834b94e6..75a0b7ef4 100644 --- a/stdlib/source/library/lux/control/function/mutual.lux +++ b/stdlib/source/library/lux/control/function/mutual.lux @@ -47,7 +47,7 @@ (<| (as Macro) (is Macro') (function (_ parameters) - (at meta.monad in (list (` (((, g!self) (, g!context)) (,* parameters)))))))) + (of meta.monad in (list (` (((, g!self) (, g!context)) (,* parameters)))))))) (.def .public let (syntax (_ [functions (<code>.tuple (<>.some ..mutual)) diff --git a/stdlib/source/library/lux/control/function/named.lux b/stdlib/source/library/lux/control/function/named.lux index 39e0fba22..91eeb4c6c 100644 --- a/stdlib/source/library/lux/control/function/named.lux +++ b/stdlib/source/library/lux/control/function/named.lux @@ -65,7 +65,7 @@ (dictionary.value (, g!it) (, g!parameters))) (list (,* (list#each code.text parameters)))) {.#Some (, g!parameters)} - (at meta.monad (,' in) + (of meta.monad (,' in) (list (` ((, g!function) ((,' .,*) (, g!parameters)))))) {.#None} diff --git a/stdlib/source/library/lux/control/function/polymorphism/context.lux b/stdlib/source/library/lux/control/function/polymorphism/context.lux index 576d44cf1..14ed33b80 100644 --- a/stdlib/source/library/lux/control/function/polymorphism/context.lux +++ b/stdlib/source/library/lux/control/function/polymorphism/context.lux @@ -56,7 +56,7 @@ (.def .public empty Context - (set.empty (at hash.functor each (|>> representation) symbol.hash))) + (set.empty (of hash.functor each (|>> representation) symbol.hash))) )) (with_template [<name> <change>] @@ -146,10 +146,10 @@ (do meta.monad [[(, g!_) (, g!_) (, g!_) (, g!_) (, g!_) (, g!_) (, g!_) (, g!scenarios)] (context.search' (|>> product.left - (at text.equivalence (,' =) (, (code.text (the #name signature))))) + (of text.equivalence (,' =) (, (code.text (the #name signature))))) [(.in_module# (, (code.text @)) ..stack) (symbol ..stack)])] - (at meta.monad (,' in) + (of meta.monad (,' in) (list (` (.def (, export_policy) (, name) (, (quoted (` (<| (,* quantifications) (-> (,* inputs) (Reader (, context) (, output))))))) diff --git a/stdlib/source/library/lux/control/function/polymorphism/predicate.lux b/stdlib/source/library/lux/control/function/polymorphism/predicate.lux index 3a145e7eb..760fd8436 100644 --- a/stdlib/source/library/lux/control/function/polymorphism/predicate.lux +++ b/stdlib/source/library/lux/control/function/polymorphism/predicate.lux @@ -86,10 +86,10 @@ (do meta.monad [[(, g!_) (, g!_) (, g!_) (, g!_) (, g!_) (, g!_) (, g!scenarios)] (context.search' (|>> product.left - (at text.equivalence (,' =) (, (code.text (the #name signature))))) + (of text.equivalence (,' =) (, (code.text (the #name signature))))) [(.in_module# (, (code.text @)) ..stack) (symbol ..stack)])] - (at meta.monad (,' in) + (of meta.monad (,' in) (list (` (.def (, export_policy) (, name) (, (quoted (` (<| (,* quantifications) (-> (,* inputs) (, output)))))) diff --git a/stdlib/source/library/lux/control/function/polymorphism/type.lux b/stdlib/source/library/lux/control/function/polymorphism/type.lux index 5aec52b70..475c3053b 100644 --- a/stdlib/source/library/lux/control/function/polymorphism/type.lux +++ b/stdlib/source/library/lux/control/function/polymorphism/type.lux @@ -55,7 +55,7 @@ (, g!method)))) (.def (, export_policy) (, name) (syntax ((, g!_) [(, g!inputs) (?.many ?code.any)]) - (at meta.monad (,' in) + (of meta.monad (,' in) (list (` (a/an (, g!method) ((,' .,*) (, g!inputs)))))))) (,* methods)))))) diff --git a/stdlib/source/library/lux/control/function/variadic.lux b/stdlib/source/library/lux/control/function/variadic.lux index e914dde9e..17b0b059b 100644 --- a/stdlib/source/library/lux/control/function/variadic.lux +++ b/stdlib/source/library/lux/control/function/variadic.lux @@ -58,7 +58,7 @@ (list parameter (` ?code.any)))) list#conjoint)) (, &rest) (?.some ?code.any)]) - (at meta.monad (,' in) + (of meta.monad (,' in) (list (` ((, g!function) (,* (list#each (|>> , ((,' .,)) `) mandatory)) (list ((,' .,*) (, &rest))))))))))))) diff --git a/stdlib/source/library/lux/control/maybe.lux b/stdlib/source/library/lux/control/maybe.lux index 6ce448249..82703bbde 100644 --- a/stdlib/source/library/lux/control/maybe.lux +++ b/stdlib/source/library/lux/control/maybe.lux @@ -80,7 +80,7 @@ true [{.#Some x} {.#Some y}] - (at super = x y) + (of super = x y) _ false)))) @@ -89,7 +89,7 @@ (All (_ a) (-> (Hash a) (Hash (Maybe a)))) (implementation (def equivalence - (..equivalence (at super equivalence))) + (..equivalence (of super equivalence))) (def (hash value) (.when value @@ -97,7 +97,7 @@ 1 {.#Some value} - (at super hash value))))) + (of super hash value))))) (def .public (with monad) (All (_ M) (-> (Monad M) (Monad (All (_ a) (M (Maybe a)))))) @@ -107,8 +107,8 @@ ..functor)) (def in - (|>> (at ..monad in) - (at monad in))) + (|>> (of ..monad in) + (of 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))))) - (at monad each (at ..monad in))) + (of monad each (of ..monad in))) (def .public else (macro (_ tokens state) diff --git a/stdlib/source/library/lux/control/parser.lux b/stdlib/source/library/lux/control/parser.lux index 453c293b4..c3c87c59f 100644 --- a/stdlib/source/library/lux/control/parser.lux +++ b/stdlib/source/library/lux/control/parser.lux @@ -93,7 +93,7 @@ (-> (Parser s a) (Parser s b) (Parser s [a b]))) (do [! ..monad] [head first] - (at ! each (|>> [head]) second))) + (of ! each (|>> [head]) second))) (def .public (or left right) (All (_ s a b) @@ -128,7 +128,7 @@ (function (_ input) (when (parser input) {try.#Success [input' head]} - (..result (at ..monad each (|>> (list.partial head)) + (..result (of ..monad each (|>> (list.partial head)) (some parser)) input') @@ -140,32 +140,32 @@ (-> (Parser s a) (Parser s (List a)))) (|> (..some parser) (..and parser) - (at ..monad each (|>> {.#Item})))) + (of ..monad each (|>> {.#Item})))) (def .public (exactly amount parser) (All (_ s a) (-> Nat (Parser s a) (Parser s (List a)))) (when amount - 0 (at ..monad in (list)) + 0 (of ..monad in (list)) _ (do [! ..monad] [x parser] (|> parser (exactly (-- amount)) - (at ! each (|>> {.#Item x})))))) + (of ! 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)] - (at ! each (list#composite minimum) (..some parser)))) + (of ! each (list#composite minimum) (..some parser)))) (def .public (at_most amount parser) (All (_ s a) (-> Nat (Parser s a) (Parser s (List a)))) (when amount - 0 (at ..monad in (list)) + 0 (of ..monad in (list)) _ (function (_ input) (when (parser input) {try.#Success [input' x]} - (..result (at ..monad each (|>> {.#Item x}) + (..result (of ..monad each (|>> {.#Item x}) (at_most (-- amount) parser)) input') @@ -178,7 +178,7 @@ [minimum (..exactly minimum parser)] (when additional 0 (in minimum) - _ (at ! each (list#composite minimum) + _ (of ! each (list#composite minimum) (..at_most additional parser))))) (def .public (separated_by separator parser) @@ -190,7 +190,7 @@ (|> parser (..and separator) ..some - (at ! each (|>> (list#each product.right) {.#Item x}))) + (of ! each (|>> (list#each product.right) {.#Item x}))) {.#None} (in {.#End})))) @@ -297,7 +297,7 @@ (function (_ input) (when (parser input) {try.#Success [input' to_decode]} - (when (at codec decoded to_decode) + (when (of codec decoded to_decode) {try.#Success value} {try.#Success [input' value]} diff --git a/stdlib/source/library/lux/control/reader.lux b/stdlib/source/library/lux/control/reader.lux index 5a657143e..245fb0077 100644 --- a/stdlib/source/library/lux/control/reader.lux +++ b/stdlib/source/library/lux/control/reader.lux @@ -58,8 +58,8 @@ (functor.composite ..functor (the monad.functor monad))) (def in - (|>> (at monad in) - (at ..monad in))) + (|>> (of monad in) + (of ..monad in))) (def (conjoint eMeMa) (function (_ env) @@ -69,4 +69,4 @@ (def .public lifted (All (_ ! e a) (-> (! a) (Reader e (! a)))) - (at ..monad in)) + (of ..monad in)) diff --git a/stdlib/source/library/lux/control/region.lux b/stdlib/source/library/lux/control/region.lux index 4216a1e78..50801fc4f 100644 --- a/stdlib/source/library/lux/control/region.lux +++ b/stdlib/source/library/lux/control/region.lux @@ -59,13 +59,13 @@ [[cleaners output] (computation [[] (list)])] (|> cleaners (monad.each ! (function (_ cleaner) (cleaner []))) - (at ! each (list#mix clean output))))) + (of ! 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]) - (at monad in [{.#Item (function (_ region) (cleaner value)) + (of monad in [{.#Item (function (_ region) (cleaner value)) cleaners} {try.#Success value}]))) @@ -77,7 +77,7 @@ (def (each f) (function (_ fa) (function (_ region+cleaners) - (at super each + (of super each (function (_ [cleaners' temp]) [cleaners' (when temp {try.#Success value} @@ -122,7 +122,7 @@ (def (in value) (function (_ [region cleaners]) - (at super in [cleaners {try.#Success value}]))) + (of 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]) - (at monad in [cleaners {try.#Failure error}]))) + (of 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]) - (at monad each + (of monad each (|>> {try.#Success} [cleaners]) operation))) diff --git a/stdlib/source/library/lux/control/security/capability.lux b/stdlib/source/library/lux/control/security/capability.lux index 112de0720..9f7b4e61b 100644 --- a/stdlib/source/library/lux/control/security/capability.lux +++ b/stdlib/source/library/lux/control/security/capability.lux @@ -43,7 +43,7 @@ (do [! meta.monad] [this_module meta.current_module_name .let [[name vars] declaration] - g!brand (at ! each (|>> %.code code.text) + g!brand (of ! each (|>> %.code code.text) (macro.symbol (format (%.symbol [this_module name])))) .let [type (` (..Capability (.Nominal (, g!brand)) (, input) (, output)))]] (in (list (` (type (, export_policy) diff --git a/stdlib/source/library/lux/control/state.lux b/stdlib/source/library/lux/control/state.lux index 3e925308a..42270a943 100644 --- a/stdlib/source/library/lux/control/state.lux +++ b/stdlib/source/library/lux/control/state.lux @@ -93,13 +93,13 @@ (implementation (def (each f sfa) (function (_ state) - (at functor each (function (_ [s a]) [s (f a)]) + (of functor each (function (_ [s a]) [s (f a)]) (sfa state)))))) (def (with//apply monad) (All (_ M s) (-> (Monad M) (Apply (All (_ a) (-> s (M [s a])))))) (implementation - (def functor (with//functor (at monad functor))) + (def functor (with//functor (of monad functor))) (def (on sFa sFf) (function (_ state) @@ -118,11 +118,11 @@ (def .public (with monad) (All (_ M s) (-> (Monad M) (Monad (+State M s)))) (implementation - (def functor (with//functor (at monad functor))) + (def functor (with//functor (of monad functor))) (def (in a) (function (_ state) - (at monad in [state a]))) + (of 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 70a35df76..c9ed542d7 100644 --- a/stdlib/source/library/lux/control/try.lux +++ b/stdlib/source/library/lux/control/try.lux @@ -73,8 +73,8 @@ ..functor)) (def in - (|>> (at ..monad in) - (at monad in))) + (|>> (of ..monad in) + (of monad in))) (def (conjoint MeMea) (do monad @@ -89,7 +89,7 @@ (def .public (lifted monad) (All (_ ! a) (-> (Monad !) (-> (! a) (! (Try a))))) - (at monad each (at ..monad in))) + (of monad each (of ..monad in))) (def .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 f55b31354..2f5069f46 100644 --- a/stdlib/source/library/lux/control/writer.lux +++ b/stdlib/source/library/lux/control/writer.lux @@ -35,7 +35,7 @@ (def (on fa ff) (let [[log1 f] ff [log2 a] fa] - [(at monoid composite log1 log2) (f a)])))) + [(of monoid composite log1 log2) (f a)])))) (def .public (monad monoid) (All (_ l) @@ -44,11 +44,11 @@ (def functor ..functor) (def in - (|>> [(at monoid identity)])) + (|>> [(of monoid identity)])) (def (conjoint mma) (let [[log1 [log2 a]] mma] - [(at monoid composite log1 log2) a])))) + [(of monoid composite log1 log2) a])))) (def .public (with monoid monad) (All (_ l M) (-> (Monoid l) (Monad M) (Monad (All (_ a) (M (Writer l a)))))) @@ -59,7 +59,7 @@ (def in (let [writer (..monad monoid)] - (|>> (at writer in) (at monad in)))) + (|>> (of writer in) (of monad in)))) (def (conjoint MlMla) (do monad @@ -73,10 +73,10 @@ ... On new compiler MlMla) [l2 a] Mla] - (in [(at monoid composite l1 l2) a]))))) + (in [(of monoid composite l1 l2) a]))))) (def .public (lifted monoid monad) (All (_ l M a) (-> (Monoid l) (Monad M) (-> (M a) (M (Writer l a))))) - (at monad each (|>> [(at monoid identity)]))) + (of monad each (|>> [(of monoid identity)]))) diff --git a/stdlib/source/library/lux/data/collection/dictionary.lux b/stdlib/source/library/lux/data/collection/dictionary.lux index 482824d85..5cb6a64e7 100644 --- a/stdlib/source/library/lux/data/collection/dictionary.lux +++ b/stdlib/source/library/lux/data/collection/dictionary.lux @@ -233,9 +233,9 @@ ... 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))) - (at maybe.monad each product.left + (of maybe.monad each product.left (array.example' (function (_ idx [key' val']) - (at key_hash = key key')) + (of key_hash = key key')) colls))) ... When #Hierarchy nodes grow too small, they're demoted to #Base @@ -277,7 +277,7 @@ {.#Right [key' val']} (array.has! hierarchy_idx - (node#has (level_up level) (at key_hash hash key') key' val' key_hash ..empty_node) + (node#has (level_up level) (of key_hash hash key') key' val' key_hash ..empty_node) h_array))] default)) [0 @@ -326,11 +326,11 @@ ... Otherwise, if it's being used by a KV, compare the keys. {.#Right key' val'} (array#revised idx - (if (at key_hash = key key') + (if (of 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' (at key_hash hash key')] + {.#Left (let [hash' (of key_hash hash key')] (if (n.= hash hash') ... If the hashes are ... the same, a new @@ -449,7 +449,7 @@ ... If, however, there was a KV-pair instead of a sub-node. {.#Right [key' val']} ... Check if the keys match. - (if (at key_hash = key key') + (if (of 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)} @@ -494,15 +494,15 @@ (node#value (level_up level) hash key key_hash sub_node) {.#Right [key' val']} - (if (at key_hash = key key') + (if (of key_hash = key key') {.#Some val'} {.#None})) {.#None})) ... For #Collisions nodes, do a linear scan of all the known KV-pairs. {#Collisions _hash _colls} - (at maybe.monad each product.right - (array.example (|>> product.left (at key_hash = key)) + (of maybe.monad each product.right + (array.example (|>> product.left (of key_hash = key)) _colls)) )) @@ -578,17 +578,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 (at key_hash hash key) key val key_hash node)])) + [key_hash (node#has root_level (of 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 (at key_hash hash key) key key_hash node)])) + [key_hash (node#lacks root_level (of 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 (at key_hash hash key) key key_hash node))) + (node#value root_level (of key_hash hash key) key key_hash node))) (def .public (key? dict key) (All (_ k v) (-> (Dictionary k v) k Bit)) @@ -736,7 +736,7 @@ (All (_ k) (Functor (Dictionary k))) (implementation (def (each f fa) - (.revised #root (at ..node_functor each f) fa)))) + (.revised #root (of ..node_functor each f) fa)))) (def .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 3541cef42..9cbe20f49 100644 --- a/stdlib/source/library/lux/data/collection/dictionary/ordered.lux +++ b/stdlib/source/library/lux/data/collection/dictionary/ordered.lux @@ -70,11 +70,11 @@ {.#Some node} (let [node_key (the #key node)] - (cond (at dict = node_key key) + (cond (of dict = node_key key) ... (_#= node_key key) {.#Some (the #value node)} - (at dict < node_key key) + (of dict < node_key key) ... (_#< node_key key) (again (the #left node)) @@ -95,9 +95,9 @@ {.#Some node} (let [node_key (the #key node)] - (or (at dict = node_key key) + (or (of dict = node_key key) ... (_#= node_key key) - (if (at dict < node_key key) + (if (of dict < node_key key) ... (_#< node_key key) (again (the #left node)) (again (the #right node))))))))) @@ -358,7 +358,7 @@ {.#Some (right_balanced (the #key right) (the #value right) (the #right right>>left) - (at maybe.functor each reddened (the #right right)))}) + (of maybe.functor each reddened (the #right right)))}) _ (panic! error_message)) @@ -385,7 +385,7 @@ (the #value left>>right) {.#Some (left_balanced (the #key left) (the #value left) - (at maybe.functor each reddened (the #left left)) + (of 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 c0b4c4e87..3ec1cd2c8 100644 --- a/stdlib/source/library/lux/data/collection/list.lux +++ b/stdlib/source/library/lux/data/collection/list.lux @@ -318,7 +318,7 @@ true [{.#Item x xs'} {.#Item y ys'}] - (and (at Equivalence<a> = x y) + (and (of Equivalence<a> = x y) (= xs' ys')) [_ _] @@ -328,12 +328,12 @@ (All (_ a) (-> (Hash a) (Hash (List a)))) (implementation (def equivalence - (..equivalence (at super equivalence))) + (..equivalence (of super equivalence))) (def hash - (at ..mix mix + (of ..mix mix (function (_ member hash) - (n.+ (at super hash member) hash)) + (n.+ (of super hash member) hash)) 0)))) (def .public monoid @@ -425,7 +425,7 @@ false {.#Item x' xs'} - (or (at eq = x x') + (or (of eq = x x') (member? eq xs' x)))) (with_template [<name> <output> <side>] @@ -591,7 +591,7 @@ (def .public together (All (_ a) (-> (List (List a)) (List a))) - (at ..monad conjoint)) + (of ..monad conjoint)) (def .public (with monad) (All (_ M) (-> (Monad M) (Monad (All (_ a) (M (List a)))))) @@ -601,7 +601,7 @@ ..functor)) (def in - (|>> (at ..monad in) (at monad in))) + (|>> (of ..monad in) (of monad in))) (def (conjoint MlMla) (do [! monad] @@ -615,7 +615,7 @@ (def .public (lifted monad) (All (_ M a) (-> (Monad M) (-> (M a) (M (List a))))) - (at monad each (at ..monad in))) + (of monad each (of ..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 05a5107c3..54eeee5fb 100644 --- a/stdlib/source/library/lux/data/collection/queue.lux +++ b/stdlib/source/library/lux/data/collection/queue.lux @@ -82,7 +82,7 @@ (All (_ a) (-> (Equivalence a) (Equivalence (Queue a)))) (implementation (def (= reference subject) - (at (list.equivalence super) = + (of (list.equivalence super) = (..list reference) (..list subject))))) diff --git a/stdlib/source/library/lux/data/collection/queue/priority.lux b/stdlib/source/library/lux/data/collection/queue/priority.lux index 17cf5ee16..de634ba5e 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]) (when (tree.root node) {0 #0 reference} - (at equivalence = reference member) + (of equivalence = reference member) {0 #1 [left right]} (or (again left) @@ -102,24 +102,24 @@ {.#Some right} {.#Some =left} - {.#Some (at ..builder branch =left right)}) + {.#Some (of ..builder branch =left right)}) (when (again right) {.#None} {.#Some left} {.#Some =right} - {.#Some (at ..builder branch left =right)}))))))) + {.#Some (of ..builder branch left =right)}))))))) (def .public (end priority value queue) (All (_ a) (-> Priority a (Queue a) (Queue a))) - (let [addition (at ..builder leaf priority value)] + (let [addition (of ..builder leaf priority value)] (abstraction (when (representation queue) {.#None} {.#Some addition} {.#Some tree} - {.#Some (at ..builder branch tree addition)})))) + {.#Some (of ..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 86558bbb1..72d48f6f1 100644 --- a/stdlib/source/library/lux/data/collection/sequence.lux +++ b/stdlib/source/library/lux/data/collection/sequence.lux @@ -270,8 +270,8 @@ (All (_ of) (Exception [(Sequence of) Nat])) (exception.report - (.list ["Size" (at n.decimal encoded (the #size sequence))] - ["Index" (at n.decimal encoded index)]))) + (.list ["Size" (of n.decimal encoded (the #size sequence))] + ["Index" (of n.decimal encoded index)]))) (exception.def base_was_not_found) @@ -497,7 +497,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! - $ (at node_functor each $)] + $ (of 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 e3bf42911..6df4be089 100644 --- a/stdlib/source/library/lux/data/collection/set.lux +++ b/stdlib/source/library/lux/data/collection/set.lux @@ -81,7 +81,7 @@ (def (hash set) (|> set ..list - (at (list.hash (..member_hash set)) hash))))) + (of (list.hash (..member_hash set)) hash))))) (def .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 46c225ab4..5b9ec01f3 100644 --- a/stdlib/source/library/lux/data/collection/set/multi.lux +++ b/stdlib/source/library/lux/data/collection/set/multi.lux @@ -136,7 +136,7 @@ (let [set (representation set) [hash _] set] (list#mix (function (_ [elem multiplicity] acc) - (|> elem (at hash hash) (n.* multiplicity) (n.+ acc))) + (|> elem (of 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 fcaa369c7..2612aa2f7 100644 --- a/stdlib/source/library/lux/data/collection/set/ordered.lux +++ b/stdlib/source/library/lux/data/collection/set/ordered.lux @@ -71,7 +71,7 @@ (All (_ a) (Equivalence (Set a))) (implementation (def (= reference sample) - (at (list.equivalence (at (representation reference) equivalence)) + (of (list.equivalence (of (representation reference) equivalence)) = (..list reference) (..list sample))))) ) diff --git a/stdlib/source/library/lux/data/collection/stack.lux b/stdlib/source/library/lux/data/collection/stack.lux index 4d1d6e0cb..8f51d85dd 100644 --- a/stdlib/source/library/lux/data/collection/stack.lux +++ b/stdlib/source/library/lux/data/collection/stack.lux @@ -54,7 +54,7 @@ (Equivalence (Stack a)))) (implementation (def (= reference subject) - (at (//.equivalence super) = (representation reference) (representation subject))))) + (of (//.equivalence super) = (representation reference) (representation subject))))) (def .public functor (Functor Stack) @@ -62,6 +62,6 @@ (def (each f value) (|> value representation - (at //.functor each f) + (of //.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 4ac0e5bed..c8e22a127 100644 --- a/stdlib/source/library/lux/data/collection/tree.lux +++ b/stdlib/source/library/lux/data/collection/tree.lux @@ -65,8 +65,8 @@ (All (_ a) (-> (Equivalence a) (Equivalence (Tree a)))) (implementation (def (= tx ty) - (and (at super = (the #value tx) (the #value ty)) - (at (list.equivalence (equivalence super)) = (the #children tx) (the #children ty)))))) + (and (of super = (the #value tx) (the #value ty)) + (of (list.equivalence (equivalence super)) = (the #children tx) (the #children ty)))))) (def .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 b54a30582..39e324aca 100644 --- a/stdlib/source/library/lux/data/collection/tree/finger.lux +++ b/stdlib/source/library/lux/data/collection/tree/finger.lux @@ -53,7 +53,7 @@ (def (branch left right) (abstraction [#monoid monoid - #tag (at monoid composite (..tag left) (..tag right)) + #tag (of monoid composite (..tag left) (..tag right)) #root {.#Right [left right]}])))) (def .public (value tree) diff --git a/stdlib/source/library/lux/data/color.lux b/stdlib/source/library/lux/data/color.lux index fc79bb0db..5d7c33920 100644 --- a/stdlib/source/library/lux/data/color.lux +++ b/stdlib/source/library/lux/data/color.lux @@ -38,11 +38,11 @@ (def .public equivalence (Equivalence Color) - (at equivalence.functor each ..rgb rgb.equivalence)) + (of equivalence.functor each ..rgb rgb.equivalence)) (def .public hash (Hash Color) - (at hash.functor each ..rgb rgb.hash)) + (of hash.functor each ..rgb rgb.hash)) (with_template [<color> <rgb>] [(def .public <color> @@ -59,11 +59,11 @@ (implementation (def identity (nominal.abstraction - (at <rgb> identity))) + (of <rgb> identity))) (def (composite left right) (nominal.abstraction - (at <rgb> composite + (of <rgb> composite (nominal.representation left) (nominal.representation right))))))] @@ -224,23 +224,3 @@ (hsb.hsb hue saturation) hsb.rgb ..of_rgb))))) - -(type .public Alpha - Rev) - -(def .public transparent - Alpha - rev#bottom) - -(def .public translucent - Alpha - .5) - -(def .public opaque - Alpha - rev#top) - -(type .public Pigment - (Record - [#color Color - #alpha Alpha])) diff --git a/stdlib/source/library/lux/data/color/cmyk.lux b/stdlib/source/library/lux/data/color/cmyk.lux index d519d2cea..6dc6b1f2a 100644 --- a/stdlib/source/library/lux/data/color/cmyk.lux +++ b/stdlib/source/library/lux/data/color/cmyk.lux @@ -4,130 +4,110 @@ [abstract [equivalence (.only Equivalence)]] [control - ["[0]" try (.only Try)] - ["[0]" exception (.only Exception)]] + ["[0]" try] + [function + [predicate (.only Predicate)]]] [data - [text - ["%" \\format]]] + ["[0]" product]] [math [number ["f" frac] - ["[0]" int]]] - [meta - [type - ["[0]" nominal]]]]] + ["[0]" int]]]]] [// ["[0]" rgb (.only RGB)]]) -(with_expansions [<min> +0.0 - <max> +1.0] - (nominal.def .public Value - Frac +(def .public Value + Frac) - (with_template [<number> <name>] - [(def .public <name> - Value - (nominal.abstraction <number>))] +(with_template [<value> <name>] + [(def .public <name> + Value + <value>)] - [<min> least] - [<max> most] - ) + [+0.0 least] + [+1.0 most] + ) - (exception.def .public (invalid it) - (Exception Frac) - (exception.report - (list ["Minimum" (%.frac (nominal.representation ..least))] - ["Maximum" (%.frac (nominal.representation ..most))] - ["Value" (%.frac it)]))) +(def .public (value? it) + (Predicate Frac) + (not (or (f.< ..least it) + (f.> ..most it)))) - (def .public (value it) - (-> Frac - (Try Value)) - (if (or (f.> (nominal.representation ..most) - it) - (f.< (nominal.representation ..least) - it)) - (exception.except ..invalid [it]) - {try.#Success (nominal.abstraction it)})) +(def .public value + (-> Frac + Value) + (|>> (f.max ..least) + (f.min ..most))) - (def .public number - (-> Value - Frac) - (|>> nominal.representation)) +(type .public CMYK + (Record + [#cyan Value + #magenta Value + #yellow Value + #key Value])) - (type .public CMYK - (Record - [#cyan Value - #magenta Value - #yellow Value - #key Value])) +(def .public equivalence + (Equivalence CMYK) + (all product.equivalence + f.equivalence + f.equivalence + f.equivalence + f.equivalence + )) - (def .public equivalence - (Equivalence CMYK) - (implementation - (def (= [cR mR yR kR] [cS mS yS kS]) - (and (f.= (nominal.representation cR) (nominal.representation cS)) - (f.= (nominal.representation mR) (nominal.representation mS)) - (f.= (nominal.representation yR) (nominal.representation yS)) - (f.= (nominal.representation kR) (nominal.representation kS)))))) +(def top + (-- rgb.limit)) - (def top - (-- rgb.limit)) +(def rgb_factor + (|> top .int int.frac)) - (def rgb_factor - (|> top .int int.frac)) +(def down + (-> Nat + Frac) + (|>> .int int.frac (f./ rgb_factor))) - (def down - (-> Nat - Frac) - (|>> .int int.frac (f./ rgb_factor))) +(def up + (-> Frac + Nat) + (|>> (f.* rgb_factor) f.int .nat)) - (def up - (-> Frac - Nat) - (|>> (f.* rgb_factor) f.int .nat)) +(def (opposite it) + (-> Frac + Frac) + (f.- it ..most)) - (def (opposite it) - (-> Frac - Frac) - (f.- it <max>)) +(def .public (cmyk it) + (-> RGB + CMYK) + (let [red (..down (rgb.number (the rgb.#red it))) + green (..down (rgb.number (the rgb.#green it))) + blue (..down (rgb.number (the rgb.#blue it))) + key (opposite (all f.max red green blue)) + f (if (f.< ..most key) + (f./ (opposite key) + ..most) + ..least)] + [#cyan (|> ..most (f.- red) (f.- key) (f.* f)) + #magenta (|> ..most (f.- green) (f.- key) (f.* f)) + #yellow (|> ..most (f.- blue) (f.- key) (f.* f)) + #key key])) - (def .public (cmyk it) - (-> RGB - CMYK) - (let [red (..down (rgb.number (the rgb.#red it))) - green (..down (rgb.number (the rgb.#green it))) - blue (..down (rgb.number (the rgb.#blue it))) - key (opposite (all f.max red green blue)) - f (if (f.< <max> key) - (f./ (opposite key) - <max>) - <min>) - cyan (|> <max> (f.- red) (f.- key) (f.* f)) - magenta (|> <max> (f.- green) (f.- key) (f.* f)) - yellow (|> <max> (f.- blue) (f.- key) (f.* f))] - [#cyan (nominal.abstraction cyan) - #magenta (nominal.abstraction magenta) - #yellow (nominal.abstraction yellow) - #key (nominal.abstraction key)])) - - (def .public (rgb it) - (-> CMYK - RGB) - (when (nominal.representation (the #key it)) - <max> - rgb.black - - key - (let [~key (opposite key) - red (f.* ~key - (opposite (nominal.representation (the #cyan it)))) - green (f.* ~key - (opposite (nominal.representation (the #magenta it)))) - blue (f.* ~key - (opposite (nominal.representation (the #yellow it))))] - (|> (rgb.rgb (..up red) - (..up green) - (..up blue)) - try.trusted)))) - )) +(def .public (rgb it) + (-> CMYK + RGB) + (when (the #key it) + ..most + rgb.black + + key + (let [~key (opposite key) + red (f.* ~key + (opposite (the #cyan it))) + green (f.* ~key + (opposite (the #magenta it))) + blue (f.* ~key + (opposite (the #yellow it)))] + (|> (rgb.rgb (..up red) + (..up green) + (..up blue)) + try.trusted)))) diff --git a/stdlib/source/library/lux/data/color/pigment.lux b/stdlib/source/library/lux/data/color/pigment.lux new file mode 100644 index 000000000..83da4983f --- /dev/null +++ b/stdlib/source/library/lux/data/color/pigment.lux @@ -0,0 +1,26 @@ +(.require + [library + [lux (.except)]] + [// + [rgb (.only RGB)]]) + +(type .public Alpha + Rev) + +(with_template [<value> <name>] + [(def .public <name> + Alpha + <value>)] + + [.0 transparent] + [.5 translucent] + ) + +(def .public opaque + Alpha + (-- transparent)) + +(type .public Pigment + (Record + [#color RGB + #alpha Alpha])) diff --git a/stdlib/source/library/lux/data/format/css.lux b/stdlib/source/library/lux/data/format/css.lux index 256e70010..517dd9f53 100644 --- a/stdlib/source/library/lux/data/format/css.lux +++ b/stdlib/source/library/lux/data/format/css.lux @@ -59,8 +59,8 @@ (-> Font (CSS Special)) (let [with_unicode (when (the /font.#unicode_range font) {.#Some 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)))] + (let [unicode_range' (format "U+" (of nat.hex encoded (the /font.#start unicode_range)) + "-" (of nat.hex encoded (the /font.#end unicode_range)))] (list ["unicode-range" unicode_range'])) {.#None} diff --git a/stdlib/source/library/lux/data/format/css/selector.lux b/stdlib/source/library/lux/data/format/css/selector.lux index 757ca8df8..292e27300 100644 --- a/stdlib/source/library/lux/data/format/css/selector.lux +++ b/stdlib/source/library/lux/data/format/css/selector.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Label Tag or and for same? not at) + [lux (.except Label Tag or and for same? not) [data ["[0]" text (.only) ["%" \\format (.only format)]]] diff --git a/stdlib/source/library/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux index 6886dad69..035d45c10 100644 --- a/stdlib/source/library/lux/data/format/css/value.lux +++ b/stdlib/source/library/lux/data/format/css/value.lux @@ -6,6 +6,7 @@ [data ["[0]" product] ["[0]" color (.only) + [pigment (.only Pigment)] ["[0]" rgb]] ["[0]" text (.only) ["%" \\format (.only Format format)]] @@ -837,16 +838,16 @@ (%.nat (rgb.number blue)))))) (def .public (rgba pigment) - (-> color.Pigment + (-> Pigment (Value Color)) - (let [(open "_[0]") pigment - [red green blue] (color.rgb _#color)] + (let [(open "/[0]") pigment + [red green blue] /#color] (..apply "rgba" (list (%.nat (rgb.number red)) (%.nat (rgb.number green)) (%.nat (rgb.number blue)) - (if (r.= (at r.interval top) _#alpha) + (if (r.= (of r.interval top) /#alpha) "1.0" - (format "0" (%.rev _#alpha))))))) + (format "0" (%.rev /#alpha))))))) (with_template [<name> <suffix>] [(def .public (<name> value) diff --git a/stdlib/source/library/lux/data/format/html.lux b/stdlib/source/library/lux/data/format/html.lux index 77beb4f7f..eb4569b48 100644 --- a/stdlib/source/library/lux/data/format/html.lux +++ b/stdlib/source/library/lux/data/format/html.lux @@ -226,7 +226,7 @@ (def .public (svg attributes content) (-> Attributes XML Element) (|> content - (at xml.codec encoded) + (of 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 32cfd2a3e..09a6f6fea 100644 --- a/stdlib/source/library/lux/data/format/json.lux +++ b/stdlib/source/library/lux/data/format/json.lux @@ -188,7 +188,7 @@ (^.with_template [<tag> <struct>] [[{<tag> x'} {<tag> y'}] - (at <struct> = x' y')]) + (of <struct> = x' y')]) ([#Boolean bit.equivalence] [#Number f.equivalence] [#String text.equivalence]) @@ -242,7 +242,7 @@ "0.0" value - (let [raw (at f.decimal encoded value)] + (let [raw (of 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 6e5293f67..7a6e9af55 100644 --- a/stdlib/source/library/lux/data/format/tar.lux +++ b/stdlib/source/library/lux/data/format/tar.lux @@ -97,10 +97,10 @@ (let [suffix <suffix> padded_size (n.+ (text.size suffix) <size>)] (|>> representation - (at n.octal encoded) + (of n.octal encoded) (..octal_padding <size>) (text.suffix suffix) - (at utf8.codec encoded) + (of utf8.codec encoded) (!binary.segment padded_size)))) (def <coercion> @@ -143,25 +143,25 @@ (Parser Small) (do <>.monad [digits (?binary.segment ..small_size) - digits (<>.of_try (at utf8.codec decoded digits)) + digits (<>.of_try (of utf8.codec decoded digits)) _ ..small_suffix] (<>.of_try (do [! try.monad] - [value (at n.octal decoded digits)] + [value (of n.octal decoded digits)] (..small value))))) (def big_parser (Parser Big) (do <>.monad [digits (?binary.segment ..big_size) - digits (<>.of_try (at utf8.codec decoded digits)) + digits (<>.of_try (of utf8.codec decoded digits)) end ?binary.bits_8 _ (let [expected (`` (char (,, (static ..blank))))] (<>.assertion (exception.error ..wrong_character [expected end]) (n.= expected end)))] (<>.of_try (do [! try.monad] - [value (at n.octal decoded digits)] + [value (of n.octal decoded digits)] (..big value))))) (nominal.def Checksum @@ -185,7 +185,7 @@ (def checksum_checksum (|> ..dummy_checksum representation - (at utf8.codec encoded) + (of utf8.codec encoded) ..checksum)) (def checksum_code @@ -193,7 +193,7 @@ (|>> ..checksum ..as_small ..from_small - (at n.octal encoded) + (of n.octal encoded) (..octal_padding ..small_size) (text.suffix ..checksum_suffix) abstraction)) @@ -203,17 +203,17 @@ (let [padded_size (n.+ (text.size ..checksum_suffix) ..small_size)] (|>> representation - (at utf8.codec encoded) + (of utf8.codec encoded) (!binary.segment padded_size)))) (def checksum_parser (Parser [Nat Checksum]) (do <>.monad [ascii (?binary.segment ..small_size) - digits (<>.of_try (at utf8.codec decoded ascii)) + digits (<>.of_try (of utf8.codec decoded ascii)) _ ..small_suffix value (<>.of_try - (at n.octal decoded digits))] + (of n.octal decoded digits))] (in [value (abstraction (%.format digits ..checksum_suffix))]))) ) @@ -224,7 +224,7 @@ (def ascii? (-> Text Bit) - (|>> (at utf8.codec encoded) + (|>> (of utf8.codec encoded) (binary.mix (function (_ char verdict) (.and verdict (n.<= ..last_ascii char))) @@ -247,7 +247,7 @@ size (loop (again [end (-- size)]) (when end - 0 (at utf8.codec encoded "") + 0 (of utf8.codec encoded "") _ (let [last_char (binary!.bits_8 end string)] (`` (when (.nat last_char) (char (,, (static ..null))) @@ -271,7 +271,7 @@ (-> <representation> (Try <type>)) (if (..ascii? value) (if (|> value - (at utf8.codec encoded) + (of utf8.codec encoded) binary!.size (n.> <size>)) (exception.except <exception> [value]) @@ -288,7 +288,7 @@ padded_size (n.+ (text.size suffix) <size>)] (|>> representation (text.suffix suffix) - (at utf8.codec encoded) + (of utf8.codec encoded) (!binary.segment padded_size)))) (def <parser> @@ -301,7 +301,7 @@ (n.= expected end))] (<>.of_try (do [! try.monad] - [text (at utf8.codec decoded (..un_padded string))] + [text (of utf8.codec decoded (..un_padded string))] (<in> text))))) (def .public <none> @@ -330,7 +330,7 @@ (let [padded_size (n.+ (text.size ..null) ..magic_size)] (|>> representation - (at utf8.codec encoded) + (of utf8.codec encoded) (!binary.segment padded_size)))) (def magic_parser @@ -342,8 +342,8 @@ _ (<>.assertion (exception.error ..wrong_character [expected end]) (n.= expected end))] (<>.of_try - (at try.monad each (|>> abstraction) - (at utf8.codec decoded string))))) + (of try.monad each (|>> abstraction) + (of utf8.codec decoded string))))) ) (def block_size Size 512) @@ -524,7 +524,7 @@ (def mode_parser (Parser Mode) (do [! <>.monad] - [value (at ! each ..from_small ..small_parser)] + [value (of ! each ..from_small ..small_parser)] (if (n.> (representation ..maximum_mode) value) (<>.of_try @@ -810,7 +810,7 @@ (-> Checksum Binary Nat) (let [|checksum| (|> checksum ..from_checksum - (at utf8.codec encoded) + (of utf8.codec encoded) ..checksum)] (|> (..checksum header) (n.- |checksum|) @@ -882,7 +882,7 @@ (do [! <>.monad] [header ..header_parser] (cond (same? ..contiguous (the #link_flag header)) - (at ! each (|>> {..#Contiguous}) (..file_parser header)) + (of ! each (|>> {..#Contiguous}) (..file_parser header)) (same? ..symbolic_link (the #link_flag header)) (in {..#Symbolic_Link (the #link_name header)}) @@ -892,7 +892,7 @@ ... (or (same? ..normal (the #link_flag header)) ... (same? ..old_normal (the #link_flag header))) - (at ! each (|>> {..#Normal}) (..file_parser header))))) + (of ! 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 @@ -919,7 +919,7 @@ (def .public parser (Parser Tar) (|> (<>.some ..entry_parser) - (at <>.monad each sequence.of_list) + (of <>.monad each sequence.of_list) (<>.before ..end_of_archive_parser))) (def .public codec diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux index 120c0a4dc..a38fbbf45 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"))] - (<| (at ! each (|>> .nat text.of_char)) + (<| (of ! each (|>> .nat text.of_char)) (<>.codec int.decimal) <text>.slice <text>.many! @@ -119,7 +119,7 @@ (def attrs^ (Parser Attrs) - (<| (at <>.monad each (dictionary.of_list symbol.hash)) + (<| (of <>.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) - (at (dictionary.equivalence text.equivalence) = reference/attrs sample/attrs) + (of (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 50ab886e2..6cf5bde39 100644 --- a/stdlib/source/library/lux/data/product.lux +++ b/stdlib/source/library/lux/data/product.lux @@ -53,15 +53,15 @@ (All (_ l r) (-> (Equivalence l) (Equivalence r) (Equivalence [l r]))) (implementation (def (= [rl rr] [sl sr]) - (and (at left = rl sl) - (at right = rr sr))))) + (and (of left = rl sl) + (of right = rr sr))))) (def .public (hash left right) (All (_ l r) (-> (Hash l) (Hash r) (Hash [l r]))) (implementation (def equivalence - (..equivalence (at left equivalence) - (at right equivalence))) + (..equivalence (of left equivalence) + (of right equivalence))) (def (hash [leftV rightV]) - (.i64_+# (at left hash leftV) - (at right hash rightV))))) + (.i64_+# (of left hash leftV) + (of right hash rightV))))) diff --git a/stdlib/source/library/lux/data/sum.lux b/stdlib/source/library/lux/data/sum.lux index 9dc3e6f7b..2cd4b6794 100644 --- a/stdlib/source/library/lux/data/sum.lux +++ b/stdlib/source/library/lux/data/sum.lux @@ -71,10 +71,10 @@ (def (= reference sample) (when [reference sample] [{.#Left reference} {.#Left sample}] - (at left = reference sample) + (of left = reference sample) [{.#Right reference} {.#Right sample}] - (at right = reference sample) + (of right = reference sample) _ false)))) @@ -83,12 +83,12 @@ (All (_ l r) (-> (Hash l) (Hash r) (Hash (Or l r)))) (implementation (def equivalence - (..equivalence (at left equivalence) - (at right equivalence))) + (..equivalence (of left equivalence) + (of right equivalence))) (def (hash value) (.nat (when value {.#Left value} - (.int_*# +2 (.int (at left hash value))) + (.int_*# +2 (.int (of left hash value))) {.#Right value} - (.int_*# +3 (.int (at right hash value)))))))) + (.int_*# +3 (.int (of right hash value)))))))) diff --git a/stdlib/source/library/lux/data/text/escape.lux b/stdlib/source/library/lux/data/text/escape.lux index f16005def..947e37e09 100644 --- a/stdlib/source/library/lux/data/text/escape.lux +++ b/stdlib/source/library/lux/data/text/escape.lux @@ -96,7 +96,7 @@ (def (unicode_escaped char pre_offset pre_limit previous current) (-> Char Nat Nat Text Text [Text Text Nat]) - (let [code (at n.hex encoded char) + (let [code (of n.hex encoded char) replacement (format ..sigil "u" (when (.text_size# code) 1 (format "000" code) @@ -183,7 +183,7 @@ (-> Nat Text Text Nat (Try [Text Text Nat])) (when (|> current (.text_clip# (n.+ ..ascii_escape_offset offset) ..code_size) - (at n.hex decoded)) + (of 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/regex.lux b/stdlib/source/library/lux/data/text/regex.lux index c59578a58..db4628919 100644 --- a/stdlib/source/library/lux/data/text/regex.lux +++ b/stdlib/source/library/lux/data/text/regex.lux @@ -56,7 +56,7 @@ (def .public together (-> (Parser (List Text)) (Parser Text)) - (at <>.monad each //.together)) + (of <>.monad each //.together)) (def symbol_char^ (Parser Text) @@ -87,9 +87,9 @@ (def re_range^ (Parser Code) (do [! <>.monad] - [from (|> regex_char^ (at ! each (|>> (//.char 0) maybe.trusted))) + [from (|> regex_char^ (of ! each (|>> (//.char 0) maybe.trusted))) _ (<text>.this "-") - to (|> regex_char^ (at ! each (|>> (//.char 0) maybe.trusted)))] + to (|> regex_char^ (of ! each (|>> (//.char 0) maybe.trusted)))] (in (` (<text>.range (, (code.nat from)) (, (code.nat to))))))) (def re_char^ @@ -296,7 +296,7 @@ [idx names (list.partial (list g!temp complex - (` .let) (` [(, g!total) (at //.monoid (,' composite) (, g!total) (, g!temp))])) + (` .let) (` [(, g!total) (of //.monoid (,' composite) (, g!total) (, g!temp))])) steps)] {.#Right [{#Capturing [?name num_captures]} scoped]} @@ -312,7 +312,7 @@ [idx! (list.partial name! names) (list.partial (list name! scoped - (` .let) (` [(, g!total) (at //.monoid (,' composite) (, g!total) (, access))])) + (` .let) (` [(, g!total) (of //.monoid (,' composite) (, g!total) (, access))])) steps)]) ))) [0 @@ -330,7 +330,7 @@ (def .public (alternative lexer) (-> (Parser Text) (Parser [Text Any])) - (<>.and lexer (at <>.monad in []))) + (<>.and lexer (of <>.monad in []))) (def .public (or 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)) - (at <>.monad each product.right (re_alternative^ true re_scoped^ current_module))) + (of <>.monad each product.right (re_alternative^ true re_scoped^ current_module))) (def .public regex (syntax (_ [pattern <code>.text]) diff --git a/stdlib/source/library/lux/data/text/unicode/block.lux b/stdlib/source/library/lux/data/text/unicode/block.lux index 2ad6484b8..2f5d7fc97 100644 --- a/stdlib/source/library/lux/data/text/unicode/block.lux +++ b/stdlib/source/library/lux/data/text/unicode/block.lux @@ -31,10 +31,10 @@ right (representation right)] (abstraction (interval.between n.enum - (n.min (at left bottom) - (at right bottom)) - (n.max (at left top) - (at right top)))))))) + (n.min (of left bottom) + (of right bottom)) + (n.max (of left top) + (of 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 67704b82e..4f97de4cc 100644 --- a/stdlib/source/library/lux/data/text/unicode/set.lux +++ b/stdlib/source/library/lux/data/text/unicode/set.lux @@ -33,14 +33,14 @@ (def .public (composite left right) (-> Set Set Set) (abstraction - (at builder branch + (of builder branch (representation left) (representation right)))) (def (singleton block) (-> Block Set) (abstraction - (at builder leaf block []))) + (of builder leaf block []))) (def .public (set [head tail]) (-> [Block (List Block)] Set) diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux index 2b076858a..5ee1ddbdf 100644 --- a/stdlib/source/library/lux/debug.lux +++ b/stdlib/source/library/lux/debug.lux @@ -554,9 +554,9 @@ (def target (<code>.Parser Target) (<>.either (<>.and <code>.local - (at <>.monad in {.#None})) + (of <>.monad in {.#None})) (<code>.tuple (<>.and <code>.local - (at <>.monad each (|>> {.#Some}) <code>.any))))) + (of <>.monad each (|>> {.#Some}) <code>.any))))) (exception.def .public (unknown_local_binding name) (Exception Text) diff --git a/stdlib/source/library/lux/documentation/remember.lux b/stdlib/source/library/lux/documentation/remember.lux index be344f2ef..96805ad81 100644 --- a/stdlib/source/library/lux/documentation/remember.lux +++ b/stdlib/source/library/lux/documentation/remember.lux @@ -42,7 +42,7 @@ <code>.int) (do <>.monad [raw <code>.text] - (when (at date.codec decoded raw) + (when (of date.codec decoded raw) {try.#Success date} (in date) diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux index 5684fb32a..b8c9650d4 100644 --- a/stdlib/source/library/lux/ffi.jvm.lux +++ b/stdlib/source/library/lux/ffi.jvm.lux @@ -333,32 +333,32 @@ (-> Primitive_Mode (Type Primitive) Code) (when mode {#ManualPrM} - (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) + (cond (of jvm.equivalence = jvm.boolean type) (` ..Boolean) + (of jvm.equivalence = jvm.byte type) (` ..Byte) + (of jvm.equivalence = jvm.short type) (` ..Short) + (of jvm.equivalence = jvm.int type) (` ..Integer) + (of jvm.equivalence = jvm.long type) (` ..Long) + (of jvm.equivalence = jvm.float type) (` ..Float) + (of jvm.equivalence = jvm.double type) (` ..Double) + (of jvm.equivalence = jvm.char type) (` ..Character) ... else (undefined)) {#AutoPrM} - (cond (at jvm.equivalence = jvm.boolean type) + (cond (of jvm.equivalence = jvm.boolean type) (` .Bit) - (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)) + (or (of jvm.equivalence = jvm.short type) + (of jvm.equivalence = jvm.byte type) + (of jvm.equivalence = jvm.int type) + (of jvm.equivalence = jvm.long type)) (` .Int) - (or (at jvm.equivalence = jvm.float type) - (at jvm.equivalence = jvm.double type)) + (or (of jvm.equivalence = jvm.float type) + (of jvm.equivalence = jvm.double type)) (` .Frac) - (at jvm.equivalence = jvm.char type) + (of jvm.equivalence = jvm.char type) (` .Nat) ... else @@ -496,7 +496,7 @@ (|>> (<>.after (<code>.this (' <comparison>))) (<>.after ..wildcard^) <code>.tuple - (at <>.monad each <constructor>)))] + (of <>.monad each <constructor>)))] [upper^ < jvm.upper] [lower^ > jvm.lower] @@ -539,7 +539,7 @@ (def array^ (-> (Parser (Type Value)) (Parser (Type Array))) (|>> <code>.tuple - (at <>.monad each jvm.array))) + (of <>.monad each jvm.array))) (def (type^ type_vars) (-> (List (Type Var)) (Parser (Type Value))) @@ -564,7 +564,7 @@ (def var^ (Parser (Type Var)) - (at <>.monad each jvm.var <code>.local)) + (of <>.monad each jvm.var <code>.local)) (def vars^ (Parser (List (Type Var))) @@ -631,7 +631,7 @@ (all <>.or (<code>.this (' "volatile")) (<code>.this (' "final")) - (at <>.monad in []))) + (of <>.monad in []))) (def (field_decl^ type_vars) (-> (List (Type Var)) (Parser [Member_Declaration FieldDecl])) @@ -1360,7 +1360,7 @@ (def .public class (syntax (_ [.let [! <>.monad] im inheritance_modifier^ - [full_class_name class_vars] (at ! each parser.declaration ..declaration^) + [full_class_name class_vars] (of ! each parser.declaration ..declaration^) super (<>.else $Object (class^ class_vars)) interfaces (<>.else (list) @@ -1380,7 +1380,7 @@ (def .public interface (syntax (_ [.let [! <>.monad] - [full_class_name class_vars] (at ! each parser.declaration ..declaration^) + [full_class_name class_vars] (of ! each parser.declaration ..declaration^) supers (<>.else (list) (<code>.tuple (<>.some (class^ class_vars)))) annotations ..annotations^ @@ -1520,7 +1520,7 @@ (in [arg_inputs input_jvm_types arg_types]))) _ - (at meta.monad in [(list) (list) (list)]))) + (of meta.monad in [(list) (list) (list)]))) (def (with_return_maybe member never_null? unboxed return_term) (-> Import_Member_Declaration Bit (Type Value) Code Code) @@ -1571,7 +1571,7 @@ {#AutoPrM} (with_expansions [<special+>' (template.spliced <special+>) <cond_cases> (with_template [<primitive> <pre> <post>] - [(at jvm.equivalence = <primitive> unboxed) + [(of jvm.equivalence = <primitive> unboxed) (with_expansions [<post>' (template.spliced <post>)] [<primitive> (` (.|> (, raw) (,* <pre>))) @@ -1835,7 +1835,7 @@ (let [[class_name _] (parser.declaration declaration)] (when (load_class class_name) {.#Right class} - (at meta.monad in (if (interface? class) + (of meta.monad in (if (interface? class) {#Interface} {#Class})) @@ -1863,7 +1863,7 @@ .jvm_object_cast# .jvm_conversion_long_to_int#))] (`` (cond (,, (with_template [<primitive> <array_op>] - [(at jvm.equivalence = <primitive> type) + [(of jvm.equivalence = <primitive> type) (in (list (` (<array_op> (, g!size)))))] [jvm.boolean .jvm_array_new_boolean#] @@ -1888,14 +1888,14 @@ (def (lux_type->jvm_type context type) (-> Type_Context .Type (Meta (Type Value))) (if (type#= .Any type) - (at meta.monad in $Object) + (of meta.monad in $Object) (when type {.#Nominal name params} (`` (cond (,, (with_template [<type>] [(text#= (..reflection <type>) name) (when params {.#End} - (at meta.monad in <type>) + (of meta.monad in <type>) _ <failure>)] @@ -1913,7 +1913,7 @@ [(text#= (..reflection (jvm.array <type>)) name) (when params {.#End} - (at meta.monad in (jvm.array <type>)) + (of meta.monad in (jvm.array <type>)) _ <failure>)] @@ -1930,7 +1930,7 @@ (text#= array.nominal name) (when params {.#Item {.#Apply writeLT {.#Apply readLT _Mutable}} {.#End}} - (at meta.monad each jvm.array + (of meta.monad each jvm.array (lux_type->jvm_type context readLT)) _ @@ -1940,14 +1940,14 @@ (when params {.#End} (let [[_ unprefixed] (maybe.trusted (text.split_by descriptor.array_prefix name))] - (at meta.monad each jvm.array + (of meta.monad each jvm.array (lux_type->jvm_type context {.#Nominal unprefixed (list)}))) _ <failure>) ... else - (at meta.monad each (jvm.class name) + (of meta.monad each (jvm.class name) (.is (Meta (List (Type Parameter))) (monad.each meta.monad (function (_ paramLT) @@ -1992,7 +1992,7 @@ context meta.type_context array_jvm_type (lux_type->jvm_type context array_type) .let [g!extension (`` (cond (,, (with_template [<primitive> <extension>] - [(at jvm.equivalence = + [(of jvm.equivalence = (jvm.array <primitive>) array_jvm_type) (` <extension>)] @@ -2034,7 +2034,7 @@ .jvm_object_cast# .jvm_conversion_long_to_int#))]] (`` (cond (,, (with_template [<primitive> <extension> <box>] - [(at jvm.equivalence = + [(of jvm.equivalence = (jvm.array <primitive>) array_jvm_type) (in (list (` (.|> (<extension> (, g!idx) (, array)) @@ -2074,7 +2074,7 @@ .jvm_object_cast# .jvm_conversion_long_to_int#))]] (`` (cond (,, (with_template [<primitive> <extension> <box>] - [(at jvm.equivalence = + [(of jvm.equivalence = (jvm.array <primitive>) array_jvm_type) (let [g!value (` (.|> (, value) diff --git a/stdlib/source/library/lux/ffi.lux b/stdlib/source/library/lux/ffi.lux index e55e55271..70f47e5bf 100644 --- a/stdlib/source/library/lux/ffi.lux +++ b/stdlib/source/library/lux/ffi.lux @@ -357,7 +357,7 @@ (Parser (Member a)))) (do [! <>.monad] [static? (<>.parses? ..static!)] - (at ! each + (of ! each (|>> [#static? static? #member]) it))) diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux index ad7072f9c..e3a444a54 100644 --- a/stdlib/source/library/lux/ffi.old.lux +++ b/stdlib/source/library/lux/ffi.old.lux @@ -725,7 +725,7 @@ (all <>.or (<code>.this (' "volatile")) (<code>.this (' "final")) - (at <>.monad in []))) + (of <>.monad in []))) (def (field_decl^ type_vars) (-> (List Type_Parameter) (Parser [Member_Declaration FieldDecl])) @@ -1375,7 +1375,7 @@ (in [arg_inputs arg_classes arg_types]))) _ - (at meta.monad in [(list) (list) (list)]))) + (of meta.monad in [(list) (list) (list)]))) (def (decorate_return_maybe class member return_term) (-> Class_Declaration Import_Member_Declaration Code Code) @@ -1623,7 +1623,7 @@ (let [class_name (..safe class_name)] (when (..load_class class_name) {try.#Success class} - (at meta.monad in (if (interface? class) + (of meta.monad in (if (interface? class) {#Interface} {#Class})) @@ -1668,10 +1668,10 @@ (def (type_class_name type) (-> Type (Meta Text)) (if (type#= Any type) - (at meta.monad in "java.lang.Object") + (of meta.monad in "java.lang.Object") (when type {.#Nominal name params} - (at meta.monad in name) + (of meta.monad in name) {.#Apply A F} (when (type.applied (list A) F) diff --git a/stdlib/source/library/lux/ffi.php.lux b/stdlib/source/library/lux/ffi.php.lux index 857633539..7eaa7b31a 100644 --- a/stdlib/source/library/lux/ffi.php.lux +++ b/stdlib/source/library/lux/ffi.php.lux @@ -250,7 +250,7 @@ (if static? (` (def (, g!field) (syntax ((, g!field) []) - (at meta.monad (,' in) + (of meta.monad (,' in) (list (` (.as (, (nullable_type fieldT)) ("php constant" (, (code.text (%.format class "::" field))))))))))) (` (def ((, g!field) (, g!object)) @@ -308,6 +308,6 @@ g!name (code.local (maybe.else name alias))] (in (list (` (def (, g!name) (syntax ((, g!name) []) - (at meta.monad (,' in) + (of 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 92184bb5a..8db541680 100644 --- a/stdlib/source/library/lux/ffi.scm.lux +++ b/stdlib/source/library/lux/ffi.scm.lux @@ -211,6 +211,6 @@ g!name (code.local (maybe.else name alias))] (in (list (` (def (, g!name) (syntax ((, g!name) []) - (at meta.monad (,' in) + (of 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 0b9fa4241..bcd8117d7 100644 --- a/stdlib/source/library/lux/ffi/export.js.lux +++ b/stdlib/source/library/lux/ffi/export.js.lux @@ -86,8 +86,8 @@ (let [! meta.monad] (|> exports (monad.each ! expansion.complete) - (at ! each (|>> list#conjoint + (of ! each (|>> list#conjoint (monad.each ! ..definition))) - (at ! conjoint) - (at ! each (list#each (function (_ [name term]) + (of ! conjoint) + (of ! each (list#each (function (_ [name term]) (` (..export_one (, (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 62f83554c..b88cc91e9 100644 --- a/stdlib/source/library/lux/ffi/export.lua.lux +++ b/stdlib/source/library/lux/ffi/export.lua.lux @@ -103,8 +103,8 @@ (let [! meta.monad] (|> exports (monad.each ! expansion.complete) - (at ! each (|>> list#conjoint + (of ! each (|>> list#conjoint (monad.each ! ..definition))) - (at ! conjoint) - (at ! each (list#each (function (_ [name term]) + (of ! conjoint) + (of ! each (list#each (function (_ [name term]) (` (export_one (, (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 21266bc51..4f1b21b79 100644 --- a/stdlib/source/library/lux/ffi/export.py.lux +++ b/stdlib/source/library/lux/ffi/export.py.lux @@ -80,8 +80,8 @@ (let [! meta.monad] (|> exports (monad.each ! expansion.complete) - (at ! each (|>> list#conjoint + (of ! each (|>> list#conjoint (monad.each ! ..definition))) - (at ! conjoint) - (at ! each (list#each (function (_ [name term]) + (of ! conjoint) + (of ! each (list#each (function (_ [name term]) (` (..export_one (, (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 fe08e1fc7..8f85a5f00 100644 --- a/stdlib/source/library/lux/ffi/export.rb.lux +++ b/stdlib/source/library/lux/ffi/export.rb.lux @@ -129,10 +129,10 @@ (let [! meta.monad] (|> exports (monad.each ! expansion.complete) - (at ! each (|>> list#conjoint + (of ! each (|>> list#conjoint (monad.each ! ..definition))) - (at ! conjoint) - (at ! each (list#each (function (_ [name term]) + (of ! conjoint) + (of ! each (list#each (function (_ [name term]) (` (export_one (,* (when name {#Method name} (list (code.bit false) (code.text name)) diff --git a/stdlib/source/library/lux/math/arithmetic/saturation.lux b/stdlib/source/library/lux/math/arithmetic/saturation.lux index dc1f2d380..cb72169ce 100644 --- a/stdlib/source/library/lux/math/arithmetic/saturation.lux +++ b/stdlib/source/library/lux/math/arithmetic/saturation.lux @@ -14,7 +14,7 @@ (`` (implementation (,, (with_template [<method>] [(def (<method> left right) - (|> (at it <method> left right) + (|> (of it <method> left right) (order.max order min) (order.min order max)))] diff --git a/stdlib/source/library/lux/math/number.lux b/stdlib/source/library/lux/math/number.lux index d145556c8..47fb4ac4a 100644 --- a/stdlib/source/library/lux/math/number.lux +++ b/stdlib/source/library/lux/math/number.lux @@ -40,22 +40,22 @@ (if (..separator_prefixed? repr') {try.#Failure <error>} (let [repr (..without_separators repr')] - (when (at <nat> decoded repr) + (when (of <nat> decoded repr) {try.#Success value} {try.#Success [state (list [meta {.#Nat value}])]} (^.multi {try.#Failure _} - [(at <int> decoded repr) + [(of <int> decoded repr) {try.#Success value}]) {try.#Success [state (list [meta {.#Int value}])]} (^.multi {try.#Failure _} - [(at <rev> decoded repr) + [(of <rev> decoded repr) {try.#Success value}]) {try.#Success [state (list [meta {.#Rev value}])]} (^.multi {try.#Failure _} - [(at <frac> decoded repr) + [(of <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 0c6f59c71..b6c4f3f20 100644 --- a/stdlib/source/library/lux/math/number/frac.lux +++ b/stdlib/source/library/lux/math/number/frac.lux @@ -693,7 +693,7 @@ (with_template [<cast> <hex> <name>] [(def <name> (|> <hex> - (at //nat.hex decoded) + (of //nat.hex decoded) try.trusted <cast>))] @@ -827,7 +827,7 @@ after_length (//nat.- after_offset (.text_size# representation))] exponent (|> representation (.text_clip# after_offset after_length) - (at codec decoded))] + (of codec decoded))] (in [(.text_clip# 0 split_index representation) (//int.* <factor> (.int exponent))]))] @@ -853,9 +853,9 @@ 1 "-" 0 "+" _ (undefined)) - (at <nat> encoded (.nat mantissa)) + (of <nat> encoded (.nat mantissa)) ".0E" - (at <int> encoded exponent)))) + (of <int> encoded exponent)))) (def (decoded representation) (let [negative? (text.starts_with? "-" representation) @@ -870,16 +870,16 @@ after_length (//nat.- after_offset (.text_size# mantissa))] decimal (|> mantissa (.text_clip# after_offset after_length) - (at <nat> decoded))] + (of <nat> decoded))] (in [(.text_clip# 0 split_index mantissa) decimal])) {.#None} {try.#Failure (.text_composite# <error> representation)}) .let [whole (.text_clip# 1 (-- (.text_size# whole)) whole)] - mantissa (at <nat> decoded (when decimal + mantissa (of <nat> decoded (when decimal 0 whole - _ (.text_composite# whole (at <nat> encoded decimal)))) + _ (.text_composite# whole (of <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 04ee87a9e..2f23acf9e 100644 --- a/stdlib/source/library/lux/math/number/i16.lux +++ b/stdlib/source/library/lux/math/number/i16.lux @@ -24,7 +24,7 @@ try.trusted (static.literal type.code)))))) -(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)) +(def .public equivalence (Equivalence I16) (of ..sub sub_equivalence)) +(def .public width Nat (of ..sub bits)) +(def .public i16 (-> I64 I16) (of ..sub narrow)) +(def .public i64 (-> I16 I64) (of ..sub wide)) diff --git a/stdlib/source/library/lux/math/number/i32.lux b/stdlib/source/library/lux/math/number/i32.lux index e2bce4938..4f588d46b 100644 --- a/stdlib/source/library/lux/math/number/i32.lux +++ b/stdlib/source/library/lux/math/number/i32.lux @@ -24,7 +24,7 @@ try.trusted (static.literal type.code)))))) -(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)) +(def .public equivalence (Equivalence I32) (of ..sub sub_equivalence)) +(def .public width Nat (of ..sub bits)) +(def .public i32 (-> I64 I32) (of ..sub narrow)) +(def .public i64 (-> I32 I64) (of ..sub wide)) diff --git a/stdlib/source/library/lux/math/number/i64.lux b/stdlib/source/library/lux/math/number/i64.lux index b7922e45d..d81b9ee75 100644 --- a/stdlib/source/library/lux/math/number/i64.lux +++ b/stdlib/source/library/lux/math/number/i64.lux @@ -158,7 +158,7 @@ (.text_composite# (repetitions size "1") (repetitions size "0"))) - high (try.trusted (at n.binary decoded pattern)) + high (try.trusted (of 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 5a36246c6..6abb8aebc 100644 --- a/stdlib/source/library/lux/math/number/i8.lux +++ b/stdlib/source/library/lux/math/number/i8.lux @@ -24,7 +24,7 @@ try.trusted (static.literal type.code)))))) -(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)) +(def .public equivalence (Equivalence I8) (of ..sub sub_equivalence)) +(def .public width Nat (of ..sub bits)) +(def .public i8 (-> I64 I8) (of ..sub narrow)) +(def .public i64 (-> I8 I64) (of ..sub wide)) diff --git a/stdlib/source/library/lux/math/number/int.lux b/stdlib/source/library/lux/math/number/int.lux index bd1c852b0..fb1cb1912 100644 --- a/stdlib/source/library/lux/math/number/int.lux +++ b/stdlib/source/library/lux/math/number/int.lux @@ -229,8 +229,8 @@ [addition ..+ +0] [multiplication ..* +1] - [maximum ..max (at ..interval bottom)] - [minimum ..min (at ..interval top)] + [maximum ..max (of ..interval bottom)] + [minimum ..min (of ..interval top)] ) (def -sign "-") @@ -242,8 +242,8 @@ (implementation (def (encoded value) (if (..< +0 value) - (|> value ++ ..opposite .nat ++ (at <codec> encoded) (.text_composite# ..-sign)) - (|> value .nat (at <codec> encoded) (.text_composite# ..+sign)))) + (|> value ++ ..opposite .nat ++ (of <codec> encoded) (.text_composite# ..-sign)) + (|> value .nat (of <codec> encoded) (.text_composite# ..+sign)))) (def (decoded repr) (let [input_size (.text_size# repr)] @@ -252,14 +252,14 @@ ..+sign (|> repr (.text_clip# 1 (-- input_size)) - (at <codec> decoded) - (at try.functor each (|>> .int))) + (of <codec> decoded) + (of try.functor each (|>> .int))) ..-sign (|> repr (.text_clip# 1 (-- input_size)) - (at <codec> decoded) - (at try.functor each (|>> -- .int ..opposite --))) + (of <codec> decoded) + (of 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 1464fc8e9..d60d2c191 100644 --- a/stdlib/source/library/lux/math/number/nat.lux +++ b/stdlib/source/library/lux/math/number/nat.lux @@ -203,8 +203,8 @@ [addition ..+ 0] [multiplication ..* 1] - [minimum ..min (at ..interval top)] - [maximum ..max (at ..interval bottom)] + [minimum ..min (of ..interval top)] + [maximum ..max (of ..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 070c284b5..16e8cc8f1 100644 --- a/stdlib/source/library/lux/math/number/rev.lux +++ b/stdlib/source/library/lux/math/number/rev.lux @@ -239,7 +239,7 @@ [(def .public <name> (Monoid Rev) (implementation - (def identity (at interval <identity>)) + (def identity (of interval <identity>)) (def composite <composite>)))] [addition ..+ bottom] @@ -258,7 +258,7 @@ (Codec Text Rev) (implementation (def (encoded value) - (let [raw_output (at <codec> encoded (.nat value)) + (let [raw_output (of <codec> encoded (.nat value)) max_num_chars (//nat.+ (//nat./ <char_bit_size> //i64.width) (when (//nat.% <char_bit_size> //i64.width) 0 0 @@ -280,7 +280,7 @@ (if (//nat.> 1 repr_size) (when (.text_char# 0 repr) (char ".") - (when (at <codec> decoded (..decimals repr)) + (when (of <codec> decoded (..decimals repr)) {try.#Success output} {try.#Success (.rev output)} @@ -368,7 +368,7 @@ (again (-- idx) true output) (again (-- idx) false - (.text_composite# (at //nat.decimal encoded digit) + (.text_composite# (of //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 7c1fbc448..85cce4485 100644 --- a/stdlib/source/library/lux/math/random.lux +++ b/stdlib/source/library/lux/math/random.lux @@ -129,7 +129,7 @@ (with_template [<name> <type> <cast>] [(def .public <name> (Random <type>) - (at ..functor each (|>> <cast>) ..i64))] + (of ..functor each (|>> <cast>) ..i64))] [nat Nat .nat] [int Int .int] @@ -138,13 +138,13 @@ (def .public frac (Random Frac) - (at ..functor each (|>> .i64 f.of_bits) ..nat)) + (of ..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))] - (at ..functor each + (of ..functor each (|>> (i.% mantissa_range) i.frac (f./ mantissa_max)) @@ -158,13 +158,13 @@ in_range (is (-> Char Char) (|>> (n.% size) (n.+ start)))] (|> ..nat - (at ..functor each in_range) + (of ..functor each in_range) (..only (unicode.member? set))))) (def .public (text char_gen size) (-> (Random Char) Nat (Random Text)) (if (n.= 0 size) - (at ..monad in "") + (of ..monad in "") (do ..monad [x char_gen xs (text char_gen (-- size))] @@ -244,7 +244,7 @@ [x value_gen xs (list (-- size) value_gen)] (in {.#Item x xs})) - (at ..monad in (.list)))) + (of ..monad in (.list)))) (def .public (sequence size value_gen) (All (_ a) (-> Nat (Random a) (Random (Sequence a)))) @@ -253,7 +253,7 @@ [x value_gen xs (sequence (-- size) value_gen)] (in (sequence.suffix x xs))) - (at ..monad in sequence.empty))) + (of ..monad in sequence.empty))) (with_template [<name> <type> <ctor>] [(def .public (<name> size value_gen) @@ -279,7 +279,7 @@ (if (n.= size (set.size xs+)) (in xs+) (again []))))) - (at ..monad in (set.empty hash)))) + (of ..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)))) @@ -294,23 +294,23 @@ (if (n.= size (dictionary.size kv+)) (in kv+) (again []))))) - (at ..monad in (dictionary.empty hash)))) + (of ..monad in (dictionary.empty hash)))) (def .public instant (Random Instant) - (at ..functor each instant.of_millis ..int)) + (of ..functor each instant.of_millis ..int)) (def .public date (Random Date) - (at ..functor each instant.date ..instant)) + (of ..functor each instant.date ..instant)) (def .public time (Random Time) - (at ..functor each instant.time ..instant)) + (of ..functor each instant.time ..instant)) (def .public duration (Random Duration) - (at ..functor each duration.of_millis ..int)) + (of ..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 8c51327ee..25cc41183 100644 --- a/stdlib/source/library/lux/meta.lux +++ b/stdlib/source/library/lux/meta.lux @@ -157,7 +157,7 @@ (in [module_name name])) _ - (at ..monad in name))) + (of ..monad in name))) (def .public (macro full_name) (-> Symbol (Meta (Maybe Macro))) @@ -247,7 +247,7 @@ {try.#Success [lux type']})) _ - (at ..monad in type)))) + (of ..monad in type)))) (def .public (var_type name) (-> Text (Meta Type)) @@ -461,7 +461,7 @@ {.#Definition [def_type def_value]} (let [type_code (`` (.in_module# (,, (static .prelude)) .type_code))] (if (or (same? .Type def_type) - (at code.equivalence = + (of code.equivalence = (type_code .Type) (type_code def_type))) (in (as Type def_value)) @@ -482,7 +482,7 @@ (def .public (definitions module) (-> Text (Meta (List [Text [Bit Definition]]))) - (at ..monad each + (of ..monad each (list.all (function (_ [name [exported? global]]) (when global {.#Alias de_aliased} @@ -630,7 +630,7 @@ (def .public (imported? import) (-> Text (Meta Bit)) - (at ..functor each + (of ..functor each (|>> (the .#imports) (list.any? (text#= import))) ..current_module)) @@ -724,7 +724,7 @@ (Meta of))) (when result {try.#Success output} - (at ..monad in output) + (of ..monad in output) {try.#Failure error} (..failure error))) @@ -732,7 +732,7 @@ (def .public (eval type code) (-> Type Code (Meta Any)) (do [! ..monad] - [eval (at ! each (the .#eval) + [eval (of ! each (the .#eval) ..compiler_state)] (eval type code))) diff --git a/stdlib/source/library/lux/meta/code.lux b/stdlib/source/library/lux/meta/code.lux index 0bec080e7..d9e753b19 100644 --- a/stdlib/source/library/lux/meta/code.lux +++ b/stdlib/source/library/lux/meta/code.lux @@ -65,7 +65,7 @@ (when [x y] (,, (with_template [<tag> <eq>] [[[_ {<tag> x'}] [_ {<tag> y'}]] - (at <eq> = x' y')] + (of <eq> = x' y')] [.#Bit bit.equivalence] [.#Nat nat.equivalence] @@ -77,7 +77,7 @@ (,, (with_template [<tag>] [[[_ {<tag> xs'}] [_ {<tag> ys'}]] - (at (list.equivalence =) = xs' ys')] + (of (list.equivalence =) = xs' ys')] [.#Form] [.#Variant] @@ -91,7 +91,7 @@ (when ast (,, (with_template [<tag> <struct>] [[_ {<tag> value}] - (at <struct> encoded value)] + (of <struct> encoded value)] [.#Bit bit.codec] [.#Nat nat.decimal] @@ -123,7 +123,7 @@ (`` (def .public (replaced original substitute ast) (-> Code Code Code Code) - (if (at ..equivalence = original ast) + (if (of ..equivalence = original ast) substitute (when ast (,, (with_template [<tag>] diff --git a/stdlib/source/library/lux/meta/compiler/default/platform.lux b/stdlib/source/library/lux/meta/compiler/default/platform.lux index c245fbc26..14d737c9f 100644 --- a/stdlib/source/library/lux/meta/compiler/default/platform.lux +++ b/stdlib/source/library/lux/meta/compiler/default/platform.lux @@ -130,7 +130,7 @@ sequence.list (monad.each ..monad write_artifact!) (is (Action (List Any))))) - document (at async.monad in + document (of async.monad in (document.marked? key (the [archive.#module module.#document] entry)))] (is (Async (Try Any)) (|> [(|> entry @@ -551,7 +551,7 @@ (if (set.empty? duplicates) (when new_dependencies {.#End} - (at ..monad in [archive (list) (list)]) + (of ..monad in [archive (list) (list)]) {.#Item _} (do [! async.monad] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux.lux b/stdlib/source/library/lux/meta/compiler/language/lux.lux index 58b2833b9..0c52f6613 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux.lux @@ -68,7 +68,7 @@ ... #imports (<binary>.list <binary>.text) ... #module_state - (at <>.monad in {.#Cached})))) + (of <>.monad in {.#Cached})))) (def .public key (Key .Module) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis.lux b/stdlib/source/library/lux/meta/compiler/language/lux/analysis.lux index 0c827a334..4adaf01c2 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/analysis.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/analysis.lux @@ -84,8 +84,8 @@ (Equivalence Branch)) (implementation (def (= [reference_pattern reference_body] [sample_pattern sample_body]) - (and (at /pattern.equivalence = reference_pattern sample_pattern) - (at equivalence = reference_body sample_body))))) + (and (of /pattern.equivalence = reference_pattern sample_pattern) + (of equivalence = reference_body sample_body))))) (def .public equivalence (Equivalence Analysis) @@ -93,23 +93,23 @@ (def (= [_ reference] [_ sample]) (.when [reference sample] [{#Simple reference} {#Simple sample}] - (at /simple.equivalence = reference sample) + (of /simple.equivalence = reference sample) [{#Structure reference} {#Structure sample}] - (at (/complex.equivalence =) = reference sample) + (of (/complex.equivalence =) = reference sample) [{#Reference reference} {#Reference sample}] - (at reference.equivalence = reference sample) + (of reference.equivalence = reference sample) [{#When [reference_analysis reference_match]} {#When [sample_analysis sample_match]}] (and (= reference_analysis sample_analysis) - (at (list.equivalence (branch_equivalence =)) = {.#Item reference_match} {.#Item sample_match})) + (of (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) - (at (list.equivalence =) = reference_environment sample_environment)) + (of (list.equivalence =) = reference_environment sample_environment)) [{#Apply [reference_input reference_abstraction]} {#Apply [sample_input sample_abstraction]}] @@ -117,7 +117,7 @@ (= reference_abstraction sample_abstraction)) [{#Extension reference} {#Extension sample}] - (at (extension.equivalence =) = reference sample) + (of (extension.equivalence =) = reference sample) _ false)))) @@ -332,7 +332,7 @@ (def .public (assertion exception parameters condition) (All (_ e) (-> (Exception e) e Bit (Operation Any))) (if condition - (at phase.monad in []) + (of phase.monad in []) (..except exception parameters))) (def .public (with_exception exception message action) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/complex.lux b/stdlib/source/library/lux/meta/compiler/language/lux/analysis/complex.lux index 7d3f9f1cf..f38318f09 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/complex.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/analysis/complex.lux @@ -61,7 +61,7 @@ (/#= reference_value sample_value)) [{#Tuple reference} {#Tuple sample}] - (at (list.equivalence /#=) = reference sample) + (of (list.equivalence /#=) = reference sample) _ false)))) @@ -70,19 +70,19 @@ (All (_ a) (-> (Hash a) (Hash (Complex a)))) (implementation (def equivalence - (..equivalence (at super equivalence))) + (..equivalence (of super equivalence))) (def (hash value) (when value {#Variant [lefts right? value]} (all n.* 2 - (at n.hash hash lefts) - (at bit.hash hash right?) - (at super hash value)) + (of n.hash hash lefts) + (of bit.hash hash right?) + (of super hash value)) {#Tuple members} (all n.* 3 - (at (list.hash super) hash members)) + (of (list.hash super) hash members)) )))) (def .public (format %it it) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/coverage.lux b/stdlib/source/library/lux/meta/compiler/language/lux/analysis/coverage.lux index c4c6da56d..853b83c3d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/coverage.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/analysis/coverage.lux @@ -101,8 +101,8 @@ [#Text]) [{#Variant allR casesR} {#Variant allS casesS}] - (and (at (maybe.equivalence n.equivalence) = allR allS) - (at (dictionary.equivalence =) = casesR casesS)) + (and (of (maybe.equivalence n.equivalence) = allR allS) + (of (dictionary.equivalence =) = casesR casesS)) [{#Seq leftR rightR} {#Seq leftS rightS}] (and (= leftR leftS) @@ -301,7 +301,7 @@ (n.> so_far_cases (..minimum addition'))))) (exception.except ..variant_mismatch [so_far_cases addition_cases]) - (at (dictionary.equivalence ..equivalence) = casesSF casesA) + (of (dictionary.equivalence ..equivalence) = casesSF casesA) <redundancy> ... else diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/inference.lux b/stdlib/source/library/lux/meta/compiler/language/lux/analysis/inference.lux index db6182d7e..c3f14a075 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/inference.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/analysis/inference.lux @@ -182,7 +182,7 @@ ... (in (++ level)))))) ... 0 ... vars) - ... :inference:' (at ! each (type.univ_q quantifications) (check.clean vars :inference:)) + ... :inference:' (of ! 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/meta/compiler/language/lux/analysis/pattern.lux b/stdlib/source/library/lux/meta/compiler/language/lux/analysis/pattern.lux index 836c7c30d..c21213def 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/analysis/pattern.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/analysis/pattern.lux @@ -29,10 +29,10 @@ (def (= reference sample) (when [reference sample] [{#Simple reference} {#Simple sample}] - (at //simple.equivalence = reference sample) + (of //simple.equivalence = reference sample) [{#Complex reference} {#Complex sample}] - (at (//complex.equivalence =) = reference sample) + (of (//complex.equivalence =) = reference sample) [{#Bind reference} {#Bind sample}] (n.= reference sample) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/complex.lux index 9c39f43a1..10f276346 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/complex.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/complex.lux @@ -123,7 +123,7 @@ (when expectedT {.#Sum _} (|> (analyse archive valueC) - (at ! each (|>> [lefts right?] (/.variant @))) + (of ! each (|>> [lefts right?] (/.variant @))) (/type.expecting (|> expectedT type.flat_variant (list.item tag) @@ -211,23 +211,23 @@ (-> Phase Type Archive (List Code) (Operation Analysis)) (<| (do [! ///.monad] [@ meta.location]) - (at ! each (|>> (/.tuple @))) + (of ! each (|>> (/.tuple @))) (is (Operation (List Analysis))) (loop (again [membersT+ (type.flat_tuple expectedT) membersC+ members]) (when [membersT+ membersC+] [{.#Item memberT {.#End}} {.#Item memberC {.#End}}] - (<| (at ! each (|>> list)) + (<| (of ! each (|>> list)) (/type.expecting memberT) (analyse archive memberC)) [{.#Item memberT {.#End}} _] (<| (/type.expecting memberT) - (at ! each (|>> list) (analyse archive (code.tuple membersC+)))) + (of ! each (|>> list) (analyse archive (code.tuple membersC+)))) [_ {.#Item memberC {.#End}}] (<| (/type.expecting (type.tuple membersT+)) - (at ! each (|>> list) (analyse archive memberC))) + (of ! each (|>> list) (analyse archive memberC))) [{.#Item memberT membersT+'} {.#Item memberC membersC+'}] (do ! @@ -337,7 +337,7 @@ (def (local_binding? name) (-> Text (Meta Bit)) - (at meta.monad each + (of meta.monad each (list.any? (list.any? (|>> product.left (text#= name)))) meta.locals)) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/function.lux index 73c26493d..06aef00dd 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/function.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/function.lux @@ -59,7 +59,7 @@ {.#Function :input: :output:} (<| (do ! [@ meta.location]) - (at ! each (.function (_ [scope bodyA]) + (of ! each (.function (_ [scope bodyA]) [@ {/.#Function (list#each (|>> (/.variable @)) (/scope.environment scope)) bodyA}])) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/when.lux index eed015604..ef35059ba 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/analysis/when.lux @@ -144,10 +144,10 @@ (list#each (..quantified envs)) type.tuple [(list)] - (at check.monad in)) + (of check.monad in)) _ - (at check.monad in [(list) (..quantified envs :it:)])))) + (of 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/meta/compiler/language/lux/phase/declaration.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/declaration.lux index 7646655c1..a47dc0e1d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/declaration.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/declaration.lux @@ -124,7 +124,7 @@ (when expansion (list.partial <lux_def_module> referrals) (|> (again archive <lux_def_module>) - (at ! each (revised /.#referrals (list#composite referrals)))) + (of ! each (revised /.#referrals (list#composite referrals)))) _ (..requiring again archive expansion)) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/jvm.lux index a9f5b9726..657ad6024 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/jvm.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/jvm.lux @@ -612,7 +612,7 @@ (text.starts_with? descriptor.array_prefix name) (let [[_ unprefixed] (maybe.trusted (text.split_by descriptor.array_prefix name))] - (at phase.monad each jvm.array + (of phase.monad each jvm.array (check_jvm {.#Nominal unprefixed (list)}))) ... else @@ -1404,7 +1404,7 @@ 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)] - (at ! each (if passes? + (of ! each (if passes? (|>> {#Pass}) (|>> {#Hint})) (method_signature method_style method)))))))] @@ -1437,7 +1437,7 @@ aliasing (dictionary.composite (..aliasing expected_class_tvars actual_class_tvars) (..aliasing expected_method_tvars actual_method_tvars))] passes? (check_constructor aliasing class inputsJT constructor)] - (at ! each + (of ! each (if passes? (|>> {#Pass}) (|>> {#Hint})) @@ -2275,7 +2275,7 @@ phase.of_try)] (|> super_parameters (monad.each ! (..reflection_type mapping)) - (at ! each (|>> (list.zipped_2 parent_parameters))))) + (of ! each (|>> (list.zipped_2 parent_parameters))))) (phase.of_try (exception.except ..mismatched_super_parameters [parent_name expected_count actual_count])))) {.#None} @@ -2345,7 +2345,7 @@ (def (matched? [sub sub_method subJT] [super super_method superJT]) (-> [(Type Class) Text (Type Method)] [(Type Class) Text (Type Method)] Bit) - (and (at descriptor.equivalence = (jvm.descriptor super) (jvm.descriptor sub)) + (and (of descriptor.equivalence = (jvm.descriptor super) (jvm.descriptor sub)) (text#= super_method sub_method) (jvm#= superJT subJT))) @@ -2524,13 +2524,13 @@ _.aconst_null {.#Right primitiveT} - (cond (at jvm.equivalence = jvm.long primitiveT) + (cond (of jvm.equivalence = jvm.long primitiveT) _.lconst_0 - (at jvm.equivalence = jvm.float primitiveT) + (of jvm.equivalence = jvm.float primitiveT) _.fconst_0 - (at jvm.equivalence = jvm.double primitiveT) + (of jvm.equivalence = jvm.double primitiveT) _.dconst_0 ... jvm.boolean jvm.byte jvm.short jvm.int jvm.char @@ -2550,13 +2550,13 @@ _.areturn {.#Right primitiveT} - (cond (at jvm.equivalence = jvm.long primitiveT) + (cond (of jvm.equivalence = jvm.long primitiveT) _.lreturn - (at jvm.equivalence = jvm.float primitiveT) + (of jvm.equivalence = jvm.float primitiveT) _.freturn - (at jvm.equivalence = jvm.double primitiveT) + (of jvm.equivalence = jvm.double primitiveT) _.dreturn ... jvm.boolean jvm.byte jvm.short jvm.int jvm.char @@ -2681,7 +2681,7 @@ (list) (list#each (|>> {#Overriden_Method}) methods))) ... Necessary for reflection to work properly during analysis. - _ (phase.of_try (at host execute mock)) + _ (phase.of_try (of 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/meta/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux index d79128c56..3014365da 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/analysis/lux.lux @@ -185,7 +185,7 @@ (|> opC (analyse archive) (typeA.expecting (type_literal (-> .Any :var:))) - (at ! each (|>> list + (of ! each (|>> list {analysis.#Extension (..translation extension_name)} [@]))))))])) @@ -203,7 +203,7 @@ [(<>.and <code>.any <code>.any) (function (_ extension_name analyse archive [typeC valueC]) (do [! phase.monad] - [actualT (at ! each (|>> (as Type)) + [actualT (of ! each (|>> (as Type)) (eval archive Type typeC)) _ (typeA.inference actualT)] (<| (typeA.expecting actualT) @@ -215,7 +215,7 @@ [(<>.and <code>.any <code>.any) (function (_ extension_name analyse archive [typeC valueC]) (do [! phase.monad] - [actualT (at ! each (|>> (as Type)) + [actualT (of ! each (|>> (as Type)) (eval archive Type typeC)) _ (typeA.inference actualT) [valueT valueA] (typeA.inferring diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/jvm.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/jvm.lux index edb4a9d3d..57a55392d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/jvm.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/declaration/jvm.lux @@ -430,7 +430,7 @@ (value.wrap <type>) (_.astore lux_register))]]] (`` (cond (,, (with_template [<shift> <load> <type>] - [(at type.equivalence = <type> argumentT) + [(of type.equivalence = <type> argumentT) (wrap_primitive <shift> <load> <type>)] [1 _.iload type.boolean] @@ -441,7 +441,7 @@ [1 _.fload type.float] [2 _.lload type.long])) - ... (at type.equivalence = type.double argumentT) + ... (of 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 (,, (with_template [<return> <type>] - [(at type.equivalence = <type> returnT) + [(of type.equivalence = <type> returnT) (unwrap_primitive <return> <type>)] [_.ireturn type.boolean] @@ -525,7 +525,7 @@ [_.freturn type.float] [_.lreturn type.long])) - ... (at type.equivalence = type.double returnT) + ... (of type.equivalence = type.double returnT) (unwrap_primitive _.dreturn type.double))))))) (def (overriden_method_translation translate archive method) @@ -632,7 +632,7 @@ (..static_method_translation translate archive method) {#Abstract_Method method} - (at phase.monad in (..abstract_method_translation method)))) + (of phase.monad in (..abstract_method_translation method)))) (def (method_definition archive super interfaces [mapping selfT] [analyse synthesize translate]) (-> Archive @@ -705,13 +705,13 @@ _.aconst_null {.#Right primitiveT} - (cond (at type.equivalence = type.long primitiveT) + (cond (of type.equivalence = type.long primitiveT) _.lconst_0 - (at type.equivalence = type.float primitiveT) + (of type.equivalence = type.float primitiveT) _.fconst_0 - (at type.equivalence = type.double primitiveT) + (of 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 (at type.equivalence = type.long primitiveT) + (cond (of type.equivalence = type.long primitiveT) _.lreturn - (at type.equivalence = type.float primitiveT) + (of type.equivalence = type.float primitiveT) _.freturn - (at type.equivalence = type.double primitiveT) + (of type.equivalence = type.double primitiveT) _.dreturn ... type.boolean type.byte type.short type.int type.char @@ -902,7 +902,7 @@ ((the [declaration.#translation declaration.#phase] state) analysis_state)])) methods) .let [all_dependencies (cache.all (list#each product.left methods))] - bytecode (<| (at ! each (\\format.result class.format)) + bytecode (<| (of ! each (\\format.result class.format)) phase.of_try (class.class version.v6_0 (all modifier#composite @@ -941,7 +941,7 @@ (function (_ phase archive [[name parameters] supers annotations method_declarations]) (declaration.of_translation (do [! phase.monad] - [bytecode (<| (at ! each (\\format.result class.format)) + [bytecode (<| (of ! each (\\format.result class.format)) phase.of_try (class.class version.v6_0 (all modifier#composite diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp/common.lux index 4a0f897c3..b48fbe8bd 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp/common.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/common_lisp/common.lux @@ -53,7 +53,7 @@ ... <s>.any)))) ... (function (_ extension_name phase archive [input else conditionals]) ... (do [! /////.monad] -... [@input (at ! each _.var (translation.symbol "input")) +... [@input (of ! each _.var (translation.symbol "input")) ... inputG (phase archive input) ... elseG (phase archive else) ... conditionalsG (is (Operation (List [Expression Expression])) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/host.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/host.lux index 0f8fab9bc..6be0522c3 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/host.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/js/host.lux @@ -113,7 +113,7 @@ (custom [<s>.text (function (_ phase archive name) - (at phase.monad in (_.var name)))])) + (of phase.monad in (_.var name)))])) (def js::apply (custom @@ -132,7 +132,7 @@ [abstractionG (phase archive abstractionS) .let [variable (is (-> Text (Operation Var)) (|>> translation.symbol - (at ! each _.var)))] + (of ! each _.var)))] g!inputs (monad.each ! (function (_ _) (variable "input")) (list.repeated (.nat arity) [])) g!abstraction (variable "abstraction")] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/host.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/host.lux index 1f019a985..ded9a8bb4 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/host.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/jvm/host.lux @@ -641,7 +641,7 @@ (..custom [(all <>.and <synthesis>.text <synthesis>.text ..value) (function (_ translate archive [class field :unboxed:]) - (at //////.monad in (_.getstatic (type.class class (list)) field :unboxed:)))])) + (of //////.monad in (_.getstatic (type.class class (list)) field :unboxed:)))])) (def put::static Handler @@ -1164,7 +1164,7 @@ (///value.unwrap <type>) <return>)]] (`` (cond (,, (with_template [<return> <type>] - [(at type.equivalence = <type> returnT) + [(of type.equivalence = <type> returnT) (unwrap_primitive <return> <type>)] [_.ireturn type.boolean] @@ -1175,7 +1175,7 @@ [_.freturn type.float] [_.lreturn type.long])) - ... (at type.equivalence = type.double returnT) + ... (of type.equivalence = type.double returnT) (unwrap_primitive _.dreturn type.double))))))) (def (method_dependencies archive method) @@ -1219,7 +1219,7 @@ (///value.wrap <type>) (_.astore lux_register))]]] (`` (cond (,, (with_template [<shift> <load> <type>] - [(at type.equivalence = <type> argumentT) + [(of type.equivalence = <type> argumentT) (wrap_primitive <shift> <load> <type>)] [1 _.iload type.boolean] @@ -1230,7 +1230,7 @@ [1 _.fload type.float] [2 _.lload type.long])) - ... (at type.equivalence = type.double argumentT) + ... (of type.equivalence = type.double argumentT) (wrap_primitive 2 _.dload type.double)))))) (def .public (prepare_arguments offset types) @@ -1332,7 +1332,7 @@ methods! (|> overriden_methods (list#each (normalized_method global_mapping)) (monad.each ! (method_definition translate archive artifact_id))) - bytecode (<| (at ! each (\\format.result class.format)) + bytecode (<| (of ! each (\\format.result class.format)) //////.of_try (class.class version.v6_0 (all modifier#composite class.public class.final) (name.internal anonymous_class_name) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/common.lux index e278cd290..31f782b48 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/common.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/common.lux @@ -142,7 +142,7 @@ {synthesis.#Then else}) [input] (//when.when! statement phase archive) - (at phase.monad each (|>> (as Expression)))))])) + (of phase.monad each (|>> (as Expression)))))])) (def with_basic_extensions (-> Bundle Bundle) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/host.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/host.lux index 6e3bf9a0f..b69079a05 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/host.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/lua/host.lux @@ -131,7 +131,7 @@ (custom [<s>.text (function (_ phase archive name) - (at ////////phase.monad in (_.var name)))])) + (of ////////phase.monad in (_.var name)))])) (def lua::apply (custom @@ -155,7 +155,7 @@ (custom [<s>.text (function (_ phase archive module) - (at ////////phase.monad in + (of ////////phase.monad in (_.require/1 (_.string module))))])) (def lua::function @@ -166,7 +166,7 @@ [abstractionG (phase archive abstractionS) .let [variable (is (-> Text (Operation Var)) (|>> translation.symbol - (at ! each _.var)))] + (of ! each _.var)))] g!inputs (monad.each ! (function (_ _) (variable "input")) (list.repeated (.nat arity) []))] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/common.lux index b6625995e..badafbb08 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/common.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/common.lux @@ -56,7 +56,7 @@ [inputG (phase archive input) [[context_module context_artifact] elseG] (translation.with_new_context archive (phase archive else)) - @input (at ! each _.var (translation.symbol "input")) + @input (of ! each _.var (translation.symbol "input")) conditionalsG (is (Operation (List [Expression Expression])) (monad.each ! (function (_ [chars branch]) (do ! diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/host.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/host.lux index 16a55823f..5aa011fc7 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/host.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/php/host.lux @@ -111,7 +111,7 @@ (custom [<s>.text (function (_ extension phase archive name) - (at ////////phase.monad in (_.constant name)))])) + (of ////////phase.monad in (_.constant name)))])) (def php::apply (custom diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/common.lux index 53ddeaa57..7b4153a5c 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/common.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/common.lux @@ -116,7 +116,7 @@ (do [! phase.monad] [inputG (phase archive input) else! (..statement phase archive else) - @input (at ! each _.var (translation.symbol "input")) + @input (of ! each _.var (translation.symbol "input")) conditionals! (is (Operation (List [(Expression Any) (Statement Any)])) (monad.each ! (function (_ [chars branch]) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/host.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/host.lux index adb650f17..2c0eb4818 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/host.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/python/host.lux @@ -130,7 +130,7 @@ [abstractionG (phase archive abstractionS) .let [variable (is (-> Text (Operation SVar)) (|>> translation.symbol - (at ! each _.var)))] + (of ! each _.var)))] g!inputs (monad.each ! (function (_ _) (variable "input")) (list.repeated (.nat arity) []))] (in (_.lambda g!inputs diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r/common.lux index ad16cb2da..b4d6b4a5c 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r/common.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/r/common.lux @@ -53,7 +53,7 @@ ... ... <s>.any)))) ... ... (function (_ extension_name phase archive [input else conditionals]) ... ... (do [! /////.monad] -... ... [@input (at ! each _.var (translation.symbol "input")) +... ... [@input (of ! each _.var (translation.symbol "input")) ... ... inputG (phase archive input) ... ... elseG (phase archive else) ... ... conditionalsG (is (Operation (List [Expression Expression])) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/common.lux index 6e34a490a..151cf3c74 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/common.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/common.lux @@ -118,7 +118,7 @@ (do [! phase.monad] [inputG (phase archive input) else! (statement phase archive else) - @input (at ! each _.local (translation.symbol "input")) + @input (of ! each _.local (translation.symbol "input")) conditionals! (is (Operation (List [Expression Statement])) (monad.each ! (function (_ [chars branch]) (do ! diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/host.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/host.lux index aedb08fb0..982c33f38 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/host.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/ruby/host.lux @@ -99,7 +99,7 @@ (custom [?synthesis.text (function (_ phase archive name) - (at phase.monad in (is _.CVar (_.manual name))))])) + (of phase.monad in (is _.CVar (_.manual name))))])) (def ruby::apply (custom @@ -114,7 +114,7 @@ (custom [?synthesis.text (function (_ phase archive module) - (at phase.monad in + (of phase.monad in (_.require/1 (_.string module))))])) (def .public bundle diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/scheme/common.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/scheme/common.lux index 7719f82cf..1ae11f0b0 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/scheme/common.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/extension/translation/scheme/common.lux @@ -53,7 +53,7 @@ <s>.any)))) (function (_ extension_name phase archive [input else conditionals]) (do [! /////.monad] - [@input (at ! each _.var (translation.symbol "input")) + [@input (of ! each _.var (translation.symbol "input")) inputG (phase archive input) elseG (phase archive else) conditionalsG (is (Operation (List [Expression Expression])) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/function.lux index f985b86ba..76cc4c74e 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/function.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/function.lux @@ -105,7 +105,7 @@ [then (grow_path grow then) else (when else {.#Some else} - (at ! each (|>> {.#Some}) (grow_path grow else)) + (of ! each (|>> {.#Some}) (grow_path grow else)) {.#None} (in {.#None}))] @@ -258,7 +258,7 @@ (/.function/abstraction @ [env' down_arity' bodyS']) (|> bodyS' (grow env') - (at ! each (function (_ body) + (of ! each (function (_ body) [/.#environment environment /.#arity (++ down_arity') /.#body body]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/loop.lux index 60619b13b..c9dd922ef 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/loop.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/loop.lux @@ -50,7 +50,7 @@ [then (again then) else (when else {.#Some else} - (at ! each (|>> {.#Some}) (again else)) + (of ! each (|>> {.#Some}) (again else)) {.#None} (in {.#None}))] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/variable.lux index 22cafb4ae..fe443f9c1 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/variable.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/variable.lux @@ -267,7 +267,7 @@ [[redundancy then] (again [redundancy then]) [redundancy else] (when else {.#Some else} - (at ! each + (of ! each (function (_ [redundancy else]) [redundancy {.#Some else}]) (again [redundancy else])) @@ -455,4 +455,4 @@ (-> Synthesis (Try Synthesis)) (|>> [..initial] optimization' - (at try.monad each product.right))) + (of try.monad each product.right))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/when.lux index 2a9141d88..cd7de82f5 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/synthesis/when.lux @@ -67,7 +67,7 @@ [///simple.#Text /.#Text_Fork |>])) {///pattern.#Bind register} - (<| (at ///.monad each (|>> {/.#Seq {/.#Bind register}})) + (<| (of ///.monad each (|>> {/.#Seq {/.#Bind register}})) /.with_new_local thenC) @@ -111,7 +111,7 @@ (All (_ a) (-> (-> Path Path Path) (Equivalence a) [a Path] (/.Fork a Path) (/.Fork a Path))) - (if (at equivalence = new_test old_test) + (if (of equivalence = new_test old_test) [[old_test (weave new_then old_then)] old_tail] [[old_test old_then] (when old_tail diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/function.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/function.lux index 608a865d9..973dce91d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/function.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/function.lux @@ -45,11 +45,11 @@ (-> (List (Expression Any)) (Expression Any) (Operation (Expression Any))) (when inits {.#End} - (at ///////phase.monad in function_definition) + (of ///////phase.monad in function_definition) _ (do [! ///////phase.monad] - [@closure (at ! each _.var (/////translation.symbol "closure"))] + [@closure (of ! each _.var (/////translation.symbol "closure"))] (in (_.labels (list [@closure [(|> (list.enumeration inits) (list#each (|>> product.left ..capture)) _.args) @@ -62,8 +62,8 @@ (def .public (function expression archive [environment arity bodyS]) (Translator (Abstraction Synthesis)) (do [! ///////phase.monad] - [@scope (at ! each (|>> %.nat (format "function_scope") _.tag) /////translation.next) - @output (at ! each (|>> %.nat (format "loop_output") _.var) /////translation.next) + [@scope (of ! each (|>> %.nat (format "function_scope") _.tag) /////translation.next) + @output (of ! each (|>> %.nat (format "loop_output") _.var) /////translation.next) [function_name bodyG] (/////translation.with_new_context archive (/////translation.with_anchor [@scope 1] (expression archive bodyS))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/loop.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/loop.lux index 299f7611d..91ebf3c28 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/loop.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/loop.lux @@ -43,8 +43,8 @@ ... true loop _ (do [! ///////phase.monad] - [@scope (at ! each (|>> %.nat (format "loop_scope") _.tag) /////translation.next) - @output (at ! each (|>> %.nat (format "loop_output") _.var) /////translation.next) + [@scope (of ! each (|>> %.nat (format "loop_scope") _.tag) /////translation.next) + @output (of ! each (|>> %.nat (format "loop_output") _.var) /////translation.next) initsG+ (monad.each ! (expression archive) initsS+) bodyG (/////translation.with_anchor [@scope start] (expression archive bodyS))] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/runtime.lux index 12fb47c17..1c82dbe73 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/runtime.lux @@ -302,4 +302,4 @@ (sequence.sequence [(%.nat ..module_id) (|> ..runtime _.code - (at encoding.utf8 encoded))])]))) + (of encoding.utf8 encoded))])]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/when.lux index 268508d6d..9c69027de 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/common_lisp/when.lux @@ -142,7 +142,7 @@ (function (again [$output @done @fail pathP]) (.when pathP (/////synthesis.path/then bodyS) - (at ///////phase.monad each + (of ///////phase.monad each (function (_ outputV) (_.progn (list (_.setq $output outputV) (_.go @done)))) @@ -196,7 +196,7 @@ (<simple> idx nextP) (|> nextP [$output @done @fail] again - (at ///////phase.monad each (|>> {.#Some} (<choice> @fail true idx))))]) + (of ///////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]) @@ -218,7 +218,7 @@ (/////synthesis.path/alt preP postP) (do [! ///////phase.monad] - [@otherwise (at ! each (|>> %.nat (format "lux_when_otherwise") _.tag) /////translation.next) + [@otherwise (of ! each (|>> %.nat (format "lux_when_otherwise") _.tag) /////translation.next) pre! (again [$output @done @otherwise preP]) post! (again [$output @done @fail postP])] (in (..alternation @otherwise pre! post!))) @@ -232,8 +232,8 @@ (def (pattern_matching $output expression archive pathP) (-> Var/1 (Translator Path)) (do [! ///////phase.monad] - [@done (at ! each (|>> %.nat (format "lux_when_done") _.tag) /////translation.next) - @fail (at ! each (|>> %.nat (format "lux_when_fail") _.tag) /////translation.next) + [@done (of ! each (|>> %.nat (format "lux_when_done") _.tag) /////translation.next) + @fail (of ! each (|>> %.nat (format "lux_when_fail") _.tag) /////translation.next) pattern_matching! (pattern_matching' expression archive [$output @done @fail pathP])] (in (_.tagbody (list pattern_matching! @@ -245,7 +245,7 @@ (Translator [Synthesis Path]) (do [! ///////phase.monad] [initG (expression archive valueS) - $output (at ! each (|>> %.nat (format "lux_when_output") _.var) /////translation.next) + $output (of ! each (|>> %.nat (format "lux_when_output") _.var) /////translation.next) pattern_matching! (pattern_matching $output expression archive pathP) .let [storage (|> pathP ////synthesis/when.storage diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/extension.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/extension.lux index 410675ec4..38a52d429 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/extension.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/extension.lux @@ -82,4 +82,4 @@ (let [! ///.monad] (|> inputsS (monad.each ! (phase archive)) - (at ! each extension))))) + (of ! each extension))))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/function.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/function.lux index cc88108bb..7d1d3434b 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/function.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/function.lux @@ -78,7 +78,7 @@ [dependencies (cache.dependencies archive bodyS) [function_name body!] (/////translation.with_new_context archive dependencies (do ! - [scope (at ! each ..@scope + [scope (of ! each ..@scope (/////translation.context archive))] (/////translation.with_anchor [1 scope] (statement expression archive bodyS)))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/loop.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/loop.lux index 6c3fd4772..6bb799c5e 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/loop.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/loop.lux @@ -71,11 +71,11 @@ ... true loop _ (do [! ///////phase.monad] - [@scope (at ! each ..@scope /////translation.next) + [@scope (of ! each ..@scope /////translation.next) initsO+ (monad.each ! (expression archive) initsS+) body! (/////translation.with_anchor [start @scope] (statement expression archive bodyS)) - $iteration (at ! each ..$iteration /////translation.next)] + $iteration (of ! each ..$iteration /////translation.next)] (in (..setup $iteration true start initsO+ @@ -104,7 +104,7 @@ (do [! ///////phase.monad] [[offset @scope] /////translation.anchor argsO+ (monad.each ! (expression archive) argsS+) - $iteration (at ! each ..$iteration /////translation.next)] + $iteration (of ! each ..$iteration /////translation.next)] (in (all _.then (_.define @temp (_.array argsO+)) (..setup $iteration diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/runtime.lux index d729f96fb..30ce82b9d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/runtime.lux @@ -835,4 +835,4 @@ {.#None} (|> ..full _.code - (at utf8.codec encoded))])]))) + (of utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/when.lux index e7205b9ff..ff635a3de 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/js/when.lux @@ -186,7 +186,7 @@ [(<simple> idx nextP) (|> nextP again - (at ///////phase.monad each (|>> (_.then (<choice> true idx)) {.#Some})))]) + (of ///////phase.monad each (|>> (_.then (<choice> true idx)) {.#Some})))]) ([/////synthesis.simple_left_side ..left_choice] [/////synthesis.simple_right_side ..right_choice]) @@ -290,7 +290,7 @@ [{<tag> item} (do [! ///////phase.monad] [cases (monad.each ! (function (_ [match then]) - (at ! each (|>> [(list (<format> match))]) (again then))) + (of ! each (|>> [(list (<format> match))]) (again then))) {.#Item item})] (in (_.switch ..peek_cursor cases diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/debug.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/debug.lux index 51ae831e0..1d6adf5f6 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/debug.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/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))] - (at file over_write bytecode))] + (of file over_write bytecode))] (in (when outcome {try.#Success definition} file_path diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux index ea6b16da0..efca8fc3e 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/host.lux @@ -131,11 +131,11 @@ _.return)})) (list))] (io.run! (do [! (try.with io.monad)] - [bytecode (at ! each (\\format.result class.format) + [bytecode (of ! each (\\format.result class.format) (io.io bytecode)) _ (loader.store eval_class bytecode library) class (loader.load eval_class loader) - value (at io.monad in (class_value eval_class class))] + value (of io.monad in (class_value eval_class class))] (in [value [eval_class bytecode]]))))) @@ -143,7 +143,7 @@ (-> Library java/lang/ClassLoader Definition (Try Any)) (io.run! (do (try.with io.monad) [existing_class? (|> (atom.read! library) - (at io.monad each (function (_ library) + (of io.monad each (function (_ library) (dictionary.key? library class_name))) (try.lifted io.monad) (is (IO (Try Bit)))) @@ -168,7 +168,7 @@ (is //runtime.Host (implementation (def (evaluate context @it,valueG) - (at try.monad each product.left + (of try.monad each product.left (..evaluate! library loader (format "E" (//runtime.class_name context)) @it,valueG))) (def execute @@ -190,5 +190,5 @@ custom)] _ (loader.store class_name bytecode library) class (loader.load class_name loader)] - (at io.monad in (..class_value class_name class))))) + (of io.monad in (..class_value class_name class))))) ))]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux index 872083d50..beb60ebc4 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/reference.lux @@ -43,7 +43,7 @@ (def (foreign archive variable) (-> Archive Register (Operation (Bytecode Any))) (do [! ////.monad] - [bytecode_name (at ! each //runtime.class_name + [bytecode_name (of ! each //runtime.class_name (translation.context archive))] (in (all _.composite ..this diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/runtime.lux index efd4999c2..6e2414d50 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/runtime.lux @@ -677,4 +677,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. - (at ////.monad each (|>> ++ (i64.left_shifted shift)) translation.next))) + (of ////.monad each (|>> ++ (i64.left_shifted shift)) translation.next))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/structure.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/structure.lux index 8f1f7696d..502fcdd3c 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/structure.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/structure.lux @@ -33,7 +33,7 @@ (Translator (Tuple Synthesis)) (when membersS {.#End} - (at phase.monad in //runtime.unit) + (of phase.monad in //runtime.unit) {.#Item singletonS {.#End}} (phase archive singletonS) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux index 04f4efff7..9601f8751 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/jvm/when.lux @@ -155,7 +155,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 (at _.monad in []) _.dup _.pop _.string ..equals@Object _.ifeq] + [path|text_fork Text (of _.monad in []) _.dup _.pop _.string ..equals@Object _.ifeq] ) (def (path' stack_depth @else @end phase archive) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/function.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/function.lux index 7e5de1fd3..66e19f510 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/function.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/function.lux @@ -74,7 +74,7 @@ [dependencies (cache.dependencies archive bodyS) [function_name body!] (/////translation.with_new_context archive dependencies (do ! - [@scope (at ! each ..@scope + [@scope (of ! each ..@scope (/////translation.context archive))] (/////translation.with_anchor [1 @scope] (statement expression archive bodyS)))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/loop.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/loop.lux index 38fab4758..e5c201528 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/loop.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/loop.lux @@ -60,12 +60,12 @@ {.#End} (|> bodyS (statement expression archive) - (at ///////phase.monad each (|>> [(list)]))) + (of ///////phase.monad each (|>> [(list)]))) ... true loop _ (do [! ///////phase.monad] - [@scope (at ! each ..@scope /////translation.next) + [@scope (of ! each ..@scope /////translation.next) initsO+ (monad.each ! (expression archive) initsS+) body! (/////translation.with_anchor [start @scope] (statement expression archive bodyS))] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/runtime.lux index 354619c27..f3089d34f 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/runtime.lux @@ -458,4 +458,4 @@ {.#None} (|> ..full _.code - (at utf8.codec encoded))])]))) + (of utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/when.lux index 9545bee65..5d8f9546d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/lua/when.lux @@ -56,7 +56,7 @@ (do [! ///////phase.monad] [this (expression archive this) that (statement expression archive that) - $dummy (at ! each _.var (/////translation.symbol "_exec"))] + $dummy (of ! each _.var (/////translation.symbol "_exec"))] (in (all _.then (_.set (list $dummy) this) that)))) @@ -299,6 +299,6 @@ (-> Phase! (Translator [Synthesis Path])) (|> [valueS pathP] (..when! statement expression archive) - (at ///////phase.monad each + (of ///////phase.monad each (|>> (_.closure (list)) (_.apply (list)))))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/function.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/function.lux index abbe8d677..c1f6bcc55 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/function.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/function.lux @@ -73,7 +73,7 @@ (do [! ///////phase.monad] [[function_name body!] (/////translation.with_new_context archive (do ! - [@scope (at ! each ..@scope + [@scope (of ! each ..@scope (/////translation.context archive))] (/////translation.with_anchor [1 @scope] (statement expression archive bodyS)))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/loop.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/loop.lux index 3c8d784ab..27eba00aa 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/loop.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/loop.lux @@ -59,7 +59,7 @@ ... true loop _ (do [! ///////phase.monad] - [@scope (at ! each ..@scope /////translation.next) + [@scope (of ! each ..@scope /////translation.next) initsO+ (monad.each ! (expression archive) initsS+) body! (/////translation.with_anchor [start @scope] (statement expression archive bodyS))] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/runtime.lux index e40c8110c..81a0b25be 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/runtime.lux @@ -632,4 +632,4 @@ (sequence.sequence [..module_id (|> ..runtime _.code - (at utf8.codec encoded))])]))) + (of utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/when.lux index 098cd0d48..de91f0c3b 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/php/when.lux @@ -214,7 +214,7 @@ (<simple> idx nextP) (|> nextP again - (at ///////phase.monad each (_.then (<choice> true idx))))]) + (of ///////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/meta/compiler/language/lux/phase/translation/python/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/runtime.lux index 85d90795c..d6fd0eb18 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/runtime.lux @@ -492,4 +492,4 @@ {.#None} (|> ..full_runtime _.code - (at utf8.codec encoded))])]))) + (of utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/when.lux index b1fbb6fec..e70766b1c 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/python/when.lux @@ -223,7 +223,7 @@ [{<tag> item} (do [! ///////phase.monad] [clauses (monad.each ! (function (_ [match then]) - (at ! each + (of ! each (|>> [(_.= (|> match <format>) ..peek)]) (again then))) @@ -237,7 +237,7 @@ [/////synthesis.#Text_Fork (<| //primitive.text)]) _ - (at ///////phase.monad in {.#None}))) + (of ///////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/meta/compiler/language/lux/phase/translation/r/function.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/function.lux index 5ad9140aa..5d76f47a3 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/function.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/function.lux @@ -77,7 +77,7 @@ (do [! ///////phase.monad] [[[function_module function_artifact] bodyO] (/////translation.with_new_context archive (do ! - [$self (at ! each (|>> ///reference.artifact _.var) + [$self (of ! each (|>> ///reference.artifact _.var) (/////translation.context archive))] (/////translation.with_anchor $self (expression archive bodyS)))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/loop.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/loop.lux index 184aa6516..4f98499f5 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/loop.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/loop.lux @@ -44,7 +44,7 @@ ... true loop _ (do [! ///////phase.monad] - [$scope (at ! each _.var (/////translation.symbol "loop_scope")) + [$scope (of ! each _.var (/////translation.symbol "loop_scope")) initsO+ (monad.each ! (expression archive) initsS+) bodyO (/////translation.with_anchor $scope (expression archive bodyS))] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/runtime.lux index ca464073b..dff290ced 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/runtime.lux @@ -879,4 +879,4 @@ (sequence.sequence [(%.nat ..module_id) (|> ..full_runtime _.code - (at utf8.codec encoded))])]))) + (of utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/when.lux index 1f0b1b16a..9b8667d7e 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/r/when.lux @@ -235,7 +235,7 @@ (Translator [Synthesis Path]) (do [! ///////phase.monad] [valueO (expression archive valueS)] - (<| (at ! each (|>> (all _.then + (<| (of ! each (|>> (all _.then (_.set! $cursor (_.list (list valueO))) (_.set! $savepoint (_.list (list)))) _.block)) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/reference.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/reference.lux index 3760acc35..e9669b5fe 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/reference.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/reference.lux @@ -66,7 +66,7 @@ (All (_ anchor expression declaration) (-> (System expression) Archive Symbol (////translation.Operation anchor expression declaration expression))) - (phase#each (|>> ..artifact (at system constant')) + (phase#each (|>> ..artifact (of system constant')) (////translation.remember archive name))) (with_template [<sigil> <name>] @@ -74,7 +74,7 @@ (All (_ expression) (-> (System expression) (-> Register expression))) - (|>> %.nat (format <sigil>) (at system variable')))] + (|>> %.nat (format <sigil>) (of system variable')))] ["f" foreign] ["l" local] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/runtime.lux index 286e897da..3bf36726d 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/runtime.lux @@ -635,4 +635,4 @@ {.#None} (|> ..full _.code - (at utf8.codec encoded))])]))) + (of utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/when.lux index dfb8254f6..ea2520b18 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/ruby/when.lux @@ -230,7 +230,7 @@ [{<tag> item} (do [! ///////phase.monad] [clauses (monad.each ! (function (_ [match then]) - (at ! each + (of ! each (|>> [(_.= (|> match <format>) ..peek)]) (again then))) @@ -244,7 +244,7 @@ [/////synthesis.#Text_Fork (<| //primitive.text)]) _ - (at ///////phase.monad in {.#None}))) + (of ///////phase.monad in {.#None}))) (def (pattern_matching' in_closure? statement expression archive) (-> Bit (Translator! Path)) @@ -287,7 +287,7 @@ [{<tag> item} (do [! ///////phase.monad] [clauses (monad.each ! (function (_ [match then]) - (at ! each + (of ! each (|>> [(_.= (|> match <format>) ..peek)]) (again then))) @@ -377,6 +377,6 @@ (-> Phase! (Translator [Synthesis Path])) (|> when (when! true statement expression archive) - (at ///////phase.monad each + (of ///////phase.monad each (|>> [(list)] (_.lambda {.#None}) (_.apply_lambda (list)))))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/function.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/function.lux index e8def4c7b..bf3adab17 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/function.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/function.lux @@ -66,7 +66,7 @@ (do [! ///////phase.monad] [[function_name bodyO] (/////translation.with_new_context archive (do ! - [@self (at ! each (|>> ///reference.artifact _.var) + [@self (of ! each (|>> ///reference.artifact _.var) (/////translation.context archive))] (/////translation.with_anchor @self (expression archive bodyS)))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/runtime.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/runtime.lux index 1c4494fc5..0f22ea302 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/runtime.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/runtime.lux @@ -386,4 +386,4 @@ (sequence.sequence [(%.nat ..module_id) (|> ..runtime _.code - (at utf8.codec encoded))])]))) + (of utf8.codec encoded))])]))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/when.lux b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/when.lux index ad7e4ca51..62dbc57d6 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/when.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/phase/translation/scheme/when.lux @@ -212,7 +212,7 @@ (def (pattern_matching expression archive pathP) (Translator Path) - (at ///////phase.monad each + (of ///////phase.monad each (try_pm (_.raise/1 (_.string "Invalid expression for pattern-matching."))) (pattern_matching' expression archive pathP))) @@ -220,6 +220,6 @@ (Translator [Synthesis Path]) (do [! ///////phase.monad] [valueO (expression archive valueS)] - (<| (at ! each (_.let (list [@cursor (_.list/* (list valueO))] + (<| (of ! each (_.let (list [@cursor (_.list/* (list valueO))] [@savepoint (_.list/* (list))]))) (pattern_matching expression archive pathP)))) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/meta/compiler/language/lux/syntax.lux index 1793cf9a5..85a28c8f7 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/syntax.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/syntax.lux @@ -351,7 +351,7 @@ [(when (|> <source_code> (!clip <start> <end>) (text.replaced ..digit_separator "") - (at <codec> decoded)) + (of <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/meta/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis.lux index 35e6db28c..2ceef9fd2 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis.lux @@ -446,12 +446,12 @@ {#Bit_Fork sample_when sample_then sample_else}] (and (bit#= reference_when sample_when) (= reference_then sample_then) - (at (maybe.equivalence =) = reference_else sample_else)) + (of (maybe.equivalence =) = reference_else sample_else)) (^.with_template [<tag> <equivalence>] [[{<tag> reference_item} {<tag> sample_item}] - (at (list.equivalence (product.equivalence <equivalence> =)) = + (of (list.equivalence (product.equivalence <equivalence> =)) = {.#Item reference_item} {.#Item sample_item})]) ([#I64_Fork (is (Equivalence I64) i64.equivalence)] @@ -460,7 +460,7 @@ (^.with_template [<tag> <equivalence>] [[{<tag> reference'} {<tag> sample'}] - (at <equivalence> = reference' sample')]) + (of <equivalence> = reference' sample')]) ([#Access /access.equivalence] [#Then equivalence]) @@ -481,7 +481,7 @@ (All (_ a) (-> (Hash a) (Hash (Path' a)))) (implementation (def equivalence - (..path'_equivalence (at super equivalence))) + (..path'_equivalence (of super equivalence))) (def (hash value) (when value @@ -489,23 +489,23 @@ 2 {#Access access} - (n.* 3 (at /access.hash hash access)) + (n.* 3 (of /access.hash hash access)) {#Bind register} - (n.* 5 (at n.hash hash register)) + (n.* 5 (of n.hash hash register)) {#Bit_Fork when then else} (all n.* 7 - (at bit.hash hash when) + (of bit.hash hash when) (hash then) - (at (maybe.hash (path'_hash super)) hash else)) + (of (maybe.hash (path'_hash super)) hash else)) (^.with_template [<factor> <tag> <hash>] [{<tag> item} (let [when_hash (product.hash <hash> (path'_hash super)) item_hash (product.hash when_hash (list.hash when_hash))] - (n.* <factor> (at item_hash hash item)))]) + (n.* <factor> (of item_hash hash item)))]) ([11 #I64_Fork i64.hash] [13 #F64_Fork f.hash] [17 #Text_Fork text.hash]) @@ -514,12 +514,12 @@ [{<tag> fork} (let [again_hash (path'_hash super) fork_hash (product.hash again_hash again_hash)] - (n.* <factor> (at fork_hash hash fork)))]) + (n.* <factor> (of fork_hash hash fork)))]) ([19 #Alt] [23 #Seq]) {#Then body} - (n.* 29 (at super hash body)) + (n.* 29 (of super hash body)) )))) (def (branch_equivalence (open "#[0]")) @@ -541,13 +541,13 @@ [{#Get [reference_path reference_record]} {#Get [sample_path sample_record]}] - (and (at (list.equivalence /member.equivalence) = reference_path sample_path) + (and (of (list.equivalence /member.equivalence) = reference_path sample_path) (#= reference_record sample_record)) [{#When [reference_input reference_path]} {#When [sample_input sample_path]}] (and (#= reference_input sample_input) - (at (path'_equivalence #=) = reference_path sample_path)) + (of (path'_equivalence #=) = reference_path sample_path)) _ false)))) @@ -556,36 +556,36 @@ (All (_ a) (-> (Hash a) (Hash (Branch a)))) (implementation (def equivalence - (..branch_equivalence (at super equivalence))) + (..branch_equivalence (of super equivalence))) (def (hash value) (when value {#Exec this that} (all n.* 2 - (at super hash this) - (at super hash that)) + (of super hash this) + (of super hash that)) {#Let [input register body]} (all n.* 3 - (at super hash input) - (at n.hash hash register) - (at super hash body)) + (of super hash input) + (of n.hash hash register) + (of super hash body)) {#If [test then else]} (all n.* 5 - (at super hash test) - (at super hash then) - (at super hash else)) + (of super hash test) + (of super hash then) + (of super hash else)) {#Get [path record]} (all n.* 7 - (at (list.hash /member.hash) hash path) - (at super hash record)) + (of (list.hash /member.hash) hash path) + (of super hash record)) {#When [input path]} (all n.* 11 - (at super hash input) - (at (..path'_hash super) hash path)) + (of super hash input) + (of (..path'_hash super) hash path)) )))) (def (loop_equivalence (open "/#[0]")) @@ -596,11 +596,11 @@ [{#Scope [reference_start reference_inits reference_iteration]} {#Scope [sample_start sample_inits sample_iteration]}] (and (n.= reference_start sample_start) - (at (list.equivalence /#=) = reference_inits sample_inits) + (of (list.equivalence /#=) = reference_inits sample_inits) (/#= reference_iteration sample_iteration)) [{#Again reference} {#Again sample}] - (at (list.equivalence /#=) = reference sample) + (of (list.equivalence /#=) = reference sample) _ false)))) @@ -609,19 +609,19 @@ (All (_ a) (-> (Hash a) (Hash (Loop a)))) (implementation (def equivalence - (..loop_equivalence (at super equivalence))) + (..loop_equivalence (of super equivalence))) (def (hash value) (when value {#Scope [start inits iteration]} (all n.* 2 - (at n.hash hash start) - (at (list.hash super) hash inits) - (at super hash iteration)) + (of n.hash hash start) + (of (list.hash super) hash inits) + (of super hash iteration)) {#Again resets} (all n.* 3 - (at (list.hash super) hash resets)) + (of (list.hash super) hash resets)) )))) (def (function_equivalence (open "#[0]")) @@ -631,14 +631,14 @@ (when [reference sample] [{#Abstraction [reference_environment reference_arity reference_body]} {#Abstraction [sample_environment sample_arity sample_body]}] - (and (at (list.equivalence #=) = reference_environment sample_environment) + (and (of (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) - (at (list.equivalence #=) = reference_arguments sample_arguments)) + (of (list.equivalence #=) = reference_arguments sample_arguments)) _ false)))) @@ -647,20 +647,20 @@ (All (_ a) (-> (Hash a) (Hash (Function a)))) (implementation (def equivalence - (..function_equivalence (at super equivalence))) + (..function_equivalence (of super equivalence))) (def (hash value) (when value {#Abstraction [environment arity body]} (all n.* 2 - (at (list.hash super) hash environment) - (at n.hash hash arity) - (at super hash body)) + (of (list.hash super) hash environment) + (of n.hash hash arity) + (of super hash body)) {#Apply [abstraction arguments]} (all n.* 3 - (at super hash abstraction) - (at (list.hash super) hash arguments)) + (of super hash abstraction) + (of (list.hash super) hash arguments)) )))) (def (control_equivalence (open "#[0]")) @@ -670,7 +670,7 @@ (when [reference sample] (^.with_template [<tag> <equivalence>] [[{<tag> reference} {<tag> sample}] - (at (<equivalence> #=) = reference sample)]) + (of (<equivalence> #=) = reference sample)]) ([#Branch ..branch_equivalence] [#Loop ..loop_equivalence] [#Function ..function_equivalence]) @@ -682,13 +682,13 @@ (All (_ a) (-> (Hash a) (Hash (Control a)))) (implementation (def equivalence - (..control_equivalence (at super equivalence))) + (..control_equivalence (of super equivalence))) (def (hash value) (when value (^.with_template [<factor> <tag> <hash>] [{<tag> value} - (n.* <factor> (at (<hash> super) hash value))]) + (n.* <factor> (of (<hash> super) hash value))]) ([2 #Branch ..branch_hash] [3 #Loop ..loop_hash] [5 #Function ..function_hash]) @@ -701,7 +701,7 @@ (when [reference sample] (^.with_template [<tag> <equivalence>] [[{<tag> reference'} {<tag> sample'}] - (at <equivalence> = reference' sample')]) + (of <equivalence> = reference' sample')]) ([#Simple /simple.equivalence] [#Structure (analysis/complex.equivalence =)] [#Reference reference.equivalence] @@ -725,7 +725,7 @@ (when value (^.with_template [<factor> <tag> <hash>] [[_ {<tag> value}] - (n.* <factor> (at <hash> hash value))]) + (n.* <factor> (of <hash> hash value))]) ([02 #Simple /simple.hash] [03 #Structure (analysis/complex.hash again_hash)] [05 #Reference reference.hash] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access.lux b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access.lux index fc1d14e8f..3366fc9fc 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access.lux @@ -35,4 +35,4 @@ (def .public equivalence (Equivalence Access) - (at ..hash equivalence)) + (of ..hash equivalence)) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/member.lux b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/member.lux index 667775b7d..3e4bfa554 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/member.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/member.lux @@ -31,4 +31,4 @@ (def .public equivalence (Equivalence Member) - (at ..hash equivalence)) + (of ..hash equivalence)) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/side.lux b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/side.lux index 0f8ef1625..43250aca1 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/side.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/access/side.lux @@ -31,4 +31,4 @@ (def .public equivalence (Equivalence Side) - (at ..hash equivalence)) + (of ..hash equivalence)) diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/simple.lux b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/simple.lux index 80d6447b9..c107af515 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/simple.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/synthesis/simple.lux @@ -67,7 +67,7 @@ (|>> (pipe.when (^.with_template [<factor> <tag> <hash>] [{<tag> value'} - (n.* <factor> (at <hash> hash value'))]) + (n.* <factor> (of <hash> hash value'))]) ([2 #Bit bit.hash] [3 #F64 f.hash] [5 #Text text.hash] diff --git a/stdlib/source/library/lux/meta/compiler/language/lux/translation.lux b/stdlib/source/library/lux/meta/compiler/language/lux/translation.lux index c69086b06..521cbf541 100644 --- a/stdlib/source/library/lux/meta/compiler/language/lux/translation.lux +++ b/stdlib/source/library/lux/meta/compiler/language/lux/translation.lux @@ -195,7 +195,7 @@ (def .public (symbol prefix) (All (_ anchor expression declaration) (-> Text (Operation anchor expression declaration Text))) - (at phase.monad each (|>> %.nat (format prefix)) ..next)) + (of phase.monad each (|>> %.nat (format prefix)) ..next)) (def .public (enter_module module) (All (_ anchor expression declaration) @@ -211,7 +211,7 @@ (All (_ anchor expression declaration) (-> unit.ID [(Maybe unit.ID) expression] (Operation anchor expression declaration Any))) (function (_ state) - (when (at (the #host state) evaluate label code) + (when (of (the #host state) evaluate label code) {try.#Success output} {try.#Success [state output]} @@ -222,7 +222,7 @@ (All (_ anchor expression declaration) (-> declaration (Operation anchor expression declaration Any))) (function (_ state) - (when (at (the #host state) execute code) + (when (of (the #host state) execute code) {try.#Success output} {try.#Success [state output]} @@ -233,7 +233,7 @@ (All (_ anchor expression declaration) (-> unit.ID (Maybe Text) [(Maybe unit.ID) expression] (Operation anchor expression declaration [Text Any declaration]))) (function (_ state) - (when (at (the #host state) define context custom code) + (when (of (the #host state) define context custom code) {try.#Success output} {try.#Success [state output]} diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive.lux b/stdlib/source/library/lux/meta/compiler/meta/archive.lux index 04187cdb3..238795b08 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive.lux @@ -153,7 +153,7 @@ (the #resolver) dictionary.entries (list.all (function (_ [module [module_id entry]]) - (at maybe.monad each (|>> [module_id] [module]) entry))))) + (of maybe.monad each (|>> [module_id] [module]) entry))))) (def .public (find module archive) (-> descriptor.Module Archive (Try (Entry Any))) @@ -282,7 +282,7 @@ _ (exception.assertion ..version_mismatch [expected_version actual_version] (n#= expected_version actual_version)) _ (exception.assertion ..configuration_mismatch [expected_configuration actual_configuration] - (at configuration.equivalence = + (of configuration.equivalence = expected_configuration actual_configuration))] (in (abstraction diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/artifact/category.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/artifact/category.lux index 0b3758826..bfb130129 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive/artifact/category.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive/artifact/category.lux @@ -46,7 +46,7 @@ true [{#Definition left} {#Definition right}] - (at definition_equivalence = left right) + (of definition_equivalence = left right) [{#Custom left} {#Custom right}] (text#= left right) diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/module/descriptor.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/module/descriptor.lux index f9cfae82a..e31fe990b 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive/module/descriptor.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive/module/descriptor.lux @@ -78,6 +78,6 @@ <binary>.text <binary>.text <binary>.nat - (at <>.monad in {.#Cached}) + (of <>.monad in {.#Cached}) (<binary>.set text.hash <binary>.text) )) diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux index 31e1ea00d..e49f63a82 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive/module/document.lux @@ -34,7 +34,7 @@ (def .public (content key document) (All (_ d) (-> (Key d) (Document Any) (Try d))) (let [[document//signature document//content] (representation document)] - (if (at signature.equivalence = + (if (of signature.equivalence = (key.signature key) document//signature) {try.#Success (sharing [e] diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux index 93e18387a..0560665c7 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive/registry.lux @@ -160,7 +160,7 @@ (when tag (^.with_template [<nat> <tag> <parser>] [<nat> - (at ! each (|>> {<tag>}) <parser>)]) + (of ! each (|>> {<tag>}) <parser>)]) ([0 //category.#Anonymous <binary>.any] [1 //category.#Definition definition] [2 //category.#Custom <binary>.text]) @@ -172,7 +172,7 @@ dependencies (is (Parser (Set unit.ID)) (<binary>.set unit.hash dependency))] (|> (<binary>.sequence_64 (all <>.and category mandatory? dependencies)) - (at <>.monad each (sequence#mix (function (_ [category mandatory? dependencies] registry) + (of <>.monad each (sequence#mix (function (_ [category mandatory? dependencies] registry) (product.right (when category {//category.#Anonymous} diff --git a/stdlib/source/library/lux/meta/compiler/meta/archive/unit.lux b/stdlib/source/library/lux/meta/compiler/meta/archive/unit.lux index 5f7b20e00..6d473997b 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/archive/unit.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/archive/unit.lux @@ -30,7 +30,7 @@ (def .public equivalence (Equivalence ID) - (at ..hash equivalence)) + (of ..hash equivalence)) (def .public none (Set ID) diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache.lux b/stdlib/source/library/lux/meta/compiler/meta/cache.lux index fb4085f0e..e4825872c 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/cache.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/cache.lux @@ -17,14 +17,14 @@ (def .public (path fs context) (All (_ !) (-> (file.System !) Context file.Path)) - (let [/ (at fs separator)] + (let [/ (of fs separator)] (format (the context.#target context) / (the context.#host context) / (version.format //.version)))) (def .public (enabled? fs context) (All (_ !) (-> (file.System !) Context (! Bit))) - (at fs directory? (..path fs context))) + (of fs directory? (..path fs context))) (def .public (enable! ! fs context) (All (_ !) (-> (Monad !) (file.System !) Context (! (Try Any)))) diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/archive.lux b/stdlib/source/library/lux/meta/compiler/meta/cache/archive.lux index 214aeffd6..8c6790ef1 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/cache/archive.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/cache/archive.lux @@ -18,9 +18,9 @@ (def .public (descriptor fs context) (All (_ !) (-> (file.System !) Context file.Path)) (%.format (//.path fs context) - (at fs separator) + (of fs separator) "descriptor")) (def .public (cache! fs configuration context it) (All (_ !) (-> (file.System !) Configuration Context Archive (! (Try Any)))) - (at fs write (..descriptor fs context) (archive.export ///.version configuration it))) + (of fs write (..descriptor fs context) (archive.export ///.version configuration it))) diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/artifact.lux b/stdlib/source/library/lux/meta/compiler/meta/cache/artifact.lux index 7afeba197..e404e3e4d 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/cache/artifact.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/cache/artifact.lux @@ -25,16 +25,16 @@ (All (_ !) (-> (file.System !) Context module.ID artifact.ID file.Path)) (format (//module.path fs context @module) - (at fs separator) + (of 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)))) - (at fs read (..path fs context @module @artifact))) + (of 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)))) - (at fs write (..path fs context @module @artifact) content)) + (of fs write (..path fs context @module @artifact) content)) diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/dependency/artifact.lux b/stdlib/source/library/lux/meta/compiler/meta/cache/dependency/artifact.lux index 512efe54f..3b8021224 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/cache/dependency/artifact.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/cache/dependency/artifact.lux @@ -170,7 +170,7 @@ (set.of_list symbol.hash) set.list (monad.each ! (translation.remember archive)) - (at ! each (set.of_list unit.hash))))) + (of ! each (set.of_list unit.hash))))) (def .public (path_dependencies archive value) (All (_ anchor expression declaration) @@ -181,7 +181,7 @@ (set.of_list symbol.hash) set.list (monad.each ! (translation.remember archive)) - (at ! each (set.of_list unit.hash))))) + (of ! each (set.of_list unit.hash))))) (def .public all (-> (List (Set unit.ID)) diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/module.lux b/stdlib/source/library/lux/meta/compiler/meta/cache/module.lux index a78ddc424..7b3a122bb 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/cache/module.lux +++ b/stdlib/source/library/lux/meta/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) - (at fs separator) + (of fs separator) (%.nat @module))) (def .public (enabled? fs context @module) (All (_ !) (-> (file.System !) Context module.ID (! Bit))) - (at fs directory? (..path fs context @module))) + (of 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? (at fs directory? path)] + module_exists? (of fs directory? path)] (if module_exists? (in {try.#Success []}) (with_expansions [<failure> (exception.except ..cannot_enable [(//.path fs context) @@ -60,8 +60,8 @@ success (|> path - (at fs make_directory) - (at ! each (|>> (pipe.when + (of fs make_directory) + (of ! each (|>> (pipe.when {try.#Failure error} <failure> @@ -75,28 +75,28 @@ (def .public (descriptor fs context @module) (All (_ !) (-> (file.System !) Context module.ID file.Path)) (format (..path fs context @module) - (at fs separator) + (of fs separator) ..file)) (def .public (cache! fs context @module content) (All (_ !) (-> (file.System !) Context module.ID Binary (! (Try Any)))) - (at fs write (..descriptor fs context @module) content)) + (of fs write (..descriptor fs context @module) content)) (def .public (cache fs context @module) (All (_ !) (-> (file.System !) Context module.ID (! (Try Binary)))) - (at fs read (..descriptor fs context @module))) + (of 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 (at fs directory_files (..path fs context @module)) + [files (of 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 - (at fs read) - (at ! each (|>> [name]))))))] + (of fs read) + (of ! each (|>> [name]))))))] (in (dictionary.of_list text.hash (for @.old (as (List [Text Binary]) pairs) pairs))))) diff --git a/stdlib/source/library/lux/meta/compiler/meta/cache/purge.lux b/stdlib/source/library/lux/meta/compiler/meta/cache/purge.lux index 801be1619..bc5fab109 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/cache/purge.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/cache/purge.lux @@ -44,10 +44,10 @@ (do [! (try.with async.monad)] [.let [cache (//module.path fs context @module)] _ (|> cache - (at fs directory_files) - (at ! each (monad.each ! (at fs delete))) - (at ! conjoint))] - (at fs delete cache))) + (of fs directory_files) + (of ! each (monad.each ! (of fs delete))) + (of ! conjoint))] + (of fs delete cache))) (def .public (valid? expected actual) (-> Descriptor Input Bit) diff --git a/stdlib/source/library/lux/meta/compiler/meta/export.lux b/stdlib/source/library/lux/meta/compiler/meta/export.lux index a32656ffa..dc5671ddf 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/export.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/export.lux @@ -54,7 +54,7 @@ (function (_ [path source_code]) (do try.monad [path (|> path - (text.replaced (at fs separator) .module_separator) + (text.replaced (of fs separator) .module_separator) tar.path)] (try#each (|>> [path (instant.of_millis +0) @@ -70,6 +70,6 @@ (do [! (try.with async.monad)] [tar (|> sources (..library fs) - (at ! each (binary.result tar.format))) - .let [/ (at fs separator)]] - (at fs write (format target / ..file) tar))) + (of ! each (binary.result tar.format))) + .let [/ (of fs separator)]] + (of fs write (format target / ..file) tar))) diff --git a/stdlib/source/library/lux/meta/compiler/meta/import.lux b/stdlib/source/library/lux/meta/compiler/meta/import.lux index 334c2aa13..af4b61658 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/import.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/import.lux @@ -44,11 +44,11 @@ (-> (file.System Async) Library Import (Action Import)) (let [! async.monad] (|> library - (at system read) - (at ! each (let [! try.monad] - (|>> (at ! each (<binary>.result tar.parser)) - (at ! conjoint) - (at ! each (|>> sequence.list + (of system read) + (of ! each (let [! try.monad] + (|>> (of ! each (<binary>.result tar.parser)) + (of ! conjoint) + (of ! each (|>> sequence.list (monad.mix ! (function (_ entry import) (when entry {tar.#Normal [path instant mode ownership content]} @@ -63,7 +63,7 @@ _ (exception.except ..useless_tar_entry []))) import))) - (at ! conjoint))))))) + (of ! conjoint))))))) (def .public (import system libraries) (-> (file.System Async) (List Library) (Action Import)) diff --git a/stdlib/source/library/lux/meta/compiler/meta/io.lux b/stdlib/source/library/lux/meta/compiler/meta/io.lux index a7eb7545b..15184122b 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/io.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/io.lux @@ -14,7 +14,7 @@ (def .public (safe system) (All (_ m) (-> (System m) Text Text)) - (text.replaced "/" (at system separator))) + (text.replaced "/" (of system separator))) (def .public lux_context Context diff --git a/stdlib/source/library/lux/meta/compiler/meta/io/archive.lux b/stdlib/source/library/lux/meta/compiler/meta/io/archive.lux index 37f0435ab..b62fa4307 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/io/archive.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/io/archive.lux @@ -107,12 +107,12 @@ (when (do ! [data (try.of_maybe (dictionary.value (format (%.nat @artifact) extension) actual)) .let [context [@module @artifact] - declaration (at host ingest context data)]] + declaration (of host ingest context data)]] (when artifact_category {category.#Anonymous} (do ! [.let [output (sequence.suffix [@artifact {.#None} data] output)] - _ (at host re_learn context {.#None} declaration)] + _ (of host re_learn context {.#None} declaration)] (in [definitions output])) @@ -122,14 +122,14 @@ (in [definitions output]) (do ! - [value (at host re_load context {.#None} declaration)] + [value (of host re_load context {.#None} declaration)] (in [(dictionary.has name value definitions) output])))) {category.#Custom name} (do ! [.let [output (sequence.suffix [@artifact {.#Some name} data] output)] - _ (at host re_learn context {.#Some name} declaration)] + _ (of host re_learn context {.#Some name} declaration)] (in [definitions output])))) {try.#Success [definitions' output']} @@ -150,7 +150,7 @@ (|> definitions (dictionary.value def_name) try.of_maybe - (at ! each (|>> [type] + (of ! each (|>> [type] {.#Definition} [exported?] [def_name] @@ -233,8 +233,8 @@ archive.#registry registry] archive)) archive) - (at try.monad each (dependency.load_order $.key)) - (at try.monad conjoint))) + (of try.monad each (dependency.load_order $.key)) + (of try.monad conjoint))) (def (loaded_caches host_environment fs context purge load_order) (All (_ expression declaration) @@ -284,7 +284,7 @@ (-> (List Custom) Configuration (translation.Host expression declaration) (file.System Async) Context Import (List //.Context) (Async (Try [Archive .Lux])))) (do async.monad - [binary (at fs read (cache/archive.descriptor fs context))] + [binary (of fs read (cache/archive.descriptor fs context))] (when binary {try.#Success binary} (do (try.with async.monad) diff --git a/stdlib/source/library/lux/meta/compiler/meta/io/context.lux b/stdlib/source/library/lux/meta/compiler/meta/io/context.lux index ae87b57af..ab6322718 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/io/context.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/io/context.lux @@ -54,7 +54,7 @@ (All (_ m) (-> (file.System m) Context Module file.Path)) (|> module (//.safe fs) - (format context (at fs separator)))) + (format context (of fs separator)))) (def (find_source_file fs importer contexts module extension) (-> (file.System Async) Module (List Context) Module Extension @@ -66,7 +66,7 @@ {.#Item context contexts'} (let [path (format (..path fs context module) extension)] (do async.monad - [? (at fs file? path)] + [? (of fs file? path)] (if ? (in {try.#Success path}) (find_source_file fs importer contexts' module extension)))))) @@ -85,15 +85,15 @@ (when outcome {try.#Success path} (|> path - (at fs read) - (at (try.with !) each (|>> [path]))) + (of fs read) + (of (try.with !) each (|>> [path]))) {try.#Failure _} (do [! (try.with !)] [path (..find_source_file fs importer contexts module ..lux_extension)] (|> path - (at fs read) - (at ! each (|>> [path]))))))) + (of fs read) + (of ! each (|>> [path]))))))) (def (find_library_source_file importer import partial_host_extension module) (-> Module Import Extension Module (Try [file.Path Binary])) @@ -130,7 +130,7 @@ (Async (Try Input))) (do (try.with async.monad) [[path binary] (..find_any_source_file fs importer import contexts partial_host_extension module)] - (when (at utf8.codec decoded binary) + (when (of utf8.codec decoded binary) {try.#Success code} (in [////.#module module ////.#file path @@ -147,19 +147,19 @@ (-> (file.System Async) Context file.Path Enumeration (Async (Try Enumeration))) (do [! (try.with async.monad)] [enumeration (|> directory - (at fs directory_files) - (at ! each (monad.mix ! (function (_ file enumeration) + (of fs directory_files) + (of ! each (monad.mix ! (function (_ file enumeration) (if (text.ends_with? ..lux_extension file) (do ! - [source_code (at fs read file)] + [source_code (of fs read file)] (async#in (dictionary.has' (text.replaced_once context "" file) source_code enumeration))) (in enumeration))) enumeration)) - (at ! conjoint))] + (of ! conjoint))] (|> directory - (at fs sub_directories) - (at ! each (monad.mix ! (context_listing fs context) enumeration)) - (at ! conjoint)))) + (of fs sub_directories) + (of ! each (monad.mix ! (context_listing fs context) enumeration)) + (of ! conjoint)))) (def Action (type_literal (All (_ a) (Async (Try a))))) @@ -167,7 +167,7 @@ (def (canonical fs context) (-> (file.System Async) Context (Action Context)) (do (try.with async.monad) - [subs (at fs sub_directories context)] + [subs (of fs sub_directories context)] (in (|> subs list.head (maybe.else context) @@ -183,7 +183,7 @@ (do ! [context (..canonical fs context)] (..context_listing fs - (format context (at fs separator)) + (format context (of fs separator)) context enumeration))) (is Enumeration diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/meta/compiler/meta/packager/jvm.lux index 845fcbb83..18577f342 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/packager/jvm.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/packager/jvm.lux @@ -178,7 +178,7 @@ (function (_ [artifact custom content] sink) (if (set.member? necessary_dependencies [module artifact]) (..write_class static module artifact custom content sink) - (at ! in sink))) + (of ! in sink))) sink (sequence.list output)))) diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/ruby.lux b/stdlib/source/library/lux/meta/compiler/meta/packager/ruby.lux index 80be5feaf..04e3ef0a3 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/packager/ruby.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/packager/ruby.lux @@ -61,8 +61,8 @@ [bundle (monad.mix ! (function (_ [artifact custom_name content] so_far) (|> content - (at utf8.codec decoded) - (at ! each + (of utf8.codec decoded) + (of ! each (|>> as_expected (is declaration) (sharing [declaration] @@ -95,7 +95,7 @@ (list#mix _.then bundle) (is _.Statement) _.code - (at utf8.codec encoded))] + (of utf8.codec encoded))] (in (list.partial [module_id [(..module_file module_id) entry_content]] sink)))))) @@ -133,7 +133,7 @@ (_.statement (_.string "")))) (is _.Statement) _.code - (at utf8.codec encoded))]] + (of utf8.codec encoded))]] (in (|> entries (list#each product.right) {.#Item [..main_file imports]} diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux index e23dfd312..e36749bb3 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux @@ -62,8 +62,8 @@ (monad.mix try.monad (function (_ content so_far) (|> content - (at encoding.utf8 decoded) - (at try.monad each + (of encoding.utf8 decoded) + (of try.monad each (|>> as_expected (is declaration) (sharing [declaration] @@ -111,7 +111,7 @@ (list#mix ..then bundle) (is _.Expression) _.code - (at encoding.utf8 encoded) + (of 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/meta/compiler/meta/packager/script.lux b/stdlib/source/library/lux/meta/compiler/meta/packager/script.lux index 84f1d9a42..f9392173a 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/packager/script.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/packager/script.lux @@ -48,8 +48,8 @@ (monad.mix try.monad (function (_ content so_far) (|> content - (at utf8.codec decoded) - (at try.monad each + (of utf8.codec decoded) + (of try.monad each (|>> as_expected (is declaration) (sharing [declaration] @@ -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) - (at ! each (|>> scope + (of ! each (|>> scope code - (at utf8.codec encoded) + (of utf8.codec encoded) {.#Left})))))) diff --git a/stdlib/source/library/lux/meta/compiler/phase.lux b/stdlib/source/library/lux/meta/compiler/phase.lux index ee0f650f0..ddd18c7b6 100644 --- a/stdlib/source/library/lux/meta/compiler/phase.lux +++ b/stdlib/source/library/lux/meta/compiler/phase.lux @@ -70,7 +70,7 @@ (-> s (Operation s o) (Try o))) (|> state operation - (at try.monad each product.right))) + (of try.monad each product.right))) (def .public state (All (_ s o) @@ -112,7 +112,7 @@ (def .public assertion (template (_ exception message test) [(if test - (at ..monad in []) + (of ..monad in []) (..except exception message))])) (def .public (try it) diff --git a/stdlib/source/library/lux/meta/compiler/reference.lux b/stdlib/source/library/lux/meta/compiler/reference.lux index b7eb370de..c12f6a535 100644 --- a/stdlib/source/library/lux/meta/compiler/reference.lux +++ b/stdlib/source/library/lux/meta/compiler/reference.lux @@ -34,7 +34,7 @@ (when [reference sample] (^.with_template [<tag> <equivalence>] [[{<tag> reference} {<tag> sample}] - (at <equivalence> = reference sample)]) + (of <equivalence> = reference sample)]) ([#Variable /variable.equivalence] [#Constant symbol.equivalence]) @@ -52,7 +52,7 @@ (^.with_template [<factor> <tag> <hash>] [{<tag> value} (|> value - (at <hash> hash) + (of <hash> hash) (n.* <factor>))]) ([2 #Variable /variable.hash] [3 #Constant symbol.hash]) diff --git a/stdlib/source/library/lux/meta/compiler/reference/variable.lux b/stdlib/source/library/lux/meta/compiler/reference/variable.lux index 7de1dee16..adea64c48 100644 --- a/stdlib/source/library/lux/meta/compiler/reference/variable.lux +++ b/stdlib/source/library/lux/meta/compiler/reference/variable.lux @@ -49,7 +49,7 @@ (^.with_template [<factor> <tag>] [{<tag> register} (|> register - (at n.hash hash) + (of n.hash hash) (n.* <factor>))]) ([2 #Local] [3 #Foreign])))))) diff --git a/stdlib/source/library/lux/meta/extension.lux b/stdlib/source/library/lux/meta/extension.lux index 1f1569c5b..7365e2442 100644 --- a/stdlib/source/library/lux/meta/extension.lux +++ b/stdlib/source/library/lux/meta/extension.lux @@ -72,7 +72,7 @@ (monad.do <>.monad [(,* inputs) (, g!_) <end>] - (.at <>.monad (,' in) (, body))) + (.of <>.monad (,' in) (, body))) (, g!inputs)) {.#Right (, g!_)} (, g!_) diff --git a/stdlib/source/library/lux/meta/macro.lux b/stdlib/source/library/lux/meta/macro.lux index 298bde13d..4ab065278 100644 --- a/stdlib/source/library/lux/meta/macro.lux +++ b/stdlib/source/library/lux/meta/macro.lux @@ -21,7 +21,7 @@ (do //.monad [id //.seed] (in (|> id - (at nat.decimal encoded) + (of nat.decimal encoded) (all text#composite "__gensym__" prefix) [""] code.symbol)))) @@ -29,7 +29,7 @@ (-> Code (Meta Text)) (when ast [_ {.#Symbol ["" name]}] - (at //.monad in name) + (of //.monad in name) _ (//.failure (text#composite "Code is not a local symbol: " (code.format ast))))) @@ -64,13 +64,13 @@ before terms]) (when times 0 - (at //.monad in before) + (of //.monad in before) _ (do [! //.monad] [after (|> before (monad.each ! /expansion.single) - (at ! each list#conjoint))] + (of ! each list#conjoint))] (again (-- times) after)))) _ @@ -81,7 +81,7 @@ (let [! //.monad] (|> it (monad.each ! /expansion.complete) - (at ! each list#conjoint))))) + (of ! each list#conjoint))))) (def .public function (-> Macro Macro') diff --git a/stdlib/source/library/lux/meta/macro/context.lux b/stdlib/source/library/lux/meta/macro/context.lux index 4ec34b5df..09b295b11 100644 --- a/stdlib/source/library/lux/meta/macro/context.lux +++ b/stdlib/source/library/lux/meta/macro/context.lux @@ -75,7 +75,7 @@ (meta.failure (exception.error ..no_active_context []))))) (.def .public peek - (syntax (_ [g!it (at ?.monad each code.symbol ?code.global)]) + (syntax (_ [g!it (of ?.monad each code.symbol ?code.global)]) (in (list (` (..peek' [(, g!it) (.symbol (, g!it))])))))) (.def .public (search' ? [_ context]) @@ -93,7 +93,7 @@ (.def .public search (syntax (_ [g!? ?code.any - g!context (at ?.monad each code.symbol ?code.global)]) + g!context (of ?.monad each code.symbol ?code.global)]) (in (list (` (..search' (, g!?) [(, g!context) (.symbol (, g!context))])))))) (.def (alter on_definition [_ definition]) @@ -156,7 +156,7 @@ (.def .public push (syntax (_ [g!it ?code.any - g!context (at ?.monad each code.symbol ?code.global)]) + g!context (of ?.monad each code.symbol ?code.global)]) (in (list (` (..push' (, g!it) [(, g!context) (.symbol (, g!context))])))))) (.def .public (revised' ? !) @@ -200,7 +200,7 @@ (.def .public revised (syntax (_ [g!predicate ?code.any g!revision ?code.any - g!context (at ?.monad each code.symbol ?code.global)]) + g!context (of ?.monad each code.symbol ?code.global)]) (in (list (` (..revised' (, g!predicate) (, g!revision) [(, g!context) (.symbol (, g!context))])))))) @@ -223,12 +223,12 @@ (list)))))) (.def .public pop - (syntax (_ [g!context (at ?.monad each code.symbol ?code.global)]) + (syntax (_ [g!context (of ?.monad each code.symbol ?code.global)]) (in (list (` (..pop'' [(, g!context) (.symbol (, g!context))])))))) (.def .public def (syntax (_ [.let [! ?.monad - ?local (at ! each code.local ?code.local)] + ?local (of ! each code.local ?code.local)] [export_$? $] (?code.tuple (export.with ?code.local)) [export_expression? g!expression] (?code.tuple (export.with ?local)) diff --git a/stdlib/source/library/lux/meta/macro/expansion.lux b/stdlib/source/library/lux/meta/macro/expansion.lux index 83e34afe2..b1f5cc371 100644 --- a/stdlib/source/library/lux/meta/macro/expansion.lux +++ b/stdlib/source/library/lux/meta/macro/expansion.lux @@ -29,10 +29,10 @@ ((as Macro' macro) args) {.#None} - (at ///.monad in (list syntax)))) + (of ///.monad in (list syntax)))) _ - (at ///.monad in (list syntax)))) + (of ///.monad in (list syntax)))) (def .public (complete syntax) (-> Code (Meta (List Code))) @@ -46,13 +46,13 @@ [top_level_complete ((as Macro' macro) args)] (|> top_level_complete (monad.each ///.monad complete) - (at ! each list#conjoint))) + (of ! each list#conjoint))) {.#None} - (at ///.monad in (list syntax)))) + (of ///.monad in (list syntax)))) _ - (at ///.monad in (list syntax)))) + (of ///.monad in (list syntax)))) (def .public (total syntax) (-> Code (Meta (List Code))) @@ -89,7 +89,7 @@ (in (list (code.tuple (list#conjoint members'))))) _ - (at ///.monad in (list syntax)))) + (of ///.monad in (list syntax)))) (def .public (one token) (-> Code (Meta Code)) diff --git a/stdlib/source/library/lux/meta/macro/local.lux b/stdlib/source/library/lux/meta/macro/local.lux index b2367fee8..9e2ada587 100644 --- a/stdlib/source/library/lux/meta/macro/local.lux +++ b/stdlib/source/library/lux/meta/macro/local.lux @@ -131,7 +131,7 @@ locals (monad.each ! (function (_ [name value]) (|> value (meta.eval .Macro) - (at ! each (|>> (as .Macro) + (of ! each (|>> (as .Macro) [[here_name name]])))) locals) expression? (is (Meta Bit) diff --git a/stdlib/source/library/lux/meta/macro/pattern.lux b/stdlib/source/library/lux/meta/macro/pattern.lux index 6ab386dd1..79cf2e519 100644 --- a/stdlib/source/library/lux/meta/macro/pattern.lux +++ b/stdlib/source/library/lux/meta/macro/pattern.lux @@ -266,7 +266,7 @@ (..spliced_unquote (macro (_ tokens) ({{.#Item it {.#End}} - (at ///.monad in (list it)) + (of ///.monad in (list it)) _ (///.failure (..wrong_syntax_error (symbol ..,*)))} @@ -335,7 +335,7 @@ (..unquote (macro (_ tokens) ({{.#Item it {.#End}} - (at ///.monad in (list it)) + (of ///.monad in (list it)) _ (///.failure (..wrong_syntax_error (symbol ..,)))} diff --git a/stdlib/source/library/lux/meta/macro/syntax.lux b/stdlib/source/library/lux/meta/macro/syntax.lux index ec96b9e42..86ee0ff5c 100644 --- a/stdlib/source/library/lux/meta/macro/syntax.lux +++ b/stdlib/source/library/lux/meta/macro/syntax.lux @@ -85,7 +85,7 @@ (is (</>.Parser (Meta (List Code))) (do <>.monad [(,* (..un_paired vars+parsers))] - (.at <>.monad (,' in) + (.of <>.monad (,' in) (is (Meta (List Code)) (, body))))) (, g!tokens)) diff --git a/stdlib/source/library/lux/meta/macro/template.lux b/stdlib/source/library/lux/meta/macro/template.lux index 77c26cfd4..7f848ea46 100644 --- a/stdlib/source/library/lux/meta/macro/template.lux +++ b/stdlib/source/library/lux/meta/macro/template.lux @@ -130,8 +130,8 @@ (exception.def .public (irregular_arguments [expected actual]) (Exception [Nat Nat]) (exception.report - (list ["Expected" (at nat.decimal encoded expected)] - ["Actual" (at nat.decimal encoded actual)]))) + (list ["Expected" (of nat.decimal encoded expected)] + ["Actual" (of nat.decimal encoded actual)]))) (def (macro (open "_[0]")) (-> Local Macro) diff --git a/stdlib/source/library/lux/meta/macro/vocabulary.lux b/stdlib/source/library/lux/meta/macro/vocabulary.lux index 0b2216617..b73716768 100644 --- a/stdlib/source/library/lux/meta/macro/vocabulary.lux +++ b/stdlib/source/library/lux/meta/macro/vocabulary.lux @@ -48,6 +48,6 @@ (-> Symbol (Meta Macro)) (do ///.monad [[(, g!type) (, g!value)] (///.export (, g!_))] - (if (at type.equivalence (,' =) (, type) (, g!type)) + (if (of type.equivalence (,' =) (, type) (, g!type)) ((,' in) ((, macro) (as (, type) (, g!value)))) (///.failure (exception.error ..invalid_type [(, type) (, g!type)]))))))))))) diff --git a/stdlib/source/library/lux/meta/static.lux b/stdlib/source/library/lux/meta/static.lux index 3b2fd8065..47cc6b7f4 100644 --- a/stdlib/source/library/lux/meta/static.lux +++ b/stdlib/source/library/lux/meta/static.lux @@ -20,7 +20,7 @@ (with_template [<name> <type> <format>] [(def .public <name> (syntax (_ [expression <code>.any]) - (at meta.monad each + (of meta.monad each (|>> (as <type>) <format> list) (meta.eval <type> expression))))] diff --git a/stdlib/source/library/lux/meta/symbol.lux b/stdlib/source/library/lux/meta/symbol.lux index edbf2acd3..36d4b4256 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) - (at ..hash equivalence)) + (of ..hash equivalence)) (def .public order (Order Symbol) @@ -36,8 +36,8 @@ (def equivalence ..equivalence) (def (< [moduleP shortP] [moduleS shortS]) (if (text#= moduleP moduleS) - (at text.order < shortP shortS) - (at text.order < moduleP moduleS))))) + (of text.order < shortP shortS) + (of text.order < moduleP moduleS))))) (def .public separator ".") diff --git a/stdlib/source/library/lux/meta/target/js.lux b/stdlib/source/library/lux/meta/target/js.lux index b2e34c32b..c158d9651 100644 --- a/stdlib/source/library/lux/meta/target/js.lux +++ b/stdlib/source/library/lux/meta/target/js.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except Location Code Label or and function if undefined for comment not int try ++ -- the type_of at , when) + [lux (.except Location Code Label or and function if undefined for comment not int try ++ -- the type_of , when) [control ["[0]" pipe]] [data diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode.lux index cb236893f..dc51330fa 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode.lux @@ -113,7 +113,7 @@ (function (_ resolver) (<| (try|do [left_exceptions left_instruction] (left resolver)) (try|do [right_exceptions right_instruction] (right resolver)) - (try|in [(at sequence.monoid composite left_exceptions right_exceptions) + (try|in [(of sequence.monoid composite left_exceptions right_exceptions) (_#composite left_instruction right_instruction)]))))) (def relative_monoid @@ -698,7 +698,7 @@ (-> Nat (Bytecode Register)) (when (//unsigned.u1 id) {try.#Success register} - (at ..monad in register) + (of ..monad in register) {try.#Failure error} (..except ..invalid_register [id]))) @@ -867,7 +867,7 @@ [(function (_ resolver) (<| (try|do [expected @to] (..resolve_label label resolver)) (try|do _ (exception.assertion ..mismatched_environments [(symbol <instruction>) label @here expected actual] - (at /stack.equivalence = expected actual))) + (of /stack.equivalence = expected actual))) (try|do jump (..jump @from @to)) (when jump {.#Left jump} @@ -916,7 +916,7 @@ (when (dictionary.value label resolver) {.#Some [expected {.#Some @to}]} (<| (try|do _ (exception.assertion ..mismatched_environments [(symbol <instruction>) label @here expected actual] - (at /stack.equivalence = expected actual))) + (of /stack.equivalence = expected actual))) (try|do jump (..jump @from @to)) (when jump {.#Left jump} @@ -975,7 +975,7 @@ (|> afterwards (monad.each ! get) (monad.then ! (monad.each ! product.right)) - (at ! each (|>> [@default @at_minimum])))) + (of ! 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))) @@ -1016,7 +1016,7 @@ (|> cases (monad.each ! (|>> product.right get)) (monad.then ! (monad.each ! product.right)) - (at ! each (|>> [@default])))) + (of ! 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/meta/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux index 3e6d4f4c2..6bcb3655a 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/address.lux @@ -39,7 +39,7 @@ (-> U2 (-> Address (Try Address))) (|>> representation (///unsigned.+/2 distance) - (at try.functor each (|>> abstraction)))) + (of try.functor each (|>> abstraction)))) (def with_sign (-> Address (Try S4)) @@ -61,7 +61,7 @@ (Equivalence Address) (implementation (def (= reference subject) - (at ///unsigned.equivalence = + (of ///unsigned.equivalence = (representation reference) (representation subject))))) diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment.lux index a7e687751..9fd4d7250 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment.lux @@ -74,7 +74,7 @@ (-> Stack Environment (Try [Stack Environment])) (when (the ..#stack environment) {.#Some actual} - (if (at /stack.equivalence = expected actual) + (if (of /stack.equivalence = expected actual) {try.#Success [actual environment]} (exception.except ..mismatched_stacks [expected actual])) diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux index 28c09c0d2..9737de12c 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/registry.lux @@ -61,7 +61,7 @@ (def .public equivalence (Equivalence Registry) - (at equivalence.functor each + (of equivalence.functor each (|>> representation) /////unsigned.equivalence)) diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux index eaf7673f7..7517c2b60 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/environment/limit/stack.lux @@ -32,7 +32,7 @@ (def .public equivalence (Equivalence Stack) - (at equivalence.functor each + (of equivalence.functor each (|>> representation) /////unsigned.equivalence)) @@ -49,7 +49,7 @@ (-> U2 (-> Stack (Try Stack))) (|>> representation (<op> amount) - (at try.functor each ..stack)))] + (of try.functor each ..stack)))] [/////unsigned.+/2 push] [/////unsigned.-/2 pop] diff --git a/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux index d6abb8141..d8a6963ae 100644 --- a/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux +++ b/stdlib/source/library/lux/meta/target/jvm/bytecode/instruction.lux @@ -597,7 +597,7 @@ tableswitch_size (try.trusted (do [! try.monad] [size (///unsigned.u2 size)] - (at ! each (|>> estimator ///unsigned.value) + (of ! each (|>> estimator ///unsigned.value) (//address.move size //address.start)))) tableswitch_mutation (is Mutation (function (_ [offset binary]) @@ -661,7 +661,7 @@ lookupswitch_size (try.trusted (do [! try.monad] [size (///unsigned.u2 size)] - (at ! each (|>> estimator ///unsigned.value) + (of ! each (|>> estimator ///unsigned.value) (//address.move size //address.start)))) lookupswitch_mutation (is Mutation (function (_ [offset binary]) diff --git a/stdlib/source/library/lux/meta/target/jvm/class.lux b/stdlib/source/library/lux/meta/target/jvm/class.lux index ba01154b6..5ffb48007 100644 --- a/stdlib/source/library/lux/meta/target/jvm/class.lux +++ b/stdlib/source/library/lux/meta/target/jvm/class.lux @@ -106,7 +106,7 @@ attributes (monad.all ! attributes) @signature (when signature {.#Some signature} - (at ! each (|>> {.#Some}) (//attribute.signature signature)) + (of ! each (|>> {.#Some}) (//attribute.signature signature)) {.#None} (in {.#None}))] diff --git a/stdlib/source/library/lux/meta/target/jvm/constant.lux b/stdlib/source/library/lux/meta/target/jvm/constant.lux index 936e73230..8039a7b47 100644 --- a/stdlib/source/library/lux/meta/target/jvm/constant.lux +++ b/stdlib/source/library/lux/meta/target/jvm/constant.lux @@ -54,7 +54,7 @@ (def .public class_equivalence (Equivalence Class) - (at equivalence.functor each + (of equivalence.functor each ..index //index.equivalence)) @@ -93,7 +93,7 @@ (All (_ kind) (-> (Equivalence kind) (Equivalence (Value kind)))) - (at equivalence.functor each + (of equivalence.functor each (|>> representation) Equivalence<kind>)) @@ -186,7 +186,7 @@ (when [reference sample] (^.with_template [<tag> <equivalence>] [[{<tag> reference} {<tag> sample}] - (at <equivalence> = reference sample)]) + (of <equivalence> = reference sample)]) ([#UTF8 text.equivalence] [#Integer (..value_equivalence i32.equivalence)] [#Long (..value_equivalence int.equivalence)] diff --git a/stdlib/source/library/lux/meta/target/jvm/constant/pool.lux b/stdlib/source/library/lux/meta/target/jvm/constant/pool.lux index bb57608a0..46adfd870 100644 --- a/stdlib/source/library/lux/meta/target/jvm/constant/pool.lux +++ b/stdlib/source/library/lux/meta/target/jvm/constant/pool.lux @@ -100,7 +100,7 @@ {try.#Success entry} (when entry [index {<tag> reference}] - (if (at <equivalence> = reference <value>') + (if (of <equivalence> = reference <value>') {try.#Success [[current pool] index]} <try_again>) @@ -115,7 +115,7 @@ (|> current //index.value (//unsigned.+/2 @new) - (at try.monad each //index.index)))) + (of try.monad each //index.index)))) (try|in [[next (sequence.suffix [current new] pool)] current]))))))])) diff --git a/stdlib/source/library/lux/meta/target/jvm/field.lux b/stdlib/source/library/lux/meta/target/jvm/field.lux index 49c60849e..443d34f16 100644 --- a/stdlib/source/library/lux/meta/target/jvm/field.lux +++ b/stdlib/source/library/lux/meta/target/jvm/field.lux @@ -68,7 +68,7 @@ [@name (//constant/pool.utf8 name) @descriptor (//constant/pool.descriptor (//type.descriptor type)) @signature (if with_signature? - (at ! each (|>> {.#Some}) (//attribute.signature (//type.signature type))) + (of ! each (|>> {.#Some}) (//attribute.signature (//type.signature type))) (in {.#None}))] (in [#modifier modifier #name @name diff --git a/stdlib/source/library/lux/meta/target/jvm/index.lux b/stdlib/source/library/lux/meta/target/jvm/index.lux index 7f93bb0ff..522684c1c 100644 --- a/stdlib/source/library/lux/meta/target/jvm/index.lux +++ b/stdlib/source/library/lux/meta/target/jvm/index.lux @@ -29,7 +29,7 @@ (def .public equivalence (All (_ kind) (Equivalence (Index kind))) - (at equivalence.functor each + (of equivalence.functor each ..value //unsigned.equivalence)) diff --git a/stdlib/source/library/lux/meta/target/jvm/method.lux b/stdlib/source/library/lux/meta/target/jvm/method.lux index 629aaae94..a4689017a 100644 --- a/stdlib/source/library/lux/meta/target/jvm/method.lux +++ b/stdlib/source/library/lux/meta/target/jvm/method.lux @@ -62,7 +62,7 @@ (list.partial (//attribute.signature (//type.signature type)) attributes) attributes) (monad.all !) - (at ! each sequence.of_list)) + (of ! each sequence.of_list)) attributes (when code {.#Some code} (do ! diff --git a/stdlib/source/library/lux/meta/target/jvm/modifier.lux b/stdlib/source/library/lux/meta/target/jvm/modifier.lux index 9b1b0843e..59359f103 100644 --- a/stdlib/source/library/lux/meta/target/jvm/modifier.lux +++ b/stdlib/source/library/lux/meta/target/jvm/modifier.lux @@ -35,7 +35,7 @@ (All (_ of) (Equivalence (Modifier of))) (implementation (def (= reference sample) - (at //unsigned.equivalence = + (of //unsigned.equivalence = (representation reference) (representation sample))))) @@ -57,7 +57,7 @@ (let [sub (!representation sub)] (|> (!representation super) (i64.and sub) - (at i64.equivalence = sub)))) + (of i64.equivalence = sub)))) (def .public monoid (All (_ of) (Monoid (Modifier of))) @@ -71,7 +71,7 @@ (def .public empty Modifier - (at ..monoid identity)) + (of ..monoid identity)) (def .public format (All (_ of) (Format (Modifier of))) diff --git a/stdlib/source/library/lux/meta/target/jvm/reflection.lux b/stdlib/source/library/lux/meta/target/jvm/reflection.lux index 2e977d594..d62ce7c3f 100644 --- a/stdlib/source/library/lux/meta/target/jvm/reflection.lux +++ b/stdlib/source/library/lux/meta/target/jvm/reflection.lux @@ -163,7 +163,7 @@ java/lang/reflect/ParameterizedType::getActualTypeArguments (array.list {.#None}) (monad.each ! parameter) - (at ! each (/.class (|> raw' + (of ! each (/.class (|> raw' (as (java/lang/Class java/lang/Object)) java/lang/Class::getName))) (exception.with ..cannot_convert_to_a_lux_type [reflection]))) @@ -196,7 +196,7 @@ {try.#Success /.wildcard} _ - (at try.monad each <kind> (parameter type bound)))]) + (of try.monad each <kind> (parameter type bound)))]) ([[_ {.#Some bound}] /.upper] [[{.#Some bound} _] /.lower]) @@ -208,7 +208,7 @@ (|> reflection java/lang/reflect/GenericArrayType::getGenericComponentType type - (at try.monad each /.array)) + (of try.monad each /.array)) _) (when (ffi.as java/lang/Class reflection) {.#Some class} @@ -376,7 +376,7 @@ <then?> (|> fieldJ java/lang/reflect/Field::getGenericType ..type - (at ! each (|>> [(java/lang/reflect/Modifier::isFinal modifiers) + (of ! each (|>> [(java/lang/reflect/Modifier::isFinal modifiers) (..deprecated? (java/lang/reflect/Field::getDeclaredAnnotations fieldJ))]))) <else?> (exception.except <exception> [field class]))))] diff --git a/stdlib/source/library/lux/meta/target/jvm/type.lux b/stdlib/source/library/lux/meta/target/jvm/type.lux index 9253258f5..0eff5b048 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type.lux @@ -154,7 +154,7 @@ (All (_ category) (Equivalence (Type category))) (implementation (def (= parameter subject) - (at /signature.equivalence = + (of /signature.equivalence = (..signature parameter) (..signature subject))))) @@ -162,13 +162,13 @@ (All (_ category) (Hash (Type category))) (implementation (def equivalence ..equivalence) - (def hash (|>> ..signature (at /signature.hash hash))))) + (def hash (|>> ..signature (of /signature.hash hash))))) (def .public (primitive? type) (-> (Type Value) (Either (Type Object) (Type Primitive))) (if (`` (or (,, (with_template [<type>] - [(at ..equivalence = (is (Type Value) <type>) type)] + [(of ..equivalence = (is (Type Value) <type>) type)] [..boolean] [..byte] @@ -185,7 +185,7 @@ (-> (Type Return) (Either (Type Value) (Type Void))) (if (`` (or (,, (with_template [<type>] - [(at ..equivalence = (is (Type Return) <type>) type)] + [(of ..equivalence = (is (Type Return) <type>) type)] [..void])))) (|> type (as (Type Void)) {.#Right}) @@ -204,7 +204,7 @@ (n.- suffix_size))] (|> repr (text.clip prefix_size name_size) - (at maybe.monad each (|>> //name.internal //name.external)))) + (of maybe.monad each (|>> //name.internal //name.external)))) {.#None}))) (def .public format diff --git a/stdlib/source/library/lux/meta/target/jvm/type/alias.lux b/stdlib/source/library/lux/meta/target/jvm/type/alias.lux index 99d623d5e..8bc4f29e8 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/alias.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/alias.lux @@ -52,7 +52,7 @@ [(def <name> (-> (Parser (Type Class)) (Parser (Type Parameter))) (|>> (<>.after (<text>.this <prefix>)) - (at <>.monad each <bound>)))] + (of <>.monad each <bound>)))] [lower //signature.lower_prefix //.lower ..Lower] [upper //signature.upper_prefix //.upper ..Upper] @@ -108,7 +108,7 @@ (def (bound_type_var aliasing) (-> Aliasing (Parser (Type Var))) (|> //parser.var_name - (at <>.monad each //.var) + (of <>.monad each //.var) (<>.before (<>.many (..bound aliasing))))) (def .public (method aliasing) diff --git a/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux index 46e360bae..2327f07b2 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/descriptor.lux @@ -120,6 +120,6 @@ (|> (text.size repr) (n.- prefix_size) (n.- suffix_size))) - (at maybe.monad each ///name.internal) + (of maybe.monad each ///name.internal) maybe.trusted)))))) ) diff --git a/stdlib/source/library/lux/meta/target/jvm/type/parser.lux b/stdlib/source/library/lux/meta/target/jvm/type/parser.lux index 61c80017c..2ad5b09a2 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/parser.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/parser.lux @@ -68,7 +68,7 @@ (with_template [<type> <name> <head> <tail> <adapter>] [(def .public <name> (Parser <type>) - (at <>.functor each <adapter> + (of <>.functor each <adapter> (<text>.slice (<text>.and! (<text>.one_of! <head>) (<text>.some! (<text>.one_of! <tail>))))))] @@ -125,7 +125,7 @@ (def class' (-> (Parser (Type Parameter)) (Parser (Type Class))) (|>> ..class'' - (at <>.monad each (product.uncurried //.class)))) + (of <>.monad each (product.uncurried //.class)))) (def .public array' (-> (Parser (Type Value)) (Parser (Type Array))) diff --git a/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux b/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux index 003030a9b..1478a0494 100644 --- a/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux +++ b/stdlib/source/library/lux/meta/target/jvm/type/reflection.lux @@ -64,7 +64,7 @@ element' (,, (with_template [<primitive> <descriptor>] - [(at ..equivalence = <primitive> element) + [(of ..equivalence = <primitive> element) (//descriptor.descriptor <descriptor>)] [..boolean //descriptor.boolean] diff --git a/stdlib/source/library/lux/meta/target/lua.lux b/stdlib/source/library/lux/meta/target/lua.lux index 0bafbd9ca..84a566839 100644 --- a/stdlib/source/library/lux/meta/target/lua.lux +++ b/stdlib/source/library/lux/meta/target/lua.lux @@ -47,13 +47,13 @@ (All (_ brand) (Equivalence (Code brand))) (implementation (def (= reference subject) - (at text.equivalence = (representation reference) (representation subject))))) + (of text.equivalence = (representation reference) (representation subject))))) (def .public hash (All (_ brand) (Hash (Code brand))) (implementation (def equivalence ..equivalence) - (def hash (|>> representation (at text.hash hash))))) + (def hash (|>> representation (of 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 (at n.hex encoded)] + (.let [to_hex (of n.hex encoded)] (|>> .nat to_hex (format "0x") diff --git a/stdlib/source/library/lux/meta/target/php.lux b/stdlib/source/library/lux/meta/target/php.lux index 44e663934..cb4d0a622 100644 --- a/stdlib/source/library/lux/meta/target/php.lux +++ b/stdlib/source/library/lux/meta/target/php.lux @@ -55,13 +55,13 @@ (All (_ brand) (Equivalence (Code brand))) (implementation (def (= reference subject) - (at text.equivalence = (representation reference) (representation subject))))) + (of text.equivalence = (representation reference) (representation subject))))) (def .public hash (All (_ brand) (Hash (Code brand))) (implementation (def equivalence ..equivalence) - (def hash (|>> representation (at text.hash hash))))) + (def hash (|>> representation (of text.hash hash))))) (def .public manual (-> Text Code) @@ -141,7 +141,7 @@ (def .public int (-> Int Literal) - (.let [to_hex (at n.hex encoded)] + (.let [to_hex (of n.hex encoded)] (|>> .nat to_hex (format "0x") diff --git a/stdlib/source/library/lux/meta/target/python.lux b/stdlib/source/library/lux/meta/target/python.lux index 9d426d1ed..a6d0968c5 100644 --- a/stdlib/source/library/lux/meta/target/python.lux +++ b/stdlib/source/library/lux/meta/target/python.lux @@ -64,13 +64,13 @@ (All (_ brand) (Equivalence (Code brand))) (implementation (.def (= reference subject) - (at text.equivalence = (representation reference) (representation subject))))) + (of text.equivalence = (representation reference) (representation subject))))) (.def .public hash (All (_ brand) (Hash (Code brand))) (implementation (.def equivalence ..equivalence) - (.def hash (|>> representation (at text.hash hash))))) + (.def hash (|>> representation (of text.hash hash))))) (.def .public manual (-> Text Code) diff --git a/stdlib/source/library/lux/meta/target/ruby.lux b/stdlib/source/library/lux/meta/target/ruby.lux index 17892b773..82fbaa9b4 100644 --- a/stdlib/source/library/lux/meta/target/ruby.lux +++ b/stdlib/source/library/lux/meta/target/ruby.lux @@ -47,7 +47,7 @@ (All (_ brand) (Equivalence (Code brand))) (implementation (def (= reference subject) - (at text.equivalence = (representation reference) (representation subject))))) + (of text.equivalence = (representation reference) (representation subject))))) (def .public manual (-> Text Code) diff --git a/stdlib/source/library/lux/meta/target/scheme.lux b/stdlib/source/library/lux/meta/target/scheme.lux index f9a3a71df..4c8049fce 100644 --- a/stdlib/source/library/lux/meta/target/scheme.lux +++ b/stdlib/source/library/lux/meta/target/scheme.lux @@ -39,13 +39,13 @@ (All (_ brand) (Equivalence (Code brand))) (implementation (def (= reference subject) - (at text.equivalence = (representation reference) (representation subject))))) + (of text.equivalence = (representation reference) (representation subject))))) (def .public hash (All (_ brand) (Hash (Code brand))) (implementation (def equivalence ..equivalence) - (def hash (|>> representation (at text.hash hash))))) + (def hash (|>> representation (of text.hash hash))))) (with_template [<type> <brand> <super>+] [(nominal.def .public (<brand> brand) Any) diff --git a/stdlib/source/library/lux/meta/type.lux b/stdlib/source/library/lux/meta/type.lux index 90ad79d1e..8413debc3 100644 --- a/stdlib/source/library/lux/meta/type.lux +++ b/stdlib/source/library/lux/meta/type.lux @@ -370,7 +370,7 @@ {.#Apply A F} (|> (..applied (list A) F) - (at maybe.monad each quantified?) + (of maybe.monad each quantified?) (maybe.else false)) (,, (with_template [<pattern>] @@ -508,7 +508,7 @@ (`` (def .public (replaced before after) (-> Type Type Type Type) (.function (again it) - (if (at ..equivalence = before it) + (if (of ..equivalence = before it) after (when it {.#Nominal name co_variant} diff --git a/stdlib/source/library/lux/meta/type/check.lux b/stdlib/source/library/lux/meta/type/check.lux index fc4794124..f5e596bd2 100644 --- a/stdlib/source/library/lux/meta/type/check.lux +++ b/stdlib/source/library/lux/meta/type/check.lux @@ -520,7 +520,7 @@ (do ! [ringE (..ring idE) ringA (..ring idA)] - (if (at set.equivalence = ringE ringA) + (if (of set.equivalence = ringE ringA) (in assumptions) ... Fuse 2 rings (do ! diff --git a/stdlib/source/library/lux/meta/type/dynamic.lux b/stdlib/source/library/lux/meta/type/dynamic.lux index 24a08e645..e326cb21d 100644 --- a/stdlib/source/library/lux/meta/type/dynamic.lux +++ b/stdlib/source/library/lux/meta/type/dynamic.lux @@ -40,7 +40,7 @@ (is Dynamic) (as <representation>))] (.is (try.Try (, type)) - (.if (.at //.equivalence (,' =) + (.if (.of //.equivalence (,' =) (.type_literal (, type)) (, g!type)) {try.#Success (.as (, type) (, g!value))} (exception.except ..wrong_type [(.type_literal (, type)) (, g!type)])))))))))) diff --git a/stdlib/source/library/lux/meta/type/implicit.lux b/stdlib/source/library/lux/meta/type/implicit.lux index 1e1a93c0d..68e64358a 100644 --- a/stdlib/source/library/lux/meta/type/implicit.lux +++ b/stdlib/source/library/lux/meta/type/implicit.lux @@ -37,7 +37,7 @@ (type_var id' env) _ - (at ///.monad in type)) + (of ///.monad in type)) {.#Some [_ {.#None}]} (///.failure (format "Unbound type-var " (%.nat id))) @@ -74,12 +74,12 @@ {.#Product left right} (if (n.= 0 idx) - (at check.monad in left) + (of check.monad in left) (member_type (-- idx) right)) _ (if (n.= 0 idx) - (at check.monad in sig_type) + (of check.monad in sig_type) (check.failure (format "Cannot find member type " (%.nat idx) " for " (%.type sig_type)))))) (def (member_name member) @@ -108,7 +108,7 @@ (///.failure (format "Too many candidate slots: " (%.list %.symbol candidates)))))) _ - (at ///.monad in member))) + (of ///.monad in member))) (def (implicit_member member) (-> Symbol (Meta [Nat Type])) @@ -220,7 +220,7 @@ final_output])) _ - (at check.monad in [(list) type]))) + (of check.monad in [(list) type]))) (def (ensure_function_application! member_type input_types expected_output) (-> Type (List Type) Type (Check [])) @@ -278,7 +278,7 @@ (check.failure (format "No candidates for provisioning: " (%.type dep))) {.#Item winner {.#End}} - (at check.monad in winner) + (of check.monad in winner) _ (check.failure (format "Too many candidates for provisioning: " (%.type dep) " --- " (%.list (|>> product.left %.symbol) candidates)))) @@ -359,7 +359,7 @@ (///.failure (format "No implementation could be found for member: " (%.symbol member))) {.#Item chosen {.#End}} - (in (list (` (.at (, (instance$ chosen)) + (in (list (` (.of (, (instance$ chosen)) (, (code.local (product.right member))) (,* (list#each code.symbol args)))))) diff --git a/stdlib/source/library/lux/meta/type/linear.lux b/stdlib/source/library/lux/meta/type/linear.lux index 89080dbb4..808649cc6 100644 --- a/stdlib/source/library/lux/meta/type/linear.lux +++ b/stdlib/source/library/lux/meta/type/linear.lux @@ -46,7 +46,7 @@ (implementation (def (in value) (function (_ keys) - (at monad in [keys value]))) + (of monad in [keys value]))) (def (then f input) (function (_ keysI) @@ -89,7 +89,7 @@ [(def .public (<name> monad value) (All (_ ! v) (Ex (_ k) (-> (Monad !) v (Affine ! (Key <mode> k) (Res k v))))) (function (_ keys) - (at monad in [[(<key> []) keys] (abstraction value)])))] + (of monad in [[(<key> []) keys] (abstraction value)])))] [ordered Ordered ..ordered_key] [commutative Commutative ..commutative_key] @@ -99,7 +99,7 @@ (All (_ ! v k m) (-> (Monad !) (Res k v) (Relevant ! (Key m k) v))) (function (_ [key keys]) - (at monad in [keys (representation resource)]))) + (of monad in [keys (representation resource)]))) ) (exception.def .public (index_cannot_be_repeated index) @@ -126,7 +126,7 @@ (def (no_op monad) (All (_ m) (-> (Monad m) (Linear m Any))) (function (_ context) - (at monad in [context []]))) + (of monad in [context []]))) (def .public exchange (syntax (_ [swaps ..indices]) @@ -157,7 +157,7 @@ [(,* g!outputsT+) (, g!context)] .Any))) (function ((, g!_) (, g!!) [(,* g!inputs) (, g!context)]) - (at (, g!!) (,' in) [[(,* g!outputs) (, g!context)] []]))))))))))) + (of (, g!!) (,' in) [[(,* g!outputs) (, g!context)] []]))))))))))) (def amount (Parser Nat) @@ -182,7 +182,7 @@ [<to> (, g!context)] .Any))) (function ((, g!_) (, g!!) [<from> (, g!context)]) - (at (, g!!) (,' in) [[<to> (, g!context)] []]))))))))))] + (of (, g!!) (,' in) [[<to> (, g!context)] []]))))))))))] [group (,* g!keys) [(,* g!keys)]] [un_group [(,* g!keys)] (,* g!keys)] diff --git a/stdlib/source/library/lux/meta/type/nominal.lux b/stdlib/source/library/lux/meta/type/nominal.lux index 1d5ce2602..6b3c2643c 100644 --- a/stdlib/source/library/lux/meta/type/nominal.lux +++ b/stdlib/source/library/lux/meta/type/nominal.lux @@ -66,7 +66,7 @@ (.def declarationP (Parser [Text (List Text)]) (<>.either (<code>.form (<>.and <code>.local (<>.some <code>.local))) - (<>.and <code>.local (at <>.monad in (list))))) + (<>.and <code>.local (of <>.monad in (list))))) (.def abstract (Parser [Code [Text (List Text)] Code (List Code)]) diff --git a/stdlib/source/library/lux/meta/type/poly.lux b/stdlib/source/library/lux/meta/type/poly.lux index 54736333f..ab2c9db8d 100644 --- a/stdlib/source/library/lux/meta/type/poly.lux +++ b/stdlib/source/library/lux/meta/type/poly.lux @@ -39,7 +39,7 @@ (, body))) (.as .Type (, g!type)))) {.#Right (, g!output)} - (at ///.monad (,' in) (.list (, g!output))) + (of ///.monad (,' in) (.list (, g!output))) {.#Left (, g!output)} (///.failure (, g!output)))))))))))) diff --git a/stdlib/source/library/lux/meta/type/quotient.lux b/stdlib/source/library/lux/meta/type/quotient.lux index 57b3ec811..6da8566c8 100644 --- a/stdlib/source/library/lux/meta/type/quotient.lux +++ b/stdlib/source/library/lux/meta/type/quotient.lux @@ -75,6 +75,6 @@ (Equivalence (..Quotient super sub %)))) (implementation (def (= reference sample) - (at super = + (of super = (..label reference) (..label sample))))) diff --git a/stdlib/source/library/lux/meta/type/row.lux b/stdlib/source/library/lux/meta/type/row.lux index b33924a27..9965c79e8 100644 --- a/stdlib/source/library/lux/meta/type/row.lux +++ b/stdlib/source/library/lux/meta/type/row.lux @@ -142,7 +142,7 @@ (` (def (, export_policy) (, (code.local row_slot)) (..slot (syntax ((, g!_) []) - (at meta.monad (,' in) + (of meta.monad (,' in) (list (,* (list.repeated (|> :super: (maybe#each nesting) (maybe.else 0)) diff --git a/stdlib/source/library/lux/meta/type/unit/scale.lux b/stdlib/source/library/lux/meta/type/unit/scale.lux index 9f4f7e1f9..81ca77b4a 100644 --- a/stdlib/source/library/lux/meta/type/unit/scale.lux +++ b/stdlib/source/library/lux/meta/type/unit/scale.lux @@ -41,8 +41,8 @@ (def .public (re_scaled from to measure) (All (_ si so u) (-> (Scale si) (Scale so) (//.Measure si u) (//.Measure so u))) - (let [(open "/[0]") (ratio./ (at from ratio) - (at to ratio))] + (let [(open "/[0]") (ratio./ (of from ratio) + (of to ratio))] (|> measure //.number (i.* (.int /#numerator)) diff --git a/stdlib/source/library/lux/test/coverage.lux b/stdlib/source/library/lux/test/coverage.lux index e717d27ed..795f957d7 100644 --- a/stdlib/source/library/lux/test/coverage.lux +++ b/stdlib/source/library/lux/test/coverage.lux @@ -1,6 +1,6 @@ (.require [library - [lux (.except) + [lux (.except of) [abstract [monad (.only do)]] [data diff --git a/stdlib/source/library/lux/test/property.lux b/stdlib/source/library/lux/test/property.lux index 3223d7c06..592c8fce3 100644 --- a/stdlib/source/library/lux/test/property.lux +++ b/stdlib/source/library/lux/test/property.lux @@ -52,7 +52,7 @@ (-> Test Test Test) (do [! random.monad] [left left] - (at ! each (//.and left) right))) + (of ! each (//.and left) right))) (def .public context (-> Text Test Test) @@ -148,7 +148,7 @@ (the tally.#actual tally)) report (is (-> Coverage Text) (|>> set.list - (list.sorted (at symbol.order <)) + (list.sorted (of symbol.order <)) (exception.listing %.symbol))) expected_coverage (set.size (the tally.#expected tally)) unexpected_coverage (set.size unexpected) @@ -215,7 +215,7 @@ {.#Some console} (console.write_line report console)) <else>))] - (async.future (at environment.default exit + (async.future (of environment.default exit (when (the tally.#failures tally) 0 ..success_exit_code _ ..failure_exit_code))))) @@ -223,12 +223,12 @@ (def .public coverage (syntax (_ [coverage <code>.any condition <code>.any]) - (in (list (` (at random.monad (,' in) (//.coverage (, coverage) (, condition)))))))) + (in (list (` (of random.monad (,' in) (//.coverage (, coverage) (, condition)))))))) (def .public for (syntax (_ [coverage <code>.any test <code>.any]) - (in (list (` (at random.functor + (in (list (` (of random.functor (,' each) (|>> (//.for (, coverage))) (, test))))))) @@ -236,7 +236,7 @@ (def .public covering (syntax (_ [module <code>.any test <code>.any]) - (in (list (` (at random.functor + (in (list (` (of random.functor (,' each) (|>> (//.covering (, module))) (, test))))))) diff --git a/stdlib/source/library/lux/world/console.lux b/stdlib/source/library/lux/world/console.lux index 4d3ba46d8..ca2224585 100644 --- a/stdlib/source/library/lux/world/console.lux +++ b/stdlib/source/library/lux/world/console.lux @@ -35,7 +35,7 @@ (`` (implementation (,, (with_template [<capability>] [(def <capability> - (|>> (at console <capability>) async.future))] + (|>> (of console <capability>) async.future))] [read] [read_line] @@ -86,7 +86,7 @@ (def (read _) (|> jvm_input java/io/InputStream::read - (at (try.with io.monad) each (|>> ffi.of_int .nat)))) + (of (try.with io.monad) each (|>> ffi.of_int .nat)))) (def (read_line _) (io#each (try#each (|>> ffi.of_string)) @@ -170,7 +170,7 @@ (def .public (write_line message console) (All (_ !) (-> Text (Console !) (! (Try Any)))) - (at console write (format message text.new_line))) + (of console write (format message text.new_line))) (type .public (Mock s) (Interface @@ -191,7 +191,7 @@ [(def (<method> _) (do [! io.monad] [|state| (atom.read! state)] - (when (at mock <mock> |state|) + (when (of mock <mock> |state|) {try.#Success [|state| output]} (do ! [_ (atom.write! |state| state)] @@ -207,7 +207,7 @@ (def (write input) (do [! io.monad] [|state| (atom.read! state)] - (when (at mock on_write input |state|) + (when (of mock on_write input |state|) {try.#Success |state|} (do ! [_ (atom.write! |state| state)] @@ -219,7 +219,7 @@ (def (close _) (do [! io.monad] [|state| (atom.read! state)] - (when (at mock on_close |state|) + (when (of 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 4c215de63..c55c16dfe 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 (,, (with_template [<name> <forge>] - [(def <name> (<forge> (|>> (!.use (at db <name>)) async.future)))] + [(def <name> (<forge> (|>> (!.use (of 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 (at db close) [])] + _ (!.use (of 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 (at db close) [])))] + _ (async#in (io.run! (!.use (of db close) [])))] (in result))) diff --git a/stdlib/source/library/lux/world/environment.lux b/stdlib/source/library/lux/world/environment.lux index 42f8e8805..9e6ff9657 100644 --- a/stdlib/source/library/lux/world/environment.lux +++ b/stdlib/source/library/lux/world/environment.lux @@ -57,9 +57,9 @@ (def .public (environment monad environment) (All (_ !) (-> (Monad !) (Environment !) (! \\parser.Environment))) (do [! monad] - [variables (at environment available_variables []) + [variables (of environment available_variables []) entries (monad.each ! (function (_ name) - (at ! each (|>> [name]) (at environment variable name))) + (of ! each (|>> [name]) (of environment variable name))) variables)] (in (|> entries (list.all (function (_ [name value]) @@ -76,7 +76,7 @@ (implementation (,, (with_template [<method>] [(def <method> - (at environment <method>))] + (of environment <method>))] [home] [directory] @@ -84,7 +84,7 @@ (,, (with_template [<method>] [(def <method> - (|>> (at environment <method>) async.future))] + (|>> (of environment <method>) async.future))] [available_variables] [variable] @@ -306,7 +306,7 @@ {.#None} (list)) (list))) - @.python (at io.monad each (array.list {.#None}) (os/environ::keys [])) + @.python (of 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/file.lux b/stdlib/source/library/lux/world/file.lux index b27ffa2bc..608d9689e 100644 --- a/stdlib/source/library/lux/world/file.lux +++ b/stdlib/source/library/lux/world/file.lux @@ -84,7 +84,7 @@ (def (un_rooted fs path) (All (_ !) (-> (System !) Path (Maybe [Path Text]))) - (let [/ (at fs separator)] + (let [/ (of fs separator)] (when (text.last_index / path) {.#None} {.#None} @@ -112,11 +112,11 @@ (-> (System IO) (System Async)) (`` (implementation (def separator - (at fs separator)) + (of fs separator)) (,, (with_template [<name>] [(def <name> - (|>> (at fs <name>) + (|>> (of fs <name>) async.future))] [file?] @@ -134,7 +134,7 @@ (,, (with_template [<name>] [(def (<name> path input) - (async.future (at fs <name> path input)))] + (async.future (of fs <name> path input)))] [modify] [write] @@ -144,7 +144,7 @@ (def .public (rooted fs parent child) (All (_ !) (-> (System !) Path Text Path)) - (format parent (at fs separator) child)) + (format parent (of fs separator) child)) (with_template [<name>] [(exception.def .public (<name> file) @@ -233,12 +233,12 @@ {.#Some children} (|> children (array.list {.#None}) - (monad.only ! (|>> <method> (at ! each (|>> ffi.of_boolean)))) - (at ! each (monad.each ! (|>> java/io/File::getAbsolutePath (at ! each (|>> ffi.of_string))))) - (at ! conjoint)) + (monad.only ! (|>> <method> (of ! each (|>> ffi.of_boolean)))) + (of ! each (monad.each ! (|>> java/io/File::getAbsolutePath (of ! each (|>> ffi.of_string))))) + (of ! conjoint)) {.#None} - (at io.monad in (exception.except ..cannot_find_directory [path])))))] + (of io.monad in (exception.except ..cannot_find_directory [path])))))] [directory_files java/io/File::isFile] [sub_directories java/io/File::isDirectory] @@ -248,13 +248,13 @@ (|>> ffi.as_string java/io/File::new java/io/File::length - (at (try.with io.monad) each (|>> ffi.of_long .nat)))) + (of (try.with io.monad) each (|>> ffi.of_long .nat)))) (def last_modified (|>> ffi.as_string java/io/File::new (java/io/File::lastModified) - (at (try.with io.monad) each (|>> ffi.of_long duration.of_millis instant.absolute)))) + (of (try.with io.monad) each (|>> ffi.of_long duration.of_millis instant.absolute)))) (def can_execute? (|>> ffi.as_string @@ -430,10 +430,10 @@ (array.list {.#None}) (list#each (|>> (format path js_separator))) (monad.each ! (function (_ sub) - (at ! each (|>> <method> [sub]) + (of ! each (|>> <method> [sub]) (with_async write! (Try Stats) (Fs::stat sub (..value_callback write!) node_fs))))) - (at ! each (|>> (list.only product.right) + (of ! each (|>> (list.only product.right) (list#each product.left))))))] [directory_files Stats::isFile] @@ -461,7 +461,7 @@ instant.absolute)))) (def (can_execute? path) - (at async.monad each + (of async.monad each (|>> (pipe.when {try.#Success _} true @@ -569,13 +569,13 @@ (let [! (try.with io.monad)] (|> path os::listdir - (at ! each (|>> (array.list {.#None}) + (of ! 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) + (of ! each (|>> [sub]) (<method> sub)))) + (of ! each (|>> (list.only product.right) (list#each product.left))))) - (at ! conjoint))))] + (of ! conjoint))))] [directory_files os/path::isfile] [sub_directories os/path::isdir] @@ -583,11 +583,11 @@ (def file_size (|>> os/path::getsize - (at (try.with io.monad) each (|>> .nat)))) + (of (try.with io.monad) each (|>> .nat)))) (def last_modified (|>> os/path::getmtime - (at (try.with io.monad) each (|>> f.int + (of (try.with io.monad) each (|>> f.int (i.* +1,000) duration.of_millis instant.absolute)))) @@ -723,7 +723,7 @@ [(def <name> (let [! (try.with io.monad)] (|>> RubyFile::stat - (at ! each (`` (|>> (,, (template.spliced <pipeline>))))))))] + (of ! each (`` (|>> (,, (template.spliced <pipeline>))))))))] [file_size [Stat::size .nat]] [last_modified [Stat::mtime @@ -827,7 +827,7 @@ ... (do [! (try.with io.monad)] ... [outcome (..file_put_contents [path ("php pack" ..byte_array_format data) <mode>])] ... (if (bit#= false (as Bit outcome)) - ... (at io.monad in (exception.except ..cannot_write_to_file [path])) + ... (of io.monad in (exception.except ..cannot_write_to_file [path])) ... (in []))))] ... [over_write +0] @@ -838,7 +838,7 @@ ... (do [! (try.with io.monad)] ... [data (..file_get_contents [path])] ... (if (bit#= false (as Bit data)) - ... (at io.monad in (exception.except ..cannot_find_file [path])) + ... (of io.monad in (exception.except ..cannot_find_file [path])) ... (in (..unpack [..byte_array_format data]))))) ... (def path @@ -849,7 +849,7 @@ ... (do [! (try.with io.monad)] ... [value (<ffi> [path])] ... (if (bit#= false (as Bit value)) - ... (at io.monad in (exception.except ..cannot_find_file [path])) + ... (of io.monad in (exception.except ..cannot_find_file [path])) ... (in (`` (|> value (,, (template.spliced <pipeline>))))))))] ... [size ..filesize [.nat]] @@ -863,21 +863,21 @@ ... (do [! (try.with io.monad)] ... [verdict (..touch [path (|> moment instant.relative duration.millis (i./ +1,000))])] ... (if (bit#= false (as Bit verdict)) - ... (at io.monad in (exception.except ..cannot_find_file [path])) + ... (of 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)) - ... (at io.monad in (exception.except ..cannot_find_file [path])) + ... (of 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)) - ... (at io.monad in (exception.except ..cannot_find_file [path])) + ... (of io.monad in (exception.except ..cannot_find_file [path])) ... (in [])))) ... ))) @@ -917,7 +917,7 @@ ... (do (try.with io.monad) ... [verdict (..rmdir [path])] ... (if (bit#= false (as Bit verdict)) - ... (at io.monad in (exception.except ..cannot_find_directory [path])) + ... (of io.monad in (exception.except ..cannot_find_directory [path])) ... (in [])))) ... ))) @@ -928,7 +928,7 @@ ... [(def (<name> path) ... (do [! (try.with io.monad)] ... [verdict (<test> path)] - ... (at io.monad in + ... (of io.monad in ... (if verdict ... {try.#Success (<constructor> path)} ... (exception.except <exception> [path])))))] @@ -940,7 +940,7 @@ ... (def (make_file path) ... (do [! (try.with io.monad)] ... [verdict (..touch [path (|> instant.now io.run! instant.relative duration.millis (i./ +1,000))])] - ... (at io.monad in + ... (of io.monad in ... (if verdict ... {try.#Success (..file path)} ... (exception.except ..cannot_make_file [path]))))) @@ -948,7 +948,7 @@ ... (def (make_directory path) ... (do [! (try.with io.monad)] ... [verdict (..mkdir path)] - ... (at io.monad in + ... (of io.monad in ... (if verdict ... {try.#Success (..directory path)} ... (exception.except ..cannot_make_directory [path]))))) @@ -963,10 +963,10 @@ (def .public (exists? monad fs path) (All (_ !) (-> (Monad !) (System !) Path (! Bit))) (do monad - [verdict (at fs file? path)] + [verdict (of fs file? path)] (if verdict (in verdict) - (at fs directory? path)))) + (of fs directory? path)))) (type Mock_File (Record @@ -1158,7 +1158,7 @@ [(def (<method> path) (|> store stm.read - (at stm.monad each + (of stm.monad each (|>> (<retrieve> separator path) (try#each (function.constant true)) (try.else false))) @@ -1264,7 +1264,7 @@ (do try.monad [[name file] (..retrieve_mock_file! separator path |store|)] (..update_mock_file! separator path now - (at binary.monoid composite + (of binary.monoid composite (the #mock_content file) content) |store|))) @@ -1290,26 +1290,26 @@ (def (check_or_make_directory monad fs path) (All (_ !) (-> (Monad !) (System !) Path (! (Try Any)))) (do monad - [? (at fs directory? path)] + [? (of fs directory? path)] (if ? (in {try.#Success []}) - (at fs make_directory path)))) + (of fs make_directory path)))) (def .public (make_directories monad fs path) (All (_ !) (-> (Monad !) (System !) Path (! (Try Any)))) - (let [rooted? (text.starts_with? (at fs separator) path) - segments (text.all_split_by (at fs separator) path)] + (let [rooted? (text.starts_with? (of fs separator) path) + segments (text.all_split_by (of fs separator) path)] (when (if rooted? (list.after 1 segments) segments) {.#End} - (at monad in (exception.except ..cannot_make_directory [path])) + (of monad in (exception.except ..cannot_make_directory [path])) {.#Item head tail} (when head - "" (at monad in (exception.except ..cannot_make_directory [path])) + "" (of monad in (exception.except ..cannot_make_directory [path])) _ (loop (again [current (if rooted? - (format (at fs separator) head) + (format (of fs separator) head) head) next tail]) (do monad @@ -1321,7 +1321,7 @@ (in {try.#Success []}) {.#Item head tail} - (again (format current (at fs separator) head) + (again (format current (of fs separator) head) tail)) {try.#Failure error} @@ -1330,13 +1330,13 @@ (def .public (make_file monad fs content path) (All (_ !) (-> (Monad !) (System !) Binary Path (! (Try Any)))) (do monad - [? (at fs file? path)] + [? (of fs file? path)] (if ? (in (exception.except ..cannot_make_file [path])) - (at fs write path content)))) + (of fs write path content)))) (def .public (copy monad fs from to) (All (_ !) (-> (Monad !) (System !) Path Path (! (Try Any)))) (do (try.with monad) - [data (at fs read from)] - (at fs write to data))) + [data (of fs read from)] + (of fs write to data))) diff --git a/stdlib/source/library/lux/world/file/watch.lux b/stdlib/source/library/lux/world/file/watch.lux index 22e4c7330..89abd42b1 100644 --- a/stdlib/source/library/lux/world/file/watch.lux +++ b/stdlib/source/library/lux/world/file/watch.lux @@ -127,11 +127,11 @@ (def (file_tracker fs directory) (-> (//.System Async) //.Path (Async (Try File_Tracker))) (do [! (try.with async.monad)] - [files (at fs directory_files directory)] + [files (of fs directory_files directory)] (monad.mix ! (function (_ file tracker) (do ! - [last_modified (at fs last_modified file)] + [last_modified (of fs last_modified file)] (in (dictionary.has file last_modified tracker)))) (is File_Tracker (dictionary.empty text.hash)) @@ -140,11 +140,11 @@ (def (available_files fs directory) (-> (//.System Async) //.Path (Async (Try (List [//.Path Instant])))) (do [! (try.with async.monad)] - [files (at fs directory_files directory)] + [files (of fs directory_files directory)] (monad.each ! (function (_ file) (|> file - (at fs last_modified) - (at ! each (|>> [file])))) + (of fs last_modified) + (of ! each (|>> [file])))) files))) (def (available_directory_changes fs [directory [the_concern file_tracker]]) @@ -195,7 +195,7 @@ (implementation (def (start new_concern path) (do [! async.monad] - [exists? (at fs directory? path)] + [exists? (of fs directory? path)] (if exists? (do ! [updated? (stm.commit! (..update_watch! new_concern path tracker))] @@ -340,7 +340,7 @@ (def default_key_concern (-> java/nio/file/WatchKey (IO Concern)) (|>> java/nio/file/WatchKey::pollEvents - (at io.monad each (|>> ..default_list + (of io.monad each (|>> ..default_list (list#each default_event_concern) (list#mix ..and ..none))))) diff --git a/stdlib/source/library/lux/world/locale.lux b/stdlib/source/library/lux/world/locale.lux index 72df452e4..b27f5be87 100644 --- a/stdlib/source/library/lux/world/locale.lux +++ b/stdlib/source/library/lux/world/locale.lux @@ -39,9 +39,9 @@ (def .public hash (Hash Locale) - (at hash.functor each ..code text.hash)) + (of hash.functor each ..code text.hash)) (def .public equivalence (Equivalence Locale) - (at ..hash equivalence)) + (of ..hash equivalence)) ) diff --git a/stdlib/source/library/lux/world/locale/language.lux b/stdlib/source/library/lux/world/locale/language.lux index ef62ab9a5..221818e6a 100644 --- a/stdlib/source/library/lux/world/locale/language.lux +++ b/stdlib/source/library/lux/world/locale/language.lux @@ -571,5 +571,5 @@ (def hash (|>> ..code - (at text.hash hash))))) + (of text.hash hash))))) ) diff --git a/stdlib/source/library/lux/world/locale/territory.lux b/stdlib/source/library/lux/world/locale/territory.lux index 5863a7e52..f98e2d07b 100644 --- a/stdlib/source/library/lux/world/locale/territory.lux +++ b/stdlib/source/library/lux/world/locale/territory.lux @@ -310,5 +310,5 @@ (def hash (|>> representation (the #long) - (at text.hash hash))))) + (of text.hash hash))))) ) diff --git a/stdlib/source/library/lux/world/logging.lux b/stdlib/source/library/lux/world/logging.lux index 6f58fd134..1baf1eedb 100644 --- a/stdlib/source/library/lux/world/logging.lux +++ b/stdlib/source/library/lux/world/logging.lux @@ -26,7 +26,7 @@ (All (_ !) (-> Text (Logger !) (! (Try Any)))) - (at it log (terminal.with <foreground> + (of it log (terminal.with <foreground> (%.format <prefix> message))))] ["[ERROR] " error terminal.red_foreground] @@ -42,7 +42,7 @@ (implementation (def log (|>> scope - (at it log))))) + (of it log))))) (def .public (timed ! now it) (All (_ !) @@ -52,7 +52,7 @@ (def (log message) (do ! [now (now [])] - (at it log (%.format (terminal.with terminal.green_foreground + (of it log (%.format (terminal.with terminal.green_foreground (%.format "[" (%.instant now) "]")) " " message)))))) diff --git a/stdlib/source/library/lux/world/money.lux b/stdlib/source/library/lux/world/money.lux index 33764e812..80c5f5d09 100644 --- a/stdlib/source/library/lux/world/money.lux +++ b/stdlib/source/library/lux/world/money.lux @@ -45,7 +45,7 @@ (def .public equivalence (All (_ of) (Equivalence (Money of))) - (at equivalence.functor each + (of equivalence.functor each (|>> nominal.representation) (all product.equivalence /.equivalence diff --git a/stdlib/source/library/lux/world/money/currency.lux b/stdlib/source/library/lux/world/money/currency.lux index 9b4abccda..7cefbb664 100644 --- a/stdlib/source/library/lux/world/money/currency.lux +++ b/stdlib/source/library/lux/world/money/currency.lux @@ -52,7 +52,7 @@ (def .public equivalence (Equivalence (Currency Any)) - (at equivalence.functor each + (of equivalence.functor each (|>> nominal.representation) (.all product.equivalence text.equivalence diff --git a/stdlib/source/library/lux/world/net/http/client.lux b/stdlib/source/library/lux/world/net/http/client.lux index 8ba9a1694..827fd4c72 100644 --- a/stdlib/source/library/lux/world/net/http/client.lux +++ b/stdlib/source/library/lux/world/net/http/client.lux @@ -48,7 +48,7 @@ (All (_ !) (-> URL Headers (Maybe Binary) (Client !) (! (Try (Response !))))) - (at client request {<method>} url headers data)))] + (of client request {<method>} url headers data)))] [//.#Post] [//.#Get] @@ -140,7 +140,7 @@ (loop (again [so_far +0]) (do [! (try.with io.monad)] [.let [remaining (i.- so_far (.int buffer_size))] - bytes_read (at ! each (|>> ffi.of_int) + bytes_read (of ! each (|>> ffi.of_int) (java/io/BufferedInputStream::read buffer (ffi.as_int so_far) (ffi.as_int remaining) input))] (when bytes_read -1 (do ! @@ -151,10 +151,10 @@ (in [buffer_size buffer]) (again (i.+ bytes_read so_far)))))) (loop (again [so_far +0 - output (at binary.monoid identity)]) + output (of binary.monoid identity)]) (do [! (try.with io.monad)] [.let [remaining (i.- so_far (.int buffer_size))] - bytes_read (at ! each (|>> ffi.of_int) + bytes_read (of ! each (|>> ffi.of_int) (java/io/BufferedInputStream::read buffer (ffi.as_int so_far) (ffi.as_int remaining) input))] (when bytes_read -1 (do ! @@ -163,14 +163,14 @@ +0 (in (..body_of output)) _ (|> buffer (binary.slice 0 (.nat so_far)) - (at try.functor each - (|>> (at binary.monoid composite output) + (of try.functor each + (|>> (of binary.monoid composite output) ..body_of)) - (at io.monad in)))) + (of io.monad in)))) +0 (again so_far output) _ (if (i.= remaining bytes_read) (again +0 - (at binary.monoid composite output buffer)) + (of binary.monoid composite output buffer)) (again (i.+ bytes_read so_far) output)))))))))) @@ -218,7 +218,7 @@ headers (..default_headers connection) input (|> connection java/net/URLConnection::getInputStream - (at ! each (|>> java/io/BufferedInputStream::new)))] + (of ! each (|>> java/io/BufferedInputStream::new)))] (in [(.nat (ffi.of_int status)) [//.#headers headers //.#body (..default_body input)]])))))))] @@ -231,9 +231,9 @@ (Client Async)) (implementation (def (request method url headers data) - (|> (at client request method url headers data) + (|> (of client request method url headers data) async.future - (at async.monad each + (of async.monad each (|>> (pipe.when {try.#Success [status message]} {try.#Success [status (revised //.#body (is (-> (//.Body IO) (//.Body Async)) diff --git a/stdlib/source/library/lux/world/net/http/header.lux b/stdlib/source/library/lux/world/net/http/header.lux index 61522e8a7..e081f136e 100644 --- a/stdlib/source/library/lux/world/net/http/header.lux +++ b/stdlib/source/library/lux/world/net/http/header.lux @@ -70,8 +70,8 @@ (def .public content_length (Header Nat) [#name "Content-Length" - #in (at nat.decimal encoded) - #out (at nat.decimal decoded)]) + #in (of nat.decimal encoded) + #out (of nat.decimal decoded)]) (def .public content_type (Header MIME) diff --git a/stdlib/source/library/lux/world/net/http/request.lux b/stdlib/source/library/lux/world/net/http/request.lux index 92f532ba3..4b0e333e4 100644 --- a/stdlib/source/library/lux/world/net/http/request.lux +++ b/stdlib/source/library/lux/world/net/http/request.lux @@ -48,7 +48,7 @@ (-> (Monad !) Binary (//.Body !))) (function (_ _) - (at ! in {try.#Success [(binary.size it) it]}))) + (of ! in {try.#Success [(binary.size it) it]}))) (def .public (utf8 ! it) (All (_ !) diff --git a/stdlib/source/library/lux/world/net/http/response.lux b/stdlib/source/library/lux/world/net/http/response.lux index 246e63723..1c8cef67c 100644 --- a/stdlib/source/library/lux/world/net/http/response.lux +++ b/stdlib/source/library/lux/world/net/http/response.lux @@ -37,7 +37,7 @@ (header.has header.content_length 0) (header.has header.content_type mime.utf_8)) //.#body (function (_ _) - (at ! in {try.#Success [0 (at utf8.codec encoded "")]}))]])) + (of ! in {try.#Success [0 (of utf8.codec encoded "")]}))]])) (def .public (temporary_redirect ! to) (All (_ !) @@ -63,13 +63,13 @@ (header.has header.content_length length) (header.has header.content_type type)) //.#body (function (_ _) - (at ! in {try.#Success [length data]}))]])) + (of ! in {try.#Success [length data]}))]])) (def .public (bad_request !) (All (_ !) (-> (Monad !) Text (Response !))) - (|>> (at utf8.codec encoded) + (|>> (of utf8.codec encoded) (content ! status.bad_request mime.utf_8))) (def .public (ok !) @@ -84,7 +84,7 @@ (-> (Monad !) <type> (Response !))) (|>> <pre> - (at utf8.codec encoded) + (of utf8.codec encoded) (..ok ! <mime>)))] [text Text mime.utf_8 (<|)] diff --git a/stdlib/source/library/lux/world/net/http/server.lux b/stdlib/source/library/lux/world/net/http/server.lux index a453c944b..ac99c4111 100644 --- a/stdlib/source/library/lux/world/net/http/server.lux +++ b/stdlib/source/library/lux/world/net/http/server.lux @@ -47,7 +47,7 @@ (function (_ ! request) (if (scheme#= <scheme> (the [request.#protocol request.#scheme] request)) (server ! request) - (at ! in (response.not_found !)))))] + (of ! in (response.not_found !)))))] [scheme.http http] [scheme.https https] @@ -64,7 +64,7 @@ (server ! request) _ - (at ! in (response.not_found !)))))] + (of ! in (response.not_found !)))))] [//.#Get get] [//.#Post post] @@ -87,7 +87,7 @@ (|>> (text.clip_since (text.size path)) maybe.trusted) request)) - (at ! in (response.not_found !))))) + (of ! in (response.not_found !))))) (def .public (or primary alternative) (All (_ !) @@ -106,7 +106,7 @@ (-> (Response !) (Server !))) (function (_ ! request) - (at ! in response))) + (of ! in response))) (def (body_text ! body) (All (_ !) @@ -142,7 +142,7 @@ (server input ! request) {try.#Failure error} - (at ! in (..failure !)))))) + (of ! in (..failure !)))))) (def .public (text server) (All (_ !) @@ -156,7 +156,7 @@ (server content ! request) {try.#Failure error} - (at ! in (..failure !)))))) + (of ! in (..failure !)))))) (def .public (form parser server) (All (_ ! of) @@ -173,7 +173,7 @@ (server input ! request) {try.#Failure error} - (at ! in (..failure !)))))) + (of ! in (..failure !)))))) (def .public (json parser server) (All (_ ! of) @@ -190,4 +190,4 @@ (server input ! request) {try.#Failure error} - (at ! in (..failure !)))))) + (of ! in (..failure !)))))) diff --git a/stdlib/source/library/lux/world/net/mime.lux b/stdlib/source/library/lux/world/net/mime.lux index ab8b54c29..5c827c530 100644 --- a/stdlib/source/library/lux/world/net/mime.lux +++ b/stdlib/source/library/lux/world/net/mime.lux @@ -25,11 +25,11 @@ (def .public equivalence (Equivalence MIME) - (at equivalence.functor each ..name text.equivalence)) + (of equivalence.functor each ..name text.equivalence)) (def .public hash (Hash MIME) - (at hash.functor each ..name text.hash)) + (of hash.functor each ..name text.hash)) ) ... https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Complete_list_of_MIME_types diff --git a/stdlib/source/library/lux/world/net/uri/encoding.lux b/stdlib/source/library/lux/world/net/uri/encoding.lux index 0c58f165d..7f36aa78d 100644 --- a/stdlib/source/library/lux/world/net/uri/encoding.lux +++ b/stdlib/source/library/lux/world/net/uri/encoding.lux @@ -97,7 +97,7 @@ (do try.monad [value (|> input (.text_clip# encoding_start 2) - (at nat.hex decoded)) + (of nat.hex decoded)) .let [index' (++ encoding_end)]] (again index' index' diff --git a/stdlib/source/library/lux/world/net/uri/query.lux b/stdlib/source/library/lux/world/net/uri/query.lux index 78ca893fe..5bfe26c2e 100644 --- a/stdlib/source/library/lux/world/net/uri/query.lux +++ b/stdlib/source/library/lux/world/net/uri/query.lux @@ -52,7 +52,7 @@ [_ (?text.this "%") code (|> (?text.exactly 2 ?text.hexadecimal) (?.codec nat.hex) - (at ! each text.of_char)) + (of ! each text.of_char)) tail component] (in (%.format head code tail)))))))) @@ -86,7 +86,7 @@ ?text.end)] (form (dictionary.has key "" query))))) ... if invalid form data, just stop parsing... - (at ?.monad in query))) + (of ?.monad in query))) (def format (%.Format Query) diff --git a/stdlib/source/library/lux/world/net/uri/scheme.lux b/stdlib/source/library/lux/world/net/uri/scheme.lux index 108254cc2..c89b41cfc 100644 --- a/stdlib/source/library/lux/world/net/uri/scheme.lux +++ b/stdlib/source/library/lux/world/net/uri/scheme.lux @@ -133,9 +133,9 @@ (def .public equivalence (Equivalence Scheme) - (at equivalence.functor each ..name text.equivalence)) + (of equivalence.functor each ..name text.equivalence)) (def .public hash (Hash Scheme) - (at hash.functor each ..name text.hash)) + (of hash.functor each ..name text.hash)) ) diff --git a/stdlib/source/library/lux/world/output/video/resolution.lux b/stdlib/source/library/lux/world/output/video/resolution.lux index 51cf3cb93..09538656d 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) - (at ..hash equivalence)) + (of ..hash equivalence)) ... https://en.wikipedia.org/wiki/Display_resolution#Common_display_resolutions (with_template [<name> <width> <height>] diff --git a/stdlib/source/library/lux/world/shell.lux b/stdlib/source/library/lux/world/shell.lux index 4101cb3c9..57535fb3b 100644 --- a/stdlib/source/library/lux/world/shell.lux +++ b/stdlib/source/library/lux/world/shell.lux @@ -64,7 +64,7 @@ (`` (implementation (,, (with_template [<method>] [(def <method> - (|>> (at process <method>) + (|>> (of process <method>) async.future))] [read] @@ -92,7 +92,7 @@ (def (execute input) (async.future (do (try.with io.monad) - [process (at shell execute input)] + [process (of shell execute input)] (in (..async_process process))))))) ... https://en.wikipedia.org/wiki/Code_injection#Shell_injection @@ -256,19 +256,19 @@ (in (ffi.of_string output)) {.#None} - (at io.monad in (exception.except ..no_more_output [])))))] + (of io.monad in (exception.except ..no_more_output [])))))] [read jvm_input] [fail jvm_error] )) (def (write message) - (java/io/OutputStream::write (at utf8.codec encoded message) jvm_output)) + (java/io/OutputStream::write (of utf8.codec encoded message) jvm_output)) (,, (with_template [<name> <method>] [(def (<name> _) (|> process <method>))] [destroy java/lang/Process::destroy] - [await (<| (at ! each (|>> ffi.of_int)) java/lang/Process::waitFor)] + [await (<| (of ! each (|>> ffi.of_int)) java/lang/Process::waitFor)] )))))))) (import java/io/File @@ -289,7 +289,7 @@ ... https://en.wikipedia.org/wiki/Code_injection#Shell_injection (def windows? (IO (Try Bit)) - (at (try.with io.monad) each + (of (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")))) @@ -304,8 +304,8 @@ (java/lang/ProcessBuilder::directory (java/io/File::new (ffi.as_string working_directory))))] _ (|> builder java/lang/ProcessBuilder::environment - (at try.functor each (..jvm::load_environment environment)) - (at io.monad in)) + (of try.functor each (..jvm::load_environment environment)) + (of io.monad in)) process (java/lang/ProcessBuilder::start builder)] (..default_process process))))) )] @@ -333,7 +333,7 @@ [(def (<name> _) (do [! io.monad] [|state| (atom.read! state)] - (when (at mock <mock> |state|) + (when (of mock <mock> |state|) {try.#Success [|state| output]} (do ! [_ (atom.write! |state| state)] @@ -349,7 +349,7 @@ (def (write message) (do [! io.monad] [|state| (atom.read! state)] - (when (at mock on_write message |state|) + (when (of mock on_write message |state|) {try.#Success |state|} (do ! [_ (atom.write! |state| state)] @@ -360,7 +360,7 @@ (def (destroy _) (do [! io.monad] [|state| (atom.read! state)] - (when (at mock on_destroy |state|) + (when (of mock on_destroy |state|) {try.#Success |state|} (do ! [_ (atom.write! |state| state)] @@ -378,5 +378,5 @@ (implementation (def execute (|>> mock - (at try.monad each (..mock_process (atom.atom init))) + (of try.monad each (..mock_process (atom.atom init))) io.io)))) diff --git a/stdlib/source/library/lux/world/time.lux b/stdlib/source/library/lux/world/time.lux index 0848dbbb8..c324966c5 100644 --- a/stdlib/source/library/lux/world/time.lux +++ b/stdlib/source/library/lux/world/time.lux @@ -56,7 +56,7 @@ (<>.either (|> (<text>.at_most 3 <text>.decimal) (<>.codec n.decimal) (<>.after (<text>.this "."))) - (at <>.monad in 0))) + (of <>.monad in 0))) (with_template [<maximum> <parser> <exception> <sub_parser>] [(exception.def .public (<exception> value) diff --git a/stdlib/source/library/lux/world/time/date.lux b/stdlib/source/library/lux/world/time/date.lux index efa497d60..cc05e8a8c 100644 --- a/stdlib/source/library/lux/world/time/date.lux +++ b/stdlib/source/library/lux/world/time/date.lux @@ -56,7 +56,7 @@ (list ["Value" (n#encoded day)] ["Minimum" (n#encoded ..minimum_day)] ["Maximum" (n#encoded (..month_days year month))] - ["Year" (at //year.codec encoded year)] + ["Year" (of //year.codec encoded year)] ["Month" (n#encoded (//month.number month))]))) (def (padded value) @@ -108,10 +108,10 @@ (def (= reference sample) (let [reference (representation reference) sample (representation sample)] - (and (at //year.equivalence = + (and (of //year.equivalence = (the #year reference) (the #year sample)) - (at //month.equivalence = + (of //month.equivalence = (the #month reference) (the #month sample)) (n.= (the #day reference) @@ -125,16 +125,16 @@ (def (< reference sample) (let [reference (representation reference) sample (representation sample)] - (or (at //year.order < + (or (of //year.order < (the #year reference) (the #year sample)) - (and (at //year.equivalence = + (and (of //year.equivalence = (the #year reference) (the #year sample)) - (or (at //month.order < + (or (of //month.order < (the #month reference) (the #month sample)) - (and (at //month.order = + (and (of //month.order = (the #month reference) (the #month sample)) (n.< (the #day reference) @@ -150,7 +150,7 @@ (<>.either (|> (<text>.at_most 3 <text>.decimal) (<>.codec n.decimal) (<>.after (<text>.this "."))) - (at <>.monad in 0))) + (of <>.monad in 0))) (with_template [<minimum> <maximum> <parser> <exception>] [(exception.def .public (<exception> value) @@ -186,7 +186,7 @@ (def (format value) (-> Date Text) (all text#composite - (at //year.codec encoded (..year value)) + (of //year.codec encoded (..year value)) ..separator (..padded (|> value ..month //month.number)) ..separator (..padded (..day_of_month value)))) diff --git a/stdlib/source/library/lux/world/time/day.lux b/stdlib/source/library/lux/world/time/day.lux index cda78a83f..1871c34fe 100644 --- a/stdlib/source/library/lux/world/time/day.lux +++ b/stdlib/source/library/lux/world/time/day.lux @@ -157,10 +157,10 @@ (exception.def .public (invalid_day number) (Exception Nat) (exception.report - (list ["Number" (at n.decimal encoded number)] - ["Valid range" (.text_composite# (at n.decimal encoded (..number {#Sunday})) + (list ["Number" (of n.decimal encoded number)] + ["Valid range" (.text_composite# (of n.decimal encoded (..number {#Sunday})) " ~ " - (at n.decimal encoded (..number {#Saturday})))]))) + (of n.decimal encoded (..number {#Saturday})))]))) (def .public (by_number number) (-> Nat (Try Day)) diff --git a/stdlib/source/library/lux/world/time/duration.lux b/stdlib/source/library/lux/world/time/duration.lux index fec1db917..ebf76fd4a 100644 --- a/stdlib/source/library/lux/world/time/duration.lux +++ b/stdlib/source/library/lux/world/time/duration.lux @@ -131,7 +131,7 @@ ) (def (encoded duration) - (if (at ..equivalence = ..empty duration) + (if (of ..equivalence = ..empty duration) (all text#composite ..positive_sign (nat#encoded 0) diff --git a/stdlib/source/library/lux/world/time/instant.lux b/stdlib/source/library/lux/world/time/instant.lux index eb50f13e5..b6a5589fa 100644 --- a/stdlib/source/library/lux/world/time/instant.lux +++ b/stdlib/source/library/lux/world/time/instant.lux @@ -18,7 +18,7 @@ ["<[1]>" \\parser (.only Parser)]]] [math [number - ["i" int] + ["i" int (.use "[1]#[0]" interval)] ["f" frac]]] [meta ["@" target] @@ -35,48 +35,59 @@ Int (def .public of_millis - (-> Int Instant) + (-> Int + Instant) (|>> abstraction)) (def .public millis - (-> Instant Int) + (-> Instant + Int) (|>> representation)) (def .public (span from to) - (-> Instant Instant Duration) + (-> Instant Instant + Duration) (duration.of_millis (i.- (representation from) (representation to)))) - (def .public (after duration instant) - (-> Duration Instant Instant) - (abstraction (i.+ (duration.millis duration) (representation instant)))) + (with_template [<*> <name>] + [(def .public (<name> duration instant) + (-> Duration Instant + Instant) + (abstraction (<*> (duration.millis duration) (representation instant))))] + + [i.- before] + [i.+ after] + ) (def .public (relative instant) - (-> Instant Duration) + (-> Instant + Duration) (|> instant representation duration.of_millis)) (def .public (absolute offset) - (-> Duration Instant) + (-> Duration + Instant) (|> offset duration.millis abstraction)) (def .public equivalence (Equivalence Instant) (implementation (def (= param subject) - (at i.equivalence = (representation param) (representation subject))))) + (of i.equivalence = (representation param) (representation subject))))) (def .public order (Order Instant) (implementation (def equivalence ..equivalence) (def (< param subject) - (at i.order < (representation param) (representation subject))))) + (of i.order < (representation param) (representation subject))))) (def .public hash (Hash Instant) (implementation (def equivalence ..equivalence) (def hash - (|>> representation (at i.hash hash))))) + (|>> representation (of i.hash hash))))) (`` (def .public enum (Enum Instant) @@ -84,7 +95,7 @@ (def order ..order) (,, (with_template [<name>] [(def <name> - (|>> representation (at i.enum <name>) abstraction))] + (|>> representation (of i.enum <name>) abstraction))] [succ] [pred] ))))) @@ -94,11 +105,21 @@ Instant (..of_millis +0)) +(with_template [<name> <value>] + [(def .public <name> + Instant + (..of_millis <value>))] + + [earliest i#bottom] + [latest i#top] + ) + (def millis_per_day (duration.ticks duration.milli_second duration.day)) (def (date_time instant) - (-> Instant [Date Duration]) + (-> Instant + [Date Duration]) (let [offset (..millis instant) bce? (i.< +0 offset) [days day_time] (if bce? @@ -111,15 +132,18 @@ (duration.of_millis day_time)])) (with_template [<value> <definition>] - [(def <definition> Text <value>)] + [(def <definition> + Text + <value>)] ["T" date_suffix] ["Z" time_suffix] ) (def (clock_time duration) - (-> Duration Time) - (|> (if (at duration.order < duration.empty duration) + (-> Duration + Time) + (|> (if (of duration.order < duration.empty duration) (duration.composite duration.day duration) duration) duration.millis @@ -128,19 +152,20 @@ try.trusted)) (def .public (format instant) - (-> Instant Text) + (-> Instant + Text) (let [[date time] (..date_time instant) time (..clock_time time)] (all text#composite - (at date.codec encoded date) ..date_suffix - (at //.codec encoded time) ..time_suffix))) + (of date.codec encoded date) ..date_suffix + (of //.codec encoded time) ..time_suffix))) (def .public parser (Parser Instant) (do [! <>.monad] - [days (at ! each date.days date.parser) + [days (of ! each date.days date.parser) _ (<text>.this ..date_suffix) - time (at ! each //.millis //.parser) + time (of ! each //.millis //.parser) _ (<text>.this ..time_suffix)] (in (|> (if (i.< +0 days) (|> duration.day @@ -198,7 +223,8 @@ (with_template [<field> <type> <post_processing>] [(def .public (<field> instant) - (-> Instant <type>) + (-> Instant + <type>) (let [[date time] (..date_time instant)] (|> <field> <post_processing>)))] @@ -207,7 +233,8 @@ ) (def .public (day_of_week instant) - (-> Instant Day) + (-> Instant + Day) (let [offset (..relative instant) days (duration.ticks duration.day offset) day_time (duration.framed duration.day offset) @@ -231,7 +258,8 @@ _ (undefined)))) (def .public (of_date_time date time) - (-> Date Time Instant) + (-> Date Time + Instant) (|> (date.days date) (i.* (duration.millis duration.day)) (i.+ (.int (//.millis time))) diff --git a/stdlib/source/library/lux/world/time/month.lux b/stdlib/source/library/lux/world/time/month.lux index b6fc1f8fa..025b38002 100644 --- a/stdlib/source/library/lux/world/time/month.lux +++ b/stdlib/source/library/lux/world/time/month.lux @@ -82,10 +82,10 @@ (exception.def .public (invalid_month number) (Exception Nat) (exception.report - (list ["Number" (at n.decimal encoded number)] - ["Valid range" (.text_composite# (at n.decimal encoded (..number {#January})) + (list ["Number" (of n.decimal encoded number)] + ["Valid range" (.text_composite# (of n.decimal encoded (..number {#January})) " ~ " - (at n.decimal encoded (..number {#December})))]))) + (of n.decimal encoded (..number {#December})))]))) (def .public (by_number number) (-> Nat (Try Month)) diff --git a/stdlib/source/library/lux/world/time/series.lux b/stdlib/source/library/lux/world/time/series.lux new file mode 100644 index 000000000..c529f6636 --- /dev/null +++ b/stdlib/source/library/lux/world/time/series.lux @@ -0,0 +1,124 @@ +(.require + [library + [lux (.except) + [abstract + [equivalence (.only Equivalence)] + [functor (.only Functor)] + [mix (.only Mix)]] + [control + ["[0]" try (.only Try)] + ["[0]" exception (.only Exception)]] + [data + [text + ["%" \\format]] + [collection + ["[0]" array (.only Array) (.use "[1]#[0]" functor mix) + ["/" \\unsafe]]]] + [meta + [type + ["[0]" nominal]]]]] + [// + ["[0]" instant (.only Instant) (.use "[1]#[0]" order)]]) + +(type .public (Event of) + (Record + [#when Instant + #what of])) + +(def (event_equivalence super) + (All (_ of) + (-> (Equivalence of) + (Equivalence (Event of)))) + (implementation + (def (= reference example) + (and (instant#= (the #when reference) (the #when example)) + (of super = (the #what reference) (the #what example)))))) + +(nominal.def .public (Series of) + (Array (Event of)) + + (def .public (equivalence super) + (All (_ of) + (-> (Equivalence of) + (Equivalence (Series of)))) + (implementation + (def (= reference example) + (of (array.equivalence (event_equivalence super)) = + (nominal.representation reference) + (nominal.representation example))))) + + (def .public functor + (Functor Series) + (implementation + (def (each $) + (|>> nominal.representation + (array#each (revised #what $)) + nominal.abstraction)))) + + (def .public mix + (Mix Series) + (implementation + (def (mix $ init) + (|>> nominal.representation + (array#mix (function (_ next it) + ($ (the #what next) it)) + init))))) + + (exception.def .public (disordered [before after]) + (Exception [Instant Instant]) + (exception.report + (list ["(Expected) before" (%.instant before)] + ["(Expected) after" (%.instant after)]))) + + (exception.def .public (duplicated it) + (Exception Instant) + (exception.report + (list ["Time-stamp" (%.instant it)]))) + + (def .public (series it) + (All (_ of) + (-> (List (Event of)) + (Try (Series of)))) + (when it + {.#Item head tail} + (loop (again [previous head + it tail]) + (when it + {.#Item current next} + (if (instant#< (the #when current) (the #when previous)) + (again current next) + (if (instant#= (the #when current) (the #when previous)) + (exception.except ..duplicated [(the #when current)]) + (exception.except ..disordered [(the #when previous) (the #when current)]))) + + {.#End} + {try.#Success (nominal.abstraction + (array.of_list it))})) + + {.#End} + {try.#Success (nominal.abstraction + (array.empty 0))})) + + (def .public size + (All (_ of) + (-> (Series of) + Nat)) + (|>> nominal.representation + /.size)) + + (exception.def .public empty) + + (with_template [<name> <index>] + [(def .public (<name> it) + (All (_ of) + (-> (Series of) + (Try (Event of)))) + (let [it (nominal.representation it)] + (when (array.size it) + 0 (exception.except ..empty []) + @ {try.#Success (/.item <index> it)})))] + + [earliest 0] + [latest (-- @)] + ) + ) diff --git a/stdlib/source/library/lux/world/time/solar.lux b/stdlib/source/library/lux/world/time/solar.lux index 26163e511..0cac56e36 100644 --- a/stdlib/source/library/lux/world/time/solar.lux +++ b/stdlib/source/library/lux/world/time/solar.lux @@ -165,11 +165,11 @@ [tz_now (|> (datetime/timedelta::new +0) datetime/timezone::new datetime/datetime::now - (at ! each datetime/datetime::astimezone)) + (of ! each datetime/datetime::astimezone)) offset (|> tz_now datetime/datetime::tzinfo datetime/datetime::now - (at ! each (|>> datetime/datetime::utcoffset + (of ! each (|>> datetime/datetime::utcoffset datetime/utcoffset::total_seconds f.int (i.* +1000) |