summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2009-09-25 19:17:20 +0000
committerPaul Phillips <paulp@improving.org>2009-09-25 19:17:20 +0000
commit0c50ba867782ce737b99f1f108103b7ba53a1a50 (patch)
tree99692218926be876b4b6e5b4adcb3bd3c194d324 /test/files
parent4a727f3b01d0fa27ef51f7dba472116e021e3445 (diff)
downloadscala-0c50ba867782ce737b99f1f108103b7ba53a1a50.tar.gz
scala-0c50ba867782ce737b99f1f108103b7ba53a1a50.tar.bz2
scala-0c50ba867782ce737b99f1f108103b7ba53a1a50.zip
Reverted r18215 at martin's request.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/run/castsingleton.check2
-rw-r--r--test/files/run/castsingleton.scala11
-rw-r--r--test/files/run/patmatnew.scala7
3 files changed, 2 insertions, 18 deletions
diff --git a/test/files/run/castsingleton.check b/test/files/run/castsingleton.check
deleted file mode 100644
index 49742281f0..0000000000
--- a/test/files/run/castsingleton.check
+++ /dev/null
@@ -1,2 +0,0 @@
-L()
-L()
diff --git a/test/files/run/castsingleton.scala b/test/files/run/castsingleton.scala
deleted file mode 100644
index f907467741..0000000000
--- a/test/files/run/castsingleton.scala
+++ /dev/null
@@ -1,11 +0,0 @@
-object Test extends Application {
- case class L();
- object N extends L();
-
- def empty(xs : L) : Unit = xs match {
- case x@N => println(x); println(x);
- case x => println(x); println(x);
- }
-
- empty(L())
-}
diff --git a/test/files/run/patmatnew.scala b/test/files/run/patmatnew.scala
index 26083a7c1b..025d6bf2ef 100644
--- a/test/files/run/patmatnew.scala
+++ b/test/files/run/patmatnew.scala
@@ -880,11 +880,8 @@ object C {
}
override def runTest() {
- // We no longer assert these are true, because they are no longer true!
- // See ticket #1503 for details, but it is unsound to let L(Nil) be
- // seen as an N by the LHS of a match.
- // assertTrue(empty( new L(Nil) ))
- // assertTrue(singleton( new L(List(1)) ))
+ assertTrue(empty( new L(Nil) ))
+ assertTrue(singleton( new L(List(1)) ))
}
} // end Ticket346