restores some disabled macro tests, makes checkFeature synchronous when used for macros

3 files changed, 34 insertions, 0 deletions

diff --git a/test/files/neg/macro-without-xmacros-a/Impls_1.scala b/test/files/neg/macro-without-xmacros-a/Impls_1.scala
new file mode 100644
index 0000000000..01daf12b1a
--- /dev/null
+++ b/test/files/neg/macro-without-xmacros-a/Impls_1.scala
@@ -0,0 +1,18 @@
+import scala.reflect.makro.{Context => Ctx}
+
+object Impls {
+  def foo_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
+    import c.mirror._
+    Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(1))))
+  }
+
+  def bar_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
+    import c.mirror._
+    Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(2))))
+  }
+
+  def quux_impl(c: Ctx)(x: c.Expr[Int]): c.Expr[Int] = {
+    import c.mirror._
+    Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(3))))
+  }
+}
diff --git a/test/files/neg/macro-without-xmacros-a/Macros_2.scala b/test/files/neg/macro-without-xmacros-a/Macros_2.scala
new file mode 100644
index 0000000000..62f9dcf505
--- /dev/null
+++ b/test/files/neg/macro-without-xmacros-a/Macros_2.scala
@@ -0,0 +1,12 @@
+import Impls._
+
+object Macros {
+  object Shmacros {
+    def foo(x: Int): Int = macro foo_impl
+  }
+  def bar(x: Int): Int = macro bar_impl
+}
+
+class Macros {
+  def quux(x: Int): Int = macro quux_impl
+}
\ No newline at end of file
diff --git a/test/files/neg/macro-without-xmacros-a/Test_3.scala b/test/files/neg/macro-without-xmacros-a/Test_3.scala
new file mode 100644
index 0000000000..e9a10e20c9
--- /dev/null
+++ b/test/files/neg/macro-without-xmacros-a/Test_3.scala
@@ -0,0 +1,4 @@
+object Test extends App {
+  import Macros.Shmacros._
+  println(foo(2) + Macros.bar(2) * new Macros().quux(4))
+}
\ No newline at end of file