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

Support default method super calls within @JvmDefault ones

Browse Source
This commit is contained in:
Mikhael Bogdanov
2018-04-06 10:52:45 +02:00
parent 942dd8a67c
commit cb9c1ae104
8 changed files with 718 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.kt
Vendored
+323
View File
@@ -0,0 +1,323 @@
// !API_VERSION: 1.3
// !ENABLE_JVM_DEFAULT
// !JVM_TARGET: 1.8
public interface KInterface {
@JvmDefault
fun test(): String {
return "OK";
}
@JvmDefault
val property: String
get() = "OK"
fun testNonDefault(): String {
return "OK";
}
val propertyNonDefault: String
get() = "OK"
}
// FILE: 1.kt
interface KotlinInterface : KInterface {
@JvmDefault
fun fooo() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
}
@JvmDefault
val propertyy: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterface.test()
super@KotlinInterface.property
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
return ""
}
fun foooNonDefault() {
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
}
val propertyyNonDefault: String
get() {
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super@KotlinInterface.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super@KotlinInterface.testNonDefault()
super@KotlinInterface.propertyNonDefault
}
}
return ""
}
}
interface KotlinInterfaceInderectInheritance : KotlinInterface {
@JvmDefault
fun foooo() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterfaceInderectInheritance.test()
super@KotlinInterfaceInderectInheritance.property
super@KotlinInterfaceInderectInheritance.testNonDefault()
super@KotlinInterfaceInderectInheritance.propertyNonDefault
}
}
}
@JvmDefault
val propertyyy: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterfaceInderectInheritance.test()
super@KotlinInterfaceInderectInheritance.property
super@KotlinInterfaceInderectInheritance.testNonDefault()
super@KotlinInterfaceInderectInheritance.propertyNonDefault
}
}
return ""
}
fun fooooNonDefault() {
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super@KotlinInterfaceInderectInheritance.testNonDefault()
super@KotlinInterfaceInderectInheritance.propertyNonDefault
}
}
}
val propertyyyNonDefault: String
get() {
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>test<!>()
super@KotlinInterfaceInderectInheritance.<!INTERFACE_CANT_CALL_DEFAULT_METHOD_VIA_SUPER!>property<!>
super@KotlinInterfaceInderectInheritance.testNonDefault()
super@KotlinInterfaceInderectInheritance.propertyNonDefault
}
}
return ""
}
}
open class KotlinClass : KInterface {
fun foo() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClass.test()
super@KotlinClass.property
super@KotlinClass.testNonDefault()
super@KotlinClass.propertyNonDefault
}
}
}
val xproperty: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClass.test()
super@KotlinClass.property
super@KotlinClass.testNonDefault()
super@KotlinClass.propertyNonDefault
}
}
return ""
}
}
class KotlinClassInderectInheritance : KotlinClass() {
fun foo2() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClassInderectInheritance.test()
super@KotlinClassInderectInheritance.property
super@KotlinClassInderectInheritance.testNonDefault()
super@KotlinClassInderectInheritance.propertyNonDefault
}
}
}
val property2: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClassInderectInheritance.test()
super@KotlinClassInderectInheritance.property
super@KotlinClassInderectInheritance.testNonDefault()
super@KotlinClassInderectInheritance.propertyNonDefault
}
}
return ""
}
}
class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
fun foo() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClassInderectInheritance2.test()
super@KotlinClassInderectInheritance2.property
super@KotlinClassInderectInheritance2.testNonDefault()
super@KotlinClassInderectInheritance2.propertyNonDefault
}
}
}
val xproperty: String
get() {
super.test()
super.property
super.testNonDefault()
super.propertyNonDefault
object {
fun run () {
super@KotlinClassInderectInheritance2.test()
super@KotlinClassInderectInheritance2.property
super@KotlinClassInderectInheritance2.testNonDefault()
super@KotlinClassInderectInheritance2.propertyNonDefault
}
}
return ""
}
}
fun test() {
KotlinClass().test()
KotlinClass().property
KotlinClass().propertyNonDefault
KotlinClassInderectInheritance2().test()
KotlinClassInderectInheritance2().testNonDefault()
KotlinClassInderectInheritance2().propertyyy
KotlinClassInderectInheritance2().propertyyyNonDefault
KotlinClass().test()
KotlinClass().testNonDefault()
KotlinClass().property
KotlinClass().propertyNonDefault
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaults.txt
Vendored
+94
View File
@@ -0,0 +1,94 @@
package
public fun test(): kotlin.Unit
public interface KInterface {
@kotlin.jvm.JvmDefault public open val property: kotlin.String
public open val propertyNonDefault: 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
@kotlin.jvm.JvmDefault public open fun test(): kotlin.String
public open fun testNonDefault(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class KotlinClass : KInterface {
public constructor KotlinClass()
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
public final val xproperty: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class KotlinClassInderectInheritance : KotlinClass {
public constructor KotlinClassInderectInheritance()
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
public final val property2: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
public final override /*1*/ /*fake_override*/ val xproperty: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public final fun foo2(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
public constructor KotlinClassInderectInheritance2()
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyyNonDefault: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyyyNonDefault: kotlin.String
public final val xproperty: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foooNonDefault(): kotlin.Unit
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun foooo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun fooooNonDefault(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface KotlinInterface : KInterface {
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
@kotlin.jvm.JvmDefault public open val propertyy: kotlin.String
public open val propertyyNonDefault: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmDefault public open fun fooo(): kotlin.Unit
public open fun foooNonDefault(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface KotlinInterfaceInderectInheritance : KotlinInterface {
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val property: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyNonDefault: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
public open override /*1*/ /*fake_override*/ val propertyyNonDefault: kotlin.String
@kotlin.jvm.JvmDefault public open val propertyyy: kotlin.String
public open val propertyyyNonDefault: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun foooNonDefault(): kotlin.Unit
@kotlin.jvm.JvmDefault public open fun foooo(): kotlin.Unit
public open fun fooooNonDefault(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun test(): kotlin.String
public open override /*1*/ /*fake_override*/ fun testNonDefault(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.kt
Vendored
+163
View File
@@ -0,0 +1,163 @@
// !API_VERSION: 1.3
// !ENABLE_JVM_DEFAULT
// !JVM_TARGET: 1.8
// FILE: JavaInterface.java
public interface JavaInterface {
default String test() {
return "OK";
}
default String testOverride() {
return "OK";
}
}
// FILE: 1.kt
interface KotlinInterface : JavaInterface {
@JvmDefault
fun fooo() {
super.test()
object {
fun run () {
super@KotlinInterface.test()
}
}
}
@JvmDefault
val propertyy: String
get() {
super.test()
object {
fun run () {
super@KotlinInterface.test()
}
}
return ""
}
@JvmDefault
override fun testOverride(): String {
return "OK";
}
}
interface KotlinInterfaceInderectInheritance : KotlinInterface {
@JvmDefault
fun foooo() {
super.test()
object {
fun run () {
super@KotlinInterfaceInderectInheritance.test()
}
}
}
@JvmDefault
val propertyyy: String
get() {
super.test()
object {
fun run () {
super@KotlinInterfaceInderectInheritance.test()
}
}
return ""
}
}
open class KotlinClass : JavaInterface {
fun foo() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClass.test()
}
}
}
val property: String
get() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClass.test()
}
}
return ""
}
}
class KotlinClassInderectInheritance : KotlinClass() {
fun foo2() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClassInderectInheritance.test()
}
}
}
val property2: String
get() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClassInderectInheritance.test()
}
}
return ""
}
}
class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
fun foo() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClassInderectInheritance2.test()
}
}
}
val property: String
get() {
super.test()
super.testOverride()
object {
fun run () {
super@KotlinClassInderectInheritance2.test()
}
}
return ""
}
}
fun test() {
KotlinClass().foo()
KotlinClass().property
KotlinClassInderectInheritance2().foo()
KotlinClassInderectInheritance2().property
KotlinClass().test()
KotlinClass().property
KotlinClass().testOverride()
KotlinClassInderectInheritance().testOverride()
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmDefault/jvmDefaultsWithJava.txt
Vendored
+72
View File
@@ -0,0 +1,72 @@
package
public fun test(): kotlin.Unit
public interface JavaInterface {
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 fun test(): kotlin.String!
public open fun testOverride(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open class KotlinClass : JavaInterface {
public constructor KotlinClass()
public final val property: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun test(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun testOverride(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class KotlinClassInderectInheritance : KotlinClass {
public constructor KotlinClassInderectInheritance()
public final override /*1*/ /*fake_override*/ val property: kotlin.String
public final val property2: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public final fun foo2(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun test(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun testOverride(): kotlin.String!
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final class KotlinClassInderectInheritance2 : KotlinInterfaceInderectInheritance {
public constructor KotlinClassInderectInheritance2()
public final val property: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyyy: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
public final fun foo(): kotlin.Unit
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun foooo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun test(): kotlin.String!
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun testOverride(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface KotlinInterface : JavaInterface {
@kotlin.jvm.JvmDefault public open val propertyy: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmDefault public open fun fooo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun test(): kotlin.String!
@kotlin.jvm.JvmDefault public open override /*1*/ fun testOverride(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public interface KotlinInterfaceInderectInheritance : KotlinInterface {
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ val propertyy: kotlin.String
@kotlin.jvm.JvmDefault public open val propertyyy: kotlin.String
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun fooo(): kotlin.Unit
@kotlin.jvm.JvmDefault public open fun foooo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun test(): kotlin.String!
@kotlin.jvm.JvmDefault public open override /*1*/ /*fake_override*/ fun testOverride(): kotlin.String
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}