Front-end test data fixed to have no complex patterns

#KT-2359 In Progress
This commit is contained in:
Andrey Breslav
2012-09-05 13:03:14 +04:00
parent 1b65ba644e
commit a267f65fa1
8 changed files with 55 additions and 144 deletions
@@ -9,11 +9,8 @@ fun foo() =
<!TYPE_MISMATCH_IN_CONDITION!>#(1, 2)<!> -> 3
<!EXPECTED_CONDITION!>in 1..10<!> -> 34
<!TYPE_MISMATCH_IN_CONDITION!>4<!> -> 38
<!EXPECTED_CONDITION!>is val a in 1..10<!> -> 23
<!EXPECTED_CONDITION!>is Int<!> -> 33
<!EXPECTED_CONDITION!>is <!TYPE_MISMATCH_IN_TUPLE_PATTERN!>#(val a, 3)<!><!> -> 2
<!EXPECTED_CONDITION!>!is <!TYPE_MISMATCH_IN_TUPLE_PATTERN!>#(*, 1100)<!><!> -> 3
<!EXPECTED_CONDITION!>is *<!> -> 34
else -> 34
}
fun cond1() = false
@@ -34,7 +34,7 @@ fun box() : Int {
val d = 2
var z = 0
when(d) {
is 5, is 3 -> z++
5, 3 -> z++
else -> z = -1000
}
return z
@@ -59,13 +59,13 @@ fun testCoercionToUnit() {
val i = 34
val <!UNUSED_VARIABLE!>withWhen<!> : () -> Unit = {
when(i) {
is 1 -> {
1 -> {
val d = 34
<!UNUSED_EXPRESSION!>"1"<!>
doSmth(d)
}
is 2 -> '4'
2 -> '4'
else -> true
}
}
@@ -87,13 +87,13 @@ fun testImplicitCoercion() {
val d = 21
var z = 0
var <!UNUSED_VARIABLE!>i<!> = <!IMPLICIT_CAST_TO_UNIT_OR_ANY!>when(d) {
is 3 -> null
is 4 -> { val <!NAME_SHADOWING, UNUSED_VARIABLE!>z<!> = 23 }
3 -> null
4 -> { val <!NAME_SHADOWING, UNUSED_VARIABLE!>z<!> = 23 }
else -> z = 20
}<!>
var <!UNUSED_VARIABLE!>u<!> = <!IMPLICIT_CAST_TO_UNIT_OR_ANY!>when(d) {
is 3 -> {
3 -> {
z = <!UNUSED_VALUE!>34<!>
}
else -> <!UNUSED_CHANGED_VALUE!>z--<!>
@@ -5,7 +5,7 @@ fun foo() : Int {
val d = 2
var z = 0
when(d) {
is 5, is 3 -> <!UNUSED_CHANGED_VALUE!>z++<!>
5, 3 -> <!UNUSED_CHANGED_VALUE!>z++<!>
<!ELSE_MISPLACED_IN_WHEN!>else<!> -> { z = <!UNUSED_VALUE!>-1000<!> }
<!UNREACHABLE_CODE!>return z -> 34<!>
}
@@ -15,7 +15,7 @@ fun foo() : Int {
fun fff(): Int {
var d = 3
<!NO_ELSE_IN_WHEN!>when<!>(d) {
is 4 -> 21
4 -> 21
return 2 -> <!UNREACHABLE_CODE!>return 47<!>
<!UNREACHABLE_CODE!>bar() -> 45<!>
<!UNREACHABLE_CODE!>444 -> true<!>
@@ -6,14 +6,14 @@ package kt234_kt973
fun test(t : #(Int, Int)) : Int {
<!NO_ELSE_IN_WHEN!>when<!> (t) {
is #(10, 10) -> return 1
#(10, 10) -> return 1
}
return 0 // unreachable code
}
fun test1(t : #(Int, Int)) : Int {
when (t) {
is #(10, 10) -> return 1
#(10, 10) -> return 1
else -> return 2
}
<!UNREACHABLE_CODE!>return 0<!> // unreachable code
@@ -21,25 +21,11 @@ fun test1(t : #(Int, Int)) : Int {
//more tests
fun t1(x: Int) = when(x) {
is * -> 1
}
fun t2(x: Int) = when(x) {
is val a -> 1
}
fun t3(x: Int) = when (x) {
is * -> 1
<!UNREACHABLE_CODE!>2 -> 2<!>
}
fun t4(x: Int) = when (x) {
is val a -> 1
<!UNREACHABLE_CODE!>2 -> 2<!>
else -> 1
}
fun t5(x: Int) = <!NO_ELSE_IN_WHEN!>when<!> (x) {
is val a : Int -> 1
is Int -> 1
2 -> 2
}
@@ -50,5 +36,5 @@ fun foo3(x: Int) = when(x) {
fun foo4(x: Int) = when(x) {
2 -> x
is val a -> a
else -> 3
}