From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34237) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtrRP-00046o-Qn for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtrRP-0006CQ-1i for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38762) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtrRO-0006CH-SX for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:02 -0500 From: Eric Blake Date: Tue, 3 Nov 2015 23:20:42 -0700 Message-Id: <1446618049-13596-21-git-send-email-eblake@redhat.com> In-Reply-To: <1446618049-13596-1-git-send-email-eblake@redhat.com> References: <1446618049-13596-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v9 20/27] qapi: Simplify QAPISchemaObjectTypeVariants.check() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Michael Roth From: Markus Armbruster Avoid the 'if seen' conditional by doing just the essential work here, namely setting self.tag_member for flat unions. Move the rest to callers. Signed-off-by: Markus Armbruster Message-Id: <1446559499-26984-7-git-send-email-armbru@redhat.com> [reword commit, rebase to earlier AlternateType.check() changes] Signed-off-by: Eric Blake --- v9: new patch --- scripts/qapi.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 3054628..6653c70 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -988,9 +988,10 @@ class QAPISchemaObjectType(QAPISchemaType): for m in self.local_members: m.check(schema) m.check_clash(seen) + self.members = seen.values() if self.variants: self.variants.check(schema, seen) - self.members = seen.values() + assert self.variants.tag_member in self.members def is_implicit(self): # See QAPISchema._make_implicit_object_type() @@ -1053,8 +1054,6 @@ class QAPISchemaObjectTypeVariants(object): # seen is non-empty for unions, empty for alternates if self.tag_name: # flat union self.tag_member = seen[self.tag_name] - if seen: - assert self.tag_member in seen.itervalues() assert isinstance(self.tag_member.type, QAPISchemaEnumType) for v in self.variants: # Reset seen array for each variant, since qapi names from one -- 2.4.3