diff --git a/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt index c945bb5e811..805810404c5 100644 --- a/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt +++ b/j2k/src/org/jetbrains/jet/j2k/ast/Statements.kt @@ -77,7 +77,7 @@ public open class DoWhileStatement(condition: Expression, body: Element) : While public open class ForeachStatement(val variable: Parameter, val expression: Expression, val body: Element) : Statement() { - public override fun toKotlin() = "for (" + variable.toKotlin() + " in " + + public override fun toKotlin() = "for (" + variable.identifier.name + " in " + expression.toKotlin() + ")\n" + body.toKotlin() } diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt index 43cfc79c100..3e0ff8ebda9 100644 --- a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt +++ b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithBlock.kt @@ -1,4 +1,4 @@ -for (n : Node? in list) +for (n in list) { var i : Int = 1 i++ diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt index 96f7cee4323..7fa0c32db4d 100644 --- a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt +++ b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithEmptyBlock.kt @@ -1,3 +1,3 @@ -for (n : Node? in list) +for (n in list) { } \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt index 7affa022577..999fe998205 100644 --- a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt +++ b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithExpression.kt @@ -1,2 +1,2 @@ -for (n : Node? in list) +for (n in list) i++ \ No newline at end of file diff --git a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt index cb66b9552f4..1e2f43f9a1f 100644 --- a/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt +++ b/j2k/tests/testData/ast/foreachStatement/statement/enhancedForWithReturn.kt @@ -1,2 +1,2 @@ -for (n : Node? in list) +for (n in list) return n \ No newline at end of file diff --git a/j2k/tests/testData/ast/list/file/ForEach.kt b/j2k/tests/testData/ast/list/file/ForEach.kt index d9bd4d64bef..b0b3afe60f5 100644 --- a/j2k/tests/testData/ast/list/file/ForEach.kt +++ b/j2k/tests/testData/ast/list/file/ForEach.kt @@ -3,11 +3,11 @@ public open class ForEach() { public open fun test() : Unit { var xs : ArrayList? = ArrayList() var ys : MutableList? = LinkedList() -for (x : Any? in xs!!) +for (x in xs!!) { ys?.add(x) } -for (y : Any? in ys!!) +for (y in ys!!) { xs?.add(y) }