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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/AnonymousInitializers.kt
Vendored
-2
View File
@@ -13,7 +13,6 @@ interface NoC {
class WithC() {
val x : Int = 1
init {
<!UNRESOLVED_REFERENCE!>$y<!> = 2
val <!UNUSED_VARIABLE!>b<!> = x
}
@@ -23,6 +22,5 @@ class WithC() {
init {
val <!UNUSED_VARIABLE!>z<!> = <!UNRESOLVED_REFERENCE!>b<!>
val <!UNUSED_VARIABLE!>zz<!> = x
val <!UNUSED_VARIABLE!>zzz<!> = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
}
}
compiler/testData/diagnostics/tests/Properties.kt
Vendored
+3 -11
View File
@@ -14,17 +14,9 @@ var x : Int = 1 + <!UNINITIALIZED_VARIABLE!>x<!>
class Test() {
var a : Int = 111
var b : Int get() = <!BACKING_FIELD_USAGE_FORBIDDEN!>$a<!>; set(x) {a = x; <!BACKING_FIELD_USAGE_FORBIDDEN!>$a<!> = x}
var b : Int = 222
get() = field
set(x) {a = x; field = x}
init {
<!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$b<!> = <!BACKING_FIELD_USAGE_FORBIDDEN!>$a<!>
<!BACKING_FIELD_USAGE_FORBIDDEN!>$a<!> = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$b<!>
a = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$b<!>
}
fun f() {
<!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$b<!> = <!BACKING_FIELD_USAGE_FORBIDDEN!>$a<!>
a = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$b<!>
}
public val i = 1
}
compiler/testData/diagnostics/tests/Properties.txt
Vendored
-1
View File
@@ -10,7 +10,6 @@ public final class Test {
public final var b: kotlin.Int
public final val i: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun f(): kotlin.Unit
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/CustomGetSet.kt
Vendored
-5
View File
@@ -3,9 +3,4 @@ class Flower() {
var minusOne: Int = 1
get() = field + 1
set(n: Int) { field = n - 1 }
var oldSyntax: Int = 1
get() = <!BACKING_FIELD_OLD_SYNTAX!>$oldSyntax<!> - 1
set(arg) { <!BACKING_FIELD_OLD_SYNTAX!>$oldSyntax<!> = arg + 1 }
}
compiler/testData/diagnostics/tests/backingField/CustomGetSet.txt
Vendored
-1
View File
@@ -3,7 +3,6 @@ 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/CyclicReferenceInitializer.kt
Vendored
-3
View File
@@ -1,3 +0,0 @@
class Cyclic() {
val a = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE!>$a<!>
}
compiler/testData/diagnostics/tests/backingField/CyclicReferenceInitializer.txt
Vendored
-9
View File
@@ -1,9 +0,0 @@
package
public final class Cyclic {
public constructor Cyclic()
public final val a: [ERROR : Type for $a]
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/ReadNonexistentAbstractPropertyInAnonymous.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
abstract class ReadNonexistent() {
abstract val aa: Int
init {
val <!UNUSED_VARIABLE!>x<!> = <!NO_BACKING_FIELD_ABSTRACT_PROPERTY!>$aa<!>
}
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.txt
Vendored
-9
View File
@@ -1,9 +0,0 @@
package
public abstract class ReadNonexistent {
public constructor ReadNonexistent()
public abstract val aa: 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/ReadNonexistentAbstractPropertyInFunction.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
abstract class ReadNonexistent {
abstract val aa: Int
fun ff() = <!NO_BACKING_FIELD_ABSTRACT_PROPERTY!>$aa<!>
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInFunction.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
package
public abstract class ReadNonexistent {
public constructor ReadNonexistent()
public abstract val aa: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun ff(): kotlin.Int
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/ReadNonexistentCustomGetInAnonymous.kt
Vendored
-8
View File
@@ -1,8 +0,0 @@
class ReadNonexistent() {
val a: Int
get() = 1
init {
val <!UNUSED_VARIABLE!>x<!> = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
}
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnonymous.txt
Vendored
-9
View File
@@ -1,9 +0,0 @@
package
public final class ReadNonexistent {
public constructor ReadNonexistent()
public final val a: 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/ReadNonexistentCustomGetInAnotherInitializer.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
class CustomValNoBackingField() {
val a: Int
get() = 1
val b = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentCustomGetInAnotherInitializer.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
package
public final class CustomValNoBackingField {
public constructor CustomValNoBackingField()
public final val a: kotlin.Int
public final val b: 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/ReadNonexistentDeclaredInHigher.kt
Vendored
-6
View File
@@ -1,6 +0,0 @@
class CustomValNoBackingField() {
val a: Int
get() = 1
val b = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentDeclaredInHigher.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
package
public final class CustomValNoBackingField {
public constructor CustomValNoBackingField()
public final val a: kotlin.Int
public final val b: 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/ReadNonexistentPropertyInAnonymous.kt
Vendored
-5
View File
@@ -1,5 +0,0 @@
class Cl() {
init {
val <!UNUSED_VARIABLE!>x<!> = <!UNRESOLVED_REFERENCE!>$a<!>
}
}
compiler/testData/diagnostics/tests/backingField/ReadNonexistentPropertyInAnonymous.txt
Vendored
-8
View File
@@ -1,8 +0,0 @@
package
public final class Cl {
public constructor Cl()
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/WriteNonexistentDeclaredInHigher.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
val y = 1
class A() {
init {
<!INACCESSIBLE_BACKING_FIELD!>$y<!> = 1
}
}
compiler/testData/diagnostics/tests/backingField/WriteNonexistentDeclaredInHigher.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
package
public val y: kotlin.Int = 1
public final class A {
public constructor A()
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/kt782packageLevel.kt
Vendored
+2 -6
View File
@@ -12,9 +12,5 @@ get() {
val x : Int
get() = z
val w : Int
get() = <!INACCESSIBLE_BACKING_FIELD!>$z<!>
fun foo() {
<!INACCESSIBLE_BACKING_FIELD!>$y<!> = 34
}
val w : Int = 56
get() = field
compiler/testData/diagnostics/tests/backingField/kt782packageLevel.txt
Vendored
+1 -2
View File
@@ -1,9 +1,8 @@
package
package kt782 {
public val w: kotlin.Int
public val w: kotlin.Int = 56
public val x: kotlin.Int
public val y: kotlin.Int = 11
public val z: kotlin.Int = 34
public fun foo(): kotlin.Unit
}
compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
abstract class Bar {
abstract var bar : String
fun foo() = "foo" + this.<!NO_BACKING_FIELD_ABSTRACT_PROPERTY!>$bar<!>
}
compiler/testData/diagnostics/tests/backingField/qualifiedWithThis.txt
Vendored
-10
View File
@@ -1,10 +0,0 @@
package
public abstract class Bar {
public constructor Bar()
public abstract var bar: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.String
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt
Vendored
+1 -3
View File
@@ -135,7 +135,6 @@ class AnonymousInitializers(var a: String, val b: String) {
init {
<!VAL_REASSIGNMENT!>i<!> = 13
<!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$j<!> = 30
<!VAL_REASSIGNMENT!>j<!> = 34
}
@@ -241,7 +240,7 @@ class Outer() {
}
class ForwardAccessToBackingField() { //kt-147
val a = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE!>$a<!> // error
val a = <!TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM, UNINITIALIZED_VARIABLE!>a<!> // error
val b = <!UNINITIALIZED_VARIABLE!>c<!> // error
val c = 1
}
@@ -327,7 +326,6 @@ fun func() {
val x = b
init {
<!VAL_REASSIGNMENT!>b<!> = 4
<!UNRESOLVED_REFERENCE!>$b<!> = 3
}
}
}
compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.txt
Vendored
+1 -1
View File
@@ -61,7 +61,7 @@ package uninitialized_reassigned_variables {
public final class ForwardAccessToBackingField {
public constructor ForwardAccessToBackingField()
public final val a: [ERROR : Type for $a]
public final val a: [ERROR : Type for a]
public final val b: kotlin.Int = 1
public final val c: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
compiler/testData/diagnostics/tests/delegatedProperty/backingField.kt
Vendored
+1 -1
View File
@@ -5,7 +5,7 @@ import kotlin.reflect.KProperty
class B {
val a: Int by Delegate()
fun foo() = <!NO_BACKING_FIELD_CUSTOM_ACCESSORS!>$a<!>
fun foo() =<!SYNTAX!><!> <!SYNTAX!>$a<!>
}
class Delegate {
compiler/testData/diagnostics/tests/delegatedProperty/backingField.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ public final class B {
public constructor B()
public final val a: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Int
public final fun foo(): [ERROR : No type, no body]
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@ package h
class Square() {
var size : Double =
<!UNRESOLVED_REFERENCE!>set<!>(<!UNRESOLVED_REFERENCE!>value<!>) {
<!BACKING_FIELD_USAGE_FORBIDDEN!>$area<!> = size * size
<!SYNTAX!>$area<!> <!SYNTAX!>= size * size<!>
}
<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var area : Double<!>
compiler/testData/diagnostics/tests/scopes/kt250.617.10.kt
Vendored
+1 -1
View File
@@ -9,7 +9,7 @@ class B(<!UNUSED_PARAMETER!>y<!>: Int) : A(<!UNRESOLVED_REFERENCE!>x<!>) //x is
//KT-617 Prohibit dollars in call to superclass constructors
open class M(<!UNUSED_PARAMETER!>p<!>: Int)
class N(val p: Int) : A(<!UNRESOLVED_REFERENCE!>$p<!>)
class N(val p: Int) : A(<!SYNTAX!><!SYNTAX!><!>$p<!><!SYNTAX!>)<!>
//KT-10 Don't allow to use properties in supertype initializers
open class Element()