From ddb75abe30fa122805a9a563c150e2babb7fc7c1 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Fri, 26 Aug 2016 13:59:30 +0300 Subject: [PATCH] Rename ScopeTower to ImplicitScopeTower. --- .../calls/tower/NewResolutionOldInference.kt | 20 +++++++++---------- .../{ScopeTower.kt => ImplicitScopeTower.kt} | 2 +- .../resolve/calls/tower/InvokeProcessors.kt | 2 +- .../kotlin/resolve/calls/tower/TowerLevels.kt | 16 +++++++-------- .../resolve/calls/tower/TowerResolver.kt | 10 +++++----- 5 files changed, 25 insertions(+), 25 deletions(-) rename compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/{ScopeTower.kt => ImplicitScopeTower.kt} (99%) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt index b49f3cd79c8..7f1e2f707d6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt @@ -67,7 +67,7 @@ class NewResolutionOldInference( outer: NewResolutionOldInference, name: Name, tracing: TracingStrategy, - scopeTower: ScopeTower, + scopeTower: ImplicitScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext ): ScopeTowerProcessor> @@ -75,7 +75,7 @@ class NewResolutionOldInference( object Function : ResolutionKind() { override fun createTowerProcessor( outer: NewResolutionOldInference, name: Name, tracing: TracingStrategy, - scopeTower: ScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext + scopeTower: ImplicitScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext ): ScopeTowerProcessor> { val functionContext = outer.SimpleContext(scopeTower, name, context, tracing) return createFunctionProcessor(functionContext, outer.InvokeContext(functionContext), explicitReceiver) @@ -85,7 +85,7 @@ class NewResolutionOldInference( object Variable : ResolutionKind() { override fun createTowerProcessor( outer: NewResolutionOldInference, name: Name, tracing: TracingStrategy, - scopeTower: ScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext + scopeTower: ImplicitScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext ): ScopeTowerProcessor> { val simpleContext = outer.SimpleContext(scopeTower, name, context, tracing) return createVariableAndObjectProcessor(simpleContext, explicitReceiver) @@ -95,7 +95,7 @@ class NewResolutionOldInference( object CallableReference : ResolutionKind() { override fun createTowerProcessor( outer: NewResolutionOldInference, name: Name, tracing: TracingStrategy, - scopeTower: ScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext + scopeTower: ImplicitScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext ): ScopeTowerProcessor> { val simpleContextF = outer.SimpleContext(scopeTower, name, context, tracing) val simpleContextV = outer.SimpleContext(scopeTower, name, context, tracing) @@ -109,7 +109,7 @@ class NewResolutionOldInference( object Invoke : ResolutionKind() { override fun createTowerProcessor( outer: NewResolutionOldInference, name: Name, tracing: TracingStrategy, - scopeTower: ScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext + scopeTower: ImplicitScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext ): ScopeTowerProcessor> { val functionContext = outer.SimpleContext(scopeTower, name, context, tracing) // todo @@ -126,7 +126,7 @@ class NewResolutionOldInference( class GivenCandidates : ResolutionKind() { override fun createTowerProcessor( outer: NewResolutionOldInference, name: Name, tracing: TracingStrategy, - scopeTower: ScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext + scopeTower: ImplicitScopeTower, explicitReceiver: DetailedReceiver?, context: BasicCallResolutionContext ): ScopeTowerProcessor> { throw IllegalStateException("Should be not called") } @@ -148,7 +148,7 @@ class NewResolutionOldInference( } val dynamicScope = dynamicCallableDescriptors.createDynamicDescriptorScope(context.call, context.scope.ownerDescriptor) - val scopeTower = ScopeTowerImpl(context, dynamicScope, syntheticScopes, context.call.createLookupLocation()) + val scopeTower = ImplicitScopeTowerImpl(context, dynamicScope, syntheticScopes, context.call.createLookupLocation()) val processor = kind.createTowerProcessor(this, name, tracing, scopeTower, detailedReceiver, context) @@ -242,12 +242,12 @@ class NewResolutionOldInference( return resolutionResultsHandler.computeResultAndReportErrors(basicCallContext, tracing, resolvedCalls) } - private class ScopeTowerImpl( + private class ImplicitScopeTowerImpl( val resolutionContext: ResolutionContext<*>, override val dynamicScope: MemberScope, override val syntheticScopes: SyntheticScopes, override val location: LookupLocation - ): ScopeTower { + ): ImplicitScopeTower { private val cache = HashMap() override fun getImplicitReceiver(scope: LexicalScope): ReceiverValueWithSmartCastInfo? = @@ -274,7 +274,7 @@ class NewResolutionOldInference( } private inner class SimpleContext( - override val scopeTower: ScopeTower, + override val scopeTower: ImplicitScopeTower, override val name: Name, val basicCallContext: BasicCallResolutionContext, val tracing: TracingStrategy diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTower.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ImplicitScopeTower.kt similarity index 99% rename from compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTower.kt rename to compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ImplicitScopeTower.kt index 624fb86a701..ec79f1c260b 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ScopeTower.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ImplicitScopeTower.kt @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.resolve.scopes.SyntheticScopes import org.jetbrains.kotlin.resolve.scopes.receivers.ReceiverValueWithSmartCastInfo import org.jetbrains.kotlin.types.KotlinType -interface ScopeTower { +interface ImplicitScopeTower { val lexicalScope: LexicalScope fun getImplicitReceiver(scope: LexicalScope): ReceiverValueWithSmartCastInfo? diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt index baed9c64c02..dac330ab117 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/InvokeProcessors.kt @@ -138,7 +138,7 @@ private class InvokeExtensionScopeTowerProcessor? { val type = extensionFunctionReceiver.receiverValue.type diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt index 737fda7ec59..152dbec9212 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerLevels.kt @@ -40,7 +40,7 @@ import org.jetbrains.kotlin.utils.addIfNotNull import java.util.* internal abstract class AbstractScopeTowerLevel( - protected val scopeTower: ScopeTower + protected val scopeTower: ImplicitScopeTower ): ScopeTowerLevel { protected val location: LookupLocation get() = scopeTower.location @@ -78,7 +78,7 @@ internal abstract class AbstractScopeTowerLevel( // todo KT-9538 Unresolved inner class via subclass reference // todo add static methods & fields with error internal class ReceiverScopeTowerLevel( - scopeTower: ScopeTower, + scopeTower: ImplicitScopeTower, val dispatchReceiver: ReceiverValueWithSmartCastInfo ): AbstractScopeTowerLevel(scopeTower) { @@ -147,7 +147,7 @@ internal class ReceiverScopeTowerLevel( } } -internal class QualifierScopeTowerLevel(scopeTower: ScopeTower, val qualifier: QualifierReceiver) : AbstractScopeTowerLevel(scopeTower) { +internal class QualifierScopeTowerLevel(scopeTower: ImplicitScopeTower, val qualifier: QualifierReceiver) : AbstractScopeTowerLevel(scopeTower) { override fun getVariables(name: Name, extensionReceiver: ReceiverValueWithSmartCastInfo?) = qualifier.staticScope .getContributedVariables(name, location).map { createCandidateDescriptor(it, dispatchReceiver = null) @@ -166,11 +166,11 @@ internal class QualifierScopeTowerLevel(scopeTower: ScopeTower, val qualifier: Q // KT-3335 Creating imported super class' inner class fails in codegen internal open class ScopeBasedTowerLevel protected constructor( - scopeTower: ScopeTower, + scopeTower: ImplicitScopeTower, private val resolutionScope: ResolutionScope ) : AbstractScopeTowerLevel(scopeTower) { - internal constructor(scopeTower: ScopeTower, lexicalScope: LexicalScope): this(scopeTower, lexicalScope as ResolutionScope) + internal constructor(scopeTower: ImplicitScopeTower, lexicalScope: LexicalScope): this(scopeTower, lexicalScope as ResolutionScope) override fun getVariables(name: Name, extensionReceiver: ReceiverValueWithSmartCastInfo?): Collection> = resolutionScope.getContributedVariables(name, location).map { @@ -188,12 +188,12 @@ internal open class ScopeBasedTowerLevel protected constructor( } } internal class ImportingScopeBasedTowerLevel( - scopeTower: ScopeTower, + scopeTower: ImplicitScopeTower, importingScope: ImportingScope ): ScopeBasedTowerLevel(scopeTower, importingScope) internal class SyntheticScopeBasedTowerLevel( - scopeTower: ScopeTower, + scopeTower: ImplicitScopeTower, private val syntheticScopes: SyntheticScopes ): AbstractScopeTowerLevel(scopeTower) { private val ReceiverValueWithSmartCastInfo.allTypes: Set @@ -219,7 +219,7 @@ internal class SyntheticScopeBasedTowerLevel( } } -internal class HidesMembersTowerLevel(scopeTower: ScopeTower): AbstractScopeTowerLevel(scopeTower) { +internal class HidesMembersTowerLevel(scopeTower: ImplicitScopeTower): AbstractScopeTowerLevel(scopeTower) { override fun getVariables(name: Name, extensionReceiver: ReceiverValueWithSmartCastInfo?) = getCandidates(name, extensionReceiver, LexicalScope::collectVariables) diff --git a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt index 243a8934bcf..63a4b029200 100644 --- a/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt +++ b/compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/TowerResolver.kt @@ -40,7 +40,7 @@ interface Candidate { interface TowerContext> { val name: Name - val scopeTower: ScopeTower + val scopeTower: ImplicitScopeTower fun createCandidate( towerCandidate: CandidateWithBoundDispatchReceiver, @@ -75,18 +75,18 @@ interface ScopeTowerProcessor { class TowerResolver { fun > runResolve( - scopeTower: ScopeTower, + scopeTower: ImplicitScopeTower, processor: ScopeTowerProcessor, useOrder: Boolean ): Collection = scopeTower.run(processor, SuccessfulResultCollector { it.status }, useOrder) fun > collectAllCandidates( - scopeTower: ScopeTower, + scopeTower: ImplicitScopeTower, processor: ScopeTowerProcessor ): Collection = scopeTower.run(processor, AllCandidatesCollector { it.status }, false) - private fun ScopeTower.createNonLocalLevels(): List { + private fun ImplicitScopeTower.createNonLocalLevels(): List { val result = ArrayList() lexicalScope.parentsWithSelf.forEach { scope -> @@ -103,7 +103,7 @@ class TowerResolver { return result } - private fun ScopeTower.run( + private fun ImplicitScopeTower.run( processor: ScopeTowerProcessor, resultCollector: ResultCollector, useOrder: Boolean