Flatten if chains also in LT FIR

This commit is contained in:
Mikhail Glukhikh
2022-02-14 09:56:27 +03:00
committed by teamcity
parent bb766a5235
commit 2ac2fa5353
16 changed files with 272 additions and 69 deletions
@@ -16,9 +16,9 @@
fun case1() {
val b = true
val c = true
val a = if (b) {
val a = <!INVALID_IF_AS_EXPRESSION!>if<!> (b) {
"first true"
} else <!INVALID_IF_AS_EXPRESSION!>if<!> (c) {
} else if (c) {
"else if true"
}
}
@@ -28,5 +28,5 @@ fun case1() {
fun case2() {
var b = true
val c = true
val a = if (b) 1 else if (c) 2 else ;
val a = <!INVALID_IF_AS_EXPRESSION!>if<!> (b) 1 else if (c) 2 else ;
}
@@ -37,7 +37,7 @@ fun case4() {
val x2 = <!INVALID_IF_AS_EXPRESSION!>if<!> (TODO()) true
val x0 = if (false) true else <!INVALID_IF_AS_EXPRESSION!>if<!> (throw Exception()) ;
val x0 = <!INVALID_IF_AS_EXPRESSION!>if<!> (false) true else if (throw Exception()) ;
}
@@ -5,7 +5,7 @@
// TESTCASE NUMBER: 1
fun case1() {
val y0else = if (false) true else ;
val y0else = <!INVALID_IF_AS_EXPRESSION!>if<!> (false) true else ;
}
/*
@@ -14,7 +14,7 @@ fun case1() {
* ISSUES: KT-35510
*/
fun case2(nothing: Nothing) {
val n1else = if (nothing) true else;
val n1else = <!INVALID_IF_AS_EXPRESSION!>if<!> (nothing) true else;
}
/*
@@ -35,5 +35,5 @@ fun case4(nothing: Nothing) {
// TESTCASE NUMBER: 5
fun case5(nothing: Nothing) {
val x = if (false) else if (nothing) { "foo"} else ;
val x = <!INVALID_IF_AS_EXPRESSION!>if<!> (false) else if (nothing) { "foo"} else ;
}
@@ -1,32 +0,0 @@
// !LANGUAGE: +NewInference
// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
// SKIP_TXT
/*
* KOTLIN DIAGNOSTICS SPEC TEST (NEGATIVE)
*
* SPEC VERSION: 0.1-296
* MAIN LINK: control--and-data-flow-analysis, control-flow-graph, expressions-1, conditional-expressions -> paragraph 1 -> sentence 2
* NUMBER: 1
* DESCRIPTION: check any if-statement in kotlin may be trivially turned into such an expression by replacing the missing branch with a kotlin.Unit object expression.
* HELPERS: checkType
*/
// TESTCASE NUMBER: 1
fun case1() {
val b = true
if (!b) {
println("this is statement")
}
val statement = <!INVALID_IF_AS_EXPRESSION!>if<!> (!b) { println("statement could not be assigned") }
}
// TESTCASE NUMBER: 2
fun case2() {
val a = 1
val b = 2
if (a > b) a else ; //statement
val expression: Any = if (a > b) a else ;
}
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +NewInference
// !DIAGNOSTICS: -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -UNUSED_VALUE -UNUSED_PARAMETER -UNUSED_EXPRESSION
// SKIP_TXT