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/annotations/annotationApplicability/illegalPlatformName.kt
Vendored
+4 -4
View File
@@ -1,12 +1,12 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
<!ILLEGAL_JVM_NAME!>@jvmName("")<!>
<!ILLEGAL_JVM_NAME!>@JvmName("")<!>
fun foo(a: Any) {}
<!ILLEGAL_JVM_NAME!>@jvmName(".")<!>
<!ILLEGAL_JVM_NAME!>@JvmName(".")<!>
fun foo() {}
<!ILLEGAL_JVM_NAME!>@jvmName("/")<!>
<!ILLEGAL_JVM_NAME!>@JvmName("/")<!>
fun fooSlash() {}
<!ILLEGAL_JVM_NAME!>@jvmName("<")<!>
<!ILLEGAL_JVM_NAME!>@JvmName("<")<!>
fun fooLT() {}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/illegalPlatformName.txt
Vendored
+4 -4
View File
@@ -1,6 +1,6 @@
package
kotlin.jvm.jvmName(name = ".") internal fun foo(): kotlin.Unit
kotlin.jvm.jvmName(name = "") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
kotlin.jvm.jvmName(name = "<") internal fun fooLT(): kotlin.Unit
kotlin.jvm.jvmName(name = "/") internal fun fooSlash(): kotlin.Unit
kotlin.jvm.JvmName(name = ".") internal fun foo(): kotlin.Unit
kotlin.jvm.JvmName(name = "") internal fun foo(/*0*/ a: kotlin.Any): kotlin.Unit
kotlin.jvm.JvmName(name = "<") internal fun fooLT(): kotlin.Unit
kotlin.jvm.JvmName(name = "/") internal fun fooSlash(): kotlin.Unit
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.kt
Vendored
+26 -26
View File
@@ -1,89 +1,89 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE -UNUSED_PARAMETER
@jvmName("a")
@JvmName("a")
fun foo() {}
@jvmName("b")
@JvmName("b")
fun Any.foo() {}
@jvmName("c")
@JvmName("c")
val px = 1
@jvmName("d")
@JvmName("d")
val Any.px : Int
get() = 1
val valx: Int
@jvmName("e")
@JvmName("e")
get() = 1
var varx: Int
@jvmName("f")
@JvmName("f")
get() = 1
@jvmName("g")
@JvmName("g")
set(v) {}
var vardef: Int = 1
@jvmName("h")
@JvmName("h")
get
@jvmName("i")
@JvmName("i")
set
<!WRONG_ANNOTATION_TARGET!>@jvmName("C")<!>
class C <!WRONG_ANNOTATION_TARGET!>jvmName("primary")<!> constructor() {
<!WRONG_ANNOTATION_TARGET!>jvmName("ctr")<!> constructor(x: Int): this() {}
<!WRONG_ANNOTATION_TARGET!>@JvmName("C")<!>
class C <!WRONG_ANNOTATION_TARGET!>JvmName("primary")<!> constructor() {
<!WRONG_ANNOTATION_TARGET!>JvmName("ctr")<!> constructor(x: Int): this() {}
@jvmName("a")
@JvmName("a")
fun foo() {}
@jvmName("b")
@JvmName("b")
fun Any.foo() {}
@jvmName("c")
@JvmName("c")
val px = 1
@jvmName("d")
@JvmName("d")
val Any.px : Int
get() = 1
val valx: Int
@jvmName("e")
@JvmName("e")
get() = 1
var varx: Int
@jvmName("f")
@JvmName("f")
get() = 1
@jvmName("g")
@JvmName("g")
set(v) {}
}
fun foo1() {
<!INAPPLICABLE_JVM_NAME!>@jvmName("a")<!>
<!INAPPLICABLE_JVM_NAME!>@JvmName("a")<!>
fun foo() {}
<!WRONG_ANNOTATION_TARGET!>@jvmName("a")<!>
<!WRONG_ANNOTATION_TARGET!>@JvmName("a")<!>
val x = 1
}
abstract class AB {
<!INAPPLICABLE_JVM_NAME!>@jvmName("AB_absFun1")<!>
<!INAPPLICABLE_JVM_NAME!>@JvmName("AB_absFun1")<!>
abstract fun absFun1()
abstract fun absFun2()
<!INAPPLICABLE_JVM_NAME!>@jvmName("AB_openFun")<!>
<!INAPPLICABLE_JVM_NAME!>@JvmName("AB_openFun")<!>
open fun openFun() {}
}
class D: AB() {
override fun absFun1() {}
<!INAPPLICABLE_JVM_NAME!>@jvmName("D_absFun2")<!>
<!INAPPLICABLE_JVM_NAME!>@JvmName("D_absFun2")<!>
override fun absFun2() {}
<!INAPPLICABLE_JVM_NAME!>@jvmName("D_openFun")<!>
<!INAPPLICABLE_JVM_NAME!>@JvmName("D_openFun")<!>
final override fun openFun() {}
@jvmName("D_finalFun")
@JvmName("D_finalFun")
fun finalFun() {}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/annotationApplicability/jvmName.txt
Vendored
+12 -12
View File
@@ -5,41 +5,41 @@ internal val valx: kotlin.Int
internal var vardef: kotlin.Int
internal var varx: kotlin.Int
internal val kotlin.Any.px: kotlin.Int
kotlin.jvm.jvmName(name = "a") internal fun foo(): kotlin.Unit
kotlin.jvm.JvmName(name = "a") internal fun foo(): kotlin.Unit
internal fun foo1(): kotlin.Unit
kotlin.jvm.jvmName(name = "b") internal fun kotlin.Any.foo(): kotlin.Unit
kotlin.jvm.JvmName(name = "b") internal fun kotlin.Any.foo(): kotlin.Unit
internal abstract class AB {
public constructor AB()
kotlin.jvm.jvmName(name = "AB_absFun1") internal abstract fun absFun1(): kotlin.Unit
kotlin.jvm.JvmName(name = "AB_absFun1") internal abstract fun absFun1(): kotlin.Unit
internal abstract fun absFun2(): kotlin.Unit
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.jvmName(name = "AB_openFun") internal open fun openFun(): kotlin.Unit
kotlin.jvm.JvmName(name = "AB_openFun") internal open fun openFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
kotlin.jvm.jvmName(name = "C") internal final class C {
kotlin.jvm.jvmName(name = "primary") public constructor C()
kotlin.jvm.jvmName(name = "ctr") public constructor C(/*0*/ x: kotlin.Int)
kotlin.jvm.JvmName(name = "C") internal final class C {
kotlin.jvm.JvmName(name = "primary") public constructor C()
kotlin.jvm.JvmName(name = "ctr") public constructor C(/*0*/ x: kotlin.Int)
internal final val px: kotlin.Int = 1
internal final val valx: kotlin.Int
internal final var varx: kotlin.Int
internal final val kotlin.Any.px: kotlin.Int
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmName(name = "a") internal final fun foo(): kotlin.Unit
kotlin.jvm.JvmName(name = "a") internal final fun foo(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
kotlin.jvm.jvmName(name = "b") internal final fun kotlin.Any.foo(): kotlin.Unit
kotlin.jvm.JvmName(name = "b") internal final fun kotlin.Any.foo(): kotlin.Unit
}
internal final class D : AB {
public constructor D()
internal open override /*1*/ fun absFun1(): kotlin.Unit
kotlin.jvm.jvmName(name = "D_absFun2") internal open override /*1*/ fun absFun2(): kotlin.Unit
kotlin.jvm.JvmName(name = "D_absFun2") internal open override /*1*/ fun absFun2(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmName(name = "D_finalFun") internal final fun finalFun(): kotlin.Unit
kotlin.jvm.JvmName(name = "D_finalFun") internal final fun finalFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
kotlin.jvm.jvmName(name = "D_openFun") internal final override /*1*/ fun openFun(): kotlin.Unit
kotlin.jvm.JvmName(name = "D_openFun") internal final override /*1*/ fun openFun(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}