1e960b4602
The lexer ignores whitespace like this:
on whitespace on non-ws spontaneously
IN_START --> IN_WHITESPACE --> JSON_SKIP --> IN_START
^ |
\__/ on whitespace
This accumulates a whitespace token in state IN_WHITESPACE, only to
throw it away on the transition via JSON_SKIP to the start state.
Wasteful. Go from IN_START to IN_START on whitespace directly,
dropping the whitespace character.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180831075841.13363-7-armbru@redhat.com>
55 lines
1.3 KiB
C
55 lines
1.3 KiB
C
/*
|
|
* JSON Parser
|
|
*
|
|
* Copyright IBM, Corp. 2009
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef JSON_PARSER_INT_H
|
|
#define JSON_PARSER_INT_H
|
|
|
|
#include "qapi/qmp/json-parser.h"
|
|
|
|
typedef enum json_token_type {
|
|
JSON_ERROR = 0, /* must be zero, see json_lexer[] */
|
|
/* Gap for lexer states */
|
|
JSON_LCURLY = 100,
|
|
JSON_MIN = JSON_LCURLY,
|
|
JSON_RCURLY,
|
|
JSON_LSQUARE,
|
|
JSON_RSQUARE,
|
|
JSON_COLON,
|
|
JSON_COMMA,
|
|
JSON_INTEGER,
|
|
JSON_FLOAT,
|
|
JSON_KEYWORD,
|
|
JSON_STRING,
|
|
JSON_INTERP,
|
|
JSON_END_OF_INPUT,
|
|
JSON_MAX = JSON_END_OF_INPUT
|
|
} JSONTokenType;
|
|
|
|
typedef struct JSONToken JSONToken;
|
|
|
|
/* json-lexer.c */
|
|
void json_lexer_init(JSONLexer *lexer, bool enable_interpolation);
|
|
void json_lexer_feed(JSONLexer *lexer, const char *buffer, size_t size);
|
|
void json_lexer_flush(JSONLexer *lexer);
|
|
void json_lexer_destroy(JSONLexer *lexer);
|
|
|
|
/* json-streamer.c */
|
|
void json_message_process_token(JSONLexer *lexer, GString *input,
|
|
JSONTokenType type, int x, int y);
|
|
|
|
/* json-parser.c */
|
|
JSONToken *json_token(JSONTokenType type, int x, int y, GString *tokstr);
|
|
QObject *json_parser_parse(GQueue *tokens, va_list *ap, Error **errp);
|
|
|
|
#endif
|