diff options
| author | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-15 12:29:12 -0700 |
|---|---|---|
| committer | Josh Suereth <Joshua.Suereth@gmail.com> | 2012-06-15 12:29:12 -0700 |
| commit | fbacbd4e637969d227b16797d2dcf357a5e09110 (patch) | |
| tree | c31d82c767d1dd8c82a8f0bbe891d325cc22dd31 | |
| parent | 4bb23e477bcb88263059433d4c6a5b0394958929 (diff) | |
| parent | 4a6ed4589089da89d13a221d4cb7bfe0c46ca7c7 (diff) | |
| download | scala-fbacbd4e637969d227b16797d2dcf357a5e09110.tar.gz scala-fbacbd4e637969d227b16797d2dcf357a5e09110.tar.bz2 scala-fbacbd4e637969d227b16797d2dcf357a5e09110.zip | |
Merge pull request #724 from scalamacros/ticket/5912
fixes SI-5912
| -rw-r--r-- | src/compiler/scala/tools/reflect/ToolBoxFactory.scala | 5 | ||||
| -rw-r--r-- | test/files/run/t5912.scala | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala index 7cf515425d..278f4e3ff7 100644 --- a/src/compiler/scala/tools/reflect/ToolBoxFactory.scala +++ b/src/compiler/scala/tools/reflect/ToolBoxFactory.scala @@ -126,7 +126,10 @@ abstract class ToolBoxFactory[U <: JavaUniverse](val u: U) { factorySelf => wrapper(currentTyper.silent(_.typed(expr, analyzer.EXPRmode, pt)) match { case analyzer.SilentResultValue(result) => trace("success: ")(showAttributed(result, true, true, settings.Yshowsymkinds.value)) - var Block(dummies, unwrapped) = result + var (dummies, unwrapped) = result match { + case Block(dummies, unwrapped) => (dummies, unwrapped) + case unwrapped => (Nil, unwrapped) + } var invertedIndex = freeTerms map (_.swap) // todo. also fixup singleton types unwrapped = new Transformer { diff --git a/test/files/run/t5912.scala b/test/files/run/t5912.scala new file mode 100644 index 0000000000..7710d04396 --- /dev/null +++ b/test/files/run/t5912.scala @@ -0,0 +1,6 @@ +object Test extends App{ + import scala.reflect.runtime.{currentMirror=>cm} + import scala.tools.reflect._ + import scala.reflect.runtime.universe._ + val tree = cm.mkToolBox().typeCheck( Literal(Constant("test")) ) +}
\ No newline at end of file |