azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add a temporary hack for migration "jet" -> "kotlin""

Browse Source 
This reverts commit fb12c56d1a.
This commit is contained in:
Alexander Udalov
2014-03-02 21:37:28 +04:00
parent e2f1e8a9c3
commit bd80e325b3
3 changed files with 0 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/builtins-serializer/src/BuiltInsSerializer.kt
-19
View File
@@ -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)
}