From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtrRO-00044N-Ey for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtrRN-0006BG-4E for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41097) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtrRM-0006B6-Rz for qemu-devel@nongnu.org; Wed, 04 Nov 2015 01:21:00 -0500 From: Eric Blake Date: Tue, 3 Nov 2015 23:20:38 -0700 Message-Id: <1446618049-13596-17-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 16/27] qapi: Eliminate QAPISchemaObjectType.check() variable members 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 We can use seen.values() instead if we make it an OrderedDict. Signed-off-by: Markus Armbruster Message-Id: <1446559499-26984-5-git-send-email-armbru@redhat.com> [reorder series] Signed-off-by: Eric Blake --- v9: new patch --- scripts/qapi.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index bf03c24..4019389 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -977,26 +977,22 @@ class QAPISchemaObjectType(QAPISchemaType): if self.members: return self.members = False # mark as being checked + seen = OrderedDict() if self._base_name: self.base = schema.lookup_type(self._base_name) assert isinstance(self.base, QAPISchemaObjectType) assert not self.base.variants # not implemented self.base.check(schema) - members = list(self.base.members) - else: - members = [] - seen = {} - for m in members: - assert m.name not in seen - seen[m.name] = m + for m in self.base.members: + assert m.name not in seen + seen[m.name] = m for m in self.local_members: m.check(schema) assert m.name not in seen seen[m.name] = m - members.append(m) if self.variants: - self.variants.check(schema, members, seen) - self.members = members + self.variants.check(schema, [], seen) + self.members = seen.values() def is_implicit(self): # See QAPISchema._make_implicit_object_type() -- 2.4.3