Introduce JvmBuiltIns and DefaultBuiltIns, different instances of KotlinBuiltIns

Make KotlinBuiltIns an abstract class
JsPlatform has DefaultBuiltIns
This commit is contained in:
Pavel V. Talanov
2015-09-23 20:42:29 +03:00
parent 4b9e167fd2
commit 76029ee9b2
15 changed files with 163 additions and 72 deletions
@@ -44,7 +44,7 @@ public class JavaToKotlinClassMap implements PlatformToKotlinClassMap {
private final Map<ClassDescriptor, ClassDescriptor> readOnlyToMutable = new HashMap<ClassDescriptor, ClassDescriptor>();
private JavaToKotlinClassMap() {
KotlinBuiltIns builtIns = KotlinBuiltIns.getInstance();
KotlinBuiltIns builtIns = JvmBuiltIns.getInstance();
add(Object.class, builtIns.getAny());
add(String.class, builtIns.getString());
@@ -0,0 +1,32 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.kotlin.platform
import org.jetbrains.kotlin.builtins.BuiltInsInitializer
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
class JvmBuiltIns private constructor() : KotlinBuiltIns() {
companion object {
private val initializer = BuiltInsInitializer {
JvmBuiltIns()
}
@JvmStatic
val Instance: KotlinBuiltIns
get() = initializer.get()
}
}