From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMyYk-0002ww-Uu for qemu-devel@nongnu.org; Thu, 07 Dec 2017 10:58:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMyYk-000509-0F for qemu-devel@nongnu.org; Thu, 07 Dec 2017 10:58:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:9782) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eMyYj-0004zs-NT for qemu-devel@nongnu.org; Thu, 07 Dec 2017 10:58:01 -0500 From: Markus Armbruster References: <20170911110623.24981-1-marcandre.lureau@redhat.com> <20170911110623.24981-16-marcandre.lureau@redhat.com> Date: Thu, 07 Dec 2017 16:57:56 +0100 In-Reply-To: <20170911110623.24981-16-marcandre.lureau@redhat.com> (=?utf-8?Q?=22Marc-Andr=C3=A9?= Lureau"'s message of "Mon, 11 Sep 2017 13:05:48 +0200") Message-ID: <87h8t2o7i3.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v3 15/50] qapi-types: refactor variants handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Cc: qemu-devel@nongnu.org, Michael Roth Marc-Andr=C3=A9 Lureau writes: > Generate variants objects outside gen_object(). This will allow to > easily wrap gen_object() with ifcond_decorator in the following patch. > > Signed-off-by: Marc-Andr=C3=A9 Lureau > --- > scripts/qapi-types.py | 37 +++++++++++++++++++++++-------------- > 1 file changed, 23 insertions(+), 14 deletions(-) > > diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py > index 915786c463..2b3588267b 100644 > --- a/scripts/qapi-types.py > +++ b/scripts/qapi-types.py > @@ -53,23 +53,27 @@ def gen_struct_members(members): > return ret >=20=20 >=20=20 > -def gen_object(name, base, members, variants): > - if name in objects_seen: > - return '' > - objects_seen.add(name) > - > +def gen_variants_objects(variants): > ret =3D '' > if variants: > for v in variants.variants: > if isinstance(v.type, QAPISchemaObjectType): > + ret +=3D gen_variants_objects(v.type.variants) > ret +=3D gen_object(v.type.name, v.type.base, > v.type.local_members, v.type.variants) > + return ret >=20=20 > - ret +=3D mcgen(''' > + > +def gen_object(name, base, members, variants): > + if name in objects_seen: > + return '' > + objects_seen.add(name) > + > + ret =3D mcgen(''' >=20=20 > struct %(c_name)s { > ''', > - c_name=3Dc_name(name)) > + c_name=3Dc_name(name)) >=20=20 > if base: > if not base.is_implicit(): > @@ -218,11 +222,7 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor): > self.decl +=3D gen_array(name, element_type) > self._gen_type_cleanup(name) >=20=20 > - def visit_object_type(self, name, info, ifcond, base, members, varia= nts): > - # Nothing to do for the special empty builtin > - if name =3D=3D 'q_empty': > - return > - self._fwdecl +=3D gen_fwd_object_or_array(name) > + def _gen_object(self, name, info, ifcond, base, members, variants): > self.decl +=3D gen_object(name, base, members, variants) > if base and not base.is_implicit(): > self.decl +=3D gen_upcast(name, base) > @@ -232,10 +232,19 @@ class QAPISchemaGenTypeVisitor(QAPISchemaVisitor): > # implicit types won't be directly allocated/freed > self._gen_type_cleanup(name) >=20=20 > + def visit_object_type(self, name, info, ifcond, base, members, varia= nts): > + # Nothing to do for the special empty builtin > + if name =3D=3D 'q_empty': > + return > + self._fwdecl +=3D gen_fwd_object_or_array(name) > + self.decl +=3D gen_variants_objects(variants) > + self._gen_object(name, info, None, base, members, variants) > + > def visit_alternate_type(self, name, info, ifcond, variants): > self._fwdecl +=3D gen_fwd_object_or_array(name) > - self.decl +=3D gen_object(name, None, [variants.tag_member], var= iants) > - self._gen_type_cleanup(name) > + self.decl +=3D gen_variants_objects(variants) > + self._gen_object(name, info, None, None, > + [variants.tag_member], variants) Where did self._gen_type_cleanup(name) go? Hmm, I guess it's now in _gen_object(). Confusing. >=20=20 > # If you link code generated from multiple schemata, you want only one > # instance of the code for built-in types. Generate it only when If I read this patch correctly, you move code from the beginning of gen_object() to new gen_variants_objects(), then arrange to have gen_variants_objects() called right before gen_object(). Correct? In old gen_object(), the code is guarded by if name in objects_seen: return '' objects_seen.add(name) In new gen_variants_objects(), it isn't. Why?