Remove toInt() from rendering IntValue

This commit is contained in:
Natalia Ukhorskaya
2014-02-20 15:57:25 +04:00
parent a80114d720
commit 89d99d2848
35 changed files with 99 additions and 99 deletions
@@ -1,16 +1,16 @@
package test
// val prop1: 1.toInt()
// val prop1: 1
val prop1 = A.a
// val prop2: 2.toInt()
// val prop2: 2
val prop2 = A.a + 1
class A {
// val prop3: 1.toInt()
// val prop3: 1
val prop3 = A.a
// val prop4: 2.toInt()
// val prop4: 2
val prop4 = A.a + 1
class object {
@@ -19,26 +19,26 @@ class A {
}
fun foo() {
// val prop5: 1.toInt()
// val prop5: 1
val prop5 = A.a
// val prop6: 2.toInt()
// val prop6: 2
val prop6 = A.a + 1
val b = {
// val prop11: 1.toInt()
// val prop11: 1
val prop11 = A.a
// val prop12: 2.toInt()
// val prop12: 2
val prop12 = A.a + 1
}
val c = object: Foo {
override fun f() {
// val prop9: 1.toInt()
// val prop9: 1
val prop9 = A.a
// val prop10: 2.toInt()
// val prop10: 2
val prop10 = A.a + 1
}
}
@@ -12,7 +12,7 @@ val prop3 = 1 <= 2
// val prop4: false
val prop4 = 1 >= 2
// val prop5: -1.toInt()
// val prop5: -1
val prop5 = 1.compareTo(2)
// val prop6: false
@@ -1,41 +1,41 @@
package test
// val prop1: 1.toInt()
// val prop1: 1
val prop1 = A().a
// val prop2: 2.toInt()
// val prop2: 2
val prop2 = A().a + 1
class A() {
val a = 1
// val prop3: 1.toInt()
// val prop3: 1
val prop3 = a
// val prop4: 2.toInt()
// val prop4: 2
val prop4 = a + 1
fun foo() {
// val prop5: 1.toInt()
// val prop5: 1
val prop5 = A().a
// val prop6: 2.toInt()
// val prop6: 2
val prop6 = A().a + 1
val b = {
// val prop11: 1.toInt()
// val prop11: 1
val prop11 = A().a
// val prop12: 2.toInt()
// val prop12: 2
val prop12 = A().a + 1
}
val c = object: Foo {
override fun f() {
// val prop9: 1.toInt()
// val prop9: 1
val prop9 = A().a
// val prop10: 2.toInt()
// val prop10: 2
val prop10 = A().a + 1
}
}
@@ -43,10 +43,10 @@ class A() {
}
fun foo() {
// val prop7: 1.toInt()
// val prop7: 1
val prop7 = A().a
// val prop8: 2.toInt()
// val prop8: 2
val prop8 = A().a + 1
}
+10 -10
View File
@@ -4,34 +4,34 @@ class A() {
fun foo() {
val a = 1
// val prop5: 1.toInt()
// val prop5: 1
val prop5 = a
// val prop6: 2.toInt()
// val prop6: 2
val prop6 = a + 1
fun local() {
// val prop1: 1.toInt()
// val prop1: 1
val prop1 = a
// val prop2: 2.toInt()
// val prop2: 2
val prop2 = a + 1
}
val b = {
// val prop3: 1.toInt()
// val prop3: 1
val prop3 = a
// val prop4: 2.toInt()
// val prop4: 2
val prop4 = a + 1
}
val c = object: Foo {
override fun f() {
// val prop9: 1.toInt()
// val prop9: 1
val prop9 = a
// val prop10: 2.toInt()
// val prop10: 2
val prop10 = a + 1
}
}
@@ -41,10 +41,10 @@ class A() {
fun foo() {
val a = 1
// val prop7: 1.toInt()
// val prop7: 1
val prop7 = a
// val prop8: 2.toInt()
// val prop8: 2
val prop8 = a + 1
}
@@ -2,43 +2,43 @@ package test
val a = 1
// val prop1: 1.toInt()
// val prop1: 1
val prop1 = a
// val prop2: 2.toInt()
// val prop2: 2
val prop2 = a + 1
class A {
// val prop3: 1.toInt()
// val prop3: 1
val prop3 = a
// val prop4: 2.toInt()
// val prop4: 2
val prop4 = a + 1
val b = {
// val prop11: 1.toInt()
// val prop11: 1
val prop11 = a
// val prop12: 2.toInt()
// val prop12: 2
val prop12 = a + 1
}
val c = object: Foo {
override fun f() {
// val prop9: 1.toInt()
// val prop9: 1
val prop9 = a
// val prop10: 2.toInt()
// val prop10: 2
val prop10 = a + 1
}
}
}
fun foo() {
// val prop5: 1.toInt()
// val prop5: 1
val prop5 = a
// val prop6: 2.toInt()
// val prop6: 2
val prop6 = a + 1
}
@@ -1,6 +1,6 @@
package test
// val p1: -1.toInt()
// val p1: -1
val p1 = -1
// val p2: -1.toLong()
@@ -9,14 +9,14 @@ val p2 = -1.toLong()
// val p3: -1.toByte()
val p3 = (-1).toByte()
// val p3a: -1.toInt()
// val p3a: -1
val p3a =-1.toByte()
// val p4: -1.toInt()
// val p4: -1
val p4 = -1.toInt()
// val p5: -1.toShort()
val p5 = (-1).toShort()
// val p5a: -1.toInt()
// val p5a: -1
val p5a = -1.toShort()
@@ -1,6 +1,6 @@
package test
// val p1: -1.toInt()
// val p1: -1
val p1: Int = -1
// val p2: -1.toLong()
@@ -25,39 +25,39 @@ val l3: Int = -1.toLong()
val l4: Short = -1.toLong()
// val b1: -1.toInt()
// val b1: -1
val b1: Byte = -1.toByte()
// val b2: -1.toInt()
// val b2: -1
val b2: Int = -1.toByte()
// val b3: -1.toInt()
// val b3: -1
val b3: Long = -1.toByte()
// val b4: -1.toInt()
// val b4: -1
val b4: Short = -1.toByte()
// val i1: -1.toInt()
// val i1: -1
val i1: Byte = -1.toInt()
// val i2: -1.toInt()
// val i2: -1
val i2: Int = -1.toInt()
// val i3: -1.toInt()
// val i3: -1
val i3: Long = -1.toInt()
// val i4: -1.toInt()
// val i4: -1
val i4: Short = -1.toInt()
// val s1: -1.toInt()
// val s1: -1
val s1: Byte = -1.toShort()
// val s2: -1.toInt()
// val s2: -1
val s2: Int = -1.toShort()
// val s3: -1.toInt()
// val s3: -1
val s3: Long = -1.toShort()
// val s4: -1.toInt()
// val s4: -1
val s4: Short = -1.toShort()
@@ -8,7 +8,7 @@ public open class ArithmeticExpressionInParam : java.lang.Object {
public abstract fun value(): kotlin.Int
}
test.ArithmeticExpressionInParam.Anno(value = 42.toInt(): kotlin.Int) public open class Class : java.lang.Object {
test.ArithmeticExpressionInParam.Anno(value = 42: kotlin.Int) public open class Class : java.lang.Object {
public constructor Class()
}
}
@@ -2,7 +2,7 @@ package test
public trait PrimitiveValueInParam : java.lang.Object {
test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1.toInt(): kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A : java.lang.Object {
test.PrimitiveValueInParam.Ann(bool = true: kotlin.Boolean, d = 1.0.toDouble(): kotlin.Double, f = 1.0.toFloat(): kotlin.Float, i = 1: kotlin.Int, l = 1.toLong(): kotlin.Long, str = "str": kotlin.String) public open class A : java.lang.Object {
public constructor A()
}
@@ -2,5 +2,5 @@ package test
public final class FinalFieldAsVal : java.lang.Object {
public constructor FinalFieldAsVal()
public final val f: kotlin.Int = 1.toInt()
public final val f: kotlin.Int = 1
}
@@ -8,7 +8,7 @@ internal final class A {
internal class object <class-object-for-B> {
/*primary*/ private constructor <class-object-for-B>()
internal final val TEST: kotlin.Int = 1.toInt()
internal final val TEST: kotlin.Int = 1
internal final fun <get-TEST>(): kotlin.Int
}
}
@@ -18,7 +18,7 @@ internal final annotation class CharAnno : kotlin.Annotation {
internal final fun <get-value>(): kotlin.Char
}
test.IntAnno(value = 42.toInt(): kotlin.Int) test.ShortAnno(value = 42.toShort(): kotlin.Short) test.ByteAnno(value = 42.toByte(): kotlin.Byte) test.LongAnno(value = 42.toLong(): kotlin.Long) test.CharAnno(value = #65(A): kotlin.Char) test.BooleanAnno(value = false: kotlin.Boolean) test.FloatAnno(value = 3.14.toFloat(): kotlin.Float) test.DoubleAnno(value = 3.14.toDouble(): kotlin.Double) internal final class Class {
test.IntAnno(value = 42: kotlin.Int) test.ShortAnno(value = 42.toShort(): kotlin.Short) test.ByteAnno(value = 42.toByte(): kotlin.Byte) test.LongAnno(value = 42.toLong(): kotlin.Long) test.CharAnno(value = #65(A): kotlin.Char) test.BooleanAnno(value = false: kotlin.Boolean) test.FloatAnno(value = 3.14.toFloat(): kotlin.Float) test.DoubleAnno(value = 3.14.toDouble(): kotlin.Double) internal final class Class {
/*primary*/ public constructor Class()
}
@@ -10,6 +10,6 @@ internal final annotation class Anno : kotlin.Annotation {
internal final fun <get-string>(): kotlin.String
}
test.Anno(double = 3.14.toDouble(): kotlin.Double, int = 42.toInt(): kotlin.Int, string = "OK": kotlin.String) internal final class Class {
test.Anno(double = 3.14.toDouble(): kotlin.Double, int = 42: kotlin.Int, string = "OK": kotlin.String) internal final class Class {
/*primary*/ public constructor Class()
}
@@ -1,6 +1,6 @@
package test
test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: kotlin.Int = 42.toInt()
test.Anno(t = ElementType.FIELD: java.lang.annotation.ElementType) internal val bar: kotlin.Int = 42
internal fun <get-bar>(): kotlin.Int
test.Anno(t = ElementType.METHOD: java.lang.annotation.ElementType) internal fun foo(): kotlin.Unit
@@ -2,12 +2,12 @@ package test
internal final class ConstructorTypeParamClassObjectConflict</*0*/ test> {
/*primary*/ public constructor ConstructorTypeParamClassObjectConflict</*0*/ test>()
internal final val some: kotlin.Int = 12.toInt()
internal final val some: kotlin.Int = 12
internal final fun <get-some>(): kotlin.Int
internal class object <class-object-for-ConstructorTypeParamClassObjectConflict> {
/*primary*/ private constructor <class-object-for-ConstructorTypeParamClassObjectConflict>()
internal final val test: kotlin.Int = 12.toInt()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
}
@@ -34,7 +34,7 @@ internal final class TestClassObjectAndClassConflict {
internal class object <class-object-for-TestClassObjectAndClassConflict> {
/*primary*/ private constructor <class-object-for-TestClassObjectAndClassConflict>()
internal final val bla: kotlin.Int = 12.toInt()
internal final val bla: kotlin.Int = 12
internal final fun <get-bla>(): kotlin.Int
}
}
@@ -46,7 +46,7 @@ internal final class TestConstructorParamClassObjectConflict {
internal class object <class-object-for-TestConstructorParamClassObjectConflict> {
/*primary*/ private constructor <class-object-for-TestConstructorParamClassObjectConflict>()
internal final val test: kotlin.Int = 12.toInt()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
}
@@ -60,7 +60,7 @@ internal final class TestConstructorValClassObjectConflict {
internal class object <class-object-for-TestConstructorValClassObjectConflict> {
/*primary*/ private constructor <class-object-for-TestConstructorValClassObjectConflict>()
internal final val test: kotlin.Int = 12.toInt()
internal final val test: kotlin.Int = 12
internal final fun <get-test>(): kotlin.Int
}
}
@@ -1,6 +1,6 @@
package test
internal val x: kotlin.Int = 5.toInt()
internal val x: kotlin.Int = 5
internal fun <get-x>(): kotlin.Int
public object Obj {
@@ -5,7 +5,7 @@ internal final class ClassObjectDeclaresProperty {
internal class object <class-object-for-ClassObjectDeclaresProperty> {
/*primary*/ private constructor <class-object-for-ClassObjectDeclaresProperty>()
internal final val i: kotlin.Int = 1.toInt()
internal final val i: kotlin.Int = 1
internal final fun <get-i>(): kotlin.Int
}
}
@@ -2,12 +2,12 @@ package test
internal final class A {
/*primary*/ public constructor A()
internal final val other: kotlin.Int = 1.toInt()
internal final val other: kotlin.Int = 1
internal final fun <get-other>(): kotlin.Int
internal class object <class-object-for-A> {
/*primary*/ private constructor <class-object-for-A>()
internal final val some: kotlin.Int = 1.toInt()
internal final val some: kotlin.Int = 1
internal final fun <get-some>(): kotlin.Int
}
}
@@ -5,12 +5,12 @@ internal final class Test {
internal class object <class-object-for-Test> {
/*primary*/ private constructor <class-object-for-Test>()
public final val prop1: kotlin.Int = 10.toInt()
public final val prop1: kotlin.Int = 10
public final fun <get-prop1>(): kotlin.Int
public final var prop2: kotlin.Int
public final fun <get-prop2>(): kotlin.Int
protected final fun <set-prop2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
public final val prop3: kotlin.Int = 12.toInt()
public final val prop3: kotlin.Int = 12
public final fun <get-prop3>(): kotlin.Int
internal final var prop4: kotlin.Int
internal final fun <get-prop4>(): kotlin.Int
@@ -4,12 +4,12 @@ internal trait Test {
internal class object <class-object-for-Test> {
/*primary*/ private constructor <class-object-for-Test>()
public final val prop1: kotlin.Int = 10.toInt()
public final val prop1: kotlin.Int = 10
public final fun <get-prop1>(): kotlin.Int
public final var prop2: kotlin.Int
public final fun <get-prop2>(): kotlin.Int
protected final fun <set-prop2>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
public final val prop3: kotlin.Int = 12.toInt()
public final val prop3: kotlin.Int = 12
public final fun <get-prop3>(): kotlin.Int
internal final var prop4: kotlin.Int
internal final fun <get-prop4>(): kotlin.Int
@@ -2,6 +2,6 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val aa: kotlin.Int = 1.toInt()
internal final val aa: kotlin.Int = 1
internal final fun <get-aa>(): kotlin.Int
}
@@ -1,4 +1,4 @@
package test
internal val nsVal: kotlin.Int = 1.toInt()
internal val nsVal: kotlin.Int = 1
internal fun <get-nsVal>(): kotlin.Int
@@ -2,7 +2,7 @@ package test
internal open class BaseClass {
/*primary*/ public constructor BaseClass()
internal final val exactly: kotlin.Int = 17.toInt()
internal final val exactly: kotlin.Int = 17
internal final fun <get-exactly>(): kotlin.Int
}
@@ -2,14 +2,14 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val property1: kotlin.Int = 1.toInt()
internal final val property1: kotlin.Int = 1
internal final fun <get-property1>(): kotlin.Int
internal final val property2: kotlin.Int = 1.toInt()
internal final val property2: kotlin.Int = 1
internal final fun <get-property2>(): kotlin.Int
private final val property3: java.lang.Object
private final fun <get-property3>(): java.lang.Object
protected final val property4: kotlin.String = ""
protected final fun <get-property4>(): kotlin.String
public final val property5: kotlin.Int = 1.toInt()
public final val property5: kotlin.Int = 1
public final fun <get-property5>(): kotlin.Int
}
@@ -2,14 +2,14 @@ package test
internal final class ClassVal {
/*primary*/ public constructor ClassVal()
internal final val property1: kotlin.Int = 1.toInt()
internal final val property1: kotlin.Int = 1
internal final fun <get-property1>(): kotlin.Int
internal final val property2: kotlin.Int = 1.toInt()
internal final val property2: kotlin.Int = 1
internal final fun <get-property2>(): kotlin.Int
private final val property3: java.lang.Object
private final fun <get-property3>(): java.lang.Object
protected final val property4: kotlin.String = ""
protected final fun <get-property4>(): kotlin.String
public final val property5: kotlin.Int = 1.toInt()
public final val property5: kotlin.Int = 1
public final fun <get-property5>(): kotlin.Int
}
@@ -14,7 +14,7 @@ internal final class B : test.A {
public open override /*1*/ var p: kotlin.Int
public open override /*1*/ fun <get-p>(): kotlin.Int
public open override /*1*/ fun <set-p>(/*0*/ <set-?>: kotlin.Int): kotlin.Unit
internal open override /*1*/ val v: kotlin.Int = 0.toInt()
internal open override /*1*/ val v: kotlin.Int = 0
internal open override /*1*/ fun <get-v>(): kotlin.Int
internal open override /*1*/ fun f(): kotlin.Int
}
@@ -1,5 +1,5 @@
package test
internal val x: kotlin.Int = 0.toInt()
internal val x: kotlin.Int = 0
internal fun <get-x>(): kotlin.Int
internal fun f(): kotlin.Int
@@ -1,4 +1,4 @@
package test
private val topLevelVal: kotlin.Int = 0.toInt()
private val topLevelVal: kotlin.Int = 0
private fun <get-topLevelVal>(): kotlin.Int
@@ -13,4 +13,4 @@ annotation class Ann(
Ann('c', 99.toChar(), 'c'.toInt(), 'c'.toLong(), 'c'.toByte(), 'c'.toShort(), 'c'.toDouble(), 'c'.toFloat()) class MyClass
// EXPECTED: Ann(b1 = #99(c): Char, b2 = #99(c): Char, b3 = 99.toInt(): Int, b4 = 99.toLong(): Long, b5 = 99.toByte(): Byte, b6 = 99.toShort(): Short, b7 = 99.0.toDouble(): Double, b8 = 99.0.toFloat(): Float)
// EXPECTED: Ann(b1 = #99(c): Char, b2 = #99(c): Char, b3 = 99: Int, b4 = 99.toLong(): Long, b5 = 99.toByte(): Byte, b6 = 99.toShort(): Short, b7 = 99.0.toDouble(): Double, b8 = 99.0.toFloat(): Float)
@@ -8,4 +8,4 @@ annotation class Ann(
Ann(1.toInt().plus(1), 1.minus(1.toInt()), 1.toInt().times(1.toInt())) class MyClass
// EXPECTED: Ann(p1 = 2.toInt(): Int, p2 = 0.toInt(): Int, p3 = 1.toInt(): Int)
// EXPECTED: Ann(p1 = 2: Int, p2 = 0: Int, p3 = 1: Int)
@@ -18,4 +18,4 @@ Ann(
p6 = java.lang.Long.MAX_VALUE + 1
) class MyClass
// EXPECTED: Ann(p1 = 128.toInt(): Int, p2 = 32768.toInt(): Int, p3 = -2147483648.toInt(): Int, p4 = -2147483648.toInt(): Int, p5 = 2147483648.toLong(): Long, p6 = -9223372036854775808.toLong(): Long)
// EXPECTED: Ann(p1 = 128: Int, p2 = 32768: Int, p3 = -2147483648: Int, p4 = -2147483648: Int, p5 = 2147483648.toLong(): Long, p6 = -9223372036854775808.toLong(): Long)
@@ -16,4 +16,4 @@ Ann(
p5 = 1.toByte() + 1.toByte()
) class MyClass
// EXPECTED: Ann(p1 = 128.toInt(): Int, p2 = IntegerValueType(2): IntegerValueType(2), p3 = 128.toInt(): Int, p4 = 2.toInt(): Int, p5 = 2.toInt(): Int)
// EXPECTED: Ann(p1 = 128: Int, p2 = IntegerValueType(2): IntegerValueType(2), p3 = 128: Int, p4 = 2: Int, p5 = 2: Int)
@@ -16,4 +16,4 @@ Ann(
p5 = 1.toInt() + 1.toInt()
) class MyClass
// EXPECTED: Ann(p1 = -2147483648.toInt(): Int, p2 = IntegerValueType(2): IntegerValueType(2), p3 = -2147483648.toInt(): Int, p4 = 2.toInt(): Int, p5 = 2.toInt(): Int)
// EXPECTED: Ann(p1 = -2147483648: Int, p2 = IntegerValueType(2): IntegerValueType(2), p3 = -2147483648: Int, p4 = 2: Int, p5 = 2: Int)
@@ -9,4 +9,4 @@ annotation class Ann(
Ann(1, 1.toInt(), 2147483648.toInt(), 2147483648) class MyClass
// EXPECTED: Ann(b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1.toInt(): Int, b3 = -2147483648.toInt(): Int, b4 = IntegerValueType(2147483648): IntegerValueType(2147483648))
// EXPECTED: Ann(b1 = IntegerValueType(1): IntegerValueType(1), b2 = 1: Int, b3 = -2147483648: Int, b4 = IntegerValueType(2147483648): IntegerValueType(2147483648))
@@ -40,7 +40,7 @@ public class IntValue extends IntegerValueConstant<Integer> {
@Override
public String toString() {
return value + ".toInt()";
return value.toString();
}
@Override