diff --git a/compiler/builtins-serializer/src/BuiltInsSerializer.kt b/compiler/builtins-serializer/src/BuiltInsSerializer.kt index eb54fb6f23f..91d29e470a4 100644 --- a/compiler/builtins-serializer/src/BuiltInsSerializer.kt +++ b/compiler/builtins-serializer/src/BuiltInsSerializer.kt @@ -42,7 +42,6 @@ import org.jetbrains.jet.lang.descriptors.ModuleDescriptor import org.jetbrains.jet.lang.resolve.name.FqName import com.intellij.util.containers.ContainerUtil import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns -import org.jetbrains.jet.lang.types.lang.BuiltInsPackageMigration import org.jetbrains.jet.utils.recursePostOrder public class BuiltInsSerializer(val out: PrintStream?) { @@ -84,24 +83,6 @@ public class BuiltInsSerializer(val out: PrintStream?) { } for (fqName in ContainerUtil.mapNotNull(files) { it?.getPackageName() }.toSet()) { - if (fqName == "kotlin") { - BuiltInsPackageMigration.isSerializingBuiltInsInKotlinPackage = true - val provider = session.getDeclarationProviderFactory().getPackageMemberDeclarationProvider(FqName(fqName))!! - - fun resolveClass(name: String): ClassDescriptor { - val classes = provider.getClassOrObjectDeclarations(Name.identifier(name)) - assert(classes.size() == 1, "Class $name not found: " + classes) - return session.getClassDescriptor(classes.iterator().next()) - } - BuiltInsPackageMigration.anyType = resolveClass("Any").getDefaultType() - BuiltInsPackageMigration.stringType = resolveClass("String").getDefaultType() - BuiltInsPackageMigration.annotationType = resolveClass("Annotation").getDefaultType() - BuiltInsPackageMigration.arrayClass = resolveClass("Array") - BuiltInsPackageMigration.enumClass = resolveClass("Enum") - } - else { - BuiltInsPackageMigration.isSerializingBuiltInsInKotlinPackage = false - } serializePackage(module, FqName(fqName), destDir) } diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsPackageMigration.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsPackageMigration.java deleted file mode 100644 index 777df42cfc6..00000000000 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/BuiltInsPackageMigration.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2010-2014 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.jet.lang.types.lang; - -import org.jetbrains.jet.lang.descriptors.ClassDescriptor; -import org.jetbrains.jet.lang.types.JetType; - -// This is a temporary hack for migration of built-ins from package "jet" to "kotlin" -public class BuiltInsPackageMigration { - public static boolean isSerializingBuiltInsInKotlinPackage = false; - - public static JetType anyType = null; - public static JetType stringType = null; - public static JetType annotationType = null; - public static ClassDescriptor arrayClass = null; - public static ClassDescriptor enumClass = null; -} diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java index 36dc1611d4d..218d88058c0 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/lang/KotlinBuiltIns.java @@ -291,9 +291,6 @@ public class KotlinBuiltIns { @NotNull public ClassDescriptor getArray() { - if (BuiltInsPackageMigration.isSerializingBuiltInsInKotlinPackage) { - return BuiltInsPackageMigration.arrayClass; - } return getBuiltInClassByName("Array"); } @@ -388,9 +385,6 @@ public class KotlinBuiltIns { @NotNull public ClassDescriptor getEnum() { - if (BuiltInsPackageMigration.isSerializingBuiltInsInKotlinPackage) { - return BuiltInsPackageMigration.enumClass; - } return getBuiltInClassByName("Enum"); } @@ -565,9 +559,6 @@ public class KotlinBuiltIns { @NotNull public JetType getAnyType() { - if (BuiltInsPackageMigration.isSerializingBuiltInsInKotlinPackage) { - return BuiltInsPackageMigration.anyType; - } return getBuiltInTypeByClassName("Any"); } @@ -639,9 +630,6 @@ public class KotlinBuiltIns { @NotNull public JetType getStringType() { - if (BuiltInsPackageMigration.isSerializingBuiltInsInKotlinPackage) { - return BuiltInsPackageMigration.stringType; - } return getBuiltInTypeByClassName("String"); } @@ -705,9 +693,6 @@ public class KotlinBuiltIns { @NotNull public JetType getAnnotationType() { - if (BuiltInsPackageMigration.isSerializingBuiltInsInKotlinPackage) { - return BuiltInsPackageMigration.annotationType; - } return getBuiltInTypeByClassName("Annotation"); }