gccrs: hir: Rename get_pattern_mappings method

Unify with the name used in Expr to allow convenient template over
everything that has mappings.

gcc/rust/ChangeLog:

	* backend/rust-compile-base.cc: Rename method.
	* backend/rust-compile-expr.cc (sort_tuple_patterns): Rename method.
	* backend/rust-compile-pattern.cc (CompilePatternCaseLabelExpr::visit): Rename method.
	(CompilePatternBindings::visit): Rename method.
	(CompilePatternLet::visit): Rename method.
	* backend/rust-compile-stmt.cc (CompileStmt::visit): Rename method.
	* backend/rust-compile-var-decl.h: Rename method.
	* hir/rust-ast-lower-pattern.cc (ASTLoweringPattern::translate): Rename method.
	* hir/rust-hir-dump.cc (Dump::visit): Rename method.
	* hir/tree/rust-hir-path.h: Rename method.
	* hir/tree/rust-hir-pattern.h: Rename method.
	* hir/tree/rust-hir.h: Rename method.
	* typecheck/rust-hir-type-check-pattern.cc (TypeCheckPattern::Resolve): Rename method.
	(TypeCheckPattern::visit): Rename method.
	(ClosureParamInfer::visit): Rename method.
	* typecheck/rust-hir-type-check-stmt.cc (TypeCheckStmt::visit): Rename method.
	* util/rust-hir-map.cc (Mappings::insert_hir_pattern): Rename method.

Signed-off-by: Jakub Dupak <dev@jakubdupak.com>

5 files changed, 15 insertions, 15 deletions

diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc
index bfa09c8..1c1c5e9 100644
--- a/gcc/rust/backend/rust-compile-base.cc
+++ b/gcc/rust/backend/rust-compile-base.cc
@@ -615,7 +615,7 @@ HIRCompileBase::compile_function (
       param_vars.push_back (compiled_param_var);
 
       const HIR::Pattern &param_pattern = *referenced_param.get_param_name ();
-      ctx->insert_var_decl (param_pattern.get_pattern_mappings ().get_hirid (),
+      ctx->insert_var_decl (param_pattern.get_mappings ().get_hirid (),
 			    compiled_param_var);
     }
 
diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index 8e64e57..b61b46a 100644
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -1072,7 +1072,7 @@ sort_tuple_patterns (HIR::MatchExpr &expr)
 
 	      // Construct a TuplePattern from the rest of the patterns
 	      result_pattern = std::unique_ptr<HIR::Pattern> (
-		new HIR::TuplePattern (ref.get_pattern_mappings (),
+		new HIR::TuplePattern (ref.get_mappings (),
 				       std::move (new_items),
 				       ref.get_locus ()));
 	    }
diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc
index 53de495..93a5f7c 100644
--- a/gcc/rust/backend/rust-compile-pattern.cc
+++ b/gcc/rust/backend/rust-compile-pattern.cc
@@ -85,8 +85,8 @@ CompilePatternCaseLabelExpr::visit (HIR::LiteralPattern &pattern)
 {
   // Compile the literal
   HIR::LiteralExpr *litexpr
-    = new HIR::LiteralExpr (pattern.get_pattern_mappings (),
-			    pattern.get_literal (), pattern.get_locus (),
+    = new HIR::LiteralExpr (pattern.get_mappings (), pattern.get_literal (),
+			    pattern.get_locus (),
 			    std::vector<AST::Attribute> ());
 
   // Note: Floating point literals are currently accepted but will likely be
@@ -164,10 +164,10 @@ void
 CompilePatternCaseLabelExpr::visit (HIR::RangePattern &pattern)
 {
   tree upper = compile_range_pattern_bound (pattern.get_upper_bound ().get (),
-					    pattern.get_pattern_mappings (),
+					    pattern.get_mappings (),
 					    pattern.get_locus (), ctx);
   tree lower = compile_range_pattern_bound (pattern.get_lower_bound ().get (),
-					    pattern.get_pattern_mappings (),
+					    pattern.get_mappings (),
 					    pattern.get_locus (), ctx);
 
   case_label_expr = build_case_label (lower, upper, associated_case_label);
@@ -239,7 +239,7 @@ CompilePatternBindings::visit (HIR::TupleStructPattern &pattern)
 						      pattern->get_locus ());
 
 		ctx->insert_pattern_binding (
-		  pattern->get_pattern_mappings ().get_hirid (), binding);
+		  pattern->get_mappings ().get_hirid (), binding);
 	      }
 	  }
 	else
