diff options
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/library/lux/data/format/xml.lux | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux index 7dd861762..468100e5b 100644 --- a/stdlib/source/library/lux/data/format/xml.lux +++ b/stdlib/source/library/lux/data/format/xml.lux @@ -44,11 +44,11 @@ (def: xml_standard_escape_char^ (Parser Text) ($_ <>.either - (<>.after (<text>.this "<") (<>\wrap "<")) - (<>.after (<text>.this ">") (<>\wrap ">")) - (<>.after (<text>.this "&") (<>\wrap "&")) - (<>.after (<text>.this "'") (<>\wrap "'")) - (<>.after (<text>.this """) (<>\wrap text.double_quote)) + (<>.after (<text>.this "<") (<>\in "<")) + (<>.after (<text>.this ">") (<>\in ">")) + (<>.after (<text>.this "&") (<>\in "&")) + (<>.after (<text>.this "'") (<>\in "'")) + (<>.after (<text>.this """) (<>\in text.double_quote)) )) (def: xml_unicode_escape_char^ @@ -61,7 +61,7 @@ (#.Some _) (<>.codec int.decimal (<text>.many <text>.hexadecimal)))] - (wrap (|> code .nat text.of_code))) + (in (|> code .nat text.of_code))) (<>.before (<text>.this ";")) (<>.after (<text>.this "&#")))) @@ -82,7 +82,7 @@ <text>.alpha) tail (<text>.some (<>.either (<text>.one_of "_.-") <text>.alpha_num))] - (wrap ($_ text\compose head tail)))) + (in ($_ text\compose head tail)))) (def: namespaced_symbol^ (Parser Name) @@ -91,10 +91,10 @@ ?second_part (<| <>.maybe (<>.after (<text>.this ..namespace_separator)) xml_identifier)] (case ?second_part #.None - (wrap ["" first_part]) + (in ["" first_part]) (#.Some second_part) - (wrap [first_part second_part])))) + (in [first_part second_part])))) (def: tag^ namespaced_symbol^) (def: attr_name^ namespaced_symbol^) @@ -174,18 +174,18 @@ #let [no_children^ ($_ <>.either (do <>.monad [_ (<text>.this "/>")] - (wrap (#Node tag attrs (list)))) + (in (#Node tag attrs (list)))) (do <>.monad [_ (<text>.this ">") _ (<>.some (<>.either <text>.space ..comment^)) _ (..close_tag^ tag)] - (wrap (#Node tag attrs (list))))) + (in (#Node tag attrs (list))))) with_children^ (do <>.monad [_ (<text>.this ">") children (<>.many node^) _ (..close_tag^ tag)] - (wrap (#Node tag attrs children)))]] + (in (#Node tag attrs children)))]] ($_ <>.either no_children^ with_children^)) |