Fix nested classes and unions

virtuald · virtuald · commit 46bb3d6d4254 · 2020-01-16T01:52:39.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -2871,8 +2871,9 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
                             self.curAccessSpecifier = self.accessSpecifierStack[-1]
                             self.accessSpecifierStack = self.accessSpecifierStack[:-1]
                         if self.curClass and self.classes[self.curClass]["parent"]:
-                            self.curClass = self.classes[self.curClass]["parent"][
-                                "name"
+                            thisClass = self.classes[self.curClass]
+                            self.curClass = self.curClass[
+                                : -(len(thisClass["name"]) + 2)
                             ]
                         else:
                             self.curClass = ""
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3744,5 +3744,46 @@ def test_fn(self):
         self.assertEqual("fn", inner["methods"]["public"][0]["name"])
 
 
+class AnonUnion_TestCase(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+struct Outer {
+    union {
+        int x;
+        int y;
+    };
+    int z;
+};
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        self.assertEqual(len(self.cppHeader.functions), 0)
+
+        outer = self.cppHeader.classes["Outer"]
+        self.assertEqual(outer["parent"], None)
+
+        inner = self.cppHeader.classes["Outer::union "]
+        self.assertIs(inner["parent"], outer)
+
+        self.assertEqual(2, len(outer["properties"]["public"]))
+        self.assertEqual(0, len(outer["properties"]["protected"]))
+        self.assertEqual(0, len(outer["properties"]["private"]))
+
+        props = outer["properties"]["public"]
+        self.assertEqual(props[0]["name"], "")
+        self.assertEqual(props[1]["name"], "z")
+
+        self.assertEqual(2, len(outer["properties"]["public"]))
+        self.assertEqual(0, len(outer["properties"]["protected"]))
+        self.assertEqual(0, len(outer["properties"]["private"]))
+
+        props = inner["properties"]["public"]
+        self.assertEqual(props[0]["name"], "x")
+        self.assertEqual(props[1]["name"], "y")
+
+
 if __name__ == "__main__":
     unittest.main()
