From 537134613acdbafdffde88200fea1ce35a4c94c1 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Tue, 22 Sep 2015 17:29:12 +0300 Subject: [PATCH] js.translator: Drop usages of KotlinBuiltIns.getInstance() --- .../kotlin/builtins/KotlinBuiltIns.java | 2 ++ .../kotlin/js/translate/context/Namer.java | 5 +++-- .../translate/expression/CatchTranslator.kt | 21 +++++++------------ .../functions/factories/TopLevelFIF.java | 4 ++-- .../intrinsic/objects/objectsIntrinsics.kt | 3 ++- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java index 722a43fc8b4..f00f3225603 100644 --- a/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/kotlin/builtins/KotlinBuiltIns.java @@ -179,6 +179,8 @@ public class KotlinBuiltIns { public final FqNameUnsafe _set = fqNameUnsafe("Set"); public final FqNameUnsafe _iterable = fqNameUnsafe("Iterable"); + public final FqName throwable = fqName("Throwable"); + public final FqName data = fqName("data"); public final FqName deprecated = fqName("Deprecated"); public final FqName tailRecursive = fqName("tailrec"); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java index e5033070fff..3f3413d1249 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/Namer.java @@ -26,6 +26,7 @@ import org.jetbrains.kotlin.descriptors.CallableDescriptor; import org.jetbrains.kotlin.descriptors.ClassDescriptor; import org.jetbrains.kotlin.descriptors.TypeParameterDescriptor; import org.jetbrains.kotlin.idea.JetLanguage; +import org.jetbrains.kotlin.js.resolve.JsPlatform; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.FqNameUnsafe; import org.jetbrains.kotlin.resolve.DescriptorUtils; @@ -46,8 +47,8 @@ public final class Namer { public static final JsNameRef KOTLIN_OBJECT_REF = new JsNameRef(KOTLIN_NAME); public static final JsNameRef KOTLIN_LONG_NAME_REF = new JsNameRef("Long", KOTLIN_OBJECT_REF); - public static final String EQUALS_METHOD_NAME = getStableMangledNameForDescriptor(KotlinBuiltIns.getInstance().getAny(), "equals"); - public static final String COMPARE_TO_METHOD_NAME = getStableMangledNameForDescriptor(KotlinBuiltIns.getInstance().getComparable(), "compareTo"); + public static final String EQUALS_METHOD_NAME = getStableMangledNameForDescriptor(JsPlatform.INSTANCE$.getBuiltIns().getAny(), "equals"); + public static final String COMPARE_TO_METHOD_NAME = getStableMangledNameForDescriptor(JsPlatform.INSTANCE$.getBuiltIns().getComparable(), "compareTo"); public static final String NUMBER_RANGE = "NumberRange"; public static final String CHAR_RANGE = "CharRange"; public static final String LONG_FROM_NUMBER = "fromNumber"; diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt index d890e9ba297..d50b6f96ce0 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/CatchTranslator.kt @@ -17,21 +17,18 @@ package org.jetbrains.kotlin.js.translate.expression import com.google.dart.compiler.backend.js.ast.* -import org.jetbrains.kotlin.psi.JetCatchClause -import org.jetbrains.kotlin.psi.JetTypeReference -import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.resolve.BindingContextUtils.getNotNull -import org.jetbrains.kotlin.resolve.DescriptorUtils import org.jetbrains.kotlin.builtins.KotlinBuiltIns -import org.jetbrains.kotlin.js.patterns.*; +import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.general.AbstractTranslator import org.jetbrains.kotlin.js.translate.general.Translation.patternTranslator import org.jetbrains.kotlin.js.translate.general.Translation.translateAsStatementAndMergeInBlockIfNeeded -import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToBlock -import org.jetbrains.kotlin.js.translate.utils.TranslationUtils import org.jetbrains.kotlin.js.translate.utils.JsAstUtils -import org.jetbrains.kotlin.js.descriptorUtils.getJetTypeFqName +import org.jetbrains.kotlin.js.translate.utils.JsAstUtils.convertToBlock +import org.jetbrains.kotlin.psi.JetCatchClause +import org.jetbrains.kotlin.psi.JetTypeReference +import org.jetbrains.kotlin.resolve.BindingContext +import org.jetbrains.kotlin.resolve.BindingContextUtils.getNotNull class CatchTranslator( val catches: List, @@ -116,10 +113,6 @@ class CatchTranslator( get() { val jetType = getNotNull(bindingContext(), BindingContext.TYPE, this) val jetTypeName = jetType.getJetTypeFqName(false) - - val throwable = KotlinBuiltIns.getInstance().getThrowable() - val throwableClassName = DescriptorUtils.getFqNameSafe(throwable).asString() - - return jetTypeName == throwableClassName + return jetTypeName == KotlinBuiltIns.FQ_NAMES.throwable.asString() } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java index 44aa2419a2b..86637b3e73f 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/functions/factories/TopLevelFIF.java @@ -19,12 +19,12 @@ package org.jetbrains.kotlin.js.translate.intrinsic.functions.factories; import com.google.dart.compiler.backend.js.ast.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.kotlin.builtins.KotlinBuiltIns; import org.jetbrains.kotlin.builtins.PrimitiveType; import org.jetbrains.kotlin.descriptors.DeclarationDescriptor; import org.jetbrains.kotlin.descriptors.PropertyDescriptor; import org.jetbrains.kotlin.js.patterns.DescriptorPredicate; import org.jetbrains.kotlin.js.patterns.NamePredicate; +import org.jetbrains.kotlin.js.resolve.JsPlatform; import org.jetbrains.kotlin.js.translate.callTranslator.CallInfo; import org.jetbrains.kotlin.js.translate.context.Namer; import org.jetbrains.kotlin.js.translate.context.TranslationContext; @@ -212,7 +212,7 @@ public final class TopLevelFIF extends CompositeFIF { } } - String mangledName = getStableMangledNameForDescriptor(KotlinBuiltIns.getInstance().getMutableMap(), operationName()); + String mangledName = getStableMangledNameForDescriptor(JsPlatform.INSTANCE$.getBuiltIns().getMutableMap(), operationName()); return new JsInvocation(new JsNameRef(mangledName, thisOrReceiver), arguments); } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt index 2342248d4bc..05e56721a24 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/intrinsic/objects/objectsIntrinsics.kt @@ -22,6 +22,7 @@ import org.jetbrains.kotlin.builtins.CompanionObjectMapping import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.descriptors.ClassDescriptor import org.jetbrains.kotlin.js.config.LibrarySourcesConfig +import org.jetbrains.kotlin.js.resolve.JsPlatform import org.jetbrains.kotlin.js.translate.context.TranslationContext import org.jetbrains.kotlin.js.translate.utils.JsAstUtils import org.jetbrains.kotlin.name.FqName @@ -37,7 +38,7 @@ class DefaultClassObjectIntrinsic(val fqName: FqName, val moduleName: String): O } public class ObjectIntrinsics { - private val companionObjectMapping = CompanionObjectMapping(KotlinBuiltIns.getInstance()) + private val companionObjectMapping = CompanionObjectMapping(JsPlatform.builtIns) public fun getIntrinsic(classDescriptor: ClassDescriptor): ObjectIntrinsic { if (!companionObjectMapping.hasMappingToObject(classDescriptor)) return NO_OBJECT_INTRINSIC