Markus Armbruster 852dfa76b8 json: Clean up how lexer consumes "end of input" ... When the lexer isn't in its start state at the end of input, it's working on a token. To flush it out, it needs to transit to its start state on "end of input" lookahead. There are two ways to the start state, depending on the current state: * If the lexer is in a TERMINAL(JSON_FOO) state, it can emit a JSON_FOO token. * Else, it can go to IN_ERROR state, and emit a JSON_ERROR token. There are complications, however: * The transition to IN_ERROR state consumes the input character and adds it to the JSON_ERROR token. The latter is inappropriate for the "end of input" character, so we suppress that. See also recent commit a2ec6be72b "json: Fix lexer to include the bad character in JSON_ERROR token". * The transition to a TERMINAL(JSON_FOO) state doesn't consume the input character. In that case, the lexer normally loops until it is consumed. We have to suppress that for the "end of input" input character. If we didn't, the lexer would consume it by entering IN_ERROR state, emitting a bogus JSON_ERROR token. We fixed that in commit bd3924a33a. However, simply breaking the loop this way assumes that the lexer needs exactly one state transition to reach its start state. That assumption is correct now, but it's unclean, and I'll soon break it. Clean up: instead of breaking the loop after one iteration, break it after it reached the start state. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180831075841.13363-3-armbru@redhat.com>		2018-09-24 18:06:09 +02:00
..
block-qdict.c	qdict: Make qdict_extract_subqdict() accept dst = NULL	2018-08-15 12:50:39 +02:00
json-lexer.c	json: Clean up how lexer consumes "end of input"	2018-09-24 18:06:09 +02:00
json-parser-int.h	json: Clean up headers	2018-08-24 20:26:37 +02:00
json-parser.c	json: Update references to RFC 7159 to RFC 8259	2018-08-24 20:27:14 +02:00
json-streamer.c	json: Clean up headers	2018-08-24 20:26:37 +02:00
Makefile.objs	qobject: Move block-specific qdict code to block-qdict.c	2018-06-15 14:49:44 +02:00
qbool.c	qobject: Drop superfluous includes of qemu-common.h	2018-08-24 20:26:37 +02:00
qdict.c	qobject: Move block-specific qdict code to block-qdict.c	2018-06-15 14:49:44 +02:00
qjson.c	json: Clean up headers	2018-08-24 20:26:37 +02:00
qlist.c	qobject: Drop superfluous includes of qemu-common.h	2018-08-24 20:26:37 +02:00
qlit.c	qapi: Replace qobject_to_X(o) by qobject_to(X, o)	2018-03-19 14:58:36 -05:00
qnull.c	qobject: Drop superfluous includes of qemu-common.h	2018-08-24 20:26:37 +02:00
qnum.c	qobject: Drop superfluous includes of qemu-common.h	2018-08-24 20:26:37 +02:00
qobject.c	qobject: Drop superfluous includes of qemu-common.h	2018-08-24 20:26:37 +02:00
qstring.c	qobject: Drop superfluous includes of qemu-common.h	2018-08-24 20:26:37 +02:00