Get rid of FIELD_IDENTIFIER at syntax level, two errors dropped, a set of tests fixed / deleted #KT-9539 Fixed

This commit is contained in:
Mikhail Glukhikh
2015-10-20 13:55:37 +03:00
parent 8ea0501a30
commit d6988ad69e
97 changed files with 177 additions and 792 deletions
@@ -6,7 +6,7 @@ class C() {
val x : Int
init {
$x = 1
x = 1
}
@@ -29,29 +29,29 @@ fun test1() {
val a = object {
val x : Int
init {
$x = 1
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 init { $x = 1 } } <v3>: <no name provided> NEW: r(object { val x : Int init { $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
x = 1
}
}
---------------------
<v0>: O NEW: magic[IMPLICIT_RECEIVER]($x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
$x = 1 !<v2>: *
{ $x = 1 } !<v2>: * COPY
<v0>: O NEW: magic[IMPLICIT_RECEIVER](x) -> <v0>
1 <v1>: Int NEW: r(1) -> <v1>
x = 1 !<v2>: *
{ x = 1 } !<v2>: * COPY
=====================
== test2 ==
fun test2() {
@@ -93,7 +93,7 @@ fun test4() {
val x : Int
val y : Int
init {
$x = 1
x = 1
}
fun ggg() {
y = 10
@@ -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 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>
<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() {
@@ -122,7 +122,7 @@ fun test5() {
val a = object {
var x = 1
init {
$x = 2
x = 2
}
fun foo() {
x = 3
@@ -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 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>
<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() {