From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id A52513858D1E; Sun, 5 Mar 2023 11:40:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A52513858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1678016438; bh=QDW1a9nUtjYMBSPGGBWU0zkVALkJU8pw4f4mstbygig=; h=From:To:Subject:Date:From; b=gUz1juURhF8a+TQ2KDZc804swpPfejN/S7ZK3YxK2KsydH8rHpY9+7bVOiuqOXv2q YrRBF0MeFctsVFqHWgTCGKlsMXRsRaKrySd4U1UMN49DBynFp2HBAA6HtHWPTWZG2S jVMoUMY3++0ZSjoBdgH8kEf1GoHucdyY2cSZZfGs= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] ast: Add RestPattern AST node X-Act-Checkin: gcc X-Git-Author: Pierre-Emmanuel Patry X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 41890d20e27d9be91fe5b35d5c85fb6a4ddcd2dd X-Git-Newrev: c2a3b370a9f42846f7d82512719d4127fa3fca4b Message-Id: <20230305114038.A52513858D1E@sourceware.org> Date: Sun, 5 Mar 2023 11:40:38 +0000 (GMT) List-Id: https://gcc.gnu.org/g:c2a3b370a9f42846f7d82512719d4127fa3fca4b commit c2a3b370a9f42846f7d82512719d4127fa3fca4b Author: Pierre-Emmanuel Patry Date: Tue Feb 28 17:34:31 2023 +0100 ast: Add RestPattern AST node Add the RestPattern AST node representing ".." code in some rust context. This commit also provides the different visitors for this node. gcc/rust/ChangeLog: * ast/rust-ast-dump.cc (Dump::visit): Add visitor. * ast/rust-ast-dump.h: Add visitor prototype. * ast/rust-ast-full-decls.h (class RestPattern): Add forward declaration for class RestPattern. * ast/rust-ast-visitor.h: Add visitor prototype. * ast/rust-ast.cc (RestPattern::accept_vis): Add function to accept a foreign visitor. * ast/rust-pattern.h (class RestPattern): Add class RestPattern. * checks/errors/rust-feature-gate.h: Add visitor prototype. * expand/rust-attribute-visitor.cc (AttrVisitor::visit): Add visitor implementation. * expand/rust-attribute-visitor.h: Add visitor prototype. * hir/rust-ast-lower-base.cc (ASTLoweringBase::visit): Add visitor implementation. * hir/rust-ast-lower-base.h: Add visitor prototype. * resolve/rust-ast-resolve-base.cc (ResolverBase::visit): Add visitor implementation. * resolve/rust-ast-resolve-base.h: Add visitor prototype. * resolve/rust-early-name-resolver.cc (EarlyNameResolver::visit): Add visitor implementation. * resolve/rust-early-name-resolver.h: Add visitor prototype. * util/rust-attributes.cc (AttributeChecker::visit): Add visitor implementation. * util/rust-attributes.h: Add visitor prototype. Signed-off-by: Pierre-Emmanuel Patry Diff: --- gcc/rust/ast/rust-ast-dump.cc | 4 ++++ gcc/rust/ast/rust-ast-dump.h | 1 + gcc/rust/ast/rust-ast-full-decls.h | 1 + gcc/rust/ast/rust-ast-visitor.h | 1 + gcc/rust/ast/rust-ast.cc | 6 ++++++ gcc/rust/ast/rust-pattern.h | 14 ++++++++++++++ gcc/rust/checks/errors/rust-feature-gate.h | 1 + gcc/rust/expand/rust-attribute-visitor.cc | 5 +++++ gcc/rust/expand/rust-attribute-visitor.h | 1 + gcc/rust/hir/rust-ast-lower-base.cc | 3 +++ gcc/rust/hir/rust-ast-lower-base.h | 1 + gcc/rust/resolve/rust-ast-resolve-base.cc | 4 ++++ gcc/rust/resolve/rust-ast-resolve-base.h | 1 + gcc/rust/resolve/rust-early-name-resolver.cc | 4 ++++ gcc/rust/resolve/rust-early-name-resolver.h | 1 + gcc/rust/util/rust-attributes.cc | 4 ++++ gcc/rust/util/rust-attributes.h | 1 + 17 files changed, 53 insertions(+) diff --git a/gcc/rust/ast/rust-ast-dump.cc b/gcc/rust/ast/rust-ast-dump.cc index 1cfcebbab9d..9315bc5292d 100644 --- a/gcc/rust/ast/rust-ast-dump.cc +++ b/gcc/rust/ast/rust-ast-dump.cc @@ -1610,6 +1610,10 @@ void Dump::visit (WildcardPattern &) {} +void +Dump::visit (RestPattern &) +{} + // void Dump::visit(RangePatternBound& ){} void diff --git a/gcc/rust/ast/rust-ast-dump.h b/gcc/rust/ast/rust-ast-dump.h index c0082aa8314..b68619d2862 100644 --- a/gcc/rust/ast/rust-ast-dump.h +++ b/gcc/rust/ast/rust-ast-dump.h @@ -273,6 +273,7 @@ private: void visit (LiteralPattern &pattern); void visit (IdentifierPattern &pattern); void visit (WildcardPattern &pattern); + void visit (RestPattern &pattern); // void visit(RangePatternBound& bound); void visit (RangePatternBoundLiteral &bound); void visit (RangePatternBoundPath &bound); diff --git a/gcc/rust/ast/rust-ast-full-decls.h b/gcc/rust/ast/rust-ast-full-decls.h index 0514eecec06..eafc82f4820 100644 --- a/gcc/rust/ast/rust-ast-full-decls.h +++ b/gcc/rust/ast/rust-ast-full-decls.h @@ -228,6 +228,7 @@ class MetaListNameValueStr; class LiteralPattern; class IdentifierPattern; class WildcardPattern; +class RestPattern; class RangePatternBound; class RangePatternBoundLiteral; class RangePatternBoundPath; diff --git a/gcc/rust/ast/rust-ast-visitor.h b/gcc/rust/ast/rust-ast-visitor.h index d60a68691ac..c0a5b995d7b 100644 --- a/gcc/rust/ast/rust-ast-visitor.h +++ b/gcc/rust/ast/rust-ast-visitor.h @@ -183,6 +183,7 @@ public: virtual void visit (LiteralPattern &pattern) = 0; virtual void visit (IdentifierPattern &pattern) = 0; virtual void visit (WildcardPattern &pattern) = 0; + virtual void visit (RestPattern &pattern) = 0; // virtual void visit(RangePatternBound& bound) = 0; virtual void visit (RangePatternBoundLiteral &bound) = 0; virtual void visit (RangePatternBoundPath &bound) = 0; diff --git a/gcc/rust/ast/rust-ast.cc b/gcc/rust/ast/rust-ast.cc index b67a5390f2f..3d1b573968f 100644 --- a/gcc/rust/ast/rust-ast.cc +++ b/gcc/rust/ast/rust-ast.cc @@ -5574,6 +5574,12 @@ WildcardPattern::accept_vis (ASTVisitor &vis) vis.visit (*this); } +void +RestPattern::accept_vis (ASTVisitor &vis) +{ + vis.visit (*this); +} + void RangePatternBoundLiteral::accept_vis (ASTVisitor &vis) { diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h index a62e9b98d93..ac0bd26f84a 100644 --- a/gcc/rust/ast/rust-pattern.h +++ b/gcc/rust/ast/rust-pattern.h @@ -191,6 +191,20 @@ protected: } }; +class RestPattern : public Pattern +{ + Location locus; + +public: + std::string as_string () const override { return ".."; } + + RestPattern (Location locus) : locus (locus) {} + + Location get_locus () const override final { return locus; } + + void accept_vis (ASTVisitor &vis) override; +}; + // Base range pattern bound (lower or upper limit) - abstract class RangePatternBound { diff --git a/gcc/rust/checks/errors/rust-feature-gate.h b/gcc/rust/checks/errors/rust-feature-gate.h index 22c1501cef6..0262903f123 100644 --- a/gcc/rust/checks/errors/rust-feature-gate.h +++ b/gcc/rust/checks/errors/rust-feature-gate.h @@ -151,6 +151,7 @@ public: void visit (AST::LiteralPattern &pattern) override {} void visit (AST::IdentifierPattern &pattern) override {} void visit (AST::WildcardPattern &pattern) override {} + void visit (AST::RestPattern &pattern) override {} void visit (AST::RangePatternBoundLiteral &bound) override {} void visit (AST::RangePatternBoundPath &bound) override {} void visit (AST::RangePatternBoundQualPath &bound) override {} diff --git a/gcc/rust/expand/rust-attribute-visitor.cc b/gcc/rust/expand/rust-attribute-visitor.cc index ce93986003d..d416505eeaf 100644 --- a/gcc/rust/expand/rust-attribute-visitor.cc +++ b/gcc/rust/expand/rust-attribute-visitor.cc @@ -2937,6 +2937,11 @@ AttrVisitor::visit (AST::WildcardPattern &) // not possible } void +AttrVisitor::visit (AST::RestPattern &) +{ + // not possible +} +void AttrVisitor::visit (AST::RangePatternBoundLiteral &) { // not possible diff --git a/gcc/rust/expand/rust-attribute-visitor.h b/gcc/rust/expand/rust-attribute-visitor.h index a7ab42e47ec..ceada6039a5 100644 --- a/gcc/rust/expand/rust-attribute-visitor.h +++ b/gcc/rust/expand/rust-attribute-visitor.h @@ -242,6 +242,7 @@ public: void visit (AST::LiteralPattern &) override; void visit (AST::IdentifierPattern &pattern) override; void visit (AST::WildcardPattern &) override; + void visit (AST::RestPattern &) override; void visit (AST::RangePatternBoundLiteral &) override; void visit (AST::RangePatternBoundPath &bound) override; void visit (AST::RangePatternBoundQualPath &bound) override; diff --git a/gcc/rust/hir/rust-ast-lower-base.cc b/gcc/rust/hir/rust-ast-lower-base.cc index 1651b00b05f..c21f511dc8d 100644 --- a/gcc/rust/hir/rust-ast-lower-base.cc +++ b/gcc/rust/hir/rust-ast-lower-base.cc @@ -409,6 +409,9 @@ ASTLoweringBase::visit (AST::IdentifierPattern &) void ASTLoweringBase::visit (AST::WildcardPattern &) {} +void +ASTLoweringBase::visit (AST::RestPattern &) +{} // void ASTLoweringBase::visit(RangePatternBoundbound) {} void ASTLoweringBase::visit (AST::RangePatternBoundLiteral &) diff --git a/gcc/rust/hir/rust-ast-lower-base.h b/gcc/rust/hir/rust-ast-lower-base.h index 60ed3a964d9..d0171a54e2e 100644 --- a/gcc/rust/hir/rust-ast-lower-base.h +++ b/gcc/rust/hir/rust-ast-lower-base.h @@ -211,6 +211,7 @@ public: virtual void visit (AST::LiteralPattern &pattern); virtual void visit (AST::IdentifierPattern &pattern); virtual void visit (AST::WildcardPattern &pattern); + virtual void visit (AST::RestPattern &pattern); // virtual void visit(RangePatternBound& bound); virtual void visit (AST::RangePatternBoundLiteral &bound); virtual void visit (AST::RangePatternBoundPath &bound); diff --git a/gcc/rust/resolve/rust-ast-resolve-base.cc b/gcc/rust/resolve/rust-ast-resolve-base.cc index 2f82f911922..2667a246561 100644 --- a/gcc/rust/resolve/rust-ast-resolve-base.cc +++ b/gcc/rust/resolve/rust-ast-resolve-base.cc @@ -518,6 +518,10 @@ void ResolverBase::visit (AST::WildcardPattern &) {} +void +ResolverBase::visit (AST::RestPattern &) +{} + void ResolverBase::visit (AST::RangePatternBoundLiteral &) {} diff --git a/gcc/rust/resolve/rust-ast-resolve-base.h b/gcc/rust/resolve/rust-ast-resolve-base.h index 994f61e92b8..df70303a6eb 100644 --- a/gcc/rust/resolve/rust-ast-resolve-base.h +++ b/gcc/rust/resolve/rust-ast-resolve-base.h @@ -158,6 +158,7 @@ public: void visit (AST::LiteralPattern &); void visit (AST::IdentifierPattern &); void visit (AST::WildcardPattern &); + void visit (AST::RestPattern &); void visit (AST::RangePatternBoundLiteral &); void visit (AST::RangePatternBoundPath &); diff --git a/gcc/rust/resolve/rust-early-name-resolver.cc b/gcc/rust/resolve/rust-early-name-resolver.cc index 584d430a014..10f7626dc7f 100644 --- a/gcc/rust/resolve/rust-early-name-resolver.cc +++ b/gcc/rust/resolve/rust-early-name-resolver.cc @@ -956,6 +956,10 @@ void EarlyNameResolver::visit (AST::WildcardPattern &) {} +void +EarlyNameResolver::visit (AST::RestPattern &) +{} + void EarlyNameResolver::visit (AST::RangePatternBoundLiteral &) {} diff --git a/gcc/rust/resolve/rust-early-name-resolver.h b/gcc/rust/resolve/rust-early-name-resolver.h index 4f51533131a..c94a77501a3 100644 --- a/gcc/rust/resolve/rust-early-name-resolver.h +++ b/gcc/rust/resolve/rust-early-name-resolver.h @@ -233,6 +233,7 @@ private: virtual void visit (AST::LiteralPattern &pattern); virtual void visit (AST::IdentifierPattern &pattern); virtual void visit (AST::WildcardPattern &pattern); + virtual void visit (AST::RestPattern &pattern); virtual void visit (AST::RangePatternBoundLiteral &bound); virtual void visit (AST::RangePatternBoundPath &bound); virtual void visit (AST::RangePatternBoundQualPath &bound); diff --git a/gcc/rust/util/rust-attributes.cc b/gcc/rust/util/rust-attributes.cc index ccabeb8f345..6df00ad95be 100644 --- a/gcc/rust/util/rust-attributes.cc +++ b/gcc/rust/util/rust-attributes.cc @@ -695,6 +695,10 @@ void AttributeChecker::visit (AST::WildcardPattern &) {} +void +AttributeChecker::visit (AST::RestPattern &) +{} + // void AttributeChecker::visit(RangePatternBound& ){} void diff --git a/gcc/rust/util/rust-attributes.h b/gcc/rust/util/rust-attributes.h index 39961bd1535..a9c8a33b690 100644 --- a/gcc/rust/util/rust-attributes.h +++ b/gcc/rust/util/rust-attributes.h @@ -222,6 +222,7 @@ private: void visit (AST::LiteralPattern &pattern); void visit (AST::IdentifierPattern &pattern); void visit (AST::WildcardPattern &pattern); + void visit (AST::RestPattern &pattern); // void visit(RangePatternBound& bound); void visit (AST::RangePatternBoundLiteral &bound); void visit (AST::RangePatternBoundPath &bound);