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

[FIR] Add ability to pass data=null to transformInplace with data producer

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-03-16 10:45:28 +03:00
parent fe95e37c88
commit 698f78570d
3 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt
+3 -5
View File
@@ -37,10 +37,7 @@ import org.jetbrains.kotlin.fir.symbols.invoke
import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.builder.* import org.jetbrains.kotlin.fir.types.builder.*
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.visitors.CompositeTransformResult import org.jetbrains.kotlin.fir.visitors.*
import org.jetbrains.kotlin.fir.visitors.FirDefaultTransformer
import org.jetbrains.kotlin.fir.visitors.compose
import org.jetbrains.kotlin.fir.visitors.transformSingle
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.types.Variance import org.jetbrains.kotlin.types.Variance
@@ -188,7 +185,8 @@ class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransformer) :
val numberOfStatements = block.statements.size val numberOfStatements = block.statements.size
block.transformStatementsIndexed(transformer) { index -> block.transformStatementsIndexed(transformer) { index ->
if (index == numberOfStatements - 1) data else ResolutionMode.ContextIndependent val value = if (index == numberOfStatements - 1) data else ResolutionMode.ContextIndependent
TransformData.Data(value)
} }
block.transformAllStatementsExceptLast(integerLiteralTypeApproximator, builtinTypes.intType.type) block.transformAllStatementsExceptLast(integerLiteralTypeApproximator, builtinTypes.intType.type)
block.transformOtherChildren(transformer, data) block.transformOtherChildren(transformer, data)
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt
+9 -4
View File
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.ConeClassLikeType
import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirTransformer
import org.jetbrains.kotlin.fir.visitors.TransformData
import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.fir.visitors.transformInplace
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
@@ -64,19 +65,23 @@ fun buildErrorExpression(source: FirSourceElement?, diagnostic: FirDiagnostic):
} }
} }
fun <D : Any> FirBlock.transformStatementsIndexed(transformer: FirTransformer<D>, dataProducer: (Int) -> D?): FirBlock { fun <D> FirBlock.transformStatementsIndexed(transformer: FirTransformer<D>, dataProducer: (Int) -> TransformData<D>): FirBlock {
when (this) { when (this) {
is FirBlockImpl -> statements.transformInplace(transformer, dataProducer) is FirBlockImpl -> statements.transformInplace(transformer, dataProducer)
is FirSingleExpressionBlock -> { is FirSingleExpressionBlock -> {
dataProducer(0)?.let { transformStatements(transformer, it) } (dataProducer(0) as? TransformData.Data<D>)?.value?.let { transformStatements(transformer, it) }
} }
} }
return this return this
} }
fun <D : Any> FirBlock.transformAllStatementsExceptLast(transformer: FirTransformer<D>, data: D): FirBlock { fun <D> FirBlock.transformAllStatementsExceptLast(transformer: FirTransformer<D>, data: D): FirBlock {
val threshold = statements.size - 1 val threshold = statements.size - 1
return transformStatementsIndexed(transformer) { index -> return transformStatementsIndexed(transformer) { index ->
data.takeIf { index < threshold } if (index < threshold) {
TransformData.Data(data)
} else {
TransformData.Nothing
}
} }
} }
compiler/fir/tree/src/org/jetbrains/kotlin/fir/visitors/FirTransformerUtil.kt
+10 -2
View File
@@ -34,12 +34,20 @@ fun <T : FirElement, D> MutableList<T>.transformInplace(transformer: FirTransfor
} }
} }
inline fun <T : FirElement, D : Any> MutableList<T>.transformInplace(transformer: FirTransformer<D>, dataProducer: (Int) -> D?) { sealed class TransformData<out D> {
class Data<D>(val value: D) : TransformData<D>()
object Nothing : TransformData<kotlin.Nothing>()
}
inline fun <T : FirElement, D> MutableList<T>.transformInplace(transformer: FirTransformer<D>, dataProducer: (Int) -> TransformData<D>) {
val iterator = this.listIterator() val iterator = this.listIterator()
var index = 0 var index = 0
while (iterator.hasNext()) { while (iterator.hasNext()) {
val next = iterator.next() as FirPureAbstractElement val next = iterator.next() as FirPureAbstractElement
val data = dataProducer(index++) ?: continue val data = when (val data = dataProducer(index++)) {
is TransformData.Data<D> -> data.value
TransformData.Nothing -> continue
}
val result = next.transform<T, D>(transformer, data).single val result = next.transform<T, D>(transformer, data).single
iterator.set(result) iterator.set(result)
} }