From 98cd8c95c53d7865db469f742c541f274057770a Mon Sep 17 00:00:00 2001 From: murphy Date: Mon, 19 Oct 2009 17:23:27 +0000 Subject: Updated JSON scanner: false, null, true are highlighted as :value now. --- test/scanners/json/big.expected.raydebug | 92 ++++++++-------- test/scanners/json/big2.expected.raydebug | 150 +++++++++++++------------- test/scanners/json/json-lib.expected.raydebug | 12 +-- 3 files changed, 127 insertions(+), 127 deletions(-) (limited to 'test') diff --git a/test/scanners/json/big.expected.raydebug b/test/scanners/json/big.expected.raydebug index c72cb2b..757cd2e 100644 --- a/test/scanners/json/big.expected.raydebug +++ b/test/scanners/json/big.expected.raydebug @@ -2,13 +2,13 @@ operator([) operator({) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -17,14 +17,14 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(}) operator(]) operator(})operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -32,11 +32,11 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -44,14 +44,14 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(}) operator(]) operator(})operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -59,11 +59,11 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -71,14 +71,14 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(}) operator(]) operator(})operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -86,11 +86,11 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -98,7 +98,7 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -117,7 +117,7 @@ operator([) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -125,29 +125,29 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(}) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(true)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -156,14 +156,14 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(}) operator(]) operator(})operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -171,11 +171,11 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -183,14 +183,14 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(}) operator(]) operator(})operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -198,11 +198,11 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -210,14 +210,14 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(}) operator(]) operator(})operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -225,11 +225,11 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -237,14 +237,14 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(}) operator(]) operator(})operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -252,11 +252,11 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -264,14 +264,14 @@ operator([) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null) operator(}) operator(]) operator(})operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator({) @@ -279,17 +279,17 @@ operator([) keyoperator(:) operator([) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(}) operator(])operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(}) operator(]) \ No newline at end of file diff --git a/test/scanners/json/big2.expected.raydebug b/test/scanners/json/big2.expected.raydebug index 9014536..7ae81e8 100644 --- a/test/scanners/json/big2.expected.raydebug +++ b/test/scanners/json/big2.expected.raydebug @@ -30,59 +30,59 @@ operator({) operator(])operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) operator([) operator({) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(}) operator(])operator(,) - keyoperator(:) reserved(false) + keyoperator(:) value(false) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5217)operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5218)operator(,) - keyoperator(:) reserved(false) + keyoperator(:) value(false) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5219)operator(,) - keyoperator(:) reserved(false) + keyoperator(:) value(false) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(true)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5220)operator(,) - keyoperator(:) reserved(false) + keyoperator(:) value(false) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) @@ -95,41 +95,41 @@ operator({) keyoperator(:) stringoperator(,) keyoperator(:) string operator(})operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(}) operator(])operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) operator({) - keyoperator(:) reserved(null)operator(,) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(null)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:) integer(1)operator(,) keyoperator(:) operator([) string operator(])operator(,) - keyoperator(:) reserved(null)operator(,) - keyoperator(:) reserved(null) + keyoperator(:) value(null)operator(,) + keyoperator(:) value(null) operator(})operator(,) keyoperator(:) operator([) operator(])operator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator({) keyoperator(:) operator([) operator({) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(null)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) integer(582)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) string operator(}) operator(]) @@ -137,41 +137,41 @@ operator({) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5221)operator(,) - keyoperator(:) reserved(false) + keyoperator(:) value(false) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator({) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:) integer(0)operator(,) keyoperator(:) string operator(})operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5222)operator(,) keyoperator(:) operator([) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator(])operator(,) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:) operator({) - keyoperator(:) reserved(null)operator(,) - keyoperator(:) reserved(null)operator(,) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(null)operator(,) + keyoperator(:) value(null)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:) operator([) string operator(])operator(,) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:) string operator(})operator(,) keyoperator(:) operator([) @@ -181,41 +181,41 @@ operator({) keyoperator(:) string operator(}) operator(])operator(,) - keyoperator(:) reserved(true)operator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(true)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) operator({) keyoperator(:) operator([) operator({) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) string<)char(\\/)content(div>#005 Stressball)delimiter(")>operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(null)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) integer(627)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) string operator(})operator(,) operator({) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) string<)char(\\/)content(div>#011 Post-It Block)delimiter(")>operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(null)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(null)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) integer(628)operator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) string operator(}) operator(]) @@ -223,45 +223,45 @@ operator({) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5223)operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5224)operator(,) - keyoperator(:) reserved(false) + keyoperator(:) value(false) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator(])operator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5225)operator(,) - keyoperator(:) reserved(false) + keyoperator(:) value(false) operator(})operator(,) operator({) keyoperator(:) stringoperator(,) keyoperator(:) operator([) operator(])operator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(false)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(false)operator(,) keyoperator(:) stringoperator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) + keyoperator(:) value(true)operator(,) keyoperator(:) integer(5226)operator(,) - keyoperator(:) reserved(false) + keyoperator(:) value(false) operator(}) operator(])operator(,) - keyoperator(:) reserved(true) + keyoperator(:) value(true) operator(}) \ No newline at end of file diff --git a/test/scanners/json/json-lib.expected.raydebug b/test/scanners/json/json-lib.expected.raydebug index cb2b188..96236b8 100644 --- a/test/scanners/json/json-lib.expected.raydebug +++ b/test/scanners/json/json-lib.expected.raydebug @@ -4,9 +4,9 @@ operator([) operator({)operator(})operator(,) operator([)operator(])operator(,) integer(-42)operator(,) - reserved(true)operator(,) - reserved(false)operator(,) - reserved(null)operator(,) + value(true)operator(,) + value(false)operator(,) + value(null)operator(,) operator({) keyoperator(:) integer(1234567890)operator(,) keyoperator(:) float(-9876.543210)operator(,) @@ -25,9 +25,9 @@ operator([) keyoperator(:) stringoperator(,) keyoperator(:) string?)delimiter(")>operator(,) keyoperator(:) stringoperator(,) - keyoperator(:) reserved(true)operator(,) - keyoperator(:) reserved(false)operator(,) - keyoperator(:) reserved(null)operator(,) + keyoperator(:) value(true)operator(,) + keyoperator(:) value(false)operator(,) + keyoperator(:) value(null)operator(,) keyoperator(:)operator([) operator(])operator(,) keyoperator(:)operator({) operator(})operator(,) keyoperator(:) stringoperator(,) -- cgit v1.2.1