From nobody Wed Nov 5 13:00:25 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 1534521906342358.2817119188694; Fri, 17 Aug 2018 09:05:06 -0700 (PDT) Received: from localhost ([::1]:35001 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqhFJ-0007Wn-7S for importer@patchew.org; Fri, 17 Aug 2018 12:05:05 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50256) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgSG-00051R-Pa for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:14:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqgSF-0008Pw-LH for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:14:24 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46756 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 1fqgSF-0008Nq-7C for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:14:23 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C7D0B818F6E3; Fri, 17 Aug 2018 15:14:22 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-56.ams2.redhat.com [10.36.116.56]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9FE3E1687B; Fri, 17 Aug 2018 15:14:22 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id DCF641171DCB; Fri, 17 Aug 2018 17:06:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 17 Aug 2018 17:05:50 +0200 Message-Id: <20180817150559.16243-52-armbru@redhat.com> In-Reply-To: <20180817150559.16243-1-armbru@redhat.com> References: <20180817150559.16243-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 17 Aug 2018 15:14:22 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Fri, 17 Aug 2018 15:14:22 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.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 v2 51/60] json: Eliminate lexer state IN_ERROR and pseudo-token JSON_MIN 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" Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qapi/qmp/json-lexer.h | 10 ++++------ qobject/json-lexer.c | 15 +++++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/include/qapi/qmp/json-lexer.h b/include/qapi/qmp/json-lexer.h index 8058695e40..f3524de07a 100644 --- a/include/qapi/qmp/json-lexer.h +++ b/include/qapi/qmp/json-lexer.h @@ -14,10 +14,9 @@ #ifndef QEMU_JSON_LEXER_H #define QEMU_JSON_LEXER_H =20 - -typedef enum json_token_type { - JSON_MIN =3D 100, - JSON_LCURLY =3D JSON_MIN, +typedef enum { + JSON_ERROR =3D 0, /* must be zero */ + JSON_LCURLY, JSON_RCURLY, JSON_LSQUARE, JSON_RSQUARE, @@ -29,8 +28,7 @@ typedef enum json_token_type { JSON_STRING, JSON_INTERPOL, JSON_SKIP, - JSON_ERROR, - JSON_END_OF_INPUT + JSON_END_OF_INPUT /* must be last */ } JSONTokenType; =20 typedef struct JSONLexer { diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c index ef29e2782d..49e075a51e 100644 --- a/qobject/json-lexer.c +++ b/qobject/json-lexer.c @@ -101,8 +101,9 @@ * - Decoding and validating is left to the parser. */ =20 -enum json_lexer_state { - IN_ERROR =3D 0, /* must really be 0, see json_lexer[] */ +enum { + IN_START =3D JSON_END_OF_INPUT + 1, + IN_START_INTERPOL, /* must be IN_START + 1 */ IN_DQ_STRING_ESCAPE, IN_DQ_STRING, IN_SQ_STRING_ESCAPE, @@ -119,11 +120,9 @@ enum json_lexer_state { IN_KEYWORD, IN_INTERPOL, IN_WHITESPACE, - IN_START, - IN_START_INTERPOL, /* must be IN_START + 1 */ }; =20 -QEMU_BUILD_BUG_ON((int)JSON_MIN <=3D (int)IN_START_INTERPOL); +QEMU_BUILD_BUG_ON(JSON_ERROR !=3D 0); /* json_lexer[] relies on this */ QEMU_BUILD_BUG_ON(IN_START_INTERPOL !=3D IN_START + 1); =20 #define TERMINAL(state) [0 ... 0x7F] =3D (state) @@ -132,10 +131,10 @@ QEMU_BUILD_BUG_ON(IN_START_INTERPOL !=3D IN_START + 1= ); from OLD_STATE required lookahead. This happens whenever the table below uses the TERMINAL macro. */ #define TERMINAL_NEEDED_LOOKAHEAD(old_state, terminal) \ - (terminal !=3D IN_ERROR && json_lexer[(old_state)][0] =3D=3D (terminal= )) + (terminal !=3D JSON_ERROR && json_lexer[(old_state)][0] =3D=3D (termin= al)) =20 static const uint8_t json_lexer[][256] =3D { - /* Relies on default initialization to IN_ERROR! */ + /* Relies on default initialization to JSON_ERROR */ =20 /* double quote string */ [IN_DQ_STRING_ESCAPE] =3D { @@ -303,7 +302,7 @@ static void json_lexer_feed_char(JSONLexer *lexer, char= ch, bool flush) g_string_truncate(lexer->token, 0); new_state =3D lexer->start_state; break; - case IN_ERROR: + case JSON_ERROR: /* XXX: To avoid having previous bad input leaving the parser = in an * unresponsive state where we consume unpredictable amounts of * subsequent "good" input, percolate this error state up to t= he --=20 2.17.1