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

Minor. Simplify CodegenUtil.getDelegates

Browse Source
This commit is contained in:
Denis Zharkov
2016-09-27 10:27:17 +03:00
parent 567b0cc8ea
commit 49fee026fc
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend-common/src/org/jetbrains/kotlin/backend/common/CodegenUtil.kt
+14 -15
View File
@@ -53,22 +53,16 @@ object CodegenUtil {
.sortedWith(MemberComparator.INSTANCE) .sortedWith(MemberComparator.INSTANCE)
.keysToMapExceptNulls { delegatingMember -> .keysToMapExceptNulls { delegatingMember ->
val actualDelegates = DescriptorUtils.getAllOverriddenDescriptors(delegatingMember) val actualDelegates = DescriptorUtils.getAllOverriddenDescriptors(delegatingMember)
.mapNotNull { overriddenDescriptor -> .filter { it.containingDeclaration == toInterface }
if (overriddenDescriptor.containingDeclaration == toInterface) { .map { overriddenDescriptor ->
val scope = (delegateExpressionType ?: toInterface.defaultType).memberScope val scope = (delegateExpressionType ?: toInterface.defaultType).memberScope
val name = overriddenDescriptor.name val name = overriddenDescriptor.name
// this is the actual member of delegateExpressionType that we are delegating to // this is the actual member of delegateExpressionType that we are delegating to
(scope.getContributedFunctions(name, NoLookupLocation.FROM_BACKEND) + (scope.getContributedFunctions(name, NoLookupLocation.FROM_BACKEND) +
scope.getContributedVariables(name, NoLookupLocation.FROM_BACKEND)) scope.getContributedVariables(name, NoLookupLocation.FROM_BACKEND))
.firstOrNull { .firstOrNull { doesOverride(it, overriddenDescriptor) }
(listOf(it) + DescriptorUtils.getAllOverriddenDescriptors(it)) }
.map(CallableMemberDescriptor::getOriginal)
.contains(overriddenDescriptor.original)
}
}
else null
}
assert(actualDelegates.size <= 1) { "Many delegates found for $delegatingMember: $actualDelegates" } assert(actualDelegates.size <= 1) { "Many delegates found for $delegatingMember: $actualDelegates" }
@@ -76,6 +70,11 @@ object CodegenUtil {
} }
} }
private fun doesOverride(overrideCandidate: CallableMemberDescriptor, overriddenDescriptor: CallableMemberDescriptor) =
(listOf(overrideCandidate) + DescriptorUtils.getAllOverriddenDescriptors(overrideCandidate))
.map(CallableMemberDescriptor::getOriginal)
.contains(overriddenDescriptor.original)
@JvmStatic @JvmStatic
fun getDelegatePropertyIfAny( fun getDelegatePropertyIfAny(
expression: KtExpression, classDescriptor: ClassDescriptor, bindingContext: BindingContext expression: KtExpression, classDescriptor: ClassDescriptor, bindingContext: BindingContext