From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 8F1F03857713; Tue, 16 Jan 2024 18:17:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F1F03857713 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705429057; bh=amGjQlKUvs0QaZT88dTepdn42XvOzsrK6WNqvKjFeFg=; h=From:To:Subject:Date:From; b=nm7I5iVDzjST1nMBT55Inq87PKXd3+3QFPLurCJMRyIyDqKFgaK7UW+CLwHgu6zU8 IFVwzwgClbmdFEF8DBPQ9UAfZ8OYmMMCBQM6u90TSQIb8/m+N8vouDI6/qU0VJxkcz NtN08wYhB792qZ2XJF1EkFqpHyGYL/WL4v6cYvVc= 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-8146] gccrs: Add trait context to ContextualASTVisitor X-Act-Checkin: gcc X-Git-Author: Pierre-Emmanuel Patry X-Git-Refname: refs/heads/trunk X-Git-Oldrev: 119e0be8b6eea63a95c89d449c38aa133e6ad5ab X-Git-Newrev: c1d722aa6f011a1584b1815bfbfb8d2733c1ba34 Message-Id: <20240116181737.8F1F03857713@sourceware.org> Date: Tue, 16 Jan 2024 18:17:37 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c1d722aa6f011a1584b1815bfbfb8d2733c1ba34 commit r14-8146-gc1d722aa6f011a1584b1815bfbfb8d2733c1ba34 Author: Pierre-Emmanuel Patry Date: Thu Nov 9 19:45:08 2023 +0100 gccrs: Add trait context to ContextualASTVisitor Some construct are forbidden in trait context (eg. pub, async...) and we'll need to reject those. To do so we need to identify a trait context. gcc/rust/ChangeLog: * ast/rust-ast-visitor.cc (ContextualASTVisitor::visit): Push the new trait context when visiting a trait. * ast/rust-ast-visitor.h: Add visit function prototype and TRAIT context. Signed-off-by: Pierre-Emmanuel Patry Diff: --- gcc/rust/ast/rust-ast-visitor.cc | 8 ++++++++ gcc/rust/ast/rust-ast-visitor.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/gcc/rust/ast/rust-ast-visitor.cc b/gcc/rust/ast/rust-ast-visitor.cc index b9ff2f97280..b4d1011a03e 100644 --- a/gcc/rust/ast/rust-ast-visitor.cc +++ b/gcc/rust/ast/rust-ast-visitor.cc @@ -1462,5 +1462,13 @@ ContextualASTVisitor::visit (AST::TraitImpl &impl) pop_context (); } +void +ContextualASTVisitor::visit (AST::Trait &trait) +{ + push_context (Context::TRAIT); + DefaultASTVisitor::visit (trait); + pop_context (); +} + } // namespace AST } // namespace Rust diff --git a/gcc/rust/ast/rust-ast-visitor.h b/gcc/rust/ast/rust-ast-visitor.h index 0f66dbe2c31..d6340e745c9 100644 --- a/gcc/rust/ast/rust-ast-visitor.h +++ b/gcc/rust/ast/rust-ast-visitor.h @@ -442,6 +442,7 @@ protected: FUNCTION, INHERENT_IMPL, TRAIT_IMPL, + TRAIT, MODULE, CRATE, }; @@ -453,6 +454,8 @@ protected: virtual void visit (AST::TraitImpl &impl) override; + virtual void visit (AST::Trait &trait) override; + template void visit (T &item) { DefaultASTVisitor::visit (item);