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

rename platformName annotation to jvmName

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-08-24 21:05:26 +02:00
parent 3465126bee
commit 4743a69d76
26 changed files with 249 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt
Vendored
+5 -7
View File
@@ -1,22 +1,20 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
import kotlin.platform.*
@platformName("bar")
@jvmName("bar")
fun foo(a: Any) {}
fun Any.foo() {}
@platformName("barInt")
@jvmName("barInt")
fun bar(x: List<Int>) {}
@platformName("barStr")
@jvmName("barStr")
fun bar(x: List<String>) {}
class C {
var rwProp: Int
@platformName("get_rwProp")
@jvmName("get_rwProp")
get() = 0
@platformName("set_rwProp")
@jvmName("set_rwProp")
set(v) {}
fun getRwProp(): Int = 123
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.txt
Vendored
+3 -3
View File
@@ -1,8 +1,8 @@
package
kotlin.platform.platformName(name = "barInt") internal fun bar(/*0*/ x: kotlin.List<kotlin.Int>): kotlin.Unit
kotlin.platform.platformName(name = "barStr") internal fun bar(/*0*/ x: kotlin.List<kotlin.String>): kotlin.Unit
kotlin.platform.platformName(name = "bar") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
kotlin.jvm.jvmName(name = "barInt") internal fun bar(/*0*/ x: kotlin.List<kotlin.Int>): kotlin.Unit
kotlin.jvm.jvmName(name = "barStr") internal fun bar(/*0*/ x: kotlin.List<kotlin.String>): kotlin.Unit
kotlin.jvm.jvmName(name = "bar") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
internal fun kotlin.Any.foo(): kotlin.Unit
internal final class C {
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt
Vendored
+6 -8
View File
@@ -1,16 +1,14 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
import kotlin.platform.*
<!CONFLICTING_JVM_DECLARATIONS!>@platformName("bar")
<!CONFLICTING_JVM_DECLARATIONS!>@jvmName("bar")
fun foo(a: Any)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun bar(a: Any)<!> {}
class C {
<!CONFLICTING_JVM_DECLARATIONS!>@platformName("foo1")
<!CONFLICTING_JVM_DECLARATIONS!>@jvmName("foo1")
fun foo(list: List<Int>)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>@platformName("foo1")
<!CONFLICTING_JVM_DECLARATIONS!>@jvmName("foo1")
fun foo(list: List<String>)<!> {}
}
@@ -19,7 +17,7 @@ class C {
// A1 -> B1 with accidental override
open class A1 {
<!INAPPLICABLE_PLATFORM_NAME!>@platformName("bar")<!>
<!INAPPLICABLE_JVM_NAME!>@jvmName("bar")<!>
open fun foo() {}
}
@@ -30,7 +28,7 @@ class B1 : A1() {
// A2 -> B2 with intended override and conflicting JVM declarations
open class A2 {
<!INAPPLICABLE_PLATFORM_NAME!>@platformName("bar")<!>
<!INAPPLICABLE_JVM_NAME!>@jvmName("bar")<!>
open fun foo() {}
}
@@ -43,7 +41,7 @@ class <!CONFLICTING_JVM_DECLARATIONS!>B2<!> : A2() {
// A3 -> B3 -> C3 with accidental override
open class A3 {
<!INAPPLICABLE_PLATFORM_NAME!>@platformName("bar")<!>
<!INAPPLICABLE_JVM_NAME!>@jvmName("bar")<!>
open fun foo() {}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.txt
Vendored
+9 -9
View File
@@ -1,12 +1,12 @@
package
internal fun bar(/*0*/ a: kotlin.Any): kotlin.Unit
kotlin.platform.platformName(name = "bar") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
kotlin.jvm.jvmName(name = "bar") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
internal open class A1 {
public constructor A1()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.platform.platformName(name = "bar") internal open fun foo(): kotlin.Unit
kotlin.jvm.jvmName(name = "bar") internal 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
}
@@ -14,7 +14,7 @@ internal open class A1 {
internal open class A2 {
public constructor A2()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.platform.platformName(name = "bar") internal open fun foo(): kotlin.Unit
kotlin.jvm.jvmName(name = "bar") internal 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
}
@@ -22,7 +22,7 @@ internal open class A2 {
internal open class A3 {
public constructor A3()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.platform.platformName(name = "bar") internal open fun foo(): kotlin.Unit
kotlin.jvm.jvmName(name = "bar") internal 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
}
@@ -31,7 +31,7 @@ internal final class B1 : A1 {
public constructor B1()
internal final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.platform.platformName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
kotlin.jvm.jvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -48,7 +48,7 @@ internal final class B2 : A2 {
internal open class B3 : A3 {
public constructor B3()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.platform.platformName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
kotlin.jvm.jvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -56,8 +56,8 @@ internal open class B3 : A3 {
internal final class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.platform.platformName(name = "foo1") internal final fun foo(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
kotlin.platform.platformName(name = "foo1") internal final fun foo(/*0*/ list: kotlin.List<kotlin.String>): kotlin.Unit
kotlin.jvm.jvmName(name = "foo1") internal final fun foo(/*0*/ list: kotlin.List<kotlin.Int>): kotlin.Unit
kotlin.jvm.jvmName(name = "foo1") internal final fun foo(/*0*/ list: kotlin.List<kotlin.String>): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
@@ -66,7 +66,7 @@ internal final class C3 : B3 {
public constructor C3()
internal final fun bar(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.platform.platformName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
kotlin.jvm.jvmName(name = "bar") internal open override /*1*/ /*fake_override*/ fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}