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

rename @overloads annotation to @jvmOverloads

Browse Source
This commit is contained in:
Dmitry Jemerov
2015-05-26 19:32:05 +02:00
parent 5c7d13e23c
commit 1188e57597
51 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/DefaultParameterValueSubstitutor.kt
+2 -2
View File
@@ -58,7 +58,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
}
/**
* If the function is annotated with [kotlin.jvm.overloads], generates Java methods that
* If the function is annotated with [kotlin.jvm.jvmOverloads], generates Java methods that
* have the default parameter values substituted. If a method has N parameters and M of which
* have default values, M overloads are generated: the first one takes N-1 parameters (all but
* the last one that takes a default value), the second takes N-2 parameters, and so on.
@@ -75,7 +75,7 @@ public class DefaultParameterValueSubstitutor(val state: GenerationState) {
delegateFunctionDescriptor: FunctionDescriptor,
owner: CodegenContext<*>,
classBuilder: ClassBuilder): Boolean {
if (functionDescriptor.getAnnotations().findAnnotation(FqName("kotlin.jvm.overloads")) == null) {
if (functionDescriptor.getAnnotations().findAnnotation(FqName("kotlin.jvm.jvmOverloads")) == null) {
return false
}
compiler/frontend.java/src/org/jetbrains/kotlin/load/kotlin/KotlinJvmCheckerProvider.kt
+1 -1
View File
@@ -120,7 +120,7 @@ public class PlatformStaticAnnotationChecker : DeclarationChecker {
public class OverloadsAnnotationChecker: DeclarationChecker {
override fun check(declaration: JetDeclaration, descriptor: DeclarationDescriptor, diagnosticHolder: DiagnosticSink) {
if (descriptor.getAnnotations().findAnnotation(FqName("kotlin.jvm.overloads")) != null) {
if (descriptor.getAnnotations().findAnnotation(FqName("kotlin.jvm.jvmOverloads")) != null) {
checkDeclaration(declaration, descriptor, diagnosticHolder)
}
}
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/diagnostics/DefaultErrorMessagesJvm.java
+3 -3
View File
@@ -48,9 +48,9 @@ public class DefaultErrorMessagesJvm implements DefaultErrorMessages.Extension {
MAP.put(ErrorsJvm.PLATFORM_STATIC_NOT_IN_OBJECT, "Only functions in named objects and companion objects of classes can be annotated with 'platformStatic'");
MAP.put(ErrorsJvm.OVERRIDE_CANNOT_BE_STATIC, "Override member cannot be 'platformStatic' in object");
MAP.put(ErrorsJvm.PLATFORM_STATIC_ILLEGAL_USAGE, "This declaration does not support ''platformStatic''", DescriptorRenderer.SHORT_NAMES_IN_TYPES);
MAP.put(ErrorsJvm.OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS, "''overloads'' annotation has no effect for methods without default arguments");
MAP.put(ErrorsJvm.OVERLOADS_ABSTRACT, "''overloads'' annotation cannot be used on abstract methods");
MAP.put(ErrorsJvm.OVERLOADS_PRIVATE, "''overloads'' annotation has no effect on private and local declarations");
MAP.put(ErrorsJvm.OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS, "''jvmOverloads'' annotation has no effect for methods without default arguments");
MAP.put(ErrorsJvm.OVERLOADS_ABSTRACT, "''jvmOverloads'' annotation cannot be used on abstract methods");
MAP.put(ErrorsJvm.OVERLOADS_PRIVATE, "''jvmOverloads'' annotation has no effect on private and local declarations");
MAP.put(ErrorsJvm.NATIVE_DECLARATION_CANNOT_BE_ABSTRACT, "Native declaration can not be abstract");
MAP.put(ErrorsJvm.NATIVE_DECLARATION_CANNOT_HAVE_BODY, "Native declaration can not have a body");
MAP.put(ErrorsJvm.NATIVE_DECLARATION_IN_TRAIT, "Members of interfaces can not be native");
compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.java
+3 -3
View File
@@ -1,13 +1,13 @@
public final class C {
@kotlin.jvm.overloads
@kotlin.jvm.jvmOverloads
@org.jetbrains.annotations.NotNull
public final java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String o, @org.jetbrains.annotations.NotNull java.lang.String s1, @org.jetbrains.annotations.NotNull java.lang.String k, @org.jetbrains.annotations.Nullable java.lang.String s2) { /* compiled code */ }
@kotlin.jvm.overloads
@kotlin.jvm.jvmOverloads
@org.jetbrains.annotations.NotNull
public java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String p, @org.jetbrains.annotations.NotNull java.lang.String p1, @org.jetbrains.annotations.Nullable java.lang.String p2) { /* compiled code */ }
@kotlin.jvm.overloads
@kotlin.jvm.jvmOverloads
@org.jetbrains.annotations.NotNull
public java.lang.String foo(@org.jetbrains.annotations.NotNull java.lang.String p, @org.jetbrains.annotations.Nullable java.lang.String p1) { /* compiled code */ }
compiler/testData/asJava/lightClasses/nullabilityAnnotations/JvmOverloads.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// C
class C {
[kotlin.jvm.overloads] public fun foo(o: String = "O", s1: String, k: String = "K", s2: String?): String {
[kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", s1: String, k: String = "K", s2: String?): String {
return o + k
}
}
compiler/testData/codegen/boxWithJava/jvmOverloads/generics/generics.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C<T> {
[kotlin.jvm.overloads] public fun foo(o: T, k: String = "K"): String = o.toString() + k
[kotlin.jvm.jvmOverloads] public fun foo(o: T, k: String = "K"): String = o.toString() + k
}
fun box(): String {
compiler/testData/codegen/boxWithJava/jvmOverloads/simple/simple.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
[kotlin.jvm.overloads] public fun foo(o: String = "O", k: String = "K"): String = o + k
[kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", k: String = "K"): String = o + k
}
fun box(): String {
compiler/testData/codegen/boxWithStdlib/jvmOverloads/companionObject.kt
+1 -1
View File
@@ -1,6 +1,6 @@
class C {
companion object {
[kotlin.platform.platformStatic] [kotlin.jvm.overloads] public fun foo(o: String, k: String = "K"): String {
[kotlin.platform.platformStatic] [kotlin.jvm.jvmOverloads] public fun foo(o: String, k: String = "K"): String {
return o + k
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/defaultsNotAtEnd.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
[kotlin.jvm.overloads] public fun foo(o: String = "O", i1: Int, k: String = "K", i2: Int): String {
[kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", i1: Int, k: String = "K", i2: Int): String {
return o + k
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/doubleParameters.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
[kotlin.jvm.overloads] public fun foo(d1: Double, d2: Double, status: String = "OK"): String {
[kotlin.jvm.jvmOverloads] public fun foo(d1: Double, d2: Double, status: String = "OK"): String {
return if (d1 + d2 == 3.0) status else "fail"
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/extensionMethod.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class C {
}
[kotlin.jvm.overloads] fun C.foo(o: String, k: String = "K"): String {
[kotlin.jvm.jvmOverloads] fun C.foo(o: String, k: String = "K"): String {
return o + k
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/multipleDefaultParameters.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
[kotlin.jvm.overloads] public fun foo(o: String = "O", k: String = "K"): String {
[kotlin.jvm.jvmOverloads] public fun foo(o: String = "O", k: String = "K"): String {
return o + k
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/nonDefaultParameter.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
[kotlin.jvm.overloads] public fun foo(o: String, k: String = "K"): String {
[kotlin.jvm.jvmOverloads] public fun foo(o: String, k: String = "K"): String {
return o + k
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/primaryConstructor.kt
+1 -1
View File
@@ -1,4 +1,4 @@
class C [kotlin.jvm.overloads] (s1: String, s2: String = "K") {
class C [kotlin.jvm.jvmOverloads] (s1: String, s2: String = "K") {
public val status: String = s1 + s2
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/secondaryConstructor.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class C(val i: Int) {
var status = "fail"
[kotlin.jvm.overloads] constructor(o: String, k: String = "K"): this(-1) {
[kotlin.jvm.jvmOverloads] constructor(o: String, k: String = "K"): this(-1) {
status = o + k
}
}
compiler/testData/codegen/boxWithStdlib/jvmOverloads/simple.kt
+1 -1
View File
@@ -1,5 +1,5 @@
class C {
[kotlin.jvm.overloads] public fun foo(s: String = "OK"): String {
[kotlin.jvm.jvmOverloads] public fun foo(s: String = "OK"): String {
return s
}
}
compiler/testData/compileJavaAgainstKotlin/method/throws/DefaultArgs.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package test
class E1: Exception()
throws(E1::class) overloads
throws(E1::class) jvmOverloads
fun one(a: Int = 1) {}
class One [throws(E1::class)] (a: Int = 1) {
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.kt
+2 -2
View File
@@ -1,7 +1,7 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>@kotlin.jvm.overloads constructor()<!> {
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>@kotlin.jvm.jvmOverloads constructor()<!> {
}
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>@kotlin.jvm.overloads fun foo(s: String)<!> {}
<!OVERLOADS_WITHOUT_DEFAULT_ARGUMENTS!>@kotlin.jvm.jvmOverloads fun foo(s: String)<!> {}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/JvmOverloadWithNoDefaults.txt
+2 -2
View File
@@ -1,9 +1,9 @@
package
internal final class C {
kotlin.jvm.overloads() 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.overloads() 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
+2 -2
View File
@@ -1,8 +1,8 @@
interface T {
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.overloads fun foo(s: String = "OK")<!>
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.jvmOverloads fun foo(s: String = "OK")<!>
}
abstract class C {
<!OVERLOADS_ABSTRACT!>@kotlin.jvm.overloads 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
+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.overloads() 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.overloads() 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
+4 -4
View File
@@ -1,20 +1,20 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class C {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.overloads private fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.jvmOverloads private fun foo(s: String = "OK")<!> {
}
@kotlin.jvm.overloads fun bar(s: String = "OK") {
@kotlin.jvm.jvmOverloads fun bar(s: String = "OK") {
}
}
fun foo() {
class D {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.overloads fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.jvmOverloads fun foo(s: String = "OK")<!> {
}
}
val <!UNUSED_VARIABLE!>x<!> = object {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.overloads fun foo(s: String = "OK")<!> {
<!OVERLOADS_PRIVATE!>@kotlin.jvm.jvmOverloads fun foo(s: String = "OK")<!> {
}
}
}
compiler/testData/diagnostics/testsWithStdLib/annotations/jvmOverloads/jvmOverloadsOnPrivate.txt
+2 -2
View File
@@ -4,9 +4,9 @@ internal fun foo(): kotlin.Unit
internal final class C {
public constructor C()
kotlin.jvm.overloads() 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.overloads() 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/duplicateJvmSignature/jvmOverloads.kt
+1 -1
View File
@@ -1,6 +1,6 @@
// !DIAGNOSTICS: -UNUSED_PARAMETER
class A {
<!CONFLICTING_JVM_DECLARATIONS!>@kotlin.jvm.overloads 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
+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.overloads() 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
}