From 4a6ed4589089da89d13a221d4cb7bfe0c46ca7c7 Mon Sep 17 00:00:00 2001 From: Eugene Burmako Date: Fri, 15 Jun 2012 11:34:00 +0200 Subject: fixes SI-5912 --- src/compiler/scala/tools/reflect/ToolBoxFactory.scala | 5 ++++- test/files/run/t5912.scala | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 test/files/run/t5912.scala 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 -- cgit v1.2.3