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/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() {}
}