Merge commit 'refs/pull/491/head' into develop

4 files changed, 89 insertions, 0 deletions

diff --git a/test/files/run/t5629.check b/test/files/run/t5629.check
new file mode 100644
index 0000000000..6a2d630f4e
--- /dev/null
+++ b/test/files/run/t5629.check
@@ -0,0 +1,2 @@
+int child got: 33
+any child got: 33
diff --git a/test/files/run/t5629.scala b/test/files/run/t5629.scala
new file mode 100644
index 0000000000..69feddd3a5
--- /dev/null
+++ b/test/files/run/t5629.scala
@@ -0,0 +1,36 @@
+
+
+
+import scala.{specialized => spec}
+
+
+
+trait GrandParent[@spec(Int) -A] {
+  def foo(a: A): Unit
+  def bar[B <: A](b: B): Unit = println("grandparent got: %s" format b)
+}
+
+
+trait Parent[@spec(Int) -A] extends GrandParent[A] {
+  def foo(a: A) = bar(a)
+}
+
+
+class IntChild extends Parent[Int] {
+  override def bar[B <: Int](b: B): Unit = println("int child got: %s" format b)
+}
+
+
+class AnyChild extends Parent[Any] {
+  override def bar[B <: Any](b: B): Unit = println("any child got: %s" format b)
+}
+
+
+object Test {
+  
+  def main(args: Array[String]) {
+    new IntChild().foo(33)
+    new AnyChild().foo(33)
+  }
+  
+}
diff --git a/test/files/run/t5629b.check b/test/files/run/t5629b.check
new file mode 100644
index 0000000000..1bc0248c3d
--- /dev/null
+++ b/test/files/run/t5629b.check
@@ -0,0 +1,10 @@
+=== pf(1):
+MySmartPF.apply entered...
+newPF.applyOrElse entered...
+default
+scala.MatchError: () (of class scala.runtime.BoxedUnit)
+=== pf(42):
+MySmartPF.apply entered...
+newPF.applyOrElse entered...
+ok
+=== done
diff --git a/test/files/run/t5629b.scala b/test/files/run/t5629b.scala
new file mode 100644
index 0000000000..6c908081b9
--- /dev/null
+++ b/test/files/run/t5629b.scala
@@ -0,0 +1,41 @@
+
+
+
+
+
+object Test extends App {
+  
+  trait MyPF[@specialized(Int) -A] extends (A => Unit) {
+    def isDefinedAt(x: A): Boolean
+    def applyOrElse[A1 <: A](x: A1, default: A1 => Unit): Unit = {
+      println("MyPF.applyOrElse entered...")
+      if (isDefinedAt(x)) apply(x) else default(x)
+    }
+  }
+  
+  trait MySmartPF[@specialized(Int) -A] extends MyPF[A] {
+    def apply(x: A): Unit = {
+      println("MySmartPF.apply entered...")
+      applyOrElse(x, { _: Any => throw new MatchError })
+    }
+  }
+  
+  type T = Int
+  //type T = Any
+  
+  def newPF(test: T): MyPF[T] = new MySmartPF[T] {
+    def isDefinedAt(x: T): Boolean = x != test
+    override def applyOrElse[A1 <: T](x: A1, default: A1 => Unit): Unit = {
+      println("newPF.applyOrElse entered...")
+      if (x != test) { println("ok"); () } else { println("default"); default(x) } 
+    }
+  }
+  
+  val pf = newPF(1)
+  println("=== pf(1):")
+  try { pf(1) } catch { case x => println(x) }
+  println("=== pf(42):")
+  pf(42)
+  println("=== done")
+  
+}