Merge pull request #59 from robotpy/compound-ns

virtuald · web-flow · commit 266bf846566f · 2021-01-10T02:16:49.000-05:00
Support compound namespace declarations
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -2891,7 +2891,7 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
                             == "__IGNORED_NAMESPACE__CppHeaderParser__"
                         ):  # Used in filtering extern "C"
                             self.nameStack[1] = ""
-                        self.nameSpaces.append(self.nameStack[1])
+                        self.nameSpaces.append("".join(self.nameStack[1:]))
                         ns = self.cur_namespace()
                         self.stack = []
                         self.stmtTokens = []
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3961,5 +3961,22 @@ def test_fn(self):
         self.assertEqual(m["parameters"][0]["raw_type"], "n1::A")
 
 
+class CompoundNS(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+namespace N1::N2 {
+class B {};
+};
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        c = self.cppHeader.classes["B"]
+        self.assertEqual("B", c["name"])
+        self.assertEqual("N1::N2", c["namespace"])
+
+
 if __name__ == "__main__":
     unittest.main()
