yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-08 12:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Simplify QAPISchemaObjectTypeVariants.check()

Browse source 
Reduce the ugly flat union / simple union conditional by doing just
the essential work here, namely setting self.tag_member.
Move the rest to callers.

Backports commit 14ff84619c6bb9b729dbf8b127c1e4c56ed8c500 from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 20:18:57 -05:00 committed by Lioncash
parent 62f41569be
commit fda436e0b2
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
qemu/scripts/qapi.py
View file

@ -985,12 +985,13 @@ class QAPISchemaObjectType(QAPISchemaType):
self.base.check(schema) self.base.check(schema)
for m in self.base.members: for m in self.base.members:
m.check_clash(seen) m.check_clash(seen)
self.members = seen.values()
for m in self.local_members: for m in self.local_members:
m.check(schema) m.check(schema)
m.check_clash(seen) m.check_clash(seen)
if self.variants: if self.variants:
self.variants.check(schema, seen) self.variants.check(schema, seen)
self.members = seen.values() assert self.variants.tag_member in self.members
def is_implicit(self): def is_implicit(self):
# See QAPISchema._make_implicit_object_type() # See QAPISchema._make_implicit_object_type()
@ -1050,10 +1051,8 @@ class QAPISchemaObjectTypeVariants(object):
self.variants = variants self.variants = variants
def check(self, schema, seen): def check(self, schema, seen):
if self.tag_name: # flat union if not self.tag_member: # flat union
self.tag_member = seen[self.tag_name] self.tag_member = seen[self.tag_name]
if seen:
assert self.tag_member in seen.itervalues()
assert isinstance(self.tag_member.type, QAPISchemaEnumType) assert isinstance(self.tag_member.type, QAPISchemaEnumType)
for v in self.variants: for v in self.variants:
v.check(schema, self.tag_member.type) v.check(schema, self.tag_member.type)