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/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
}