diff options
Diffstat (limited to 'test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala')
-rw-r--r-- | test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala b/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala index 3de9367994..2c9bce92a5 100644 --- a/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala +++ b/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala @@ -2,10 +2,10 @@ import scala.reflect.makro.Context object Macros { def impl_with_macros_enabled(c: Context) = { - import c.mirror._ + import c.universe._ - val mr = Select(Select(Select(Ident(newTermName("scala")), newTermName("reflect")), newTermName("package")), newTermName("mirror")) - val tree1 = Apply(Select(mr, newTermName("reify")), List(Literal(Constant(2)))) + val ru = Select(Select(Select(Select(Ident(newTermName("scala")), newTermName("reflect")), newTermName("runtime")), newTermName("package")), newTermName("universe")) + val tree1 = Apply(Select(ru, newTermName("reify")), List(Literal(Constant(2)))) val ttree1 = c.typeCheck(tree1, withMacrosDisabled = false) c.literal(ttree1.toString) } @@ -13,14 +13,14 @@ object Macros { def foo_with_macros_enabled = macro impl_with_macros_enabled def impl_with_macros_disabled(c: Context) = { - import c.mirror._ + import c.universe._ - val mrPkg = staticModule("scala.reflect.package") - val mrSym = selectTerm(mrPkg, "mirror") - val NullaryMethodType(mrTpe) = mrSym.typeSignature - val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror) + val rupkg = c.mirror.staticModule("scala.reflect.runtime.package") + val rusym = build.selectTerm(rupkg, "universe") + val NullaryMethodType(rutpe) = rusym.typeSignature + val ru = build.newFreeTerm("ru", rutpe, scala.reflect.runtime.universe) - val tree2 = Apply(Select(Ident(mr), newTermName("reify")), List(Literal(Constant(2)))) + val tree2 = Apply(Select(Ident(ru), newTermName("reify")), List(Literal(Constant(2)))) val ttree2 = c.typeCheck(tree2, withMacrosDisabled = true) c.literal(ttree2.toString) } |