convertDoxygen: Add docstrings to more python objects

.gitignore

@@ -1,4 +1,3 @@
 .p4*
 .DS_Store
-.AppleDouble
-
+.AppleDouble

docs/python/convertDoxygen.py

@@ -106,11 +106,13 @@
     # Loop through module list and create a Writer for each module to 
     # load and generate the doc strings for the specific module
     for moduleName in moduleList:
+        if not moduleName:
+            continue
         writer = Writer(packageName, moduleName)
         # Parser.traverse builds the docElement tree for all the 
         # doxygen XML files, so we only need to call it once if we're
         # processing multiple modules
-        if (docList == None):
+        if (docList is None):
             docList = parser.traverse(writer)
             Debug("Processed %d DocElements from doxygen XML" % len(docList))
         Debug("Processing module %s" % moduleName)
@@ -120,8 +122,12 @@
         module_output_file = os.path.join(module_output_dir, "__DOC.py")
         writer.generate(module_output_file, docList)
 else:
+    moduleName = modules
     # Processing a single module. Writer's constructor will sanity
     # check module and verify it can be loaded
-    writer = Writer()
+    if not output_file.endswith(".py"):
+        module_output_dir = os.path.join(output_file, moduleName)
+        output_file = os.path.join(module_output_dir, "__DOC.py")
+    writer = Writer(packageName, moduleName)
     docList = parser.traverse(writer)
-    writer.generate(output_file, docList)
+    writer.generate(output_file, docList)

docs/python/doxygenlib/cdDocElement.py

@@ -29,9 +29,14 @@
 #
 # The Parser class is responsible for building up a list of these objects.
 #
+from collections import namedtuple
 
 from .cdUtils import Warn
 
+
+Param = namedtuple("Param", "type name default")
+
+
 class DocElement:
     """
     Describe the documentation for a single class, method, function, etc.
@@ -45,6 +50,9 @@ class DocElement:
     same function, i.e., in C++ parlance, the overloaded methods.
     """
 
+    __slots__ = ("name", "kind", "prot", "doc", "location", "children", "const", "virt", "explicit",
+                 "static", "inline", "returnType", "argsString", "definition", "params")
+
     def __init__(self, name, kind, prot, doc, location):
         self.name = name                     # the name of this class/method
         self.kind = kind                     # e.g., function, class, etc.
@@ -60,7 +68,10 @@ def __init__(self, name, kind, prot, doc, location):
         self.returnType = None               # return type of a method/function
         self.argsString = None               # arguments for this method/func
         self.definition = None               # full C++ definition for method
-        self.params = None                   # name and type of each parameter
+        self.params = None                   # type, name, and default of each parameter
+
+    def __repr__(self):
+        return "%s(%r, %r, %r, ...)" % (self.__class__.__name__, self.name, self.kind, self.location)
 
     def isFunction(self):
         """Is this doc element a function?"""
@@ -86,6 +97,10 @@ def isRoot(self):
         """Is this doc element the root of the doxygen XML tree?"""
         return self.kind == 'root'
 
+    def isStatic(self):
+        """Is this doc element static?"""
+        return self.static is not None and self.static == 'yes'
+
     def addChildren(self, children):
         """Adds the list of nodes as children of this node."""
         for child in children:
@@ -103,7 +118,7 @@ def replaceInnerClass(self, innerClassName, obj):
                 del(self.children[childName])
                 self.__addChild(obj)
                 return
-        Warn('could not find innerclass %s in %s' % (innerClassName,self.name))
+        Warn('%r: could not find innerclass %s in %s' % (self, innerClassName,self.name))
 
     def __addChild(self, child):
         if child.name in self.children:
@@ -120,8 +135,8 @@ def __addChild(self, child):
                     # so just ignore it.
                     pass
                 else:
-                    Warn('overload mismatch: expected functions, got %s and %s' % \
-                          (self.children[child.name][0].kind, child.kind))
+                    Warn('%r: overload mismatch: expected functions, got %s and %s' % \
+                         (self, self.children[child.name][0].kind, child.kind))
         else:
             self.children[child.name] = [child]
 

docs/python/doxygenlib/cdParser.py

@@ -42,13 +42,18 @@ class XMLNode:
     """
     Rrepresent a single node in the XML tree.
     """
+    __slots__ = ("parent", "name", "attrs", "text", "childNodes")
+
     def __init__(self, parent, name, attrs, text):
         self.parent = parent
         self.name = name
         self.attrs = attrs
         self.text = text
         self.childNodes = []
 
+    def __repr__(self) -> str:
+        return "XMLNode(%s, %s, ...)" % (self.name, self.attrs.items())
+
     def addChildNode(self, node):
         """Append the specifed node to the children of this node."""
         self.childNodes.append(node)
