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

[FIR] Move delegateFieldSymbol from FirVariable to FirProperty

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-06-26 11:34:35 +03:00
parent dc3ee6318c
commit 62d781a70f
30 changed files with 19 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt
+1 -1
View File
@@ -273,7 +273,7 @@ object BuilderConfigurator : AbstractBuilderConfigurator<FirTreeBuilder>(FirTree
}
builder(valueParameter, type = "FirDefaultSetterValueParameter") {
defaultNull("defaultValue", "initializer", "delegate", "receiverTypeRef", "delegateFieldSymbol", "getter", "setter")
defaultNull("defaultValue", "initializer", "delegate", "receiverTypeRef", "getter", "setter")
defaultFalse("isCrossinline", "isNoinline", "isVararg", "isVar")
defaultTrue("isVal")
}
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
+3 -4
View File
@@ -206,7 +206,6 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
"receiverTypeRef",
"initializer",
"delegate",
"delegateFieldSymbol",
"getter", "setter",
withGetter = true
)
@@ -221,13 +220,13 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
}
publicImplementation()
defaultNull("delegateFieldSymbol", "receiverTypeRef", "delegate", "getter", "setter", withGetter = true)
defaultNull("receiverTypeRef", "delegate", "getter", "setter", withGetter = true)
}
impl(enumEntry) {
defaultTrue("isVal", withGetter = true)
defaultFalse("isVar", withGetter = true)
defaultNull("delegateFieldSymbol", "receiverTypeRef", "delegate", "getter", "setter", withGetter = true)
defaultNull("receiverTypeRef", "delegate", "getter", "setter", withGetter = true)
}
impl(namedArgumentExpression) {
@@ -455,7 +454,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
impl(valueParameter) {
defaultTrue("isVal", withGetter = true)
defaultFalse("isVar", withGetter = true)
defaultNull("getter", "setter", "initializer", "delegate", "receiverTypeRef", "delegateFieldSymbol", withGetter = true)
defaultNull("getter", "setter", "initializer", "delegate", "receiverTypeRef", withGetter = true)
}
impl(valueParameter, "FirDefaultSetterValueParameter") {
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+2 -2
View File
@@ -336,6 +336,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
parentArg(variable, "E", property)
+symbol("FirPropertySymbol")
+field("backingFieldSymbol", backingFieldSymbolType)
+field("delegateFieldSymbol", delegateFieldSymbolType, nullable = true)
+booleanField("isLocal")
+typeParameters
}
@@ -393,7 +394,6 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
+symbol("FirVariableSymbol", "E")
+initializer.withTransform().withReplace()
+field("delegate", expression, nullable = true).withTransform()
+field("delegateFieldSymbol", delegateFieldSymbolType, "E", nullable = true)
generateBooleanFields("var", "val")
+field("getter", propertyAccessor, nullable = true).withTransform()
+field("setter", propertyAccessor, nullable = true).withTransform()
@@ -578,7 +578,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
}
delegateFieldReference.configure {
+field("resolvedSymbol", delegateFieldSymbolType.withArgs("*"))
+field("resolvedSymbol", delegateFieldSymbolType)
}
backingFieldReference.configure {