From nobody Wed Nov 5 10:30:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535043292007173.30206488849626; Thu, 23 Aug 2018 09:54:52 -0700 (PDT) Received: from localhost ([::1]:37760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsssk-000086-RC for importer@patchew.org; Thu, 23 Aug 2018 12:54:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fssgG-0003T9-CA for qemu-devel@nongnu.org; Thu, 23 Aug 2018 12:41:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fssew-0003cp-5y for qemu-devel@nongnu.org; Thu, 23 Aug 2018 12:40:37 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:40770 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fssev-0003bX-MD for qemu-devel@nongnu.org; Thu, 23 Aug 2018 12:40:33 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E23F32637B; Thu, 23 Aug 2018 16:40:32 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-97.ams2.redhat.com [10.36.116.97]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9E2B12027047; Thu, 23 Aug 2018 16:40:32 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3862D110E655; Thu, 23 Aug 2018 18:40:26 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 23 Aug 2018 18:40:04 +0200 Message-Id: <20180823164025.12553-38-armbru@redhat.com> In-Reply-To: <20180823164025.12553-1-armbru@redhat.com> References: <20180823164025.12553-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 23 Aug 2018 16:40:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 23 Aug 2018 16:40:32 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 37/58] json: Rename token JSON_ESCAPE & friends to JSON_INTERP X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Eric Blake --- include/qapi/qmp/json-lexer.h | 2 +- qobject/json-lexer.c | 64 +++++++++++++++++------------------ qobject/json-parser.c | 8 ++--- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/include/qapi/qmp/json-lexer.h b/include/qapi/qmp/json-lexer.h index 44bcf2ca64..8bce6ef676 100644 --- a/include/qapi/qmp/json-lexer.h +++ b/include/qapi/qmp/json-lexer.h @@ -27,7 +27,7 @@ typedef enum json_token_type { JSON_FLOAT, JSON_KEYWORD, JSON_STRING, - JSON_ESCAPE, + JSON_INTERP, JSON_SKIP, JSON_ERROR, } JSONTokenType; diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c index 17272a3874..5436809be6 100644 --- a/qobject/json-lexer.c +++ b/qobject/json-lexer.c @@ -115,12 +115,12 @@ enum json_lexer_state { IN_NONZERO_NUMBER, IN_NEG_NONZERO_NUMBER, IN_KEYWORD, - IN_ESCAPE, - IN_ESCAPE_L, - IN_ESCAPE_LL, - IN_ESCAPE_I, - IN_ESCAPE_I6, - IN_ESCAPE_I64, + IN_INTERP, + IN_INTERP_L, + IN_INTERP_LL, + IN_INTERP_I, + IN_INTERP_I6, + IN_INTERP_I64, IN_WHITESPACE, IN_START, }; @@ -221,40 +221,40 @@ static const uint8_t json_lexer[][256] =3D { ['\n'] =3D IN_WHITESPACE, }, =20 - /* escape */ - [IN_ESCAPE_LL] =3D { - ['d'] =3D JSON_ESCAPE, - ['u'] =3D JSON_ESCAPE, + /* interpolation */ + [IN_INTERP_LL] =3D { + ['d'] =3D JSON_INTERP, + ['u'] =3D JSON_INTERP, }, =20 - [IN_ESCAPE_L] =3D { - ['d'] =3D JSON_ESCAPE, - ['l'] =3D IN_ESCAPE_LL, - ['u'] =3D JSON_ESCAPE, + [IN_INTERP_L] =3D { + ['d'] =3D JSON_INTERP, + ['l'] =3D IN_INTERP_LL, + ['u'] =3D JSON_INTERP, }, =20 - [IN_ESCAPE_I64] =3D { - ['d'] =3D JSON_ESCAPE, - ['u'] =3D JSON_ESCAPE, + [IN_INTERP_I64] =3D { + ['d'] =3D JSON_INTERP, + ['u'] =3D JSON_INTERP, }, =20 - [IN_ESCAPE_I6] =3D { - ['4'] =3D IN_ESCAPE_I64, + [IN_INTERP_I6] =3D { + ['4'] =3D IN_INTERP_I64, }, =20 - [IN_ESCAPE_I] =3D { - ['6'] =3D IN_ESCAPE_I6, + [IN_INTERP_I] =3D { + ['6'] =3D IN_INTERP_I6, }, =20 - [IN_ESCAPE] =3D { - ['d'] =3D JSON_ESCAPE, - ['i'] =3D JSON_ESCAPE, - ['p'] =3D JSON_ESCAPE, - ['s'] =3D JSON_ESCAPE, - ['u'] =3D JSON_ESCAPE, - ['f'] =3D JSON_ESCAPE, - ['l'] =3D IN_ESCAPE_L, - ['I'] =3D IN_ESCAPE_I, + [IN_INTERP] =3D { + ['d'] =3D JSON_INTERP, + ['i'] =3D JSON_INTERP, + ['p'] =3D JSON_INTERP, + ['s'] =3D JSON_INTERP, + ['u'] =3D JSON_INTERP, + ['f'] =3D JSON_INTERP, + ['l'] =3D IN_INTERP_L, + ['I'] =3D IN_INTERP_I, }, =20 /* top level rule */ @@ -271,7 +271,7 @@ static const uint8_t json_lexer[][256] =3D { [','] =3D JSON_COMMA, [':'] =3D JSON_COLON, ['a' ... 'z'] =3D IN_KEYWORD, - ['%'] =3D IN_ESCAPE, + ['%'] =3D IN_INTERP, [' '] =3D IN_WHITESPACE, ['\t'] =3D IN_WHITESPACE, ['\r'] =3D IN_WHITESPACE, @@ -311,7 +311,7 @@ static void json_lexer_feed_char(JSONLexer *lexer, char= ch, bool flush) case JSON_RSQUARE: case JSON_COLON: case JSON_COMMA: - case JSON_ESCAPE: + case JSON_INTERP: case JSON_INTEGER: case JSON_FLOAT: case JSON_KEYWORD: diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 06aff19a5d..864cb578d8 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -423,7 +423,7 @@ static QObject *parse_keyword(JSONParserContext *ctxt) return NULL; } =20 -static QObject *parse_escape(JSONParserContext *ctxt, va_list *ap) +static QObject *parse_interpolation(JSONParserContext *ctxt, va_list *ap) { JSONToken *token; =20 @@ -432,7 +432,7 @@ static QObject *parse_escape(JSONParserContext *ctxt, v= a_list *ap) } =20 token =3D parser_context_pop_token(ctxt); - assert(token && token->type =3D=3D JSON_ESCAPE); + assert(token && token->type =3D=3D JSON_INTERP); =20 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: --=20 2.17.1