From 016534b4878ab390c627c8bd03eedde305cb422d Mon Sep 17 00:00:00 2001 From: Zalim Bashorov Date: Wed, 27 May 2015 18:29:15 +0300 Subject: [PATCH] Minor: change package in astUtils.kt: ast -> jsAstUtils --- .../org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt | 2 +- .../org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt | 2 +- .../org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt | 4 ++-- .../kotlin/js/translate/declaration/PropertyTranslator.kt | 2 +- .../src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt index c221ea7f18c..279c7c4dde2 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/ExpressionDecomposer.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.inline.util import com.google.dart.compiler.backend.js.ast.* import com.google.dart.compiler.backend.js.ast.metadata.* import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.* -import org.jetbrains.kotlin.js.translate.utils.ast.* +import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.* import kotlin.platform.platformStatic import kotlin.properties.Delegates diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt index 8f4a9e57a8c..aee884d8712 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/FunctionInlineMutator.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.js.inline.context.NamingContext import org.jetbrains.kotlin.js.inline.util.* import org.jetbrains.kotlin.js.inline.util.rewriters.ReturnReplacingVisitor import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.newVar -import org.jetbrains.kotlin.js.translate.utils.ast.* +import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.* import kotlin.platform.platformStatic diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt index 6d9d99bd5a2..719a61ac110 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/util/sideEffectUtils.kt @@ -19,7 +19,7 @@ package org.jetbrains.kotlin.js.inline.util import com.google.dart.compiler.backend.js.ast.JsLiteral.* import com.google.dart.compiler.backend.js.ast.* import com.google.dart.compiler.backend.js.ast.metadata.typeCheck -import org.jetbrains.kotlin.js.translate.utils.ast.any +import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.any public fun JsExpression.canHaveSideEffect(): Boolean = any { it is JsExpression && it.canHaveOwnSideEffect() } @@ -47,4 +47,4 @@ public fun JsExpression.shouldHaveOwnAlias(): Boolean = is JsArrayLiteral -> true is JsInvocation -> if (typeCheck == null) canHaveSideEffect() else false else -> canHaveOwnSideEffect() - } \ No newline at end of file + } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt index 15c0dbda93a..f2c496d7056 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PropertyTranslator.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.js.translate.general.AbstractTranslator import org.jetbrains.kotlin.js.translate.general.Translation import org.jetbrains.kotlin.js.translate.utils.JsDescriptorUtils import org.jetbrains.kotlin.js.translate.context.Namer.* -import org.jetbrains.kotlin.js.translate.utils.ast.* +import org.jetbrains.kotlin.js.translate.utils.jsAstUtils.* import org.jetbrains.kotlin.js.translate.utils.TranslationUtils.* import org.jetbrains.kotlin.resolve.DescriptorUtils.isExtension import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt index 8b70dd9f116..2b06f5baf40 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.kotlin.js.translate.utils.ast +package org.jetbrains.kotlin.js.translate.utils.jsAstUtils import com.google.dart.compiler.backend.js.ast.* import org.jetbrains.kotlin.js.inline.util.IdentitySet @@ -101,4 +101,4 @@ public val JsBinaryOperation.operator: JsBinaryOperator public var JsVars.JsVar.initExpression: JsExpression? get() = getInitExpression() - set(value) = setInitExpression(value) \ No newline at end of file + set(value) = setInitExpression(value)