"field": deprecated warnings introduced, compiler tests migrated to the new syntax

This commit is contained in:
Mikhail Glukhikh
2015-09-17 18:58:30 +03:00
committed by Mikhail Glukhikh
parent 028e0ec59a
commit a1e3471d92
64 changed files with 154 additions and 149 deletions
@@ -15,7 +15,7 @@ trait Base2 : Base1 {
class Base2Impl() : Base2 {
override var prop: String = ""
set(value) {
$prop = "prop:${value}"
field = "prop:${value}"
}
}
@@ -9,7 +9,7 @@ class BaseImpl(val s: String) : Base {
override fun foo(x: String) = "BaseImpl.foo: ${s}:${x}"
override var prop: String = "init"
set(value) {
$prop = "prop:${value}"
field = "prop:${value}"
}
}
@@ -4,9 +4,9 @@ open class Base() {
get() = 239
public var readwrite: Int = 0
get() = $readwrite + 1
get() = field + 1
set(n: Int) {
$readwrite = n
field = n
}
}
@@ -29,7 +29,7 @@ class A() {
val a: A = A()
get() {
c0++
return $a
return field
}
fun box(): String {
@@ -18,7 +18,7 @@ class A() {
var a: A = A()
get() {
c0++
return $a
return field
}
fun box(): String {
@@ -17,7 +17,7 @@ class A() {
var b = MyInt(0)
get() {
gc = gc + 1;
return $b;
return field;
}
set(a: MyInt) {
sc = sc + 1;
@@ -2,7 +2,7 @@ package foo
class A {
val a: Int = 1
get() = $a + 1
get() = field + 1
fun getA(): Int {
return $a
@@ -3,7 +3,7 @@ package foo
class Test() {
var a: Int = 5
set(b: Int) {
$a = 3
field = 3
}
}
@@ -4,7 +4,7 @@ class A {
val a: Int
val aa: Int
get() {
return $aa
return field
}
var aR = 0
@@ -22,7 +22,7 @@ class B {
private val a: Int
private val aa: Int
get() {
return $aa
return field
}
var aR = 0
@@ -8,7 +8,7 @@ trait Holder {
open class BasicHolder : Holder {
override val element: String
get() = $element + $element
get() = field + field
init {
element = "1"
@@ -5,7 +5,7 @@ open class A {
private val b = 2
get() {
return $b + 10 + 100 * a
return field + 10 + 100 * a
}
fun getBInA(): Int {
return b
@@ -37,10 +37,10 @@ class C : A, B {
override val bal: Int = 1
override var bar: Int = 2
get() {
return $bar + 20
return field + 20
}
set(value: Int) {
$bar = value + 20
field = value + 20
}
override var realBar: Int = 3
@@ -3,14 +3,14 @@ package foo
open class A {
open val a = 2
get() {
return $a + 1
return field + 1
}
}
class B : A() {
override val a: Int = 5
get() {
return super.a + 10 * $a + 100
return super.a + 10 * field + 100
}
}
@@ -100,10 +100,10 @@ class Logo(override var pos: Vector) : Shape() {
val gradientGenerator: RadialGradientGenerator? = null
get() {
if ($gradientGenerator == null) {
$gradientGenerator = RadialGradientGenerator(context)
if (field == null) {
field = RadialGradientGenerator(context)
}
return $gradientGenerator
return field
}
class Creature(override var pos: Vector, val state: CanvasState) : Shape() {