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

qapi-types: Simplify gen_struct_field[s]

Browse source 
Simplify gen_struct_fields() back to a single iteration over a
list of fields (like it was prior to commit f87ab7f9), by moving
the generated comments to gen_object(). Then, inline
gen_struct_field() into its only caller.

Backports commit 7d9586f900a9043025866f84c096b1842b0bbbf6 from qemu
This commit is contained in:
Eric Blake 2018-02-19 20:06:36 -05:00 committed by Lioncash
parent f637efea10
commit 5899d98959
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,46 +34,39 @@ struct %(c_name)s {
c_name=c_name(name), c_type=element_type.c_type()) c_name=c_name(name), c_type=element_type.c_type())
def gen_struct_field(member): def gen_struct_fields(members):
ret = '' ret = ''
if member.optional: for memb in members:
ret += mcgen(''' if memb.optional:
ret += mcgen('''
bool has_%(c_name)s; bool has_%(c_name)s;
''', ''',
c_name=c_name(member.name)) c_name=c_name(memb.name))
ret += mcgen(''' ret += mcgen('''
%(c_type)s %(c_name)s; %(c_type)s %(c_name)s;
''', ''',
c_type=member.type.c_type(), c_name=c_name(member.name)) c_type=memb.type.c_type(), c_name=c_name(memb.name))
return ret return ret
def gen_struct_fields(local_members, base): def gen_object(name, base, members, variants):
ret = '' ret = mcgen('''
struct %(c_name)s {
''',
c_name=c_name(name))
if base: if base:
ret += mcgen(''' ret += mcgen('''
/* Members inherited from %(c_name)s: */ /* Members inherited from %(c_name)s: */
''', ''',
c_name=base.c_name()) c_name=base.c_name())
for memb in base.members: ret += gen_struct_fields(base.members)
ret += gen_struct_field(memb)
ret += mcgen(''' ret += mcgen('''
/* Own members: */ /* Own members: */
''') ''')
ret += gen_struct_fields(members)
for memb in local_members:
ret += gen_struct_field(memb)
return ret
def gen_object(name, base, members, variants):
ret = mcgen('''
struct %(c_name)s {
''',
c_name=c_name(name))
ret += gen_struct_fields(members, base)
if variants: if variants:
ret += gen_variants(variants) ret += gen_variants(variants)