diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/library/lux/data/text/regex.lux | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/stdlib/source/library/lux/data/text/regex.lux b/stdlib/source/library/lux/data/text/regex.lux index 0e048bdcd..3ae94415b 100644 --- a/stdlib/source/library/lux/data/text/regex.lux +++ b/stdlib/source/library/lux/data/text/regex.lux @@ -81,7 +81,7 @@ (-> Text (Parser Code)) (do <>.monad [symbol (<text>.enclosed ["\@<" ">"] (symbol^ current_module))] - (in (` (: ((~! <text>.Parser) Text) (~ (code.symbol symbol))))))) + (in (` (is ((~! <text>.Parser) Text) (~ (code.symbol symbol))))))) (def: re_range^ (Parser Code) @@ -286,38 +286,38 @@ (re_scoped^ current_module))) .let [g!total (code.symbol ["" "0total"]) g!temp (code.symbol ["" "0temp"]) - [_ names steps] (list#mix (: (-> (Either Code [Re_Group Code]) - [Nat (List Code) (List (List Code))] - [Nat (List Code) (List (List Code))]) - (function (_ part [idx names steps]) - (case part - (^.or {.#Left complex} - {.#Right [{#Non_Capturing} complex]}) - [idx - names - (list& (list g!temp complex - (` .let) (` [(~ g!total) (# (~! //.monoid) (~' composite) (~ g!total) (~ g!temp))])) - steps)] - - {.#Right [{#Capturing [?name num_captures]} scoped]} - (let [[idx! name!] (case ?name - {.#Some _name} - [idx (code.symbol ["" _name])] - - {.#None} - [(++ idx) (code.symbol ["" (n#encoded idx)])]) - access (if (n.> 0 num_captures) - (` ((~! product.left) (~ name!))) - name!)] - [idx! - (list& name! names) - (list& (list name! scoped - (` .let) (` [(~ g!total) (# (~! //.monoid) (~' composite) (~ g!total) (~ access))])) - steps)]) - ))) + [_ names steps] (list#mix (is (-> (Either Code [Re_Group Code]) + [Nat (List Code) (List (List Code))] + [Nat (List Code) (List (List Code))]) + (function (_ part [idx names steps]) + (case part + (^.or {.#Left complex} + {.#Right [{#Non_Capturing} complex]}) + [idx + names + (list& (list g!temp complex + (` .let) (` [(~ g!total) (# (~! //.monoid) (~' composite) (~ g!total) (~ g!temp))])) + steps)] + + {.#Right [{#Capturing [?name num_captures]} scoped]} + (let [[idx! name!] (case ?name + {.#Some _name} + [idx (code.symbol ["" _name])] + + {.#None} + [(++ idx) (code.symbol ["" (n#encoded idx)])]) + access (if (n.> 0 num_captures) + (` ((~! product.left) (~ name!))) + name!)] + [idx! + (list& name! names) + (list& (list name! scoped + (` .let) (` [(~ g!total) (# (~! //.monoid) (~' composite) (~ g!total) (~ access))])) + steps)]) + ))) [0 - (: (List Code) (list)) - (: (List (List Code)) (list))] + (is (List Code) (list)) + (is (List (List Code)) (list))] parts)]] (in [(if capturing? (list.size names) |