hir: Rename ComoundAssignment getters

Use more a consistent name.

gcc/rust/ChangeLog:

	* backend/rust-compile-expr.cc (CompileExpr::visit): Rename method.
	* checks/errors/privacy/rust-privacy-reporter.cc (PrivacyReporter::visit): Rename method.
	* checks/errors/rust-const-checker.cc (ConstChecker::visit): Rename method.
	* checks/errors/rust-unsafe-checker.cc (UnsafeChecker::visit): Rename method.
	* hir/rust-hir-dump.cc (Dump::visit): Rename method.
	* hir/tree/rust-hir-expr.h: Rename method.
	* typecheck/rust-hir-type-check-expr.cc (TypeCheckExpr::visit): Rename method.
	* typecheck/rust-tyty.h: Rename method.

diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index 351d5d7242fd79cd2f31c847db0596e9d2dfe0c3..5f4ce5411ceebd958a161229c869c167ea22d09c 100644 (file)
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -184,8 +184,8 @@ void
 CompileExpr::visit (HIR::CompoundAssignmentExpr &expr)
 {
   auto op = expr.get_expr_type ();
-  auto lhs = CompileExpr::Compile (expr.get_left_expr ().get (), ctx);
-  auto rhs = CompileExpr::Compile (expr.get_right_expr ().get (), ctx);
+  auto lhs = CompileExpr::Compile (expr.get_lhs ().get (), ctx);
+  auto rhs = CompileExpr::Compile (expr.get_rhs ().get (), ctx);
 
   // this might be an operator overload situation lets check
   TyTy::FnType *fntype;
@@ -198,8 +198,8 @@ CompileExpr::visit (HIR::CompoundAssignmentExpr &expr)
          expr.get_expr_type ());
       auto compound_assignment
        = resolve_operator_overload (lang_item_type, expr, lhs, rhs,
-                                    expr.get_left_expr ().get (),
-                                    expr.get_right_expr ().get ());
+                                    expr.get_lhs ().get (),
+                                    expr.get_rhs ().get ());
       ctx->add_statement (compound_assignment);
 
       return;

diff --git a/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
index 6bdc2fa17a701baf85fe1cf92b0b0286643a10bc..81f678dabaaaef7991dd62ce98ece04fa6e99c4e 100644 (file)
--- a/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
+++ b/gcc/rust/checks/errors/privacy/rust-privacy-reporter.cc
@@ -375,8 +375,8 @@ PrivacyReporter::visit (HIR::AssignmentExpr &expr)
 void
 PrivacyReporter::visit (HIR::CompoundAssignmentExpr &expr)
 {
-  expr.get_left_expr ()->accept_vis (*this);
-  expr.get_right_expr ()->accept_vis (*this);
+  expr.get_lhs ()->accept_vis (*this);
+  expr.get_rhs ()->accept_vis (*this);
 }
 
 void

diff --git a/gcc/rust/checks/errors/rust-const-checker.cc b/gcc/rust/checks/errors/rust-const-checker.cc
index 22668d5d7bb74740287945f2646e65bd49050c9e..032a8ec9f3aaf076e4012c3938603962c3968a84 100644 (file)
--- a/gcc/rust/checks/errors/rust-const-checker.cc
+++ b/gcc/rust/checks/errors/rust-const-checker.cc
@@ -214,8 +214,8 @@ ConstChecker::visit (AssignmentExpr &expr)
 void
 ConstChecker::visit (CompoundAssignmentExpr &expr)
 {
-  expr.get_left_expr ()->accept_vis (*this);
-  expr.get_right_expr ()->accept_vis (*this);
+  expr.get_lhs ()->accept_vis (*this);
+  expr.get_rhs ()->accept_vis (*this);
 }
 
 void

diff --git a/gcc/rust/checks/errors/rust-unsafe-checker.cc b/gcc/rust/checks/errors/rust-unsafe-checker.cc
index d5b772b2063d8af952275058069eeeedad94562b..bee446f57060465eb869a1034cf771d3da0c89b4 100644 (file)
--- a/gcc/rust/checks/errors/rust-unsafe-checker.cc
+++ b/gcc/rust/checks/errors/rust-unsafe-checker.cc
@@ -327,8 +327,8 @@ UnsafeChecker::visit (AssignmentExpr &expr)
 void
 UnsafeChecker::visit (CompoundAssignmentExpr &expr)
 {
-  expr.get_left_expr ()->accept_vis (*this);
-  expr.get_right_expr ()->accept_vis (*this);
+  expr.get_lhs ()->accept_vis (*this);
+  expr.get_rhs ()->accept_vis (*this);
 }
 
 void

