Don't strip pointer from inside of templates

virtuald · virtuald · commit 9ff5a7ab4529 · 2020-01-03T17:47:31.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -1470,6 +1470,23 @@ def guess_ctypes_type(self, string):
             x += ")" * pointers
             return x
 
+    def _remove_modifiers(self, vtype):
+        return " ".join(x for x in vtype.split() if x not in self.C_MODIFIERS)
+
+    def _create_raw_type(self, vtype):
+        lt = vtype.find("<")
+        if lt != -1:
+            gt = vtype.rfind(">")
+            vtype = (
+                self._remove_modifiers(vtype[:lt])
+                + vtype[lt : gt + 1]
+                + self._remove_modifiers(vtype[gt + 1 :])
+            )
+        else:
+            vtype = self._remove_modifiers(vtype)
+
+        return vtype
+
     def resolve_type(self, string, result):  # recursive
         """
         keeps track of useful things like: how many pointers, number of typedefs, is fundamental or a class, etc...
@@ -1788,11 +1805,7 @@ def finalize_vars(self):
         # create stripped raw_type #
         for var in CppVariable.Vars:
             if "raw_type" not in var:
-                raw = []
-                for x in var["type"].split():
-                    if x not in self.C_MODIFIERS:
-                        raw.append(x)
-                var["raw_type"] = " ".join(raw)
+                var["raw_type"] = self._create_raw_type(var["type"])
 
                 # if 'AutoConstantEntry' in var['raw_type']: print(var); assert 0
                 if var["class"]:
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3648,5 +3648,35 @@ def test_fn(self):
         self.assertEqual(fn["rtnType"], "HAL_Value")
 
 
+class PointerTemplate_TestCase(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+
+std::vector<Pointer*> * fn(std::vector<Pointer*> * ps);
+
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        self.assertEqual(len(self.cppHeader.functions), 1)
+        fn = self.cppHeader.functions[0]
+        self.assertEqual(fn["name"], "fn")
+        self.assertEqual(
+            filter_pameters(fn["parameters"], ["namespace", "raw_type"]),
+            [
+                {
+                    "type": "std::vector<Pointer *> *",
+                    "name": "ps",
+                    "desc": None,
+                    "namespace": None,
+                    "raw_type": "std::vector<Pointer *>",
+                },
+            ],
+        )
+        self.assertEqual(fn["rtnType"], "std::vector<Pointer *> *")
+
+
 if __name__ == "__main__":
     unittest.main()
