From 9d64d85cbd5a892368cd2c48147753e76ce13dc4 Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Wed, 14 Dec 2016 14:55:58 -0400 Subject: - Updated lux/pipe, lux/lexer and lux/regex tests. --- stdlib/source/lux/data/format/json.lux | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'stdlib/source/lux/data/format/json.lux') diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux index 280aab24b..e8189a594 100644 --- a/stdlib/source/lux/data/format/json.lux +++ b/stdlib/source/lux/data/format/json.lux @@ -217,19 +217,19 @@ (def: data-sep (Lexer [Text Char Text]) - ($_ lexer;seq space~ (lexer;this-char #",") space~)) + ($_ lexer;seq space~ (lexer;char #",") space~)) (def: null~ (Lexer Null) (do Monad - [_ (lexer;this "null")] + [_ (lexer;text "null")] (wrap []))) (do-template [ ] [(def: (Lexer Boolean) (do Monad - [_ (lexer;this )] + [_ (lexer;text )] (wrap )))] [t~ "true" true] @@ -244,12 +244,12 @@ (Lexer Number) (do Monad [?sign (: (Lexer (Maybe Text)) - (lexer;opt (lexer;this "-"))) + (lexer;opt (lexer;text "-"))) digits (: (Lexer Text) (lexer;many' lexer;digit)) ?decimals (: (Lexer (Maybe Text)) (lexer;opt (do @ - [_ (lexer;this ".")] + [_ (lexer;text ".")] (lexer;many' lexer;digit))))] (case (: (Error Real) (Real/decode (format (default "" ?sign) @@ -290,9 +290,9 @@ (def: string~ (Lexer String) (do Monad - [_ (lexer;this "\"") + [_ (lexer;text "\"") string-body string-body~ - _ (lexer;this "\"")] + _ (lexer;text "\"")] (wrap string-body))) (def: (kv~ json~) @@ -300,7 +300,7 @@ (do Monad [key string~ _ space~ - _ (lexer;this-char #":") + _ (lexer;char #":") _ space~ value (json~ [])] (wrap [key value]))) @@ -309,11 +309,11 @@ [(def: ( json~) (-> (-> Unit (Lexer JSON)) (Lexer )) (do Monad - [_ (lexer;this-char ) + [_ (lexer;char ) _ space~ elems (lexer;sep-by data-sep ) _ space~ - _ (lexer;this-char )] + _ (lexer;char )] (wrap ( elems))))] [array~ Array #"[" #"]" (json~ []) vector;from-list] -- cgit v1.2.3