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-expr.cc: Likewise. * backend/rust-compile-pattern.cc: Likewise. * typecheck/rust-hir-type-check-pattern.cc: Likewise. Signed-off-by: Owen Avery <[email protected]>
Rust-GCC · Oct 17, 2023 · 816b16c · 816b16c
1 parent c82bbb0
commit 816b16c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
@@ -1038,8 +1038,7 @@ sort_tuple_patterns (HIR::MatchExpr &expr)
 
       auto items
 	= HIR::TuplePattern (ref).get_items ()->clone_tuple_pattern_items ();
-      if (items->get_item_type ()
-	  == HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE)
+      if (items->get_item_type () == HIR::TuplePatternItems::ItemType::MULTIPLE)
 	{
 	  auto items_ref
 	    = *static_cast<HIR::TuplePatternItemsMultiple *> (items.get ());

diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc
@@ -208,13 +208,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 ());
 
@@ -418,7 +418,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 ());
@@ -462,7 +462,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/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 @@ class TupleStructItemsNoRange : public TupleStructItems
     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 @@ class TupleStructItemsRange : public TupleStructItems
     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 @@ class TupleStructPattern : public Pattern
 class TuplePatternItems : public FullVisitable
 {
 public:
-  enum TuplePatternItemType
+  enum ItemType
   {
     MULTIPLE,
     RANGED,
@@ -1032,7 +1032,7 @@ class TuplePatternItems : public FullVisitable
 
   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 @@ class TuplePatternItemsMultiple : public TuplePatternItems
 
   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 @@ class TuplePatternItemsRanged : public TuplePatternItems
 
   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
@@ -102,13 +102,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 ());
 
@@ -298,7 +298,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 ());
@@ -338,7 +338,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 ());