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é Lureau <marcandre.lur...@redhat.com>
---
scripts/qapi-types.py | 34 +++++++++++++++++++++-------------
1 file changed, 21 insertions(+), 13 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 6f06720adc..05b0eee482 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -53,19 +53,23 @@ def gen_struct_members(members):
return ret
-def gen_object(name, base, members, variants):
- if name in objects_seen:
- return ''
- objects_seen.add(name)
-
+def gen_variants_objects(variants):
ret = ''
if variants:
for v in variants.variants:
if isinstance(v.type, QAPISchemaObjectType):
+ ret += gen_variants_objects(v.type.variants)
ret += gen_object(v.type.name, v.type.base,
v.type.local_members, v.type.variants)
+ return ret
- ret += mcgen('''
+
+def gen_object(name, base, members, variants):
+ if name in objects_seen:
+ return ''
+ objects_seen.add(name)
+
+ ret = mcgen('''
struct %(c_name)s {
''',
@@ -224,11 +228,7 @@ typedef struct QEnumLookup {
self.decl += gen_array(name, element_type)
self._gen_type_cleanup(name)
- def visit_object_type(self, name, info, base, members, variants, ifcond):
- # Nothing to do for the special empty builtin
- if name == 'q_empty':
- return
- self._fwdecl += gen_fwd_object_or_array(name)
+ def _gen_object(self, name, info, base, members, variants):
self.decl += gen_object(name, base, members, variants)
if base and not base.is_implicit():
self.decl += gen_upcast(name, base)
@@ -238,10 +238,18 @@ typedef struct QEnumLookup {
# implicit types won't be directly allocated/freed
self._gen_type_cleanup(name)
+ def visit_object_type(self, name, info, base, members, variants, ifcond):
+ # Nothing to do for the special empty builtin
+ if name == 'q_empty':
+ return
+ self._fwdecl += gen_fwd_object_or_array(name)
+ self.decl += gen_variants_objects(variants)
+ self._gen_object(name, info, base, members, variants)
+
def visit_alternate_type(self, name, info, variants, ifcond):
self._fwdecl += gen_fwd_object_or_array(name)
- self.decl += gen_object(name, None, [variants.tag_member], variants)
- self._gen_type_cleanup(name)
+ self.decl += gen_variants_objects(variants)
+ self._gen_object(name, info, None, [variants.tag_member], variants)
# If you link code generated from multiple schemata, you want only one
# instance of the code for built-in types. Generate it only when
--
2.14.1.146.gd35faa819
