Fix =default constructor/destructor detection

virtuald · virtuald · commit 694536e7127b · 2020-11-17T01:16:10.000-05:00
... apparently the unit tests were totally broken, go figure
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -2233,6 +2233,9 @@ def parse_method_type(self, stack):
                 info["pure_virtual"] = True
             elif stack[-2] == "delete":
                 info["deleted"] = True
+            elif stack[-2] == "default":
+                info["default"] = True
+                info["defined"] = True
 
         r = header.split()
         name = None
@@ -2274,15 +2277,9 @@ def parse_method_type(self, stack):
 
         if name.startswith("~"):
             info["destructor"] = True
-            if "default;" in stack:
-                info["defined"] = True
-                info["default"] = True
             name = name[1:]
         elif not a or (name == self.curClass and len(self.curClass)):
             info["constructor"] = True
-            if "default;" in stack:
-                info["defined"] = True
-                info["default"] = True
 
         info["name"] = name
 
diff --git a/test/TestSampleClass.h b/test/TestSampleClass.h
@@ -780,13 +780,13 @@ int non_vararg_func(int foo, const char* fmt);
 class DefaultConstDest {
 public:
     DefaultConstDest() =default ;     // spacing check
-    DefaultConstDest() = default  ;   // spacing check
+    ~DefaultConstDest() = default  ;   // spacing check
 };
 // default constructor on a class containing "default" as name (edge case check)
 class default_class_tricky {
 public:
     default_class_tricky();
-    default_class_tricky();
+    ~default_class_tricky();
 
     void randomMethod1_default();
     void defaultrandomMethod2();
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -2648,7 +2648,7 @@ def test_Grackle_const_noexcept_noexcept_operator(self):
 
 
 # Test enhancement 13 (default constructor / destructor)
-class DefaultConstDest_TestCase:
+class DefaultConstDest_TestCase(unittest.TestCase):
     def setUp(self):
         self.cppHeader = CppHeaderParser.CppHeader("TestSampleClass.h")
 
@@ -3807,6 +3807,24 @@ def test_fn(self):
         self.assertEqual(props[1]["name"], "y")
 
 
+class Default_TestCase(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+class A {
+public:
+    A() = default;
+};
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        m = self.cppHeader.classes["A"]["methods"]["public"][0]
+        self.assertEqual(m["constructor"], True)
+        self.assertEqual(m["default"], True)
+
+
 class Deleted_TestCase(unittest.TestCase):
     def setUp(self):
         self.cppHeader = CppHeaderParser.CppHeader(
