[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 25/25] qapi: Simplify gen_struct_field()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 25/25] qapi: Simplify gen_struct_field() |
Date: |
Mon, 2 Nov 2015 10:13:30 +0100 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi-types.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 7e35bb6..b37900f 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -36,18 +36,18 @@ struct %(c_name)s {
c_name=c_name(name), c_type=element_type.c_type())
-def gen_struct_field(name, typ, optional):
+def gen_struct_field(member):
ret = ''
- if optional:
+ if member.optional:
ret += mcgen('''
bool has_%(c_name)s;
''',
- c_name=c_name(name))
+ c_name=c_name(member.name))
ret += mcgen('''
%(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
@@ -60,13 +60,13 @@ def gen_struct_fields(local_members, base=None):
''',
c_name=base.c_name())
for memb in base.members:
- ret += gen_struct_field(memb.name, memb.type, memb.optional)
+ ret += gen_struct_field(memb)
ret += mcgen('''
/* Own members: */
''')
for memb in local_members:
- ret += gen_struct_field(memb.name, memb.type, memb.optional)
+ ret += gen_struct_field(memb)
return ret
@@ -149,9 +149,7 @@ struct %(c_name)s {
if base:
ret += gen_struct_fields([], base)
else:
- ret += gen_struct_field(variants.tag_member.name,
- variants.tag_member.type,
- False)
+ ret += gen_struct_field(variants.tag_member)
# 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
--
2.4.3
- [Qemu-devel] [PULL v2 12/25] qapi-visit: Remove redundant functions for flat union base, (continued)
- [Qemu-devel] [PULL v2 12/25] qapi-visit: Remove redundant functions for flat union base, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 09/25] qapi-types: Refactor base fields output, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 13/25] qapi: Start converting to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 11/25] qapi: Unbox base members, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 18/25] net: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 15/25] tests: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 16/25] block: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 20/25] input: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 17/25] sockets: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 23/25] qapi: Finish converting to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 25/25] qapi: Simplify gen_struct_field(),
Markus Armbruster <=
- [Qemu-devel] [PULL v2 21/25] memory: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 24/25] qapi: Reserve 'u' member name, Markus Armbruster, 2015/11/02
- [Qemu-devel] [PULL v2 19/25] char: Convert to new qapi union layout, Markus Armbruster, 2015/11/02
- Re: [Qemu-devel] [PULL v2 00/25] QAPI patches, Peter Maydell, 2015/11/02