From 7d9586f900a9043025866f84c096b1842b0bbbf6 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 18 Nov 2015 01:52:38 -0700 Subject: [PATCH] qapi-types: Simplify gen_struct_field[s] 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 Message-Id: <1447836791-369-4-git-send-email-eblake@redhat.com> Signed-off-by: Markus Armbruster --- scripts/qapi-types.py | 44 +++++++++++++++++-------------------------- 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index 403768b89f..2f2f7dfd80 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -36,37 +36,18 @@ 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)) - return ret - - -def gen_struct_fields(local_members, base): - ret = '' - - 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 += mcgen(''' - /* Own members: */ -''') - - for memb in local_members: - ret += gen_struct_field(memb) + c_type=memb.type.c_type(), c_name=c_name(memb.name)) return ret @@ -77,7 +58,16 @@ struct %(c_name)s { ''', c_name=c_name(name)) - ret += gen_struct_fields(members, base) + if base: + ret += mcgen(''' + /* Members inherited from %(c_name)s: */ +''', + c_name=base.c_name()) + ret += gen_struct_fields(base.members) + ret += mcgen(''' + /* Own members: */ +''') + ret += gen_struct_fields(members) if variants: ret += gen_variants(variants)