Removing usages of tuples from test data

(KT-2358 Drop tuples)
 #KT-2358 In progress
This commit is contained in:
Andrey Breslav
2012-09-18 13:48:20 +04:00
parent dee5152f9b
commit 5eaa5b396b
64 changed files with 172 additions and 330 deletions
@@ -3,13 +3,13 @@
package testData.libraries
[public final val <T : jet.Any?>#(T, T).exProp : jet.String] /* compiled code */
[public final val jet.Int.exProp : jet.Int] /* compiled code */
[public final val jet.String.exProp : jet.String] /* compiled code */
[public final val globalVal : #(jet.Int, jet.String)] /* compiled code */
[public final val <T : jet.Any?>testData.libraries.Pair<T, T>.exProp : jet.String] /* compiled code */
[public final val globalVal : testData.libraries.Pair<jet.Int, jet.String>] /* compiled code */
[public final val globalValWithGetter : jet.Long] /* compiled code */
+5 -3
View File
@@ -1,5 +1,7 @@
package testData.libraries
public class Pair<A, B>(val first: A, val second: B)
public trait SimpleTrait {
}
@@ -60,7 +62,7 @@ public abstract class ClassWithAbstractAndOpenMembers {
public fun main(args : Array<String>) {
}
public val globalVal : #(Int, String) = #(239, "239")
public val globalVal : Pair<Int, String> = Pair(239, "239")
public val globalValWithGetter : Long
get() {
@@ -77,9 +79,9 @@ get() {
return this
}
public val <T> #(T, T).exProp : String
public val <T> Pair<T, T>.exProp : String
get() {
return "${this._1} : ${this._2}"
return "${this.first} : ${this.second}"
}
public fun func(a : Int, b : String = "55") {
@@ -2,7 +2,8 @@ import testData.libraries.*
fun foo() {
println("".exProp)
println(#(1, 2).exProp)
val p = Pair(1, 2)
println(p.exProp)
}
// main.kt
@@ -16,4 +17,4 @@ fun foo() {
// return this
//}
//
//public val <T> #(T, T).<2>exProp : String
//public val <T> Pair<T, T>.<2>exProp : String
@@ -6,6 +6,6 @@ fun foo() {
}
// main.kt
//public val <1>globalVal : #(Int, String) = #(239, "239")
//public val <1>globalVal : Pair<Int, String> = Pair(239, "239")
//
//public val <2>globalValWithGetter : Long