From e17308479824dd555ca072de589a22b2f32e3fb3 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Mon, 28 Nov 2011 12:49:14 +0400 Subject: [PATCH] KT-564 Move "constructor body" to beginning of the class --- src/org/jetbrains/jet/j2k/ast/Class.java | 2 +- src/org/jetbrains/jet/j2k/ast/Enum.java | 2 +- .../ast/constructors/file/allCallsPrimary2.kt | 10 +++++----- .../ast/constructors/file/customerBuilder.kt | 12 +++++------ .../constructors/file/genericIdentifier.kt | 8 ++++---- testData/ast/constructors/file/identifier.kt | 8 ++++---- .../file/withManyDefaultParams.kt | 20 +++++++++---------- .../enum/class/primaryPrivateConstructor.kt | 6 +++--- .../identifier/file/finalFieldReference.kt | 6 +++--- .../file/classOneExtendsBaseGeneric.kt | 2 +- ...dsBaseWithZeroParamsNonEmptyConstructor.kt | 2 +- 11 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/org/jetbrains/jet/j2k/ast/Class.java b/src/org/jetbrains/jet/j2k/ast/Class.java index 2bff21daaa7..98c6680998f 100644 --- a/src/org/jetbrains/jet/j2k/ast/Class.java +++ b/src/org/jetbrains/jet/j2k/ast/Class.java @@ -168,9 +168,9 @@ public class Class extends Member { String bodyToKotlin() { return SPACE + "{" + N + + primaryConstructorBodyToKotlin() + N + AstUtil.joinNodes(getNonStatic(membersExceptConstructors()), N) + N + classObjectToKotlin() + N + - primaryConstructorBodyToKotlin() + N + "}"; } diff --git a/src/org/jetbrains/jet/j2k/ast/Enum.java b/src/org/jetbrains/jet/j2k/ast/Enum.java index 9e9c1659e7f..82bfeca2be4 100644 --- a/src/org/jetbrains/jet/j2k/ast/Enum.java +++ b/src/org/jetbrains/jet/j2k/ast/Enum.java @@ -30,8 +30,8 @@ public class Enum extends Class { public String toKotlin() { return modifiersToKotlin() + "enum" + SPACE + myName.toKotlin() + primaryConstructorSignatureToKotlin() + typeParametersToKotlin() + implementTypesToKotlin() + SPACE + "{" + N + - AstUtil.joinNodes(membersExceptConstructors(), N) + N + primaryConstructorBodyToKotlin() + N + + AstUtil.joinNodes(membersExceptConstructors(), N) + N + "}"; } } \ No newline at end of file diff --git a/testData/ast/constructors/file/allCallsPrimary2.kt b/testData/ast/constructors/file/allCallsPrimary2.kt index 01df1ce685e..37f361b89a9 100644 --- a/testData/ast/constructors/file/allCallsPrimary2.kt +++ b/testData/ast/constructors/file/allCallsPrimary2.kt @@ -1,4 +1,9 @@ open class C(arg1 : Int) { +{ +$myArg1 = arg1 +$myArg2 = 0 +$myArg3 = 0 +} val myArg1 : Int var myArg2 : Int var myArg3 : Int @@ -16,11 +21,6 @@ __.myArg3 = 0 return __ } } -{ -$myArg1 = arg1 -$myArg2 = 0 -$myArg3 = 0 -} } public open class User() { class object { diff --git a/testData/ast/constructors/file/customerBuilder.kt b/testData/ast/constructors/file/customerBuilder.kt index 7218a7f38bf..6b3e9db1448 100644 --- a/testData/ast/constructors/file/customerBuilder.kt +++ b/testData/ast/constructors/file/customerBuilder.kt @@ -1,5 +1,11 @@ namespace org.test.customer open class Customer(first : String?, last : String?) { +{ +doSmthBefore() +$_firstName = first +$_lastName = last +doSmthAfter() +} public val _firstName : String? public val _lastName : String? open public fun getFirstName() : String? { @@ -12,12 +18,6 @@ open private fun doSmthBefore() : Unit { } open private fun doSmthAfter() : Unit { } -{ -doSmthBefore() -$_firstName = first -$_lastName = last -doSmthAfter() -} } open class CustomerBuilder() { public var _firstName : String? = "Homer" diff --git a/testData/ast/constructors/file/genericIdentifier.kt b/testData/ast/constructors/file/genericIdentifier.kt index 314b85e84f0..1c7c9cc77db 100644 --- a/testData/ast/constructors/file/genericIdentifier.kt +++ b/testData/ast/constructors/file/genericIdentifier.kt @@ -1,4 +1,8 @@ public open class Identifier(myName : T?, myHasDollar : Boolean) { +{ +$myName = myName +$myHasDollar = myHasDollar +} private val myName : T? private var myHasDollar : Boolean private var myNullable : Boolean = true @@ -21,10 +25,6 @@ __.myNullable = isNullable return __ } } -{ -$myName = myName -$myHasDollar = myHasDollar -} } public open class User() { class object { diff --git a/testData/ast/constructors/file/identifier.kt b/testData/ast/constructors/file/identifier.kt index 384974d68f7..200f6bd4ed3 100644 --- a/testData/ast/constructors/file/identifier.kt +++ b/testData/ast/constructors/file/identifier.kt @@ -1,4 +1,8 @@ public open class Identifier(myName : String?, myHasDollar : Boolean) { +{ +$myName = myName +$myHasDollar = myHasDollar +} private val myName : String? private var myHasDollar : Boolean private var myNullable : Boolean = true @@ -21,10 +25,6 @@ __.myNullable = isNullable return __ } } -{ -$myName = myName -$myHasDollar = myHasDollar -} } public open class User() { class object { diff --git a/testData/ast/constructors/file/withManyDefaultParams.kt b/testData/ast/constructors/file/withManyDefaultParams.kt index 06b13888509..7817a15545b 100644 --- a/testData/ast/constructors/file/withManyDefaultParams.kt +++ b/testData/ast/constructors/file/withManyDefaultParams.kt @@ -1,4 +1,14 @@ public open class Test(myName : String?, a : Boolean, b : Double, c : Float, d : Long, e : Int, f : Short, g : Char) { +{ +$myName = myName +$a = a +$b = b +$c = c +$d = d +$e = e +$f = f +$g = g +} private val myName : String? private var a : Boolean private var b : Double @@ -20,16 +30,6 @@ open fun foo(n : String?) : String? { return "" } } -{ -$myName = myName -$a = a -$b = b -$c = c -$d = d -$e = e -$f = f -$g = g -} } public open class User() { class object { diff --git a/testData/ast/enum/class/primaryPrivateConstructor.kt b/testData/ast/enum/class/primaryPrivateConstructor.kt index 3fe8cd69ef3..6eb52b3fd81 100644 --- a/testData/ast/enum/class/primaryPrivateConstructor.kt +++ b/testData/ast/enum/class/primaryPrivateConstructor.kt @@ -1,9 +1,9 @@ enum Color(c : Int) { +{ +$code = c +} private var code : Int open public fun getCode() : Int { return code } -{ -$code = c -} } \ No newline at end of file diff --git a/testData/ast/identifier/file/finalFieldReference.kt b/testData/ast/identifier/file/finalFieldReference.kt index 215a03c5f83..6f3df706c90 100644 --- a/testData/ast/identifier/file/finalFieldReference.kt +++ b/testData/ast/identifier/file/finalFieldReference.kt @@ -3,11 +3,11 @@ open class `$$$$$`() { open class `$`() { } open class `$$`(`$$$$` : `$$$$$`?) : `$`() { +{ +$`$$$` = `$$$$` +} val `$$$` : `$$$$$`? open public fun `$$$$$$`() : `$$$$$`? { return `$$$` } -{ -$`$$$` = `$$$$` -} } \ No newline at end of file diff --git a/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt b/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt index 5f03b0858e4..b9acbfbc541 100644 --- a/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt +++ b/testData/ast/inheritance/file/classOneExtendsBaseGeneric.kt @@ -1,8 +1,8 @@ open class Base(name : T?) { } open class One(name : T?, second : K?) : Base(name) { -private var mySecond : K? { $mySecond = second } +private var mySecond : K? } \ No newline at end of file diff --git a/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt b/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt index c59aa0d172c..6381bc4f634 100644 --- a/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt +++ b/testData/ast/inheritance/file/classOneExtendsBaseWithZeroParamsNonEmptyConstructor.kt @@ -1,8 +1,8 @@ open class Base(name : String?) { } open class One(name : String?, second : String?) : Base(name) { -private var mySecond : String? { $mySecond = second } +private var mySecond : String? } \ No newline at end of file