diff options
author | Denys Shabalin <denys.shabalin@typesafe.com> | 2014-07-14 15:22:59 +0200 |
---|---|---|
committer | Denys Shabalin <denys.shabalin@typesafe.com> | 2014-07-14 15:22:59 +0200 |
commit | 9d527b6558f9ecf32467b6f414175267bb44c1d7 (patch) | |
tree | 4a4ac967d78d8294c23825f28e2cacb30f48c6b0 /src | |
parent | 14d1fe0c35f4ab07a0535adbdf8acbcbd1208363 (diff) | |
download | scala-9d527b6558f9ecf32467b6f414175267bb44c1d7.tar.gz scala-9d527b6558f9ecf32467b6f414175267bb44c1d7.tar.bz2 scala-9d527b6558f9ecf32467b6f414175267bb44c1d7.zip |
Address pull request feedback
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala b/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala index 460d02c218..392b7fc881 100644 --- a/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala +++ b/src/compiler/scala/tools/reflect/quasiquotes/Parsers.scala @@ -72,8 +72,10 @@ trait Parsers { self: Quasiquotes => override def makeBlock(stats: List[Tree]): Tree = method match { case nme.apply => stats match { + // we don't want to eagerly flatten trees with placeholders as they + // might have to be wrapped into a block depending on their value case (head @ Ident(name)) :: Nil if isHole(name) => Block(Nil, head) - case _ => super.makeBlock(stats) + case _ => gen.mkBlock(stats, doFlatten = true) } case nme.unapply => gen.mkBlock(stats, doFlatten = false) case other => global.abort("unreachable") |