diff options
Diffstat (limited to 'stdlib/source/library/lux/data/text/regex.lux')
-rw-r--r-- | stdlib/source/library/lux/data/text/regex.lux | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/stdlib/source/library/lux/data/text/regex.lux b/stdlib/source/library/lux/data/text/regex.lux index 795bee383..4998e9ce9 100644 --- a/stdlib/source/library/lux/data/text/regex.lux +++ b/stdlib/source/library/lux/data/text/regex.lux @@ -52,11 +52,9 @@ (-> Text (Parser Text)) (<>.after (<text>.this reference) (<>\in reference))) -(def: (join_text^ part^) +(def: join_text^ (-> (Parser (List Text)) (Parser Text)) - (do <>.monad - [parts part^] - (in (//.join_with "" parts)))) + (\ <>.monad map //.joined)) (def: name_char^ (Parser Text) @@ -87,9 +85,9 @@ (def: re_range^ (Parser Code) (do {! <>.monad} - [from (|> regex_char^ (\ ! map (|>> (//.char 0) maybe.assume))) + [from (|> regex_char^ (\ ! map (|>> (//.char 0) maybe.trusted))) _ (<text>.this "-") - to (|> regex_char^ (\ ! map (|>> (//.char 0) maybe.assume)))] + to (|> regex_char^ (\ ! map (|>> (//.char 0) maybe.trusted)))] (in (` ((~! <text>.range) (~ (code.nat from)) (~ (code.nat to))))))) (def: re_char^ |