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

Minor. rename context -> candidateFactory

Browse Source
This commit is contained in:
Stanislav Erokhin
2016-08-31 14:07:49 +03:00
parent 0072d6004a
commit eb6f444c19
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt
+2 -2
View File
@@ -131,11 +131,11 @@ private class InvokeExtensionScopeTowerProcessor<C : Candidate<FunctionDescripto
override fun simpleProcess(data: TowerData): Collection<C> { override fun simpleProcess(data: TowerData): Collection<C> {
if (explicitReceiver != null && data == TowerData.Empty) { if (explicitReceiver != null && data == TowerData.Empty) {
return listOf(context.createCandidate(invokeCandidateDescriptor, ExplicitReceiverKind.BOTH_RECEIVERS, explicitReceiver)) return listOf(candidateFactory.createCandidate(invokeCandidateDescriptor, ExplicitReceiverKind.BOTH_RECEIVERS, explicitReceiver))
} }
if (explicitReceiver == null && data is TowerData.OnlyImplicitReceiver) { if (explicitReceiver == null && data is TowerData.OnlyImplicitReceiver) {
return listOf(context.createCandidate(invokeCandidateDescriptor, ExplicitReceiverKind.DISPATCH_RECEIVER, data.implicitReceiver)) return listOf(candidateFactory.createCandidate(invokeCandidateDescriptor, ExplicitReceiverKind.DISPATCH_RECEIVER, data.implicitReceiver))
} }
return emptyList() return emptyList()
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTowerProcessors.kt
+7 -7
View File
@@ -41,7 +41,7 @@ class CompositeScopeTowerProcessor<out C>(
} }
internal abstract class AbstractSimpleScopeTowerProcessor<D : CallableDescriptor, C: Candidate<D>>( internal abstract class AbstractSimpleScopeTowerProcessor<D : CallableDescriptor, C: Candidate<D>>(
val context: CandidateFactory<D, C> val candidateFactory: CandidateFactory<D, C>
) : ScopeTowerProcessor<C> { ) : ScopeTowerProcessor<C> {
protected abstract fun simpleProcess(data: TowerData): Collection<C> protected abstract fun simpleProcess(data: TowerData): Collection<C>
@@ -66,12 +66,12 @@ internal class ExplicitReceiverScopeTowerProcessor<D : CallableDescriptor, C: Ca
private fun resolveAsMember(): Collection<C> { private fun resolveAsMember(): Collection<C> {
val members = ReceiverScopeTowerLevel(scopeTower, explicitReceiver) val members = ReceiverScopeTowerLevel(scopeTower, explicitReceiver)
.collectCandidates(null).filter { !it.requiresExtensionReceiver } .collectCandidates(null).filter { !it.requiresExtensionReceiver }
return members.map { context.createCandidate(it, ExplicitReceiverKind.DISPATCH_RECEIVER, extensionReceiver = null) } return members.map { candidateFactory.createCandidate(it, ExplicitReceiverKind.DISPATCH_RECEIVER, extensionReceiver = null) }
} }
private fun resolveAsExtension(level: ScopeTowerLevel): Collection<C> { private fun resolveAsExtension(level: ScopeTowerLevel): Collection<C> {
val extensions = level.collectCandidates(explicitReceiver).filter { it.requiresExtensionReceiver } val extensions = level.collectCandidates(explicitReceiver).filter { it.requiresExtensionReceiver }
return extensions.map { context.createCandidate(it, ExplicitReceiverKind.EXTENSION_RECEIVER, extensionReceiver = explicitReceiver) } return extensions.map { candidateFactory.createCandidate(it, ExplicitReceiverKind.EXTENSION_RECEIVER, extensionReceiver = explicitReceiver) }
} }
} }
@@ -86,7 +86,7 @@ private class QualifierScopeTowerProcessor<D : CallableDescriptor, C: Candidate<
val staticMembers = QualifierScopeTowerLevel(scopeTower, qualifier).collectCandidates(null) val staticMembers = QualifierScopeTowerLevel(scopeTower, qualifier).collectCandidates(null)
.filter { !it.requiresExtensionReceiver } .filter { !it.requiresExtensionReceiver }
.map { context.createCandidate(it, ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = null) } .map { candidateFactory.createCandidate(it, ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = null) }
return staticMembers return staticMembers
} }
} }
@@ -99,7 +99,7 @@ private class NoExplicitReceiverScopeTowerProcessor<D : CallableDescriptor, C: C
= when(data) { = when(data) {
is TowerData.TowerLevel -> { is TowerData.TowerLevel -> {
data.level.collectCandidates(null).filter { !it.requiresExtensionReceiver }.map { data.level.collectCandidates(null).filter { !it.requiresExtensionReceiver }.map {
context.createCandidate(it, ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = null) candidateFactory.createCandidate(it, ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = null)
} }
} }
is TowerData.BothTowerLevelAndImplicitReceiver -> { is TowerData.BothTowerLevelAndImplicitReceiver -> {
@@ -107,13 +107,13 @@ private class NoExplicitReceiverScopeTowerProcessor<D : CallableDescriptor, C: C
data.level.collectCandidates(data.implicitReceiver).filter { it.requiresExtensionReceiver }.forEach { data.level.collectCandidates(data.implicitReceiver).filter { it.requiresExtensionReceiver }.forEach {
result.add( result.add(
context.createCandidate( candidateFactory.createCandidate(
it, ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = data.implicitReceiver)) it, ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = data.implicitReceiver))
if (data.implicitReceiver.receiverValue is CoroutineReceiverValue) { if (data.implicitReceiver.receiverValue is CoroutineReceiverValue) {
val newDescriptor = it.descriptor.createCoroutineSuspensionFunctionView() ?: return@forEach val newDescriptor = it.descriptor.createCoroutineSuspensionFunctionView() ?: return@forEach
result.add( result.add(
context.createCandidate( candidateFactory.createCandidate(
it.copy(newDescriptor = newDescriptor), it.copy(newDescriptor = newDescriptor),
ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = data.implicitReceiver)) ExplicitReceiverKind.NO_EXPLICIT_RECEIVER, extensionReceiver = data.implicitReceiver))
} }