Received: from eggs.gnu.org ([2001:4830:134:3::10]:49704) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtyEr-0004qM-0O for qemu-devel@nongnu.org; Wed, 04 Nov 2015 08:36:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtyEn-0007gi-Ln for qemu-devel@nongnu.org; Wed, 04 Nov 2015 08:36:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32907) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtyEn-0007ge-Gs for qemu-devel@nongnu.org; Wed, 04 Nov 2015 08:36:29 -0500 From: Markus Armbruster References: <1446618049-13596-1-git-send-email-eblake@redhat.com> <1446618049-13596-15-git-send-email-eblake@redhat.com> Date: Wed, 04 Nov 2015 14:36:26 +0100 In-Reply-To: <1446618049-13596-15-git-send-email-eblake@redhat.com> (Eric Blake's message of "Tue, 3 Nov 2015 23:20:36 -0700") Message-ID: <877flxopid.fsf@blackfin.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v9 14/27] qapi: Fix up commit 7618b91's clash sanity checking change List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eric Blake Cc: qemu-devel@nongnu.org, Michael Roth Eric Blake writes: > From: Markus Armbruster > > This hunk > > @@ -964,6 +965,7 @@ class QAPISchemaObjectType(QAPISchemaType): > members = [] > seen = {} > for m in members: > + assert c_name(m.name) not in seen > seen[m.name] = m > for m in self.local_members: > m.check(schema, members, seen) > > is plainly broken. > > Asserting the members inherited from base don't clash is somewhat > redundant, because self.base.check() just checked that. But it > doesn't hurt. > > The idea to use c_name(m.name) instead of m.name for collision > checking is sound, because we need to catch clashes between the m.name > and between the c_name(m.name), and when two m.name clash, then their > c_name() also clash. > > However, using c_name(m.name) instead of m.name in one of several > places doesn't work. See the very next line. > > Keep the assertion, but drop the c_name() for now. A future commit > will bring it back. > > Signed-off-by: Markus Armbruster > Message-Id: <1446559499-26984-4-git-send-email-armbru@redhat.com> > [change TAB to space] In the commit message. You had me wondering briefly whether my Emacs configuration to avoid tabs in QEMU code failed :) > Signed-off-by: Eric Blake > > --- > v9: new patch > --- > scripts/qapi.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/qapi.py b/scripts/qapi.py > index 145dbfe..c910715 100644 > --- a/scripts/qapi.py > +++ b/scripts/qapi.py > @@ -987,7 +987,7 @@ class QAPISchemaObjectType(QAPISchemaType): > members = [] > seen = {} > for m in members: > - assert c_name(m.name) not in seen > + assert m.name not in seen > seen[m.name] = m > for m in self.local_members: > m.check(schema, members, seen)