Correctly detect templates for 'using' statements

virtuald · virtuald · commit cc0d4a0610a7 · 2022-09-27T23:57:37.000-04:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -1207,7 +1207,7 @@ class CppVariable(_CppVariable):
 
     Vars = []
 
-    def __init__(self, nameStack, doxygen, location, **kwargs):
+    def __init__(self, nameStack, doxygen, location, is_var=True, **kwargs):
         debug_print("var trace %s", nameStack)
         if len(nameStack) and nameStack[0] == "extern":
             self["extern"] = True
@@ -1297,7 +1297,8 @@ def __init__(self, nameStack, doxygen, location, **kwargs):
             pass
 
         self.init()
-        CppVariable.Vars.append(self)  # save and resolve later
+        if is_var:
+            CppVariable.Vars.append(self)  # save and resolve later
 
     def _filter_name(self, name):
         name = name.replace(" :", ":").replace(": ", ":")
@@ -3359,7 +3360,10 @@ def _evaluate_stack(self, token=None):
                     alias = self.nameStack[1]
                     ns, stack = _split_namespace(self.nameStack[3:])
                     atype = CppVariable(
-                        stack, self._get_stmt_doxygen(), self._get_location(stack)
+                        stack,
+                        self._get_stmt_doxygen(),
+                        self._get_location(stack),
+                        is_var=False,
                     )
 
                     # namespace refers to the embedded type
@@ -3374,7 +3378,10 @@ def _evaluate_stack(self, token=None):
                     #    from a base class
                     ns, stack = _split_namespace(self.nameStack[1:])
                     atype = CppVariable(
-                        stack, self._get_stmt_doxygen(), self._get_location(stack)
+                        stack,
+                        self._get_stmt_doxygen(),
+                        self._get_location(stack),
+                        is_var=False,
                     )
                     alias = atype["type"]
                     atype["using_type"] = "declaration"
@@ -3383,6 +3390,9 @@ def _evaluate_stack(self, token=None):
                     else:
                         atype["namespace"] = ns
 
+                atype["template"] = self.curTemplate
+                self.curTemplate = None
+
                 if atype["type"].startswith("typename "):
                     atype["raw_type"] = "typename " + ns + atype["type"][9:]
                 else:
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -4110,5 +4110,30 @@ def test_fn(self):
         self.assertEqual(et2["params"], "<5, 6>")
 
 
+class UsingTemplateTest(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+class X {
+  template <typename T>
+  using TT = U<T>;
+};
+
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        u = self.cppHeader.classes["X"]["using"]
+        self.assertEqual(len(u), 1)
+        tt = u["TT"]
+
+        self.assertEqual(tt["access"], "private")
+        self.assertEqual(tt["raw_type"], "U<T >")
+        self.assertEqual(tt["type"], "U<T >")
+        self.assertEqual(tt["typealias"], "TT")
+        self.assertEqual(tt["template"], "template<typename T>")
+
+
 if __name__ == "__main__":
     unittest.main()
