diff options
Diffstat (limited to '')
10 files changed, 29 insertions, 29 deletions
diff --git a/stdlib/source/library/lux/control/parser.lux b/stdlib/source/library/lux/control/parser.lux index c842910c7..31fe9ad6a 100644 --- a/stdlib/source/library/lux/control/parser.lux +++ b/stdlib/source/library/lux/control/parser.lux @@ -96,7 +96,7 @@ (-> (Parser s a) (Parser s b) (Parser s [a b]))) (do [! ..monad] [head first] - (# ! each (|>> [head]) second))) + (at ! each (|>> [head]) second))) (def: .public (or left right) (All (_ s a b) @@ -134,8 +134,8 @@ {try.#Success [input (list)]} {try.#Success [input' head]} - (..result (# ..monad each (|>> (partial_list head)) - (some parser)) + (..result (at ..monad each (|>> (partial_list head)) + (some parser)) input')))) (def: .public (many parser) @@ -143,36 +143,36 @@ (-> (Parser s a) (Parser s (List a)))) (|> (..some parser) (..and parser) - (# ..monad each (|>> {.#Item})))) + (at ..monad each (|>> {.#Item})))) (def: .public (exactly amount parser) (All (_ s a) (-> Nat (Parser s a) (Parser s (List a)))) (case amount - 0 (# ..monad in (list)) + 0 (at ..monad in (list)) _ (do [! ..monad] [x parser] (|> parser (exactly (-- amount)) - (# ! each (|>> {.#Item x})))))) + (at ! each (|>> {.#Item x})))))) (def: .public (at_least amount parser) (All (_ s a) (-> Nat (Parser s a) (Parser s (List a)))) (do [! ..monad] [minimum (..exactly amount parser)] - (# ! each (list#composite minimum) (..some parser)))) + (at ! each (list#composite minimum) (..some parser)))) (def: .public (at_most amount parser) (All (_ s a) (-> Nat (Parser s a) (Parser s (List a)))) (case amount - 0 (# ..monad in (list)) + 0 (at ..monad in (list)) _ (function (_ input) (case (parser input) {try.#Failure msg} {try.#Success [input (list)]} {try.#Success [input' x]} - (..result (# ..monad each (|>> {.#Item x}) - (at_most (-- amount) parser)) + (..result (at ..monad each (|>> {.#Item x}) + (at_most (-- amount) parser)) input'))))) (def: .public (between minimum additional parser) @@ -181,8 +181,8 @@ [minimum (..exactly minimum parser)] (case additional 0 (in minimum) - _ (# ! each (list#composite minimum) - (..at_most additional parser))))) + _ (at ! each (list#composite minimum) + (..at_most additional parser))))) (def: .public (separated_by separator parser) (All (_ s a b) (-> (Parser s b) (Parser s a) (Parser s (List a)))) @@ -196,7 +196,7 @@ (|> parser (..and separator) ..some - (# ! each (|>> (list#each product.right) {.#Item x})))))) + (at ! each (|>> (list#each product.right) {.#Item x})))))) (def: .public (not parser) (All (_ s a) (-> (Parser s a) (Parser s Any))) @@ -301,7 +301,7 @@ {try.#Failure error} {try.#Success [input' to_decode]} - (case (# codec decoded to_decode) + (case (at codec decoded to_decode) {try.#Failure error} {try.#Failure error} diff --git a/stdlib/source/library/lux/control/parser/analysis.lux b/stdlib/source/library/lux/control/parser/analysis.lux index 60b8edb63..e23cc495e 100644 --- a/stdlib/source/library/lux/control/parser/analysis.lux +++ b/stdlib/source/library/lux/control/parser/analysis.lux @@ -104,7 +104,7 @@ (function (_ input) (case input (pattern (partial_list (<tag> actual) input')) - (if (# <eq> = expected actual) + (if (at <eq> = expected actual) {try.#Success [input' []]} (exception.except ..cannot_parse input)) diff --git a/stdlib/source/library/lux/control/parser/binary.lux b/stdlib/source/library/lux/control/parser/binary.lux index f9871b53b..36f70c1e0 100644 --- a/stdlib/source/library/lux/control/parser/binary.lux +++ b/stdlib/source/library/lux/control/parser/binary.lux @@ -137,7 +137,7 @@ (with_expansions [<case>+' (template.spliced <case>+)] (case flag (^.template [<number> <tag> <parser>] - [<number> (`` (# ! each (|>> {(~~ (template.spliced <tag>))}) <parser>))]) + [<number> (`` (at ! each (|>> {(~~ (template.spliced <tag>))}) <parser>))]) (<case>+') _ (//.lifted (exception.except ..invalid_tag [(template.amount [<case>+]) flag])))))]) @@ -203,7 +203,7 @@ (Parser Text) (do //.monad [utf8 <binary>] - (//.lifted (# utf8.codec decoded utf8)))))] + (//.lifted (at utf8.codec decoded utf8)))))] [08 utf8_8 ..binary_8] [16 utf8_16 ..binary_16] diff --git a/stdlib/source/library/lux/control/parser/code.lux b/stdlib/source/library/lux/control/parser/code.lux index 8ac364a2a..e2b1b9c9e 100644 --- a/stdlib/source/library/lux/control/parser/code.lux +++ b/stdlib/source/library/lux/control/parser/code.lux @@ -74,7 +74,7 @@ (function (_ tokens) (case tokens {.#Item [[_ {<tag> actual}] tokens']} - (if (# <eq> = expected actual) + (if (at <eq> = expected actual) {try.#Success [tokens' []]} <failure>) @@ -119,7 +119,7 @@ (function (_ tokens) (case tokens {.#Item [[_ {.#Symbol ["" actual]}] tokens']} - (if (# text.equivalence = expected actual) + (if (at text.equivalence = expected actual) {try.#Success [tokens' []]} <failure>) @@ -148,7 +148,7 @@ <failure> {.#Item [[_ {.#Symbol it}] tokens']} - (if (# symbol.equivalence = expected it) + (if (at symbol.equivalence = expected it) {try.#Success [tokens' []]} <failure>) diff --git a/stdlib/source/library/lux/control/parser/environment.lux b/stdlib/source/library/lux/control/parser/environment.lux index 484671355..03051bf2b 100644 --- a/stdlib/source/library/lux/control/parser/environment.lux +++ b/stdlib/source/library/lux/control/parser/environment.lux @@ -41,4 +41,4 @@ (def: .public (result parser environment) (All (_ a) (-> (Parser a) Environment (Try a))) - (# try.monad each product.right (parser environment))) + (at try.monad each product.right (parser environment))) diff --git a/stdlib/source/library/lux/control/parser/json.lux b/stdlib/source/library/lux/control/parser/json.lux index 61bad3146..1887b387b 100644 --- a/stdlib/source/library/lux/control/parser/json.lux +++ b/stdlib/source/library/lux/control/parser/json.lux @@ -90,7 +90,7 @@ [head ..any] (case head {<tag> value} - (in (# <equivalence> = test value)) + (in (at <equivalence> = test value)) _ (//.failure (exception.error ..unexpected_value [head]))))) @@ -101,7 +101,7 @@ [head ..any] (case head {<tag> value} - (if (# <equivalence> = test value) + (if (at <equivalence> = test value) (in []) (//.failure (exception.error ..value_mismatch [{<tag> test} {<tag> value}]))) diff --git a/stdlib/source/library/lux/control/parser/synthesis.lux b/stdlib/source/library/lux/control/parser/synthesis.lux index 47179c5d8..2fd9942fb 100644 --- a/stdlib/source/library/lux/control/parser/synthesis.lux +++ b/stdlib/source/library/lux/control/parser/synthesis.lux @@ -103,7 +103,7 @@ (.function (_ input) (case input (pattern (partial_list (<tag> actual) input')) - (if (# <eq> = expected actual) + (if (at <eq> = expected actual) {try.#Success [input' []]} (exception.except ..cannot_parse input)) diff --git a/stdlib/source/library/lux/control/parser/text.lux b/stdlib/source/library/lux/control/parser/text.lux index 4b8ab6e24..c03a62dae 100644 --- a/stdlib/source/library/lux/control/parser/text.lux +++ b/stdlib/source/library/lux/control/parser/text.lux @@ -331,7 +331,7 @@ (template [<name> <base> <doc_modifier>] [(def: .public (<name> parser) (-> (Parser Text) (Parser Text)) - (|> parser <base> (# //.monad each /.together)))] + (|> parser <base> (at //.monad each /.together)))] [some //.some "some"] [many //.many "many"] @@ -351,7 +351,7 @@ (-> Nat (Parser Text) (Parser Text)) (|> parser (<base> amount) - (# //.monad each /.together)))] + (at //.monad each /.together)))] [exactly //.exactly "exactly"] [at_most //.at_most "at most"] @@ -373,7 +373,7 @@ (-> Nat Nat (Parser Text) (Parser Text)) (|> parser (//.between minimum additional) - (# //.monad each /.together))) + (at //.monad each /.together))) (def: .public (between! minimum additional parser) (-> Nat Nat (Parser Slice) (Parser Slice)) diff --git a/stdlib/source/library/lux/control/parser/type.lux b/stdlib/source/library/lux/control/parser/type.lux index 944e687c7..4b2e9cd90 100644 --- a/stdlib/source/library/lux/control/parser/type.lux +++ b/stdlib/source/library/lux/control/parser/type.lux @@ -180,7 +180,7 @@ (All (_ a) (-> (Parser a) (Parser [Code (List Code) a]))) (do [! //.monad] [headT any - funcI (# ! each dictionary.size ..env) + funcI (at ! each dictionary.size ..env) [num_args non_poly] (local (list headT) ..polymorphic') env ..env .let [funcL (label funcI) diff --git a/stdlib/source/library/lux/control/parser/xml.lux b/stdlib/source/library/lux/control/parser/xml.lux index 6853965af..5f5c42d23 100644 --- a/stdlib/source/library/lux/control/parser/xml.lux +++ b/stdlib/source/library/lux/control/parser/xml.lux @@ -38,7 +38,7 @@ (exception: .public (unconsumed_inputs [inputs (List XML)]) (exception.report - "Inputs" (exception.listing (# /.codec encoded) inputs))) + "Inputs" (exception.listing (at /.codec encoded) inputs))) (def: (result' parser attrs documents) (All (_ a) (-> (Parser a) Attrs (List XML) (Try a))) |