[v4,19/34] qapi/schema: Call QAPIDoc.connect_member() in just one place

Commit Message

Markus Armbruster March 17, 2020, 11:54 a.m. UTC

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 <[e-mail]>
Reviewed-by: Marc-André Lureau <[e-mail]>
---
 scripts/qapi/schema.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

Patch

diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index 033c84c4a0..59e1f5a395 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -252,9 +252,8 @@  class QAPISchemaEnumType(QAPISchemaType):
     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 @@  class QAPISchemaObjectType(QAPISchemaType):
     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 @@  class QAPISchemaAlternateType(QAPISchemaType):
     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 @@  class QAPISchemaMember:
                 % (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