[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/40] qapi-types: Simplify gen_struct_field[s]
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 03/40] qapi-types: Simplify gen_struct_field[s] |
Date: |
Thu, 17 Dec 2015 09:33:08 +0100 |
From: Eric Blake <address@hidden>
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.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi-types.py | 40 +++++++++++++++-------------------------
1 file changed, 15 insertions(+), 25 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 403768b..2f2f7df 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -36,48 +36,38 @@ struct %(c_name)s {
c_name=c_name(name), c_type=element_type.c_type())
-def gen_struct_field(member):
+def gen_struct_fields(members):
ret = ''
-
- if member.optional:
- ret += mcgen('''
+ for memb in members:
+ if memb.optional:
+ ret += mcgen('''
bool has_%(c_name)s;
''',
- c_name=c_name(member.name))
- ret += mcgen('''
+ c_name=c_name(memb.name))
+ ret += mcgen('''
%(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
-def gen_struct_fields(local_members, base):
- ret = ''
+def gen_object(name, base, members, variants):
+ ret = mcgen('''
+
+struct %(c_name)s {
+''',
+ c_name=c_name(name))
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)
+ ret += gen_struct_fields(base.members)
ret += mcgen('''
/* Own 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)
+ ret += gen_struct_fields(members)
if variants:
ret += gen_variants(variants)
--
2.4.3
- [Qemu-devel] [PULL 00/40] QAPI patches for 2015-12-17, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 09/40] qapi: Factor out QAPISchemaObjectTypeMember.check_clash(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 02/40] qapi-types: Consolidate gen_struct() and gen_union(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 05/40] qapi: Simplify QAPISchemaObjectTypeMember.check(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 07/40] qapi: Fix up commit 7618b91's clash sanity checking change, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 06/40] qapi: Clean up after previous commit, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 10/40] qapi: Simplify QAPISchemaObjectTypeVariants.check(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 04/40] qapi: Drop obsolete tag value collision assertions, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 03/40] qapi-types: Simplify gen_struct_field[s],
Markus Armbruster <=
- [Qemu-devel] [PULL 12/40] qapi: Factor out QAPISchemaObjectType.check_clash(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 01/40] qapi: Track simple union tag in object.local_members, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 17/40] qapi: Fix c_name() munging, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 19/40] blkdebug: Merge hand-rolled and qapi BlkdebugEvent enum, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 18/40] qapi: Remove dead visitor code, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 24/40] cpu: Convert CpuInfo into flat union, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 25/40] qapi: Add alias for ErrorClass, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 32/40] qapi: Inline _make_implicit_tag(), Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 14/40] qapi: Remove outdated tests related to QMP/branch collisions, Markus Armbruster, 2015/12/17
- [Qemu-devel] [PULL 08/40] qapi: Eliminate QAPISchemaObjectType.check() variable members, Markus Armbruster, 2015/12/17