[gcc r14-8031] gccrs: Adjust methods for TuplePatternItems to match TupleStructItems
Arthur Cohen
cohenarthur@gcc.gnu.org
Tue Jan 16 18:15:04 GMT 2024
https://gcc.gnu.org/g:4e2110cac3f965d4a0c47f8440b99e47471c5b4d
commit r14-8031-g4e2110cac3f965d4a0c47f8440b99e47471c5b4d
Author: Owen Avery <powerboat9.gamer@gmail.com>
Date: Tue Oct 3 17:56:33 2023 -0400
gccrs: Adjust methods for TuplePatternItems to match TupleStructItems
gcc/rust/ChangeLog:
* hir/tree/rust-hir-pattern.h
(TuplePatternItems::get_pattern_type): Rename to...
(TuplePatternItems::get_item_type): ...here.
(TuplePatternItemsMultiple::get_pattern_type): Rename to...
(TuplePatternItemsMultiple::get_item_type): ...here.
(TuplePatternItemsRanged::get_pattern_type): Rename to...
(TuplePatternItemsRanged::get_item_type): ...here.
* backend/rust-compile-expr.cc: Adjust calls to renamed methods.
* backend/rust-compile-pattern.cc: Likewise.
* typecheck/rust-hir-type-check-pattern.cc: Likewise.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diff:
---
gcc/rust/backend/rust-compile-expr.cc | 2 +-
gcc/rust/backend/rust-compile-pattern.cc | 2 +-
gcc/rust/hir/tree/rust-hir-pattern.h | 6 +++---
gcc/rust/typecheck/rust-hir-type-check-pattern.cc | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index 929f3c0f5e4..2e4bd57b377 100644
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -1038,7 +1038,7 @@ sort_tuple_patterns (HIR::MatchExpr &expr)
auto items
= HIR::TuplePattern (ref).get_items ()->clone_tuple_pattern_items ();
- if (items->get_pattern_type ()
+ if (items->get_item_type ()
== HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE)
{
auto items_ref
diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc
index 66726d20d42..53de49558b8 100644
--- a/gcc/rust/backend/rust-compile-pattern.cc
+++ b/gcc/rust/backend/rust-compile-pattern.cc
@@ -416,7 +416,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
tree access_expr = Backend::var_expression (tmp_var, pattern.get_locus ());
ctx->add_statement (init_stmt);
- switch (pattern.get_items ()->get_pattern_type ())
+ switch (pattern.get_items ()->get_item_type ())
{
case HIR::TuplePatternItems::TuplePatternItemType::RANGED: {
size_t tuple_idx = 0;
diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-hir-pattern.h
index c8defd4d795..652faa4d980 100644
--- a/gcc/rust/hir/tree/rust-hir-pattern.h
+++ b/gcc/rust/hir/tree/rust-hir-pattern.h
@@ -1033,7 +1033,7 @@ public:
virtual std::string as_string () const = 0;
- virtual TuplePatternItemType get_pattern_type () const = 0;
+ virtual TuplePatternItemType get_item_type () const = 0;
protected:
// pure virtual clone implementation
@@ -1078,7 +1078,7 @@ public:
void accept_vis (HIRFullVisitor &vis) override;
- TuplePatternItemType get_pattern_type () const override
+ TuplePatternItemType get_item_type () const override
{
return TuplePatternItemType::MULTIPLE;
}
@@ -1148,7 +1148,7 @@ public:
void accept_vis (HIRFullVisitor &vis) override;
- TuplePatternItemType get_pattern_type () const override
+ TuplePatternItemType get_item_type () const override
{
return TuplePatternItemType::RANGED;
}
diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
index eacdd7cf1a2..4c001453a54 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
@@ -296,7 +296,7 @@ void
TypeCheckPattern::visit (HIR::TuplePattern &pattern)
{
std::unique_ptr<HIR::TuplePatternItems> items;
- switch (pattern.get_items ()->get_pattern_type ())
+ switch (pattern.get_items ()->get_item_type ())
{
case HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE: {
HIR::TuplePatternItemsMultiple &ref
More information about the Gcc-cvs
mailing list