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

[FIR] Remove FirUncheckedNotNullCastImpl from FIR

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2019-08-29 13:15:53 +03:00
parent c2602fda1f
commit 9508fc60c9
3 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
-7
View File
@@ -17,7 +17,6 @@ import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor
import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.expressions.*
import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition
import org.jetbrains.kotlin.fir.expressions.impl.FirUncheckedNotNullCastImpl
import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression
import org.jetbrains.kotlin.fir.references.FirErrorNamedReference import org.jetbrains.kotlin.fir.references.FirErrorNamedReference
import org.jetbrains.kotlin.fir.references.FirSimpleNamedReference import org.jetbrains.kotlin.fir.references.FirSimpleNamedReference
@@ -1021,11 +1020,6 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver
} }
} }
private fun FlowContent.generate(makeNotNullCall: FirUncheckedNotNullCastImpl) {
generate(makeNotNullCall.expression)
keyword("!")
}
private fun FlowContent.generate(typeOperatorCall: FirTypeOperatorCall) { private fun FlowContent.generate(typeOperatorCall: FirTypeOperatorCall) {
val (expression) = typeOperatorCall.arguments val (expression) = typeOperatorCall.arguments
generate(expression) generate(expression)
@@ -1237,7 +1231,6 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver
generate(expression.expression) generate(expression.expression)
} }
is FirTypeOperatorCall -> generate(expression) is FirTypeOperatorCall -> generate(expression)
is FirUncheckedNotNullCastImpl -> generate(expression)
is FirOperatorCall -> generate(expression) is FirOperatorCall -> generate(expression)
is FirBinaryLogicExpression -> generate(expression) is FirBinaryLogicExpression -> generate(expression)
else -> inlineUnsupported(expression) else -> inlineUnsupported(expression)
compiler/fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/ConversionUtils.kt
+1 -1
View File
@@ -155,7 +155,7 @@ fun FirExpression.generateNotNullOrOther(
branches += FirWhenBranchImpl( branches += FirWhenBranchImpl(
other.psi, FirElseIfTrueCondition(basePsi), other.psi, FirElseIfTrueCondition(basePsi),
FirSingleExpressionBlock( FirSingleExpressionBlock(
FirUncheckedNotNullCastImpl(basePsi, generateResolvedAccessExpression(basePsi, subjectVariable)) generateResolvedAccessExpression(basePsi, subjectVariable)
) )
) )
} }
compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirUncheckedNotNullCastImpl.kt
-17
View File
@@ -1,17 +0,0 @@
/*
* Copyright 2010-2019 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.expressions.impl
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.fir.expressions.FirExpression
import org.jetbrains.kotlin.fir.expressions.FirUncheckedNotNullCast
class FirUncheckedNotNullCastImpl(psi: PsiElement?, expression: FirExpression) : FirUncheckedNotNullCast(psi) {
init {
arguments += expression
}
}