Fix tests not to duplicate array constructor definitions as they are available now in builtins.

This commit is contained in:
Ilya Gorbunov
2015-12-11 18:18:23 +03:00
parent f509937037
commit 4dde59368c
22 changed files with 31 additions and 67 deletions
+7 -9
View File
@@ -1,6 +1,5 @@
== foo ==
fun foo() {
val a = Array<Int>
fun foo(a: Array<Int>) {
3
a[10] = 4
2
@@ -11,11 +10,10 @@ fun foo() {
---------------------
L0:
1 <START>
2 mark({ val a = Array<Int> 3 a[10] = 4 2 a[10] 100 a[10] += 1 })
v(val a = Array<Int>)
mark(Array<Int>)
call(Array<Int>, <init>) -> <v0>
v(a: Array<Int>)
magic[FAKE_INITIALIZER](a: Array<Int>) -> <v0>
w(a|<v0>)
2 mark({ 3 a[10] = 4 2 a[10] 100 a[10] += 1 })
r(3) -> <v1>
mark(a[10])
r(a) -> <v2>
@@ -41,9 +39,9 @@ L0:
r(10) -> <v17>
call(a[10] += 1, set|<v16>, <v17>, <v15>) -> <v18>
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
+1 -2
View File
@@ -1,5 +1,4 @@
fun foo() {
val a = Array<Int>
fun foo(a: Array<Int>) {
3
a[10] = 4
2
+18 -19
View File
@@ -1,6 +1,5 @@
== foo ==
fun foo() {
val a = Array<Int>
fun foo(a: Array<Int>) {
3
a[10] = 4
2
@@ -9,21 +8,21 @@ fun foo() {
a[10] += 1
}
---------------------
Array<Int> <v0>: {<: Array<Int>} NEW: call(Array<Int>, <init>) -> <v0>
3 <v1>: * NEW: r(3) -> <v1>
a <v2>: {<: Array<Int>} NEW: r(a) -> <v2>
10 <v3>: Int NEW: r(10) -> <v3>
4 <v4>: Int NEW: r(4) -> <v4>
a[10] = 4 <v5>: * NEW: call(a[10] = 4, set|<v2>, <v3>, <v4>) -> <v5>
2 <v6>: * NEW: r(2) -> <v6>
a <v7>: {<: Array<Int>} NEW: r(a) -> <v7>
10 <v8>: Int NEW: r(10) -> <v8>
a[10] <v9>: * NEW: call(a[10], get|<v7>, <v8>) -> <v9>
100 <v10>: * NEW: r(100) -> <v10>
a <v16>: {<: Array<Int>} NEW: r(a) -> <v16>
10 <v17>: Int NEW: r(10) -> <v17>
a[10] <v13>: Int NEW: call(a[10], get|<v11>, <v12>) -> <v13>
1 <v14>: Int NEW: r(1) -> <v14>
a[10] += 1 <v18>: * NEW: call(a[10] += 1, set|<v16>, <v17>, <v15>) -> <v18>
{ val a = Array<Int> 3 a[10] = 4 2 a[10] 100 a[10] += 1 } <v18>: * COPY
<v0>: {<: Array<Int>} NEW: magic[FAKE_INITIALIZER](a: Array<Int>) -> <v0>
3 <v1>: * NEW: r(3) -> <v1>
a <v2>: {<: Array<Int>} NEW: r(a) -> <v2>
10 <v3>: Int NEW: r(10) -> <v3>
4 <v4>: Int NEW: r(4) -> <v4>
a[10] = 4 <v5>: * NEW: call(a[10] = 4, set|<v2>, <v3>, <v4>) -> <v5>
2 <v6>: * NEW: r(2) -> <v6>
a <v7>: {<: Array<Int>} NEW: r(a) -> <v7>
10 <v8>: Int NEW: r(10) -> <v8>
a[10] <v9>: * NEW: call(a[10], get|<v7>, <v8>) -> <v9>
100 <v10>: * NEW: r(100) -> <v10>
a <v16>: {<: Array<Int>} NEW: r(a) -> <v16>
10 <v17>: Int NEW: r(10) -> <v17>
a[10] <v13>: Int NEW: call(a[10], get|<v11>, <v12>) -> <v13>
1 <v14>: Int NEW: r(1) -> <v14>
a[10] += 1 <v18>: * NEW: call(a[10] += 1, set|<v16>, <v17>, <v15>) -> <v18>
{ 3 a[10] = 4 2 a[10] 100 a[10] += 1 } <v18>: * COPY
=====================
@@ -1,6 +1,3 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
public inline fun <reified T> Array(n: Int, block: (Int) -> T): Array<T> = null!!
fun bar(x: Int): Int = x + 1
fun foo() {
@@ -1,5 +1,4 @@
package
public inline fun </*0*/ reified T> Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array<T>
public fun bar(/*0*/ x: kotlin.Int): kotlin.Int
public fun foo(): kotlin.Unit
@@ -1,6 +1,3 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
public inline fun <reified T> Array(n: Int, block: (Int) -> T): Array<T> = null!!
fun bar(x: Int): Int = x + 1
fun foo() {
@@ -1,5 +1,4 @@
package
public inline fun </*0*/ reified T> Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array<T>
public fun bar(/*0*/ x: kotlin.Int): kotlin.Int
public fun foo(): kotlin.Unit
@@ -1,8 +1,5 @@
// !CHECK_TYPE
@Suppress("UNCHECKED_CAST")
fun <T> arrayOf(vararg t : T) : Array<T> = t as Array<T>
fun test() {
val array = arrayOf(arrayOf(1))
array checkType { _<Array<Array<Int>>>() }
@@ -1,4 +1,3 @@
package
@kotlin.Suppress(names = {"UNCHECKED_CAST"}) public fun </*0*/ T> arrayOf(/*0*/ vararg t: T /*kotlin.Array<out T>*/): kotlin.Array<T>
public fun test(): kotlin.Unit
-3
View File
@@ -1,6 +1,3 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
public inline fun <reified T> Array(n: Int, block: (Int) -> T): Array<T> = null!!
//KT-1703 Reference to label is unresolved
fun test() {
-1
View File
@@ -1,6 +1,5 @@
package
public inline fun </*0*/ reified T> Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array<T>
public fun test(): kotlin.Unit
public fun use(/*0*/ a: kotlin.Any?): kotlin.Any?
public fun </*0*/ T> kotlin.Array<out T>.forEach(/*0*/ operation: (T) -> kotlin.Unit): kotlin.Unit
@@ -10,7 +10,3 @@ enum class MyEnum { A }
<!TYPE_CANT_BE_USED_FOR_CONST_VAL!>const<!> val enumConst: MyEnum = MyEnum.A
<!TYPE_CANT_BE_USED_FOR_CONST_VAL!>const<!> val arrayConst: Array<String> = arrayOf("1")
<!TYPE_CANT_BE_USED_FOR_CONST_VAL!>const<!> val intArrayConst: IntArray = intArrayOf()
// ------------------------------------------------
fun <T> arrayOf(vararg x: T): Array<T> = null!!
fun intArrayOf(): IntArray = null!!
@@ -7,8 +7,6 @@ public const val intArrayConst: kotlin.IntArray
public const val intConst: kotlin.Int = 1
public const val longConst: kotlin.Long = 1.toLong()
public const val stringConst: kotlin.String = "empty"
public fun </*0*/ T> arrayOf(/*0*/ vararg x: T /*kotlin.Array<out T>*/): kotlin.Array<T>
public fun intArrayOf(): kotlin.IntArray
public final enum class MyEnum : kotlin.Enum<MyEnum> {
enum entry A
@@ -1,6 +1,3 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
public inline fun <reified T> Array(n: Int, block: (Int) -> T): Array<T> = null!!
// KT-312 Nullability problem when a nullable version of a generic type is returned
fun <T> Array<out T>.safeGet(index : Int) : T? {
@@ -3,5 +3,4 @@ package
public val args: kotlin.Array<kotlin.String>
public val name: kotlin.String
public val name1: kotlin.String?
public inline fun </*0*/ reified T> Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array<T>
public fun </*0*/ T> kotlin.Array<out T>.safeGet(/*0*/ index: kotlin.Int): T?
@@ -1,6 +1,3 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
public inline fun <reified T> Array(n: Int, block: (Int) -> T): Array<T> = null!!
class A {
operator fun component1() = 42
operator fun component2() = 42
@@ -1,6 +1,5 @@
package
public inline fun </*0*/ reified T> Array(/*0*/ n: kotlin.Int, /*1*/ block: (kotlin.Int) -> T): kotlin.Array<T>
public fun foo(/*0*/ a: A, /*1*/ c: kotlin.Int): kotlin.Unit
public final class A {
@@ -1,6 +1,6 @@
fun test(fals: Int) {
val falt = 111
fa<caret>
fal<caret>
}
// ORDER: fals, falt, false
@@ -1,5 +1,6 @@
fun bar(fop: Int) {
fo<caret>
fun bar(breach: Int) {
while (true)
bre<caret>
}
// ORDER: fop, for
// ORDER: breach, break
@@ -1,4 +1,3 @@
// ERROR: Unresolved reference: emptyArray
//KT-1602
import lib.ArrayFactory
@@ -1,4 +1,3 @@
public inline fun <reified T> Array(n: Int, block: (Int) -> T): Array<T> = null!!
fun foo(i: Int) {
Array(1, { 42 })[(i + i<caret>)]
}
@@ -1,4 +1,3 @@
public inline fun <reified T> Array(n: Int, block: (Int) -> T): Array<T> = null!!
fun foo(i: Int) {
Array(1, { 42 })[i + i]
}