diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2014-01-22 07:48:56 -0800 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2014-01-22 07:48:56 -0800 |
| commit | 7a23a908a77e2424c0f951acb3f0de6a0cac454c (patch) | |
| tree | 4c6bed3f0e050b626166cde89b719edf2dd119ba | |
| parent | e9d45980abd7d99abb5a59348deb83954cfd983c (diff) | |
| parent | 7591aa1ce525a372a302134d0e7354d68fa14ec1 (diff) | |
| download | scala-7a23a908a77e2424c0f951acb3f0de6a0cac454c.tar.gz scala-7a23a908a77e2424c0f951acb3f0de6a0cac454c.tar.bz2 scala-7a23a908a77e2424c0f951acb3f0de6a0cac454c.zip | |
Merge pull request #3399 from xeno-by/topic/eval
an optimization for c.eval
| -rw-r--r-- | src/compiler/scala/reflect/macros/contexts/Evals.scala | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/macros/contexts/Evals.scala b/src/compiler/scala/reflect/macros/contexts/Evals.scala index 84928ddf86..180a998c39 100644 --- a/src/compiler/scala/reflect/macros/contexts/Evals.scala +++ b/src/compiler/scala/reflect/macros/contexts/Evals.scala @@ -12,7 +12,12 @@ trait Evals { private lazy val evalImporter = ru.mkImporter(universe).asInstanceOf[ru.Importer { val from: universe.type }] def eval[T](expr: Expr[T]): T = { - val imported = evalImporter.importTree(expr.tree) - evalToolBox.eval(imported).asInstanceOf[T] + expr.tree match { + case global.Literal(global.Constant(value)) => + value.asInstanceOf[T] + case _ => + val imported = evalImporter.importTree(expr.tree) + evalToolBox.eval(imported).asInstanceOf[T] + } } }
\ No newline at end of file |