Resolve forward declared variables correctly

virtuald · virtuald · commit b87ee6d23236 · 2021-01-10T01:43:40.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -1473,7 +1473,7 @@ def initextra(self):
             []
         )  # full name stack, good idea to keep both stacks? (simple stack and full stack)
         self._classes_brace_level = {}  # class name : level
-        self._forward_decls = []
+        self._forward_decls = {}  # name: namespace
         self._template_typenames = []  # template<typename XXX>
 
     def current_namespace(self):
@@ -1747,6 +1747,7 @@ def finalize_vars(self):
 
                         elif tag in self._forward_decls:
                             var["forward_declared"] = tag
+                            var["namespace"] = self._forward_decls[tag]
                             var["ctypes_type"] = "ctypes.c_void_p"
 
                         elif tag in self.global_enums:
@@ -2599,7 +2600,7 @@ def evalute_forward_decl(self):
             if self.curAccessSpecifier == "public":
                 klass._public_forward_declares.append(name)
         else:
-            self._forward_decls.append(name)
+            self._forward_decls[name] = self.current_namespace()
 
 
 # fmt: off
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3929,5 +3929,37 @@ def test_fn(self):
         self.assertEqual(m["returns"], "int")
 
 
+class ForwardDeclResolve(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+namespace n1 {
+
+class A;
+
+namespace n2 {
+
+class B {
+public:
+  explicit B(const A &a);
+};
+
+}
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        c = self.cppHeader.classes["B"]
+        self.assertEqual("B", c["name"])
+
+        m = c["methods"]["public"][0]
+        self.assertEqual(m["name"], "B")
+        self.assertEqual(m["parameters"][0]["forward_declared"], "A")
+        self.assertEqual(m["parameters"][0]["namespace"], "n1::")
+        self.assertEqual(m["parameters"][0]["name"], "a")
+        self.assertEqual(m["parameters"][0]["raw_type"], "n1::A")
+
+
 if __name__ == "__main__":
     unittest.main()
