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

FIR IDE: make compile-time constant evaluator an object

Browse Source 
because it doesn't have any states.
This commit is contained in:
Jinseong Jeon
2021-09-21 11:32:39 -07:00
committed by Ilya Kirillov
parent 414881403b
commit d3d3aeacb4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/components/KtFirCompileTimeConstantProvider.kt
+1 -1
View File
@@ -25,7 +25,7 @@ internal class KtFirCompileTimeConstantProvider(
override fun evaluate(expression: KtExpression): KtConstantValue? = withValidityAssertion { override fun evaluate(expression: KtExpression): KtConstantValue? = withValidityAssertion {
when (val fir = expression.getOrBuildFir(firResolveState)) { when (val fir = expression.getOrBuildFir(firResolveState)) {
is FirExpression -> { is FirExpression -> {
FirCompileTimeConstantEvaluator().evaluate(fir)?.let { KtFirConstantValueConverter.toConstantValue(it) } FirCompileTimeConstantEvaluator.evaluate(fir)?.let { KtFirConstantValueConverter.toConstantValue(it) }
?: KtFirConstantValueConverter.toConstantValue(fir, firResolveState.rootModuleSession) ?: KtFirConstantValueConverter.toConstantValue(fir, firResolveState.rootModuleSession)
} }
else -> throwUnexpectedFirElementError(fir, expression) else -> throwUnexpectedFirElementError(fir, expression)
analysis/analysis-api-fir/src/org/jetbrains/kotlin/analysis/api/fir/evaluate/FirCompileTimeConstantEvaluator.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.types.ConstantValueKind
* An evaluator that transform numeric operation, such as div, into compile-time constant iff involved operands, such as explicit receiver * An evaluator that transform numeric operation, such as div, into compile-time constant iff involved operands, such as explicit receiver
* and the argument, are compile-time constant as well. * and the argument, are compile-time constant as well.
*/ */
internal class FirCompileTimeConstantEvaluator { internal object FirCompileTimeConstantEvaluator {
// TODO: Handle boolean operators, const property loading, class reference, array, annotation values, etc. // TODO: Handle boolean operators, const property loading, class reference, array, annotation values, etc.
fun evaluate(expression: FirExpression): FirConstExpression<*>? = fun evaluate(expression: FirExpression): FirConstExpression<*>? =