diff --git a/compiler/testData/checker/Unresolved.jet b/compiler/testData/checker/Unresolved.jet index 9e361861010..2d56e915eb7 100644 --- a/compiler/testData/checker/Unresolved.jet +++ b/compiler/testData/checker/Unresolved.jet @@ -22,8 +22,9 @@ fun testUnresolved() { //TODO for (j in collection) { - val i: Int = j - j += 1 + var i: Int = j + i += 1 + foo1(j) } } diff --git a/compiler/testData/checker/regression/Jet183-1.jet b/compiler/testData/checker/regression/Jet183-1.jet index 37c72d83ef6..0199cd9fcb3 100644 --- a/compiler/testData/checker/regression/Jet183-1.jet +++ b/compiler/testData/checker/regression/Jet183-1.jet @@ -12,7 +12,7 @@ abstract enum class ProtocolState { fun box(): String { - val x: ProtocolState = ProtocolState.WAITING + var x: ProtocolState = ProtocolState.WAITING x = x.signal() if (x != ProtocolState.TALKING) return "fail 1" x = x.signal() diff --git a/compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet b/compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet index 646a38f5b89..68b1803449f 100644 --- a/compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet +++ b/compiler/testData/checkerWithErrorTypes/full/FunctionReturnTypes.jet @@ -176,23 +176,23 @@ fun testFunctionLiterals() { } val endsWithAssignment = { () : Int => - val x = 1 + var x = 1 x = 333 } val endsWithReAssignment = { () : Int => - val x = 1 + var x = 1 x += 333 } val endsWithFunDeclaration : fun() : String = { - val x = 1 + var x = 1 x = 333 fun meow() : Unit {} } val endsWithObjectDeclaration : fun() : Int = { - val x = 1 + var x = 1 x = 333 object A {} } diff --git a/compiler/testData/checkerWithErrorTypes/full/Unresolved.jet b/compiler/testData/checkerWithErrorTypes/full/Unresolved.jet index 48ea2a58e4d..9bd749a8372 100644 --- a/compiler/testData/checkerWithErrorTypes/full/Unresolved.jet +++ b/compiler/testData/checkerWithErrorTypes/full/Unresolved.jet @@ -22,8 +22,9 @@ fun testUnresolved() { //TODO for (j in collection) { - val i: Int = j - j += 1 + var i: Int = j + i += 1 + foo1(j) } } diff --git a/compiler/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet b/compiler/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet index 37c72d83ef6..0199cd9fcb3 100644 --- a/compiler/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet +++ b/compiler/testData/checkerWithErrorTypes/full/regression/Jet183-1.jet @@ -12,7 +12,7 @@ abstract enum class ProtocolState { fun box(): String { - val x: ProtocolState = ProtocolState.WAITING + var x: ProtocolState = ProtocolState.WAITING x = x.signal() if (x != ProtocolState.TALKING) return "fail 1" x = x.signal() diff --git a/compiler/testData/codegen/classes/overloadPlusAssign.jet b/compiler/testData/codegen/classes/overloadPlusAssign.jet index 21459ecff1e..5247973e8d6 100644 --- a/compiler/testData/codegen/classes/overloadPlusAssign.jet +++ b/compiler/testData/codegen/classes/overloadPlusAssign.jet @@ -17,7 +17,7 @@ class ArrayWrapper() { } fun box(): String { - val v1 = ArrayWrapper() + var v1 = ArrayWrapper() val v2 = ArrayWrapper() v1.add("foo") v2.add("bar") diff --git a/compiler/testData/codegen/classes/overloadPlusAssignReturn.jet b/compiler/testData/codegen/classes/overloadPlusAssignReturn.jet index 28fb9af2652..42671b9f138 100644 --- a/compiler/testData/codegen/classes/overloadPlusAssignReturn.jet +++ b/compiler/testData/codegen/classes/overloadPlusAssignReturn.jet @@ -20,7 +20,7 @@ class ArrayWrapper() { } fun box(): String { - val v1 = ArrayWrapper() + var v1 = ArrayWrapper() val v2 = ArrayWrapper() v1.add("foo") val v3 = v1 diff --git a/compiler/testData/codegen/classes/overloadPlusToPlusAssign.jet b/compiler/testData/codegen/classes/overloadPlusToPlusAssign.jet index e81515821b0..c5236b0ace4 100644 --- a/compiler/testData/codegen/classes/overloadPlusToPlusAssign.jet +++ b/compiler/testData/codegen/classes/overloadPlusToPlusAssign.jet @@ -20,7 +20,7 @@ class ArrayWrapper() { } fun box(): String { - val v1 = ArrayWrapper() + var v1 = ArrayWrapper() val v2 = ArrayWrapper() v1.add("foo") val v3 = v1 diff --git a/compiler/testData/codegen/controlStructures/forIntRange.jet b/compiler/testData/codegen/controlStructures/forIntRange.jet index 0fe391123eb..d215a925bb9 100644 --- a/compiler/testData/codegen/controlStructures/forIntRange.jet +++ b/compiler/testData/codegen/controlStructures/forIntRange.jet @@ -4,7 +4,7 @@ fun box() : String { a[1] = "b" a[2] = "c" - val result = 0 + var result = 0 for(i in a.indices) { result += i } diff --git a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java index 5c4167442fa..5be2b30adca 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/NamespaceGenTest.java @@ -268,7 +268,7 @@ public class NamespaceGenTest extends CodegenTestCase { } public void testStringPlusEq() throws Exception { - loadText("fun foo(s: String) : String { val result = s; result += s; return result; } "); + loadText("fun foo(s: String) : String { var result = s; result += s; return result; } "); System.out.println(generateToText()); final Method main = generateFunction(); assertEquals("JarJar", main.invoke(null, "Jar"));