From 5d6c2cb4c663f4351f5eacb6c9f6f9b0cedf4966 Mon Sep 17 00:00:00 2001 From: David MacIver Date: Mon, 10 Nov 2008 00:29:09 +0000 Subject: 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. --- test/pending/pos/t1260.scala | 17 +++++++++++++++++ test/pending/pos/t1480.scala | 6 ------ 2 files changed, 17 insertions(+), 6 deletions(-) create mode 100644 test/pending/pos/t1260.scala delete mode 100644 test/pending/pos/t1480.scala (limited to 'test/pending/pos') diff --git a/test/pending/pos/t1260.scala b/test/pending/pos/t1260.scala new file mode 100644 index 0000000000..b05259998e --- /dev/null +++ b/test/pending/pos/t1260.scala @@ -0,0 +1,17 @@ +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/pending/pos/t1480.scala b/test/pending/pos/t1480.scala deleted file mode 100644 index 1d9f94d2e9..0000000000 --- a/test/pending/pos/t1480.scala +++ /dev/null @@ -1,6 +0,0 @@ -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 - } -} -- cgit v1.2.3