https://gcc.gnu.org/g:005d5e1f0343d8e0091d47938e8d6b2f384d45d7
commit 005d5e1f0343d8e0091d47938e8d6b2f384d45d7
Author: Owen Avery <powerboat9.ga...@gmail.com>
Date: Fri Oct 6 09:15:17 2023 -0400
Adjust item kind enums for TupleStructItems and TuplePatternItems
gcc/rust/ChangeLog:
* hir/tree/rust-hir-pattern.h
(TupleStructItems::ItemType::RANGE): Rename to...
(TupleStructItems::ItemType::RANGED): ...here.
(TupleStructItems::ItemType::NO_RANGE): Rename to...
(TupleStructItems::ItemType::MULTIPLE): ...here.
(TuplePatternItems::TuplePatternItemType): Rename to...
(TuplePatternItems::ItemType): ...here.
: Handle renames.
* backend/rust-compile-pattern.cc: Likewise.
* typecheck/rust-hir-type-check-pattern.cc: Likewise.
* checks/errors/borrowck/rust-bir-builder-pattern.h: Likewise.
Signed-off-by: Owen Avery <powerboat9.ga...@gmail.com>
Diff:
---
gcc/rust/backend/rust-compile-pattern.cc | 12 ++++++------
.../errors/borrowck/rust-bir-builder-pattern.h | 4 ++--
gcc/rust/hir/tree/rust-hir-pattern.h | 22 ++++++++--------------
gcc/rust/typecheck/rust-hir-type-check-pattern.cc | 8 ++++----
4 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/gcc/rust/backend/rust-compile-pattern.cc
b/gcc/rust/backend/rust-compile-pattern.cc
index 5e3026996aed..810cf6bff64c 100644
--- a/gcc/rust/backend/rust-compile-pattern.cc
+++ b/gcc/rust/backend/rust-compile-pattern.cc
@@ -355,13 +355,13 @@ CompilePatternCheckExpr::visit (HIR::TupleStructPattern
&pattern)
std::unique_ptr<HIR::TupleStructItems> &items = pattern.get_items ();
switch (items->get_item_type ())
{
- case HIR::TupleStructItems::RANGE: {
+ case HIR::TupleStructItems::RANGED: {
// TODO
rust_unreachable ();
}
break;
- case HIR::TupleStructItems::NO_RANGE: {
+ case HIR::TupleStructItems::MULTIPLE: {
HIR::TupleStructItemsNoRange &items_no_range
= static_cast<HIR::TupleStructItemsNoRange &> (*items.get ());
@@ -457,13 +457,13 @@ CompilePatternBindings::visit (HIR::TupleStructPattern
&pattern)
std::unique_ptr<HIR::TupleStructItems> &items = pattern.get_items ();
switch (items->get_item_type ())
{
- case HIR::TupleStructItems::RANGE: {
+ case HIR::TupleStructItems::RANGED: {
// TODO
rust_unreachable ();
}
break;
- case HIR::TupleStructItems::NO_RANGE: {
+ case HIR::TupleStructItems::MULTIPLE: {
HIR::TupleStructItemsNoRange &items_no_range
= static_cast<HIR::TupleStructItemsNoRange &> (*items.get ());
@@ -667,7 +667,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
switch (pattern.get_items ()->get_item_type ())
{
- case HIR::TuplePatternItems::TuplePatternItemType::RANGED: {
+ case HIR::TuplePatternItems::ItemType::RANGED: {
size_t tuple_idx = 0;
auto &items
= static_cast<HIR::TuplePatternItemsRanged &> (*pattern.get_items ());
@@ -711,7 +711,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
return;
}
- case HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE: {
+ case HIR::TuplePatternItems::ItemType::MULTIPLE: {
size_t tuple_idx = 0;
auto &items = static_cast<HIR::TuplePatternItemsMultiple &> (
*pattern.get_items ());
diff --git a/gcc/rust/checks/errors/borrowck/rust-bir-builder-pattern.h
b/gcc/rust/checks/errors/borrowck/rust-bir-builder-pattern.h
index 0596264afc51..9949ef17989f 100644
--- a/gcc/rust/checks/errors/borrowck/rust-bir-builder-pattern.h
+++ b/gcc/rust/checks/errors/borrowck/rust-bir-builder-pattern.h
@@ -260,7 +260,7 @@ public:
size_t index = 0;
switch (pattern.get_items ()->get_item_type ())
{
- case HIR::TupleStructItems::RANGE: {
+ case HIR::TupleStructItems::RANGED: {
auto &items
= static_cast<HIR::TupleStructItemsRange &> (*pattern.get_items ());
@@ -278,7 +278,7 @@ public:
visit_tuple_fields (items.get_upper_patterns (), saved, index);
break;
}
- case HIR::TupleStructItems::NO_RANGE: {
+ case HIR::TupleStructItems::MULTIPLE: {
auto &items = static_cast<HIR::TupleStructItemsNoRange &> (
*pattern.get_items ());
visit_tuple_fields (items.get_patterns (), saved, index);
diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h
b/gcc/rust/hir/tree/rust-hir-pattern.h
index 65dc53a4ca6d..851e3b2b75b4 100644
--- a/gcc/rust/hir/tree/rust-hir-pattern.h
+++ b/gcc/rust/hir/tree/rust-hir-pattern.h
@@ -783,8 +783,8 @@ class TupleStructItems : public FullVisitable
public:
enum ItemType
{
- RANGE,
- NO_RANGE
+ MULTIPLE,
+ RANGED,
};
virtual ~TupleStructItems () {}
@@ -852,7 +852,7 @@ public:
return patterns;
}
- ItemType get_item_type () const override final { return ItemType::NO_RANGE; }
+ ItemType get_item_type () const override final { return ItemType::MULTIPLE; }
protected:
/* Use covariance to implement clone function as returning this object rather
@@ -931,7 +931,7 @@ public:
return upper_patterns;
}
- ItemType get_item_type () const override final { return ItemType::RANGE; }
+ ItemType get_item_type () const override final { return ItemType::RANGED; }
protected:
/* Use covariance to implement clone function as returning this object rather
@@ -1014,7 +1014,7 @@ protected:
class TuplePatternItems : public FullVisitable
{
public:
- enum TuplePatternItemType
+ enum ItemType
{
MULTIPLE,
RANGED,
@@ -1032,7 +1032,7 @@ public:
virtual std::string as_string () const = 0;
- virtual TuplePatternItemType get_item_type () const = 0;
+ virtual ItemType get_item_type () const = 0;
protected:
// pure virtual clone implementation
@@ -1077,10 +1077,7 @@ public:
void accept_vis (HIRFullVisitor &vis) override;
- TuplePatternItemType get_item_type () const override
- {
- return TuplePatternItemType::MULTIPLE;
- }
+ ItemType get_item_type () const override { return ItemType::MULTIPLE; }
std::vector<std::unique_ptr<Pattern>> &get_patterns () { return patterns; }
const std::vector<std::unique_ptr<Pattern>> &get_patterns () const
@@ -1147,10 +1144,7 @@ public:
void accept_vis (HIRFullVisitor &vis) override;
- TuplePatternItemType get_item_type () const override
- {
- return TuplePatternItemType::RANGED;
- }
+ ItemType get_item_type () const override { return ItemType::RANGED; }
std::vector<std::unique_ptr<Pattern>> &get_lower_patterns ()
{
diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
index a5bceae039e7..7ad0147327cb 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
@@ -101,13 +101,13 @@ TypeCheckPattern::visit (HIR::TupleStructPattern &pattern)
std::unique_ptr<HIR::TupleStructItems> &items = pattern.get_items ();
switch (items->get_item_type ())
{
- case HIR::TupleStructItems::RANGE: {
+ case HIR::TupleStructItems::RANGED: {
// TODO
rust_unreachable ();
}
break;
- case HIR::TupleStructItems::NO_RANGE: {
+ case HIR::TupleStructItems::MULTIPLE: {
HIR::TupleStructItemsNoRange &items_no_range
= static_cast<HIR::TupleStructItemsNoRange &> (*items.get ());
@@ -297,7 +297,7 @@ TypeCheckPattern::visit (HIR::TuplePattern &pattern)
std::unique_ptr<HIR::TuplePatternItems> items;
switch (pattern.get_items ()->get_item_type ())
{
- case HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE: {
+ case HIR::TuplePatternItems::ItemType::MULTIPLE: {
HIR::TuplePatternItemsMultiple &ref
= *static_cast<HIR::TuplePatternItemsMultiple *> (
pattern.get_items ().get ());
@@ -336,7 +336,7 @@ TypeCheckPattern::visit (HIR::TuplePattern &pattern)
}
break;
- case HIR::TuplePatternItems::TuplePatternItemType::RANGED: {
+ case HIR::TuplePatternItems::ItemType::RANGED: {
// HIR::TuplePatternItemsRanged &ref
// = *static_cast<HIR::TuplePatternItemsRanged *> (
// pattern.get_items ().get ());
