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

FIR: Minor. Clarify name for addNonLocalTowerDataElements

Browse Source
This commit is contained in:
Denis Zharkov
2020-05-08 18:23:29 +03:00
parent 288db4fb1c
commit 2e91bf7e50
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/BodyResolveComponents.kt
+1 -1
View File
@@ -88,7 +88,7 @@ class FirTowerDataContext private constructor(
) )
} }
fun addTowerDataElements(newElements: List<FirTowerDataElement>): FirTowerDataContext { fun addNonLocalTowerDataElements(newElements: List<FirTowerDataElement>): FirTowerDataContext {
return FirTowerDataContext( return FirTowerDataContext(
towerDataElements.addAll(newElements), towerDataElements.addAll(newElements),
implicitReceiverStack.addAll(newElements.mapNotNull { it.implicitReceiver }), implicitReceiverStack.addAll(newElements.mapNotNull { it.implicitReceiver }),
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirAbstractBodyResolveTransformer.kt
+4 -4
View File
@@ -178,12 +178,12 @@ abstract class FirAbstractBodyResolveTransformer(phase: FirResolvePhase) : FirAb
towerDataContext = newContext towerDataContext = newContext
} }
fun addTowerDataElement(element: FirTowerDataElement) { fun addNonLocalTowerDataElement(element: FirTowerDataElement) {
replaceTowerDataContext(towerDataContext.addTowerDataElements(listOf(element))) replaceTowerDataContext(towerDataContext.addNonLocalTowerDataElements(listOf(element)))
} }
fun addTowerDataElements(newElements: List<FirTowerDataElement>) { fun addNonLocalTowerDataElements(newElements: List<FirTowerDataElement>) {
replaceTowerDataContext(towerDataContext.addTowerDataElements(newElements)) replaceTowerDataContext(towerDataContext.addNonLocalTowerDataElements(newElements))
} }
fun addLocalScope(localScope: FirLocalScope) { fun addLocalScope(localScope: FirLocalScope) {
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt
+1 -1
View File
@@ -51,7 +51,7 @@ open class FirBodyResolveTransformer(
return withScopeCleanup(context.fileImportsScope) { return withScopeCleanup(context.fileImportsScope) {
val importingScopes = createImportingScopes(file, session, components.scopeSession) val importingScopes = createImportingScopes(file, session, components.scopeSession)
context.fileImportsScope += importingScopes context.fileImportsScope += importingScopes
context.addTowerDataElements(importingScopes.map { it.asTowerDataElement(isLocal = false) }) context.addNonLocalTowerDataElements(importingScopes.map { it.asTowerDataElement(isLocal = false) })
file.replaceResolvePhase(transformerPhase) file.replaceResolvePhase(transformerPhase)
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirDeclarationsResolveTransformer.kt
+2 -2
View File
@@ -83,7 +83,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
val scope = createTypeParameterScope(declaration) ?: return l() val scope = createTypeParameterScope(declaration) ?: return l()
return context.withTowerDataCleanup { return context.withTowerDataCleanup {
context.addTowerDataElement(scope.asTowerDataElement(isLocal = false)) context.addNonLocalTowerDataElement(scope.asTowerDataElement(isLocal = false))
l() l()
} }
} }
@@ -691,7 +691,7 @@ open class FirDeclarationsResolveTransformer(transformer: FirBodyResolveTransfor
val staticsAndCompanion = val staticsAndCompanion =
context.towerDataContext context.towerDataContext
.addTowerDataElements(towerElementsForClass.superClassesStaticsAndCompanionReceivers) .addNonLocalTowerDataElements(towerElementsForClass.superClassesStaticsAndCompanionReceivers)
.run { .run {
if (towerElementsForClass.companionReceiver != null) if (towerElementsForClass.companionReceiver != null)
addReceiver(null, towerElementsForClass.companionReceiver) addReceiver(null, towerElementsForClass.companionReceiver)