summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2006-02-10 14:49:29 +0000
committerMartin Odersky <odersky@gmail.com>2006-02-10 14:49:29 +0000
commitc19726b180758dc3b9d4dd070dff626fce5836d7 (patch)
treea714012c48e571f209f135ce99d910d3fe0bc7b3 /test
parent5ea297c2becd1d277e8fbe16a6046b4967ce870c (diff)
downloadscala-c19726b180758dc3b9d4dd070dff626fce5836d7.tar.gz
scala-c19726b180758dc3b9d4dd070dff626fce5836d7.tar.bz2
scala-c19726b180758dc3b9d4dd070dff626fce5836d7.zip
Diffstat (limited to 'test')
-rw-r--r--test/files/run/forvaleq.check9
-rw-r--r--test/files/run/forvaleq.scala17
2 files changed, 20 insertions, 6 deletions
diff --git a/test/files/run/forvaleq.check b/test/files/run/forvaleq.check
index 141ac1ebfe..27f5269789 100644
--- a/test/files/run/forvaleq.check
+++ b/test/files/run/forvaleq.check
@@ -1,4 +1,5 @@
-List(2, 6, 10, 14, 18, 22, 24, 26, 28, 30, 32, 34, 36, 38)
-List(2, 6, 10, 14, 18, 22, 24, 26, 28, 30, 32, 34, 36, 38)
-List(2, 6, 10, 14, 18, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2)
-called 21 times
+List(2,6,10,14,18,20,22,24,26,28,30,32,34,36,38)
+List(2,6,10,14,18,2,2,2,2,2,2,2,2,2,2)
+List(2,6,10,14,18,20,22,24,26,28,30,32,34,36,38)
+List(2,6,10,14,18,2,2,2,2,2,2,2,2,2,2)
+called 20 times
diff --git a/test/files/run/forvaleq.scala b/test/files/run/forvaleq.scala
index 47bc545d47..a30c659ecc 100644
--- a/test/files/run/forvaleq.scala
+++ b/test/files/run/forvaleq.scala
@@ -7,7 +7,6 @@ import scala.{List=>L}
object Test {
// redefine some symbols to make it extra hard
class List
- class Pair
class Tuple2
def List[A](as:A*) = 5
@@ -33,6 +32,20 @@ object Test {
}
{
+ // a test case with patterns
+
+ val input = L.range(0,20)
+ val oddFirstTimesTwo =
+ for{val x <- input
+ val xf = firstDigit(x)
+ val yf = x - firstDigit(x) / 10
+ val Pair(a, b) = Pair(xf - yf, xf + yf)
+ xf % 2 == 1}
+ yield a + b
+ Console.println(oddFirstTimesTwo)
+ }
+
+ {
// make sure it works on non-Ls
// val input: Queue = Queue.Empty[int].incl(L.range(0,20))
@@ -42,7 +55,7 @@ object Test {
val xf = firstDigit(x)
xf % 2 == 1}
yield x*2
- Console.println(oddFirstTimesTwo.toL)
+ Console.println(oddFirstTimesTwo.toList)
}
{