[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 07/15] qapi: add #if/#endif helpers
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v6 07/15] qapi: add #if/#endif helpers |
Date: |
Wed, 27 Jun 2018 18:35:43 +0200 |
Add helpers to wrap generated code with #if/#endif lines.
Add QAPIGenCSnippet class to write C snippet code, make QAPIGenC
inherit from it, for full C files with copyright headers etc.
Add a 'with' statement context manager that will be used to wrap
generator visitor methods. The manager will check if code was
generated before adding #if/#endif lines on QAPIGenCSnippet
objects. Used in the following patches.
Signed-off-by: Marc-André Lureau <address@hidden>
---
scripts/qapi/common.py | 101 +++++++++++++++++++++++++++++++++++++++--
1 file changed, 97 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py
index 1b56065a80..44eaf25850 100644
--- a/scripts/qapi/common.py
+++ b/scripts/qapi/common.py
@@ -12,6 +12,7 @@
# See the COPYING file in the top-level directory.
from __future__ import print_function
+from contextlib import contextmanager
import errno
import os
import re
@@ -1974,6 +1975,40 @@ def guardend(name):
name=guardname(name))
+def gen_if(ifcond):
+ ret = ''
+ for ifc in ifcond:
+ ret += mcgen('''
+#if %(cond)s
+''', cond=ifc)
+ return ret
+
+
+def gen_endif(ifcond):
+ ret = ''
+ for ifc in reversed(ifcond):
+ ret += mcgen('''
+#endif /* %(cond)s */
+''', cond=ifc)
+ return ret
+
+
+def wrap_ifcond(ifcond, before, after):
+ if ifcond is None or before == after:
+ return after
+
+ assert after.startswith(before)
+ out = before
+ added = after[len(before):]
+ if added[0] == '\n':
+ out += '\n'
+ added = added[1:]
+ out += gen_if(ifcond)
+ out += added
+ out += gen_endif(ifcond)
+ return out
+
+
def gen_enum_lookup(name, values, prefix=None):
ret = mcgen('''
@@ -2064,6 +2099,7 @@ class QAPIGen(object):
def __init__(self):
self._preamble = ''
self._body = ''
+ self._start_if = None
def preamble_add(self, text):
self._preamble += text
@@ -2071,6 +2107,25 @@ class QAPIGen(object):
def add(self, text):
self._body += text
+ def start_if(self, ifcond):
+ assert self._start_if is None
+
+ self._start_if = (ifcond, self._body, self._preamble)
+
+ def _wrap_ifcond(self):
+ pass
+
+ def end_if(self):
+ assert self._start_if
+
+ self._wrap_ifcond()
+ self._start_if = None
+
+ def get_content(self, fname=None):
+ assert self._start_if is None
+ return (self._top(fname) + self._preamble + self._body
+ + self._bottom(fname))
+
def _top(self, fname):
return ''
@@ -2091,8 +2146,7 @@ class QAPIGen(object):
f = open(fd, 'r+', encoding='utf-8')
else:
f = os.fdopen(fd, 'r+')
- text = (self._top(fname) + self._preamble + self._body
- + self._bottom(fname))
+ text = self.get_content(fname)
oldtext = f.read(len(text) + 1)
if text != oldtext:
f.seek(0)
@@ -2101,10 +2155,49 @@ class QAPIGen(object):
f.close()
-class QAPIGenC(QAPIGen):
address@hidden
+def ifcontext(ifcond, *args):
+ """A 'with' statement context manager to wrap with start_if()/end_if()
- def __init__(self, blurb, pydoc):
+ *args: variable length argument list of QAPIGen
+
+ Example::
+
+ with ifcontext(ifcond, self._genh, self._genc):
+ modify self._genh and self._genc ...
+
+ Is equivalent to calling::
+
+ self._genh.start_if(ifcond)
+ self._genc.start_if(ifcond)
+ modify self._genh and self._genc ...
+ self._genh.end_if()
+ self._genc.end_if()
+
+ """
+ for arg in args:
+ arg.start_if(ifcond)
+ yield
+ for arg in args:
+ arg.end_if()
+
+
+class QAPIGenCCode(QAPIGen):
+
+ def __init__(self):
QAPIGen.__init__(self)
+
+ def _wrap_ifcond(self):
+ self._body = wrap_ifcond(self._start_if[0],
+ self._start_if[1], self._body)
+ self._preamble = wrap_ifcond(self._start_if[0],
+ self._start_if[2], self._preamble)
+
+
+class QAPIGenC(QAPIGenCCode):
+
+ def __init__(self, blurb, pydoc):
+ QAPIGenCCode.__init__(self)
self._blurb = blurb
self._copyright = '\n * '.join(re.findall(r'^Copyright .*', pydoc,
re.MULTILINE))
--
2.18.0.rc1
- Re: [Qemu-devel] [PATCH v6 01/15] qapi: add 'if' to top-level expressions, (continued)
- [Qemu-devel] [PATCH v6 02/15] tests, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 03/15] qapi: pass 'if' condition into QAPISchemaEntity objects, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 04/15] qapi: leave the ifcond attribute undefined until check(), Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 06/15] qapi: mcgen() shouldn't indent # lines, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 05/15] qapi: add 'ifcond' to visitor methods, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 07/15] qapi: add #if/#endif helpers,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v6 08/15] qapi-introspect: modify to_qlit() to append ', ' on level > 0, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 11/15] qapi/events: add #if conditions to events, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 09/15] qapi-introspect: add preprocessor conditions to generated QLit, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 10/15] qapi/commands: add #if conditions to commands, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 12/15] qapi-types: add #if conditions to types & visitors, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 13/15] qapi: add 'If:' section to generated documentation, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 14/15] qapi: add conditions to VNC type/commands/events on the schema, Marc-André Lureau, 2018/06/27
- [Qemu-devel] [PATCH v6 15/15] qapi: add conditions to SPICE type/commands/events on the schema, Marc-André Lureau, 2018/06/27