gccrs: Rename get_pattern_to_bind to get_subpattern

gcc/rust/ChangeLog:

	* ast/rust-ast-collector.cc: Rename get_pattern_to_bind to get_subpattern
	* ast/rust-ast-visitor.cc: Ditto.
	* ast/rust-pattern.h: Ditto.
	* expand/rust-cfg-strip.cc: Ditto.
	* hir/rust-ast-lower-pattern.cc: Ditto.

Signed-off-by: Yap Zhi Heng <yapzhhg@gmail.com>

diff --git a/gcc/rust/ast/rust-ast-collector.cc b/gcc/rust/ast/rust-ast-collector.cc
index b0e06ab85dbc0a50694e8bb74fbb56641da916df..5a8d462dbd7b466254cb602920a0bbeeb9bd6c46 100644 (file)
--- a/gcc/rust/ast/rust-ast-collector.cc
+++ b/gcc/rust/ast/rust-ast-collector.cc
@@ -2485,7 +2485,7 @@ TokenCollector::visit (IdentifierPattern &pattern)
   if (pattern.has_subpattern ())
     {
       push (Rust::Token::make (PATTERN_BIND, UNDEF_LOCATION));
-      visit (pattern.get_pattern_to_bind ());
+      visit (pattern.get_subpattern ());
     }
 }
 

diff --git a/gcc/rust/ast/rust-ast-visitor.cc b/gcc/rust/ast/rust-ast-visitor.cc
index 02f4f1664d62133e7f896c93187ac6a2a838ae4a..f21a5bbfcb75c07a142be02c24d8b401ddc3f93e 100644 (file)
--- a/gcc/rust/ast/rust-ast-visitor.cc
+++ b/gcc/rust/ast/rust-ast-visitor.cc
@@ -1200,7 +1200,7 @@ void
 DefaultASTVisitor::visit (AST::IdentifierPattern &pattern)
 {
   if (pattern.has_subpattern ())
-    visit (pattern.get_pattern_to_bind ());
+    visit (pattern.get_subpattern ());
 }
 
 void

diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h
index 195a08f4fcd93f85a857418344d8df3fba55400b..b9c0fd9bb2f14e610f09831636209c46310dda3e 100644 (file)
--- a/gcc/rust/ast/rust-pattern.h
+++ b/gcc/rust/ast/rust-pattern.h
@@ -137,8 +137,7 @@ public:
 
   void accept_vis (ASTVisitor &vis) override;
 
-  // TODO: is this better? Or is a "vis_pattern" better?
-  Pattern &get_pattern_to_bind ()
+  Pattern &get_subpattern ()
   {
     rust_assert (has_subpattern ());
     return *subpattern;

diff --git a/gcc/rust/expand/rust-cfg-strip.cc b/gcc/rust/expand/rust-cfg-strip.cc
index 0db6122d5c33af38871048a2ec412567cbdda7e2..774e2b46b947a86344baead47966b99f1f6be517 100644 (file)
--- a/gcc/rust/expand/rust-cfg-strip.cc
+++ b/gcc/rust/expand/rust-cfg-strip.cc
@@ -2267,7 +2267,7 @@ CfgStrip::visit (AST::IdentifierPattern &pattern)
 
   AST::DefaultASTVisitor::visit (pattern);
 
-  auto &sub_pattern = pattern.get_pattern_to_bind ();
+  auto &sub_pattern = pattern.get_subpattern ();
   if (sub_pattern.is_marked_for_strip ())
     rust_error_at (sub_pattern.get_locus (),
                   "cannot strip pattern in this position");

diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc
index 9baf81d6ee91b897efd3b92f52fe55d2d67f979f..bb5b93b2c49bac7d5a25e47ef36494a4efe67bdd 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-pattern.cc
+++ b/gcc/rust/hir/rust-ast-lower-pattern.cc
@@ -53,7 +53,7 @@ ASTLoweringPattern::visit (AST::IdentifierPattern &pattern)
   if (pattern.has_subpattern ())
     {
       subpattern = std::unique_ptr<Pattern> (
-       ASTLoweringPattern::translate (pattern.get_pattern_to_bind ()));
+       ASTLoweringPattern::translate (pattern.get_subpattern ()));
     }
   translated
     = new HIR::IdentifierPattern (mapping, pattern.get_ident (),