From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcCv-0008Ed-Dj for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:05:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtcCu-0005cD-9i for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:05:05 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50697) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcCu-0005bo-5f for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:05:04 -0500 From: Markus Armbruster Date: Tue, 3 Nov 2015 15:04:58 +0100 Message-Id: <1446559499-26984-6-git-send-email-armbru@redhat.com> In-Reply-To: <1446559499-26984-1-git-send-email-armbru@redhat.com> References: <87611jjq98.fsf@blackfin.pond.sub.org> <1446559499-26984-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] qapi: Factor out QAPISchemaObjectTypeMember.check_clash() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com While there, stick in a TODO change key of seen from QAPI name to C name. Can't do it right away, because it would fail the assertion for tests/qapi-schema/args-has-clash.json. Signed-off-by: Markus Armbruster --- scripts/qapi.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index a46fded..f0cbb7e 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -984,12 +984,10 @@ class QAPISchemaObjectType(QAPISchemaType): assert not self.base.variants # not implemented self.base.check(schema) for m in self.base.members: - assert m.name not in seen - seen[m.name] = m + m.check_clash(seen) for m in self.local_members: m.check(schema) - assert m.name not in seen - seen[m.name] = m + m.check_clash(seen) if self.variants: self.variants.check(schema, seen) self.members = seen.values() @@ -1030,6 +1028,11 @@ class QAPISchemaObjectTypeMember(object): self.type = schema.lookup_type(self._type_name) assert self.type + def check_clash(self, seen): + # TODO change key of seen from QAPI name to C name + assert self.name not in seen + seen[self.name] = self + class QAPISchemaObjectTypeVariants(object): def __init__(self, tag_name, tag_member, variants): -- 2.4.3