From 560e35174b3f19abb1e028fec809268ba8df7349 Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Mon, 19 Mar 2018 15:46:16 +0300 Subject: [PATCH] Minor: renames IrElementToJsNodeTransformer -> BaseIrElementToJsNodeTransformer IrFileTransformer -> IrFileToJsTransformer IrModuleTransformer -> IrModuleToJsTransformer --- .../src/org/jetbrains/kotlin/ir/backend/js/compiler.kt | 4 ++-- ...eTransformer.kt.kt => BaseIrElementToJsNodeTransformer.kt} | 2 +- .../js/transformers/irToJs/IrDeclarationToJsTransformer.kt | 2 +- .../transformers/irToJs/IrElementToJsExpressionTransformer.kt | 2 +- .../transformers/irToJs/IrElementToJsStatementTransformer.kt | 2 +- .../irToJs/{IrFileTransformer.kt => IrFileToJsTransformer.kt} | 2 +- .../{IrModuleTransformer.kt => IrModuleToJsTransformer.kt} | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/{IrElementToJsNodeTransformer.kt.kt => BaseIrElementToJsNodeTransformer.kt} (89%) rename compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/{IrFileTransformer.kt => IrFileToJsTransformer.kt} (88%) rename compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/{IrModuleTransformer.kt => IrModuleToJsTransformer.kt} (85%) diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt index 60d1a5ebdc8..878d9b50a6e 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/compiler.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.ir.backend.js import com.intellij.openapi.project.Project import org.jetbrains.kotlin.config.CompilerConfiguration -import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleTransformer +import org.jetbrains.kotlin.ir.backend.js.transformers.irToJs.IrModuleToJsTransformer import org.jetbrains.kotlin.js.analyze.TopDownAnalyzerFacadeForJS import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.progress.ProgressIndicatorAndCompilationCanceledStatus @@ -27,7 +27,7 @@ fun compile( val moduleFragment = Psi2IrTranslator().generateModule(analysisResult.moduleDescriptor, files, analysisResult.bindingContext) - val program = moduleFragment.accept(IrModuleTransformer(), null) + val program = moduleFragment.accept(IrModuleToJsTransformer(), null) return program.toString() } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsNodeTransformer.kt.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/BaseIrElementToJsNodeTransformer.kt similarity index 89% rename from compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsNodeTransformer.kt.kt rename to compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/BaseIrElementToJsNodeTransformer.kt index c8404da2ad4..0a22e7a74fe 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsNodeTransformer.kt.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/BaseIrElementToJsNodeTransformer.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.ir.visitors.IrElementVisitor import org.jetbrains.kotlin.js.backend.ast.JsEmpty import org.jetbrains.kotlin.js.backend.ast.JsNode -interface IrElementToJsNodeTransformer : IrElementVisitor { +interface BaseIrElementToJsNodeTransformer : IrElementVisitor { override fun visitElement(element: IrElement, data: D): R { TODO(element) } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt index 1b8371e3a4b..40946d1abd8 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrDeclarationToJsTransformer.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs import org.jetbrains.kotlin.ir.declarations.IrSimpleFunction import org.jetbrains.kotlin.js.backend.ast.* -class IrDeclarationToJsTransformer : IrElementToJsNodeTransformer { +class IrDeclarationToJsTransformer : BaseIrElementToJsNodeTransformer { override fun visitSimpleFunction(declaration: IrSimpleFunction, data: Nothing?): JsStatement { return JsExpressionStatement(transformIrFunctionToJsFunction(declaration)) } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt index 8880b7c4d49..5b76b6b79f3 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsExpressionTransformer.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.ir.expressions.IrConst import org.jetbrains.kotlin.js.backend.ast.JsExpression import org.jetbrains.kotlin.js.backend.ast.JsStringLiteral -class IrElementToJsExpressionTransformer : IrElementToJsNodeTransformer { +class IrElementToJsExpressionTransformer : BaseIrElementToJsNodeTransformer { override fun visitConst(expression: IrConst, data: Nothing?): JsExpression { return JsStringLiteral(expression.value.toString()) } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt index e30d05bbbc7..715748b6fea 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrElementToJsStatementTransformer.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.js.backend.ast.JsExpressionStatement import org.jetbrains.kotlin.js.backend.ast.JsReturn import org.jetbrains.kotlin.js.backend.ast.JsStatement -class IrElementToJsStatementTransformer : IrElementToJsNodeTransformer { +class IrElementToJsStatementTransformer : BaseIrElementToJsNodeTransformer { override fun visitBlockBody(body: IrBlockBody, data: Nothing?): JsStatement { return JsBlock(body.statements.map { it.accept(this, data) }) } diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrFileTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrFileToJsTransformer.kt similarity index 88% rename from compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrFileTransformer.kt rename to compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrFileToJsTransformer.kt index a13de2afd5c..3f0309d7423 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrFileTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrFileToJsTransformer.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.ir.declarations.IrFile import org.jetbrains.kotlin.js.backend.ast.JsBlock import org.jetbrains.kotlin.js.backend.ast.JsStatement -class IrFileTransformer : IrElementToJsNodeTransformer { +class IrFileToJsTransformer : BaseIrElementToJsNodeTransformer { override fun visitFile(declaration: IrFile, data: Nothing?): JsStatement { val block = JsBlock() diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt similarity index 85% rename from compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleTransformer.kt rename to compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt index 639c22f6d9b..9b995272b96 100644 --- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleTransformer.kt +++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt @@ -9,12 +9,12 @@ import org.jetbrains.kotlin.ir.declarations.IrModuleFragment import org.jetbrains.kotlin.js.backend.ast.JsNode import org.jetbrains.kotlin.js.backend.ast.JsProgram -class IrModuleTransformer : IrElementToJsNodeTransformer { +class IrModuleToJsTransformer : BaseIrElementToJsNodeTransformer { override fun visitModuleFragment(declaration: IrModuleFragment, data: Nothing?): JsNode { val program = JsProgram() declaration.files.forEach { - program.globalBlock.statements.add(it.accept(IrFileTransformer(), null)) + program.globalBlock.statements.add(it.accept(IrFileToJsTransformer(), null)) } return program