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/boxInline/capture/simpleCapturingInClass.1.kt
+4 -4
View File
@@ -1,7 +1,7 @@
fun testAll(): String {
val inlineX = InlineAll()
return inlineX.inline({(a1: Int, a2: Double, a3: Double, a4: String, a5: Long) ->
return inlineX.inline({ a1: Int, a2: Double, a3: Double, a4: String, a5: Long ->
"" + a1 + a2 + a3 + a4 + a5},
1, 12.0, 13.0, "14", 15)
}
@@ -19,7 +19,7 @@ fun testAllWithCapturedVal(): String {
val c8 = 27.toShort()
val c9 = 28.toFloat()
return inlineX.inline({(a1: Int, a2: Double, a3: Double, a4: String, a5: Long) ->
return inlineX.inline({ a1: Int, a2: Double, a3: Double, a4: String, a5: Long ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
}
@@ -37,7 +37,7 @@ fun testAllWithCapturedVar(): String {
var c8 = 27.toShort()
val c9 = 28.toFloat()
return inlineX.inline({(a1: Int, a2: Double, a3: Double, a4: String, a5: Long) ->
return inlineX.inline({ a1: Int, a2: Double, a3: Double, a4: String, a5: Long ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
}
@@ -55,7 +55,7 @@ fun testAllWithCapturedValAndVar(): String {
var c8 = 27.toShort()
val c9 = 28.toFloat()
return inlineX.inline({(a1: Int, a2: Double, a3: Double, a4: String, a5: Long) ->
return inlineX.inline({ a1: Int, a2: Double, a3: Double, a4: String, a5: Long ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
}
compiler/testData/codegen/boxInline/capture/simpleCapturingInPackage.1.kt
+12 -12
View File
@@ -1,7 +1,7 @@
fun testAll(): String {
return inline({(a1: Int, a2: Double, a3: Double, a4: String, a5: Long) ->
"" + a1 + a2 + a3 + a4 + a5},
1, 12.0, 13.0, "14", 15)
return inline({ a1: Int, a2: Double, a3: Double, a4: String, a5: Long ->
"" + a1 + a2 + a3 + a4 + a5},
1, 12.0, 13.0, "14", 15)
}
fun testAllWithCapturedVal(): String {
@@ -15,9 +15,9 @@ fun testAllWithCapturedVal(): String {
val c8 = 27.toShort()
val c9 = 28.toFloat()
return inline({(a1: Int, a2: Double, a3: Double, a4: String, a5: Long) ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
return inline({ a1: Int, a2: Double, a3: Double, a4: String, a5: Long ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
}
fun testAllWithCapturedVar(): String {
@@ -31,9 +31,9 @@ fun testAllWithCapturedVar(): String {
var c8 = 27.toShort()
val c9 = 28.toFloat()
return inline({(a1: Int, a2: Double, a3: Double, a4: String, a5: Long) ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
return inline({ a1: Int, a2: Double, a3: Double, a4: String, a5: Long ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
}
fun testAllWithCapturedValAndVar(): String {
@@ -47,9 +47,9 @@ fun testAllWithCapturedValAndVar(): String {
var c8 = 27.toShort()
val c9 = 28.toFloat()
return inline({(a1: Int, a2: Double, a3: Double, a4: String, a5: Long) ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
return inline({ a1: Int, a2: Double, a3: Double, a4: String, a5: Long ->
"" + a1 + a2 + a3 + a4 + a5 + c1 + c2 + c3 + c4 + c5 + c6 + c7 + c8 + c9},
1, 12.0, 13.0, "14", 15)
}
compiler/testData/codegen/boxInline/complex/closureChain.1.kt
+1 -1
View File
@@ -1,6 +1,6 @@
fun test1(): Int {
val inlineX = Inline()
return inlineX.foo({(z: Int) -> "" + z}, 25, {String.() -> this.length()})
return inlineX.foo({ z: Int -> "" + z}, 25, fun String.(): Int = this.length())
}
fun box(): String {
compiler/testData/codegen/boxInline/defaultValues/defaultInExtension.1.kt
+4 -4
View File
@@ -8,10 +8,10 @@ fun testExtensionInClass() : String {
res = with(Z(1)) { "1".run() }
if (res != "1null") return "failed in class 2: $res"
res = with(Z(2)) { "3".run("OK", {(a, b) -> a + b + value }, 1) }
res = with(Z(2)) { "3".run("OK", { a, b -> a + b + value }, 1) }
if (res != "OK123") return "failed in class 3: $res"
res = with(Z(3)) { "4".run(lambda = {(a, b) -> a + b + value }) }
res = with(Z(3)) { "4".run(lambda = { a, b -> a + b + value }) }
if (res != "034") return "failed in class 4: $res"
return "OK"
@@ -25,10 +25,10 @@ fun box(): String {
res = "1".run()
if (res != "1null") return "failed 2: $res"
res = "3".run("OK", {(a, b) -> a + b}, 1)
res = "3".run("OK", { a, b -> a + b}, 1)
if (res != "OK13") return "failed 3: $res"
res = "4".run(lambda = {(a, b) -> a + b})
res = "4".run(lambda = { a, b -> a + b})
if (res != "04") return "failed 4: $res"
return testExtensionInClass()
compiler/testData/codegen/boxInline/defaultValues/defaultMethodInClass.1.kt
+2 -2
View File
@@ -5,9 +5,9 @@ fun box(): String {
if (Z().run("OK") != "OK0") return "fail 2"
if (Z().run("OK", {(a, b) -> a + b }, 1) != "OK1") return "fail 3"
if (Z().run("OK", { a, b -> a + b }, 1) != "OK1") return "fail 3"
if (Z().run(lambda = {(a: String, b: Int) -> a + b }) != "0") return "fail 4"
if (Z().run(lambda = { a: String, b: Int -> a + b }) != "0") return "fail 4"
return "OK"
}
compiler/testData/codegen/boxInline/noInline/noInline.1.kt
+1 -1
View File
@@ -1,5 +1,5 @@
fun test1(): Int {
return calc( {(l : Int) -> 2*l}, {(l : Int) -> 4*l})
return calc( { l: Int -> 2*l}, { l: Int -> 4*l})
}
compiler/testData/codegen/boxInline/noInline/withoutInline.1.kt
+1 -1
View File
@@ -1,6 +1,6 @@
fun test1(): Int {
val inlineX = Inline()
var p = {(l : Int) -> l};
var p = { l : Int -> l};
return inlineX.calc(p, 25)
}
compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/bracket.1.kt
-1
View File
@@ -2,7 +2,6 @@ import test.*
fun test1(b: Boolean): String {
val localResult = doCall ((@local {
() : String ->
if (b) {
return@local "local"
} else {
compiler/testData/codegen/boxInline/nonLocalReturns/deparenthesize/labeled.1.kt
-1
View File
@@ -2,7 +2,6 @@ import test.*
fun test1(b: Boolean): String {
val localResult = doCall @local {
() : String ->
if (b) {
return@local "local"
} else {
compiler/testData/codegen/boxInline/nonLocalReturns/explicitLocalReturn.1.kt
-1
View File
@@ -2,7 +2,6 @@ import test.*
fun test1(b: Boolean): String {
val localResult = doCall @local {
() : String ->
if (b) {
return@local "local"
} else {
compiler/testData/codegen/boxInline/nonLocalReturns/nestedNonLocals.1.kt
-2
View File
@@ -16,10 +16,8 @@ class Global(val value: String)
fun test1(intKind: Kind, extKind: Kind): Global {
var externalResult = doCall @ext {
() : External ->
val internalResult = doCall @int {
() : Internal ->
if (intKind == Kind.GLOBAL) {
return@test1 Global("internal -> global")
} else if (intKind == EXTERNAL) {
compiler/testData/codegen/boxInline/nonLocalReturns/noInlineLocalReturn.1.kt
-1
View File
@@ -2,7 +2,6 @@ import test.*
fun test1(b: Boolean): String {
val localResult = noInlineCall @local {
() : Int ->
if (b) {
return@local 1
} else {
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/callSite/callSite.1.kt
-2
View File
@@ -23,11 +23,9 @@ fun test1(intKind: Kind, extKind: Kind, holder: Holder): Global {
holder.value = ""
try {
var externalResult = doCall @ext {
(): External ->
try {
val internalResult = doCall @int {
(): Internal ->
try {
if (intKind == Kind.GLOBAL) {
return@test1 Global("internal -> global")
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/complex.1.kt
-2
View File
@@ -23,11 +23,9 @@ fun test1(intKind: Kind, extKind: Kind, holder: Holder): Global {
holder.value = ""
try {
var externalResult = doCall (@ext {
(): External ->
try {
val internalResult = doCall (@int {
(): Internal ->
try {
if (intKind == Kind.GLOBAL) {
return@test1 Global("internal -> global")
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTry.1.kt
-1
View File
@@ -18,7 +18,6 @@ fun test1(h: Holder): String {
fun test2(h: Holder): String {
val localResult = doCall (@lambda {
(): String ->
h.value += "OK_LOCAL"
return@lambda "OK_LOCAL"
}, {
compiler/testData/codegen/boxInline/nonLocalReturns/tryFinally/declSite/returnInTryAndFinally.1.kt
+1 -4
View File
@@ -22,7 +22,6 @@ fun test1(h: Holder): String {
fun test2(h: Holder): String {
val localResult = doCall (
@lambda {
(): String ->
h.value += "OK_NONLOCAL"
return@lambda "OK_NONLOCAL"
}, {
@@ -47,14 +46,12 @@ fun test3(h: Holder): String {
}
fun test4(h: Holder): String {
val localResult = doCall (
val localResult = doCall<String> (
{
():String ->
h.value += "OK_NONLOCAL"
return "OK_NONLOCAL"
},
@l2 {
():String ->
h.value += ", OK_FINALLY"
return@l2 "OK_FINALLY"
})
compiler/testData/codegen/boxInline/simple/extension.1.kt
+3 -3
View File
@@ -1,11 +1,11 @@
fun test1(): Int {
val inlineX = Inline(9)
return inlineX.calcExt({(z: Int) -> z}, 25)
return inlineX.calcExt({ z: Int -> z}, 25)
}
fun test2(): Int {
val inlineX = Inline(9)
return inlineX.calcExt2({Int.() -> this}, 25)
return inlineX.calcExt2(fun Int.(): Int = this, 25)
}
fun test3(): Int {
@@ -21,7 +21,7 @@ fun test4(): Double {
fun test5(): Double {
val inlineX = Inline(9)
with(inlineX) {
11.0.calcDouble{(a: Int, b: Double) -> a + b}
11.0.calcDouble{ a: Int, b: Double -> a + b}
}
return inlineX.doWorkWithDouble(11.0)
}
compiler/testData/codegen/boxInline/simple/extension.2.kt
+2 -2
View File
@@ -19,11 +19,11 @@ class Inline(val res: Int) {
}
fun doWork(l : InlineX) : Int {
return l.calcInt({(a: Int, b: Int) -> a + b})
return l.calcInt({ a: Int, b: Int -> a + b})
}
fun doWorkWithDouble(s : Double) : Double {
return s.calcDouble({(a: Int, b: Double) -> a + b})
return s.calcDouble({ a: Int, b: Double -> a + b})
}
}
compiler/testData/codegen/boxInline/simple/params.1.kt
+4 -4
View File
@@ -1,23 +1,23 @@
fun test1(): Int {
val inlineX = Inline()
return inlineX.foo1Int({(z: Int) -> z}, 25)
return inlineX.foo1Int({ z: Int -> z}, 25)
}
fun test2(): Double {
val inlineX = Inline()
return inlineX.foo1Double(25.0, {(z: Double) -> z})
return inlineX.foo1Double(25.0, { z: Double -> z})
}
fun test3(): Double {
val inlineX = Inline()
return inlineX.foo2Param(15.0, {(z1: Int, z2: Double) -> z1 + z2}, 10)
return inlineX.foo2Param(15.0, { z1: Int, z2: Double -> z1 + z2}, 10)
}
fun test3WithCaptured(): Double {
val inlineX = Inline()
var c = 11.0;
return inlineX.foo2Param(15.0, {(z1: Int, z2: Double) -> z1 + z2 + c}, 10)
return inlineX.foo2Param(15.0, { z1: Int, z2: Double -> z1 + z2 + c}, 10)
}
compiler/testData/codegen/boxInline/simple/severalClosures.1.kt
+3 -3
View File
@@ -1,17 +1,17 @@
fun test1(): Double {
val inlineX = Inline()
return inlineX.foo1({(z: Int) -> z}, 25, {(z: Double) -> z}, 11.5)
return inlineX.foo1({ z: Int -> z}, 25, { z: Double -> z}, 11.5)
}
fun test1WithCaptured(): Double {
val inlineX = Inline()
var d = 0.0;
return inlineX.foo1({(z: Int) -> d = 1.0; z}, 25, {(z: Double) -> z + d}, 11.5)
return inlineX.foo1({ z: Int -> d = 1.0; z}, 25, { z: Double -> z + d}, 11.5)
}
fun test2(): Double {
val inlineX = Inline()
return inlineX.foo2({(z: Int, p: Int) -> z + p}, 25, {(x: Double, y: Int, z: Int) -> z + x + y}, 11.5, 2)
return inlineX.foo2({ z: Int, p: Int -> z + p}, 25, { x: Double, y: Int, z: Int -> z + x + y}, 11.5, 2)
}
fun box(): String {
compiler/testData/codegen/boxInline/simple/simpleDouble.1.kt
+7 -7
View File
@@ -1,39 +1,39 @@
fun test0Param(): Double {
val inlineX = InlineDouble(10.0)
return inlineX.foo({() -> 1.0})
return inlineX.foo({ -> 1.0})
}
fun test1Param(): Double {
val inlineX = InlineDouble(10.0)
return inlineX.foo11({(z: Double) -> z})
return inlineX.foo11({ z: Double -> z})
}
fun test1ParamCaptured(): Double {
val s = 100.0
val inlineX = InlineDouble(10.0)
return inlineX.foo11({(z: Double) -> s})
return inlineX.foo11({ z: Double -> s})
}
fun test1ParamMissed() : Double {
val inlineX = InlineDouble(10.0)
return inlineX.foo11({(z: Double) -> 111.0})
return inlineX.foo11({ z: Double -> 111.0})
}
fun test1ParamFromCallContext() : Double {
val inlineX = InlineDouble(1000.0)
return inlineX.fooRes({(z: Double) -> z})
return inlineX.fooRes({ z: Double -> z})
}
fun test2Params() : Double {
val inlineX = InlineDouble(1000.0)
return inlineX.fooRes2({(y: Double, z: Double) -> 2.0 * y + 3.0 * z})
return inlineX.fooRes2({ y: Double, z: Double -> 2.0 * y + 3.0 * z})
}
fun test2ParamsWithCaptured() : Double {
val inlineX = InlineDouble(1000.0)
val s = 9.0
var t = 1.0
return inlineX.fooRes2({(y: Double, z: Double) -> 2.0 * s + t})
return inlineX.fooRes2({ y: Double, z: Double -> 2.0 * s + t})
}
fun box(): String {
compiler/testData/codegen/boxInline/simple/simpleInt.1.kt
+7 -7
View File
@@ -1,39 +1,39 @@
fun test0Param(): Int {
val inlineX = Inline(10)
return inlineX.foo({() -> 1})
return inlineX.foo({ -> 1})
}
fun test1Param(): Int {
val inlineX = Inline(10)
return inlineX.foo11({(z: Int) -> z})
return inlineX.foo11({ z: Int -> z})
}
fun test1ParamCaptured(): Int {
val s = 100
val inlineX = Inline(10)
return inlineX.foo11({(z: Int) -> s})
return inlineX.foo11({ z: Int -> s})
}
fun test1ParamMissed() : Int {
val inlineX = Inline(10)
return inlineX.foo11({(z: Int) -> 111})
return inlineX.foo11({ z: Int -> 111})
}
fun test1ParamFromCallContext() : Int {
val inlineX = Inline(1000)
return inlineX.fooRes({(z: Int) -> z})
return inlineX.fooRes({ z: Int -> z})
}
fun test2Params() : Int {
val inlineX = Inline(1000)
return inlineX.fooRes2({(y: Int, z: Int) -> 2 * y + 3 * z})
return inlineX.fooRes2({ y: Int, z: Int -> 2 * y + 3 * z})
}
fun test2ParamsWithCaptured() : Int {
val inlineX = Inline(1000)
val s = 9
var t = 1
return inlineX.fooRes2({(y: Int, z: Int) -> 2 * s + t})
return inlineX.fooRes2({ y: Int, z: Int -> 2 * s + t})
}
fun box(): String {
compiler/testData/codegen/boxInline/simple/simpleObject.1.kt
+7 -7
View File
@@ -1,39 +1,39 @@
fun test0Param(): String {
val inlineX = InlineString("10")
return inlineX.foo({() -> "1"})
return inlineX.foo({ -> "1"})
}
fun test1Param(): String {
val inlineX = InlineString("10")
return inlineX.foo11({(z: String) -> z})
return inlineX.foo11({ z: String -> z})
}
fun test1ParamCaptured(): String {
val s = "100"
val inlineX = InlineString("10")
return inlineX.foo11({(z: String) -> s})
return inlineX.foo11({ z: String -> s})
}
fun test1ParamMissed() : String {
val inlineX = InlineString("10")
return inlineX.foo11({(z: String) -> "111"})
return inlineX.foo11({ z: String -> "111"})
}
fun test1ParamFromCallContext() : String {
val inlineX = InlineString("1000")
return inlineX.fooRes({(z: String) -> z})
return inlineX.fooRes({ z: String -> z})
}
fun test2Params() : String {
val inlineX = InlineString("1000")
return inlineX.fooRes2({(y: String, z: String) -> y + "0" + z})
return inlineX.fooRes2({ y: String, z: String -> y + "0" + z})
}
fun test2ParamsWithCaptured() : String {
val inlineX = InlineString("1000")
val s = "9"
var t = "1"
return inlineX.fooRes2({(y: String, z: String) -> s + t})
return inlineX.fooRes2({ y: String, z: String -> s + t})
}
fun box(): String {
compiler/testData/codegen/boxInline/simple/vararg.2.kt
+1 -1
View File
@@ -1,5 +1,5 @@
package test
inline fun doSmth(vararg a: String) : String {
return a.foldRight("", {(a, b) -> a + b})
return a.foldRight("", { a, b -> a + b})
}
compiler/testData/codegen/boxInline/special/inlineChain.1.kt
+2 -2
View File
@@ -1,13 +1,13 @@
fun test1(): String {
val inlineX = My()
var d = "";
inlineX.doWork({(z: String) -> d = z; z})
inlineX.doWork({ z: String -> d = z; z})
return d
}
fun test2(): Int {
val inlineX = My()
return inlineX.perform({(z: My) -> 11})
return inlineX.perform({ z: My -> 11})
}
fun box(): String {
compiler/testData/codegen/boxInline/tryCatchFinally/tryCatch2.1.kt
+3 -3
View File
@@ -17,7 +17,7 @@ fun test11(): Int {
throw RuntimeException("2")
}
},
{(ex, thizz) ->
{ ex, thizz ->
if (ex.getMessage() == "2") {
thizz.value
} else {
@@ -48,7 +48,7 @@ fun test22(): Int {
111
}
},
{(ex, thizz) ->
{ ex, thizz ->
-11111
})
@@ -80,7 +80,7 @@ fun test33(): Int {
throw RuntimeException("-2")
}
},
{(ex, thizz) ->
{ ex, thizz ->
if (ex.getMessage() == "-2") {
throw RuntimeException("-3")
} else {
compiler/testData/codegen/boxInline/tryCatchFinally/tryCatchFinally.1.kt
+1 -1
View File
@@ -48,7 +48,7 @@ fun test3(): Int {
result = it.value;
throw RuntimeException("-1")
},
{ (e, z)->
{ e, z ->
++result
throw RuntimeException("-2")
},