Commit c5461660 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

qjson: Give each of the six structural chars its own token type 



Simplifies things, because we always check for a specific one.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Message-Id: <1448486613-17634-6-git-send-email-armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
parent b8d3b1da

include/qapi/qmp/json-lexer.h

+6 −1
Original line number Diff line number Diff line
@@ -19,7 +19,12 @@ 


typedef enum json_token_type {

    JSON_MIN = 100,

    JSON_OPERATOR = JSON_MIN,

    JSON_LCURLY = JSON_MIN,

    JSON_RCURLY,

    JSON_LSQUARE,

    JSON_RSQUARE,

    JSON_COLON,

    JSON_COMMA,

    JSON_INTEGER,

    JSON_FLOAT,

    JSON_KEYWORD,

qobject/json-lexer.c

+12 −7
Original line number Diff line number Diff line
@@ -257,12 +257,12 @@ static const uint8_t json_lexer[][256] = { 
        ['0'] = IN_ZERO,

        ['1' ... '9'] = IN_NONZERO_NUMBER,

        ['-'] = IN_NEG_NONZERO_NUMBER,

        ['{'] = JSON_OPERATOR,

        ['}'] = JSON_OPERATOR,

        ['['] = JSON_OPERATOR,

        [']'] = JSON_OPERATOR,

        [','] = JSON_OPERATOR,

        [':'] = JSON_OPERATOR,

        ['{'] = JSON_LCURLY,

        ['}'] = JSON_RCURLY,

        ['['] = JSON_LSQUARE,

        [']'] = JSON_RSQUARE,

        [','] = JSON_COMMA,

        [':'] = JSON_COLON,

        ['a' ... 'z'] = IN_KEYWORD,

        ['%'] = IN_ESCAPE,

        [' '] = IN_WHITESPACE,
@@ -299,7 +299,12 @@ static int json_lexer_feed_char(JSONLexer *lexer, char ch, bool flush) 
        }



        switch (new_state) {

        case JSON_OPERATOR:

        case JSON_LCURLY:

        case JSON_RCURLY:

        case JSON_LSQUARE:

        case JSON_RSQUARE:

        case JSON_COLON:

        case JSON_COMMA:

        case JSON_ESCAPE:

        case JSON_INTEGER:

        case JSON_FLOAT:

qobject/json-parser.c

+9 −22
Original line number Diff line number Diff line
@@ -63,19 +63,6 @@ static JSONTokenType token_get_type(QObject *obj) 
    return qdict_get_int(qobject_to_qdict(obj), "type");

}



static int token_is_operator(QObject *obj, char op)

{

    const char *val;



    if (token_get_type(obj) != JSON_OPERATOR) {

        return 0;

    }



    val = token_get_value(obj);



    return (val[0] == op) && (val[1] == 0);

}



static int token_is_keyword(QObject *obj, const char *value)

{

    if (token_get_type(obj) != JSON_KEYWORD) {
@@ -384,7 +371,7 @@ static int parse_pair(JSONParserContext *ctxt, QDict *dict, va_list *ap) 
        goto out;

    }



    if (!token_is_operator(token, ':')) {

    if (token_get_type(token) != JSON_COLON) {

        parse_error(ctxt, token, "missing : in object pair");

        goto out;

    }
@@ -419,7 +406,7 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) 
        goto out;

    }



    if (!token_is_operator(token, '{')) {

    if (token_get_type(token) != JSON_LCURLY) {

        goto out;

    }
@@ -431,7 +418,7 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) 
        goto out;

    }



    if (!token_is_operator(peek, '}')) {

    if (token_get_type(peek) != JSON_RCURLY) {

        if (parse_pair(ctxt, dict, ap) == -1) {

            goto out;

        }
@@ -442,8 +429,8 @@ static QObject *parse_object(JSONParserContext *ctxt, va_list *ap) 
            goto out;

        }



        while (!token_is_operator(token, '}')) {

            if (!token_is_operator(token, ',')) {

        while (token_get_type(token) != JSON_RCURLY) {

            if (token_get_type(token) != JSON_COMMA) {

                parse_error(ctxt, token, "expected separator in dict");

                goto out;

            }
@@ -481,7 +468,7 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) 
        goto out;

    }



    if (!token_is_operator(token, '[')) {

    if (token_get_type(token) != JSON_LSQUARE) {

        goto out;

    }
@@ -493,7 +480,7 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) 
        goto out;

    }



    if (!token_is_operator(peek, ']')) {

    if (token_get_type(peek) != JSON_RSQUARE) {

        QObject *obj;



        obj = parse_value(ctxt, ap);
@@ -510,8 +497,8 @@ static QObject *parse_array(JSONParserContext *ctxt, va_list *ap) 
            goto out;

        }



        while (!token_is_operator(token, ']')) {

            if (!token_is_operator(token, ',')) {

        while (token_get_type(token) != JSON_RSQUARE) {

            if (token_get_type(token) != JSON_COMMA) {

                parse_error(ctxt, token, "expected separator in list");

                goto out;

            }

qobject/json-streamer.c

+15 −17
Original line number Diff line number Diff line
@@ -26,24 +26,22 @@ static void json_message_process_token(JSONLexer *lexer, QString *token, JSONTok 
    JSONMessageParser *parser = container_of(lexer, JSONMessageParser, lexer);

    QDict *dict;



    if (type == JSON_OPERATOR) {

        switch (qstring_get_str(token)[0]) {

        case '{':

    switch (type) {

    case JSON_LCURLY:

        parser->brace_count++;

        break;

        case '}':

    case JSON_RCURLY:

        parser->brace_count--;

        break;

        case '[':

    case JSON_LSQUARE:

        parser->bracket_count++;

        break;

        case ']':

    case JSON_RSQUARE:

        parser->bracket_count--;

        break;

    default:

        break;

    }

    }



    dict = qdict_new();

    qdict_put(dict, "type", qint_from_int(type));