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
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt
Vendored
+2 -2
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
@kotlin.jvm.jvmOverloads <!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>constructor()<!> {
@kotlin.jvm.JvmOverloads <!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>constructor()<!> {
}
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>@kotlin.jvm.jvmOverloads fun foo(s: String)<!> {}
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>@kotlin.jvm.JvmOverloads fun foo(s: String)<!> {}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt
Vendored
+2 -2
View File
@@ -1,9 +1,9 @@
package
internal final class C {
kotlin.jvm.jvmOverloads() public constructor C()
kotlin.jvm.JvmOverloads() public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmOverloads() internal final fun foo(/*0*/ s: kotlin.String): kotlin.Unit
kotlin.jvm.JvmOverloads() internal final fun foo(/*0*/ s: kotlin.String): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
interface T {
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.jvmOverloads fun foo(s: String = "OK")<!>
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.JvmOverloads fun foo(s: String = "OK")<!>
}
abstract class C {
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.jvmOverloads abstract fun foo(s: String = "OK")<!>
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.JvmOverloads abstract fun foo(s: String = "OK")<!>
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnAbstractMethods.txt
Vendored
+2 -2
View File
@@ -3,14 +3,14 @@ package
internal abstract class C {
public constructor C()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmOverloads() internal abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
kotlin.jvm.JvmOverloads() internal abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
internal interface T {
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmOverloads() internal abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
kotlin.jvm.JvmOverloads() internal abstract fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.kt
Vendored
+4 -4
View File
@@ -1,20 +1,20 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.jvmOverloads private fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.JvmOverloads private fun foo(s: String = "OK")<!> {
}
@kotlin.jvm.jvmOverloads fun bar(s: String = "OK") {
@kotlin.jvm.JvmOverloads fun bar(s: String = "OK") {
}
}
fun foo() {
class D {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.jvmOverloads fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.JvmOverloads fun foo(s: String = "OK")<!> {
}
}
val <!UNUSED_VARIABLE!>x<!> = object {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.jvmOverloads fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.JvmOverloads fun foo(s: String = "OK")<!> {
}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt
Vendored
+2 -2
View File
@@ -4,9 +4,9 @@ internal fun foo(): kotlin.Unit
internal final class C {
public constructor C()
kotlin.jvm.jvmOverloads() internal final fun bar(/*0*/ s: kotlin.String = ...): kotlin.Unit
kotlin.jvm.JvmOverloads() internal final fun bar(/*0*/ s: kotlin.String = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmOverloads() private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
kotlin.jvm.JvmOverloads() private final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.kt
Vendored
+4 -4
View File
@@ -1,9 +1,9 @@
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
class A {
<!WRONG_ANNOTATION_TARGET!>jvmStatic<!> constructor() {}
<!WRONG_ANNOTATION_TARGET!>JvmStatic<!> constructor() {}
inner class B {
<!WRONG_ANNOTATION_TARGET!>jvmStatic<!> constructor() {}
<!WRONG_ANNOTATION_TARGET!>JvmStatic<!> constructor() {}
}
}
class C <!WRONG_ANNOTATION_TARGET!>jvmStatic<!> constructor()
class C <!WRONG_ANNOTATION_TARGET!>JvmStatic<!> constructor()
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/constructors.txt
Vendored
+3 -3
View File
@@ -1,13 +1,13 @@
package
internal final class A {
kotlin.jvm.jvmStatic() public constructor A()
kotlin.jvm.JvmStatic() public constructor A()
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
internal final inner class B {
kotlin.jvm.jvmStatic() public constructor B()
kotlin.jvm.JvmStatic() public constructor B()
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
@@ -15,7 +15,7 @@ internal final class A {
}
internal final class C {
kotlin.jvm.jvmStatic() public constructor C()
kotlin.jvm.JvmStatic() public constructor C()
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
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.kt
Vendored
+9 -9
View File
@@ -1,5 +1,5 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
abstract class A {
@@ -12,24 +12,24 @@ abstract class A {
object B: A() {
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override fun a()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override fun b()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic final override fun c()<!> {}
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic final override fun c()<!> {}
@jvmStatic open fun d() {}
@JvmStatic open fun d() {}
}
class C {
companion object: A() {
@jvmStatic override fun a() {}
@JvmStatic override fun a() {}
@jvmStatic override fun b() {}
@JvmStatic override fun b() {}
@jvmStatic final override fun c() {}
@JvmStatic final override fun c() {}
@jvmStatic open fun d() {}
@JvmStatic open fun d() {}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/finalAndAbstract.txt
Vendored
+8 -8
View File
@@ -12,10 +12,10 @@ internal abstract class A {
internal object B : A {
private constructor B()
kotlin.jvm.jvmStatic() internal open override /*1*/ fun a(): kotlin.Unit
kotlin.jvm.jvmStatic() internal open override /*1*/ fun b(): kotlin.Unit
kotlin.jvm.jvmStatic() internal final override /*1*/ fun c(): kotlin.Unit
kotlin.jvm.jvmStatic() internal open fun d(): kotlin.Unit
kotlin.jvm.JvmStatic() internal open override /*1*/ fun a(): kotlin.Unit
kotlin.jvm.JvmStatic() internal open override /*1*/ fun b(): kotlin.Unit
kotlin.jvm.JvmStatic() internal final override /*1*/ fun c(): kotlin.Unit
kotlin.jvm.JvmStatic() internal open fun d(): 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -29,10 +29,10 @@ internal final class C {
public companion object Companion : A {
private constructor Companion()
kotlin.jvm.jvmStatic() internal open override /*1*/ fun a(): kotlin.Unit
kotlin.jvm.jvmStatic() internal open override /*1*/ fun b(): kotlin.Unit
kotlin.jvm.jvmStatic() internal final override /*1*/ fun c(): kotlin.Unit
kotlin.jvm.jvmStatic() internal open fun d(): kotlin.Unit
kotlin.jvm.JvmStatic() internal open override /*1*/ fun a(): kotlin.Unit
kotlin.jvm.JvmStatic() internal open override /*1*/ fun b(): kotlin.Unit
kotlin.jvm.JvmStatic() internal final override /*1*/ fun c(): kotlin.Unit
kotlin.jvm.JvmStatic() internal open fun d(): 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.kt
Vendored
+9 -9
View File
@@ -1,54 +1,54 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
class A {
companion object {
jvmStatic fun a1() {
JvmStatic fun a1() {
}
}
object A {
jvmStatic fun a2() {
JvmStatic fun a2() {
}
}
fun test() {
val s = object {
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a3()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a3()<!> {
}
}
}
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a4()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a4()<!> {
}
}
interface B {
companion object {
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a1()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a1()<!> {
}
}
object A {
jvmStatic fun a2() {
JvmStatic fun a2() {
}
}
fun test() {
val s = object {
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a3()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a3()<!> {
}
}
}
<!JVM_STATIC_NOT_IN_OBJECT!>jvmStatic fun a4()<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>JvmStatic fun a4()<!> {
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/functions.txt
Vendored
+6 -6
View File
@@ -2,7 +2,7 @@ package
internal final class A {
public constructor A()
kotlin.jvm.jvmStatic() internal final fun a4(): kotlin.Unit
kotlin.jvm.JvmStatic() internal final fun a4(): 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
internal final fun test(): kotlin.Unit
@@ -10,7 +10,7 @@ internal final class A {
internal object A {
private constructor A()
kotlin.jvm.jvmStatic() internal final fun a2(): kotlin.Unit
kotlin.jvm.JvmStatic() internal final fun a2(): 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -18,7 +18,7 @@ internal final class A {
public companion object Companion {
private constructor Companion()
kotlin.jvm.jvmStatic() internal final fun a1(): kotlin.Unit
kotlin.jvm.JvmStatic() internal final fun a1(): 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -26,7 +26,7 @@ internal final class A {
}
internal interface B {
kotlin.jvm.jvmStatic() internal open fun a4(): kotlin.Unit
kotlin.jvm.JvmStatic() internal open fun a4(): 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
internal open fun test(): kotlin.Unit
@@ -34,7 +34,7 @@ internal interface B {
internal object A {
private constructor A()
kotlin.jvm.jvmStatic() internal final fun a2(): kotlin.Unit
kotlin.jvm.JvmStatic() internal final fun a2(): 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
@@ -42,7 +42,7 @@ internal interface B {
public companion object Companion {
private constructor Companion()
kotlin.jvm.jvmStatic() internal final fun a1(): kotlin.Unit
kotlin.jvm.JvmStatic() internal final fun a1(): 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
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/localFun.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
fun main(args: Array<String>) {
<!JVM_STATIC_NOT_IN_OBJECT!>@jvmStatic fun a()<!>{
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic fun a()<!>{
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.kt
Vendored
+12 -12
View File
@@ -1,5 +1,5 @@
// !DIAGNOSTICS: -UNUSED_VARIABLE
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
open class B {
public open val base1 : Int = 1
@@ -9,38 +9,38 @@ open class B {
class A {
companion object : B() {
var p1:Int = 1
@jvmStatic set(p: Int) {
@JvmStatic set(p: Int) {
p1 = 1
}
@jvmStatic val z = 1;
@JvmStatic val z = 1;
@jvmStatic override val base1: Int = 0
@JvmStatic override val base1: Int = 0
override val base2: Int = 0
@jvmStatic get
@JvmStatic get
}
object A : B() {
var p:Int = 1
@jvmStatic set(p1: Int) {
@JvmStatic set(p1: Int) {
p = 1
}
@jvmStatic val z = 1;
@JvmStatic val z = 1;
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic override val base1: Int<!> = 0
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic override val base1: Int<!> = 0
jvmStatic open fun f() {}
JvmStatic open fun f() {}
override val base2: Int = 0
<!OVERRIDE_CANNOT_BE_STATIC!>@jvmStatic get<!>
<!OVERRIDE_CANNOT_BE_STATIC!>@JvmStatic get<!>
}
var p:Int = 1
<!JVM_STATIC_NOT_IN_OBJECT!>@jvmStatic set(p1: Int)<!> {
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic set(p1: Int)<!> {
p = 1
}
<!JVM_STATIC_NOT_IN_OBJECT!>@jvmStatic val z2<!> = 1;
<!JVM_STATIC_NOT_IN_OBJECT!>@JvmStatic val z2<!> = 1;
}
compiler/testData/diagnostics/testsWithStdLib/annotations/platformStatic/property.txt
Vendored
+6 -6
View File
@@ -3,29 +3,29 @@ package
internal final class A {
public constructor A()
internal final var p: kotlin.Int
kotlin.jvm.jvmStatic() internal final val z2: kotlin.Int = 1
kotlin.jvm.JvmStatic() internal final val z2: kotlin.Int = 1
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
internal object A : B {
private constructor A()
kotlin.jvm.jvmStatic() public open override /*1*/ val base1: kotlin.Int = 0
kotlin.jvm.JvmStatic() public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
internal final var p: kotlin.Int
kotlin.jvm.jvmStatic() internal final val z: kotlin.Int = 1
kotlin.jvm.JvmStatic() internal final val z: kotlin.Int = 1
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmStatic() internal open fun f(): kotlin.Unit
kotlin.jvm.JvmStatic() internal open fun f(): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
public companion object Companion : B {
private constructor Companion()
kotlin.jvm.jvmStatic() public open override /*1*/ val base1: kotlin.Int = 0
kotlin.jvm.JvmStatic() public open override /*1*/ val base1: kotlin.Int = 0
public open override /*1*/ val base2: kotlin.Int = 0
internal final var p1: kotlin.Int
kotlin.jvm.jvmStatic() internal final val z: kotlin.Int = 1
kotlin.jvm.JvmStatic() internal final val z: kotlin.Int = 1
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
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class A {
<!CONFLICTING_JVM_DECLARATIONS!>@kotlin.jvm.jvmOverloads fun foo(s: String = "")<!> {
<!CONFLICTING_JVM_DECLARATIONS!>@kotlin.jvm.JvmOverloads fun foo(s: String = "")<!> {
}
<!CONFLICTING_JVM_DECLARATIONS!>fun foo()<!> {
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/jvmOverloads.txt
Vendored
+1 -1
View File
@@ -4,7 +4,7 @@ internal final class A {
public constructor A()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
internal final fun foo(): kotlin.Unit
kotlin.jvm.jvmOverloads() internal final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
kotlin.jvm.JvmOverloads() internal final fun foo(/*0*/ s: kotlin.String = ...): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformNames.kt
Vendored
+5 -5
View File
@@ -1,20 +1,20 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
@jvmName("bar")
@JvmName("bar")
fun foo(a: Any) {}
fun Any.foo() {}
@jvmName("barInt")
@JvmName("barInt")
fun bar(x: List<Int>) {}
@jvmName("barStr")
@JvmName("barStr")
fun bar(x: List<String>) {}
class C {
var rwProp: Int
@jvmName("get_rwProp")
@JvmName("get_rwProp")
get() = 0
@jvmName("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.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
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 -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() {}
}
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.jvm.jvmName(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.jvm.jvmName(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.jvm.jvmName(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.jvm.jvmName(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.jvm.jvmName(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.jvm.jvmName(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.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
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.jvm.jvmName(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
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.kt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
open class Base {
fun foo() {}
@@ -6,6 +6,6 @@ open class Base {
class Derived : Base() {
companion object {
<!ACCIDENTAL_OVERRIDE!>jvmStatic fun foo()<!> {}
<!ACCIDENTAL_OVERRIDE!>JvmStatic fun foo()<!> {}
}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInClassObject.txt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ internal final class Derived : Base {
public companion object Companion {
private constructor Companion()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmStatic() internal final fun foo(): kotlin.Unit
kotlin.jvm.JvmStatic() 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
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.kt
Vendored
+2 -2
View File
@@ -1,10 +1,10 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
import kotlin.jvm.jvmStatic
import kotlin.jvm.JvmStatic
open class Base {
fun `foo$default`(i: Int, mask: Int) {}
}
object Derived : Base() {
<!ACCIDENTAL_OVERRIDE!>jvmStatic fun foo(i: Int = 0)<!> {}
<!ACCIDENTAL_OVERRIDE!>JvmStatic fun foo(i: Int = 0)<!> {}
}
compiler/testData/diagnostics/testsWithStdLib/duplicateJvmSignature/platformStaticInObject.txt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ internal open class Base {
internal object Derived : Base {
private constructor Derived()
public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
kotlin.jvm.jvmStatic() internal final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit
kotlin.jvm.JvmStatic() internal final fun foo(/*0*/ i: kotlin.Int = ...): kotlin.Unit
internal final override /*1*/ /*fake_override*/ fun `foo$default`(/*0*/ i: kotlin.Int, /*1*/ mask: kotlin.Int): kotlin.Unit
public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String