Reverted r18215 at martin's request.

3 files changed, 3 insertions, 7 deletions

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
diff --git a/test/files/run/castsingleton.check b/test/pending/run/castsingleton.check
index 49742281f0..49742281f0 100644
--- a/test/files/run/castsingleton.check
+++ b/test/pending/run/castsingleton.check
diff --git a/test/files/run/castsingleton.scala b/test/pending/run/castsingleton.scala
index f907467741..171b380dc9 100644
--- a/test/files/run/castsingleton.scala
+++ b/test/pending/run/castsingleton.scala
@@ -3,8 +3,7 @@ object Test extends Application {
   object N extends L();
 
   def empty(xs : L) : Unit = xs match {
-    case x@N  => println(x); println(x);
-    case x    => println(x); println(x);
+    case x@N => println(x); println(x);
   }
 
   empty(L())