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/pos | |
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/pos')
-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 |
3 files changed, 24 insertions, 6 deletions
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 |