Deploying to gh-pages from @ 0e732f1 🚀

robotpy · Nov 14, 2023 · 01cc1b8 · 01cc1b8
1 parent f4194f6
commit 01cc1b8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cxxheaderparser/parser.py b/cxxheaderparser/parser.py
@@ -1914,11 +1914,12 @@ def _parse_fn_end(self, fn: Function) -> None:
                     fn_template = fn_template[0]
                 fn_template.raw_requires_post = self._parse_requires(rtok)
 
+        if self.lex.token_if("ARROW"):
+            self._parse_trailing_return_type(fn)
+
         if self.lex.token_if("{"):
             self._discard_contents("{", "}")
             fn.has_body = True
-        elif self.lex.token_if("ARROW"):
-            self._parse_trailing_return_type(fn)
 
     def _parse_method_end(self, method: Method) -> None:
         """
@@ -1963,6 +1964,9 @@ def _parse_method_end(self, method: Method) -> None:
                 method.ref_qualifier = tok_value
             elif tok_value == "->":
                 self._parse_trailing_return_type(method)
+                if self.lex.token_if("{"):
+                    self._discard_contents("{", "}")
+                    method.has_body = True
                 break
             elif tok_value == "throw":
                 tok = self._next_token_must_be("(")

diff --git a/cxxheaderparser/version.py b/cxxheaderparser/version.py
@@ -1 +1 @@
-__version__ = '1.1.0-4-g9883a4e'
+__version__ = '1.2.0-2-g0e732f1'