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

[FIR] FirVariable: add replace method for delegate

Browse Source 
It is required to properly implement lazy expression calculation

^KT-59687
This commit is contained in:
Dmitrii Gridin
2023-07-01 17:46:35 +02:00
committed by Space Team
parent 4f859a634e
commit f8b2b4ac21
18 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt
+1
View File
@@ -142,6 +142,7 @@ class FirJavaField @FirImplementationDetail constructor(
return this
}
override fun replaceDelegate(newDelegate: FirExpression?) {}
override val delegate: FirExpression?
get() = null
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt
+2
View File
@@ -178,6 +178,8 @@ class FirJavaValueParameter @FirImplementationDetail constructor(
override fun replaceInitializer(newInitializer: FirExpression?) {
}
override fun replaceDelegate(newDelegate: FirExpression?) {}
override fun replaceControlFlowGraphReference(newControlFlowGraphReference: FirControlFlowGraphReference?) {
}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt
+2
View File
@@ -64,6 +64,8 @@ abstract class FirBackingField : FirVariable(), FirTypeParametersOwner, FirState
abstract override fun replaceContextReceivers(newContextReceivers: List<FirContextReceiver>)
abstract override fun replaceDelegate(newDelegate: FirExpression?)
abstract override fun replaceGetter(newGetter: FirPropertyAccessor?)
abstract override fun replaceSetter(newSetter: FirPropertyAccessor?)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt
+2
View File
@@ -65,6 +65,8 @@ abstract class FirEnumEntry : FirVariable() {
abstract override fun replaceInitializer(newInitializer: FirExpression?)
abstract override fun replaceDelegate(newDelegate: FirExpression?)
abstract override fun replaceGetter(newGetter: FirPropertyAccessor?)
abstract override fun replaceSetter(newSetter: FirPropertyAccessor?)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt
+2
View File
@@ -68,6 +68,8 @@ abstract class FirErrorProperty : FirVariable(), FirDiagnosticHolder {
abstract override fun replaceInitializer(newInitializer: FirExpression?)
abstract override fun replaceDelegate(newDelegate: FirExpression?)
abstract override fun replaceGetter(newGetter: FirPropertyAccessor?)
abstract override fun replaceSetter(newSetter: FirPropertyAccessor?)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt
+2
View File
@@ -67,6 +67,8 @@ abstract class FirField : FirVariable(), FirControlFlowGraphOwner {
abstract override fun replaceInitializer(newInitializer: FirExpression?)
abstract override fun replaceDelegate(newDelegate: FirExpression?)
abstract override fun replaceGetter(newGetter: FirPropertyAccessor?)
abstract override fun replaceSetter(newSetter: FirPropertyAccessor?)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt
+2
View File
@@ -69,6 +69,8 @@ abstract class FirProperty : FirVariable(), FirTypeParametersOwner, FirControlFl
abstract override fun replaceInitializer(newInitializer: FirExpression?)
abstract override fun replaceDelegate(newDelegate: FirExpression?)
abstract override fun replaceGetter(newGetter: FirPropertyAccessor?)
abstract override fun replaceSetter(newSetter: FirPropertyAccessor?)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt
+2
View File
@@ -73,6 +73,8 @@ abstract class FirValueParameter : FirVariable(), FirControlFlowGraphOwner {
abstract override fun replaceInitializer(newInitializer: FirExpression?)
abstract override fun replaceDelegate(newDelegate: FirExpression?)
abstract override fun replaceGetter(newGetter: FirPropertyAccessor?)
abstract override fun replaceSetter(newSetter: FirPropertyAccessor?)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt
+2
View File
@@ -66,6 +66,8 @@ sealed class FirVariable : FirCallableDeclaration(), FirStatement {
abstract fun replaceInitializer(newInitializer: FirExpression?)
abstract fun replaceDelegate(newDelegate: FirExpression?)
abstract fun replaceGetter(newGetter: FirPropertyAccessor?)
abstract fun replaceSetter(newSetter: FirPropertyAccessor?)
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt
+4
View File
@@ -172,6 +172,10 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor(
contextReceivers = newContextReceivers.toMutableOrEmpty()
}
override fun replaceDelegate(newDelegate: FirExpression?) {
delegate = newDelegate
}
override fun replaceGetter(newGetter: FirPropertyAccessor?) {
getter = newGetter
}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt
+4
View File
@@ -189,6 +189,10 @@ internal class FirDefaultSetterValueParameter(
initializer = newInitializer
}
override fun replaceDelegate(newDelegate: FirExpression?) {
delegate = newDelegate
}
override fun replaceGetter(newGetter: FirPropertyAccessor?) {
getter = newGetter
}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt
+2
View File
@@ -165,6 +165,8 @@ internal class FirEnumEntryImpl(
initializer = newInitializer
}
override fun replaceDelegate(newDelegate: FirExpression?) {}
override fun replaceGetter(newGetter: FirPropertyAccessor?) {}
override fun replaceSetter(newSetter: FirPropertyAccessor?) {}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt
+2
View File
@@ -161,6 +161,8 @@ internal class FirErrorPropertyImpl(
override fun replaceInitializer(newInitializer: FirExpression?) {}
override fun replaceDelegate(newDelegate: FirExpression?) {}
override fun replaceGetter(newGetter: FirPropertyAccessor?) {}
override fun replaceSetter(newSetter: FirPropertyAccessor?) {}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt
+2
View File
@@ -170,6 +170,8 @@ class FirFieldImpl @FirImplementationDetail constructor(
initializer = newInitializer
}
override fun replaceDelegate(newDelegate: FirExpression?) {}
override fun replaceGetter(newGetter: FirPropertyAccessor?) {}
override fun replaceSetter(newSetter: FirPropertyAccessor?) {}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt
+4
View File
@@ -191,6 +191,10 @@ internal class FirPropertyImpl(
initializer = newInitializer
}
override fun replaceDelegate(newDelegate: FirExpression?) {
delegate = newDelegate
}
override fun replaceGetter(newGetter: FirPropertyAccessor?) {
getter = newGetter
}
compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt
+2
View File
@@ -170,6 +170,8 @@ internal class FirValueParameterImpl(
override fun replaceInitializer(newInitializer: FirExpression?) {}
override fun replaceDelegate(newDelegate: FirExpression?) {}
override fun replaceGetter(newGetter: FirPropertyAccessor?) {}
override fun replaceSetter(newSetter: FirPropertyAccessor?) {}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt
+4
View File
@@ -167,6 +167,10 @@ class FirSyntheticProperty(
notSupported()
}
override fun replaceDelegate(newDelegate: FirExpression?) {
notSupported()
}
override fun replaceBodyResolveState(newBodyResolveState: FirPropertyBodyResolveState) {
notSupported()
}
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+1 -1
View File
@@ -440,7 +440,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
+name
+symbol("FirVariableSymbol", "out FirVariable")
+initializer.withTransform().withReplace()
+field("delegate", expression, nullable = true).withTransform()
+field("delegate", expression, nullable = true, withReplace = true).withTransform()
generateBooleanFields("var", "val")
+field("getter", propertyAccessor, nullable = true, withReplace = true).withTransform()
+field("setter", propertyAccessor, nullable = true, withReplace = true).withTransform()