[FIR generator] Extract BaseTransformerTypeFinder into the common module

We want to use it in other tree generators.
This commit is contained in:
Sergej Jaskiewicz
2023-11-14 12:46:40 +01:00
committed by Space Team
parent 7787b53b4a
commit 62d32471e1
17 changed files with 126 additions and 87 deletions
@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.tree.generator.model.Field
import org.jetbrains.kotlin.fir.tree.generator.model.Implementation
import org.jetbrains.kotlin.fir.tree.generator.model.LeafBuilder
import org.jetbrains.kotlin.fir.tree.generator.printer.invisibleField
import org.jetbrains.kotlin.fir.tree.generator.util.traverseParents
import org.jetbrains.kotlin.generators.tree.traverseParents
object BuilderConfigurator : AbstractBuilderConfigurator<FirTreeBuilder>(FirTreeBuilder) {
fun configureBuilders() = with(firTreeBuilder) {
@@ -5,9 +5,11 @@
package org.jetbrains.kotlin.fir.tree.generator
import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder
import org.jetbrains.kotlin.fir.tree.generator.printer.generateElements
import org.jetbrains.kotlin.fir.tree.generator.util.configureInterfacesAndAbstractClasses
import org.jetbrains.kotlin.fir.tree.generator.util.detectBaseTransformerTypes
import org.jetbrains.kotlin.generators.tree.Model
import org.jetbrains.kotlin.generators.tree.detectBaseTransformerTypes
import org.jetbrains.kotlin.generators.tree.addPureAbstractElement
import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil
import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil.collectPreviouslyGeneratedFiles
@@ -20,7 +22,8 @@ fun main(args: Array<String>) {
?: File("../../tree/gen").canonicalFile
NodeConfigurator.configureFields()
detectBaseTransformerTypes(FirTreeBuilder)
val model = Model(FirTreeBuilder.elements, AbstractFirTreeBuilder.baseFirElement)
detectBaseTransformerTypes(model)
ImplementationConfigurator.configureImplementations()
configureInterfacesAndAbstractClasses(FirTreeBuilder)
addPureAbstractElement(FirTreeBuilder.elements, pureAbstractElementType)
@@ -76,9 +76,6 @@ class Element(name: String, override val propertyName: String, kind: Kind) : Abs
override val transformableChildren: List<Field>
get() = emptyList() // Use Implementation#transformableChildren instead
var baseTransformerType: Element? = null
val transformerClass: Element get() = baseTransformerType ?: this
override val visitorParameterName: String
get() = safeDecapitalizedName
@@ -162,10 +159,6 @@ class Element(name: String, override val propertyName: String, kind: Kind) : Abs
result.values.toList()
}
val allFirFields: List<Field> by lazy {
allFields.filter { it.isFirType }
}
override fun toString(): String {
return with(ImportCollector("")) { render() }
}
@@ -6,21 +6,14 @@
package org.jetbrains.kotlin.fir.tree.generator.model
import org.jetbrains.kotlin.generators.tree.*
import org.jetbrains.kotlin.generators.tree.ElementOrRef as GenericElementOrRef
sealed class Field : AbstractField() {
open var withReplace: Boolean = false
abstract val isFirType: Boolean
open var needsSeparateTransform: Boolean = false
var parentHasSeparateTransform: Boolean = true
open var needTransformInOtherChildren: Boolean = false
/**
* @see org.jetbrains.kotlin.fir.tree.generator.util.detectBaseTransformerTypes
*/
var useInBaseTransformerDetection = true
open var customInitializationCall: String? = null
open val isMutableOrEmptyList: Boolean
@@ -79,7 +72,8 @@ class FieldWithDefault(val origin: Field) : Field() {
override var withReplace: Boolean
get() = origin.withReplace
set(_) {}
override val isFirType: Boolean get() = origin.isFirType
override val containsElement: Boolean
get() = origin.containsElement
override var needsSeparateTransform: Boolean
get() = origin.needsSeparateTransform
set(_) {}
@@ -149,7 +143,6 @@ class SimpleField(
override var isLateinit: Boolean = false,
override var isParameter: Boolean = false,
) : Field() {
override val isFirType: Boolean = false
override var isMutable: Boolean = withReplace
override fun internalCopy(): Field {
@@ -186,11 +179,10 @@ class FirField(
override var withReplace: Boolean,
) : Field() {
override val typeRef: TypeRefWithNullability
override val typeRef: ElementRef
get() = element
override var isVolatile: Boolean = false
override var isFinal: Boolean = false
override val isFirType: Boolean = true
override var isMutable: Boolean = true
override var isLateinit: Boolean = false
@@ -211,13 +203,17 @@ class FirField(
class FieldList(
override val name: String,
val baseType: TypeRef,
override val baseType: TypeRef,
override var withReplace: Boolean,
useMutableOrEmpty: Boolean = false
) : Field() {
) : Field(), ListField {
override var defaultValueInImplementation: String? = null
override val typeRef: ClassRef<PositionTypeParameterRef>
get() = StandardTypes.list.withArgs(baseType)
get() = super.typeRef
override val listType: ClassRef<PositionTypeParameterRef>
get() = StandardTypes.list
override var isVolatile: Boolean = false
override var isFinal: Boolean = false
@@ -234,6 +230,4 @@ class FieldList(
isMutableOrEmptyList
)
}
override val isFirType: Boolean = baseType is GenericElementOrRef<*, *> && baseType.element is Element
}
@@ -65,7 +65,7 @@ class Implementation(val element: Element, val name: String?) : FieldContainer,
get() = true
override val walkableChildren: List<FieldWithDefault>
get() = allFields.filter { it.isFirType && !it.withGetter && it.needAcceptAndTransform }
get() = allFields.filter { it.containsElement && !it.withGetter && it.needAcceptAndTransform }
override val transformableChildren: List<FieldWithDefault>
get() = walkableChildren.filter { it.isMutable }
@@ -285,7 +285,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) {
continue
}
printBlock {
if (field.isMutable && field.isFirType) {
if (field.isMutable && field.containsElement) {
// TODO: replace with smth normal
if (typeName == "FirWhenExpressionImpl" && field.name == "subject") {
println(
@@ -314,7 +314,7 @@ fun SmartPrinter.printImplementation(implementation: Implementation) {
} else {
printBlock {
for (field in allFields) {
if (!field.isMutable || !field.isFirType || field.name == "subjectVariable") continue
if (!field.isMutable || !field.containsElement || field.name == "subjectVariable") continue
if (!field.needsSeparateTransform) {
field.transform()
}
@@ -1,42 +0,0 @@
/*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.tree.generator.util
import org.jetbrains.kotlin.fir.tree.generator.context.AbstractFirTreeBuilder
import org.jetbrains.kotlin.fir.tree.generator.model.Element
import org.jetbrains.kotlin.fir.tree.generator.model.Field
import org.jetbrains.kotlin.fir.tree.generator.model.FieldList
import org.jetbrains.kotlin.fir.tree.generator.model.FirField
import org.jetbrains.kotlin.generators.tree.ElementOrRef as GenericElementOrRef
/**
* For each FIR element, sets its [Element.baseTransformerType] to one of it parents if that parent FIR type is used at least once as
* a type of [Field], except when that [Field] is explicitly opted out of it via [Field.useInBaseTransformerDetection].
*/
fun detectBaseTransformerTypes(builder: AbstractFirTreeBuilder) {
val usedAsFieldType = hashSetOf<Element>()
for (element in builder.elements) {
for (field in element.allFirFields) {
if (!field.useInBaseTransformerDetection) continue
val fieldElement = when (field) {
is FirField -> field.element.element
is FieldList -> (field.baseType as GenericElementOrRef<*, *>).element as Element
else -> error("Invalid field type: $field")
}
if (fieldElement == AbstractFirTreeBuilder.baseFirElement) continue
usedAsFieldType.add(fieldElement)
}
}
for (element in builder.elements) {
element.traverseParents {
if (it in usedAsFieldType) {
element.baseTransformerType = it
return@traverseParents
}
}
}
}
@@ -5,16 +5,10 @@
package org.jetbrains.kotlin.fir.tree.generator.util
import org.jetbrains.kotlin.fir.tree.generator.model.Element
import org.jetbrains.kotlin.generators.util.GeneratorsFileUtil
import org.jetbrains.kotlin.utils.SmartPrinter
import java.io.File
fun Element.traverseParents(block: (Element) -> Unit) {
block(this)
elementParents.forEach { it.element.traverseParents(block) }
}
operator fun <K, V, U> MutableMap<K, MutableMap<V, U>>.set(k1: K, k2: V, value: U) {
this.putIfAbsent(k1, mutableMapOf())
val map = getValue(k1)