From 5712d7d383b0597cd00466e5995c1e620c2fc809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= <dkm@kataplop.net>
Date: Thu, 10 Aug 2023 22:45:38 +0200
Subject: gccrs: Adjust HIR dump for IfExpr and IfExprConseqElse
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Adjust the HIR dump for IfExpr and IfExprConseqElse
to use visit_field() and factor common part.

gcc/rust/ChangeLog:

	* hir/rust-hir-dump.h (do_ifexpr): New.
	* hir/rust-hir-dump.cc (Dump::do_ifexpr): New.
	(Dump::visit): Use do_ifexpr and visit_field

Signed-off-by: Marc Poulhiès <dkm@kataplop.net>
---
 gcc/rust/hir/rust-hir-dump.cc | 34 ++++++++++++----------------------
 gcc/rust/hir/rust-hir-dump.h  |  1 +
 2 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'gcc/rust/hir')

diff --git a/gcc/rust/hir/rust-hir-dump.cc b/gcc/rust/hir/rust-hir-dump.cc
index c134c80..fb6029f 100644
--- a/gcc/rust/hir/rust-hir-dump.cc
+++ b/gcc/rust/hir/rust-hir-dump.cc
@@ -323,6 +323,14 @@ Dump::do_structexprstruct (StructExprStruct &e)
 }
 
 void
+Dump::do_ifexpr (IfExpr &e)
+{
+  do_expr (e);
+  visit_field ("condition", e.get_if_condition ());
+  visit_field ("if_block", e.get_if_block ());
+}
+
+void
 Dump::do_expr (Expr &e)
 {
   do_mappings (e.get_mappings ());
@@ -1404,18 +1412,10 @@ Dump::visit (ForLoopExpr &e)
 }
 
 void
-Dump::visit (IfExpr &if_expr)
+Dump::visit (IfExpr &e)
 {
   begin ("IfExpr");
-  begin ("condition");
-
-  if_expr.vis_if_condition (*this);
-  end ("condition");
-
-  begin ("if_block");
-  if_expr.vis_if_block (*this);
-  end ("if_block");
-
+  do_ifexpr (e);
   end ("IfExpr");
 }
 
@@ -1423,18 +1423,8 @@ void
 Dump::visit (IfExprConseqElse &e)
 {
   begin ("IfExprConseqElse");
-
-  begin ("condition");
-  e.vis_if_condition (*this);
-  end ("condition");
-
-  begin ("if_block");
-  e.vis_if_block (*this);
-  end ("if_block");
-
-  begin ("else_block");
-  e.vis_else_block (*this);
-  end ("else_block");
+  do_ifexpr (e);
+  visit_field ("else_block", e.get_else_block ());
 
   end ("IfExprConseqElse");
 }
diff --git a/gcc/rust/hir/rust-hir-dump.h b/gcc/rust/hir/rust-hir-dump.h
index d55dfca..046ae01 100644
--- a/gcc/rust/hir/rust-hir-dump.h
+++ b/gcc/rust/hir/rust-hir-dump.h
@@ -77,6 +77,7 @@ private:
   void do_item (Item &);
   void do_type (Type &);
   void do_expr (Expr &);
+  void do_ifexpr (IfExpr &);
   void do_ifletexpr (IfLetExpr &);
   void do_pathexpr (PathExpr &);
   void do_pathpattern (PathPattern &);
-- 
cgit v1.1