azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pseudocode: Implement computation of expected type predicates

Browse Source
This commit is contained in:
Alexey Sedunov
2014-06-23 14:02:22 +04:00
parent 50228fa085
commit 5e2c2b4eca
87 changed files with 1154 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/controlStructures/Finally.values
+123 -123
View File
@@ -7,12 +7,12 @@ fun t1() {
}
}
---------------------
1 <v0> NEW()
{ 1 } <v0> COPY
2 <v1> NEW()
{ 2 } <v1> COPY
try { 1 } finally { 2 } <v0> COPY
{ try { 1 } finally { 2 } } <v0> COPY
1 <v0>: * NEW()
{ 1 } <v0>: * COPY
2 <v1>: * NEW()
{ 2 } <v1>: * COPY
try { 1 } finally { 2 } <v0>: * COPY
{ try { 1 } finally { 2 } } <v0>: * COPY
=====================
== t2 ==
fun t2() {
@@ -26,12 +26,12 @@ fun t2() {
}
}
---------------------
1 <v0> NEW()
2 <v1> NEW()
3 <v2> NEW()
2 > 3 <v3> NEW(<v1>, <v2>)
2 <v4> NEW()
{ 2 } <v4> COPY
1 <v0>: * NEW()
2 <v1>: {<: Comparable<Int>} NEW()
3 <v2>: Int NEW()
2 > 3 <v3>: Boolean NEW(<v1>, <v2>)
2 <v4>: * NEW()
{ 2 } <v4>: * COPY
=====================
== t3 ==
fun t3() {
@@ -47,14 +47,14 @@ fun t3() {
}
}
---------------------
1 <v0> NEW()
{ () -> if (2 > 3) { return@l } } <v1> NEW()
@l{ () -> if (2 > 3) { return@l } } <v1> COPY
{ 1 @l{ () -> if (2 > 3) { return@l } } } <v1> COPY
2 <v2> NEW()
{ 2 } <v2> COPY
try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1> COPY
{ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } } <v1> COPY
1 <v0>: * NEW()
{ () -> if (2 > 3) { return@l } } <v1>: * NEW()
@l{ () -> if (2 > 3) { return@l } } <v1>: * COPY
{ 1 @l{ () -> if (2 > 3) { return@l } } } <v1>: * COPY
2 <v2>: * NEW()
{ 2 } <v2>: * COPY
try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1>: * COPY
{ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } } <v1>: * COPY
=====================
== anonymous_0 ==
{ () ->
@@ -63,9 +63,9 @@ try { 1 @l{ () -> if (2 > 3) { return@l } } } finally { 2 } <v1> COPY
}
}
---------------------
2 <v0> NEW()
3 <v1> NEW()
2 > 3 <v2> NEW(<v0>, <v1>)
2 <v0>: {<: Comparable<Int>} NEW()
3 <v1>: Int NEW()
2 > 3 <v2>: Boolean NEW(<v0>, <v1>)
=====================
== t4 ==
fun t4() {
@@ -81,9 +81,9 @@ fun t4() {
}
}
---------------------
{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0> NEW()
@l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0> COPY
{ @l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } } <v0> COPY
{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * NEW()
@l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } <v0>: * COPY
{ @l{ () -> try { 1 if (2 > 3) { return@l } } finally { 2 } } } <v0>: * COPY
=====================
== anonymous_1 ==
{ () ->
@@ -97,12 +97,12 @@ fun t4() {
}
}
---------------------
1 <v0> NEW()
2 <v1> NEW()
3 <v2> NEW()
2 > 3 <v3> NEW(<v1>, <v2>)
2 <v4> NEW()
{ 2 } <v4> COPY
1 <v0>: * NEW()
2 <v1>: {<: Comparable<Int>} NEW()
3 <v2>: Int NEW()
2 > 3 <v3>: Boolean NEW(<v1>, <v2>)
2 <v4>: * NEW()
{ 2 } <v4>: * COPY
=====================
== t5 ==
fun t5() {
@@ -118,13 +118,13 @@ fun t5() {
}
}
---------------------
true <v0> NEW()
1 <v1> NEW()
2 <v2> NEW()
3 <v3> NEW()
2 > 3 <v4> NEW(<v2>, <v3>)
2 <v5> NEW()
{ 2 } <v5> COPY
true <v0>: * NEW()
1 <v1>: * NEW()
2 <v2>: {<: Comparable<Int>} NEW()
3 <v3>: Int NEW()
2 > 3 <v4>: Boolean NEW(<v2>, <v3>)
2 <v5>: * NEW()
{ 2 } <v5>: * COPY
=====================
== t6 ==
fun t6() {
@@ -141,17 +141,17 @@ fun t6() {
}
}
---------------------
true <v0> NEW()
1 <v1> NEW()
2 <v2> NEW()
3 <v3> NEW()
2 > 3 <v4> NEW(<v2>, <v3>)
5 <v5> NEW()
{ @l while(true) { 1 if (2 > 3) { break @l } } 5 } <v5> COPY
2 <v6> NEW()
{ 2 } <v6> COPY
try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } <v5> COPY
{ try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } } <v5> COPY
true <v0>: * NEW()
1 <v1>: * NEW()
2 <v2>: {<: Comparable<Int>} NEW()
3 <v3>: Int NEW()
2 > 3 <v4>: Boolean NEW(<v2>, <v3>)
5 <v5>: * NEW()
{ @l while(true) { 1 if (2 > 3) { break @l } } 5 } <v5>: * COPY
2 <v6>: * NEW()
{ 2 } <v6>: * COPY
try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } <v5>: * COPY
{ try { @l while(true) { 1 if (2 > 3) { break @l } } 5 } finally { 2 } } <v5>: * COPY
=====================
== t7 ==
fun t7() {
@@ -167,13 +167,13 @@ fun t7() {
}
}
---------------------
true <v0> NEW()
1 <v1> NEW()
2 <v2> NEW()
3 <v3> NEW()
2 > 3 <v4> NEW(<v2>, <v3>)
2 <v5> NEW()
{ 2 } <v5> COPY
true <v0>: * NEW()
1 <v1>: * NEW()
2 <v2>: {<: Comparable<Int>} NEW()
3 <v3>: Int NEW()
2 > 3 <v4>: Boolean NEW(<v2>, <v3>)
2 <v5>: * NEW()
{ 2 } <v5>: * COPY
=====================
== t8 ==
fun t8(a : Int) {
@@ -189,15 +189,15 @@ fun t8(a : Int) {
}
}
---------------------
1 <v1> NEW()
a <v2> NEW()
1..a <v3> NEW(<v1>, <v2>)
1 <v5> NEW()
2 <v6> NEW()
3 <v7> NEW()
2 > 3 <v8> NEW(<v6>, <v7>)
2 <v9> NEW()
{ 2 } <v9> COPY
1 <v1>: Int NEW()
a <v2>: Int NEW()
1..a <v3>: {<: Iterable<Int>} NEW(<v1>, <v2>)
1 <v5>: * NEW()
2 <v6>: {<: Comparable<Int>} NEW()
3 <v7>: Int NEW()
2 > 3 <v8>: Boolean NEW(<v6>, <v7>)
2 <v9>: * NEW()
{ 2 } <v9>: * COPY
=====================
== t9 ==
fun t9(a : Int) {
@@ -214,19 +214,19 @@ fun t9(a : Int) {
}
}
---------------------
1 <v1> NEW()
a <v2> NEW()
1..a <v3> NEW(<v1>, <v2>)
1 <v5> NEW()
2 <v6> NEW()
3 <v7> NEW()
2 > 3 <v8> NEW(<v6>, <v7>)
5 <v9> NEW()
{ @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } <v9> COPY
2 <v10> NEW()
{ 2 } <v10> COPY
try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } <v9> COPY
{ try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } } <v9> COPY
1 <v1>: Int NEW()
a <v2>: Int NEW()
1..a <v3>: {<: Iterable<Int>} NEW(<v1>, <v2>)
1 <v5>: * NEW()
2 <v6>: {<: Comparable<Int>} NEW()
3 <v7>: Int NEW()
2 > 3 <v8>: Boolean NEW(<v6>, <v7>)
5 <v9>: * NEW()
{ @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } <v9>: * COPY
2 <v10>: * NEW()
{ 2 } <v10>: * COPY
try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } <v9>: * COPY
{ try { @l for (i in 1..a) { 1 if (2 > 3) { continue @l } } 5 } finally { 2 } } <v9>: * COPY
=====================
== t10 ==
fun t10(a : Int) {
@@ -242,15 +242,15 @@ fun t10(a : Int) {
}
}
---------------------
1 <v1> NEW()
a <v2> NEW()
1..a <v3> NEW(<v1>, <v2>)
1 <v5> NEW()
2 <v6> NEW()
3 <v7> NEW()
2 > 3 <v8> NEW(<v6>, <v7>)
2 <v9> NEW()
{ 2 } <v9> COPY
1 <v1>: Int NEW()
a <v2>: Int NEW()
1..a <v3>: {<: Iterable<Int>} NEW(<v1>, <v2>)
1 <v5>: * NEW()
2 <v6>: {<: Comparable<Int>} NEW()
3 <v7>: Int NEW()
2 > 3 <v8>: Boolean NEW(<v6>, <v7>)
2 <v9>: * NEW()
{ 2 } <v9>: * COPY
=====================
== t11 ==
fun t11() {
@@ -262,8 +262,8 @@ fun t11() {
}
}
---------------------
1 <v0> NEW()
2 <v1> NEW()
1 <v0>: * NEW()
2 <v1>: Unit NEW()
=====================
== t12 ==
fun t12() : Int {
@@ -275,10 +275,10 @@ fun t12() : Int {
}
}
---------------------
1 <v0> NEW()
3 <v1> NEW()
doSmth(3) <v2> NEW(<v1>)
{ doSmth(3) } <v2> COPY
1 <v0>: Int NEW()
3 <v1>: Int NEW()
doSmth(3) <v2>: * NEW(<v1>)
{ doSmth(3) } <v2>: * COPY
=====================
== t13 ==
fun t13() : Int {
@@ -293,15 +293,15 @@ fun t13() : Int {
}
}
---------------------
1 <v0> NEW()
2 <v4> NEW()
doSmth(2) <v5> NEW(<v4>)
{ doSmth(2) } <v5> COPY
3 <v1> NEW()
doSmth(3) <v2> NEW(<v1>)
{ doSmth(3) } <v2> COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } <v5> COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } } <v5> COPY
1 <v0>: Int NEW()
2 <v4>: Int NEW()
doSmth(2) <v5>: * NEW(<v4>)
{ doSmth(2) } <v5>: * COPY
3 <v1>: Int NEW()
doSmth(3) <v2>: * NEW(<v1>)
{ doSmth(3) } <v2>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } <v5>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } finally { doSmth(3) } } <v5>: * COPY
=====================
== t14 ==
fun t14() : Int {
@@ -313,12 +313,12 @@ fun t14() : Int {
}
}
---------------------
1 <v0> NEW()
2 <v2> NEW()
doSmth(2) <v3> NEW(<v2>)
{ doSmth(2) } <v3> COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } <v3> COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } } <v3> COPY
1 <v0>: Int NEW()
2 <v2>: Int NEW()
doSmth(2) <v3>: * NEW(<v2>)
{ doSmth(2) } <v3>: * COPY
try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } <v3>: * COPY
{ try { return 1 } catch (e: UnsupportedOperationException) { doSmth(2) } } <v3>: * COPY
=====================
== t15 ==
fun t15() : Int {
@@ -333,11 +333,11 @@ fun t15() : Int {
}
}
---------------------
1 <v0> NEW()
2 <v4> NEW()
3 <v1> NEW()
doSmth(3) <v2> NEW(<v1>)
{ doSmth(3) } <v2> COPY
1 <v0>: Int NEW()
2 <v4>: Int NEW()
3 <v1>: Int NEW()
doSmth(3) <v2>: * NEW(<v1>)
{ doSmth(3) } <v2>: * COPY
=====================
== t16 ==
fun t16() : Int {
@@ -352,15 +352,15 @@ fun t16() : Int {
}
}
---------------------
1 <v0> NEW()
doSmth(1) <v1> NEW(<v0>)
{ doSmth(1) } <v1> COPY
2 <v3> NEW()
3 <v4> NEW()
doSmth(3) <v5> NEW(<v4>)
{ doSmth(3) } <v5> COPY
try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } <v1> COPY
{ try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } } <v1> COPY
1 <v0>: Int NEW()
doSmth(1) <v1>: * NEW(<v0>)
{ doSmth(1) } <v1>: * COPY
2 <v3>: Int NEW()
3 <v4>: Int NEW()
doSmth(3) <v5>: * NEW(<v4>)
{ doSmth(3) } <v5>: * COPY
try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } <v1>: * COPY
{ try { doSmth(1) } catch (e: UnsupportedOperationException) { return 2 } finally { doSmth(3) } } <v1>: * COPY
=====================
== doSmth ==
fun doSmth(i: Int) {
compiler/testData/cfg/controlStructures/FinallyTestCopy.values
+35 -35
View File
@@ -30,15 +30,15 @@ fun testCopy1() : Int {
}
}
---------------------
doSmth() <v0> NEW()
{ doSmth() } <v0> COPY
doSmth1() <v2> NEW()
{ doSmth1() } <v2> COPY
doSmth2() <v4> NEW()
{ doSmth2() } <v4> COPY
1 <v5> NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } <v6> NEW(<v0>, <v2>, <v4>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } } <v6> COPY
doSmth() <v0>: * NEW()
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW()
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW()
{ doSmth2() } <v4>: * COPY
1 <v5>: Int NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } <v6>: * NEW(<v0>, <v2>, <v4>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { return 1 } } <v6>: * COPY
=====================
== testCopy2 ==
fun testCopy2() {
@@ -59,16 +59,16 @@ fun testCopy2() {
}
}
---------------------
cond() <v0> NEW()
doSmth() <v1> NEW()
{ doSmth() } <v1> COPY
doSmth1() <v3> NEW()
{ doSmth1() } <v3> COPY
doSmth2() <v5> NEW()
{ doSmth2() } <v5> COPY
cond() <v6> NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } <v7> NEW(<v1>, <v3>, <v5>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } } <v7> COPY
cond() <v0>: Boolean NEW()
doSmth() <v1>: * NEW()
{ doSmth() } <v1>: * COPY
doSmth1() <v3>: * NEW()
{ doSmth1() } <v3>: * COPY
doSmth2() <v5>: * NEW()
{ doSmth2() } <v5>: * COPY
cond() <v6>: Boolean NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } <v7>: * NEW(<v1>, <v3>, <v5>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { if (cond()) return else continue } } <v7>: * COPY
=====================
== testCopy3 ==
fun testCopy3() {
@@ -86,15 +86,15 @@ fun testCopy3() {
}
}
---------------------
doSmth() <v0> NEW()
{ doSmth() } <v0> COPY
doSmth1() <v2> NEW()
{ doSmth1() } <v2> COPY
doSmth2() <v4> NEW()
{ doSmth2() } <v4> COPY
cond() <v5> NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } <v6> NEW(<v0>, <v2>, <v4>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } } <v6> COPY
doSmth() <v0>: * NEW()
{ doSmth() } <v0>: * COPY
doSmth1() <v2>: * NEW()
{ doSmth1() } <v2>: * COPY
doSmth2() <v4>: * NEW()
{ doSmth2() } <v4>: * COPY
cond() <v5>: Boolean NEW()
try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } <v6>: * NEW(<v0>, <v2>, <v4>)
{ try { doSmth() } catch (e: NullPointerException) { doSmth1() } catch (e: Exception) { doSmth2() } finally { while (cond()); } } <v6>: * COPY
=====================
== doTestCopy4 ==
fun doTestCopy4(list: List<String>?) : Int {
@@ -107,11 +107,11 @@ fun doTestCopy4(list: List<String>?) : Int {
}
}
---------------------
doSmth() <v1> NEW()
{ doSmth() } <v1> COPY
list <v2> NEW()
null <v3> NEW()
list != null <v4> NEW(<v2>, <v3>)
try { doSmth() } finally { if(list != null) { } } <v1> COPY
{ try { doSmth() } finally { if(list != null) { } } } <v1> COPY
doSmth() <v1>: * NEW()
{ doSmth() } <v1>: * COPY
list <v2>: {<: Any?} NEW()
null <v3>: {<: Any?} NEW()
list != null <v4>: Boolean NEW(<v2>, <v3>)
try { doSmth() } finally { if(list != null) { } } <v1>: * COPY
{ try { doSmth() } finally { if(list != null) { } } } <v1>: * COPY
=====================
compiler/testData/cfg/controlStructures/For.values
+6 -6
View File
@@ -5,12 +5,12 @@ fun t1() {
}
}
---------------------
1 <v0> NEW()
2 <v1> NEW()
1..2 <v2> NEW(<v0>, <v1>)
i <v4> NEW()
doSmth(i) <v5> NEW(<v4>)
{ doSmth(i) } <v5> COPY
1 <v0>: Int NEW()
2 <v1>: Int NEW()
1..2 <v2>: {<: Iterable<Int>} NEW(<v0>, <v1>)
i <v4>: Int NEW()
doSmth(i) <v5>: * NEW(<v4>)
{ doSmth(i) } <v5>: * COPY
=====================
== doSmth ==
fun doSmth(i: Int) {}
compiler/testData/cfg/controlStructures/If.values
+16 -16
View File
@@ -16,16 +16,16 @@ fun t1(b: Boolean) {
doSmth(r)
}
---------------------
b <v1> NEW()
"s" <v2> NEW()
u <v3> NEW()
doSmth(u) <v4> NEW(<v3>)
b <v5> NEW()
"s" <v6> NEW()
"t" <v7> NEW()
r <v8> NEW()
doSmth(r) <v9> NEW(<v8>)
{ var u: String if (b) { u = "s" } doSmth(u) var r: String if (b) { r = "s" } else { r = "t" } doSmth(r) } <v9> COPY
b <v1>: Boolean NEW()
"s" <v2>: String NEW()
u <v3>: String NEW()
doSmth(u) <v4>: * NEW(<v3>)
b <v5>: Boolean NEW()
"s" <v6>: String NEW()
"t" <v7>: String NEW()
r <v8>: String NEW()
doSmth(r) <v9>: * NEW(<v8>)
{ var u: String if (b) { u = "s" } doSmth(u) var r: String if (b) { r = "s" } else { r = "t" } doSmth(r) } <v9>: * COPY
=====================
== t2 ==
fun t2(b: Boolean) {
@@ -39,12 +39,12 @@ fun t2(b: Boolean) {
}
}
---------------------
3 <v1> NEW()
b <v2> NEW()
i <v3> NEW()
doSmth(i) <v4> NEW(<v3>)
i <v5> NEW()
i is Int <v6> NEW(<v5>)
3 <v1>: Int NEW()
b <v2>: Boolean NEW()
i <v3>: String NEW()
doSmth(i) <v4>: * NEW(<v3>)
i <v5>: * NEW()
i is Int <v6>: Boolean NEW(<v5>)
=====================
== doSmth ==
fun doSmth(s: String) {}
compiler/testData/cfg/controlStructures/OnlyWhileInFunctionBody.values
+8 -8
View File
@@ -5,11 +5,11 @@ fun main() {
}
}
---------------------
0 <v0> NEW()
1 <v1> NEW()
0 > 1 <v2> NEW(<v0>, <v1>)
2 <v3> NEW()
{ 2 } <v3> COPY
0 <v0>: {<: Comparable<Int>} NEW()
1 <v1>: Int NEW()
0 > 1 <v2>: Boolean NEW(<v0>, <v1>)
2 <v3>: * NEW()
{ 2 } <v3>: * COPY
=====================
== dowhile ==
fun dowhile() {
@@ -17,7 +17,7 @@ fun dowhile() {
while(0 > 1)
}
---------------------
0 <v0> NEW()
1 <v1> NEW()
0 > 1 <v2> NEW(<v0>, <v1>)
0 <v0>: * NEW()
1 <v1>: * NEW()
0 > 1 <v2>: * NEW(<v0>, <v1>)
=====================
compiler/testData/cfg/controlStructures/returnsInWhen.values
+2 -2
View File
@@ -5,6 +5,6 @@ fun illegalWhenBlock(a: Any): Any {
}
}
---------------------
a <v1> NEW()
a <v3> NEW()
a <v1>: * NEW()
a <v3>: {<: Any} NEW()
=====================