From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57643) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzhKI-0003Ae-TA for qemu-devel@nongnu.org; Wed, 04 Oct 2017 06:54:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzhKH-0001nt-ON for qemu-devel@nongnu.org; Wed, 04 Oct 2017 06:54:54 -0400 Received: from mail-oi0-x242.google.com ([2607:f8b0:4003:c06::242]:44517) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dzhKH-0001nT-If for qemu-devel@nongnu.org; Wed, 04 Oct 2017 06:54:53 -0400 Received: by mail-oi0-x242.google.com with SMTP id s145so13113410oie.1 for ; Wed, 04 Oct 2017 03:54:53 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20171002152552.27999-9-armbru@redhat.com> References: <20171002152552.27999-1-armbru@redhat.com> <20171002152552.27999-9-armbru@redhat.com> From: =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= Date: Wed, 4 Oct 2017 12:54:47 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [RFC PATCH 08/32] qapi: Simplify check_name() parameters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: QEMU , Michael Roth On Mon, Oct 2, 2017 at 5:25 PM, Markus Armbruster wrote= : > 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_-]*$') > > > -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 > > @@ -602,12 +601,12 @@ def check_name(info, source, name, allow_optional= =3DFalse, > 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=3DF= alse, > > 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=3DFal= se, > > # 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).startswit= h('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'" %= name) > 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-uni= on') > > # 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 bran= ches " > "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') > > # 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'" % = name) > 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-e= num') > > > def check_struct(expr, info): > -- > 2.13.6 > > --=20 Marc-Andr=C3=A9 Lureau