mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Simplify gen_struct_field()

Browse Source 
Rather than having all callers pass a name, type, and optional
flag, have them instead pass a QAPISchemaObjectTypeMember which
already has all that information.

No change to generated code.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1445898903-12082-25-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:35:03 -06:00 committed by Markus Armbruster
parent 5e59baf90a
commit 32bc6879be
1 changed files with 7 additions and 9 deletions

16
scripts/qapi-types.py

@ -36,18 +36,18 @@ 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(name, typ, optional): def gen_struct_field(member):
ret = '' ret = ''
if optional: if member.optional:
ret += mcgen(''' ret += mcgen('''
bool has_%(c_name)s; bool has_%(c_name)s;
''', ''',
c_name=c_name(name)) c_name=c_name(member.name))
ret += mcgen(''' ret += mcgen('''
%(c_type)s %(c_name)s; %(c_type)s %(c_name)s;
''', ''',
c_type=typ.c_type(), c_name=c_name(name)) c_type=member.type.c_type(), c_name=c_name(member.name))
return ret return ret
@ -60,13 +60,13 @@ def gen_struct_fields(local_members, base=None):
''', ''',
c_name=base.c_name()) c_name=base.c_name())
for memb in base.members: for memb in base.members:
ret += gen_struct_field(memb.name, memb.type, memb.optional) ret += gen_struct_field(memb)
ret += mcgen(''' ret += mcgen('''
/* Own members: */ /* Own members: */
''') ''')
for memb in local_members: for memb in local_members:
ret += gen_struct_field(memb.name, memb.type, memb.optional) ret += gen_struct_field(memb)
return ret return ret
@ -149,9 +149,7 @@ struct %(c_name)s {
if base: if base:
ret += gen_struct_fields([], base) ret += gen_struct_fields([], base)
else: else:
ret += gen_struct_field(variants.tag_member.name, ret += gen_struct_field(variants.tag_member)
variants.tag_member.type,
False)
# FIXME: What purpose does data serve, besides preventing a union that # FIXME: What purpose does data serve, besides preventing a union that
# has a branch named 'data'? We use it in qapi-visit.py to decide # has a branch named 'data'? We use it in qapi-visit.py to decide