mirror of https://gitee.com/openkylin/qemu.git
qapi: Split .connect_doc(), .check_doc() off .check()
Splitting documentation checking off the .check() methods makes them a bit more focused, which is welcome, as some of them are pretty big. It also prepares the ground for the following commits. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20191024110237.30963-9-armbru@redhat.com>
This commit is contained in:
parent
a4bd91d3f3
commit
ee1e6a1f6c
|
@ -51,6 +51,12 @@ def check(self, schema):
|
||||||
os.path.dirname(schema.fname))
|
os.path.dirname(schema.fname))
|
||||||
self._checked = True
|
self._checked = True
|
||||||
|
|
||||||
|
def connect_doc(self):
|
||||||
|
pass
|
||||||
|
|
||||||
|
def check_doc(self):
|
||||||
|
pass
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def ifcond(self):
|
def ifcond(self):
|
||||||
assert self._checked
|
assert self._checked
|
||||||
|
@ -217,7 +223,10 @@ def check(self, schema):
|
||||||
seen = {}
|
seen = {}
|
||||||
for m in self.members:
|
for m in self.members:
|
||||||
m.check_clash(self.info, seen)
|
m.check_clash(self.info, seen)
|
||||||
if self.doc:
|
|
||||||
|
def connect_doc(self):
|
||||||
|
if self.doc:
|
||||||
|
for m in self.members:
|
||||||
self.doc.connect_member(m)
|
self.doc.connect_member(m)
|
||||||
|
|
||||||
def is_implicit(self):
|
def is_implicit(self):
|
||||||
|
@ -345,8 +354,6 @@ def check(self, schema):
|
||||||
for m in self.local_members:
|
for m in self.local_members:
|
||||||
m.check(schema)
|
m.check(schema)
|
||||||
m.check_clash(self.info, seen)
|
m.check_clash(self.info, seen)
|
||||||
if self.doc:
|
|
||||||
self.doc.connect_member(m)
|
|
||||||
members = seen.values()
|
members = seen.values()
|
||||||
|
|
||||||
if self.variants:
|
if self.variants:
|
||||||
|
@ -358,9 +365,6 @@ def check(self, schema):
|
||||||
for f in self.features:
|
for f in self.features:
|
||||||
f.check_clash(self.info, seen)
|
f.check_clash(self.info, seen)
|
||||||
|
|
||||||
if self.doc:
|
|
||||||
self.doc.check()
|
|
||||||
|
|
||||||
self.members = members # mark completed
|
self.members = members # mark completed
|
||||||
|
|
||||||
# Check that the members of this type do not cause duplicate JSON members,
|
# Check that the members of this type do not cause duplicate JSON members,
|
||||||
|
@ -372,6 +376,15 @@ def check_clash(self, info, seen):
|
||||||
for m in self.members:
|
for m in self.members:
|
||||||
m.check_clash(info, seen)
|
m.check_clash(info, seen)
|
||||||
|
|
||||||
|
def connect_doc(self):
|
||||||
|
if self.doc:
|
||||||
|
for m in self.local_members:
|
||||||
|
self.doc.connect_member(m)
|
||||||
|
|
||||||
|
def check_doc(self):
|
||||||
|
if self.doc:
|
||||||
|
self.doc.check()
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def ifcond(self):
|
def ifcond(self):
|
||||||
assert self._checked
|
assert self._checked
|
||||||
|
@ -639,8 +652,13 @@ def check(self, schema):
|
||||||
"%s can't be distinguished from '%s'"
|
"%s can't be distinguished from '%s'"
|
||||||
% (v.describe(self.info), types_seen[qt]))
|
% (v.describe(self.info), types_seen[qt]))
|
||||||
types_seen[qt] = v.name
|
types_seen[qt] = v.name
|
||||||
if self.doc:
|
|
||||||
|
def connect_doc(self):
|
||||||
|
if self.doc:
|
||||||
|
for v in self.variants.variants:
|
||||||
self.doc.connect_member(v)
|
self.doc.connect_member(v)
|
||||||
|
|
||||||
|
def check_doc(self):
|
||||||
if self.doc:
|
if self.doc:
|
||||||
self.doc.check()
|
self.doc.check()
|
||||||
|
|
||||||
|
@ -1043,6 +1061,8 @@ def _def_exprs(self, exprs):
|
||||||
def check(self):
|
def check(self):
|
||||||
for ent in self._entity_list:
|
for ent in self._entity_list:
|
||||||
ent.check(self)
|
ent.check(self)
|
||||||
|
ent.connect_doc()
|
||||||
|
ent.check_doc()
|
||||||
|
|
||||||
def visit(self, visitor):
|
def visit(self, visitor):
|
||||||
visitor.visit_begin(self)
|
visitor.visit_begin(self)
|
||||||
|
|
Loading…
Reference in New Issue