diff --git a/gcc/rust/hir/rust-hir-dump.cc b/gcc/rust/hir/rust-hir-dump.cc
index c3e1cd3c07a6b0b6184a7ac96b564c702e5096c9..8e31f2774382f46357a80d7f915bb469420f5552 100644 (file)
--- a/gcc/rust/hir/rust-hir-dump.cc
+++ b/gcc/rust/hir/rust-hir-dump.cc
@@ -983,7 +983,7 @@ Dump::visit (CompoundAssignmentExpr &e)
   begin ("CompoundAssignmentExpr");
 
   do_operatorexpr (e);
-  visit_field ("right_expr", *e.get_right_expr ());
+  visit_field ("right_expr", *e.get_rhs ());
 
   std::string str;
 

diff --git a/gcc/rust/hir/tree/rust-hir-expr.h b/gcc/rust/hir/tree/rust-hir-expr.h
index abed61c1222ab0d9197a785b92be1d2f022be03d..c5abeaa23a05fe7ef2ed8395b6e236600f9396c3 100644 (file)
--- a/gcc/rust/hir/tree/rust-hir-expr.h
+++ b/gcc/rust/hir/tree/rust-hir-expr.h
@@ -762,9 +762,9 @@ public:
   void accept_vis (HIRFullVisitor &vis) override;
   void accept_vis (HIRExpressionVisitor &vis) override;
 
-  std::unique_ptr<Expr> &get_left_expr () { return main_or_left_expr; }
+  std::unique_ptr<Expr> &get_lhs () { return main_or_left_expr; }
 
-  std::unique_ptr<Expr> &get_right_expr () { return right_expr; }
+  std::unique_ptr<Expr> &get_rhs () { return right_expr; }
 
   void visit_lhs (HIRFullVisitor &vis) { main_or_left_expr->accept_vis (vis); }
   void visit_rhs (HIRFullVisitor &vis) { right_expr->accept_vis (vis); }

diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
index 3a63d3b9e5d92b016737e7f26953c9a3234a992d..9f1ee012851aa89f51794a5413b8b693326a333f 100644 (file)
--- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
@@ -249,16 +249,14 @@ TypeCheckExpr::visit (HIR::CompoundAssignmentExpr &expr)
 {
   infered = TyTy::TupleType::get_unit_type (expr.get_mappings ().get_hirid ());
 
-  auto lhs = TypeCheckExpr::Resolve (expr.get_left_expr ().get ());
-  auto rhs = TypeCheckExpr::Resolve (expr.get_right_expr ().get ());
+  auto lhs = TypeCheckExpr::Resolve (expr.get_lhs ().get ());
+  auto rhs = TypeCheckExpr::Resolve (expr.get_rhs ().get ());
 
   // we dont care about the result of the unify from a compound assignment
   // since this is a unit-type expr
   coercion_site (expr.get_mappings ().get_hirid (),
-                TyTy::TyWithLocation (lhs,
-                                      expr.get_left_expr ()->get_locus ()),
-                TyTy::TyWithLocation (rhs,
-                                      expr.get_right_expr ()->get_locus ()),
+                TyTy::TyWithLocation (lhs, expr.get_lhs ()->get_locus ()),
+                TyTy::TyWithLocation (rhs, expr.get_rhs ()->get_locus ()),
                 expr.get_locus ());
 
   auto lang_item_type

diff --git a/gcc/rust/typecheck/rust-tyty.h b/gcc/rust/typecheck/rust-tyty.h
index 6391bd7be73f34239e1371e9ef12ca2e54c5ace9..212ebc9757044fb1579d6c76f58cc164b8096f44 100644 (file)
--- a/gcc/rust/typecheck/rust-tyty.h
+++ b/gcc/rust/typecheck/rust-tyty.h
@@ -1012,6 +1012,8 @@ public:
 
 private:
   TyVar element_type;
+  // FIXME: I dont think this should be in tyty - tyty should already be const
+  // evaluated
   HIR::Expr &capacity_expr;
 };