mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 01:43:39 +00:00
qapi/schema: Call QAPIDoc.connect_member() in just one place
The .connect_doc() of classes that have QAPISchemaMember connect them to their documentation. Change them to delegate the actual work to new QAPISchemaMember.connect_doc(). Matches the .connect_doc() that already exist. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Message-Id: <20200317115459.31821-20-armbru@redhat.com>
This commit is contained in:
parent
5858fd1a02
commit
645178c069
|
@ -252,9 +252,8 @@ def check(self, schema):
|
|||
def connect_doc(self, doc=None):
|
||||
super().connect_doc(doc)
|
||||
doc = doc or self.doc
|
||||
if doc:
|
||||
for m in self.members:
|
||||
doc.connect_member(m)
|
||||
for m in self.members:
|
||||
m.connect_doc(doc)
|
||||
|
||||
def is_implicit(self):
|
||||
# See QAPISchema._make_implicit_enum_type() and ._def_predefineds()
|
||||
|
@ -396,11 +395,10 @@ def check_clash(self, info, seen):
|
|||
def connect_doc(self, doc=None):
|
||||
super().connect_doc(doc)
|
||||
doc = doc or self.doc
|
||||
if doc:
|
||||
if self.base and self.base.is_implicit():
|
||||
self.base.connect_doc(doc)
|
||||
for m in self.local_members:
|
||||
doc.connect_member(m)
|
||||
if self.base and self.base.is_implicit():
|
||||
self.base.connect_doc(doc)
|
||||
for m in self.local_members:
|
||||
m.connect_doc(doc)
|
||||
|
||||
@property
|
||||
def ifcond(self):
|
||||
|
@ -496,9 +494,8 @@ def check(self, schema):
|
|||
def connect_doc(self, doc=None):
|
||||
super().connect_doc(doc)
|
||||
doc = doc or self.doc
|
||||
if doc:
|
||||
for v in self.variants.variants:
|
||||
doc.connect_member(v)
|
||||
for v in self.variants.variants:
|
||||
v.connect_doc(doc)
|
||||
|
||||
def c_type(self):
|
||||
return c_name(self.name) + pointer_suffix
|
||||
|
@ -627,6 +624,10 @@ def check_clash(self, info, seen):
|
|||
% (self.describe(info), seen[cname].describe(info)))
|
||||
seen[cname] = self
|
||||
|
||||
def connect_doc(self, doc):
|
||||
if doc:
|
||||
doc.connect_member(self)
|
||||
|
||||
def describe(self, info):
|
||||
role = self.role
|
||||
defined_in = self.defined_in
|
||||
|
|
Loading…
Reference in a new issue