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

Fix formatting in some of test data files.

Browse Source 
Adapted from https://github.com/develar/kotlin/commit/a9e0a42fb1347fa8e21c86b5a073ef8a7c873da0.
This commit is contained in:
Pavel V. Talanov
2012-08-10 14:06:23 +04:00
parent 12d9b25189
commit 7a22ad099a
31 changed files with 227 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/testFiles/expression/function/cases/KT-921.kt
+36 -35
View File
@@ -2,12 +2,12 @@ import java.util.*
class Lifetime() {
val attached = ArrayList< Function0<Unit> >()
public fun attach(action : ()->Unit)
{
attached.add(action)
}
fun close()
{
for(x in attached) x()
@@ -18,51 +18,52 @@ class Lifetime() {
public class Viewable<T>()
{
val items = ArrayList<T>()
fun add(item:T)
{
items.add(item)
}
fun remove(item:T)
{
items.remove(item)
}
fun view(lifetime: Lifetime, viewer: (itemLifetime:Lifetime, item:T) -> Unit)
{
for(item in items)
viewer(lifetime, item)
}
fun view(lifetime: Lifetime, viewer: (itemLifetime: Lifetime, item: T) -> Unit) {
for (item in items) {
viewer(lifetime, item)
}
}
}
fun lifetime(body: (Lifetime)->Unit)
{
val l = Lifetime()
body(l)
l.close()
fun lifetime(body: (Lifetime)->Unit) {
val l = Lifetime()
body(l)
l.close()
}
fun<T> Dump(items:ArrayList<T>)
{
for(item in items)
print(item.toString() + ", ")
println("end")
fun<T> Dump(items: ArrayList<T>) {
for(item in items) {
print(item.toString() + ", ")
}
println("end")
}
fun main(args:Array<String>)
{
val v = Viewable<Int>()
val x = ArrayList<Int>()
v.add(1)
v.add(2)
v.add(3)
lifetime(
{
v.view(it, {(itemLifetime, item)->
x.add(item)
Dump(x)
itemLifetime.attach { x.remove(item as Any); Dump(x); println("!") }
})
})
fun main(args: Array<String>) {
val v = Viewable<Int>()
val x = ArrayList<Int>()
v.add(1)
v.add(2)
v.add(3)
lifetime() {
v.view(it) {itemLifetime, item ->
x.add(item)
Dump(x)
itemLifetime.attach() {
x.remove(item as Any);
Dump(x);
println("!")
}
}
}
}
js/js.translator/testFiles/expression/function/cases/adderClosure.kt
+6 -6
View File
@@ -1,9 +1,9 @@
package foo
fun box() : Boolean {
var sum = 0
val adder = {(a: Int) -> sum += a }
adder(3)
adder(2)
return sum == 5
fun box(): Boolean {
var sum = 0
val adder = {(a: Int) -> sum += a}
adder(3)
adder(2)
return sum == 5
}
js/js.translator/testFiles/expression/function/cases/defaultParameters.kt
-1
View File
@@ -1,6 +1,5 @@
package foo
fun f(a : Int = 2, b : Int = 3) = a + b
fun box() : Boolean
js/js.translator/testFiles/expression/function/cases/functionLiteralAsLastParameter.kt
+3 -3
View File
@@ -1,14 +1,14 @@
package foo
fun f(a: (Int) -> Int) = a(1)
fun f(a: (Int) -> Int) = a(1)
fun box() : Boolean {
fun box(): Boolean {
if (f() {
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
}
js/js.translator/testFiles/expression/function/cases/loopClosure.kt
+5 -5
View File
@@ -2,16 +2,16 @@ package foo
var b = 0
fun loop(var times : Int) {
while(times > 0) {
val u = {(value : Int) ->
fun loop(var times: Int) {
while (times > 0) {
val u = {(value: Int) ->
b = b + 1
}
u(times--)
}
}
}
fun box() : Boolean {
fun box(): Boolean {
loop(5)
return b == 5
}
js/js.translator/testFiles/expression/misc/cases/KT-1361-2.kt
+15 -16
View File
@@ -1,7 +1,7 @@
package foo
class Data(val rawData : Array<Int>, val width : Int, val height : Int) {
fun get(x : Int, y : Int) : ColorLike {
class Data(val rawData: Array<Int>, val width: Int, val height: Int) {
fun get(x: Int, y: Int): ColorLike {
return object : ColorLike {
override val red: Int = rawData[(y * width + x) * 4 + 0];
override val green: Int = rawData[(y * width + x) * 4 + 1];
@@ -9,13 +9,13 @@ class Data(val rawData : Array<Int>, val width : Int, val height : Int) {
}
}
fun set(x : Int, y : Int, color : ColorLike) {
fun set(x: Int, y: Int, color: ColorLike) {
rawData[(y * width + x) * 4 + 0] = color.red;
rawData[(y * width + x) * 4 + 1] = color.green;
rawData[(y * width + x) * 4 + 2] = color.blue;
}
fun each(block : (x : Int, y : Int)->Unit) {
fun each(block: (x: Int, y: Int)->Unit) {
for (x in 0..width - 1) {
for (y in 0..height - 1) {
block(x, y)
@@ -24,29 +24,28 @@ class Data(val rawData : Array<Int>, val width : Int, val height : Int) {
}
}
class Color(r : Int, g : Int, b : Int) : ColorLike {
class Color(r: Int, g: Int, b: Int): ColorLike {
override val red: Int = r
override val green: Int = g
override val blue: Int = b
}
trait ColorLike {
val red : Int;
val green : Int;
val blue : Int;
val red: Int;
val green: Int;
val blue: Int;
}
fun box() : Boolean {
fun box(): Boolean {
val d = Data(Array(4) {0}, 1, 1)
if (d[0, 0].red != 0) {
return false
}
if (d[0, 0].green != 0) {
return false
}
if (d[0, 0].blue != 0) {
return false
}
return true
return false
}
if (d[0, 0].blue != 0) {
return false
}
return true
}
js/js.translator/testFiles/expression/misc/cases/KT-740-2.kt
+24 -26
View File
@@ -5,31 +5,29 @@ var c1 = 0
var c2 = 0
class A() {
var p = 0
fun get(i : Int) : Int {
c1++
return 0
}
fun set(i : Int, value : Int) {
c2++
}
var p = 0
fun get(i: Int): Int {
c1++
return 0
}
fun set(i: Int, value: Int) {
c2++
}
}
val a : A = A()
get() {
c0++
return $a
}
fun box() : String {
val a: A = A()
get() {
c0++
return $a
}
fun box(): String {
var d = a[1]
if (c0 != 1) {
return "1"
}
if (c1 != 1) {
if (c1 != 1) {
return "2"
}
++a[1]
@@ -37,20 +35,20 @@ fun box() : String {
return "3"
}
if (c1 != 3) {
return "4"
return "4"
}
if (c2 != 1) {
return "5"
}
--a[1]
--a[1]
if (c0 != 3) {
return "6"
}
if (c1 != 5) {
return "7"
}
if (c2 != 2) {
return "8"
}
return "OK"
if (c1 != 5) {
return "7"
}
if (c2 != 2) {
return "8"
}
return "OK"
}
js/js.translator/testFiles/expression/misc/cases/classWithoutNamespace.kt
+3 -3
View File
@@ -1,7 +1,7 @@
class A(var a : Int) {
class A(var a: Int) {
{
$a=3
$a = 3
}
}
fun box() = (A(1).a == 3)
fun box() = (A(1).a == 3)
js/js.translator/testFiles/expression/misc/cases/funInConstructor.kt
+8 -7
View File
@@ -1,17 +1,18 @@
package foo
class A() {
fun lold() = true
fun lold() = true
val p = {{lold()}()}
val p = {{
lold()
}()
}
}
fun box() : Boolean {
return A().p()
fun box(): Boolean {
return A().p()
}
fun main(arg : Array<String>) {
fun main(arg: Array<String>) {
println(box())
}
js/js.translator/testFiles/expression/misc/cases/funInConstructorBlock.kt
+8 -9
View File
@@ -1,19 +1,18 @@
package foo
class A() {
fun lold() = true
val p : ()->Boolean
{
$p = {{lold()}()}
}
fun lold() = true
val p: ()->Boolean
{
$p = {{lold()}()}
}
}
fun box() : Boolean {
return A().p()
fun box(): Boolean {
return A().p()
}
fun main(arg : Array<String>) {
fun main(arg: Array<String>) {
println(box())
}
js/js.translator/testFiles/expression/misc/cases/whenReturnedWithoutBlock.kt
+12 -12
View File
@@ -1,18 +1,18 @@
package foo
fun box() : Boolean {
if (t(1) != 0) {
return false
}
if (t(0) != 1) {
return false
}
return (t(100) == 2)
fun box(): Boolean {
if (t(1) != 0) {
return false
}
if (t(0) != 1) {
return false
}
return (t(100) == 2)
}
fun t(i : Int) = when(i) {
0 -> 1
1 -> 0
else -> 2
fun t(i: Int) = when(i) {
0 -> 1
1 -> 0
else -> 2
}