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

private / protected / internal modifiers are deprecated in interfaces, relevant tests changed

Browse Source
This commit is contained in:
Mikhail Glukhikh
2015-09-22 11:30:33 +03:00
parent dcb84a7d0a
commit 731fdecf06
33 changed files with 76 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/override/AllPrivateFromSuperTypes.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
package test
interface A {
private val a: String
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>private<!> val a: String
get() = "AAAA!"
}
compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
package test
interface A {
protected val a: String
}
open class C {
protected val a: String = ""
}
class Subject : C(), A {
val c = a
}
compiler/testData/diagnostics/tests/override/AllProtectedFromSupertypes.txt
Vendored
-28
View File
@@ -1,28 +0,0 @@
package
package test {
public interface A {
protected abstract val a: kotlin.String
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
}
public open class C {
public constructor C()
protected final val a: kotlin.String = ""
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
}
public final class Subject : test.C, test.A {
public constructor Subject()
protected final override /*2*/ /*fake_override*/ val a: kotlin.String
public final val c: kotlin.String
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/override/CannotInferVisibilityForProperty.kt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
interface T {
internal var foo: Long
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>internal<!> var foo: Long
}
interface U {
protected var foo: Long
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> var foo: Long
}
interface V : T, U {
compiler/testData/diagnostics/tests/override/CannotInferVisibilityForPropertySetter.kt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
interface T {
public var foo: Short
internal set
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>internal<!> set
}
interface U {
public var foo: Short
protected set
<!DEPRECATED_MODIFIER_CONTAINING_DECLARATION!>protected<!> set
}
interface V : T, U {
compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.kt
Vendored
+2 -2
View File
@@ -1,11 +1,11 @@
package test
interface A {
protected val a: String
val a: String
}
interface B {
protected val a: String
val a: String
}
open class C {
compiler/testData/diagnostics/tests/override/ProtectedAndPrivateFromSupertypes.txt
Vendored
+3 -3
View File
@@ -3,14 +3,14 @@ package
package test {
public interface A {
protected abstract val a: kotlin.String
public abstract val a: kotlin.String
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
}
public interface B {
protected abstract val a: kotlin.String
public abstract val a: kotlin.String
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
@@ -26,7 +26,7 @@ package test {
public final class Subject : test.C, test.A, test.B {
public constructor Subject()
protected abstract override /*2*/ /*fake_override*/ val a: kotlin.String
public abstract override /*2*/ /*fake_override*/ val a: kotlin.String
public final val c: kotlin.String
public open override /*3*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*3*/ /*fake_override*/ fun hashCode(): kotlin.Int
compiler/testData/diagnostics/tests/override/kt4785.kt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
interface T {
internal fun foo()
fun foo()
}
open class C {
compiler/testData/diagnostics/tests/override/kt4785.txt
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ public final class E : C, T {
public interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): kotlin.Unit
public abstract fun foo(): 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/override/kt4785classObject.kt
Vendored
-13
View File
@@ -1,13 +0,0 @@
interface A {
internal fun foo()
}
interface B {
protected fun foo() {}
}
class C {
companion <!CANNOT_INFER_VISIBILITY!>object<!> : A, B {
fun bar() = null
}
}
compiler/testData/diagnostics/tests/override/kt4785classObject.txt
Vendored
-31
View File
@@ -1,31 +0,0 @@
package
public interface A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
protected open fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class C {
public constructor C()
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
public companion object Companion : A, B {
private constructor Companion()
public final fun bar(): kotlin.Nothing?
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}
}
compiler/testData/diagnostics/tests/override/kt4785delegation.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
interface A {
internal fun foo()
}
interface B {
protected fun foo()
}
class <!CANNOT_INFER_VISIBILITY!>E(a: A)<!> : A by a, B
compiler/testData/diagnostics/tests/override/kt4785delegation.txt
Vendored
-23
View File
@@ -1,23 +0,0 @@
package
public interface A {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal abstract fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface B {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
protected abstract fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class E : A, B {
public constructor E(/*0*/ a: A)
public open override /*2*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public open override /*2*/ /*delegation*/ fun foo(): kotlin.Unit
public open override /*2*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*2*/ /*fake_override*/ fun toString(): kotlin.String
}