[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 2/7] qobject: Correct JSON lexer grammar comments
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 2/7] qobject: Correct JSON lexer grammar comments |
Date: |
Thu, 30 Jun 2016 15:42:46 +0200 |
From: Eric Blake <address@hidden>
Fix the regex comments describing what we parse as JSON. No change
to the lexer itself, just to the comments:
- The "" and '' string construction was missing alternation between
different escape sequences
- The construction for numbers forgot to handle optional leading '-'
- The construction for numbers was grouped incorrectly so that it
didn't permit '0.1'
- The construction for numbers forgot to mark the exponent as optional
- No mention that our '' string and "\'" are JSON extensions
- No mention of our %d and related extensions when constructing JSON
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Eric's regexp simplification squashed in]
Signed-off-by: Markus Armbruster <address@hidden>
---
qobject/json-lexer.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c
index 496374d..af4a75e 100644
--- a/qobject/json-lexer.c
+++ b/qobject/json-lexer.c
@@ -18,11 +18,20 @@
#define MAX_TOKEN_SIZE (64ULL << 20)
/*
- *
\"([^\\\"]|(\\\"\\'\\\\\\/\\b\\f\\n\\r\\t\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]))*\"
- *
'([^\\']|(\\\"\\'\\\\\\/\\b\\f\\n\\r\\t\\u[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]))*'
- * 0|([1-9][0-9]*(.[0-9]+)?([eE]([-+])?[0-9]+))
+ * Required by JSON (RFC 7159):
+ *
+ * \"([^\\\"]|\\[\"'\\/bfnrt]|\\u[0-9a-fA-F]{4})*\"
+ * -?(0|[1-9][0-9]*)(.[0-9]+)?([eE][-+]?[0-9]+)?
* [{}\[\],:]
- * [a-z]+
+ * [a-z]+ # covers null, true, false
+ *
+ * Extension of '' strings:
+ *
+ * '([^\\']|\\[\"'\\/bfnrt]|\\u[0-9a-fA-F]{4})*'
+ *
+ * Extension for vararg handling in JSON construction:
+ *
+ * %((l|ll|I64)?d|[ipsf])
*
*/
@@ -213,7 +222,7 @@ static const uint8_t json_lexer[][256] = {
['\t'] = IN_WHITESPACE,
['\r'] = IN_WHITESPACE,
['\n'] = IN_WHITESPACE,
- },
+ },
/* escape */
[IN_ESCAPE_LL] = {
--
2.5.5
- [Qemu-devel] [PULL v2 0/7] QAPI patches 2016-06-30, Markus Armbruster, 2016/06/30
- [Qemu-devel] [PULL v2 6/7] qapi: Simplify use of range.h, Markus Armbruster, 2016/06/30
- [Qemu-devel] [PULL v2 3/7] checkpatch: There is no qemu_strtod(), Markus Armbruster, 2016/06/30
- [Qemu-devel] [PULL v2 4/7] qapi: Fix crash on missing alternate member of QAPI struct, Markus Armbruster, 2016/06/30
- [Qemu-devel] [PULL v2 2/7] qobject: Correct JSON lexer grammar comments,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 5/7] range: Create range.c for code that should not be inline, Markus Armbruster, 2016/06/30
- [Qemu-devel] [PULL v2 1/7] json-streamer: Don't leak tokens on incomplete parse, Markus Armbruster, 2016/06/30
- [Qemu-devel] [PULL v2 7/7] qapi: Fix memleak in string visitors on int lists, Markus Armbruster, 2016/06/30