@@ -255,7 +255,7 @@ CompilePatternBindings::visit (HIR::TupleStructPattern &pattern)
 						      pattern->get_locus ());
 
 		ctx->insert_pattern_binding (
-		  pattern->get_pattern_mappings ().get_hirid (), binding);
+		  pattern->get_mappings ().get_hirid (), binding);
 	      }
 	  }
       }
@@ -362,7 +362,7 @@ CompilePatternBindings::visit (HIR::ReferencePattern &pattern)
 void
 CompilePatternBindings::visit (HIR::IdentifierPattern &pattern)
 {
-  ctx->insert_pattern_binding (pattern.get_pattern_mappings ().get_hirid (),
+  ctx->insert_pattern_binding (pattern.get_mappings ().get_hirid (),
 			       match_scrutinee_expr);
 }
 
@@ -371,7 +371,7 @@ CompilePatternLet::visit (HIR::IdentifierPattern &pattern)
 {
   Bvariable *var = nullptr;
   rust_assert (
-    ctx->lookup_var_decl (pattern.get_pattern_mappings ().get_hirid (), &var));
+    ctx->lookup_var_decl (pattern.get_mappings ().get_hirid (), &var));
 
   auto fnctx = ctx->peek_fn ();
   if (ty->is_unit ())
@@ -429,7 +429,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
 	for (auto &sub : items_lower)
 	  {
 	    TyTy::BaseType *ty_sub = nullptr;
-	    HirId pattern_id = pattern.get_pattern_mappings ().get_hirid ();
+	    HirId pattern_id = pattern.get_mappings ().get_hirid ();
 	    bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub);
 	    rust_assert (ok);
 
@@ -448,7 +448,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
 	for (auto &sub : items_upper)
 	  {
 	    TyTy::BaseType *ty_sub = nullptr;
-	    HirId pattern_id = pattern.get_pattern_mappings ().get_hirid ();
+	    HirId pattern_id = pattern.get_mappings ().get_hirid ();
 	    bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub);
 	    rust_assert (ok);
 
@@ -470,7 +470,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
 	for (auto &sub : items.get_patterns ())
 	  {
 	    TyTy::BaseType *ty_sub = nullptr;
-	    HirId pattern_id = pattern.get_pattern_mappings ().get_hirid ();
+	    HirId pattern_id = pattern.get_mappings ().get_hirid ();
 	    bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub);
 	    rust_assert (ok);
 
diff --git a/gcc/rust/backend/rust-compile-stmt.cc b/gcc/rust/backend/rust-compile-stmt.cc
index 2d9578d..c006f4a 100644
--- a/gcc/rust/backend/rust-compile-stmt.cc
+++ b/gcc/rust/backend/rust-compile-stmt.cc
@@ -49,7 +49,7 @@ CompileStmt::visit (HIR::LetStmt &stmt)
     return;
 
   HIR::Pattern &stmt_pattern = *stmt.get_pattern ();
-  HirId stmt_id = stmt_pattern.get_pattern_mappings ().get_hirid ();
+  HirId stmt_id = stmt_pattern.get_mappings ().get_hirid ();
 
   TyTy::BaseType *ty = nullptr;
   if (!ctx->get_tyctx ()->lookup_type (stmt_id, &ty))
diff --git a/gcc/rust/backend/rust-compile-var-decl.h b/gcc/rust/backend/rust-compile-var-decl.h
index 3abff89..370e939 100644
--- a/gcc/rust/backend/rust-compile-var-decl.h
+++ b/gcc/rust/backend/rust-compile-var-decl.h
@@ -47,7 +47,7 @@ public:
 				 translated_type, NULL /*decl_var*/,
 				 pattern.get_locus ());
 
-    HirId stmt_id = pattern.get_pattern_mappings ().get_hirid ();
+    HirId stmt_id = pattern.get_mappings ().get_hirid ();
     ctx->insert_var_decl (stmt_id, var);
 
     locals.push_back (var);