From nobody Wed Nov 5 13:00:26 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 1534520198291354.29769533081264; Fri, 17 Aug 2018 08:36:38 -0700 (PDT) Received: from localhost ([::1]:34795 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgnl-0007cw-5d for importer@patchew.org; Fri, 17 Aug 2018 11:36:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgKL-00038a-2K for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqgKG-0001np-AA for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:12 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:56280 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 1fqgKF-0001l8-F8 for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:07 -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 C7806346FB; Fri, 17 Aug 2018 15:06:06 +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 A09111730B; Fri, 17 Aug 2018 15:06:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E21671171DCC; Fri, 17 Aug 2018 17:06:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 17 Aug 2018 17:05:51 +0200 Message-Id: <20180817150559.16243-53-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.2]); Fri, 17 Aug 2018 15:06:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Fri, 17 Aug 2018 15:06:06 +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 52/60] json: Eliminate lexer state IN_WHITESPACE, pseudo-token JSON_SKIP 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" Bonus: static json_lexer[] loses its unused elements. It shrinks from 8KiB to 4.75KiB for me. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- include/qapi/qmp/json-lexer.h | 1 - qobject/json-lexer.c | 26 +++++++++----------------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/include/qapi/qmp/json-lexer.h b/include/qapi/qmp/json-lexer.h index f3524de07a..1a2dbbb717 100644 --- a/include/qapi/qmp/json-lexer.h +++ b/include/qapi/qmp/json-lexer.h @@ -27,7 +27,6 @@ typedef enum { JSON_KEYWORD, JSON_STRING, JSON_INTERPOL, - JSON_SKIP, JSON_END_OF_INPUT /* must be last */ } JSONTokenType; =20 diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c index 49e075a51e..431a1ede61 100644 --- a/qobject/json-lexer.c +++ b/qobject/json-lexer.c @@ -119,7 +119,6 @@ enum { IN_SIGN, IN_KEYWORD, IN_INTERPOL, - IN_WHITESPACE, }; =20 QEMU_BUILD_BUG_ON(JSON_ERROR !=3D 0); /* json_lexer[] relies on this */ @@ -214,15 +213,6 @@ static const uint8_t json_lexer[][256] =3D { ['a' ... 'z'] =3D IN_KEYWORD, }, =20 - /* whitespace */ - [IN_WHITESPACE] =3D { - TERMINAL(JSON_SKIP), - [' '] =3D IN_WHITESPACE, - ['\t'] =3D IN_WHITESPACE, - ['\r'] =3D IN_WHITESPACE, - ['\n'] =3D IN_WHITESPACE, - }, - /* interpolation */ [IN_INTERPOL] =3D { TERMINAL(JSON_INTERPOL), @@ -249,12 +239,16 @@ static const uint8_t json_lexer[][256] =3D { [','] =3D JSON_COMMA, [':'] =3D JSON_COLON, ['a' ... 'z'] =3D IN_KEYWORD, - [' '] =3D IN_WHITESPACE, - ['\t'] =3D IN_WHITESPACE, - ['\r'] =3D IN_WHITESPACE, - ['\n'] =3D IN_WHITESPACE, + [' '] =3D IN_START, + ['\t'] =3D IN_START, + ['\r'] =3D IN_START, + ['\n'] =3D IN_START, }, [IN_START_INTERPOL]['%'] =3D IN_INTERPOL, + [IN_START_INTERPOL][' '] =3D IN_START_INTERPOL, + [IN_START_INTERPOL]['\t'] =3D IN_START_INTERPOL, + [IN_START_INTERPOL]['\r'] =3D IN_START_INTERPOL, + [IN_START_INTERPOL]['\n'] =3D IN_START_INTERPOL, }; =20 void json_lexer_init(JSONLexer *lexer, bool enable_interpolation) @@ -279,7 +273,7 @@ static void json_lexer_feed_char(JSONLexer *lexer, char= ch, bool flush) assert(lexer->state <=3D ARRAY_SIZE(json_lexer)); new_state =3D json_lexer[lexer->state][(uint8_t)ch]; char_consumed =3D !TERMINAL_NEEDED_LOOKAHEAD(lexer->state, new_sta= te); - if (char_consumed && !flush) { + if (char_consumed && new_state !=3D lexer->start_state && !flush) { g_string_append_c(lexer->token, ch); } =20 @@ -297,8 +291,6 @@ static void json_lexer_feed_char(JSONLexer *lexer, char= ch, bool flush) case JSON_STRING: json_message_process_token(lexer, lexer->token, new_state, lexer->x, lexer->y); - /* fall through */ - case JSON_SKIP: g_string_truncate(lexer->token, 0); new_state =3D lexer->start_state; break; --=20 2.17.1