Updating java to kotlin convert to new language syntax

This commit is contained in:
Valentin Kipyatkov
2015-05-27 13:30:58 +03:00
parent 802ca5476d
commit 87cb36e8e9
24 changed files with 56 additions and 55 deletions
@@ -1,6 +1,6 @@
package pack
class C [jvmOverloads] (arg1: Int, arg2: Int = 0, arg3: Int = 0)
class C @jvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0)
public object User {
public fun main() {
@@ -1,16 +1,16 @@
import javaApi.Anon5
class A
[Anon5(10)]
(private val a: Int, private val b: Int) {
@Anon5(10)
constructor(private val a: Int, private val b: Int) {
deprecated("") // this constructor will not be replaced by default parameter value in primary because of this annotation
public constructor(a: Int) : this(a, 1) {
}
}
class B [Anon5(11)]
()
class B @Anon5(11)
constructor()
class C [Anon5(12)]
private ()
class C @Anon5(12)
private constructor()
@@ -1 +1 @@
class C [jvmOverloads] (private val string: String, a: Int = string.length())
class C @jvmOverloads constructor(private val string: String, a: Int = string.length())
@@ -1,4 +1,4 @@
class A [jvmOverloads] (nested: A.Nested = A.Nested(A.Nested.FIELD)) {
class A @jvmOverloads constructor(nested: A.Nested = A.Nested(A.Nested.FIELD)) {
class Nested(p: Int) {
companion object {
@@ -1,7 +1,7 @@
// ERROR: Property must be initialized or be abstract
import A.Nested
class A [jvmOverloads] (nested: Nested = Nested(Nested.FIELD)) {
class A @jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
companion object {
@@ -3,7 +3,7 @@ package pack
import pack.A.Nested
class A [jvmOverloads] (nested: Nested = Nested(Nested.FIELD)) {
class A @jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
companion object {
@@ -3,7 +3,7 @@ package pack
import pack.A.*
class A [jvmOverloads] (nested: Nested = Nested(Nested.FIELD)) {
class A @jvmOverloads constructor(nested: Nested = Nested(Nested.FIELD)) {
class Nested(p: Int) {
companion object {
@@ -1,6 +1,6 @@
package pack
class C [jvmOverloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
class C @jvmOverloads constructor(a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
constructor(a: Int) : this(a, 0, 0, 0, 1) {
}
@@ -1,6 +1,6 @@
package pack
class C [jvmOverloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
class C @jvmOverloads constructor(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) {
}
@@ -1,6 +1,6 @@
package pack
class C [jvmOverloads] (a: Int = 0, b: Int = 0, c: Int = 0, d: Int = 0, e: Int = 0) {
class C @jvmOverloads constructor(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) {
}
@@ -1,3 +1,3 @@
package pack
class C [jvmOverloads] (a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
class C @jvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
@@ -1,3 +1,3 @@
package pack
class C [jvmOverloads] (a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
class C @jvmOverloads constructor(a: Int = 1, b: Int = 2, c: Int = 3, d: Int = 4, e: Int = 5)
@@ -1,5 +1,5 @@
// 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) {
class C @jvmOverloads constructor(arg1: Int, arg2: Int = 0, arg3: Int = 0) {
private val field: Int
init {
@@ -1,4 +1,4 @@
class C [jvmOverloads] private (arg1: Int, arg2: Int, arg3: Int = 0) {
class C @jvmOverloads private constructor(arg1: Int, arg2: Int, arg3: Int = 0) {
public constructor(arg1: Int) : this(arg1, 0, 0) {
}