From nobody Wed Nov 12 10:09:27 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1569696709; cv=none; d=zoho.com; s=zohoarc; b=QsWKI13DzEoQvZ+yfm2lyQ3HGpXQDuqrd36FYg3+8wznZMr63Mk0cuL96OKfL7k6gzLit6u1zWmLump5h5YCPE253tga01+gq1cut0rnhFNgqN6YC+cE6XMl9CTUP5oDFxl9/3qyxjmrU+ddgUfvxxzlRQ3yVruaWHISou0HMNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569696709; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=h6CTAZ3u7+GfilbJz2ltkq9LerlnmfHaGHarJjYvK7w=; b=gb/lrR1zEugHyU9ubjnDaDlIEVPrf8pFOQ0PKq5rpuLS8yDO6p9CrD+kXsmGG+NtzQVMPuxGYW9Qv7C3fYV8Uxqehr9+ogseLTPifuXrIv6jXYjhqJJ6jNvn4Q9Mdz9xYQTCoCIhaHjTKnTKaJPUYmDjdQRRsif2kaJ38yb27c0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1569696709944708.6552788381684; Sat, 28 Sep 2019 11:51:49 -0700 (PDT) Received: from localhost ([::1]:34420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEHon-0001mF-Jw for importer@patchew.org; Sat, 28 Sep 2019 14:51:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43936) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iEHd9-0008S8-84 for qemu-devel@nongnu.org; Sat, 28 Sep 2019 14:39:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iEHd5-0003ux-OV for qemu-devel@nongnu.org; Sat, 28 Sep 2019 14:39:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52810) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iEHd5-0003sh-9r for qemu-devel@nongnu.org; Sat, 28 Sep 2019 14:39:39 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 793A73D94D for ; Sat, 28 Sep 2019 18:39:38 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-117-142.ams2.redhat.com [10.36.117.142]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2242C3DE2; Sat, 28 Sep 2019 18:39:38 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 572E41138528; Sat, 28 Sep 2019 20:39:34 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 13/27] qapi: Move check for reserved names out of add_name() Date: Sat, 28 Sep 2019 20:39:20 +0200 Message-Id: <20190928183934.12459-14-armbru@redhat.com> In-Reply-To: <20190928183934.12459-1-armbru@redhat.com> References: <20190928183934.12459-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Sat, 28 Sep 2019 18:39:38 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The checks for reserved names are spread far and wide. Move one from add_name() to new check_defn_name_str(). This is a first step towards collecting them all in dedicated name checking functions next to check_name(). While there, drop the quotes around the meta-type in check_name_str()'s error messages: "'command' uses ... name 'NAME'" becomes "command uses ... name 'NAME'". Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-Id: <20190927134639.4284-13-armbru@redhat.com> --- scripts/qapi/common.py | 16 ++++++++++------ tests/qapi-schema/bad-ident.err | 2 +- tests/qapi-schema/reserved-command-q.err | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index a4cf41f13e..111a4bbe55 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -741,6 +741,13 @@ def check_name_str(name, info, source, assert not membername.startswith('*') =20 =20 +def check_defn_name_str(name, info, meta): + check_name_str(name, info, meta, permit_upper=3DTrue) + if name.endswith('Kind') or name.endswith('List'): + raise QAPISemError( + info, "%s '%s' should not end in '%s'" % (meta, name, name[-4:= ])) + + def add_name(name, info, meta): global all_names # FIXME should reject names that differ only in '_' vs. '.' @@ -748,9 +755,6 @@ def add_name(name, info, meta): if name in all_names: raise QAPISemError(info, "%s '%s' is already defined" % (all_names[name], name)) - if name.endswith('Kind') or name.endswith('List'): - raise QAPISemError(info, "%s '%s' should not end in '%s'" - % (meta, name, name[-4:])) all_names[name] =3D meta =20 =20 @@ -1162,7 +1166,7 @@ def check_exprs(exprs): name =3D expr[meta] check_name_is_str(name, info, "'%s'" % meta) info.set_defn(meta, name) - check_name_str(name, info, "'%s'" % meta, permit_upper=3DTrue) + check_defn_name_str(name, info, meta) add_name(name, info, meta) if doc and doc.symbol !=3D name: raise QAPISemError( @@ -1889,13 +1893,13 @@ class QAPISchema(object): =20 def _make_implicit_enum_type(self, name, info, ifcond, values): # See also QAPISchemaObjectTypeMember.describe() - name =3D name + 'Kind' # Use namespace reserved by add_name() + name =3D name + 'Kind' # reserved by check_defn_name_str() self._def_entity(QAPISchemaEnumType( name, info, None, ifcond, self._make_enum_members(values), Non= e)) return name =20 def _make_array_type(self, element_type, info): - name =3D element_type + 'List' # Use namespace reserved by add_n= ame() + name =3D element_type + 'List' # reserved by check_defn_name_st= r() if not self.lookup_type(name): self._def_entity(QAPISchemaArrayType(name, info, element_type)) return name diff --git a/tests/qapi-schema/bad-ident.err b/tests/qapi-schema/bad-ident.= err index ddc96bd3a9..79d14758ce 100644 --- a/tests/qapi-schema/bad-ident.err +++ b/tests/qapi-schema/bad-ident.err @@ -1,2 +1,2 @@ tests/qapi-schema/bad-ident.json: In struct '*oops': -tests/qapi-schema/bad-ident.json:2: 'struct' uses invalid name '*oops' +tests/qapi-schema/bad-ident.json:2: struct uses invalid name '*oops' diff --git a/tests/qapi-schema/reserved-command-q.err b/tests/qapi-schema/r= eserved-command-q.err index 0844e14b26..631cb5cdcc 100644 --- a/tests/qapi-schema/reserved-command-q.err +++ b/tests/qapi-schema/reserved-command-q.err @@ -1,2 +1,2 @@ tests/qapi-schema/reserved-command-q.json: In command 'q-unix': -tests/qapi-schema/reserved-command-q.json:5: 'command' uses invalid name '= q-unix' +tests/qapi-schema/reserved-command-q.json:5: command uses invalid name 'q-= unix' --=20 2.21.0