[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v9 17/17] qapi: Simplify gen_struct_field()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v9 17/17] qapi: Simplify gen_struct_field() |
Date: |
Thu, 15 Oct 2015 22:15:42 -0600 |
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>
---
v9: rebase after kind/base cleanups, don't rely on member.c_name()
v8: new patch
---
scripts/qapi-types.py | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 4ba39b6..235fe07 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
@@ -66,7 +66,7 @@ def gen_struct_fields(members, base, nested=False):
''')
for memb in members:
- ret += gen_struct_field(memb.name, memb.type, memb.optional)
+ ret += gen_struct_field(memb)
return ret
@@ -136,9 +136,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] [PATCH v9 17/17] qapi: Simplify gen_struct_field(),
Eric Blake <=
[Qemu-devel] [PATCH v9 16/17] qapi: Finish converting to new qapi union layout, Eric Blake, 2015/10/16
[Qemu-devel] [PATCH v9 15/17] tpm: Convert to new qapi union layout, Eric Blake, 2015/10/16
[Qemu-devel] [PATCH v9 09/17] block: Convert to new qapi union layout, Eric Blake, 2015/10/16
[Qemu-devel] [PATCH v9 14/17] memory: Convert to new qapi union layout, Eric Blake, 2015/10/16
Re: [Qemu-devel] [PATCH v9 00/17] qapi collision reduction (post-introspection subset B'), Markus Armbruster, 2015/10/22