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

Do not allow error supertypes

Browse Source
This commit is contained in:
Andrey Breslav
2013-10-31 13:01:56 +04:00
parent 31d4993406
commit e538668229
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/jet/lang/resolve/java/lazy/descriptors/LazyJavaClassDescriptor.kt
+7 -6
View File
@@ -27,8 +27,6 @@ import org.jetbrains.jet.lang.resolve.java.sam.SingleAbstractMethodUtils
import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod import org.jetbrains.jet.lang.resolve.java.structure.JavaMethod
import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor
import org.jetbrains.jet.lang.types.TypeUtils import org.jetbrains.jet.lang.types.TypeUtils
import java.util.ArrayList
import org.jetbrains.jet.lang.types.checker.JetTypeChecker
import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor import org.jetbrains.jet.lang.resolve.java.descriptor.JavaClassDescriptor
class LazyJavaClassDescriptor( class LazyJavaClassDescriptor(
@@ -122,10 +120,13 @@ class LazyJavaClassDescriptor(
emptyOrSingletonList(jlObject ?: KotlinBuiltIns.getInstance().getAnyType()) emptyOrSingletonList(jlObject ?: KotlinBuiltIns.getInstance().getAnyType())
} }
else else
supertypes.map { supertypes.iterator()
supertype -> .map {
innerC.typeResolver.transformJavaType(supertype, TypeUsage.SUPERTYPE.toAttributes()) supertype ->
} innerC.typeResolver.transformJavaType(supertype, TypeUsage.SUPERTYPE.toAttributes())
}
.filter { supertype -> !supertype.isError() }
.toList()
} }
override fun getSupertypes(): Collection<JetType> = _supertypes() override fun getSupertypes(): Collection<JetType> = _supertypes()