diff options
author | Eduardo Julian | 2017-05-09 17:49:03 -0400 |
---|---|---|
committer | Eduardo Julian | 2017-05-09 17:49:03 -0400 |
commit | fb031d2157cfbebe359ab58db02de363b96fe909 (patch) | |
tree | e0cff590966865d09f8462d64adbe4d64eee8c13 /stdlib/source/lux/data/format/json.lux | |
parent | dd5220e13b03c8f85972feac535a34ef64525222 (diff) |
- Small fixes and refactorings.
Diffstat (limited to 'stdlib/source/lux/data/format/json.lux')
-rw-r--r-- | stdlib/source/lux/data/format/json.lux | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux index 863c8cd3e..b75b9dbf7 100644 --- a/stdlib/source/lux/data/format/json.lux +++ b/stdlib/source/lux/data/format/json.lux @@ -787,7 +787,7 @@ <basic> (with-gensyms [g!type-fun g!case g!input g!key g!val] (do @ - [:sub: (poly;list :x:) + [:sub: (poly;apply-1 (ident-for ;List) :x:) [g!vars members] (poly;tuple :sub:) :val: (case members (^ (list :key: :val:)) @@ -821,12 +821,12 @@ ))) )) (do @ - [:sub: (poly;maybe :x:) + [:sub: (poly;apply-1 (ident-for ;Maybe) :x:) .sub. (Codec<JSON,?>//encode *env* :sub:)] (wrap (` (: (~ (->Codec//encode (type;to-ast :x:))) (;;gen-nullable (~ .sub.)))))) (do @ - [:sub: (poly;list :x:) + [:sub: (poly;apply-1 (ident-for ;List) :x:) .sub. (Codec<JSON,?>//encode *env* :sub:)] (wrap (` (: (~ (->Codec//encode (type;to-ast :x:))) (|>. (_map_ (~ .sub.)) vector;from-list ;;gen-array))))) @@ -942,13 +942,13 @@ (wrap (` (: (~ (->Codec//decode (type;to-ast :x:))) (<decoder> (~ .sub.))))))] - [Maybe poly;maybe ;;nullable] - [List poly;list ;;array])] + [Maybe (poly;apply-1 (ident-for ;Maybe)) ;;nullable] + [List (poly;apply-1 (ident-for ;List)) ;;array])] ($_ macro;either <basic> (with-gensyms [g!type-fun g!case g!input g!key g!val] (do @ - [:sub: (poly;list :x:) + [:sub: (poly;apply-1 (ident-for ;List) :x:) [g!vars members] (poly;tuple :sub:) :val: (case members (^ (list :key: :val:)) @@ -1046,8 +1046,8 @@ (do Monad<Error> [(~@ (List/join extraction))] ((~ (' wrap)) (~ (code;record (List/map (function [[name :slot:]] - [(code;tag name) (code;symbol ["" (product;right name)])]) - members)))))) + [(code;tag name) (code;symbol ["" (product;right name)])]) + members)))))) ))))) (with-gensyms [g!type-fun g!case g!input] (do @ |