Prevent enums from being parsed as a class

virtuald · virtuald · commit 08950fc52ccf · 2019-12-28T19:46:12.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -2711,7 +2711,10 @@ def __init__(self, headerFileName, argType="file", encoding=None, **kwargs):
                     if "class" in self.nameStack and self.nameStack[0] != "class":
                         classLocationNS = self.nameStack.index("class")
                         classLocationS = self.stack.index("class")
-                        if "(" not in self.nameStack[classLocationNS:]:
+                        if (
+                            "(" not in self.nameStack[classLocationNS:]
+                            and self.nameStack[classLocationNS - 1] != "enum"
+                        ):
                             debug_print(
                                 "keyword 'class' found in unexpected location in nameStack, must be following #define magic.  Process that before moving on"
                             )
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3420,5 +3420,28 @@ def test_future(self):
         self.assertEqual(c["methods"]["public"][0]["name"], "future")
 
 
+class EnumClass_TestCase(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+enum class MyEnum {
+    V = 1
+};
+
+""",
+            "string",
+        )
+
+    def test_enum(self):
+        self.assertEqual(self.cppHeader.classes, {})
+        self.assertEqual(len(self.cppHeader.enums), 1)
+        e = self.cppHeader.enums[0]
+
+        self.assertEqual(e["name"], "MyEnum")
+        self.assertEqual(
+            e["values"], [{"name": "V", "value": 1}],
+        )
+
+
 if __name__ == "__main__":
     unittest.main()
