Reversion of the changes to targetParams which ...

Reversion of the changes to targetParams which I made to fix #1260 as
they caused problems (specifically #1480).

This code is wrong but it's the old wrong behaviour, which is less
broken than the new wrong behaviour.

2 files changed, 6 insertions, 17 deletions

diff --git a/test/files/pos/t1260.scala b/test/files/pos/t1260.scala
deleted file mode 100644
index b05259998e..0000000000
--- a/test/files/pos/t1260.scala
+++ /dev/null
@@ -1,17 +0,0 @@
-case class Foo(a: String, b: String)
-
-object Bar {
-  def unapply(s: String): Option[Long] =
-    try { Some(s.toLong) } catch { case _ => None }
-}
-
-object Test {
-  def main(args: Array[String]) {
-    val f = Foo("1", "2")
-    f match {
-      case Foo(Bar(1), Bar(2)) => ()
-      case Foo(Bar(i), Bar(j)) if i >= 0 => ()
-    }
-  }
-}
-
diff --git a/test/files/pos/t1480.scala b/test/files/pos/t1480.scala
new file mode 100644
index 0000000000..1d9f94d2e9
--- /dev/null
+++ b/test/files/pos/t1480.scala
@@ -0,0 +1,6 @@
+class Foo{
+  def compare(newP : Any, oldP : Any) : Boolean = (newP,oldP) match {
+    case (newP : AnyRef, oldP : AnyRef) if newP == oldP => newP == oldP
+    case (newS : Symbol, oldS: Symbol) if newS == oldS => newS == oldS
+  }
+}