ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-9-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-10-26 16:34:47 -06:00 committed by Markus Armbruster
parent d02cf37766
commit f87ab7f9bd
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/qapi-types.py
View File

@ -51,10 +51,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
@ -126,14 +137,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;