summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-04-10 10:30:43 +0000
committerMartin Odersky <odersky@gmail.com>2007-04-10 10:30:43 +0000
commitc5861d824317784efb52b52a60d4194960218bb3 (patch)
treeafbbda330bc838b3406fadb7c3b5c5c2c80fa13c /test
parent1f2a73f36b7e3334b03ea8d321e8b9058289fa0e (diff)
downloadscala-c5861d824317784efb52b52a60d4194960218bb3.tar.gz
scala-c5861d824317784efb52b52a60d4194960218bb3.tar.bz2
scala-c5861d824317784efb52b52a60d4194960218bb3.zip
check for variables in pattern alternatives; ch...
check for variables in pattern alternatives; changes to enable presupercall initialization.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/patternalts.check4
-rw-r--r--test/files/neg/patternalts.scala8
-rw-r--r--test/files/run/colltest.check2
-rw-r--r--test/files/run/colltest.scala2
4 files changed, 14 insertions, 2 deletions
diff --git a/test/files/neg/patternalts.check b/test/files/neg/patternalts.check
new file mode 100644
index 0000000000..9bec9a001a
--- /dev/null
+++ b/test/files/neg/patternalts.check
@@ -0,0 +1,4 @@
+patternalts.scala:3: error: illegal variable in pattern alternative
+ case List(x) | List() => Console.println(x)
+ ^
+one error found
diff --git a/test/files/neg/patternalts.scala b/test/files/neg/patternalts.scala
new file mode 100644
index 0000000000..091b6e51ad
--- /dev/null
+++ b/test/files/neg/patternalts.scala
@@ -0,0 +1,8 @@
+object Test {
+ List(1) match {
+ case List(x) | List() => Console.println(x)
+ }
+ List(2) match {
+ case List(_: int) | List() => Console.println()
+ }
+}
diff --git a/test/files/run/colltest.check b/test/files/run/colltest.check
index 868cc81ece..be930f06ce 100644
--- a/test/files/run/colltest.check
+++ b/test/files/run/colltest.check
@@ -1 +1 @@
-succeeded for 1000000 iterations.
+succeeded for 10 iterations.
diff --git a/test/files/run/colltest.scala b/test/files/run/colltest.scala
index 024f2fb1f4..049c075fa1 100644
--- a/test/files/run/colltest.scala
+++ b/test/files/run/colltest.scala
@@ -1,6 +1,6 @@
import collection.mutable._
class TestSet(s0: Set[int], s1: Set[int]) {
- val Iterations = 1000000
+ val Iterations = 10
val Range = 100000
val testEachStep = false
val Threshold = 20000