From nobody Wed Nov 5 16:54:41 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 1535702440580326.6442677666828; Fri, 31 Aug 2018 01:00:40 -0700 (PDT) Received: from localhost ([::1]:52352 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fveM2-00022O-L2 for importer@patchew.org; Fri, 31 Aug 2018 04:00:30 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57995) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fveKP-0001B1-MF for qemu-devel@nongnu.org; Fri, 31 Aug 2018 03:58:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fveKN-0006cc-3J for qemu-devel@nongnu.org; Fri, 31 Aug 2018 03:58:49 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36854 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 1fveKM-0006cN-RA for qemu-devel@nongnu.org; Fri, 31 Aug 2018 03:58:46 -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 6A8CB40241F7; Fri, 31 Aug 2018 07:58:46 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-117.ams2.redhat.com [10.36.116.117]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 42D8310876C; Fri, 31 Aug 2018 07:58:46 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E3DE81138408; Fri, 31 Aug 2018 09:58:41 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 31 Aug 2018 09:58:41 +0200 Message-Id: <20180831075841.13363-7-armbru@redhat.com> In-Reply-To: <20180831075841.13363-1-armbru@redhat.com> References: <20180831075841.13363-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.7]); Fri, 31 Aug 2018 07:58:46 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Fri, 31 Aug 2018 07:58:46 +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 6/6] 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" The lexer ignores whitespace like this: on whitespace on non-ws spontaneously IN_START --> IN_WHITESPACE --> JSON_SKIP --> IN_START ^ | \__/ on whitespace This accumulates a whitespace token in state IN_WHITESPACE, only to throw it away on the transition via JSON_SKIP to the start state. Wasteful. Go from IN_START to IN_START on whitespace directly, dropping the whitespace character. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- qobject/json-lexer.c | 22 +++++----------------- qobject/json-parser-int.h | 1 - 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c index 2a5561c917..a7df2093aa 100644 --- a/qobject/json-lexer.c +++ b/qobject/json-lexer.c @@ -115,7 +115,6 @@ enum json_lexer_state { IN_SIGN, IN_KEYWORD, IN_INTERP, - IN_WHITESPACE, IN_START, IN_START_INTERP, /* must be IN_START + 1 */ }; @@ -228,15 +227,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_INTERP] =3D { TERMINAL(JSON_INTERP), @@ -263,10 +253,10 @@ 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_INTERP]['%'] =3D IN_INTERP, }; @@ -323,10 +313,8 @@ static void json_lexer_feed_char(JSONLexer *lexer, cha= r ch, bool flush) json_message_process_token(lexer, lexer->token, new_state, lexer->x, lexer->y); /* fall through */ - case JSON_SKIP: - g_string_truncate(lexer->token, 0); - /* fall through */ case IN_START: + g_string_truncate(lexer->token, 0); new_state =3D lexer->start_state; break; case JSON_ERROR: diff --git a/qobject/json-parser-int.h b/qobject/json-parser-int.h index 57cb8e79d3..16a25d00bb 100644 --- a/qobject/json-parser-int.h +++ b/qobject/json-parser-int.h @@ -31,7 +31,6 @@ typedef enum json_token_type { JSON_KEYWORD, JSON_STRING, JSON_INTERP, - JSON_SKIP, JSON_END_OF_INPUT, JSON_MAX =3D JSON_END_OF_INPUT } JSONTokenType; --=20 2.17.1