motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

json: Rename token JSON_ESCAPE & friends to JSON_INTERP

Browse source 
The JSON parser optionally supports interpolation.  The code calls it
"escape".  Awkward, because it uses the same term for escape sequences
within strings.  The latter usage is consistent with RFC 8259 "The
JavaScript Object Notation (JSON) Data Interchange Format" and ISO C.
Call the former "interpolation" instead.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20180823164025.12553-38-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2018-08-23 18:40:04 +02:00
parent 269e57ae28
commit 61030280ca
3 changed files with 37 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

8
qobject/json-parser.c
View file

@ -423,7 +423,7 @@ static QObject *parse_keyword(JSONParserContext *ctxt)
return NULL;
}
static QObject *parse_escape(JSONParserContext *ctxt, va_list *ap)
static QObject *parse_interpolation(JSONParserContext *ctxt, va_list *ap)
{
JSONToken *token;
@ -432,7 +432,7 @@ static QObject *parse_escape(JSONParserContext *ctxt, va_list *ap)
}
token = parser_context_pop_token(ctxt);
assert(token && token->type == JSON_ESCAPE);
assert(token && token->type == JSON_INTERP);
if (!strcmp(token->str, "%p")) {
return va_arg(*ap, QObject *);
@ -527,8 +527,8 @@ static QObject *parse_value(JSONParserContext *ctxt, va_list *ap)
return parse_object(ctxt, ap);
case JSON_LSQUARE:
return parse_array(ctxt, ap);
case JSON_ESCAPE:
return parse_escape(ctxt, ap);
case JSON_INTERP:
return parse_interpolation(ctxt, ap);
case JSON_INTEGER:
case JSON_FLOAT:
case JSON_STRING: