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/macro/poly/json.lux | |
| parent | 22d10692d87ac1c07fc14f6100917b913bb0f8b3 (diff) | |
Re-named "seq" to "and" and "alt" to "or".
Diffstat (limited to 'stdlib/source/lux/macro/poly/json.lux')
| -rw-r--r-- | stdlib/source/lux/macro/poly/json.lux | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stdlib/source/lux/macro/poly/json.lux b/stdlib/source/lux/macro/poly/json.lux index 4217ce704..31ae2fdff 100644 --- a/stdlib/source/lux/macro/poly/json.lux +++ b/stdlib/source/lux/macro/poly/json.lux @@ -126,7 +126,7 @@ [#let [g!_ (code.local-identifier "_______") g!key (code.local-identifier "_______key") g!val (code.local-identifier "_______val")] - [_ _ =val=] (poly.apply ($_ p.seq + [_ _ =val=] (poly.apply ($_ p.and (poly.exactly d.Dictionary) (poly.exactly .Text) Codec<JSON,?>//encode))] @@ -137,13 +137,13 @@ (d.from-list text.Hash<Text>) #//.Object))))) (do @ - [[_ =sub=] (poly.apply ($_ p.seq + [[_ =sub=] (poly.apply ($_ p.and (poly.exactly .Maybe) Codec<JSON,?>//encode))] (wrap (` (: (~ (@JSON//encode inputT)) ((~! ..nullable) (~ =sub=)))))) (do @ - [[_ =sub=] (poly.apply ($_ p.seq + [[_ =sub=] (poly.apply ($_ p.and (poly.exactly .List) Codec<JSON,?>//encode))] (wrap (` (: (~ (@JSON//encode inputT)) @@ -239,26 +239,26 @@ (wrap (` (: (~ (@JSON//decode inputT)) (p.codec (~! Codec<JSON,Qty>) //.any))))) (do @ - [[_ _ valC] (poly.apply ($_ p.seq + [[_ _ valC] (poly.apply ($_ p.and (poly.exactly d.Dictionary) (poly.exactly .Text) Codec<JSON,?>//decode))] (wrap (` (: (~ (@JSON//decode inputT)) (//.object (~ valC)))))) (do @ - [[_ subC] (poly.apply (p.seq (poly.exactly .Maybe) + [[_ subC] (poly.apply (p.and (poly.exactly .Maybe) Codec<JSON,?>//decode))] (wrap (` (: (~ (@JSON//decode inputT)) (//.nullable (~ subC)))))) (do @ - [[_ subC] (poly.apply (p.seq (poly.exactly .List) + [[_ subC] (poly.apply (p.and (poly.exactly .List) Codec<JSON,?>//decode))] (wrap (` (: (~ (@JSON//decode inputT)) (//.array (p.some (~ subC))))))) (do @ [members (poly.variant (p.many Codec<JSON,?>//decode))] (wrap (` (: (~ (@JSON//decode inputT)) - ($_ p.alt + ($_ p.or (~+ (list/map (function (_ [tag memberC]) (` (|> (~ memberC) (p.after (//.number! (~ (code.frac (..tag tag))))) @@ -267,7 +267,7 @@ (do @ [g!decoders (poly.tuple (p.many Codec<JSON,?>//decode))] (wrap (` (: (~ (@JSON//decode inputT)) - (//.array ($_ p.seq (~+ g!decoders))))))) + (//.array ($_ p.and (~+ g!decoders))))))) ## Type recursion (do @ [[selfC bodyC] (poly.recursive Codec<JSON,?>//decode) @@ -278,7 +278,7 @@ poly.recursive-self ## Type applications (do @ - [[funcC argsC] (poly.apply (p.seq Codec<JSON,?>//decode (p.many Codec<JSON,?>//decode)))] + [[funcC argsC] (poly.apply (p.and Codec<JSON,?>//decode (p.many Codec<JSON,?>//decode)))] (wrap (` ((~ funcC) (~+ argsC))))) ## Polymorphism (do @ |