Delete TargetPlatform.builtins

Replace it's usages with relevant singleton reference
This commit is contained in:
Denis Zharkov
2016-04-01 13:43:53 +03:00
parent ef18d64931
commit c667f50741
14 changed files with 25 additions and 33 deletions
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.resolve.jvm.platform
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.descriptors.ModuleParameters
import org.jetbrains.kotlin.platform.JavaToKotlinClassMap
import org.jetbrains.kotlin.platform.JvmBuiltIns
@@ -37,9 +36,6 @@ object JvmPlatform : TargetPlatform("JVM") {
get() = DEFAULT_IMPORTS_FOR_JVM
}
override val builtIns: KotlinBuiltIns
get() = JvmBuiltIns.Instance
override val platformConfigurator: PlatformConfigurator = JvmPlatformConfigurator
}
@@ -60,7 +56,7 @@ private val DEFAULT_IMPORTS_FOR_JVM: List<ImportPath> = ArrayList<ImportPath>().
}
}
val builtIns = JvmPlatform.builtIns
val builtIns = JvmBuiltIns.Instance
for (builtinPackageFragment in builtIns.builtInsPackageFragments) {
addAllClassifiersFromScope(builtinPackageFragment.getMemberScope())
}