yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-05-11 19:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi-types: Refactor base fields output

Browse source 
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
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qemu/scripts/qapi-types.py
View file

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