aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/lux/data/format/json.lux
diff options
context:
space:
mode:
authorEduardo Julian2017-04-05 18:05:23 -0400
committerEduardo Julian2017-04-05 18:05:23 -0400
commitadf8aeaa2a52760e294e08618e7aca5fc371fc0f (patch)
tree9247cd321dce5e2bae58d42f8ae08fe27a1a3224 /stdlib/source/lux/data/format/json.lux
parent6f87d469fa427dbaaaa13c0ef22626801f3f03e9 (diff)
- Moved lux/lexer and lux/lexer/regex to lux/data/text/lexer and lux/data/text/regex.
- Moved lux/pipe to lux/control/pipe. - Moved the @pre and @post macros to lux/control/contract. - Improved error reporting for lux/type/auto. - Added a test for third-order type-checking for lux/type/auto. - Fixed a bug in the tests for lux/data/coll/vector.
Diffstat (limited to 'stdlib/source/lux/data/format/json.lux')
-rw-r--r--stdlib/source/lux/data/format/json.lux3
1 files changed, 2 insertions, 1 deletions
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index 066777fdf..153920700 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -10,6 +10,7 @@
(data [bool]
[text "Text/" Eq<Text> Monoid<Text>]
text/format
+ (text [lexer #+ Lexer Monad<Lexer>])
[number #* "Real/" Codec<Text,Real>]
maybe
[char "Char/" Eq<Char> Codec<Text,Char>]
@@ -24,7 +25,7 @@
[ast]
[poly #+ poly:])
[type]
- [lexer #+ Lexer Monad<Lexer>]))
+ ))
## [Types]
(do-template [<name> <type>]