* (unapply) fixed accessor handling for product...

* (unapply) fixed accessor handling for products in SyntheticMethods
* added test cases

3 files changed, 66 insertions, 1 deletions

diff --git a/test/pending/pos/unapply.scala b/test/pending/pos/unapply.scala
index 4461c3324c..e784299ad8 100644
--- a/test/pending/pos/unapply.scala
+++ b/test/pending/pos/unapply.scala
@@ -1,5 +1,5 @@
 case class MyTuple2[A,B](val _1:A, val snd:B)
-
+class Foo
 object Foo {
   def unapply(x:Any): Option[Product2[Int,String]] = {
     if(x.isInstanceOf[Bar]) {
diff --git a/test/pending/pos/unapplyComplex.scala b/test/pending/pos/unapplyComplex.scala
new file mode 100644
index 0000000000..4c91ca18b0
--- /dev/null
+++ b/test/pending/pos/unapplyComplex.scala
@@ -0,0 +1,37 @@
+trait Complex extends Product2[double,double]
+
+class ComplexRect(val _1:double, _2:double) extends Complex {
+  override def toString = "ComplexRect("+_1+","+_2+")"
+}
+
+class ComplexPolar(val _1:double, _2:double) extends Complex {
+  override def toString = "ComplexPolar("+_1+","+_2+")"
+}
+
+object ComplexRect {
+  def unapply(z:Complex): Option[Complex] = {
+    if(z.isInstanceOf[ComplexRect]) Some(z) else z match {
+      case ComplexPolar(mod, arg) =>
+	Some(new ComplexRect(mod*Math.cos(arg), mod*Math.sin(arg)))
+} } }
+
+object ComplexPolar {
+  def unapply(z:Complex): Option[Complex] = {
+    if(z.isInstanceOf[ComplexPolar]) Some(z) else z match {
+      case ComplexRect(re,im) =>
+	Some(new ComplexPolar(Math.sqrt(re*re + im*im), Math.atan(re/im)))
+} } }
+
+object Test {
+  def main(args:Array[String]) = {
+    new ComplexRect(1,1) match {
+      case ComplexPolar(mod,arg) => // z @ ???
+	Console.println("mod"+mod+"arg"+arg)
+    }
+    val Komplex = ComplexRect
+    new ComplexPolar(Math.sqrt(2),Math.PI / 4.0) match {
+      case Komplex(re,im) => // z @ ???
+	Console.println("re"+re+" im"+im)
+    }
+  }
+}
diff --git a/test/pending/pos/unapplySeq.scala b/test/pending/pos/unapplySeq.scala
new file mode 100644
index 0000000000..36cb69cf3d
--- /dev/null
+++ b/test/pending/pos/unapplySeq.scala
@@ -0,0 +1,28 @@
+case class MyTuple2[A,B](val _1:A, val snd:B)
+
+object FooSeq {
+  def unapplySeq(x:Any): Option[Product2[Int,Seq[String]]] = {
+    if(x.isInstanceOf[Bar]) {
+      val y = x.asInstanceOf[Bar]
+      Some(MyTuple2(y.size, y.name))
+    } else None
+  }
+
+  def main(args:Array[String]) = {
+    val b = new Bar
+    b match {
+      case FooSeq(s:Int,_,n:String) => Console.println("size "+s+" name "+n)
+    }
+    b.size = 54
+    b.name = List("large","L")
+    b match {
+      case FooSeq(s:Int,_,n:String) => Console.println("size "+s+" name "+n)
+    }
+  }
+}
+
+class Bar {
+  var size: Int    = 50
+  var name: List[String] = List("medium","M")
+}
+