From nobody Tue Feb 10 20:28:52 2026 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@gnu.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@gnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506958932237603.2954334170855; Mon, 2 Oct 2017 08:42:12 -0700 (PDT) Received: from localhost ([::1]:52889 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dz2r3-0004Qn-EE for importer@patchew.org; Mon, 02 Oct 2017 11:42:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dz2be-0007z1-9m for qemu-devel@nongnu.org; Mon, 02 Oct 2017 11:26:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dz2bX-0007t1-TF for qemu-devel@nongnu.org; Mon, 02 Oct 2017 11:26:06 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55968) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dz2bX-0007sJ-Lo for qemu-devel@nongnu.org; Mon, 02 Oct 2017 11:25:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C4C3BC058ECD; Mon, 2 Oct 2017 15:25:58 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-91.ams2.redhat.com [10.36.116.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5983891B32; Mon, 2 Oct 2017 15:25:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 9A48A1156275; Mon, 2 Oct 2017 17:25:52 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C4C3BC058ECD Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=armbru@redhat.com From: Markus Armbruster To: qemu-devel@nongnu.org Date: Mon, 2 Oct 2017 17:25:28 +0200 Message-Id: <20171002152552.27999-9-armbru@redhat.com> In-Reply-To: <20171002152552.27999-1-armbru@redhat.com> References: <20171002152552.27999-1-armbru@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 02 Oct 2017 15:25:58 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [RFC PATCH 08/32] qapi: Simplify check_name() parameters X-BeenThere: qemu-devel@gnu.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@gnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace flags @enum_member, @allow_optional by string @meta: 'member-enum' implies @enum_member, 'member-struct' implies @allow_optional. Signed-off-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- scripts/qapi.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 248af89b0b..208010c241 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -593,8 +593,7 @@ valid_name =3D re.compile(r'^(__[a-zA-Z0-9.-]+_)?' '[a-zA-Z][a-zA-Z0-9_-]*$') =20 =20 -def check_name(info, source, name, allow_optional=3DFalse, - enum_member=3DFalse): +def check_name(info, source, name, meta): global valid_name membername =3D name =20 @@ -602,12 +601,12 @@ def check_name(info, source, name, allow_optional=3DF= alse, raise QAPISemError(info, "%s requires a string name" % source) if name.startswith('*'): membername =3D name[1:] - if not allow_optional: + if meta !=3D 'member-struct': raise QAPISemError(info, "%s does not allow optional name '%s'" % (source, name)) # Enum members can start with a digit, because the generated C # code always prefixes it with the enum name - if enum_member and membername[0].isdigit(): + if meta =3D=3D 'member-enum' and membername[0].isdigit(): membername =3D 'D' + membername # Reserve the entire 'q_' namespace for c_name(), and for 'q_empty' # and 'q_obj_*' implicit type names. @@ -618,7 +617,7 @@ def check_name(info, source, name, allow_optional=3DFal= se, =20 def add_name(name, info, meta, implicit=3DFalse): global all_names - check_name(info, "'%s'" % meta, name) + check_name(info, "'%s'" % meta, name, meta) # FIXME should reject names that differ only in '_' vs. '.' # vs. '-', because they're liable to clash in generated C. if name in all_names: @@ -667,8 +666,7 @@ def check_type(info, source, value, allow_array=3DFalse, =20 # value is a dictionary, check that each member is okay for (key, arg) in value.items(): - check_name(info, "Member of %s" % source, key, - allow_optional=3Dallow_optional) + check_name(info, "Member of %s" % source, key, 'member-struct') if c_name(key, False) =3D=3D 'u' or c_name(key, False).startswith(= 'has_'): raise QAPISemError(info, "Member of %s uses reserved name '%s'" % (source, key)) @@ -741,7 +739,7 @@ def check_union(expr, info): # The value of member 'discriminator' must name a non-optional # member of the base struct. check_name(info, "Discriminator of flat union '%s'" % name, - discriminator) + discriminator, 'member-union') discriminator_type =3D base_members.get(discriminator) if not discriminator_type: raise QAPISemError(info, @@ -760,7 +758,7 @@ def check_union(expr, info): if len(members) =3D=3D 0: raise QAPISemError(info, "Union '%s' cannot have empty 'data'" % n= ame) for (key, value) in members.items(): - check_name(info, "Member of union '%s'" % name, key) + check_name(info, "Member of union '%s'" % name, key, 'member-union= ') =20 # Each value must name a known type check_type(info, "Member '%s' of union '%s'" % (key, name), @@ -794,7 +792,8 @@ def check_alternate(expr, info): "Alternate '%s' should have at least two branch= es " "in 'data'" % name) for (key, value) in members.items(): - check_name(info, "Member of alternate '%s'" % name, key) + check_name(info, "Member of alternate '%s'" % name, key, + 'member-alternate') =20 # Ensure alternates have no type conflicts. check_type(info, "Member '%s' of alternate '%s'" % (key, name), @@ -836,8 +835,7 @@ def check_enum(expr, info): raise QAPISemError(info, "Enum '%s' requires a string for 'prefix'" % na= me) for member in members: - check_name(info, "Member of enum '%s'" % name, member, - enum_member=3DTrue) + check_name(info, "Member of enum '%s'" % name, member, 'member-enu= m') =20 =20 def check_struct(expr, info): --=20 2.13.6