From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 7E47038582AF; Tue, 30 Jan 2024 11:58:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E47038582AF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1706615920; bh=V8eJsNdL0AZlMb6h6XTASwUB4S5KwPouqtfcSjAMip0=; h=From:To:Subject:Date:From; b=UnEp2MlC98DsA4ROqCaZM61ntZDAs6jjyjOr+f7sQNWxImV2EJXgZJyanp6yKaYFX nluy0515xqfSdB4plBvg6BKuKXGV4WVAvcVl0jdXexronaozomLW/OU90jp8KIieiI 9hwXeCb0iUFQW82BeXv4s+x13gpPt2WOhy/TARXo= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-8576] gccrs: Allow const and async specifiers in functions X-Act-Checkin: gcc X-Git-Author: Pierre-Emmanuel Patry X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 12844c82dec296c8530594211a65b55875797b43 X-Git-Newrev: 68990dbeadc5f4b90c0aa14387cb80d0f411aa43 Message-Id: <20240130115840.7E47038582AF@sourceware.org> Date: Tue, 30 Jan 2024 11:58:40 +0000 (GMT) List-Id: https://gcc.gnu.org/g:68990dbeadc5f4b90c0aa14387cb80d0f411aa43 commit r14-8576-g68990dbeadc5f4b90c0aa14387cb80d0f411aa43 Author: Pierre-Emmanuel Patry Date: Wed Nov 22 10:35:44 2023 +0100 gccrs: Allow const and async specifiers in functions We need to account for const specifiers in async parsing as const can be used in the syntax before the async keyword. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_vis_item): Allow parsing async items in const. (Parser::parse_async_item): Account for const offset during async lookahead. Signed-off-by: Pierre-Emmanuel Patry Diff: --- gcc/rust/parse/rust-parse-impl.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index a1ad4f11993a..acceec302a2d 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -1383,6 +1383,8 @@ Parser::parse_vis_item (AST::AttrVec outer_attrs) return parse_const_item (std::move (vis), std::move (outer_attrs)); case UNSAFE: case EXTERN_KW: + case ASYNC: + return parse_async_item (std::move (vis), std::move (outer_attrs)); case FN_KW: return parse_function (std::move (vis), std::move (outer_attrs)); default: @@ -1445,7 +1447,9 @@ std::unique_ptr Parser::parse_async_item (AST::Visibility vis, AST::AttrVec outer_attrs) { - const_TokenPtr t = lexer.peek_token (); + auto offset = (lexer.peek_token ()->get_id () == CONST) ? 1 : 0; + const_TokenPtr t = lexer.peek_token (offset); + if (Session::get_instance ().options.get_edition () == CompileOptions::Edition::E2015) { @@ -1456,7 +1460,7 @@ Parser::parse_async_item (AST::Visibility vis, "to use %, switch to Rust 2018 or later")); } - t = lexer.peek_token (1); + t = lexer.peek_token (offset + 1); switch (t->get_id ()) {