Migrate testdata to new lambda syntax

This commit is contained in:
Stanislav Erokhin
2015-04-03 13:40:07 +03:00
parent b703f59e04
commit 3de0dff575
134 changed files with 263 additions and 277 deletions
@@ -2,7 +2,7 @@ package foo
fun box(): Boolean {
var sum = 0
val adder = {(a: Int) -> sum += a }
val adder = { a: Int -> sum += a }
adder(3)
adder(2)
return sum == 5
@@ -1,7 +1,7 @@
package foo
fun box(): String {
return apply("OK", {(arg: String) -> arg })
return apply("OK", { arg: String -> arg })
}
fun apply(arg: String, f: (p: String) -> String): String {
@@ -1,7 +1,7 @@
package foo
fun box(): String {
return if (apply(5, {(arg: Int) -> arg + 13 }) == 18) "OK" else "fail"
return if (apply(5, { arg: Int -> arg + 13 }) == 18) "OK" else "fail"
}
fun apply(arg: Int, f: (p: Int) -> Int): Int {
@@ -2,7 +2,7 @@ package foo
class Point(val x: Int, val y: Int) {
fun mul(): (scalar: Int) -> Point {
return {(scalar: Int): Point -> Point(x * scalar, y * scalar) }
return { scalar: Int -> Point(x * scalar, y * scalar) }
}
}
@@ -2,8 +2,8 @@ package foo
import java.util.*;
val d = {(a: Int) -> a + 1 }
val p = {(a: Int) -> a * 3 }
val d = { a: Int -> a + 1 }
val p = { a: Int -> a * 3 }
val list = ArrayList<Function1<Int, Int>>();
@@ -35,7 +35,7 @@ fun box(): Boolean {
if (chain(2) != -19) {
return false;
}
if (({(a: Int) -> a * a }(3)) != 9) {
if (({ a: Int -> a * a }(3)) != 9) {
return false;
}
return true;
@@ -10,7 +10,7 @@ fun Int.foo2(): (i: Int) -> Int {
fun fooT1<T>(t: T) = { t.toString() }
fun fooT2<T>(t: T) = {(x: T) -> t.toString() + x.toString() }
fun fooT2<T>(t: T) = { x: T -> t.toString() + x.toString() }
fun box(): Any? {
if ( (10.foo1())() != "23910") return "foo1 fail"
@@ -18,7 +18,7 @@ fun box(): Any? {
if (1.{ Int.() -> this + 1 }() != 2) return "test 3 failed";
if ( { 1 }() != 1) return "test 4 failed";
if ( {(x: Int) -> x }(1) != 1) return "test 5 failed";
if ( { x: Int -> x }(1) != 1) return "test 5 failed";
if ( 1.{ Int.(x: Int) -> x + this }(1) != 2) return "test 6 failed";
val tmp = 1.({ Int.() -> this })()
if (+tmp != 1) return "test 7 failed, res: $tmp ${tmp is Int}";
@@ -2,7 +2,7 @@ package foo
fun box(): Boolean {
var sum = 0
val addFive = {(a: Int) -> a + 5 }
val addFive = { a: Int -> a + 5 }
sum = addFive(sum)
return sum == 5
}
@@ -8,7 +8,7 @@ fun box(): Boolean {
it + 2
} != 3) return false
if (f() {(a: Int) -> a * 300 } != 300) return false;
if (f() { a: Int -> a * 300 } != 300) return false;
return true
}
@@ -6,5 +6,5 @@ fun apply(f: (Int) -> Int, t: Int): Int {
fun box(): Boolean {
return apply({(a: Int) -> a + 5 }, 3) == 8
return apply({ a: Int -> a + 5 }, 3) == 8
}
@@ -5,7 +5,7 @@ var b = 0
fun loop(times: Int) {
var left = times
while (left > 0) {
val u = {(value: Int) ->
val u = { value: Int ->
b = b + 1
}
u(left--)
@@ -134,8 +134,8 @@ trait TestPublicInTrait {
public fun boo(): Int = 2
}
val public_in_trait_f = { (obj: TestPublicInTrait) -> obj.foo() + obj.foo }
val public_in_trait_b = { (obj: TestPublicInTrait) -> obj.boo() + obj.boo }
val public_in_trait_f = { obj: TestPublicInTrait -> obj.foo() + obj.foo }
val public_in_trait_b = { obj: TestPublicInTrait -> obj.boo() + obj.boo }
trait TestInternalInTrait {
fun foo(): Int = 2
@@ -144,8 +144,8 @@ trait TestInternalInTrait {
fun boo(): Int = 2
}
val internal_in_trait_f = { (obj: TestInternalInTrait) -> obj.foo() + obj.foo }
val internal_in_trait_b = { (obj: TestInternalInTrait) -> obj.boo() + obj.boo }
val internal_in_trait_f = { obj: TestInternalInTrait -> obj.foo() + obj.foo }
val internal_in_trait_b = { obj: TestInternalInTrait -> obj.boo() + obj.boo }
//Testing