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

fix tests by adding missing 'init' keywords to testdata

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-04-27 13:23:15 +02:00
parent 98b8784ab0
commit f93eeeb563
130 changed files with 277 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.instructions
+2 -2
View File
@@ -3,14 +3,14 @@ class AnonymousInitializers() {
val k = 34
val i: Int
{
init {
$i = 12
}
val j: Int
get() = 20
{
init {
$i = 13
}
}
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.kt
+2 -2
View File
@@ -2,14 +2,14 @@ class AnonymousInitializers() {
val k = 34
val i: Int
{
init {
$i = 12
}
val j: Int
get() = 20
{
init {
$i = 13
}
}
compiler/testData/cfg/declarations/classesAndObjects/AnonymousInitializers.values
+2 -2
View File
@@ -3,14 +3,14 @@ class AnonymousInitializers() {
val k = 34
val i: Int
{
init {
$i = 12
}
val j: Int
get() = 20
{
init {
$i = 13
}
}
compiler/testData/cfg/declarations/local/LocalDeclarations.instructions
+32 -32
View File
@@ -5,7 +5,7 @@ class C() {
companion object {
val x : Int
{
init {
$x = 1
}
@@ -50,7 +50,7 @@ sink:
fun test1() {
val a = object {
val x : Int
{
init {
$x = 1
}
}
@@ -58,27 +58,27 @@ fun test1() {
---------------------
L0:
1 <START>
2 mark({ val a = object { val x : Int { $x = 1 } } })
v(val a = object { val x : Int { $x = 1 } })
mark(object { val x : Int { $x = 1 } })
2 mark({ val a = object { val x : Int init { $x = 1 } } })
v(val a = object { val x : Int init { $x = 1 } })
mark(object { val x : Int init { $x = 1 } })
v(val x : Int)
3 mark({ $x = 1 })
magic[IMPLICIT_RECEIVER]($x) -> <v0>
r(1) -> <v1>
w($x|<v0>, <v1>)
2 r(object { val x : Int { $x = 1 } }) -> <v3>
2 r(object { val x : Int init { $x = 1 } }) -> <v3>
w(a|<v3>)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>]
<SINK> PREV:[<ERROR>, <END>]
=====================
== O ==
object O {
val x : Int
{
init {
$x = 1
}
}
@@ -176,7 +176,7 @@ fun test4() {
val a = object {
val x : Int
val y : Int
{
init {
$x = 1
}
fun ggg() {
@@ -187,26 +187,26 @@ fun test4() {
---------------------
L0:
1 <START>
2 mark({ val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } })
v(val a = object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } })
mark(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } })
2 mark({ val a = object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } } })
v(val a = object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } })
mark(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } })
v(val x : Int)
v(val y : Int)
3 mark({ $x = 1 })
magic[IMPLICIT_RECEIVER]($x) -> <v0>
r(1) -> <v1>
w($x|<v0>, <v1>)
2 jmp?(L2) NEXT:[r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v3>, d(fun ggg() { y = 10 })]
d(fun ggg() { y = 10 }) NEXT:[<SINK>]
2 jmp?(L2) NEXT:[r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3>, d(fun ggg() { y = 10 })]
d(fun ggg() { y = 10 }) NEXT:[<SINK>]
L2 [after local declaration]:
r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v3> PREV:[jmp?(L2)]
r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3> PREV:[jmp?(L2)]
w(a|<v3>)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 })]
<SINK> PREV:[<ERROR>, <END>, d(fun ggg() { y = 10 })]
=====================
== ggg ==
fun ggg() {
@@ -230,7 +230,7 @@ sink:
fun test5() {
val a = object {
var x = 1
{
init {
$x = 2
}
fun foo() {
@@ -244,9 +244,9 @@ fun test5() {
---------------------
L0:
1 <START>
2 mark({ val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } })
v(val a = object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
mark(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
2 mark({ val a = object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } })
v(val a = object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
mark(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } })
v(var x = 1)
r(1) -> <v0>
w(x|<v0>)
@@ -254,20 +254,20 @@ L0:
magic[IMPLICIT_RECEIVER]($x) -> <v1>
r(2) -> <v2>
w($x|<v1>, <v2>)
2 jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })]
d(fun foo() { x = 3 }) NEXT:[<SINK>]
2 jmp?(L2) NEXT:[jmp?(L5), d(fun foo() { x = 3 })]
d(fun foo() { x = 3 }) NEXT:[<SINK>]
L2 [after local declaration]:
jmp?(L5) NEXT:[r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>, d(fun bar() { x = 4 })] PREV:[jmp?(L2)]
d(fun bar() { x = 4 }) NEXT:[<SINK>]
jmp?(L5) NEXT:[r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>, d(fun bar() { x = 4 })] PREV:[jmp?(L2)]
d(fun bar() { x = 4 }) NEXT:[<SINK>]
L5 [after local declaration]:
r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4> PREV:[jmp?(L5)]
r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4> PREV:[jmp?(L5)]
w(a|<v4>)
L1:
1 <END> NEXT:[<SINK>]
1 <END> NEXT:[<SINK>]
error:
<ERROR> PREV:[]
<ERROR> PREV:[]
sink:
<SINK> PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }), d(fun bar() { x = 4 })]
<SINK> PREV:[<ERROR>, <END>, d(fun foo() { x = 3 }), d(fun bar() { x = 4 })]
=====================
== foo ==
fun foo() {
compiler/testData/cfg/declarations/local/LocalDeclarations.kt
+5 -5
View File
@@ -4,7 +4,7 @@ class C() {
companion object {
val x : Int
{
init {
$x = 1
}
@@ -21,7 +21,7 @@ fun doSmth(i: Int) {}
fun test1() {
val a = object {
val x : Int
{
init {
$x = 1
}
}
@@ -29,7 +29,7 @@ fun test1() {
object O {
val x : Int
{
init {
$x = 1
}
}
@@ -52,7 +52,7 @@ fun test4() {
val a = object {
val x : Int
val y : Int
{
init {
$x = 1
}
fun ggg() {
@@ -64,7 +64,7 @@ fun test4() {
fun test5() {
val a = object {
var x = 1
{
init {
$x = 2
}
fun foo() {
compiler/testData/cfg/declarations/local/LocalDeclarations.values
+21 -21
View File
@@ -5,7 +5,7 @@ class C() {
companion object {
val x : Int
{
init {
$x = 1
}
@@ -28,22 +28,22 @@ fun doSmth(i: Int) {}
fun test1() {
val a = object {
val x : Int
{
init {
$x = 1
}
}
}
---------------------
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY
object { val x : Int { $x = 1 } } <v3>: <no name provided> NEW: r(object { val x : Int { $x = 1 } }) -> <v3>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY
object { val x : Int init { $x = 1 } } <v3>: <no name provided> NEW: r(object { val x : Int init { $x = 1 } }) -> <v3>
=====================
== O ==
object O {
val x : Int
{
init {
$x = 1
}
}
@@ -92,7 +92,7 @@ fun test4() {
val a = object {
val x : Int
val y : Int
{
init {
$x = 1
}
fun ggg() {
@@ -101,11 +101,11 @@ fun test4() {
}
}
---------------------
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY
object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } } <v3>: <no name provided> NEW: r(object { val x : Int val y : Int { $x = 1 } fun ggg() { y = 10 } }) -> <v3>
<v0>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY
object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } } <v3>: <no name provided> NEW: r(object { val x : Int val y : Int init { $x = 1 } fun ggg() { y = 10 } }) -> <v3>
=====================
== ggg ==
fun ggg() {
@@ -121,7 +121,7 @@ y = 10 !<v2>: *
fun test5() {
val a = object {
var x = 1
{
init {
$x = 2
}
fun foo() {
@@ -133,12 +133,12 @@ fun test5() {
}
}
---------------------
<v1>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
$x = 2 !<v3>: *
{ $x = 2 } !<v3>: * COPY
object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v4>: <no name provided> NEW: r(object { var x = 1 { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>
<v1>: <no name provided> NEW: magic[IMPLICIT_RECEIVER]($x) -> <v1>
1 <v0>: Int NEW: r(1) -> <v0>
2 <v2>: Int NEW: r(2) -> <v2>
$x = 2 !<v3>: *
{ $x = 2 } !<v3>: * COPY
object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } } <v4>: <no name provided> NEW: r(object { var x = 1 init { $x = 2 } fun foo() { x = 3 } fun bar() { x = 4 } }) -> <v4>
=====================
== foo ==
fun foo() {
compiler/testData/cfg/declarations/properties/backingFieldAccess.instructions
+1 -1
View File
@@ -3,7 +3,7 @@ class C {
val a: Int
get() = 1
{
init {
$a
}
}
compiler/testData/cfg/declarations/properties/backingFieldAccess.kt
+1 -1
View File
@@ -2,7 +2,7 @@ class C {
val a: Int
get() = 1
{
init {
$a
}
}
compiler/testData/cfg/declarations/properties/backingFieldAccess.values
+1 -1
View File
@@ -3,7 +3,7 @@ class C {
val a: Int
get() = 1
{
init {
$a
}
}