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

Deprecate JVM platform annotations in favor of capitilized themselves

Browse Source
This commit is contained in:
Denis Zharkov
2015-09-04 14:46:46 +03:00
parent 5471a1d18a
commit 952d45dc8b
107 changed files with 290 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNamesDuplicate.kt
Vendored
+6 -6
View File
@@ -1,14 +1,14 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!CONFLICTING_JVM_DECLARATIONS!>@jvmName("bar")
<!CONFLICTING_JVM_DECLARATIONS!>@JvmName("bar")
fun foo(a: Any)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>fun bar(a: Any)<!> {}
class C {
<!CONFLICTING_JVM_DECLARATIONS!>@jvmName("foo1")
<!CONFLICTING_JVM_DECLARATIONS!>@JvmName("foo1")
fun foo(list: List<Int>)<!> {}
<!CONFLICTING_JVM_DECLARATIONS!>@jvmName("foo1")
<!CONFLICTING_JVM_DECLARATIONS!>@JvmName("foo1")
fun foo(list: List<String>)<!> {}
}
@@ -17,7 +17,7 @@ class C {
// A1 -> B1 with accidental override
open class A1 {
<!INAPPLICABLE_JVM_NAME!>@jvmName("bar")<!>
<!INAPPLICABLE_JVM_NAME!>@JvmName("bar")<!>
open fun foo() {}
}
@@ -28,7 +28,7 @@ class B1 : A1() {
// A2 -> B2 with intended override and conflicting JVM declarations
open class A2 {
<!INAPPLICABLE_JVM_NAME!>@jvmName("bar")<!>
<!INAPPLICABLE_JVM_NAME!>@JvmName("bar")<!>
open fun foo() {}
}
@@ -41,7 +41,7 @@ class <!CONFLICTING_JVM_DECLARATIONS!>B2<!> : A2() {
// A3 -> B3 -> C3 with accidental override
open class A3 {
<!INAPPLICABLE_JVM_NAME!>@jvmName("bar")<!>
<!INAPPLICABLE_JVM_NAME!>@JvmName("bar")<!>
open fun foo() {}
}