diff options
| author | Eugene Burmako <xeno.by@gmail.com> | 2012-06-04 13:53:13 +0200 |
|---|---|---|
| committer | Eugene Burmako <xeno.by@gmail.com> | 2012-06-08 15:32:17 +0200 |
| commit | 7b0f0a142bb526f4bd108a8c208ec9a8952398c9 (patch) | |
| tree | ee13d036756be41521a9eb3f1e05898410ab744e /test/files/run/macro-invalidret-doesnt-conform-to-def-rettype | |
| parent | d9103e01b467634d61baa3b131aeb93fca9e20a5 (diff) | |
| download | scala-7b0f0a142bb526f4bd108a8c208ec9a8952398c9.tar.gz scala-7b0f0a142bb526f4bd108a8c208ec9a8952398c9.tar.bz2 scala-7b0f0a142bb526f4bd108a8c208ec9a8952398c9.zip | |
repairs the tests after the refactoring spree
Diffstat (limited to 'test/files/run/macro-invalidret-doesnt-conform-to-def-rettype')
| -rw-r--r-- | test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala | 4 | ||||
| -rw-r--r-- | test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala b/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala index 828ccf34e2..5a7d1a6b9a 100644 --- a/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala +++ b/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Impls_Macros_1.scala @@ -2,8 +2,8 @@ import scala.reflect.makro.{Context => Ctx} object Impls { def foo(c: Ctx): c.Expr[Int] = { - import c.mirror._ - Expr(Literal(Constant("42"))) + import c.universe._ + c.Expr(Literal(Constant("42"))) } } diff --git a/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala b/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala index ecf48b9752..c6caa2b585 100644 --- a/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala +++ b/test/files/run/macro-invalidret-doesnt-conform-to-def-rettype/Test_2.scala @@ -1,6 +1,8 @@ object Test extends App { - import scala.reflect.mirror._ + import scala.reflect.runtime.universe._ + import scala.reflect.runtime.{currentMirror => cm} + import scala.tools.reflect.ToolBox val tree = Select(Ident("Macros"), newTermName("foo")) - try Expr(tree).eval + try cm.mkToolBox().runExpr(tree) catch { case ex: Throwable => println(ex.getMessage) } }
\ No newline at end of file |