7 files changed, 88 insertions, 3 deletions
diff --git a/test/files/run/virtpatmat_partial.check b/test/files/run/virtpatmat_partial.check
index 093020ce05..1555eca82b 100644
--- a/test/files/run/virtpatmat_partial.check
+++ b/test/files/run/virtpatmat_partial.check
@@ -1,2 +1,4 @@
 Map(a -> Some(1), b -> None)
-Map(a -> 1)
-\ No newline at end of file
+79
+undefined
+Map(a -> 1)
diff --git a/test/files/run/virtpatmat_partial.scala b/test/files/run/virtpatmat_partial.scala
index c408b31983..6597f2f5ae 100644
--- a/test/files/run/virtpatmat_partial.scala
+++ b/test/files/run/virtpatmat_partial.scala
@@ -4,6 +4,29 @@ object Test extends App {
 
   val res = a collect {case (p, Some(a)) => (p, a)}
 
+  final val GT = 79
+  final val GTGT = 93
+  final val GTGTGT = 94
+  final val GTEQ = 81
+  final val GTGTEQ = 113
+  final val GTGTGTEQ = 114
+  final val ASSIGN = 75
+
+  def acceptClosingAngle(in: Int) {
+    val closers: PartialFunction[Int, Int] = {
+      case GTGTGTEQ => GTGTEQ
+      case GTGTGT   => GTGT
+      case GTGTEQ   => GTEQ
+      case GTGT     => GT
+      case GTEQ     => ASSIGN
+    }
+    if (closers isDefinedAt in) println(closers(in))
+    else println("undefined")
+  }
+
+  acceptClosingAngle(GTGT)
+  acceptClosingAngle(ASSIGN)
+
   // should uncurry to:
   // val res: Map[String,Int] = a.collect[(String, Int), Map[String,Int]](
   //   new PartialFunction[(String, Option[Int]),(String, Int)]  {
diff --git a/test/files/run/virtpatmat_switch.scala b/test/files/run/virtpatmat_switch.scala
index 2e2c31e8e5..1329c19d0f 100644
--- a/test/files/run/virtpatmat_switch.scala
+++ b/test/files/run/virtpatmat_switch.scala
@@ -14,9 +14,15 @@ object Test extends App {
     case 'b' => "got b"
     case _ => "got some letter"
   }
+
+  def byteSwitch(x: Byte) = x match {
+    case 'a' => "got a"
+    case 'b' => "got b"
+    case _ => "got some letter"
+  }
   
   println(charSwitch('a'))
-  println(charSwitch('b'))
+  println(byteSwitch('b'))
   println(charSwitch('z'))
   
   def implicitDefault(x: Int) = x match {
diff --git a/test/files/run/virtpatmat_try.check b/test/files/run/virtpatmat_try.check
new file mode 100644
index 0000000000..80ebbf494a
--- /dev/null
+++ b/test/files/run/virtpatmat_try.check
@@ -0,0 +1,2 @@
+meh
+B
diff --git a/test/files/run/virtpatmat_try.flags b/test/files/run/virtpatmat_try.flags
new file mode 100644
index 0000000000..9769db9257
--- /dev/null
+++ b/test/files/run/virtpatmat_try.flags
@@ -0,0 +1 @@
+ -Yvirtpatmat -Xexperimental
diff --git a/test/files/run/virtpatmat_try.scala b/test/files/run/virtpatmat_try.scala
new file mode 100644
index 0000000000..46e67cb72e
--- /dev/null
+++ b/test/files/run/virtpatmat_try.scala
@@ -0,0 +1,47 @@
+object Test extends App {
+  case class A(val x: String) extends Throwable
+  class B extends Exception { override def toString = "B" }
+  def bla = 0
+
+  try {
+    throw new A("meh")
+  } catch { // this should emit a "catch-switch"
+    case y: A => println(y.x)
+    case (_ : A | _ : B)  => println("B")
+    case _ => println("other")
+  }
+
+  try {
+    throw new B()
+  } catch { // case classes and alternative flattening aren't supported yet, but could be in principle
+    // case A(x) => println(x)
+    case y: A => println(y.x)
+    case x@((_ : A) | (_ : B))  => println(x)
+    case _ => println("other")
+  }
+
+ def simpleTry {
+    try {
+      bla
+    } catch {
+      case x: Exception if x.getMessage == "test" => println("first case " + x)
+      case x: Exception => println("second case " + x)
+    }
+  }
+
+  def typedWildcardTry {
+    try { bla } catch { case _: ClassCastException => bla }
+  }
+
+  def wildcardTry {
+    try { bla } catch { case _ => bla }
+  }
+
+  def tryPlusFinally {
+    try { bla } finally { println("finally") }
+  }
+
+  def catchAndPassToLambda {
+    try { bla } catch { case ex: Exception => val f = () => ex }
+  }
+}
+\ No newline at end of file
diff --git a/test/files/specialized/SI-5005.scala b/test/files/specialized/SI-5005.scala
index cc9d327b08..3d1ada49e2 100644
--- a/test/files/specialized/SI-5005.scala
+++ b/test/files/specialized/SI-5005.scala
@@ -17,7 +17,11 @@ object Test extends DirectTest {
 
   override def show(): Unit = {
     // redirect err to out, for inliner log
-    System.setErr(new PrintStream(System.out));
+    val prevErr = System.err
+    System.setErr(System.out)
     compile()
+    System.setErr(prevErr)
   }
+
+  override def isDebug = false // so we don't get the newSettings warning
 }