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

ConstantExpressionEvaluator: avoid calling KotlinBuiltIns.getInstance()

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-09-21 18:44:39 +03:00
parent b9da08d11c
commit 0610dd36fa
1 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/resolve/constants/evaluate/ConstantExpressionEvaluator.kt
+19 -19
View File
@@ -36,8 +36,7 @@ import org.jetbrains.kotlin.types.TypeUtils
import org.jetbrains.kotlin.types.checker.JetTypeChecker import org.jetbrains.kotlin.types.checker.JetTypeChecker
import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.types.expressions.OperatorConventions
import java.math.BigInteger import java.math.BigInteger
import java.util.ArrayList import java.util.*
import java.util.HashMap
public class ConstantExpressionEvaluator( public class ConstantExpressionEvaluator(
internal val builtIns: KotlinBuiltIns internal val builtIns: KotlinBuiltIns
@@ -656,6 +655,24 @@ private class ConstantExpressionEvaluatorVisitor(
return createOperationArgument(argumentExpression, parameter.getType(), argumentCompileTimeType) return createOperationArgument(argumentExpression, parameter.getType(), argumentCompileTimeType)
} }
private fun getCompileTimeType(c: JetType): CompileTimeType<out Any>? {
val builtIns = constantExpressionEvaluator.builtIns
return when (TypeUtils.makeNotNullable(c)) {
builtIns.intType -> INT
builtIns.byteType -> BYTE
builtIns.shortType -> SHORT
builtIns.longType -> LONG
builtIns.doubleType -> DOUBLE
builtIns.floatType -> FLOAT
builtIns.charType -> CHAR
builtIns.booleanType -> BOOLEAN
builtIns.stringType -> STRING
builtIns.anyType -> ANY
else -> null
}
}
private fun createOperationArgument(expression: JetExpression, expressionType: JetType, compileTimeType: CompileTimeType<*>): OperationArgument? { private fun createOperationArgument(expression: JetExpression, expressionType: JetType, compileTimeType: CompileTimeType<*>): OperationArgument? {
val compileTimeConstant = constantExpressionEvaluator.evaluateExpression(expression, trace, expressionType) ?: return null val compileTimeConstant = constantExpressionEvaluator.evaluateExpression(expression, trace, expressionType) ?: return null
val evaluationResult = compileTimeConstant.getValue(expressionType) ?: return null val evaluationResult = compileTimeConstant.getValue(expressionType) ?: return null
@@ -820,23 +837,6 @@ private fun getReceiverExpressionType(resolvedCall: ResolvedCall<*>): JetType? {
} }
} }
private fun getCompileTimeType(c: JetType): CompileTimeType<out Any>? {
val builtIns = KotlinBuiltIns.getInstance()
return when (TypeUtils.makeNotNullable(c)) {
builtIns.getIntType() -> INT
builtIns.getByteType() -> BYTE
builtIns.getShortType() -> SHORT
builtIns.getLongType() -> LONG
builtIns.getDoubleType() -> DOUBLE
builtIns.getFloatType() -> FLOAT
builtIns.getCharType() -> CHAR
builtIns.getBooleanType() -> BOOLEAN
builtIns.getStringType() -> STRING
builtIns.getAnyType() -> ANY
else -> null
}
}
private class CompileTimeType<T> private class CompileTimeType<T>
internal val BYTE = CompileTimeType<Byte>() internal val BYTE = CompileTimeType<Byte>()