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

Remove toInt() from rendering IntValue

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/evaluate/constant/classObjectProperty.kt
+10 -10
View File
@@ -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
}
}
compiler/testData/evaluate/constant/compareTo.kt
+1 -1
View File
@@ -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
compiler/testData/evaluate/constant/finalProperty.kt
+12 -12
View File
@@ -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
}
compiler/testData/evaluate/constant/localVal.kt
+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
}
compiler/testData/evaluate/constant/topLevelVal.kt
+10 -10
View File
@@ -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
}
compiler/testData/evaluate/constant/unaryMinusIndepWoExpType.kt
+4 -4
View File
@@ -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()
compiler/testData/evaluate/constant/unaryMinusIndependentExpType.kt
+13 -13
View File
@@ -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()