"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
+20 -20
View File
@@ -13,10 +13,10 @@ class MyClass() {
<error>abstract</error> var b2: Int private set
<error>abstract</error> var b3: Int = 0; private set
<error>var c: Int</error> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
<error>abstract</error> var c2: Int set(v: Int) { $c2 = v }
<error>abstract</error> var c3: Int = 0; set(v: Int) { $c3 = v }
<error>var c: Int</error> set(v: Int) { field = v }
var c1: Int = 0; set(v: Int) { field = v }
<error>abstract</error> var c2: Int set(v: Int) { field = v }
<error>abstract</error> var c3: Int = 0; set(v: Int) { field = v }
val e: Int get() = a
val e1: Int = <error>0</error>; get() = a
@@ -44,10 +44,10 @@ abstract class MyAbstractClass() {
abstract var b2: Int private set
abstract var b3: Int = <error>0</error>; private set
<error>var c: Int</error> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
abstract var c2: Int <error>set(v: Int) { $c2 = v }</error>
abstract var c3: Int = <error>0</error>; <error>set(v: Int) { $c3 = v }</error>
<error>var c: Int</error> set(v: Int) { field = v }
var c1: Int = 0; set(v: Int) { field = v }
abstract var c2: Int <error>set(v: Int) { field = v }</error>
abstract var c3: Int = <error>0</error>; <error>set(v: Int) { field = v }</error>
val e: Int get() = a
val e1: Int = <error>0</error>; get() = a
@@ -75,10 +75,10 @@ interface MyTrait {
<warning>abstract</warning> var b2: Int private set
<warning>abstract</warning> var b3: Int = <error>0</error>; private set
<error>var c: Int</error> set(v: Int) { $c = v }
<error>var c1: Int</error> = <error>0</error>; set(v: Int) { $c1 = v }
<warning>abstract</warning> var c2: Int <error>set(v: Int) { $c2 = v }</error>
<warning>abstract</warning> var c3: Int = <error>0</error>; <error>set(v: Int) { $c3 = v }</error>
<error>var c: Int</error> set(v: Int) { field = v }
<error>var c1: Int</error> = <error>0</error>; set(v: Int) { field = v }
<warning>abstract</warning> var c2: Int <error>set(v: Int) { field = v }</error>
<warning>abstract</warning> var c3: Int = <error>0</error>; <error>set(v: Int) { field = v }</error>
val e: Int get() = a
val e1: Int = <error>0</error>; get() = a
@@ -107,10 +107,10 @@ enum class MyEnum() {
abstract var b2: Int private set
abstract var b3: Int = <error>0</error>; private set
<error>var c: Int</error> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
abstract var c2: Int <error>set(v: Int) { $c2 = v }</error>
abstract var c3: Int = <error>0</error>; <error>set(v: Int) { $c3 = v }</error>
<error>var c: Int</error> set(v: Int) { field = v }
var c1: Int = 0; set(v: Int) { field = v }
abstract var c2: Int <error>set(v: Int) { field = v }</error>
abstract var c3: Int = <error>0</error>; <error>set(v: Int) { field = v }</error>
val e: Int get() = a
val e1: Int = <error>0</error>; get() = a
@@ -139,10 +139,10 @@ var b1: Int = 0; private set
<error><error>abstract</error> var b2: Int</error> private set
<error>abstract</error> var b3: Int = 0; private set
<error>var c: Int</error> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
<error><error>abstract</error> var c2: Int</error> set(v: Int) { $c2 = v }
<error>abstract</error> var c3: Int = 0; set(v: Int) { $c3 = v }
<error>var c: Int</error> set(v: Int) { field = v }
var c1: Int = 0; set(v: Int) { field = v }
<error><error>abstract</error> var c2: Int</error> set(v: Int) { field = v }
<error>abstract</error> var c3: Int = 0; set(v: Int) { field = v }
val e: Int get() = a
val e1: Int = <error>0</error>; get() = a
+5 -8
View File
@@ -1,8 +1,8 @@
var x : Int = 1 + <error>x</error>
get() : Int = 1
set(value : <error>Long</error>) {
$x = value.toInt()
$x = <error>1.toLong()</error>
field = value.toInt()
field = <error>1.toLong()</error>
}
val xx : Int = <error>1 + x</error>
@@ -14,15 +14,12 @@
class Test() {
var a : Int = 111
var b : Int get() = $a; set(x) {a = x; $a = x}
var b : Int get() = a; set(x) { a = x }
init {
<error>$b</error> = $a
$a = <error>$b</error>
a = <error>$b</error>
}
fun f() {
<error>$b</error> = $a
a = <error>$b</error>
}
}
+3 -3
View File
@@ -16,7 +16,7 @@
val c4 : Int
<info>get</info>() = 1
<error>val c5 : Int</error>
<info>get</info>() = $c5 + 1
<info>get</info>() = field + 1
<info>abstract</info> var y : Int
<info>abstract</info> var y1 : Int <info>get</info>
@@ -32,8 +32,8 @@
<error>var v3 : Int</error> <info>get</info>() = 1; <info>set</info>
var v4 : Int <info>get</info>() = 1; <info>set</info>(x){}
<error>var v5 : Int</error> <info>get</info>() = 1; <info>set</info>(x){$v5 = x}
<error>var v6 : Int</error> <info>get</info>() = $v6 + 1; <info>set</info>(x){}
<error>var v5 : Int</error> <info>get</info>() = 1; <info>set</info>(x){field = x}
<error>var v6 : Int</error> <info>get</info>() = field + 1; <info>set</info>(x){}
<error>var v9 : Int</error> <info>set</info>
<error>var v10 : Int</error> <info>get</info>
+4 -4
View File
@@ -2,7 +2,7 @@ class A() {
var x: Int = 0
get() = <error>"s"</error>
set(value: <error>String</error>) {
$x = <error>value</error>
field = <error>value</error>
}
val y: Int
get(): <error>String</error> = "s"
@@ -13,7 +13,7 @@ class A() {
var a: Any = 1
set(v: <error>String</error>) {
$a = v
field = v
}
val b: Int
get(): <error>Any</error> = "s"
@@ -23,11 +23,11 @@ class A() {
}
val d = 1
get() {
return $d
return field
}
val e = 1
get(): <error>String</error> {
return <error>$e</error>
return <error>field</error>
}
}