diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-29 19:17:17 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-29 19:17:17 +1000 |
commit | de641dc265f34b06e17dfa7c64be00219f72b670 (patch) | |
tree | 61b06c92c26d6ddd84f273368176b5d69f5bc1d2 /src/main/scala/scala/async/internal/AsyncTransform.scala | |
parent | 43c0287ab48f139f450750d74b965eb9d6e25e97 (diff) | |
download | scala-async-de641dc265f34b06e17dfa7c64be00219f72b670.tar.gz scala-async-de641dc265f34b06e17dfa7c64be00219f72b670.tar.bz2 scala-async-de641dc265f34b06e17dfa7c64be00219f72b670.zip |
Cleanup code generation by avoiding redundant blocks
Don't bother adding `{ ...; () }` if we can use the original tree(s) instead,
e.g. if the last tree in `...` conforms to `Unit`.
This makes the debug output of the macro a little easier to read.
Diffstat (limited to 'src/main/scala/scala/async/internal/AsyncTransform.scala')
-rw-r--r-- | src/main/scala/scala/async/internal/AsyncTransform.scala | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/scala/scala/async/internal/AsyncTransform.scala b/src/main/scala/scala/async/internal/AsyncTransform.scala index ec3a2a1..baa3fc2 100644 --- a/src/main/scala/scala/async/internal/AsyncTransform.scala +++ b/src/main/scala/scala/async/internal/AsyncTransform.scala @@ -70,12 +70,11 @@ trait AsyncTransform { for ((state, flds) <- assignsOf) { val assigns = flds.map { fld => val fieldSym = fld.symbol - Block( - List( - asyncBase.nullOut(c.universe)(c.Expr[String](Literal(Constant(fieldSym.name.toString))), c.Expr[Any](Ident(fieldSym))).tree - ), - Assign(gen.mkAttributedStableRef(thisType(fieldSym.owner), fieldSym), mkZero(fieldSym.info)) - ) + val assign = Assign(gen.mkAttributedStableRef(thisType(fieldSym.owner), fieldSym), mkZero(fieldSym.info)) + asyncBase.nullOut(c.universe)(c.Expr[String](Literal(Constant(fieldSym.name.toString))), c.Expr[Any](Ident(fieldSym))).tree match { + case Literal(Constant(value: Unit)) => assign + case x => Block(x :: Nil, assign) + } } val asyncState = asyncBlock.asyncStates.find(_.state == state).get asyncState.stats = assigns ++ asyncState.stats |