diff options
author | Martin Odersky <odersky@gmail.com> | 2006-06-21 10:36:06 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2006-06-21 10:36:06 +0000 |
commit | 2933e3f3cce9221a1fbe76b434957f8affb54548 (patch) | |
tree | afce1c862f9f24d3d456a31edd1c1b0c59b7663b /test/files | |
parent | b444420b5b136e8f6e3439c100fbcc5236e0100b (diff) | |
download | scala-2933e3f3cce9221a1fbe76b434957f8affb54548.tar.gz scala-2933e3f3cce9221a1fbe76b434957f8affb54548.tar.bz2 scala-2933e3f3cce9221a1fbe76b434957f8affb54548.zip |
Fixed test files after syntax change for closures.
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/jvm/serialization.scala | 2 | ||||
-rw-r--r-- | test/files/pos/bug115.scala | 4 | ||||
-rwxr-xr-x | test/files/pos/bug628.scala | 17 | ||||
-rw-r--r-- | test/files/pos/lambda.scala | 9 | ||||
-rw-r--r-- | test/files/run/Course-2002-05.scala | 6 | ||||
-rw-r--r-- | test/files/run/Course-2002-10.scala | 6 | ||||
-rw-r--r-- | test/files/run/bug216.scala | 2 |
7 files changed, 32 insertions, 14 deletions
diff --git a/test/files/jvm/serialization.scala b/test/files/jvm/serialization.scala index f33458fac7..ec1bbbab13 100644 --- a/test/files/jvm/serialization.scala +++ b/test/files/jvm/serialization.scala @@ -43,7 +43,7 @@ object Test1_scala { val x1 = Nil; val x2 = None; val x3 = Array(1, 2, 3); - val x4 = x: Int => 2 * x; + val x4 = { x: Int => 2 * x } try { val y1: List[All] = Serialize.read(Serialize.write(x1)); diff --git a/test/files/pos/bug115.scala b/test/files/pos/bug115.scala index a250e3c090..ad6cb44497 100644 --- a/test/files/pos/bug115.scala +++ b/test/files/pos/bug115.scala @@ -1,9 +1,9 @@ class S[A](f: A => A, x: A) { System.out.println(f(x)); } -class T[B](f: B => B, y: B) extends S(x: B => f(x), y) { +class T[B](f: B => B, y: B) extends S((x: B) => f(x), y) { } object Test extends Application { new T[Int](x => x * 2, 1); - val f = new S(x: Int => x, 1); + val f = new S((x: Int) => x, 1); } diff --git a/test/files/pos/bug628.scala b/test/files/pos/bug628.scala new file mode 100755 index 0000000000..f32c1cad0f --- /dev/null +++ b/test/files/pos/bug628.scala @@ -0,0 +1,17 @@ +object Test { + abstract class Unit + object NoUnit extends Unit + object Hour extends Unit + + case class Measure(scalar: Double, unit: Unit) { + def *(newUnit: Unit): Measure = Measure(scalar, newUnit) + } + + implicit def double2Measure(scalar: Double) = + Measure(scalar, NoUnit) + + + def main(args: Array[String]): scala.Unit = { + Console.println("3.0 * Hour = " + (3.0 * (Hour: Unit))) + } +} diff --git a/test/files/pos/lambda.scala b/test/files/pos/lambda.scala index 187b3f9783..c9094992e8 100644 --- a/test/files/pos/lambda.scala +++ b/test/files/pos/lambda.scala @@ -1,8 +1,9 @@ object test { - def apply[a,b](f: a => b): a => b = x: a => f(x); + def apply[a,b](f: a => b): a => b = { x: a => f(x) } - def twice[a](f: a => a): a => a = x: a => f(f(x)); + def twice[a](f: a => a): a => a = { x: a => f(f(x)) } + + def main = apply[Int,Int](twice[Int]{x: Int => x})(1); +} - def main = apply[Int,Int](twice[Int](x: Int => x))(1); -}
\ No newline at end of file diff --git a/test/files/run/Course-2002-05.scala b/test/files/run/Course-2002-05.scala index c761f88f5d..abf9978ac6 100644 --- a/test/files/run/Course-2002-05.scala +++ b/test/files/run/Course-2002-05.scala @@ -21,7 +21,7 @@ object M0 { xs else { val pivot = xs.head; - val sub = partition(xs.tail, (elem : a => less(elem, pivot))); + val sub = partition(xs.tail, { elem : a => less(elem, pivot) }); quicksort(less)(sub._1) ::: List(pivot) ::: quicksort(less)(sub._2) } } @@ -61,7 +61,7 @@ object M1 { xs else { val pivot = xs.head; - val sub = partition(xs.tail, (elem : a => less(elem, pivot))); + val sub = partition(xs.tail, (elem : a) => less(elem, pivot)); quicksort(less)(sub._1) ::: List(pivot) ::: quicksort(less)(sub._2) } } @@ -97,7 +97,7 @@ object M2 { else { val x = s.head; val withoutX = powerset(s.tail); - withoutX ::: withoutX.map(s1 : List[a] => x::s1) + withoutX ::: withoutX.map { s1 : List[a] => x::s1 } } } diff --git a/test/files/run/Course-2002-10.scala b/test/files/run/Course-2002-10.scala index e634309018..d92893772e 100644 --- a/test/files/run/Course-2002-10.scala +++ b/test/files/run/Course-2002-10.scala @@ -25,7 +25,7 @@ object M0 { object M1 { def scale(x: double, s: Stream[double]): Stream[double] = - s map (e: double => e*x); + s map { e: double => e*x } def partialSums(s: Stream[double]): Stream[double] = Stream.cons(s.head, partialSums(s.tail) map (x => x + s.head)); @@ -46,14 +46,14 @@ object M1 { better(s, transform) map (x => x.head); def lnSummands(n: double): Stream[double] = - Stream.cons(1.0 / n, lnSummands(n + 1.0) map (x: double => -x)); + Stream.cons(1.0 / n, lnSummands(n + 1.0) map { x: double => -x }) var ln0 = partialSums(lnSummands(1.0)); var ln1 = euler(ln0); var ln2 = veryGood(ln0, euler); def piSummands(n: double): Stream[double] = - Stream.cons(1.0 / n, piSummands(n + 2.0) map (x: double => -x)); + Stream.cons(1.0 / n, piSummands(n + 2.0) map { x: double => -x }) var pi0 = scale(4.0, partialSums(piSummands(1.0))); var pi1 = euler(pi0); diff --git a/test/files/run/bug216.scala b/test/files/run/bug216.scala index 41b2af7b50..8f67c7b024 100644 --- a/test/files/run/bug216.scala +++ b/test/files/run/bug216.scala @@ -1,6 +1,6 @@ object Test extends Application { object m { - val f = x: unit => (); + val f = { x: unit => () } Console.println("OK") } m; |