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.

4 files changed, 6 insertions, 54 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
+  }
+}
diff --git a/test/files/run/complicatedmatch.check b/test/files/run/complicatedmatch.check
deleted file mode 100644
index 501b7a32d6..0000000000
--- a/test/files/run/complicatedmatch.check
+++ /dev/null
@@ -1,6 +0,0 @@
-1
-42
-42
-11
-7
-13
diff --git a/test/files/run/complicatedmatch.scala b/test/files/run/complicatedmatch.scala
deleted file mode 100644
index c837c328b3..0000000000
--- a/test/files/run/complicatedmatch.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-object Bar{
-  def unapply(x : String) = x == "bar";
-}
-
-object Even{
-  def unapply(x : Int) = if (x % 2 == 0) Some(x / 2) else None;
-}
-
-object Test extends Application{
-  val LongWord = "supercalifragilisticexpialadocious";
-
-  def foo(x : Int, y : String) : Int = (x, y) match {
-    case (Even(i), "bar") => 1
-    case (1 | 2 | 3, "foo") => 42;
-    case (x, y) if y.length < x => 11;
-    case (1 | 2 | 3, Bar()) => 7;
-    case (1 | 2 | 3, "bar") => 8
-    case (Even(Even(3)), Bar()) => 13;
-    case (Even(Even(3)), LongWord) => 13;
-    case _ => 0;
-  }
-
-  List(
-    2 -> "bar",
-    2 -> "foo",
-    3 -> "foo",
-    7 -> "flob",
-    3 -> "bar",
-    12 -> LongWord
-  ).foreach({case (x, y) => println(foo(x, y))});
-}