Properly process nested try and loop blocks

KT-3894: Loops and finally: finally block executed twice when break and return exists in try/finally block
KT-3874: Compilation error on try catch block contains break and continue
KT-3869: Loops and finally: outer finally block not run

 #KT-3869 Fixed
 #KT-3894 Fixed
 #KT-3874 Fixed
This commit is contained in:
Mikhael Bogdanov
2013-08-16 13:03:14 +04:00
parent d0f042ba93
commit 185b5013fe
7 changed files with 284 additions and 30 deletions
@@ -0,0 +1,39 @@
class MyString {
var s = ""
fun plus(x : String) : MyString {
s += x
return this
}
fun toString(): String {
return s
}
}
fun test1() : MyString {
var r = MyString()
try {
r + "Try1"
try {
r + "Try2"
if (true)
return r
} finally {
r + "Finally2"
if (true) {
return r
}
}
return r
} finally {
r + "Finally1"
}
}
fun box(): String {
return if (test1().toString() == "Try1Try2Finally2Finally1") "OK" else "fail: ${test1()}"
}
@@ -0,0 +1,35 @@
fun test1(): String {
var r = ""
for (i in 1..2) {
try {
r += "O"
continue
} finally {
r += "K"
break
}
}
return r
}
fun test2(): String {
var r = ""
for (i in 1..2) {
try {
r += "O"
break
} finally {
r += "K"
continue
}
}
return r
}
fun box(): String {
if (test1() != "OK") return "fail1: ${test1()}"
if (test2() != "OKOK") return "fail2: ${test2()}"
return "OK"
}
@@ -0,0 +1,36 @@
class MyString {
var s = ""
fun plus(x : String) : MyString {
s += x
return this
}
fun toString(): String {
return s
}
}
fun test1() : MyString {
var r = MyString()
while (true) {
try {
r + "Try"
if (true) {
r + "Break"
break
}
} finally {
return r + "Finally"
}
}
}
fun box(): String {
if (test1().toString() != "TryBreakFinally") return "fail1: ${test1().toString()}"
return "OK"
}
@@ -0,0 +1,69 @@
//KT-3869 Loops and finally: outer finally block not run
class MyString {
var s = ""
fun plus(x : String) : MyString {
s += x
return this
}
fun toString(): String {
return s
}
}
fun test1() : MyString {
var r = MyString()
try {
r + "Try"
while(r.toString() != "") {
return r + "Loop"
}
return r + "Fail"
} finally {
r + "Finally"
}
}
fun test2() : MyString {
var r = MyString()
try {
r + "Try"
do {
if (r.toString() != "") {
return r + "Loop"
}
} while (r.toString() != "")
return r + "Fail"
} finally {
r + "Finally"
}
}
fun test3() : MyString {
var r = MyString()
try {
r + "Try"
for(i in 1..2) {
r + "Loop"
return r
}
return r + "Fail"
} finally {
r + "Finally"
}
}
fun box(): String {
if (test1().toString() != "TryLoopFinally") return "fail1: ${test1()}"
if (test2().toString() != "TryLoopFinally") return "fail2: ${test2()}"
if (test3().toString() != "TryLoopFinally") return "fail3: ${test3()}"
return "OK"
}
@@ -0,0 +1,36 @@
//test for appropriate
class MyString {
var s = ""
fun plus(x : String) : MyString {
s += x
return this
}
fun toString(): String {
return s
}
}
fun test1() : MyString {
var r = MyString()
try {
r + "Try1"
for(i in 1..1) {
try {
r + "Try2"
} finally {
return r + "Finally2"
}
}
} finally {
r + "Finally1"
}
return r + "Fail"
}
fun box(): String {
return if (test1().toString() == "Try1Try2Finally2Finally1") "OK" else "fail: ${test1()}"
}