Fix default access for structs/union base classes

virtuald · virtuald · commit 69017114baa2 · 2020-01-23T04:13:59.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -384,8 +384,8 @@ class CppBaseDecl(dict):
 
     """
 
-    def __init__(self):
-        self["access"] = "private"
+    def __init__(self, default_access):
+        self["access"] = default_access
         self["class"] = ""
         self["decl_name"] = ""
         self["decltype"] = False
@@ -530,13 +530,13 @@ def _parse_cppclass_name(c, stack):
     return i
 
 
-def _parse_cpp_base(stack):
-    debug_print("Parsing base: %s", stack)
+def _parse_cpp_base(stack, default_access):
+    debug_print("Parsing base: %s (access %s)", stack, default_access)
     inherits = []
     i = 0
     sl = len(stack)
     init = True
-    base = CppBaseDecl()
+    base = CppBaseDecl(default_access)
     require_ending = False
     while i < sl:
         t = stack[i]
@@ -558,7 +558,7 @@ def _parse_cpp_base(stack):
 
         if t == ",":
             inherits.append(base)
-            base = CppBaseDecl()
+            base = CppBaseDecl(default_access)
             init = True
             require_ending = False
             continue
@@ -681,7 +681,7 @@ def _lookup_type(self, name):
             if n["name"] == name:
                 return {"raw_type": self["name"] + "::" + n["name"], "type": n["name"]}
 
-    def __init__(self, nameStack, curTemplate, doxygen, location):
+    def __init__(self, nameStack, curTemplate, doxygen, location, defaultAccess):
         self["nested_classes"] = []
         self["parent"] = None
         self["abstract"] = False
@@ -706,7 +706,7 @@ def __init__(self, nameStack, curTemplate, doxygen, location):
         # consume bases
         baseStack = nameStack[n:]
         if baseStack:
-            self["inherits"] = _parse_cpp_base(baseStack)
+            self["inherits"] = _parse_cpp_base(baseStack, defaultAccess)
         else:
             self["inherits"] = []
 
@@ -838,7 +838,7 @@ class CppUnion(CppClass):
     """
 
     def __init__(self, nameStack, doxygen, location):
-        CppClass.__init__(self, nameStack, None, doxygen, location)
+        CppClass.__init__(self, nameStack, None, doxygen, location, "public")
         self["members"] = self["properties"]["public"]
 
     def transform_to_union_keys(self):
@@ -2487,6 +2487,7 @@ def _evaluate_class_stack(self):
                 self.curTemplate,
                 self._get_stmt_doxygen(),
                 self._get_location(self.nameStack),
+                self.curAccessSpecifier,
             )
         newClass["declaration_method"] = self.nameStack[0]
         self.classes_order.append(newClass)  # good idea to save ordering
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3187,7 +3187,7 @@ def testBuildIndexImpl1(self):
         self.assertEqual(
             [
                 {
-                    "access": "private",
+                    "access": "public",
                     "class": "build_index_impl<N-1,N-1,I...>",
                     "decltype": False,
                     "decl_name": "build_index_impl",
@@ -3217,7 +3217,7 @@ def testBuildIndexImpl2(self):
         self.assertEqual(
             [
                 {
-                    "access": "private",
+                    "access": "public",
                     "class": "index_sequence<I...>",
                     "decltype": False,
                     "decl_name": "index_sequence",

Original file line number	Diff line number	Diff line change
`@@ -3187,7 +3187,7 @@ def testBuildIndexImpl1(self):`
`3187`	`3187`	`self.assertEqual(`
`3188`	`3188`	`[`
`3189`	`3189`	`{`
`3190`		`- "access": "private",`
	`3190`	`+ "access": "public",`
`3191`	`3191`	`"class": "build_index_impl<N-1,N-1,I...>",`
`3192`	`3192`	`"decltype": False,`
`3193`	`3193`	`"decl_name": "build_index_impl",`
`@@ -3217,7 +3217,7 @@ def testBuildIndexImpl2(self):`
`3217`	`3217`	`self.assertEqual(`
`3218`	`3218`	`[`
`3219`	`3219`	`{`
`3220`		`- "access": "private",`
	`3220`	`+ "access": "public",`
`3221`	`3221`	`"class": "index_sequence<I...>",`
`3222`	`3222`	`"decltype": False,`
`3223`	`3223`	`"decl_name": "index_sequence",`