mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Factor out QAPISchemaObjectType.check_clash()

Browse Source 
Consolidate two common sequences of clash detection into a
new QAPISchemaObjectType.check_clash() helper method.

No change to generated code.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1447836791-369-13-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-11-18 01:52:47 -07:00 committed by Markus Armbruster
parent b807a1e1e3
commit c2183d2e62
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/qapi.py
View File

@ -981,10 +981,8 @@ class QAPISchemaObjectType(QAPISchemaType):
if self._base_name: if self._base_name:
self.base = schema.lookup_type(self._base_name) self.base = schema.lookup_type(self._base_name)
assert isinstance(self.base, QAPISchemaObjectType) assert isinstance(self.base, QAPISchemaObjectType)
assert not self.base.variants # not implemented
self.base.check(schema) self.base.check(schema)
for m in self.base.members: self.base.check_clash(schema, seen)
m.check_clash(seen)
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)
@ -994,6 +992,11 @@ class QAPISchemaObjectType(QAPISchemaType):
assert self.variants.tag_member in self.members assert self.variants.tag_member in self.members
self.variants.check_clash(schema, seen) self.variants.check_clash(schema, seen)
def check_clash(self, schema, seen):
assert not self.variants # not implemented
for m in self.members:
m.check_clash(seen)
def is_implicit(self): def is_implicit(self):
# See QAPISchema._make_implicit_object_type() # See QAPISchema._make_implicit_object_type()
return self.name[0] == ':' return self.name[0] == ':'
@ -1064,11 +1067,8 @@ class QAPISchemaObjectTypeVariants(object):
for v in self.variants: for v in self.variants:
# Reset seen map for each variant, since qapi names from one # Reset seen map for each variant, since qapi names from one
# branch do not affect another branch # branch do not affect another branch
vseen = dict(seen)
assert isinstance(v.type, QAPISchemaObjectType) assert isinstance(v.type, QAPISchemaObjectType)
assert not v.type.variants # not implemented v.type.check_clash(schema, dict(seen))
for m in v.type.members:
m.check_clash(vseen)
class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember): class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember):