diff options
| author | Eduardo Julian | 2018-07-21 23:57:21 -0400 |
|---|---|---|
| committer | Eduardo Julian | 2018-07-21 23:57:21 -0400 |
| commit | 9671d6064dd02dfe6c32492f5b9907b096e5bd89 (patch) | |
| tree | db89e3908dedd606ce5838096bc5df9ebcc9b1c4 /stdlib/source/lux/data/format/json.lux | |
| parent | 22d10692d87ac1c07fc14f6100917b913bb0f8b3 (diff) | |
Re-named "seq" to "and" and "alt" to "or".
Diffstat (limited to '')
| -rw-r--r-- | stdlib/source/lux/data/format/json.lux | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux index 79510cb5c..02c05f5dd 100644 --- a/stdlib/source/lux/data/format/json.lux +++ b/stdlib/source/lux/data/format/json.lux @@ -284,8 +284,8 @@ (def: #export (nullable parser) (All [a] (-> (Reader a) (Reader (Maybe a)))) - (p.alt null - parser)) + (p.or null + parser)) (def: #export (array parser) {#.doc "Parses a JSON array, assuming that every element can be parsed the same way."} @@ -405,7 +405,7 @@ (def: data-sep (l.Lexer [Text Any Text]) - ($_ p.seq space~ (l.this ",") space~)) + ($_ p.and space~ (l.this ",") space~)) (def: null~ (l.Lexer Null) @@ -502,7 +502,7 @@ (def: (json~' _) (-> Any (l.Lexer JSON)) - ($_ p.alt null~ boolean~ number~ string~ (array~ json~') (object~ json~'))) + ($_ p.or null~ boolean~ number~ string~ (array~ json~') (object~ json~'))) (structure: #export _ (Codec Text JSON) (def: encode show-json) |