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

[FIR] Squash AbstractFirBasedSymbol with FirBasedSymbol

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2021-06-11 12:14:24 +03:00
parent 823cbc59b7
commit 39cd1c8504
84 changed files with 294 additions and 313 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/NodeConfigurator.kt
+4 -4
View File
@@ -48,7 +48,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
symbolOwner.configure {
withArg("E", symbolOwner, declaration)
+symbolWithPackage("fir.symbols", "AbstractFirBasedSymbol", "E")
+symbolWithPackage("fir.symbols", "FirBasedSymbol", "E")
}
typeParameterRef.configure {
@@ -560,11 +560,11 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
namedReference.configure {
+name
+field("candidateSymbol", abstractFirBasedSymbolType, "*", nullable = true)
+field("candidateSymbol", firBasedSymbolType, "*", nullable = true)
}
resolvedNamedReference.configure {
+field("resolvedSymbol", abstractFirBasedSymbolType, "*")
+field("resolvedSymbol", firBasedSymbolType, "*")
}
resolvedCallableReference.configure {
@@ -587,7 +587,7 @@ object NodeConfigurator : AbstractFieldConfigurator<FirTreeBuilder>(FirTreeBuild
thisReference.configure {
+stringField("labelName", nullable = true)
+field("boundSymbol", abstractFirBasedSymbolType, "*", nullable = true, withReplace = true)
+field("boundSymbol", firBasedSymbolType, "*", nullable = true, withReplace = true)
}
typeRef.configure {
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/Types.kt
+1 -1
View File
@@ -63,7 +63,7 @@ val implicitUnitTypeRefType = generatedType("types.impl", "FirImplicitUnitTypeRe
val resolvePhaseType = type("fir.declarations", "FirResolvePhase")
val stubReferenceType = generatedType("references.impl", "FirStubReference")
val abstractFirBasedSymbolType = type("fir.symbols", "AbstractFirBasedSymbol")
val firBasedSymbolType = type("fir.symbols", "FirBasedSymbol")
val backingFieldSymbolType = type("fir.symbols.impl", "FirBackingFieldSymbol")
val delegateFieldSymbolType = type("fir.symbols.impl", "FirDelegateFieldSymbol")
val classSymbolType = type("fir.symbols.impl", "FirClassSymbol")