yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-20 03:28:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Detect collisions in C member names

Browse Source 
Detect attempts to declare two object members that would result
in the same C member name, by keying the 'seen' dictionary off
of the C name rather than the qapi name. It also requires passing
info through the check_clash() methods.

This addresses a TODO and fixes the previously-broken
args-name-clash test. The resulting error message demonstrates
the utility of the .describe() method added previously. No change
to generated code.

Backports commit 27b60ab93bd1d5d8c85f009aac7a97ffd2c53c86 from qemu
This commit is contained in:
Eric Blake 2018-02-19 20:30:18 -05:00 committed by Lioncash
parent e9647be986
commit bc1e31663e
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
qemu/scripts/qapi.py
View File

@ -978,20 +978,23 @@ class QAPISchemaObjectType(QAPISchemaType):
self.base = schema.lookup_type(self._base_name)
assert isinstance(self.base, QAPISchemaObjectType)
self.base.check(schema)
self.base.check_clash(schema, seen)
self.base.check_clash(schema, self.info, seen)
self.members = seen.values()
for m in self.local_members:
m.check(schema)
m.check_clash(seen)
m.check_clash(self.info, seen)
if self.variants:
self.variants.check(schema, seen)
assert self.variants.tag_member in self.members
self.variants.check_clash(schema, seen)
self.variants.check_clash(schema, self.info, seen)
def check_clash(self, schema, seen):
# Check that the members of this type do not cause duplicate JSON fields,
# and update seen to track the members seen so far. Report any errors
# on behalf of info, which is not necessarily self.info
def check_clash(self, schema, info, seen):
assert not self.variants # not implemented
for m in self.members:
m.check_clash(seen)
m.check_clash(info, seen)
def is_implicit(self):
# See QAPISchema._make_implicit_object_type()
@ -1037,10 +1040,13 @@ 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
def check_clash(self, info, seen):
cname = c_name(self.name)
if cname in seen:
raise QAPIExprError(info,
"%s collides with %s"
% (self.describe(), seen[cname].describe()))
seen[cname] = self
def _pretty_owner(self):
owner = self.owner
@ -1081,7 +1087,8 @@ class QAPISchemaObjectTypeVariants(object):
def check(self, schema, seen):
if not self.tag_member: # flat union
self.tag_member = seen[self.tag_name]
self.tag_member = seen[c_name(self.tag_name)]
assert self.tag_name == self.tag_member.name
assert isinstance(self.tag_member.type, QAPISchemaEnumType)
for v in self.variants:
v.check(schema)
@ -1089,12 +1096,12 @@ class QAPISchemaObjectTypeVariants(object):
if isinstance(v.type, QAPISchemaObjectType):
v.type.check(schema)
def check_clash(self, schema, seen):
def check_clash(self, schema, info, seen):
for v in self.variants:
# Reset seen map for each variant, since qapi names from one
# branch do not affect another branch
assert isinstance(v.type, QAPISchemaObjectType)
v.type.check_clash(schema, dict(seen))
v.type.check_clash(schema, info, dict(seen))
class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember):