From 14dabed85a5a8bd260b494c21788b3b3ba426f68 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 11 Nov 2020 16:32:57 +0300 Subject: [PATCH] [IR] KotlinLikeDumper.kt: move branch support to corresponding visit* methods --- .../kotlin/ir/util/KotlinLikeDumper.kt | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/KotlinLikeDumper.kt b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/KotlinLikeDumper.kt index 8ca0a1b8734..670b6cb3fd2 100644 --- a/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/KotlinLikeDumper.kt +++ b/compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/util/KotlinLikeDumper.kt @@ -1189,16 +1189,7 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption p.printlnWithNoIndent("when {") p.pushIndent() - for (b in expression.branches) { - p.printIndent() - b.condition.accept(this, data) - - p.printWithNoIndent(" -> ") - - b.result.accept(this, data) - - p.println() - } + expression.branches.forEach { it.accept(this, data) } p.popIndent() p.print("}") @@ -1382,11 +1373,19 @@ private class KotlinLikeDumper(val p: Printer, val options: KotlinLikeDumpOption } override fun visitBranch(branch: IrBranch, data: IrDeclaration?) { - super.visitBranch(branch, data) + p.printIndent() + branch.condition.accept(this, data) + p.printWithNoIndent(" -> ") + branch.result.accept(this, data) + p.println() } override fun visitElseBranch(branch: IrElseBranch, data: IrDeclaration?) { - super.visitElseBranch(branch, data) + p.printIndent() + // TODO assert that condition is `true` + p.printWithNoIndent("else -> ") + branch.result.accept(this, data) + p.println() } private fun commentBlock(text: String) = "/* $text */"