Merge branch 'master' of https://github.com/scala/scala into wip-sip14-fixes

1 files changed, 36 insertions, 0 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
new file mode 100644
index 0000000000..c253f0b1fb
--- /dev/null
+++ b/test/files/run/macro-typecheck-macrosdisabled/Impls_Macros_1.scala
@@ -0,0 +1,36 @@
+import scala.reflect.makro.Context
+
+object Macros {
+  def impl_with_macros_enabled(c: Context) = {
+    import c.mirror._
+
+    // todo. doesn't work. why?
+    //val mrPkg = staticModule("scala.reflect.package")
+    //val mrSym = selectTerm(mrPkg, "mirror")
+    //val NullaryMethodType(mrTpe) = mrSym.typeSignature
+    //val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror, null)
+    //val tree1 = Apply(Select(Ident(mr), newTermName("reify")), List(Literal(Constant(2))))
+
+    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 ttree1 = c.typeCheck(tree1, withMacrosDisabled = false)
+    c.literal(ttree1.toString)
+  }
+
+  def foo_with_macros_enabled = macro impl_with_macros_enabled
+
+  def impl_with_macros_disabled(c: Context) = {
+    import c.mirror._
+
+    val mrPkg = staticModule("scala.reflect.package")
+    val mrSym = selectTerm(mrPkg, "mirror")
+    val NullaryMethodType(mrTpe) = mrSym.typeSignature
+    val mr = newFreeTerm("mr", mrTpe, scala.reflect.mirror, null)
+
+    val tree2 = Apply(Select(Ident(mr), newTermName("reify")), List(Literal(Constant(2))))
+    val ttree2 = c.typeCheck(tree2, withMacrosDisabled = true)
+    c.literal(ttree2.toString)
+  }
+
+  def foo_with_macros_disabled = macro impl_with_macros_disabled
+}
\ No newline at end of file