azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate testdata to new lambda syntax

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/box/closures/closureInsideClosure/varAsFunInsideLocalFun.kt
+1 -1
View File
@@ -2,7 +2,7 @@
fun box(): String {
fun rec(n : Int) {
val x = { (m : Int) ->
val x = { m : Int ->
if (n > 0) rec(n - 1)
}
compiler/testData/codegen/box/closures/closureWithParameter.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun box() : String {
return apply( "OK", {(arg: String) -> arg } )
return apply( "OK", {arg: String -> arg } )
}
fun apply(arg : String, f : (p:String) -> String) : String {
compiler/testData/codegen/box/closures/closureWithParameterAndBoxing.kt
+1 -1
View File
@@ -1,5 +1,5 @@
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 {
compiler/testData/codegen/box/closures/enclosingThis.kt
+1 -1
View File
@@ -1,6 +1,6 @@
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) }
}
}
compiler/testData/codegen/box/closures/extensionClosure.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class Point(val x : Int, val y : Int)
fun box() : String {
val answer = apply(Point(3, 5), { Point.(scalar : Int) : Point ->
val answer = apply(Point(3, 5), { scalar : Int ->
Point(x * scalar, y * scalar)
})
compiler/testData/codegen/box/closures/localReturn.kt
+2 -2
View File
@@ -1,13 +1,13 @@
fun box(): String {
val a = 1
val explicitlyReturned = run1 @f{(): String ->
val explicitlyReturned = run1 @f{
if (a > 0)
return@f "OK"
else "Fail 1"
}
if (explicitlyReturned != "OK") return explicitlyReturned
val implicitlyReturned = run1 @f{(): String ->
val implicitlyReturned = run1 @f{
if (a < 0)
return@f "Fail 2"
else "OK"
compiler/testData/codegen/box/closures/localReturnWithAutolabel.kt
+2 -2
View File
@@ -1,13 +1,13 @@
fun box(): String {
val a = 1
val explicitlyReturned = run1 {(): String ->
val explicitlyReturned = run1 {
if (a > 0)
return@run1 "OK"
else "Fail 1"
}
if (explicitlyReturned != "OK") return explicitlyReturned
val implicitlyReturned = run1 {(): String ->
val implicitlyReturned = run1 {
if (a < 0)
return@run1 "Fail 2"
else "OK"
compiler/testData/codegen/box/controlStructures/kt237.kt
+3 -3
View File
@@ -5,7 +5,7 @@ fun main(args: Array<String>?) {
//do not compile
System.out?.println(fff<Unit>(Unit)) //do not compile
System.out?.println(id<Unit>(y)) //do not compile
System.out?.println(fff<Unit>(id<Unit>(y)) == id<Unit>(foreach(arrayOfNulls<Int>(0) as Array<Int>,{(e : Int) : Unit -> }))) //do not compile
System.out?.println(fff<Unit>(id<Unit>(y)) == id<Unit>(foreach(arrayOfNulls<Int>(0) as Array<Int>,{ e : Int -> }))) //do not compile
}
class A<T>()
@@ -34,8 +34,8 @@ fun box() : String {
a[0] = 0
a[1] = 1
a[2] = 2
foreach(a, { (el : Int) : Unit -> System.out?.println(el) })
almostFilter(a, { (el : Int) : Int -> el })
foreach(a, { el : Int -> System.out?.println(el) })
almostFilter(a, { el : Int -> el })
main(null)
return "OK"
}
compiler/testData/codegen/box/extensionFunctions/kt1061.kt
+1 -1
View File
@@ -1,7 +1,7 @@
//KT-1061 Can't call function defined as a val
object X {
val doit = { (i: Int) -> i }
val doit = { i: Int -> i }
}
fun box() : String = if (X.doit(3) == 3) "OK" else "fail"
compiler/testData/codegen/box/extensionFunctions/kt1290.kt
+1 -1
View File
@@ -6,7 +6,7 @@ class Foo<T>(val filter: (T) -> Boolean) {
}
}
fun foo() = Foo({ (i: Int) -> i < 5 }).bar(2)
fun foo() = Foo({ i: Int -> i < 5 }).bar(2)
fun box() : String {
if (!foo()) return "fail"
compiler/testData/codegen/box/extensionFunctions/nested2.kt
+1 -1
View File
@@ -1,6 +1,6 @@
fun box() : String {
val y = 12
val op = { (x:Int) -> (x + y).toString() }
val op = { x:Int -> (x + y).toString() }
val op2 : Int.(Int) -> String = { op(this + it) }
compiler/testData/codegen/box/functions/functionLiteralExpression.kt
+5 -5
View File
@@ -8,17 +8,17 @@ 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() : String {
if( (10.foo1())() != "23910") return "foo1 fail"
if( (10.foo2())(1) != 11 ) return "foo2 fail"
if(1.{Int.() -> this + 1}() != 2) return "test 3 failed";
if(1.(fun 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( 1.{Int.(x : Int) -> x + this}(1) != 2) return "test 6 failed";
if( 1.({Int.() -> this})() != 1) return "test 7 failed";
if( {x : Int -> x}(1) != 1) return "test 5 failed";
if( 1.(fun Int.(x: Int) = x + this)(1) != 2) return "test 6 failed";
if( 1.(fun Int.() = this)() != 1) return "test 7 failed";
if( (fooT1<String>("mama"))() != "mama") return "test 8 failed";
if( (fooT2<String>("mama"))("papa") != "mamapapa") return "test 9 failed";
return "OK"
compiler/testData/codegen/box/functions/functionNtoString.kt
+14 -14
View File
@@ -7,22 +7,22 @@ fun check(expected: String, obj: Any?) {
fun box(): String {
check("kotlin.Function0<kotlin.Unit>")
{ () : Unit -> }
{ -> }
check("kotlin.Function0<java.lang.Integer>")
{ () : Int -> 42 }
check("kotlin.Function1<java.lang.String, java.lang.Long>")
{ (s: String) : Long -> 42.toLong() }
{ -> 42 }
check("kotlin.Function1<java.lang.String, java.lang.Long>",
fun (s: String) = 42.toLong())
check("kotlin.Function2<java.lang.Integer, java.lang.Integer, kotlin.Unit>")
{ (x: Int, y: Int) : Unit -> }
{ x: Int, y: Int -> }
check("kotlin.ExtensionFunction0<java.lang.Integer, kotlin.Unit>")
{ Int.() : Unit -> }
check("kotlin.ExtensionFunction0<kotlin.Unit, java.lang.Integer>")
{ Unit.() : Int -> 42 }
check("kotlin.ExtensionFunction1<java.lang.String, java.lang.String, java.lang.Long>")
{ String.(s: String) : Long -> 42.toLong() }
check("kotlin.ExtensionFunction2<java.lang.Integer, java.lang.Integer, java.lang.Integer, kotlin.Unit>")
{ Int.(x: Int, y: Int) : Unit -> }
check("kotlin.ExtensionFunction0<java.lang.Integer, kotlin.Unit>",
fun Int.() {})
check("kotlin.ExtensionFunction0<kotlin.Unit, java.lang.Integer>",
fun Unit.(): Int = 42)
check("kotlin.ExtensionFunction1<java.lang.String, java.lang.String, java.lang.Long>",
fun String.(s: String): Long = 42.toLong())
check("kotlin.ExtensionFunction2<java.lang.Integer, java.lang.Integer, java.lang.Integer, kotlin.Unit>",
fun Int.(x: Int, y: Int) {})
return "OK"
}
}
compiler/testData/codegen/box/functions/invoke/extensionInvokeOnExpr.kt
+2 -2
View File
@@ -13,8 +13,8 @@ fun B.test(): String {
if (foo()() != "##") return "fail3"
if (foo()(42) != "#42") return "fail4"
if ((foo())(42) != "#42") return "fail5"
if ({() -> A()}()() != "##") return "fail6"
if ({() -> A()}()(37) != "#37") return "fail7"
if ({ -> A()}()() != "##") return "fail6"
if ({ -> A()}()(37) != "#37") return "fail7"
return "OK"
}
compiler/testData/codegen/box/functions/invoke/invokeOnExprByConvention.kt
+2 -2
View File
@@ -14,7 +14,7 @@ fun box(): String {
if (foo()() != "##") return "fail3"
if (foo()(42) != "#42") return "fail4"
if ((foo())(42) != "#42") return "fail5"
if ({() -> A()}()() != "##") return "fail6"
if ({() -> A()}()(37) != "#37") return "fail7"
if ({ -> A()}()() != "##") return "fail6"
if ({ -> A()}()(37) != "#37") return "fail7"
return "OK"
}
compiler/testData/codegen/box/functions/kt395.kt
+1 -1
View File
@@ -1,6 +1,6 @@
fun Any.with(operation : Any.() -> Any) = operation().toString()
val f = { (a : Int) :Unit -> }
val f = { a : Int -> }
fun box () : String {
return if(20.with {
compiler/testData/codegen/box/functions/kt785.kt
+1 -1
View File
@@ -1,7 +1,7 @@
class A() {
var x : Int = 0
var z = { () ->
var z = {
x++
}
}
compiler/testData/codegen/box/functions/localFunctions/kt2895.kt
+1 -1
View File
@@ -2,7 +2,7 @@ fun outer() {
fun inner(i: Int) {
if (i > 0){
{
(it: Int) -> inner(0) // <- invocation of literal itself is generated instead
it: Int -> inner(0) // <- invocation of literal itself is generated instead
}.invoke(1)
}
}
compiler/testData/codegen/box/labels/propertyAccessorInnerExtensionFun.kt
+2 -2
View File
@@ -1,6 +1,6 @@
val Int.getter: Int
get() {
val extFun = { Int.() ->
val extFun: Int.() -> Int = {
this@getter
}
return this@getter.extFun()
@@ -10,7 +10,7 @@ val Int.getter: Int
var Int.setter: Int
get() = 1
set(i: Int) {
val extFun = { Int.() ->
val extFun: Int.() -> Int = {
this@setter
}
this@setter.extFun()
compiler/testData/codegen/box/reflection/functionLiteralGenericSignature.kt
+6 -6
View File
@@ -10,13 +10,13 @@ fun assertGenericSuper(expected: String, function: Any?) {
val unitFun = { }
val intFun = { 42 }
val stringParamFun = { (x: String) : Unit -> }
val listFun = { (l: List<String>) : List<String> -> l }
val mutableListFun = { (l: MutableList<Double>) : MutableList<Int> -> null!! }
val funWithIn = { (x: Comparable<String>) : Unit -> }
val stringParamFun = { x: String -> }
val listFun = { l: List<String> -> l }
val mutableListFun = fun (l: MutableList<Double>): MutableList<Int> = null!!
val funWithIn = fun (x: Comparable<String>) {}
val extensionFun = { Any.() : Unit -> }
val extensionWithArgFun = { Long.(x: Any) : Date -> Date() }
val extensionFun = fun Any.() {}
val extensionWithArgFun = fun Long.(x: Any): Date = Date()
fun box(): String {
assertGenericSuper("kotlin.Function0<kotlin.Unit>", unitFun)
compiler/testData/codegen/box/regressions/kt3173.kt
+1 -1
View File
@@ -1,4 +1,4 @@
fun box(): String {
val sum = {Int.(other: Int) -> this + other }
val sum = fun Int.(other: Int) = this + other
return if (1 sum 2 == 3) "OK" else "Fail"
}
compiler/testData/codegen/box/regressions/kt3999.kt
+1 -1
View File
@@ -19,7 +19,7 @@ fun test2() {
}
fun Int.foo(a: Int) = this * a
val boo = {Int.(a: Int): Int -> this + a}
val boo = fun Int.(a: Int): Int = this + a
fun box(): String {
test1()