unapply <-> as in "Matching with Objects"

1 files changed, 9 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
index 167b8be1c8..05bd8b664d 100644
--- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala
+++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -368,12 +368,16 @@ abstract class UnCurry extends InfoTransform with TypingTransformers {
             mainTransform(new TreeSubstituter(vparams map (.symbol), args).transform(body))
           }
 
-        case UnApply(fn, args) =>
-         if(fn.symbol.name == nme.unapply) copy.UnApply(tree, fn, transformTrees(args))
-         else {
-           val formals = definitions.unapplySeqResultToMethodSig(fn.tpe)
+        case UnApply(fn, args) if nme.unapply == fn.symbol.name =>
+          copy.UnApply(tree, fn, transformTrees(args))
+
+        case UnApply(fn, args) if nme.unapplySeq == fn.symbol.name =>
+           val formals = definitions.unapplyTypeListFromReturnTypeSeq(fn.tpe)
            copy.UnApply(tree, fn, transformTrees(transformArgs(tree.pos, args, formals)))
-        }
+
+        case UnApply(_, _) =>
+           assert(false,"internal error: UnApply node has wrong symbol"); null
+
         case Apply(fn, args) =>
           if (settings.noassertions.value &&
               (fn.symbol ne null) &&