Function lookup, more stripping of declarators

breathe-doc · Sep 2, 2021 · b3ec822 · b3ec822
1 parent bd26a7f
commit b3ec822
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/breathe/directives/function.py b/breathe/directives/function.py
@@ -148,15 +148,20 @@ def stripParamQual(paramQual):
                     continue
                 p.arg.init = None  # type: ignore
                 declarator = p.arg.type.decl
-                while hasattr(declarator, 'next'):
-                    if isinstance(declarator, cpp.ASTDeclaratorParen):
-                        assert hasattr(declarator, 'inner')
-                        declarator = declarator.inner  # type: ignore
+
+                def stripDeclarator(declarator):
+                    if hasattr(declarator, 'next'):
+                        stripDeclarator(declarator.next)
+                        if isinstance(declarator, cpp.ASTDeclaratorParen):
+                            assert hasattr(declarator, 'inner')
+                            stripDeclarator(declarator.inner)
                     else:
-                        declarator = declarator.next  # type: ignore
-                assert hasattr(declarator, 'declId')
-                assert isinstance(declarator, cpp.ASTDeclaratorNameParamQual)
-                declarator.declId = None  # type: ignore
+                        assert isinstance(declarator, cpp.ASTDeclaratorNameParamQual)
+                        assert hasattr(declarator, 'declId')
+                        declarator.declId = None  # type: ignore
+                        if declarator.paramQual is not None:
+                            stripParamQual(declarator.paramQual)
+                stripDeclarator(declarator)
         stripParamQual(paramQual)
         return paramQual
 

diff --git a/documentation/source/specific.rst b/documentation/source/specific.rst
@@ -285,6 +285,9 @@ This one should actually have ``[[myattr]]`` but Doxygen seems to not put attrib
 .. doxygenfunction:: fParen(void (*)())
    :project: cpp_function_lookup
 
+.. doxygenfunction:: fParenPlain(void (*)(int))
+   :project: cpp_function_lookup
+
 
 Doxygen xrefsect
 ----------------

diff --git a/examples/specific/cpp_function_lookup.h b/examples/specific/cpp_function_lookup.h
@@ -17,3 +17,6 @@ void fParamPack(T ...arg);
 class A {};
 void fMemPtr(int A::*arg);
 void fParen(void (*arg)());
+
+// different parameters in a function pointer
+void fParenPlain(void (*arg)(int argInner));