Minor: CompileTimeConstant use utils instead of JetType#equals

2015-07-23 18:30:58 +03:00
parent 0bed8bb7d4
commit a1a38e2eba
1 changed files with 5 additions and 4 deletions
@@ -63,14 +63,15 @@ public class IntegerValueTypeConstant(

    override fun toConstantValue(expectedType: JetType): ConstantValue<Number> {
        val factory = ConstantValueFactory(KotlinBuiltIns.getInstance())
-        return when (getType(expectedType)) {
-            KotlinBuiltIns.getInstance().getIntType() -> {
+        val type = getType(expectedType)
+        return when {
+            KotlinBuiltIns.isInt(type) -> {
                factory.createIntValue(value.toInt())
            }
-            KotlinBuiltIns.getInstance().getByteType() -> {
+            KotlinBuiltIns.isByte(type) -> {
                factory.createByteValue(value.toByte())
            }
-            KotlinBuiltIns.getInstance().getShortType() -> {
+            KotlinBuiltIns.isShort(type) -> {
                factory.createShortValue(value.toShort())
            }
            else -> {