Rename. INSTANCE -> DEFAULT in JetTypeChecker

This commit is contained in:
Andrey Breslav
2014-06-23 15:34:13 +04:00
parent f26cad71d8
commit cd28b216c1
55 changed files with 94 additions and 98 deletions
@@ -181,7 +181,7 @@ class LazyJavaClassDescriptor(
val candidateReturnType = candidate.getReturnType()
val currentMostSpecificReturnType = currentMostSpecificType.getReturnType()
assert(candidateReturnType != null && currentMostSpecificReturnType != null, "$candidate, $currentMostSpecificReturnType")
if (JetTypeChecker.INSTANCE.isSubtypeOf(candidateReturnType!!, currentMostSpecificReturnType!!)) {
if (JetTypeChecker.DEFAULT.isSubtypeOf(candidateReturnType!!, currentMostSpecificReturnType!!)) {
currentMostSpecificType = candidate
}
}
@@ -147,7 +147,7 @@ class LazyJavaTypeResolver(
for (supertype in (classifier() as JavaTypeParameter).getUpperBounds()) {
supertypesJet.add(transformJavaType(supertype, UPPER_BOUND.toAttributes()))
}
return TypeUtils.intersect(JetTypeChecker.INSTANCE, supertypesJet)
return TypeUtils.intersect(JetTypeChecker.DEFAULT, supertypesJet)
?: ErrorUtils.createErrorType("Can't intersect upper bounds of " + javaType.getPresentableText())
}
@@ -276,4 +276,4 @@ fun TypeUsage.toAttributes() = object : JavaTypeAttributes {
override val howThisTypeIsUsedAccordingToAnnotations: TypeUsage
get() = howThisTypeIsUsed
override val isMarkedNotNull: Boolean = false
}
}