Add access specifier for nested classes

virtuald · virtuald · commit d444b580d972 · 2020-01-06T23:11:24.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -2428,12 +2428,9 @@ def _evaluate_class_stack(self):
         # dont support sub classes today
         # print( 'eval class stack', self.nameStack )
         parent = self.curClass
-        if self.braceDepth > len(self.nameSpaces) and parent:
-            trace_print("HIT NESTED SUBCLASS")
+        if parent:
+            debug_print("found nested subclass")
             self.accessSpecifierStack.append(self.curAccessSpecifier)
-        elif self.braceDepth != len(self.nameSpaces):
-            error_print("ERROR: WRONG BRACE DEPTH")
-            return
 
         # When dealing with typedefed structs, get rid of typedef keyword to handle later on
         if self.nameStack[0] == "typedef":
@@ -2478,6 +2475,7 @@ def _evaluate_class_stack(self):
         if parent:
             newClass["namespace"] = self.classes[parent]["namespace"] + "::" + parent
             newClass["parent"] = self.classes[parent]
+            newClass["access_in_parent"] = self.accessSpecifierStack[-1]
             self.classes[parent]["nested_classes"].append(newClass)
             ## supports nested classes with the same name ##
             self.curClass = key = parent + "::" + classKey
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3708,5 +3708,41 @@ def test_fn(self):
         self.assertEqual(fn["rtnType"], "void")
 
 
+class NestedClassAccess_TestCase(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+class Outer {
+    struct Inner {
+        void fn();
+    };
+
+    void ofn();
+};
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        self.assertEqual(len(self.cppHeader.functions), 0)
+
+        outer = self.cppHeader.classes["Outer"]
+        self.assertEqual(outer["parent"], None)
+
+        self.assertEqual(0, len(outer["methods"]["public"]))
+        self.assertEqual(0, len(outer["methods"]["protected"]))
+        self.assertEqual(1, len(outer["methods"]["private"]))
+        self.assertEqual("ofn", outer["methods"]["private"][0]["name"])
+
+        inner = self.cppHeader.classes["Outer::Inner"]
+        self.assertIs(inner["parent"], outer)
+        self.assertEqual(inner["access_in_parent"], "private")
+
+        self.assertEqual(1, len(inner["methods"]["public"]))
+        self.assertEqual(0, len(inner["methods"]["protected"]))
+        self.assertEqual(0, len(inner["methods"]["private"]))
+        self.assertEqual("fn", inner["methods"]["public"][0]["name"])
+
+
 if __name__ == "__main__":
     unittest.main()
