[gcc r14-8043] gccrs: Replace get_pattern_node_id with get_node_id
Arthur Cohen
cohenarthur@gcc.gnu.org
Tue Jan 16 18:13:40 GMT 2024
https://gcc.gnu.org/g:292aec084c9986ea4274cd23f73248879a713911
commit r14-8043-g292aec084c9986ea4274cd23f73248879a713911
Author: Owen Avery <powerboat9.gamer@gmail.com>
Date: Tue Oct 10 22:50:55 2023 -0400
gccrs: Replace get_pattern_node_id with get_node_id
gcc/rust/ChangeLog:
* ast/rust-ast.h
(Pattern::get_pattern_node_id): Rename to...
(Pattern::get_node_id): ...here.
* ast/rust-macro.h
(MacroInvocation::get_pattern_node_id): Rename to...
(MacroInvocation::get_node_id): ...here.
* ast/rust-path.h
(PathInExpression::get_pattern_node_id): Remove.
(QualifiedPathInExpression::get_pattern_node_id): Remove.
* ast/rust-pattern.h
(LiteralPattern::get_pattern_node_id): Remove.
(IdentifierPattern::get_pattern_node_id): Remove.
(WildcardPattern::get_pattern_node_id): Remove.
(RestPattern::get_pattern_node_id): Rename to...
(RestPattern::get_node_id): ...here.
(RangePattern::get_pattern_node_id): Remove.
(ReferencePattern::get_pattern_node_id): Remove.
(StructPattern::get_pattern_node_id): Remove.
(TupleStructPattern::get_pattern_node_id): Remove.
(TuplePattern::get_pattern_node_id): Remove.
(GroupedPattern::get_pattern_node_id): Remove.
(SlicePattern::get_pattern_node_id): Remove.
(AltPattern::get_pattern_node_id): Remove.
* resolve/rust-early-name-resolver.cc
(EarlyNameResolver::visit):
Use get_node_id instead of get_pattern_node_id.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diff:
---
gcc/rust/ast/rust-ast.h | 2 +-
gcc/rust/ast/rust-macro.h | 2 +-
gcc/rust/ast/rust-path.h | 4 ----
gcc/rust/ast/rust-pattern.h | 24 +-----------------------
gcc/rust/resolve/rust-early-name-resolver.cc | 2 +-
5 files changed, 4 insertions(+), 30 deletions(-)
diff --git a/gcc/rust/ast/rust-ast.h b/gcc/rust/ast/rust-ast.h
index 136da86525d..b39d3cc1364 100644
--- a/gcc/rust/ast/rust-ast.h
+++ b/gcc/rust/ast/rust-ast.h
@@ -1194,7 +1194,7 @@ public:
virtual bool is_marked_for_strip () const { return false; }
virtual location_t get_locus () const = 0;
- virtual NodeId get_pattern_node_id () const = 0;
+ virtual NodeId get_node_id () const = 0;
protected:
// Clone pattern implementation as pure virtual method
diff --git a/gcc/rust/ast/rust-macro.h b/gcc/rust/ast/rust-macro.h
index 490e8121427..435ecb11815 100644
--- a/gcc/rust/ast/rust-macro.h
+++ b/gcc/rust/ast/rust-macro.h
@@ -668,7 +668,7 @@ public:
outer_attrs = std::move (new_attrs);
}
- NodeId get_pattern_node_id () const override final
+ NodeId get_node_id () const override final
{
return ExprWithoutBlock::get_node_id ();
}
diff --git a/gcc/rust/ast/rust-path.h b/gcc/rust/ast/rust-path.h
index 14524c7624c..9279fdd8c7d 100644
--- a/gcc/rust/ast/rust-path.h
+++ b/gcc/rust/ast/rust-path.h
@@ -644,8 +644,6 @@ public:
outer_attrs = std::move (new_attrs);
}
- NodeId get_pattern_node_id () const override final { return get_node_id (); }
-
protected:
/* Use covariance to implement clone function as returning this object
* rather than base */
@@ -1244,8 +1242,6 @@ public:
NodeId get_node_id () const override { return _node_id; }
- NodeId get_pattern_node_id () const override final { return get_node_id (); }
-
protected:
/* Use covariance to implement clone function as returning this object
* rather than base */
diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h
index 18fe9995790..6ee1417a1fd 100644
--- a/gcc/rust/ast/rust-pattern.h
+++ b/gcc/rust/ast/rust-pattern.h
@@ -51,8 +51,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
Literal &get_literal () { return lit; }
const Literal &get_literal () const { return lit; }
@@ -151,8 +149,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -181,8 +177,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -208,7 +202,7 @@ public:
void accept_vis (ASTVisitor &vis) override;
- NodeId get_pattern_node_id () const override final { return node_id; }
+ NodeId get_node_id () const override final { return node_id; }
protected:
RestPattern *clone_pattern_impl () const override
@@ -437,8 +431,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -507,8 +499,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -944,8 +934,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -1183,8 +1171,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -1425,8 +1411,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -1487,8 +1471,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -1553,8 +1535,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
@@ -1620,8 +1600,6 @@ public:
NodeId get_node_id () const { return node_id; }
- NodeId get_pattern_node_id () const override final { return node_id; }
-
protected:
/* Use covariance to implement clone function as returning this object rather
* than base */
diff --git a/gcc/rust/resolve/rust-early-name-resolver.cc b/gcc/rust/resolve/rust-early-name-resolver.cc
index cdebca63892..63d3ccfb74f 100644
--- a/gcc/rust/resolve/rust-early-name-resolver.cc
+++ b/gcc/rust/resolve/rust-early-name-resolver.cc
@@ -953,7 +953,7 @@ EarlyNameResolver::visit (AST::MacroInvocation &invoc)
if (has_semicolon)
source_node = invoc.get_macro_node_id ();
else
- source_node = invoc.get_pattern_node_id ();
+ source_node = invoc.get_node_id ();
auto seg
= CanonicalPath::new_seg (source_node, invoc_data.get_path ().as_string ());
More information about the Gcc-cvs
mailing list