Mark incompatibilities related to the declaration signature as STRONG

This commit is contained in:
Mikhail Zarechenskiy
2017-10-13 03:27:01 +03:00
parent d557c19a88
commit 61d1963ddb
9 changed files with 85 additions and 13 deletions
@@ -8,6 +8,9 @@ expect fun foo2<!JVM:NO_ACTUAL_FOR_EXPECT!>(x: Int)<!>
expect class NoArgConstructor()
expect fun foo3(): <!JVM:NO_ACTUAL_FOR_EXPECT!>Int<!>
expect fun foo4<!JVM:NO_ACTUAL_FOR_EXPECT!>()<!>: Int
// MODULE: m2-jvm(m1-common)
// FILE: jvm.kt
@@ -20,6 +23,9 @@ fun foo1(x: String) {}
fun foo2(x: Int, y: Int) {}
fun foo2(x: String) {}
actual fun foo3(): <!ACTUAL_WITHOUT_EXPECT!>String<!> = ""
fun foo4(x: Int): String = ""
actual class NoArgConstructor {
actual constructor()
actual constructor<!ACTUAL_WITHOUT_EXPECT!>(x: Int)<!>
@@ -3,6 +3,8 @@ package
public expect fun foo1(/*0*/ x: kotlin.Int): kotlin.Unit
public expect fun foo2(/*0*/ x: kotlin.Int): kotlin.Unit
public expect fun foo3(): kotlin.Int
public expect fun foo4(): kotlin.Int
public final expect class NoArgConstructor {
public constructor NoArgConstructor()
@@ -20,6 +22,8 @@ public fun foo1(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int): kotlin.Unit
public fun foo1(/*0*/ x: kotlin.String): kotlin.Unit
public fun foo2(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.Int): kotlin.Unit
public fun foo2(/*0*/ x: kotlin.String): kotlin.Unit
public actual fun foo3(): kotlin.String
public fun foo4(/*0*/ x: kotlin.Int): kotlin.String
public final actual class NoArgConstructor {
public constructor NoArgConstructor()
@@ -6,18 +6,23 @@
expect class Foo1
expect class Foo2
expect fun foo1(): Int
expect fun foo2(): Int
expect fun foo3<!JVM:NO_ACTUAL_FOR_EXPECT!>()<!>: Int
expect val s: String
expect open class <!JVM:PACKAGE_OR_CLASSIFIER_REDECLARATION!>Foo3<!>
// MODULE: m2-jvm(m1-common)
// FILE: jvm.kt
<!DECLARATION_WITH_INCOMPATIBLE_EXPECT!>interface<!> Foo1
<!ACTUAL_WITHOUT_EXPECT!>interface<!> Foo1
actual <!ACTUAL_WITHOUT_EXPECT!>interface<!> Foo2
actual fun foo1(): <!ACTUAL_WITHOUT_EXPECT!>String<!> = ""
actual <!ACTUAL_WITHOUT_EXPECT!>var<!> s: String = "value"
fun <!ACTUAL_MISSING!>foo2<!>(): Int = 0
fun foo3(x: Int): String = ""
actual class <!PACKAGE_OR_CLASSIFIER_REDECLARATION, ACTUAL_WITHOUT_EXPECT!>Foo3<!>
class <!PACKAGE_OR_CLASSIFIER_REDECLARATION, ACTUAL_WITHOUT_EXPECT!>Foo3<!>
@@ -1,9 +1,8 @@
// -- Module: <m1-common> --
package
public expect fun foo1(): kotlin.Int
public expect val s: kotlin.String
public expect fun foo2(): kotlin.Int
public expect fun foo3(): kotlin.Int
public final expect class Foo1 {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -17,13 +16,18 @@ public final expect class Foo2 {
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public open expect class Foo3 {
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
}
// -- Module: <m2-jvm> --
package
public actual fun foo1(): kotlin.String
public actual var s: kotlin.String
public fun foo2(): kotlin.Int
public fun foo3(/*0*/ x: kotlin.Int): kotlin.String
public interface Foo1 {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
@@ -36,3 +40,17 @@ public actual interface Foo2 {
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public final actual class Foo3 {
public constructor Foo3()
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 Foo3 {
public constructor Foo3()
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
}
@@ -23,7 +23,7 @@ open class Open {
}
actual open class Foo1 : Open() {
override val <!DECLARATION_WITH_INCOMPATIBLE_EXPECT!>x<!> = super.x
override val <!ACTUAL_WITHOUT_EXPECT!>x<!> = super.x
}
actual open class <!NO_ACTUAL_CLASS_MEMBER_FOR_EXPECTED_CLASS!>Foo2<!> : Open()