"field": deprecated warnings introduced, compiler tests migrated to the new syntax
This commit is contained in:
committed by
Mikhail Glukhikh
parent
028e0ec59a
commit
a1e3471d92
@@ -1,7 +1,11 @@
|
||||
class Flower() {
|
||||
|
||||
var minusOne: Int = 1
|
||||
get() = $minusOne + 1
|
||||
set(n: Int) { $minusOne = n - 1 }
|
||||
get() = field + 1
|
||||
set(n: Int) { field = n - 1 }
|
||||
|
||||
var oldSyntax: Int = 1
|
||||
get() = <!BACKING_FIELD_SYNTAX_DEPRECATED!>$oldSyntax<!> - 1
|
||||
set(arg) { <!BACKING_FIELD_SYNTAX_DEPRECATED!>$oldSyntax<!> = arg + 1 }
|
||||
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ package
|
||||
public final class Flower {
|
||||
public constructor Flower()
|
||||
public final var minusOne: kotlin.Int
|
||||
public final var oldSyntax: kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
|
||||
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
|
||||
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
class CustomGetVal() {
|
||||
val zz = 1
|
||||
get() = $zz * 2
|
||||
get() = field * 2
|
||||
}
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
package customGetValGlobal
|
||||
val zz = 1
|
||||
get() = $zz * 2
|
||||
get() = field * 2
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
class Raise() {
|
||||
var zz = 1
|
||||
get() = $zz * 2
|
||||
get() = field * 2
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
class Raise() {
|
||||
var zz = 1
|
||||
set(it) { $zz = it / 2 }
|
||||
set(it) { field = it / 2 }
|
||||
}
|
||||
|
||||
+7
-7
@@ -27,7 +27,7 @@ abstract class TestInitializationWithoutBackingField() {
|
||||
|
||||
var varWithCustomSetter : Int
|
||||
set(v: Int) {
|
||||
$varWithCustomSetter = v
|
||||
field = v
|
||||
}
|
||||
init {
|
||||
<!INITIALIZATION_USING_BACKING_FIELD_CUSTOM_SETTER!>varWithCustomSetter<!> = 3
|
||||
@@ -70,7 +70,7 @@ abstract class TestInitializationThroughBackingField() {
|
||||
|
||||
var varWithCustomSetter : Int
|
||||
set(v: Int) {
|
||||
$varWithCustomSetter = v
|
||||
field = v
|
||||
}
|
||||
init {
|
||||
$varWithCustomSetter = 3
|
||||
@@ -114,7 +114,7 @@ class TestBackingFieldsVisibility() {
|
||||
}
|
||||
|
||||
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val w = 11
|
||||
get() = $w //test there is no second error here
|
||||
get() = field //test there is no second error here
|
||||
}
|
||||
|
||||
val topLevelVar = 11
|
||||
@@ -141,10 +141,10 @@ class T() {
|
||||
get() {
|
||||
val <!UNUSED_VARIABLE!>o<!> = object {
|
||||
init {
|
||||
$x = 34
|
||||
field = 34
|
||||
}
|
||||
fun foo() {
|
||||
$x = 23
|
||||
field = 23
|
||||
}
|
||||
}
|
||||
return 1
|
||||
@@ -153,10 +153,10 @@ class T() {
|
||||
var r: Int = $x
|
||||
set(v: Int) {
|
||||
if (true) {
|
||||
$r = 33
|
||||
field = 33
|
||||
}
|
||||
else {
|
||||
$r = 35
|
||||
field = 35
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@ val z : Int = 34
|
||||
|
||||
val y : Int = 11
|
||||
get() {
|
||||
return $y
|
||||
return field
|
||||
}
|
||||
|
||||
val x : Int
|
||||
|
||||
Reference in New Issue
Block a user