Fixed tests to account for SIP 18

1 files changed, 54 insertions, 51 deletions

diff --git a/test/files/run/macro-repl-basic.check b/test/files/run/macro-repl-basic.check
index 3bc899f49b..9e0f9aa1a2 100644
--- a/test/files/run/macro-repl-basic.check
+++ b/test/files/run/macro-repl-basic.check
@@ -1,51 +1,54 @@
-Type in expressions to have them evaluated.

-Type :help for more information.

-

-scala> 

-

-scala> import scala.reflect.makro.{Context => Ctx}

-import scala.reflect.makro.{Context=>Ctx}

-

-scala> 

-

-scala> object Impls {

-  def foo(c: Ctx)(x: c.Expr[Int]) = {

-    import c.mirror._

-    val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(1))))

-    Expr[Int](body)

-  }

-

-  def bar(c: Ctx)(x: c.Expr[Int]) = {

-    import c.mirror._

-    val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(2))))

-    Expr[Int](body)

-  }

-

-  def quux(c: Ctx)(x: c.Expr[Int]) = {

-    import c.mirror._

-    val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(3))))

-    Expr[Int](body)

-  }

-}

-defined module Impls

-

-scala> object Macros {

-  object Shmacros {

-    def foo(x: Int): Int = macro Impls.foo

-  }

-  def bar(x: Int): Int = macro Impls.bar

-}; class Macros {

-  def quux(x: Int): Int = macro Impls.quux

-}

-defined module Macros

-defined class Macros

-

-scala> 

-

-scala> import Macros.Shmacros._

-import Macros.Shmacros._

-

-scala> println(foo(2) + Macros.bar(2) * new Macros().quux(4))

-31

-

-scala> 

+Type in expressions to have them evaluated.
+Type :help for more information.
+
+scala> 
+
+scala> import language.experimental.macros
+import language.experimental.macros
+
+scala> import scala.reflect.makro.{Context => Ctx}
+import scala.reflect.makro.{Context=>Ctx}
+
+scala> 
+
+scala> object Impls {
+  def foo(c: Ctx)(x: c.Expr[Int]) = {
+    import c.mirror._
+    val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(1))))
+    Expr[Int](body)
+  }
+
+  def bar(c: Ctx)(x: c.Expr[Int]) = {
+    import c.mirror._
+    val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(2))))
+    Expr[Int](body)
+  }
+
+  def quux(c: Ctx)(x: c.Expr[Int]) = {
+    import c.mirror._
+    val body = Apply(Select(x.tree, newTermName("$plus")), List(Literal(Constant(3))))
+    Expr[Int](body)
+  }
+}
+defined module Impls
+
+scala> object Macros {
+  object Shmacros {
+    def foo(x: Int): Int = macro Impls.foo
+  }
+  def bar(x: Int): Int = macro Impls.bar
+}; class Macros {
+  def quux(x: Int): Int = macro Impls.quux
+}
+defined module Macros
+defined class Macros
+
+scala> 
+
+scala> import Macros.Shmacros._
+import Macros.Shmacros._
+
+scala> println(foo(2) + Macros.bar(2) * new Macros().quux(4))
+31
+
+scala>