Merge pull request scala#2217 from JamesIry/master_7006b

JamesIry · JamesIry · commit 5483861d2e37 · 2013-03-08T11:52:26.000-08:00
SI-7006 Fix the unreachable test
diff --git a/test/files/run/unreachable.scala b/test/files/run/unreachable.scala
@@ -93,17 +93,17 @@ object Test extends App {
     x match {
       case 0 => return 0
       case 1 => return 1
-      case _ => error("wtf")
+      case -1 => return 2
     }
-    2
+    3
   }
 
   def unreachableAfterSwitch: Int = {
     val x = util.Random.nextInt % 2
     x match {
       case 0 => return 42
       case 1 => return 41 + x
-      case _ => error("wtf")
+      case -1 => return 43 + x
     }
     2
   }

Original file line number	Diff line number	Diff line change
`@@ -93,17 +93,17 @@ object Test extends App {`
`93`	`93`	`x match {`
`94`	`94`	`case 0 => return 0`
`95`	`95`	`case 1 => return 1`
`96`		`- case _ => error("wtf")`
	`96`	`+ case -1 => return 2`
`97`	`97`	`}`
`98`		`- 2`
	`98`	`+ 3`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`def unreachableAfterSwitch: Int = {`
`102`	`102`	`val x = util.Random.nextInt % 2`
`103`	`103`	`x match {`
`104`	`104`	`case 0 => return 42`
`105`	`105`	`case 1 => return 41 + x`
`106`		`- case _ => error("wtf")`
	`106`	`+ case -1 => return 43 + x`
`107`	`107`	`}`
`108`	`108`	`2`
`109`	`109`	`}`