From patchwork Mon Jun 24 17:39:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 11013859 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BEF516C5 for ; Mon, 24 Jun 2019 17:41:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE07B28AA5 for ; Mon, 24 Jun 2019 17:41:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1F7028B68; Mon, 24 Jun 2019 17:41:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2AB7828AA5 for ; Mon, 24 Jun 2019 17:41:53 +0000 (UTC) Received: from localhost ([::1]:53458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfSyW-0003It-Dm for patchwork-qemu-devel@patchwork.kernel.org; Mon, 24 Jun 2019 13:41:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48755) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfSwj-00018S-8W for qemu-devel@nongnu.org; Mon, 24 Jun 2019 13:40:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfSwc-0004em-6c for qemu-devel@nongnu.org; Mon, 24 Jun 2019 13:39:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34352) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfSwV-00047e-EV; Mon, 24 Jun 2019 13:39:49 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E8A84882FB; Mon, 24 Jun 2019 17:39:39 +0000 (UTC) Received: from localhost (ovpn-204-152.brq.redhat.com [10.40.204.152]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 80D6A60BE2; Mon, 24 Jun 2019 17:39:39 +0000 (UTC) From: Max Reitz To: qemu-block@nongnu.org Date: Mon, 24 Jun 2019 19:39:21 +0200 Message-Id: <20190624173935.25747-2-mreitz@redhat.com> In-Reply-To: <20190624173935.25747-1-mreitz@redhat.com> References: <20190624173935.25747-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 24 Jun 2019 17:39:39 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 01/14] qapi: Parse numeric values X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , qemu-devel@nongnu.org, Michael Roth , Markus Armbruster , Max Reitz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Max Reitz --- tests/qapi-schema/bad-type-int.json | 1 - tests/qapi-schema/enum-int-member.json | 1 - scripts/qapi/common.py | 25 ++++++++++++++++++++---- scripts/qapi/introspect.py | 2 ++ tests/qapi-schema/bad-type-int.err | 2 +- tests/qapi-schema/enum-int-member.err | 2 +- tests/qapi-schema/leading-comma-list.err | 2 +- 7 files changed, 26 insertions(+), 9 deletions(-) diff --git a/tests/qapi-schema/bad-type-int.json b/tests/qapi-schema/bad-type-int.json index 56fc6f8126..81355eb196 100644 --- a/tests/qapi-schema/bad-type-int.json +++ b/tests/qapi-schema/bad-type-int.json @@ -1,3 +1,2 @@ # we reject an expression with a metatype that is not a string -# FIXME: once the parser understands integer inputs, improve the error message { 'struct': 1, 'data': { } } diff --git a/tests/qapi-schema/enum-int-member.json b/tests/qapi-schema/enum-int-member.json index 6c9c32e149..6958440c6d 100644 --- a/tests/qapi-schema/enum-int-member.json +++ b/tests/qapi-schema/enum-int-member.json @@ -1,3 +1,2 @@ # we reject any enum member that is not a string -# FIXME: once the parser understands integer inputs, improve the error message { 'enum': 'MyEnum', 'data': [ 1 ] } diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index d61bfdc526..3396ea4a09 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -498,6 +498,8 @@ class QAPISchemaParser(object): raise QAPISemError(info, "Unknown pragma '%s'" % name) def accept(self, skip_comment=True): + num_match = re.compile(r'([-+]?inf|nan|[-+0-9.][0-9a-f.ex]*)') + while True: self.tok = self.src[self.cursor] self.pos = self.cursor @@ -584,7 +586,22 @@ class QAPISchemaParser(object): return self.line += 1 self.line_pos = self.cursor - elif not self.tok.isspace(): + elif self.tok.isspace(): + pass + elif num_match.match(self.src[self.pos:]): + match = num_match.match(self.src[self.pos:]).group(0) + try: + self.val = int(match, 0) + except ValueError: + try: + self.val = float(match) + except ValueError: + raise QAPIParseError(self, + '"%s" is not a valid integer or float' % match) + + self.cursor += len(match) - 1 + return + else: raise QAPIParseError(self, 'Stray "%s"' % self.tok) def get_members(self): @@ -617,9 +634,9 @@ class QAPISchemaParser(object): if self.tok == ']': self.accept() return expr - if self.tok not in "{['tfn": + if self.tok not in "{['tfn-+0123456789.i": raise QAPIParseError(self, 'Expected "{", "[", "]", string, ' - 'boolean or "null"') + 'boolean, number or "null"') while True: expr.append(self.get_expr(True)) if self.tok == ']': @@ -638,7 +655,7 @@ class QAPISchemaParser(object): elif self.tok == '[': self.accept() expr = self.get_values() - elif self.tok in "'tfn": + elif self.tok in "'tfn-+0123456789.i": expr = self.val self.accept() else: diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index f62cf0a2e1..6a61dd831f 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -57,6 +57,8 @@ def to_qlit(obj, level=0, suppress_first_indent=False): ret += indent(level) + '}))' elif isinstance(obj, bool): ret += 'QLIT_QBOOL(%s)' % ('true' if obj else 'false') + elif isinstance(obj, int) and obj >= -(2 ** 63) and obj < 2 ** 63: + ret += 'QLIT_QNUM(%i)' % obj else: assert False # not implemented if level > 0: diff --git a/tests/qapi-schema/bad-type-int.err b/tests/qapi-schema/bad-type-int.err index da89895404..e22fb4f655 100644 --- a/tests/qapi-schema/bad-type-int.err +++ b/tests/qapi-schema/bad-type-int.err @@ -1 +1 @@ -tests/qapi-schema/bad-type-int.json:3:13: Stray "1" +tests/qapi-schema/bad-type-int.json:2: 'struct' key must have a string value diff --git a/tests/qapi-schema/enum-int-member.err b/tests/qapi-schema/enum-int-member.err index 071c5213d8..112175f79d 100644 --- a/tests/qapi-schema/enum-int-member.err +++ b/tests/qapi-schema/enum-int-member.err @@ -1 +1 @@ -tests/qapi-schema/enum-int-member.json:3:31: Stray "1" +tests/qapi-schema/enum-int-member.json:2: Member of enum 'MyEnum' requires a string name diff --git a/tests/qapi-schema/leading-comma-list.err b/tests/qapi-schema/leading-comma-list.err index f5c870bb9c..fa9c80aa57 100644 --- a/tests/qapi-schema/leading-comma-list.err +++ b/tests/qapi-schema/leading-comma-list.err @@ -1 +1 @@ -tests/qapi-schema/leading-comma-list.json:2:13: Expected "{", "[", "]", string, boolean or "null" +tests/qapi-schema/leading-comma-list.json:2:13: Expected "{", "[", "]", string, boolean, number or "null"