From b38f991ab4948f3358a937604dc28ffa4901270e Mon Sep 17 00:00:00 2001
From: Jason Zaugg <jzaugg@gmail.com>
Date: Mon, 15 Apr 2013 13:22:47 +0200
Subject: Rephrase a few pattern matches, fix ANF tracing.

Addresses review comments
---
 src/main/scala/scala/async/AnfTransform.scala   | 18 ++++++++----------
 src/main/scala/scala/async/TransformUtils.scala |  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/main/scala/scala/async/AnfTransform.scala b/src/main/scala/scala/async/AnfTransform.scala
index 82af3c6..da375a5 100644
--- a/src/main/scala/scala/async/AnfTransform.scala
+++ b/src/main/scala/scala/async/AnfTransform.scala
@@ -107,9 +107,7 @@ private[async] final case class AnfTransform[C <: Context](c: C) {
       indent += 1
       def oneLine(s: Any) = s.toString.replaceAll( """\n""", "\\\\n").take(127)
       try {
-        AsyncUtils.trace(s"${
-          indentString
-        }$prefix(${oneLine(args)})")
+        AsyncUtils.trace(s"${indentString}$prefix(${oneLine(args)})")
         val result = t
         AsyncUtils.trace(s"${indentString}= ${oneLine(result)}")
         result
@@ -193,19 +191,19 @@ private[async] final case class AnfTransform[C <: Context](c: C) {
           val stats :+ expr = inline.transformToList(qual)
           stats :+ attachCopy(tree)(Select(expr, sel).setSymbol(tree.symbol))
 
-        case utils.Applied(fun, targs, argss @ (args :: rest)) if containsAwait =>
+        case Applied(fun, targs, argss) if argss.nonEmpty && containsAwait =>
           // we an assume that no await call appears in a by-name argument position,
           // this has already been checked.
           val funStats :+ simpleFun = inline.transformToList(fun)
           def isAwaitRef(name: Name) = name.toString.startsWith(utils.name.await + "$")
           val (argStatss, argExprss): (List[List[List[Tree]]], List[List[Tree]]) =
             mapArgumentss[List[Tree]](fun, argss) {
-              case arg if arg.isByName || isSafeToInline(arg.expr) => (Nil, arg.expr)
-              case Arg(arg@Ident(name), _, _) if isAwaitRef(name)  => (Nil, arg) // not typed, so it eludes the check in `isSafeToInline`
-              case arg                                             =>
-                inline.transformToList(arg.expr) match {
-                  case stats :+ expr =>
-                    val valDef = defineVal(arg.argName, expr, arg.expr.pos)
+              case Arg(expr, byName, _) if byName || isSafeToInline(expr) => (Nil, expr)
+              case Arg(expr@Ident(name), _, _) if isAwaitRef(name)        => (Nil, expr) // not typed, so it eludes the check in `isSafeToInline`
+              case Arg(expr, _, argName)                                 =>
+                inline.transformToList(expr) match {
+                  case stats :+ expr1 =>
+                    val valDef = defineVal(argName, expr1, expr.pos)
                     (stats :+ valDef, Ident(valDef.name))
                 }
             }
diff --git a/src/main/scala/scala/async/TransformUtils.scala b/src/main/scala/scala/async/TransformUtils.scala
index 239bea1..7731b83 100644
--- a/src/main/scala/scala/async/TransformUtils.scala
+++ b/src/main/scala/scala/async/TransformUtils.scala
@@ -100,7 +100,7 @@ private[async] final case class TransformUtils[C <: Context](c: C) {
         case dd: DefDef            => nestedMethod(dd)
         case fun: Function         => function(fun)
         case m@Match(EmptyTree, _) => patMatFunction(m) // Pattern matching anonymous function under -Xoldpatmat of after `restorePatternMatchingFunctions`
-        case Applied(fun, targs, argss @ (_ :: _))      =>
+        case Applied(fun, targs, argss) if argss.nonEmpty =>
           val isInByName = isByName(fun)
           for ((args, i) <- argss.zipWithIndex) {
             for ((arg, j) <- args.zipWithIndex) {
-- 
cgit v1.2.3