Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 32 insertions, 0 deletions

diff --git a/test/files/run/virtpatmat_switch.scala b/test/files/run/virtpatmat_switch.scala
new file mode 100644
index 0000000000..2e2c31e8e5
--- /dev/null
+++ b/test/files/run/virtpatmat_switch.scala
@@ -0,0 +1,32 @@
+object Test extends App {
+  def intSwitch(x: Int) = x match {
+    case 0 => "zero"
+    case 1 => "one"
+    case _ => "many"
+  }
+  
+  println(intSwitch(0))
+  println(intSwitch(1))
+  println(intSwitch(10))
+  
+  def charSwitch(x: Char) = x match {
+    case 'a' => "got a"
+    case 'b' => "got b"
+    case _ => "got some letter"
+  }
+  
+  println(charSwitch('a'))
+  println(charSwitch('b'))
+  println(charSwitch('z'))
+  
+  def implicitDefault(x: Int) = x match {
+    case 0 => 0
+  }
+  
+  try {
+    implicitDefault(5)
+  } catch {
+    case e: MatchError => println(e)
+  }
+
+}