Add support for parsing ref-qualifiers

virtuald · virtuald · commit 953c40854e7f · 2022-11-03T22:22:17.000-04:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -2208,11 +2208,21 @@ def parse_method_type(self, stack):
         else:
             assert 0
 
-        if len(stack) > 3 and stack[-1] == ";" and stack[-3] == "=":
-            if stack[-2] == "0":
-                info["pure_virtual"] = True
-            elif stack[-2] == "delete":
-                info["deleted"] = True
+        refqual = ""
+        if len(stack) > 3:
+            if stack[-1] == ";" and stack[-3] == "=":
+                if stack[-2] == "0":
+                    info["pure_virtual"] = True
+                elif stack[-2] == "delete":
+                    info["deleted"] = True
+
+            for e in reversed(stack):
+                if e == ")":
+                    break
+                elif e == "&":
+                    refqual += "&"
+
+        info["ref_qualifiers"] = refqual
 
         r = header.split()
         name = None
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -4146,5 +4146,42 @@ def test_fn(self):
         self.assertEqual(tt["template"], "template<typename T>")
 
 
+class RefQualifierTest(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+struct X {
+  void fn0();
+  void fn1() &;
+  void fn2() &&;
+  void fn3() && = 0;
+};
+
+""",
+            "string",
+        )
+
+    def test_fn0(self):
+        fn = self.cppHeader.classes["X"]["methods"]["public"][0]
+        self.assertEqual(fn["name"], "fn0")
+        self.assertEqual(fn["ref_qualifiers"], "")
+
+    def test_fn1(self):
+        fn = self.cppHeader.classes["X"]["methods"]["public"][1]
+        self.assertEqual(fn["name"], "fn1")
+        self.assertEqual(fn["ref_qualifiers"], "&")
+
+    def test_fn1(self):
+        fn = self.cppHeader.classes["X"]["methods"]["public"][2]
+        self.assertEqual(fn["name"], "fn2")
+        self.assertEqual(fn["ref_qualifiers"], "&&")
+
+    def test_fn3(self):
+        fn = self.cppHeader.classes["X"]["methods"]["public"][3]
+        self.assertEqual(fn["name"], "fn3")
+        self.assertEqual(fn["ref_qualifiers"], "&&")
+        self.assertEqual(fn["pure_virtual"], True)
+
+
 if __name__ == "__main__":
     unittest.main()
