]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
Merge #1818
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>
Fri, 3 Feb 2023 20:17:06 +0000 (20:17 +0000)
committerGitHub <noreply@github.com>
Fri, 3 Feb 2023 20:17:06 +0000 (20:17 +0000)
1818: Implement lowering ReferencePattern from AST to HIR r=CohenArthur a=powerboat9

gcc/rust/ChangeLog:

* ast/rust-pattern.h (ReferencePattern::get_has_two_amps): Add method. (ReferencePattern::get_is_mut): Add method.
* hir/rust-ast-lower-pattern.cc (ASTLoweringPattern::visit): Add ReferencePattern visitor.
* hir/rust-ast-lower-pattern.h (ASTLoweringPattern::visit): Add ReferencePattern visitor.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Partially addresses #1813

Co-authored-by: Owen Avery <powerboat9.gamer@gmail.com>
1  2 
gcc/rust/hir/rust-ast-lower-pattern.cc
gcc/rust/hir/tree/rust-hir-full-test.cc
gcc/rust/hir/tree/rust-hir-pattern.h

index 237fa2ee7466d859216bfa108695867c77808afd,9f673926f9ddcdcd71519c0fac42b06d34fb5025..57cf17c24ae25cda1f7f459fd8aa4cc43da1814f
@@@ -246,8 -246,47 +246,37 @@@ ASTLoweringPattern::visit (AST::RangePa
  void
  ASTLoweringPattern::visit (AST::GroupedPattern &pattern)
  {
 -  auto crate_num = mappings->get_current_crate ();
 -  Analysis::NodeMapping mapping (crate_num, pattern.get_node_id (),
 -                               mappings->get_next_hir_id (crate_num),
 -                               UNKNOWN_LOCAL_DEFID);
 -
 -  HIR::Pattern *inner
 -    = ASTLoweringPattern::translate (pattern.get_pattern_in_parens ().get ());
 -
 -  translated
 -    = new HIR::GroupedPattern (mapping, std::unique_ptr<HIR::Pattern> (inner),
 -                             pattern.get_locus ());
 +  pattern.get_pattern_in_parens ()->accept_vis (*this);
  }
  
+ void
+ ASTLoweringPattern::visit (AST::ReferencePattern &pattern)
+ {
+   auto crate_num = mappings->get_current_crate ();
+   Analysis::NodeMapping mapping (crate_num, pattern.get_node_id (),
+                                mappings->get_next_hir_id (crate_num),
+                                UNKNOWN_LOCAL_DEFID);
+   HIR::Pattern *inner
+     = ASTLoweringPattern::translate (pattern.get_referenced_pattern ().get ());
+   translated
+     = new HIR::ReferencePattern (mapping, std::unique_ptr<HIR::Pattern> (inner),
+                                pattern.get_is_mut () ? Mutability::Mut
+                                                      : Mutability::Imm,
+                                pattern.get_locus ());
+   if (pattern.is_double_reference ())
+     {
+       Analysis::NodeMapping mapping2 (crate_num, pattern.get_node_id (),
+                                     mappings->get_next_hir_id (crate_num),
+                                     UNKNOWN_LOCAL_DEFID);
+       translated
+       = new HIR::ReferencePattern (mapping2,
+                                    std::unique_ptr<HIR::Pattern> (translated),
+                                    Mutability::Imm, pattern.get_locus ());
+     }
+ }
  } // namespace HIR
  } // namespace Rust
Simple merge