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
j2k/testData/fileOrElement/constructors/allCallsPrimary.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package pack
class C [overloads] (arg1: Int, arg2: Int = 0, arg3: Int = 0)
class C [jvmOverloads] (arg1: Int, arg2: Int = 0, arg3: Int = 0)
public object User {
public fun main() {
j2k/testData/fileOrElement/constructors/fieldsInitializedFromParams9.kt
+1 -1
View File
@@ -1 +1 @@
class C [overloads] (private val string: String, a: Int = string.length())
class C [jvmOverloads] (private val string: String, a: Int = string.length())
j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults.kt
+1 -1
View File
@@ -1,4 +1,4 @@
class A [overloads] (nested: A.Nested = A.Nested(A.Nested.FIELD)) {
class A [jvmOverloads] (nested: A.Nested = A.Nested(A.Nested.FIELD)) {
class Nested(p: Int) {
companion object {
j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults2.kt
+1 -1
View File
@@ -1,7 +1,7 @@
// ERROR: Property must be initialized or be abstract
import A.Nested
class A [overloads] (nested: Nested = Nested(Nested.FIELD)) {
class A [jvmOverloads] (nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
companion object {
j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults3.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package pack
import pack.A.Nested
class A [overloads] (nested: Nested = Nested(Nested.FIELD)) {
class A [jvmOverloads] (nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
companion object {
j2k/testData/fileOrElement/constructors/nestedClassNameInParameterDefaults4.kt
+1 -1
View File
@@ -3,7 +3,7 @@ package pack
import pack.A.*
class A [overloads] (nested: Nested = Nested(Nested.FIELD)) {
class A [jvmOverloads] (nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
companion object {
j2k/testData/fileOrElement/constructors/parameterDefaults1.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package pack
class C [overloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
class C [jvmOverloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
constructor(a: Int) : this(a, 0, 0, 0, 1) {
}
j2k/testData/fileOrElement/constructors/parameterDefaults2.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package pack
class C [overloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
class C [jvmOverloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
constructor(a1: Int, b1: Int, c1: Int) : this(a1, b1, c1, 0, 0) {
}
j2k/testData/fileOrElement/constructors/parameterDefaults3.kt
+1 -1
View File
@@ -1,6 +1,6 @@
package pack
class C [overloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
class C [jvmOverloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
constructor(a: Int, b: Int, c: Int) : this(b, a, c, 0, 0) {
}
j2k/testData/fileOrElement/constructors/parameterDefaults4.kt
+1 -1
View File
@@ -1,3 +1,3 @@
package pack
class C [overloads] (a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
class C [jvmOverloads] (a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
j2k/testData/fileOrElement/constructors/parameterDefaults5.kt
+1 -1
View File
@@ -1,3 +1,3 @@
package pack
class C [overloads] (a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
class C [jvmOverloads] (a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
j2k/testData/fileOrElement/constructors/parameterModification.kt
+2 -2
View File
@@ -1,5 +1,5 @@
// ERROR: Overload resolution ambiguity: public constructor C(arg1: kotlin.Int, arg2: kotlin.Int) defined in C kotlin.jvm.overloads public constructor C(arg1: kotlin.Int, arg2: kotlin.Int = ..., arg3: kotlin.Int = ...) defined in C
class C [overloads] (arg1: Int, arg2: Int = 0, arg3: Int = 0) {
// ERROR: Overload resolution ambiguity: public constructor C(arg1: kotlin.Int, arg2: kotlin.Int) defined in C kotlin.jvm.jvmOverloads public constructor C(arg1: kotlin.Int, arg2: kotlin.Int = ..., arg3: kotlin.Int = ...) defined in C
class C [jvmOverloads] (arg1: Int, arg2: Int = 0, arg3: Int = 0) {
private val field: Int
init {
j2k/testData/fileOrElement/constructors/privateConstructors.kt
+1 -1
View File
@@ -1,4 +1,4 @@
class C [overloads] private (arg1: Int, arg2: Int, arg3: Int = 0) {
class C [jvmOverloads] private (arg1: Int, arg2: Int, arg3: Int = 0) {
public constructor(arg1: Int) : this(arg1, 0, 0) {
}
j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues.kt
+1 -1
View File
@@ -7,7 +7,7 @@ class A {
public constructor() {
}
overloads public constructor(p: Int, s: String, x: Int = 1) {
jvmOverloads public constructor(p: Int, s: String, x: Int = 1) {
this.s = s
this.x = x
}
j2k/testData/fileOrElement/constructors/secondaryConstructorWithDefaultValues2.kt
+1 -1
View File
@@ -4,7 +4,7 @@ class A() {
private val s = ""
private val x = 0
overloads public constructor(p: Int, s: String, x: Int = 1) : this() {
jvmOverloads public constructor(p: Int, s: String, x: Int = 1) : this() {
this.s = s
this.x = x
}