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-variables/basic/IfWithUninitialized.values
+10 -10
View File
@@ -9,18 +9,18 @@ fun foo() {
}
}
---------------------
1 <v0> NEW()
2 <v1> NEW()
1 < 2 <v2> NEW(<v0>, <v1>)
b <v3> NEW()
use(b) <v4> NEW(<v3>)
{ use(b) } <v4> COPY
true <v5> NEW()
if (1 < 2) { use(b) } else { b = true } <v4> COPY
{ val b: Boolean if (1 < 2) { use(b) } else { b = true } } <v4> COPY
1 <v0>: {<: Comparable<Int>} NEW()
2 <v1>: Int NEW()
1 < 2 <v2>: Boolean NEW(<v0>, <v1>)
b <v3>: {<: Any?} NEW()
use(b) <v4>: * NEW(<v3>)
{ use(b) } <v4>: * COPY
true <v5>: Boolean NEW()
if (1 < 2) { use(b) } else { b = true } <v4>: * COPY
{ val b: Boolean if (1 < 2) { use(b) } else { b = true } } <v4>: * COPY
=====================
== use ==
fun use(vararg a: Any?) = a
---------------------
a <v1> NEW()
a <v1>: {<: Array<Any?>} NEW()
=====================
compiler/testData/cfg-variables/basic/InitializedNotDeclared.values
+1 -1
View File
@@ -6,5 +6,5 @@ class A {
val x: Int
}
---------------------
1 <v1> NEW()
1 <v1>: Int NEW()
=====================
compiler/testData/cfg-variables/basic/UsageInFunctionLiteral.values
+9 -9
View File
@@ -7,8 +7,8 @@ fun foo() {
}
}
---------------------
1 <v0> NEW()
{ (x: Int) -> val y = x + a use(a) } <v1> NEW()
1 <v0>: Int NEW()
{ (x: Int) -> val y = x + a use(a) } <v1>: {<: (Int) -> Array<Any?>} NEW()
=====================
== anonymous_0 ==
{ (x: Int) ->
@@ -16,15 +16,15 @@ fun foo() {
use(a)
}
---------------------
x <v1> NEW()
a <v2> NEW()
x + a <v3> NEW(<v1>, <v2>)
a <v4> NEW()
use(a) <v5> NEW(<v4>)
val y = x + a use(a) <v5> COPY
x <v1>: Int NEW()
a <v2>: Int NEW()
x + a <v3>: Int NEW(<v1>, <v2>)
a <v4>: {<: Any?} NEW()
use(a) <v5>: {<: Array<Any?>} NEW(<v4>)
val y = x + a use(a) <v5>: {<: Array<Any?>} COPY
=====================
== use ==
fun use(vararg a: Any?) = a
---------------------
a <v1> NEW()
a <v1>: {<: Array<Any?>} NEW()
=====================
compiler/testData/cfg-variables/basic/VariablesInitialization.values
+11 -11
View File
@@ -6,10 +6,10 @@ fun foo() {
42
}
---------------------
1 <v0> NEW()
2 <v1> NEW()
42 <v2> NEW()
{ val a = 1 val b: Int b = 2 42 } <v2> COPY
1 <v0>: Int NEW()
2 <v1>: Int NEW()
42 <v2>: * NEW()
{ val a = 1 val b: Int b = 2 42 } <v2>: * COPY
=====================
== bar ==
fun bar(foo: Foo) {
@@ -18,13 +18,13 @@ fun bar(foo: Foo) {
42
}
---------------------
foo <v1> NEW()
c <v2> NEW(<v1>)
foo.c <v2> COPY
foo <v3> NEW()
2 <v4> NEW()
42 <v5> NEW()
{ foo.c foo.c = 2 42 } <v5> COPY
foo <v1>: {<: Foo} NEW()
c <v2>: * NEW(<v1>)
foo.c <v2>: * COPY
foo <v3>: {<: Foo} NEW()
2 <v4>: Int NEW()
42 <v5>: * NEW()
{ foo.c foo.c = 2 42 } <v5>: * COPY
=====================
== Foo ==
trait Foo {
compiler/testData/cfg-variables/basic/VariablesUsage.values
+9 -9
View File
@@ -6,13 +6,13 @@ fun foo() {
use(a)
}
---------------------
1 <v0> NEW()
a <v1> NEW()
use(a) <v2> NEW(<v1>)
2 <v3> NEW()
a <v4> NEW()
use(a) <v5> NEW(<v4>)
{ var a = 1 use(a) a = 2 use(a) } <v5> COPY
1 <v0>: Int NEW()
a <v1>: Int NEW()
use(a) <v2>: * NEW(<v1>)
2 <v3>: Int NEW()
a <v4>: Int NEW()
use(a) <v5>: * NEW(<v4>)
{ var a = 1 use(a) a = 2 use(a) } <v5>: * COPY
=====================
== bar ==
fun bar() {
@@ -20,10 +20,10 @@ fun bar() {
b = 3
}
---------------------
3 <v0> NEW()
3 <v0>: Int NEW()
=====================
== use ==
fun use(a: Int) = a
---------------------
a <v1> NEW()
a <v1>: Int NEW()
=====================
compiler/testData/cfg-variables/bugs/referenceToPropertyInitializer.values
+16 -16
View File
@@ -5,21 +5,21 @@ class TestFunctionLiteral {
}
}
---------------------
{ (x: Int) -> sum(x - 1) + x } <v0> NEW()
{ (x: Int) -> sum(x - 1) + x } <v0>: {<: (Int) -> Int} NEW()
=====================
== anonymous_0 ==
{ (x: Int) ->
sum(x - 1) + x
}
---------------------
sum <v2> NEW(<v1>)
x <v3> NEW()
1 <v4> NEW()
x - 1 <v5> NEW(<v3>, <v4>)
sum(x - 1) <v6> NEW(<v2>, <v5>)
x <v7> NEW()
sum(x - 1) + x <v8> NEW(<v6>, <v7>)
sum(x - 1) + x <v8> COPY
sum <v2>: {<: (Int) -> Int} NEW(<v1>)
x <v3>: Int NEW()
1 <v4>: Int NEW()
x - 1 <v5>: Int NEW(<v3>, <v4>)
sum(x - 1) <v6>: Int NEW(<v2>, <v5>)
x <v7>: Int NEW()
sum(x - 1) + x <v8>: Int NEW(<v6>, <v7>)
sum(x - 1) + x <v8>: Int COPY
=====================
== A ==
open class A(val a: A)
@@ -37,23 +37,23 @@ class TestObjectLiteral {
}
}
---------------------
obj <v1> NEW(<v0>)
obj <v3> NEW(<v2>)
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v4> NEW()
obj <v1>: * NEW(<v0>)
obj <v3>: {<: A} NEW(<v2>)
object: A(obj) { { val x = obj } fun foo() { val y = obj } } <v4>: {<: A} NEW()
=====================
== foo ==
fun foo() {
val y = obj
}
---------------------
obj <v1> NEW(<v0>)
obj <v1>: {<: A} NEW(<v0>)
=====================
== TestOther ==
class TestOther {
val x: Int = x + 1
}
---------------------
x <v1> NEW(<v0>)
1 <v2> NEW()
x + 1 <v3> NEW(<v1>, <v2>)
x <v1>: Int NEW(<v0>)
1 <v2>: Int NEW()
x + 1 <v3>: Int NEW(<v1>, <v2>)
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIf.values
+8 -8
View File
@@ -10,12 +10,12 @@ fun foo() {
use(b)
}
---------------------
1 <v0> NEW()
2 <v1> NEW()
1 < 2 <v2> NEW(<v0>, <v1>)
false <v3> NEW()
true <v4> NEW()
b <v5> NEW()
use(b) <v6> NEW(<v5>)
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v6> COPY
1 <v0>: {<: Comparable<Int>} NEW()
2 <v1>: Int NEW()
1 < 2 <v2>: Boolean NEW(<v0>, <v1>)
false <v3>: Boolean NEW()
true <v4>: Boolean NEW()
b <v5>: * NEW()
use(b) <v6>: * NEW(<v5>)
{ val b: Boolean if (1 < 2) { b = false } else { b = true } use(b) } <v6>: * COPY
=====================
compiler/testData/cfg-variables/bugs/varInitializationInIfInCycle.values
+9 -9
View File
@@ -13,17 +13,17 @@ fun foo(numbers: Collection<Int>) {
}
}
---------------------
numbers <v1> NEW()
1 <v3> NEW()
2 <v4> NEW()
1 < 2 <v5> NEW(<v3>, <v4>)
false <v6> NEW()
true <v7> NEW()
b <v8> NEW()
use(b) <v9> NEW(<v8>)
numbers <v1>: {<: Iterable<Int>} NEW()
1 <v3>: {<: Comparable<Int>} NEW()
2 <v4>: Int NEW()
1 < 2 <v5>: Boolean NEW(<v3>, <v4>)
false <v6>: Boolean NEW()
true <v7>: Boolean NEW()
b <v8>: {<: Any?} NEW()
use(b) <v9>: * NEW(<v8>)
=====================
== use ==
fun use(vararg a: Any?) = a
---------------------
a <v1> NEW()
a <v1>: {<: Array<Any?>} NEW()
=====================
compiler/testData/cfg-variables/lexicalScopes/doWhileScope.values
+7 -7
View File
@@ -7,11 +7,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
2 <v1> NEW()
a <v2> NEW()
0 <v3> NEW()
a > 0 <v4> NEW(<v2>, <v3>)
"after" <v5> NEW()
{ "before" do { var a = 2 } while (a > 0) "after" } <v5> COPY
"before" <v0>: * NEW()
2 <v1>: Int NEW()
a <v2>: {<: Comparable<Int>} NEW()
0 <v3>: Int NEW()
a > 0 <v4>: Boolean NEW(<v2>, <v3>)
"after" <v5>: * NEW()
{ "before" do { var a = 2 } while (a > 0) "after" } <v5>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/forScope.values
+7 -7
View File
@@ -7,11 +7,11 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
1 <v1> NEW()
10 <v2> NEW()
1..10 <v3> NEW(<v1>, <v2>)
i <v5> NEW()
"after" <v6> NEW()
{ "before" for (i in 1..10) { val a = i } "after" } <v6> COPY
"before" <v0>: * NEW()
1 <v1>: Int NEW()
10 <v2>: Int NEW()
1..10 <v3>: {<: Iterable<Int>} NEW(<v1>, <v2>)
i <v5>: Int NEW()
"after" <v6>: * NEW()
{ "before" for (i in 1..10) { val a = i } "after" } <v6>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/functionLiteralScope.values
+8 -8
View File
@@ -8,18 +8,18 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
1 <v1> NEW()
{ (x: Int) -> val a = x + b } <v2> NEW()
"after" <v3> NEW()
{ "before" val b = 1 val f = { (x: Int) -> val a = x + b } "after" } <v3> COPY
"before" <v0>: * NEW()
1 <v1>: Int NEW()
{ (x: Int) -> val a = x + b } <v2>: {<: (Int) -> Unit} NEW()
"after" <v3>: * NEW()
{ "before" val b = 1 val f = { (x: Int) -> val a = x + b } "after" } <v3>: * COPY
=====================
== anonymous_0 ==
{ (x: Int) ->
val a = x + b
}
---------------------
x <v1> NEW()
b <v2> NEW()
x + b <v3> NEW(<v1>, <v2>)
x <v1>: Int NEW()
b <v2>: Int NEW()
x + b <v3>: Int NEW(<v1>, <v2>)
=====================
compiler/testData/cfg-variables/lexicalScopes/ifScope.values
+6 -6
View File
@@ -10,10 +10,10 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
true <v1> NEW()
1 <v2> NEW()
2 <v3> NEW()
"after" <v4> NEW()
{ "before" if (true) { val a = 1 } else { val b = 2 } "after" } <v4> COPY
"before" <v0>: * NEW()
true <v1>: Boolean NEW()
1 <v2>: Int NEW()
2 <v3>: Int NEW()
"after" <v4>: * NEW()
{ "before" if (true) { val a = 1 } else { val b = 2 } "after" } <v4>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/localClass.values
+5 -5
View File
@@ -12,15 +12,15 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
x <v3> NEW(<v2>)
"after" <v4> NEW()
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4> COPY
"before" <v0>: * NEW()
x <v3>: Int NEW(<v2>)
"after" <v4>: * NEW()
{ "before" class A(val x: Int) { { val a = x } fun foo() { val b = x } } "after" } <v4>: * COPY
=====================
== foo ==
fun foo() {
val b = x
}
---------------------
x <v1> NEW(<v0>)
x <v1>: Int NEW(<v0>)
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScope.values
+7 -7
View File
@@ -8,17 +8,17 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
1 <v1> NEW()
"after" <v2> NEW()
{ "before" val b = 1 fun local(x: Int) { val a = x + b } "after" } <v2> COPY
"before" <v0>: * NEW()
1 <v1>: Int NEW()
"after" <v2>: * NEW()
{ "before" val b = 1 fun local(x: Int) { val a = x + b } "after" } <v2>: * COPY
=====================
== local ==
fun local(x: Int) {
val a = x + b
}
---------------------
x <v1> NEW()
b <v2> NEW()
x + b <v3> NEW(<v1>, <v2>)
x <v1>: Int NEW()
b <v2>: Int NEW()
x + b <v3>: Int NEW(<v1>, <v2>)
=====================
compiler/testData/cfg-variables/lexicalScopes/localFunctionScopeWithoutBody.values
+7 -7
View File
@@ -6,15 +6,15 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
1 <v1> NEW()
"after" <v2> NEW()
{ "before" val b = 1 fun local(x: Int) = x + b "after" } <v2> COPY
"before" <v0>: * NEW()
1 <v1>: Int NEW()
"after" <v2>: * NEW()
{ "before" val b = 1 fun local(x: Int) = x + b "after" } <v2>: * COPY
=====================
== local ==
fun local(x: Int) = x + b
---------------------
x <v1> NEW()
b <v2> NEW()
x + b <v3> NEW(<v1>, <v2>)
x <v1>: Int NEW()
b <v2>: Int NEW()
x + b <v3>: Int NEW(<v1>, <v2>)
=====================
compiler/testData/cfg-variables/lexicalScopes/localObject.values
+5 -5
View File
@@ -12,15 +12,15 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
1 <v1> NEW()
"after" <v2> NEW()
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2> COPY
"before" <v0>: * NEW()
1 <v1>: Int NEW()
"after" <v2>: * NEW()
{ "before" object A { { val a = 1 } fun foo() { val b = 2 } } "after" } <v2>: * COPY
=====================
== foo ==
fun foo() {
val b = 2
}
---------------------
2 <v0> NEW()
2 <v0>: Int NEW()
=====================
compiler/testData/cfg-variables/lexicalScopes/objectLiteralScope.values
+6 -6
View File
@@ -12,16 +12,16 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
1 <v1> NEW()
object { { val x = 1 } fun foo() { val a = 2 } } <v2> NEW()
"after" <v3> NEW()
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3> COPY
"before" <v0>: * NEW()
1 <v1>: Int NEW()
object { { val x = 1 } fun foo() { val a = 2 } } <v2>: <no name provided> NEW()
"after" <v3>: * NEW()
{ "before" val bar = object { { val x = 1 } fun foo() { val a = 2 } } "after" } <v3>: * COPY
=====================
== foo ==
fun foo() {
val a = 2
}
---------------------
2 <v0> NEW()
2 <v0>: Int NEW()
=====================
compiler/testData/cfg-variables/lexicalScopes/propertyAccessorScope.values
+2 -2
View File
@@ -17,12 +17,12 @@ get() {
return $a
}
---------------------
$a <v1> NEW(<v0>)
$a <v1>: Int NEW(<v0>)
=====================
== set_a ==
set(v: Int) {
$a = v
}
---------------------
v <v2> NEW()
v <v2>: Int NEW()
=====================
compiler/testData/cfg-variables/lexicalScopes/tryScope.values
+8 -8
View File
@@ -13,12 +13,12 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
foo() <v1> NEW()
{ foo() } <v1> COPY
e <v3> NEW()
1 <v4> NEW()
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v1> COPY
"after" <v5> NEW()
{ "before" try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } "after" } <v5> COPY
"before" <v0>: * NEW()
foo() <v1>: * NEW()
{ foo() } <v1>: * COPY
e <v3>: {<: Exception} NEW()
1 <v4>: Int NEW()
try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } <v1>: * COPY
"after" <v5>: * NEW()
{ "before" try { foo() } catch (e: Exception) { val a = e } finally { val a = 1 } "after" } <v5>: * COPY
=====================
compiler/testData/cfg-variables/lexicalScopes/whileScope.values
+4 -4
View File
@@ -7,8 +7,8 @@ fun foo() {
"after"
}
---------------------
"before" <v0> NEW()
true <v1> NEW()
"after" <v2> NEW()
{ "before" while (true) { val a: Int } "after" } <v2> COPY
"before" <v0>: * NEW()
true <v1>: * NEW()
"after" <v2>: * NEW()
{ "before" while (true) { val a: Int } "after" } <v2>: * COPY
=====================