From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpUcJ-0007D0-7l for qemu-devel@nongnu.org; Fri, 23 Oct 2015 01:10:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZpUcI-0003Lj-2b for qemu-devel@nongnu.org; Fri, 23 Oct 2015 01:10:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:39500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZpUcH-0003LU-UY for qemu-devel@nongnu.org; Fri, 23 Oct 2015 01:10:14 -0400 From: Eric Blake Date: Thu, 22 Oct 2015 23:09:58 -0600 Message-Id: <1445576998-2921-26-git-send-email-eblake@redhat.com> In-Reply-To: <1445576998-2921-1-git-send-email-eblake@redhat.com> References: <1445576998-2921-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v10 25/25] qapi: Simplify gen_struct_field() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth 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 --- v10: no change 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 d131430..f8fc272 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 @@ -65,7 +65,7 @@ def gen_struct_fields(members, base=None): ''') for memb in members: - ret += gen_struct_field(memb.name, memb.type, memb.optional) + ret += gen_struct_field(memb) return ret @@ -148,9 +148,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