diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2012-11-22 19:10:36 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2012-11-22 19:10:36 +0100 |
commit | b746b7fe9f8ccbc2d37182d4be0dc24597223331 (patch) | |
tree | bdd62ef35d1cd39a85c940edf255c1fb72630aee | |
parent | d6ce00d65ade8c31b61091d65fe21ad480c6b20c (diff) | |
download | scala-async-b746b7fe9f8ccbc2d37182d4be0dc24597223331.tar.gz scala-async-b746b7fe9f8ccbc2d37182d4be0dc24597223331.tar.bz2 scala-async-b746b7fe9f8ccbc2d37182d4be0dc24597223331.zip |
Make the ANF transform more selective.
-rw-r--r-- | src/main/scala/scala/async/AnfTransform.scala | 109 |
1 files changed, 52 insertions, 57 deletions
diff --git a/src/main/scala/scala/async/AnfTransform.scala b/src/main/scala/scala/async/AnfTransform.scala index 0146210..346da57 100644 --- a/src/main/scala/scala/async/AnfTransform.scala +++ b/src/main/scala/scala/async/AnfTransform.scala @@ -73,63 +73,58 @@ class AnfTransform[C <: Context](override val c: C) extends TransformUtils(c) { } object anf { - def transformToList(tree: Tree): List[Tree] = tree match { - case Select(qual, sel) => - val stats :+ expr = inline.transformToList(qual) - stats :+ Select(expr, sel) - - case Apply(fun, args) => - // 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) - val argLists = args map inline.transformToList - val allArgStats = argLists flatMap (_.init) - val simpleArgs = argLists map (_.last) - funStats ++ allArgStats :+ Apply(simpleFun, simpleArgs).setSymbol(tree.symbol) - - case Block(stats, expr) => - inline.transformToList(stats) ++ inline.transformToList(expr) - - case ValDef(mods, name, tpt, rhs) => - val stats :+ expr = inline.transformToList(rhs) - stats :+ ValDef(mods, name, tpt, expr).setSymbol(tree.symbol) - - case Assign(name, rhs) => - val stats :+ expr = inline.transformToList(rhs) - stats :+ Assign(name, expr) - - case If(cond, thenp, elsep) => - val stats :+ expr = inline.transformToList(cond) - val thenBlock = inline.transformToBlock(thenp) - val elseBlock = inline.transformToBlock(elsep) - stats :+ - c.typeCheck(If(expr, thenBlock, elseBlock)) - - case Match(scrut, cases) => - val scrutStats :+ scrutExpr = inline.transformToList(scrut) - val caseDefs = cases map { - case CaseDef(pat, guard, body) => - val block = inline.transformToBlock(body) - CaseDef(pat, guard, block) - } - scrutStats :+ c.typeCheck(Match(scrutExpr, caseDefs)) - - //TODO - case Literal(_) | Ident(_) | This(_) | New(_) | Function(_, _) => List(tree) - - case TypeApply(fun, targs) => - val funStats :+ simpleFun = inline.transformToList(fun) - funStats :+ TypeApply(simpleFun, targs) - - //TODO - case DefDef(mods, name, tparams, vparamss, tpt, rhs) => List(tree) - - case ClassDef(mods, name, tparams, impl) => List(tree) - - case ModuleDef(mods, name, impl) => List(tree) - - case _ => - c.abort(tree.pos, s"Internal error while compiling `async` block: $tree") + def transformToList(tree: Tree): List[Tree] = { + def containsAwait = tree exists isAwait + tree match { + case Select(qual, sel) if containsAwait => + val stats :+ expr = inline.transformToList(qual) + stats :+ Select(expr, sel) + + case Apply(fun, args) if 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) + val argLists = args map inline.transformToList + val allArgStats = argLists flatMap (_.init) + val simpleArgs = argLists map (_.last) + funStats ++ allArgStats :+ Apply(simpleFun, simpleArgs).setSymbol(tree.symbol) + + case Block(stats, expr) => + inline.transformToList(stats) ++ inline.transformToList(expr) + + case ValDef(mods, name, tpt, rhs) if containsAwait => + if (rhs exists isAwait) { + val stats :+ expr = inline.transformToList(rhs) + stats :+ ValDef(mods, name, tpt, expr).setSymbol(tree.symbol) + } else List(tree) + case Assign(name, rhs) if containsAwait => + val stats :+ expr = inline.transformToList(rhs) + stats :+ Assign(name, expr) + + case If(cond, thenp, elsep) if containsAwait => + val stats :+ expr = inline.transformToList(cond) + val thenBlock = inline.transformToBlock(thenp) + val elseBlock = inline.transformToBlock(elsep) + stats :+ + c.typeCheck(If(expr, thenBlock, elseBlock)) + + case Match(scrut, cases) if containsAwait => + val scrutStats :+ scrutExpr = inline.transformToList(scrut) + val caseDefs = cases map { + case CaseDef(pat, guard, body) => + val block = inline.transformToBlock(body) + CaseDef(pat, guard, block) + } + scrutStats :+ c.typeCheck(Match(scrutExpr, caseDefs)) + + case TypeApply(fun, targs) if containsAwait => + val funStats :+ simpleFun = inline.transformToList(fun) + funStats :+ TypeApply(simpleFun, targs).setSymbol(tree.symbol) + + case _ => + List(tree) + } } } |