Fix removal of keywords from method return types

virtuald · virtuald · commit 2a8a096d1d4d · 2020-09-16T19:09:18.000-04:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -983,6 +983,12 @@ def __init__(self, nameStack, curClass, methinfo, curTemplate, doxygen, location
         if doxygen:
             self["doxygen"] = doxygen
 
+        # Remove leading keywords
+        for i, word in enumerate(nameStack):
+            if word not in Resolver.C_KEYWORDS:
+                nameStack = nameStack[i:]
+                break
+
         if "operator" in nameStack:
             self["rtnType"] = " ".join(nameStack[: nameStack.index("operator")])
             self["name"] = "".join(
@@ -993,12 +999,7 @@ def __init__(self, nameStack, curClass, methinfo, curTemplate, doxygen, location
             self["name"] = " ".join(
                 nameStack[nameStack.index("(") - 1 : nameStack.index("(")]
             )
-        if self["rtnType"].startswith("virtual"):
-            self["rtnType"] = self["rtnType"][len("virtual") :].strip()
-        elif self["rtnType"].startswith("static"):
-            self["rtnType"] = self["rtnType"][len("static") :].strip()
-        elif self["rtnType"].startswith("inline"):
-            self["rtnType"] = self["rtnType"][len("inline") :].strip()
+
         if len(self["rtnType"]) == 0 or self["name"] == curClass:
             self["rtnType"] = "void"
 
@@ -1444,6 +1445,7 @@ class Resolver(object):
     C_MODIFIERS = set(C_MODIFIERS)
 
     C_KEYWORDS = "extern virtual static explicit inline friend".split()
+    C_KEYWORDS = set(C_KEYWORDS)
 
     SubTypedefs = {}  # TODO deprecate?
     NAMESPACES = []
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3906,5 +3906,27 @@ def test_fn(self):
         self.assertEqual(self.cppHeader.typedefs["A"], "C")
 
 
+class InlineVirtual(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+class B {
+public:
+  virtual inline int aMethod();
+};
+""",
+            "string",
+        )
+
+    def test_fn(self):
+        c = self.cppHeader.classes["B"]
+        self.assertEqual("B", c["name"])
+
+        m = c["methods"]["public"][0]
+        self.assertEqual(m["name"], "aMethod")
+        self.assertEqual(m["rtnType"], "int")
+        self.assertEqual(m["returns"], "int")
+
+
 if __name__ == "__main__":
     unittest.main()
