mirror of
https://github.com/yuzu-emu/unicorn
synced 2024-11-25 23:28:06 +00:00
qapi: Fix up commit 7618b91's clash sanity checking change
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. Backports commit 08683353fc46b5d462199c9e8cff6f6c67f20f65 from qemu
This commit is contained in:
parent
f311d9c2d8
commit
a0d6b16297
1 changed files with 1 additions and 1 deletions
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue