From b75dec4cf4f9a4ca6dc5d1d8866e9540b84f9d70 Mon Sep 17 00:00:00 2001 From: michelou Date: Wed, 4 Jul 2007 12:26:05 +0000 Subject: fixed bug in zipAll (thanks to Manojo, Prog4) --- test/files/run/lists.scala | 116 ++++++++++++++++++++++----------------------- 1 file changed, 58 insertions(+), 58 deletions(-) (limited to 'test/files') diff --git a/test/files/run/lists.scala b/test/files/run/lists.scala index 3791828a1c..947433d6a6 100644 --- a/test/files/run/lists.scala +++ b/test/files/run/lists.scala @@ -7,108 +7,108 @@ object Test { - val xs1 = List(1, 2, 3); - val xs2 = List('a', 'b'); - val xs3 = List(List(1, 2), List(4, 5)); - val xs4 = List(2, 4, 6, 8); - val xs5 = List(List(3, 4), List(3), List(4, 5)); - - def check_count: int = { - val n1 = xs1 count { e => e % 2 != 0 }; - val n2 = xs4 count { e => e < 5 }; + val xs1 = List(1, 2, 3) + val xs2 = List('a', 'b') + val xs3 = List(List(1, 2), List(4, 5)) + val xs4 = List(2, 4, 6, 8) + val xs5 = List(List(3, 4), List(3), List(4, 5)) + + def check_count: Int = { + val n1 = xs1 count { e => e % 2 != 0 } + val n2 = xs4 count { e => e < 5 } n1 + n2 } - def check_diff: int = { - val ys1 = xs1 diff xs4; - val ys2 = xs3 diff xs5; + def check_diff: Int = { + val ys1 = xs1 diff xs4 + val ys2 = xs3 diff xs5 ys1.length + ys2.length } - def check_exists: boolean = { - val b1 = xs1 exists { e => e % 2 == 0 }; - val b2 = xs4 exists { e => e == 5 }; + def check_exists: Boolean = { + val b1 = xs1 exists { e => e % 2 == 0 } + val b2 = xs4 exists { e => e == 5 } b1 & b2 } - def check_filter: int = { - val ys1 = xs1 filter { e => e % 2 == 0 }; - val ys2 = xs4 filter { e => e < 5 }; + def check_filter: Int = { + val ys1 = xs1 filter { e => e % 2 == 0 } + val ys2 = xs4 filter { e => e < 5 } ys1.length + ys2.length } - def check_foldLeft: int = { - val n1 = xs1.foldLeft(0)((e1, e2) => e1 + e2); - val ys1 = xs4.foldLeft(List[Int]())((e1, e2) => e2 :: e1); + def check_foldLeft: Int = { + val n1 = xs1.foldLeft(0)((e1, e2) => e1 + e2) + val ys1 = xs4.foldLeft(List[Int]())((e1, e2) => e2 :: e1) n1 + ys1.length } - def check_forall: boolean = { - val b1 = xs1 forall { e => e < 10}; - val b2 = xs4 forall { e => e % 2 == 0 }; + def check_forall: Boolean = { + val b1 = xs1 forall { e => e < 10} + val b2 = xs4 forall { e => e % 2 == 0 } b1 & b2 } - def check_intersect: int = { - val ys1 = xs1 intersect xs4; - val ys2 = xs3 intersect xs5; + def check_intersect: Int = { + val ys1 = xs1 intersect xs4 + val ys2 = xs3 intersect xs5 ys1.length + ys2.length } - def check_remove: int = { - val ys1 = xs1 remove { e => e % 2 != 0 }; - val ys2 = xs4 remove { e => e < 5 }; + def check_remove: Int = { + val ys1 = xs1 remove { e => e % 2 != 0 } + val ys2 = xs4 remove { e => e < 5 } ys1.length + ys2.length } - def check_union: int = { + def check_union: Int = { val ys1 = xs1 union xs4; val ys2 = xs3 union xs5; ys1.length + ys2.length } - def check_zip: int = { + def check_zip: Int = { val ys1 = xs1 zip xs2; val ys2 = xs1 zip xs3; ys1.length + ys2.length } - def check_zipAll: int = { - val ys1 = xs1.zipAll(xs2, 0, '_'); - val ys2 = xs1.zipAll(xs3, 0, List(-1)); - ys1.length + ys2.length + def check_zipAll: Int = { + val ys1 = xs1.zipAll(xs2, 0, '_') + val ys2 = xs2.zipAll(xs1, '_', 0) + val ys3 = xs1.zipAll(xs3, 0, List(-1)) + ys1.length + ys2.length + ys3.length } - def check_success[A](name: String, closure: => A, expected: A): Unit = { - Console.print("test " + name); + def check_success[A](name: String, closure: => A, expected: A) { + print("test " + name) try { - val actual: A = closure; + val actual: A = closure if (actual == expected) - Console.print(" was successful"); + print(" was successful") else - Console.print(" failed: expected "+ expected +", found "+ actual); + print(" failed: expected "+ expected +", found "+ actual) } catch { - case exception: Throwable => { - Console.print(" raised exception " + exception); - } + case exception: Throwable => + print(" raised exception " + exception) } - Console.println; + println } - def main(args: Array[String]): Unit = { - check_success("check_count", check_count, 4); - check_success("check_diff", check_diff, 3); - check_success("check_exists", check_exists, false); - check_success("check_filter", check_filter, 3); - check_success("check_foldLeft", check_foldLeft, 10); - check_success("check_forall", check_forall, true); - check_success("check_intersect", check_intersect, 2); - check_success("check_remove", check_remove, 3); - check_success("check_union", check_union, 10); - check_success("check_zip", check_zip, 4); - check_success("check_zipAll", check_zipAll, 6); - Console.println; + def main(args: Array[String]) { + check_success("check_count", check_count, 4) + check_success("check_diff", check_diff, 3) + check_success("check_exists", check_exists, false) + check_success("check_filter", check_filter, 3) + check_success("check_foldLeft", check_foldLeft, 10) + check_success("check_forall", check_forall, true) + check_success("check_intersect", check_intersect, 2) + check_success("check_remove", check_remove, 3) + check_success("check_union", check_union, 10) + check_success("check_zip", check_zip, 4) + check_success("check_zipAll", check_zipAll, 9) + println } } -- cgit v1.2.3