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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/Abstract.kt
Vendored
+4 -4
View File
@@ -11,10 +11,10 @@ package MyPackage
<!MUST_BE_INITIALIZED!><!WRONG_MODIFIER_TARGET!>abstract<!> var b2: Int<!> private set
<!WRONG_MODIFIER_TARGET!>abstract<!> var b3: Int = 0; private set
<!MUST_BE_INITIALIZED!>var c: Int<!> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
<!MUST_BE_INITIALIZED!><!WRONG_MODIFIER_TARGET!>abstract<!> var c2: Int<!> set(v: Int) { $c2 = v }
<!WRONG_MODIFIER_TARGET!>abstract<!> var c3: Int = 0; set(v: Int) { $c3 = v }
<!MUST_BE_INITIALIZED!>var c: Int<!> set(v: Int) { field = v }
var c1: Int = 0; set(v: Int) { field = v }
<!MUST_BE_INITIALIZED!><!WRONG_MODIFIER_TARGET!>abstract<!> var c2: Int<!> set(v: Int) { field = v }
<!WRONG_MODIFIER_TARGET!>abstract<!> var c3: Int = 0; set(v: Int) { field = v }
val e: Int get() = a
val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
compiler/testData/diagnostics/tests/AbstractInAbstractClass.kt
Vendored
+4 -4
View File
@@ -12,10 +12,10 @@ abstract class MyAbstractClass() {
abstract var b2: Int private set
abstract var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
<!MUST_BE_INITIALIZED!>var c: Int<!> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
abstract var c2: Int <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
<!MUST_BE_INITIALIZED!>var c: Int<!> set(v: Int) { field = v }
var c1: Int = 0; set(v: Int) { field = v }
abstract var c2: Int <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
val e: Int get() = a
val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
compiler/testData/diagnostics/tests/AbstractInClass.kt
Vendored
+4 -4
View File
@@ -12,10 +12,10 @@ class MyClass() {
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var b2: Int private set
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var b3: Int = 0; private set
<!MUST_BE_INITIALIZED!>var c: Int<!> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c2: Int set(v: Int) { $c2 = v }
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c3: Int = 0; set(v: Int) { $c3 = v }
<!MUST_BE_INITIALIZED!>var c: Int<!> set(v: Int) { field = v }
var c1: Int = 0; set(v: Int) { field = v }
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c2: Int set(v: Int) { field = v }
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c3: Int = 0; set(v: Int) { field = v }
val e: Int get() = a
val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
compiler/testData/diagnostics/tests/AbstractInTrait.kt
Vendored
+4 -4
View File
@@ -12,10 +12,10 @@ interface MyTrait {
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var b2: Int private set
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
<!BACKING_FIELD_IN_TRAIT!>var c: Int<!> set(v: Int) { $c = v }
<!BACKING_FIELD_IN_TRAIT!>var c1: Int<!> = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>; set(v: Int) { $c1 = v }
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var c2: Int <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
<!BACKING_FIELD_IN_TRAIT!>var c: Int<!> set(v: Int) { field = v }
<!BACKING_FIELD_IN_TRAIT!>var c1: Int<!> = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>; set(v: Int) { field = v }
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var c2: Int <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
<!ABSTRACT_MODIFIER_IN_TRAIT!>abstract<!> var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
val e: Int get() = a
val e1: Int = <!PROPERTY_INITIALIZER_IN_TRAIT!>0<!>; get() = a
compiler/testData/diagnostics/tests/LateInit.kt
Vendored
+1 -1
View File
@@ -32,7 +32,7 @@ public abstract class A<T: Any, V: String?>(<!INAPPLICABLE_LATEINIT_MODIFIER!>la
get() = "A"
<!INAPPLICABLE_LATEINIT_MODIFIER!>lateinit<!> var e9: String
set(v) { $e9 = v }
set(v) { field = v }
abstract <!INAPPLICABLE_LATEINIT_MODIFIER!>lateinit<!> val e10: String
compiler/testData/diagnostics/tests/Properties.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
var x : Int = 1 + <!UNINITIALIZED_VARIABLE!>x<!>
get() : Int = 1
set(value : <!WRONG_SETTER_PARAMETER_TYPE!>Long<!>) {
$x = value.toInt()
$x = <!TYPE_MISMATCH!>1.toLong()<!>
field = value.toInt()
field = <!TYPE_MISMATCH!>1.toLong()<!>
}
val xx : Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1 + x<!>
compiler/testData/diagnostics/tests/UnusedVariables.kt
Vendored
+1 -1
View File
@@ -35,7 +35,7 @@ class MyTest() {
var i: Int = 23
doSmth(i)
<!UNUSED_VALUE!>i =<!> 34
$a = v
field = v
}
init {
compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt
Vendored
+6 -2
View File
@@ -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 }
}
compiler/testData/diagnostics/tests/backingField/CustomGetSet.txt
Vendored
+1
View File
@@ -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
compiler/testData/diagnostics/tests/backingField/CustomGetVal.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
class CustomGetVal() {
val zz = 1
get() = $zz * 2
get() = field * 2
}
compiler/testData/diagnostics/tests/backingField/CustomGetValGlobal.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
package customGetValGlobal
val zz = 1
get() = $zz * 2
get() = field * 2
compiler/testData/diagnostics/tests/backingField/CustomGetVar.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
class Raise() {
var zz = 1
get() = $zz * 2
get() = field * 2
}
compiler/testData/diagnostics/tests/backingField/CustomSet.kt
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
class Raise() {
var zz = 1
set(it) { $zz = it / 2 }
set(it) { field = it / 2 }
}
compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt
Vendored
+7 -7
View File
@@ -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
}
}
compiler/testData/diagnostics/tests/backingField/kt782packageLevel.kt
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@ val z : Int = 34
val y : Int = 11
get() {
return $y
return field
}
val x : Int
compiler/testData/diagnostics/tests/controlFlowAnalysis/backingFieldInsideGetter.kt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ import java.util.HashSet
val a: MutableSet<String>? = null
get() {
if (a == null) {
$a = HashSet()
field = HashSet()
}
return a
}
@@ -14,7 +14,7 @@ class R {
val b: String? = null
get() {
if (b == null) {
$b = "b"
field = "b"
}
return b
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt1571.kt
Vendored
+1 -1
View File
@@ -19,7 +19,7 @@ class A() {
val a : A = A()
get() {
c0++
return $a
return field
}
fun box() : String {
compiler/testData/diagnostics/tests/controlFlowAnalysis/kt2960.kt
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ class A {
get() {
val x : Int
doSmth(<!UNINITIALIZED_VARIABLE!>x<!>)
return $a
return field
}
}
compiler/testData/diagnostics/tests/enum/AbstractInEnum.kt
Vendored
+4 -4
View File
@@ -14,10 +14,10 @@ enum class MyEnum() {
abstract var b2: Int private set
abstract var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
<!MUST_BE_INITIALIZED!>var c: Int<!> set(v: Int) { $c = v }
var c1: Int = 0; set(v: Int) { $c1 = v }
abstract var c2: Int <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c2 = v }<!>
abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { $c3 = v }<!>
<!MUST_BE_INITIALIZED!>var c: Int<!> set(v: Int) { field = v }
var c1: Int = 0; set(v: Int) { field = v }
abstract var c2: Int <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
val e: Int get() = a
val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
compiler/testData/diagnostics/tests/infos/PropertiesWithBackingFields.kt
Vendored
+3 -3
View File
@@ -16,7 +16,7 @@ abstract class Test() {
val c4 : Int
get() = 1
<!MUST_BE_INITIALIZED!>val c5 : Int<!>
get() = $c5 + 1
get() = field + 1
abstract var y : Int
abstract var y1 : Int get
@@ -32,8 +32,8 @@ abstract class Test() {
<!MUST_BE_INITIALIZED!>var v3 : Int<!> get() = 1; set
var v4 : Int get() = 1; set(x){}
<!MUST_BE_INITIALIZED!>var v5 : Int<!> get() = 1; set(x){$v5 = x}
<!MUST_BE_INITIALIZED!>var v6 : Int<!> get() = $v6 + 1; set(x){}
<!MUST_BE_INITIALIZED!>var v5 : Int<!> get() = 1; set(x){field = x}
<!MUST_BE_INITIALIZED!>var v6 : Int<!> get() = field + 1; set(x){}
abstract val v7 : Int get
abstract var v8 : Int get set
compiler/testData/diagnostics/tests/modifiers/IllegalModifiers.kt
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@ abstract class A() {
class FinalClass() {
<!NON_FINAL_MEMBER_IN_FINAL_CLASS!>open<!> fun foo() {}
val i: Int = 1
<!WRONG_MODIFIER_TARGET!>open<!> get(): Int = $i
<!WRONG_MODIFIER_TARGET!>open<!> get(): Int = field
var j: Int = 1
<!WRONG_MODIFIER_TARGET!>open<!> set(v: Int) {}
}
compiler/testData/diagnostics/tests/regressions/kt251.kt
Vendored
+4 -4
View File
@@ -2,7 +2,7 @@ class A() {
var x: Int = 0
get() = <!TYPE_MISMATCH!>"s"<!>
set(value: <!WRONG_SETTER_PARAMETER_TYPE!>String<!>) {
$x = <!TYPE_MISMATCH!>value<!>
field = <!TYPE_MISMATCH!>value<!>
}
val y: Int
get(): <!WRONG_GETTER_RETURN_TYPE!>String<!> = "s"
@@ -13,7 +13,7 @@ class A() {
var a: Any = 1
set(v: <!WRONG_SETTER_PARAMETER_TYPE!>String<!>) {
$a = v
field = v
}
val b: Int
get(): <!WRONG_GETTER_RETURN_TYPE!>Any<!> = "s"
@@ -23,11 +23,11 @@ class A() {
}
val d = 1
get() {
return $d
return field
}
val e = 1
get(): <!WRONG_GETTER_RETURN_TYPE!>String<!> {
return <!TYPE_MISMATCH!>$e<!>
return <!TYPE_MISMATCH!>field<!>
}
}