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

FIR: Rename FirResolvedCallableReference -> FirResolvedNamedReference

Browse Source 
^KT-32725 In Progress
This commit is contained in:
Denis Zharkov
2019-10-23 14:51:05 +03:00
parent 5e322a2dd9
commit 1564e72b59
35 changed files with 139 additions and 122 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/FirTreeBuilder.kt
+4 -4
View File
@@ -117,11 +117,11 @@ object FirTreeBuilder : AbstractFirTreeBuilder() {
val thisReference = element("ThisReference", Reference, reference)
val controlFlowGraphReference = element("ControlFlowGraphReference", Reference, reference)
val resolvedCallableReference = element("ResolvedCallableReference", Reference, namedReference)
val delegateFieldReference = element("DelegateFieldReference", Reference, resolvedCallableReference)
val backingFieldReference = element("BackingFieldReference", Reference, resolvedCallableReference)
val resolvedNamedReference = element("ResolvedNamedReference", Reference, namedReference)
val delegateFieldReference = element("DelegateFieldReference", Reference, resolvedNamedReference)
val backingFieldReference = element("BackingFieldReference", Reference, resolvedNamedReference)
val resolvedRealCallableReference = element("ResolvedRealCallableReference", Reference, resolvedCallableReference)
val resolvedRealCallableReference = element("ResolvedRealCallableReference", Reference, resolvedNamedReference)
val resolvedTypeRef = element("ResolvedTypeRef", TypeRef, typeRef)
val errorTypeRef = element("ErrorTypeRef", TypeRef, resolvedTypeRef)
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt
+4 -3
View File
@@ -7,7 +7,8 @@ package org.jetbrains.kotlin.fir.tree.generator
import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeImplementationConfigurator
import org.jetbrains.kotlin.fir.tree.generator.model.Implementation
import org.jetbrains.kotlin.fir.tree.generator.model.Implementation.Kind.*
import org.jetbrains.kotlin.fir.tree.generator.model.Implementation.Kind.Object
import org.jetbrains.kotlin.fir.tree.generator.model.Implementation.Kind.OpenClass
object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() {
private lateinit var abstractAnnotatedElement: Implementation
@@ -425,11 +426,11 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator()
}
}
impl(resolvedCallableReference) {
impl(resolvedNamedReference) {
defaultNull("candidateSymbol", withGetter = true)
}
impl(resolvedCallableReference, "FirPropertyFromParameterCallableReference") {
impl(resolvedNamedReference, "FirPropertyFromParameterResolvedNamedReference") {
defaultNull("candidateSymbol", withGetter = true)
}
compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt
+1 -1
View File
@@ -448,7 +448,7 @@ object NodeConfigurator : AbstractFieldConfigurator() {
+field("candidateSymbol", abstractFirBasedSymbolType, "*", nullable = true)
}
resolvedCallableReference.configure {
resolvedNamedReference.configure {
+field("resolvedSymbol", abstractFirBasedSymbolType, "*")
}