Fix robotpy#43

virtuald · virtuald · commit 98288433e628 · 2020-03-04T10:43:32.000-05:00
diff --git a/CppHeaderParser/CppHeaderParser.py b/CppHeaderParser/CppHeaderParser.py
@@ -1957,6 +1957,7 @@ def finalize(self):
                     "static": 0,
                     "pointer": 0,
                     "reference": 0,
+                    "typedefs": 0,
                 }
                 self.resolve_type(meth["rtnType"], rtnType)
                 if not rtnType["unresolved"]:
diff --git a/test/test_CppHeaderParser.py b/test/test_CppHeaderParser.py
@@ -3868,5 +3868,30 @@ def test_fn(self):
         self.assertEqual(c["type"], "C")
 
 
+class MoreTypedef(unittest.TestCase):
+    def setUp(self):
+        self.cppHeader = CppHeaderParser.CppHeader(
+            """
+typedef C A;
+
+class B {
+public:
+  A 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"], "A")
+
+        self.assertEqual(self.cppHeader.typedefs["A"], "C")
+
+
 if __name__ == "__main__":
     unittest.main()

Original file line number	Diff line number	Diff line change
`@@ -1957,6 +1957,7 @@ def finalize(self):`
`1957`	`1957`	`"static": 0,`
`1958`	`1958`	`"pointer": 0,`
`1959`	`1959`	`"reference": 0,`
	`1960`	`+ "typedefs": 0,`
`1960`	`1961`	`}`
`1961`	`1962`	`self.resolve_type(meth["rtnType"], rtnType)`
`1962`	`1963`	`if not rtnType["unresolved"]:`