qapi-types: Refactor base fields output

Move code from gen_union() into gen_struct_fields() in order for
a later patch to share code when enumerating inherited fields
for struct types.

No change to generated code.

Backports commit f87ab7f9bd956250c48b5c6e9b607b537fd21543 from qemu
This commit is contained in:
Eric Blake 2018-02-19 19:12:59 -05:00 committed by Lioncash
parent 61e59c4c62
commit ac0ee0286c
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7

View file

@ -49,10 +49,21 @@ def gen_struct_field(name, typ, optional):
return ret
def gen_struct_fields(members):
def gen_struct_fields(local_members, base=None):
ret = ''
for memb in members:
if base:
ret += mcgen('''
/* Members inherited from %(c_name)s: */
''',
c_name=base.c_name())
for memb in base.members:
ret += gen_struct_field(memb.name, memb.type, memb.optional)
ret += mcgen('''
/* Own members: */
''')
for memb in local_members:
ret += gen_struct_field(memb.name, memb.type, memb.optional)
return ret
@ -122,14 +133,7 @@ struct %(c_name)s {
''',
c_name=c_name(name))
if base:
ret += mcgen('''
/* Members inherited from %(c_name)s: */
''',
c_name=c_name(base.name))
ret += gen_struct_fields(base.members)
ret += mcgen('''
/* Own members: */
''')
ret += gen_struct_fields([], base)
else:
ret += mcgen('''
%(c_type)s kind;