1 files changed, 44 insertions, 13 deletions

diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc
index b7a4c56..8aabcd8 100644
--- a/gcc/rust/hir/rust-ast-lower-pattern.cc
+++ b/gcc/rust/hir/rust-ast-lower-pattern.cc
@@ -23,7 +23,9 @@
 namespace Rust {
 namespace HIR {
 
-ASTLoweringPattern::ASTLoweringPattern () : translated (nullptr) {}
+ASTLoweringPattern::ASTLoweringPattern ()
+  : translated (nullptr), is_let_top_level (false)
+{}
 
 HIR::Pattern *
 ASTLoweringPattern::translate (AST::Pattern &pattern, bool is_let_top_level)
@@ -49,13 +51,18 @@ ASTLoweringPattern::visit (AST::IdentifierPattern &pattern)
 				 mappings.get_next_hir_id (crate_num),
 				 UNKNOWN_LOCAL_DEFID);
 
-  std::unique_ptr<Pattern> to_bind;
+  std::unique_ptr<Pattern> subpattern;
+  if (pattern.has_subpattern ())
+    {
+      subpattern = std::unique_ptr<Pattern> (
+	ASTLoweringPattern::translate (pattern.get_subpattern ()));
+    }
   translated
     = new HIR::IdentifierPattern (mapping, pattern.get_ident (),
 				  pattern.get_locus (), pattern.get_is_ref (),
 				  pattern.get_is_mut () ? Mutability::Mut
 							: Mutability::Imm,
-				  std::move (to_bind));
+				  std::move (subpattern));
 }
 
 void
@@ -74,13 +81,15 @@ ASTLoweringPattern::visit (AST::TupleStructPattern &pattern)
   auto &items = pattern.get_items ();
   switch (items.get_item_type ())
     {
-      case AST::TupleStructItems::RANGE: {
+    case AST::TupleStructItems::RANGE:
+      {
 	// TODO
 	rust_unreachable ();
       }
       break;
 
-      case AST::TupleStructItems::NO_RANGE: {
+    case AST::TupleStructItems::NO_RANGE:
+      {
 	AST::TupleStructItemsNoRange &items_no_range
 	  = static_cast<AST::TupleStructItemsNoRange &> (items);
 
@@ -120,7 +129,8 @@ ASTLoweringPattern::visit (AST::StructPattern &pattern)
       HIR::StructPatternField *f = nullptr;
       switch (field->get_item_type ())
 	{
-	  case AST::StructPatternField::ItemType::TUPLE_PAT: {
+	case AST::StructPatternField::ItemType::TUPLE_PAT:
+	  {
 	    auto &tuple
 	      = static_cast<AST::StructPatternFieldTuplePat &> (*field);
 
@@ -140,7 +150,8 @@ ASTLoweringPattern::visit (AST::StructPattern &pattern)
 	  }
 	  break;
 
-	  case AST::StructPatternField::ItemType::IDENT_PAT: {
+	case AST::StructPatternField::ItemType::IDENT_PAT:
+	  {
 	    AST::StructPatternFieldIdentPat &ident
 	      = static_cast<AST::StructPatternFieldIdentPat &> (*field);
 
@@ -160,7 +171,8 @@ ASTLoweringPattern::visit (AST::StructPattern &pattern)
 	  }
 	  break;
 
-	  case AST::StructPatternField::ItemType::IDENT: {
+	case AST::StructPatternField::ItemType::IDENT:
+	  {
 	    AST::StructPatternFieldIdent &ident
 	      = static_cast<AST::StructPatternFieldIdent &> (*field.get ());
 
@@ -213,7 +225,8 @@ ASTLoweringPattern::visit (AST::TuplePattern &pattern)
   std::unique_ptr<HIR::TuplePatternItems> items;
   switch (pattern.get_items ().get_pattern_type ())
     {
-      case AST::TuplePatternItems::TuplePatternItemType::MULTIPLE: {
+    case AST::TuplePatternItems::TuplePatternItemType::MULTIPLE:
+      {
 	AST::TuplePatternItemsMultiple &ref
 	  = static_cast<AST::TuplePatternItemsMultiple &> (
 	    pattern.get_items ());
@@ -221,7 +234,8 @@ ASTLoweringPattern::visit (AST::TuplePattern &pattern)
       }
       break;
 
-      case AST::TuplePatternItems::TuplePatternItemType::RANGED: {
+    case AST::TuplePatternItems::TuplePatternItemType::RANGED:
+      {
 	AST::TuplePatternItemsRanged &ref
 	  = static_cast<AST::TuplePatternItemsRanged &> (pattern.get_items ());
 	items = lower_tuple_pattern_ranged (ref);
@@ -309,10 +323,27 @@ void
 ASTLoweringPattern::visit (AST::SlicePattern &pattern)
 {
   std::vector<std::unique_ptr<HIR::Pattern>> items;
-  for (auto &p : pattern.get_items ())
+
+  switch (pattern.get_items ().get_pattern_type ())
     {
-      HIR::Pattern *item = ASTLoweringPattern::translate (*p);
-      items.push_back (std::unique_ptr<HIR::Pattern> (item));
+    case AST::SlicePatternItems::SlicePatternItemType::NO_REST:
+      {
+	AST::SlicePatternItemsNoRest &ref
+	  = static_cast<AST::SlicePatternItemsNoRest &> (pattern.get_items ());
+	for (auto &p : ref.get_patterns ())
+	  {
+	    HIR::Pattern *item = ASTLoweringPattern::translate (*p);
+	    items.push_back (std::unique_ptr<HIR::Pattern> (item));
+	  }
+      }
+      break;
+    case AST::SlicePatternItems::SlicePatternItemType::HAS_REST:
+      {
+	rust_error_at (pattern.get_locus (),
+		       "lowering of slice patterns with rest elements are not "
+		       "supported yet");
+      }
+      break;
     }
 
   auto crate_num = mappings.get_current_crate ();