From 01cc1b8fa45fb469b0a66f7e4237c7726e8fa1ce Mon Sep 17 00:00:00 2001 From: virtuald Date: Tue, 14 Nov 2023 04:27:27 +0000 Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20@=20robotpy/?= =?UTF-8?q?cxxheaderparser@0e732f1d43ac825b1093c984c493e2d783663a82=20?= =?UTF-8?q?=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cxxheaderparser/parser.py | 8 ++++++-- cxxheaderparser/version.py | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cxxheaderparser/parser.py b/cxxheaderparser/parser.py index a4217a2..65be148 100644 --- 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 index ff45bb7..ff55881 100644 --- a/cxxheaderparser/version.py +++ b/cxxheaderparser/version.py @@ -1 +1 @@ -__version__ = '1.1.0-4-g9883a4e' +__version__ = '1.2.0-2-g0e732f1'