Rename platform to header.

This commit is contained in:
Stanislav Erokhin
2016-12-13 17:59:59 +03:00
parent facee84020
commit 59efedf610
134 changed files with 500 additions and 499 deletions
@@ -44,7 +44,7 @@ class FlatSignature<out T> private constructor(
val hasExtensionReceiver: Boolean,
val hasVarargs: Boolean,
val numDefaults: Int,
val isPlatform: Boolean,
val isHeader: Boolean,
val isSyntheticMember: Boolean
) {
val isGeneric = typeParameters.isNotEmpty()
@@ -65,7 +65,7 @@ class FlatSignature<out T> private constructor(
hasExtensionReceiver = extensionReceiverType != null,
hasVarargs = descriptor.valueParameters.any { it.varargElementType != null },
numDefaults = numDefaults,
isPlatform = descriptor is MemberDescriptor && descriptor.isPlatform,
isHeader = descriptor is MemberDescriptor && descriptor.isHeader,
isSyntheticMember = descriptor is SyntheticMemberDescriptor<*>
)
}
@@ -241,8 +241,8 @@ class OverloadingConflictResolver<C : Any>(
if (isGeneric1 && isGeneric2) return false
}
if (!call1.isPlatform && call2.isPlatform) return true
if (call1.isPlatform && !call2.isPlatform) return false
if (!call1.isHeader && call2.isHeader) return true
if (call1.isHeader && !call2.isHeader) return false
return createEmptyConstraintSystem().isSignatureNotLessSpecific(call1, call2, SpecificityComparisonWithNumerics, specificityComparator)
}