From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50066) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZkUb-0005sy-NZ for qemu-devel@nongnu.org; Thu, 11 Jan 2018 16:34:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZkUa-0001zh-RF for qemu-devel@nongnu.org; Thu, 11 Jan 2018 16:34:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:44094) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZkUa-0001zB-Ks for qemu-devel@nongnu.org; Thu, 11 Jan 2018 16:34:32 -0500 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 11 Jan 2018 22:32:09 +0100 Message-Id: <20180111213250.16511-11-marcandre.lureau@redhat.com> In-Reply-To: <20180111213250.16511-1-marcandre.lureau@redhat.com> References: <20180111213250.16511-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v4 10/51] qapi: add #if/#endif helpers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: eblake@redhat.com, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Eduardo Habkost , Cleber Rosa , Michael Roth Add helpers to wrap generated code with #if/#endif lines. Add a function decorator that will be used to wrap visitor methods. The decorator will check if code was generated before adding #if/#endif lines. Used in the following patches. Signed-off-by: Marc-Andr=C3=A9 Lureau --- scripts/qapi.py | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/scripts/qapi.py b/scripts/qapi.py index 3d33ed7d76..71f28fc6d8 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1911,6 +1911,53 @@ def guardend(name): name=3Dguardname(name)) =20 =20 +def gen_if(ifcond): + ret =3D '' + for ifc in ifcond: + ret +=3D mcgen(''' +#if %(cond)s +''', cond=3Difc) + return ret + + +def gen_endif(ifcond): + ret =3D '' + for ifc in reversed(ifcond): + ret +=3D mcgen(''' +#endif /* %(cond)s */ +''', cond=3Difc) + return ret + + +# Wrap a method to add #if / #endif to generated code, only if some +# code was generated. The method must have an 'ifcond' argument. +# self must have 'if_members' listing the attributes to wrap. +def ifcond_decorator(func): + + def func_wrapper(self, *args, **kwargs): + import inspect + idx =3D inspect.getargspec(func).args.index('ifcond') + ifcond =3D args[idx - 1] + save =3D {} + for mem in self.if_members: + save[mem] =3D getattr(self, mem) + func(self, *args, **kwargs) + for mem, val in save.items(): + newval =3D getattr(self, mem) + if newval !=3D val: + assert newval.startswith(val) + newval =3D newval[len(val):] + if newval[0] =3D=3D '\n': + val +=3D '\n' + newval =3D newval[1:] + val +=3D gen_if(ifcond) + val +=3D newval + val +=3D gen_endif(ifcond) + setattr(self, mem, val) + + return func_wrapper + + def gen_enum_lookup(name, values, prefix=3DNone): ret =3D mcgen(''' =20 --=20 2.16.0.rc1.1.gef27df75a1