Doxygen comments were being discarded when an attribute was encountered

virtuald · virtuald · commit 7dfe47347c63 · 2022-10-20T01:56:52.000-04:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -2895,9 +2895,11 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
                         self._parse_template()
                         continue
                     elif tok.value == "alignas":
+                        self._doxygen_cache = self.lex.get_doxygen()
                         self._parse_attribute_specifier_seq(tok)
                         continue
                     elif tok.value == "__attribute__":
+                        self._doxygen_cache = self.lex.get_doxygen()
                         self._parse_gcc_attribute()
                         continue
                     elif not self.stack and tok.value == "static_assert":
@@ -2906,6 +2908,7 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
                         continue
 
                 elif tok.type == "DBL_LBRACKET":
+                    self._doxygen_cache = self.lex.get_doxygen()
                     self._parse_attribute_specifier_seq(tok)
                     continue
 
@@ -3076,7 +3079,7 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
 
                 newNsLen = len(self.nameStack)
                 if nslen != newNsLen and newNsLen == 1:
-                    if not self.curTemplate:
+                    if not self._doxygen_cache:
                         self._doxygen_cache = self.lex.get_doxygen()
 
         except Exception as e:
@@ -3471,7 +3474,7 @@ def _evaluate_stack(self, token=None):
 
         # its a little confusing to have some if/else above return and others not, and then clearning the nameStack down here
         self.nameStack = []
-        self.lex.doxygenCommentCache = ""
+        self._doxygen_cache = None
         self.curTemplate = None
 
     def _parse_template(self):
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3414,6 +3414,10 @@ def setUp(self):
 class
 C2 {};
 
+/// hasattr comment
+[[nodiscard]]
+int hasattr();
+
 """,
             "string",
         )
@@ -3443,6 +3447,11 @@ def test_cls2(self):
         self.assertEqual("C2", c["name"])
         self.assertEqual("/// template comment", c["doxygen"])
 
+    def test_hasattr(self):
+        fn = self.cppHeader.functions[1]
+        self.assertEqual("hasattr", fn["name"])
+        self.assertEqual("/// hasattr comment", fn["doxygen"])
+
 
 class EnumParameter_TestCase(unittest.TestCase):
     def setUp(self):
