ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

json: Improve names of lexer states related to numbers 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-43-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-08-23 18:40:09 +02:00
parent 53a0d616fe
commit 4d40066142
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
qobject/json-lexer.c
View File

@ -108,13 +108,13 @@ enum json_lexer_state {
IN_SQ_STRING_ESCAPE, IN_SQ_STRING_ESCAPE,
IN_SQ_STRING, IN_SQ_STRING,
IN_ZERO, IN_ZERO,
IN_DIGITS, IN_EXP_DIGITS,
IN_DIGIT, IN_EXP_SIGN,
IN_EXP_E, IN_EXP_E,
IN_MANTISSA, IN_MANTISSA,
IN_MANTISSA_DIGITS, IN_MANTISSA_DIGITS,
IN_NONZERO_NUMBER, IN_DIGITS,
IN_NEG_NONZERO_NUMBER, IN_SIGN,
IN_KEYWORD, IN_KEYWORD,
IN_INTERP, IN_INTERP,
IN_WHITESPACE, IN_WHITESPACE,
@ -164,19 +164,19 @@ static const uint8_t json_lexer[][256] = {
}, },
/* Float */ /* Float */
[IN_DIGITS] = { [IN_EXP_DIGITS] = {
TERMINAL(JSON_FLOAT), TERMINAL(JSON_FLOAT),
['0' ... '9'] = IN_DIGITS, ['0' ... '9'] = IN_EXP_DIGITS,
}, },
[IN_DIGIT] = { [IN_EXP_SIGN] = {
['0' ... '9'] = IN_DIGITS, ['0' ... '9'] = IN_EXP_DIGITS,
}, },
[IN_EXP_E] = { [IN_EXP_E] = {
['-'] = IN_DIGIT, ['-'] = IN_EXP_SIGN,
['+'] = IN_DIGIT, ['+'] = IN_EXP_SIGN,
['0' ... '9'] = IN_DIGITS, ['0' ... '9'] = IN_EXP_DIGITS,
}, },
[IN_MANTISSA_DIGITS] = { [IN_MANTISSA_DIGITS] = {
@ -191,17 +191,17 @@ static const uint8_t json_lexer[][256] = {
}, },
/* Number */ /* Number */
[IN_NONZERO_NUMBER] = { [IN_DIGITS] = {
TERMINAL(JSON_INTEGER), TERMINAL(JSON_INTEGER),
['0' ... '9'] = IN_NONZERO_NUMBER, ['0' ... '9'] = IN_DIGITS,
['e'] = IN_EXP_E, ['e'] = IN_EXP_E,
['E'] = IN_EXP_E, ['E'] = IN_EXP_E,
['.'] = IN_MANTISSA, ['.'] = IN_MANTISSA,
}, },
[IN_NEG_NONZERO_NUMBER] = { [IN_SIGN] = {
['0'] = IN_ZERO, ['0'] = IN_ZERO,
['1' ... '9'] = IN_NONZERO_NUMBER, ['1' ... '9'] = IN_DIGITS,
}, },
/* keywords */ /* keywords */
@ -236,8 +236,8 @@ static const uint8_t json_lexer[][256] = {
['"'] = IN_DQ_STRING, ['"'] = IN_DQ_STRING,
['\''] = IN_SQ_STRING, ['\''] = IN_SQ_STRING,
['0'] = IN_ZERO, ['0'] = IN_ZERO,
['1' ... '9'] = IN_NONZERO_NUMBER, ['1' ... '9'] = IN_DIGITS,
['-'] = IN_NEG_NONZERO_NUMBER, ['-'] = IN_SIGN,
['{'] = JSON_LCURLY, ['{'] = JSON_LCURLY,
['}'] = JSON_RCURLY, ['}'] = JSON_RCURLY,
['['] = JSON_LSQUARE, ['['] = JSON_LSQUARE,