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

FIR: resolve primary constructor parameters in initializers context

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-04-25 14:55:33 +03:00
committed by Mikhail Glukhikh
parent fa4ba82350
commit 7b9f5293da
2 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirBodyResolveTransformer.kt
+30 -3
View File
@@ -21,7 +21,6 @@ import org.jetbrains.kotlin.fir.scopes.impl.FirLocalScope
import org.jetbrains.kotlin.fir.scopes.impl.FirTopLevelDeclaredMemberScope
import org.jetbrains.kotlin.fir.scopes.impl.withReplacedConeType
import org.jetbrains.kotlin.fir.symbols.*
import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.impl.*
import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult
@@ -62,6 +61,27 @@ open class FirBodyResolveTransformer(val session: FirSession, val implicitTypeOn
}
}
private var primaryConstructorParametersScope: FirLocalScope? = null
override fun transformConstructor(constructor: FirConstructor, data: Any?): CompositeTransformResult<FirDeclaration> {
if (constructor.isPrimary) {
primaryConstructorParametersScope = FirLocalScope().apply {
constructor.valueParameters.forEach { this.storeDeclaration(it) }
}
}
return super.transformConstructor(constructor, data)
}
override fun transformAnonymousInitializer(
anonymousInitializer: FirAnonymousInitializer,
data: Any?
): CompositeTransformResult<FirDeclaration> {
return withScopeCleanup(localScopes) {
localScopes.addIfNotNull(primaryConstructorParametersScope)
super.transformAnonymousInitializer(anonymousInitializer, data)
}
}
override fun transformImplicitTypeRef(implicitTypeRef: FirImplicitTypeRef, data: Any?): CompositeTransformResult<FirTypeRef> {
if (data == null)
return implicitTypeRef.compose()
@@ -99,11 +119,15 @@ open class FirBodyResolveTransformer(val session: FirSession, val implicitTypeOn
override fun transformRegularClass(regularClass: FirRegularClass, data: Any?): CompositeTransformResult<FirDeclaration> {
return withScopeCleanup(scopes) {
val oldConstructorScope = primaryConstructorParametersScope
primaryConstructorParametersScope = null
val type = regularClass.defaultType()
scopes.addIfNotNull(type.scope(session, scopeSession))
withLabelAndReceiverType(regularClass.name, regularClass, type) {
val result = withLabelAndReceiverType(regularClass.name, regularClass, type) {
super.transformRegularClass(regularClass, data)
}
primaryConstructorParametersScope = oldConstructorScope
result
}
}
@@ -685,7 +709,10 @@ open class FirBodyResolveTransformer(val session: FirSession, val implicitTypeOn
override fun transformProperty(property: FirProperty, data: Any?): CompositeTransformResult<FirDeclaration> {
if (property.returnTypeRef !is FirImplicitTypeRef && implicitTypeOnly) return property.compose()
return transformVariable(property, data)
return withScopeCleanup(localScopes) {
localScopes.addIfNotNull(primaryConstructorParametersScope)
transformVariable(property, data)
}
}
override fun transformExpression(expression: FirExpression, data: Any?): CompositeTransformResult<FirStatement> {
compiler/fir/resolve/testData/resolve/fromBuilder/enums.txt
Vendored
+1 -1
View File
@@ -70,7 +70,7 @@ FILE: enums.kt
}
public final val g: R|kotlin/Double| = R|/Planet.Companion.G|.R|kotlin/Double.times|(R|/Planet.m|).R|kotlin/Double.div|(R|/Planet.r|.R|kotlin/Double.times|(R|/Planet.r|))
public final val g: R|kotlin/Double| = R|/Planet.Companion.G|.R|kotlin/Double.times|(R|<local>/m|).R|kotlin/Double.div|(R|<local>/r|.R|kotlin/Double.times|(R|<local>/r|))
public get(): R|kotlin/Double|
public abstract fun sayHello(): R|kotlin/Unit|