diff options
author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2024-05-21 18:09:14 +0200 |
---|---|---|
committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-03-17 16:35:34 +0100 |
commit | ab89ab377d8d99d9875dc0f2262c5282ce083bdf (patch) | |
tree | 350a1b574c2cfeb9835defbe55aad2bbc3df0e12 | |
parent | cc7ec3925c3371deca5fa891e0a7a82950956c54 (diff) | |
download | gcc-ab89ab377d8d99d9875dc0f2262c5282ce083bdf.zip gcc-ab89ab377d8d99d9875dc0f2262c5282ce083bdf.tar.gz gcc-ab89ab377d8d99d9875dc0f2262c5282ce083bdf.tar.bz2 |
gccrs: Add exclusive_range_pattern feature gate
This syntax is experimental and shall be explicitely enabled in the crate
attributes as it cannot be used in stable rust.
gcc/rust/ChangeLog:
* checks/errors/rust-feature-gate.cc (FeatureGate::visit): Gate the
excluded pattern.
* checks/errors/rust-feature-gate.h: Update the function prototype
and delete two empty implementations in order to use default visitor
behavior.
* checks/errors/rust-feature.cc (Feature::create): Add the new
exclusive range pattern feature gate.
* checks/errors/rust-feature.h: Add new feature enum variant for
exclusive range patterns.
* parse/rust-parse-impl.h (Parser::parse_pattern_no_alt): Forward the
token location to the AST.
(Parser::parse_ident_leading_pattern): Likewise.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
-rw-r--r-- | gcc/rust/checks/errors/rust-feature-gate.cc | 8 | ||||
-rw-r--r-- | gcc/rust/checks/errors/rust-feature-gate.h | 4 | ||||
-rw-r--r-- | gcc/rust/checks/errors/rust-feature.cc | 5 | ||||
-rw-r--r-- | gcc/rust/checks/errors/rust-feature.h | 1 | ||||
-rw-r--r-- | gcc/rust/parse/rust-parse-impl.h | 4 |
5 files changed, 17 insertions, 5 deletions
diff --git a/gcc/rust/checks/errors/rust-feature-gate.cc b/gcc/rust/checks/errors/rust-feature-gate.cc index 8f9e991..580afc9 100644 --- a/gcc/rust/checks/errors/rust-feature-gate.cc +++ b/gcc/rust/checks/errors/rust-feature-gate.cc @@ -209,4 +209,12 @@ FeatureGate::visit (AST::BorrowExpr &expr) "raw address of syntax is experimental"); } +void +FeatureGate::visit (AST::RangePattern &pattern) +{ + if (pattern.get_range_kind () == AST::RangeKind::EXCLUDED) + gate (Feature::Name::EXCLUSIVE_RANGE_PATTERN, pattern.get_locus (), + "exclusive range pattern syntax is experimental"); +} + } // namespace Rust diff --git a/gcc/rust/checks/errors/rust-feature-gate.h b/gcc/rust/checks/errors/rust-feature-gate.h index a31405e..31c2ed6 100644 --- a/gcc/rust/checks/errors/rust-feature-gate.h +++ b/gcc/rust/checks/errors/rust-feature-gate.h @@ -99,9 +99,7 @@ public: void visit (AST::ForLoopExpr &expr) override {} void visit (AST::IfExpr &expr) override {} void visit (AST::IfExprConseqElse &expr) override {} - void visit (AST::IfLetExpr &expr) override {} void visit (AST::IfLetExprConseqElse &expr) override {} - void visit (AST::MatchExpr &expr) override {} void visit (AST::AwaitExpr &expr) override {} void visit (AST::AsyncBlockExpr &expr) override {} void visit (AST::TypeParam ¶m) override; @@ -150,7 +148,7 @@ public: void visit (AST::RangePatternBoundLiteral &bound) override {} void visit (AST::RangePatternBoundPath &bound) override {} void visit (AST::RangePatternBoundQualPath &bound) override {} - void visit (AST::RangePattern &pattern) override {} + void visit (AST::RangePattern &pattern) override; void visit (AST::ReferencePattern &pattern) override {} void visit (AST::StructPatternFieldTuplePat &field) override {} void visit (AST::StructPatternFieldIdentPat &field) override {} diff --git a/gcc/rust/checks/errors/rust-feature.cc b/gcc/rust/checks/errors/rust-feature.cc index bc8aa91..917e3b2 100644 --- a/gcc/rust/checks/errors/rust-feature.cc +++ b/gcc/rust/checks/errors/rust-feature.cc @@ -54,6 +54,10 @@ Feature::create (Feature::Name name) case Feature::Name::RAW_REF_OP: return Feature (Feature::Name::RAW_REF_OP, Feature::State::ACTIVE, "raw_ref_op", "1.41.0", 64490, tl::nullopt, ""); + case Feature::Name::EXCLUSIVE_RANGE_PATTERN: + return Feature (Feature::Name::EXCLUSIVE_RANGE_PATTERN, + Feature::State::ACTIVE, "exclusive_range_pattern", + "1.11.0", 37854, tl::nullopt, ""); default: rust_unreachable (); } @@ -74,6 +78,7 @@ const std::map<std::string, Feature::Name> Feature::name_hash_map = { {"box_syntax", Feature::Name::BOX_SYNTAX}, {"dropck_eyepatch", Feature::Name::DROPCK_EYEPATCH}, {"raw_ref_op", Feature::Name::RAW_REF_OP}, + {"exclusive_range_pattern", Feature::Name::EXCLUSIVE_RANGE_PATTERN}, }; // namespace Rust tl::optional<Feature::Name> diff --git a/gcc/rust/checks/errors/rust-feature.h b/gcc/rust/checks/errors/rust-feature.h index 6661865..698aac2 100644 --- a/gcc/rust/checks/errors/rust-feature.h +++ b/gcc/rust/checks/errors/rust-feature.h @@ -49,6 +49,7 @@ public: BOX_SYNTAX, DROPCK_EYEPATCH, RAW_REF_OP, + EXCLUSIVE_RANGE_PATTERN, }; const std::string &as_string () { return m_name_str; } diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index cabfb5b..7a9c0b7 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -10586,7 +10586,7 @@ Parser<ManagedTokenSource>::parse_pattern_no_alt () return std::unique_ptr<AST::RangePattern> ( new AST::RangePattern (std::move (lower_bound), std::move (upper_bound), kind, - UNKNOWN_LOCATION)); + next->get_locus ())); } case EXCLAM: return parse_macro_invocation_partial (std::move (path), @@ -11112,7 +11112,7 @@ Parser<ManagedTokenSource>::parse_ident_leading_pattern () return std::unique_ptr<AST::RangePattern> ( new AST::RangePattern (std::move (lower_bound), std::move (upper_bound), kind, - UNKNOWN_LOCATION)); + t->get_locus ())); } case PATTERN_BIND: { // only allow on single-segment paths |