@@ -221,8 +226,7 @@ def parseDoxygenIndexFile(self, doxygen_index_file):
                     continue
                 if (kind == "dir"):
                     continue
-                if (kind == "file"):
-                    continue
+                # we need to keep kind == "file" because this holds info on functions
                 refid = compound_element.get('refid')
                 # Individual entity XML generated XML files are <refid>.xml
                 entity_file_name = refid + ".xml"
@@ -357,7 +361,8 @@ def __getAllParams(self, node):
             if child.name == 'param':
                 pname = child.getText('declname')
                 ptype = child.getText('type')
-                params.append((ptype, pname))
+                pdefault = child.getText('defval') or None
+                params.append(Param(ptype, pname, pdefault))
         return params
 
     def __createDocElement(self, node):
@@ -382,7 +387,10 @@ def __createDocElement(self, node):
             prot = ''
             doc = self.__getAllDocStrings(node, name)
             location = node.getLocation()
-            ret = DocElement(name, kind, prot, doc, location)
+            if location != ('', ''):
+                # These elements shadow class elements of the same name, but they 
+                # lack any valuable information, and thus create empty docstrings.
+                ret = DocElement(name, kind, prot, doc, location)
         elif node.name == 'compounddef':
             kind = node.getKind()
             if kind == 'class' or kind == 'struct':

docs/python/doxygenlib/cdWriterDocstring.py

@@ -52,29 +52,6 @@ class Writer:
     # we can combine property docstrings for getters/setters.
     propertyTable = {}
 
-    # Default constructor that assumes we're processing a single module
-    def __init__(self):
-        #
-        # Parse the extra arguments required by this plugin
-        #
-        project = GetArgValue(['--package', '-p'])
-        package = GetArgValue(['--module', '-m'])
-
-        if not project:
-            Error("Required option --package not specified")
-        if not package:
-            Error("Required option --module not specified")
-
-        # Import the python module that these docs pertain to
-        if not Import("from " +project+ " import " +package+ " as " +package):
-            Error("Could not import %s" % (package))
-
-        self.module = eval(package)
-        self.prefix = self.module.__name__.split('.')[-1]
-        self.seenPaths = {}
-
-    # Constructor that takes package and module name, used when processing 
-    # a list of modules
     def __init__(self, packageName, moduleName):
 
         # Import the python module 
@@ -295,11 +272,14 @@ def generate(self, output_file, docElements):
         if len(lines) == 1:
             lines.append("    pass")
 
+        outputDir = os.path.split(output_file)[0]
+        if not os.path.exists(outputDir):
+            os.makedirs(outputDir)
+
         # output the lines to disk...
         try:
-            logfile = open(output_file, 'w')
-            logfile.write('\n'.join(lines))
-            logfile.close()
+            with open(output_file, 'w') as logfile:
+                logfile.write('\n'.join(lines))
         except:
             Error("Could not write to file: %s" % output_file)
 
@@ -502,11 +482,14 @@ def __getSignatureString(self, pyname, pyobj, doxy):
         if doxy.isFunction():
             cnt = 1;
             pnames = []
-            for ptype, pname in doxy.params:
+            for ptype, pname, pdefault in doxy.params:
                 if len(pname):
-                    pnames.append(pname)
+                    arg = pname
                 else:
-                    pnames.append('arg%s' % cnt)
+                    arg = 'arg%s' % cnt
+                if pdefault is not None:
+                    arg += '=...'
+                pnames.append(arg)
                 cnt += 1
             sig = '('+', '.join(pnames)+')'
             retType = self.__convertTypeName(doxy.returnType)
@@ -520,7 +503,7 @@ def __getSignatureDescription(self, pyname, pyobj, doxy):
         if doxy.isFunction():
             cnt = 0
             lines = []
-            for ptype, pname in doxy.params:
+            for ptype, pname, pdefault in doxy.params:
                 cnt += 1
                 if not len(pname):
                     pname = 'arg%s' % cnt
@@ -593,11 +576,11 @@ def __getOutputFormat(self, pypath, pyobj, overloads):
 
         if len(overloads) == 1:
             lines += self.__getFullDoc(pyname, pyobj, overloads[0])
-            if overloads[0].static == 'yes':
+            if overloads[0].isStatic():
                 docString = LABEL_STATIC # set the return type to static
         else:
             for doxy in overloads:
-                if doxy.static == 'yes':
+                if doxy.isStatic():
                     docString = LABEL_STATIC # set the return type to static
 
                 desc = self.__getFullDoc(pyname, pyobj, doxy)