From nobody Wed Nov 5 13:06:50 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 1534520163517186.00063186998636; Fri, 17 Aug 2018 08:36:03 -0700 (PDT) Received: from localhost ([::1]:34791 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgnC-0005wE-9x for importer@patchew.org; Fri, 17 Aug 2018 11:36:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fqgKJ-00037J-MX for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fqgKF-0001mv-Vr for qemu-devel@nongnu.org; Fri, 17 Aug 2018 11:06:11 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46180 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-0001ki-6J 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 87C80407B397; 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 619397C2E; Fri, 17 Aug 2018 15:06:06 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id ADE9F1171DC1; Fri, 17 Aug 2018 17:06:00 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Fri, 17 Aug 2018 17:05:41 +0200 Message-Id: <20180817150559.16243-43-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.7]); Fri, 17 Aug 2018 15:06:06 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); 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 42/60] json: Improve names of lexer states related to numbers 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 --- qobject/json-lexer.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/qobject/json-lexer.c b/qobject/json-lexer.c index 4028f39f28..6a3b89c855 100644 --- a/qobject/json-lexer.c +++ b/qobject/json-lexer.c @@ -109,13 +109,13 @@ enum json_lexer_state { IN_SQ_STRING, IN_ZERO, IN_BAD_ZERO, - IN_DIGITS, - IN_DIGIT, + IN_EXP_DIGITS, + IN_EXP_SIGN, IN_EXP_E, IN_MANTISSA, IN_MANTISSA_DIGITS, - IN_NONZERO_NUMBER, - IN_NEG_NONZERO_NUMBER, + IN_DIGITS, + IN_SIGN, IN_KEYWORD, IN_INTERPOL, IN_WHITESPACE, @@ -169,19 +169,19 @@ static const uint8_t json_lexer[][256] =3D { }, =20 /* Float */ - [IN_DIGITS] =3D { + [IN_EXP_DIGITS] =3D { TERMINAL(JSON_FLOAT), - ['0' ... '9'] =3D IN_DIGITS, + ['0' ... '9'] =3D IN_EXP_DIGITS, }, =20 - [IN_DIGIT] =3D { - ['0' ... '9'] =3D IN_DIGITS, + [IN_EXP_SIGN] =3D { + ['0' ... '9'] =3D IN_EXP_DIGITS, }, =20 [IN_EXP_E] =3D { - ['-'] =3D IN_DIGIT, - ['+'] =3D IN_DIGIT, - ['0' ... '9'] =3D IN_DIGITS, + ['-'] =3D IN_EXP_SIGN, + ['+'] =3D IN_EXP_SIGN, + ['0' ... '9'] =3D IN_EXP_DIGITS, }, =20 [IN_MANTISSA_DIGITS] =3D { @@ -196,17 +196,17 @@ static const uint8_t json_lexer[][256] =3D { }, =20 /* Number */ - [IN_NONZERO_NUMBER] =3D { + [IN_DIGITS] =3D { TERMINAL(JSON_INTEGER), - ['0' ... '9'] =3D IN_NONZERO_NUMBER, + ['0' ... '9'] =3D IN_DIGITS, ['e'] =3D IN_EXP_E, ['E'] =3D IN_EXP_E, ['.'] =3D IN_MANTISSA, }, =20 - [IN_NEG_NONZERO_NUMBER] =3D { + [IN_SIGN] =3D { ['0'] =3D IN_ZERO, - ['1' ... '9'] =3D IN_NONZERO_NUMBER, + ['1' ... '9'] =3D IN_DIGITS, }, =20 /* keywords */ @@ -241,8 +241,8 @@ static const uint8_t json_lexer[][256] =3D { ['"'] =3D IN_DQ_STRING, ['\''] =3D IN_SQ_STRING, ['0'] =3D IN_ZERO, - ['1' ... '9'] =3D IN_NONZERO_NUMBER, - ['-'] =3D IN_NEG_NONZERO_NUMBER, + ['1' ... '9'] =3D IN_DIGITS, + ['-'] =3D IN_SIGN, ['{'] =3D JSON_LCURLY, ['}'] =3D JSON_RCURLY, ['['] =3D JSON_LSQUARE, --=20 2.17.1