mirror of https://gitee.com/openkylin/qemu.git
qapi: Clean up after previous commit
QAPISchemaObjectTypeVariants.check() parameter members and QAPISchemaObjectTypeVariant.check() parameter seen are no longer used, drop them. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <1446559499-26984-3-git-send-email-armbru@redhat.com> [rebase to earlier changes that moved tag_member.check() of alternate types] Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1447836791-369-7-git-send-email-eblake@redhat.com>
This commit is contained in:
parent
e564e2dd59
commit
cdc5fa37ed
|
@ -995,7 +995,7 @@ def check(self, schema):
|
|||
seen[m.name] = m
|
||||
members.append(m)
|
||||
if self.variants:
|
||||
self.variants.check(schema, members, seen)
|
||||
self.variants.check(schema, seen)
|
||||
self.members = members
|
||||
|
||||
def is_implicit(self):
|
||||
|
@ -1050,21 +1050,21 @@ def __init__(self, tag_name, tag_member, variants):
|
|||
self.tag_member = tag_member
|
||||
self.variants = variants
|
||||
|
||||
def check(self, schema, members, seen):
|
||||
def check(self, schema, seen):
|
||||
if self.tag_name: # flat union
|
||||
self.tag_member = seen[self.tag_name]
|
||||
if seen:
|
||||
assert self.tag_member in seen.itervalues()
|
||||
assert isinstance(self.tag_member.type, QAPISchemaEnumType)
|
||||
for v in self.variants:
|
||||
v.check(schema, self.tag_member.type, {})
|
||||
v.check(schema, self.tag_member.type)
|
||||
|
||||
|
||||
class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember):
|
||||
def __init__(self, name, typ):
|
||||
QAPISchemaObjectTypeMember.__init__(self, name, typ, False)
|
||||
|
||||
def check(self, schema, tag_type, seen):
|
||||
def check(self, schema, tag_type):
|
||||
QAPISchemaObjectTypeMember.check(self, schema)
|
||||
assert self.name in tag_type.values
|
||||
|
||||
|
@ -1088,7 +1088,7 @@ def __init__(self, name, info, variants):
|
|||
|
||||
def check(self, schema):
|
||||
self.variants.tag_member.check(schema)
|
||||
self.variants.check(schema, [], {})
|
||||
self.variants.check(schema, {})
|
||||
|
||||
def json_type(self):
|
||||
return 'value'
|
||||
|
|
Loading…
Reference in New Issue