motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-01 14:53:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <1446559499-26984-7-git-send-email-armbru@redhat.com>
[rebase to earlier changes that moved tag_member.check() of
alternate types, and tweak commit title and wording]
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-11-git-send-email-eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2015-11-18 01:52:45 -07:00
parent 577de12d22
commit 14ff84619c
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/qapi.py
View file

@ -988,9 +988,10 @@ class QAPISchemaObjectType(QAPISchemaType):
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)
self.members = seen.values()
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)