yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 22:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Clean up after previous commit

Browse source 
QAPISchemaObjectTypeVariants.check() parameter members and
QAPISchemaObjectTypeVariant.check() parameter seen are no longer used,
drop them.

Backports commit cdc5fa37eda2896d2b08f9215c963256eb859d3b from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 20:13:21 -05:00 committed by Lioncash
parent f246800df6
commit f311d9c2d8
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qemu/scripts/qapi.py
View file

@ -995,7 +995,7 @@ class QAPISchemaObjectType(QAPISchemaType):
seen[m.name] = m seen[m.name] = m
members.append(m) members.append(m)
if self.variants: if self.variants:
self.variants.check(schema, members, seen) self.variants.check(schema, seen)
self.members = members self.members = members
def is_implicit(self): def is_implicit(self):
@ -1050,20 +1050,20 @@ class QAPISchemaObjectTypeVariants(object):
self.tag_member = tag_member self.tag_member = tag_member
self.variants = variants self.variants = variants
def check(self, schema, members, seen): def check(self, schema, seen):
if self.tag_name: # flat union if self.tag_name: # flat union
self.tag_member = seen[self.tag_name] self.tag_member = seen[self.tag_name]
if seen: if seen:
assert self.tag_member in seen.itervalues() 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)
class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember): class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember):
def __init__(self, name, typ): def __init__(self, name, typ):
QAPISchemaObjectTypeMember.__init__(self, name, typ, False) QAPISchemaObjectTypeMember.__init__(self, name, typ, False)
def check(self, schema, tag_type, seen): def check(self, schema, tag_type):
QAPISchemaObjectTypeMember.check(self, schema) QAPISchemaObjectTypeMember.check(self, schema)
assert self.name in tag_type.values assert self.name in tag_type.values
@ -1087,7 +1087,7 @@ class QAPISchemaAlternateType(QAPISchemaType):
def check(self, schema): def check(self, schema):
self.variants.tag_member.check(schema) self.variants.tag_member.check(schema)
self.variants.check(schema, [], {}) self.variants.check(schema, {})
def json_type(self): def json_type(self):
return 'value' return 'value'