From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by sourceware.org (Postfix) with ESMTPS id 7C5D33857BAE for ; Tue, 30 Jan 2024 12:11:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7C5D33857BAE Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 7C5D33857BAE Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::433 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616718; cv=none; b=IiMuogSaAAowYbsXT0PxIHbVwtsJmT7edbca2JJsnjzstlWsX1GORBGYD0V4zLTUooO4g+GaYi+LTu5+XzR6kZoGpZoLFrWqqtqtEQKaQ5N9Uw1N2VnnxYTyKyYp98T7oIYFA5XkLj7YkAkfZGF2j+FLwfB0EfuOPc1ui7XD0XM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616718; c=relaxed/simple; bh=+ah8tuaPA+wFxJBJTGEGj5BFQHG7C4ylbpyBQVwsG1A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=jm+gkReempDHmbLXDKgGpnfjulWKGzLRn1+rrGBSfGDyW/eNm/pc3F1AVL7s+/a3ftQfnDqikfHsCy6ku41rna6udqAYBu2/mykGYXp9yBiOn3cu/3kiTW74WhaCuPXaLvKLGHVWxcKvd/ZwirpSoJ6Fyab/CaEclP3Uu+oPzCA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-33ae3cc8a70so2134209f8f.0 for ; Tue, 30 Jan 2024 04:11:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616688; x=1707221488; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=XB5QG9cWh2i6OpCmTXIuUTmITF/AOB6Rg1JfUAMV5Ho=; b=chqv7wooJY+g2CmM+he2JIsYhMEujhjKCs4ye9VVMszMFyy4TzS1ohXR0GPQ6M4K7y EuzLLMZnBOFrjmFDMnk1QyeMv1KsEMPtD9mSf84WwrxMk+dYpMcDpyIzKOxEtU0QCias qHL0rwJq7OEPNindEp4f0UiPUZiDtXdpxK8vtB0W4chkKvakk0YwuuOU4Jf4k4L3UBFE nKHZNElf1m0bRH0l1hepu1FkDqTADbW4ymHcz2KKgvv0SL2YIz9gZXCYT3CFPEGpY7Sa 1E3lohOaKnJbz9mHqS5F5B/5/bPHVf1jOOPGT3zm397YZmkf2imhXIbLH0BKj5kJCsQ8 m5Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616688; x=1707221488; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=XB5QG9cWh2i6OpCmTXIuUTmITF/AOB6Rg1JfUAMV5Ho=; b=dmLA9p2qlfDXeJiSmw4LdoJPTp9e9vk9Nj1x/0nO0koQ1PJr0G62RuUT6I7eFRx9vO C1Ea1T72ADsjsNPnwNfsVeUZbiOos96dNAZl9Ir7L+6XAjYLjpbj4tO5xOOADzkA/DnZ VLOteDR8VCVAB6G9ffolabOhhnHyQAqZHfFsn+yP59s0iRDq+WiutLIQPF/wmZRd6YvK 9ctjMR8aA0qsJYI2KHpJNhd4RcjlP/SoMMAZpx3NTk33GEHU0ANSDrvQ5DAkzYiyaz+k ugJwoO7oNM8eKx3BGwhzZk3AqHTELH80y2BeDo7LrVvxZYC4p4Vp2O17zRCg98U7dBfE 3aNQ== X-Gm-Message-State: AOJu0YysvpymjKWrOOOCf5yRhyHK942JgzJZJr9ZvD+9QQIaGyCrKxqm iNNtf3Ks91ib4E0v2JWSeYFZwBpfnX9V1bCP4oOdV0hUcCAwdJqzZcn8ix3iQw== X-Google-Smtp-Source: AGHT+IHPYax4e7hJQ+gaxbLu7IAOdce1zAJLD3gabPJ9Hl5V55Dyzgq5ajL+IvTTGRwhn3fhy6HgPg== X-Received: by 2002:a5d:6483:0:b0:33a:f9fe:9db with SMTP id o3-20020a5d6483000000b0033af9fe09dbmr1720284wri.14.1706616688362; Tue, 30 Jan 2024 04:11:28 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:28 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Pierre-Emmanuel Patry Subject: [COMMITTED 052/101] gccrs: Allow const and async specifiers in functions Date: Tue, 30 Jan 2024 13:07:08 +0100 Message-ID: <20240130121026.807464-55-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Pierre-Emmanuel Patry 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 --- 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 a1ad4f11993..acceec302a2 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 ()) { -- 2.42.1