Revert exploratory changes to default REPL wrappers

Revert "Enable magic imports unconditionally to survey test results"

This reverts commit b02f890.

Revert "Enable -Yrepl-class-based to survey test failures"

This reverts commit d64af1a.

Author: retronym

src/compiler/scala/tools/nsc/settings/ScalaSettings.scala

@@ -237,6 +237,7 @@ trait ScalaSettings extends AbsScalaSettings
   val YmacroFresh     = BooleanSetting    ("-Ymacro-global-fresh-names", "Should fresh names in macros be unique across all compilation units")
   val Yreplsync       = BooleanSetting    ("-Yrepl-sync", "Do not use asynchronous code for repl startup")
   val Yreplclassbased = BooleanSetting    ("-Yrepl-class-based", "Use classes to wrap REPL snippets instead of objects")
+  val YreplMagicImport = BooleanSetting    ("-Yrepl-use-magic-imports", "In the code the wraps REPL snippes, use magic imports to rather than nesting wrapper object/classes")
   val Yreploutdir     = StringSetting     ("-Yrepl-outdir", "path", "Write repl-generated classfiles to given output directory (use \"\" to generate a temporary dir)" , "")
   val YmethodInfer    = BooleanSetting    ("-Yinfer-argument-types", "Infer types for arguments of overridden methods.")
   val YdisableFlatCpCaching  = BooleanSetting    ("-YdisableFlatCpCaching", "Do not cache flat classpath representation of classpath elements from jars across compiler instances.")

src/repl/scala/tools/nsc/interpreter/IMain.scala

@@ -74,8 +74,8 @@ class IMain(initialSettings: Settings, protected val out: JPrintWriter) extends
   // Used in a test case.
   def showDirectory() = replOutput.show(out)
 
-  lazy val isClassBased: Boolean = true
-  private[interpreter] lazy val useMagicImport: Boolean = true
+  lazy val isClassBased: Boolean = settings.Yreplclassbased.value
+  private[interpreter] lazy val useMagicImport: Boolean = settings.YreplMagicImport.value
 
   private[nsc] var printResults               = true        // whether to print result lines
   private[nsc] var totalSilence               = false       // whether to print anything

test/files/run/macro-bundle-repl.check

@@ -6,31 +6,17 @@ scala> import scala.reflect.macros.blackbox.Context
 import scala.reflect.macros.blackbox.Context
 
 scala> class Bar(val c: Context) { def impl = { import c.universe._; c.Expr[Unit](q"()") } };def bar: Unit = macro Bar.impl
-<console>:12: error: macro definition needs to be enabled
-by making the implicit value scala.language.experimental.macros visible.
-This can be achieved by adding the import clause 'import scala.language.experimental.macros'
-or by setting the compiler option -language:experimental.macros.
-See the Scaladoc for value scala.language.experimental.macros for a discussion
-why the feature needs to be explicitly enabled.
-       class Bar(val c: Context) { def impl = { import c.universe._; c.Expr[Unit](q"()") } };def bar: Unit = macro Bar.impl
-                                                                                                 ^
+defined class Bar
+defined term macro bar: Unit
 
 scala> bar
-<console>:14: error: not found: value bar
-       bar
-       ^
 
 scala> class Foo(val c: Context) { def impl = { import c.universe._; c.Expr[Unit](q"()") } }
 defined class Foo
 
 scala> def foo: Unit = macro Foo.impl
-<console>:14: error: macro bundles must be static
-       def foo: Unit = macro Foo.impl
-                             ^
+defined term macro foo: Unit
 
 scala> foo
-<console>:14: error: not found: value foo
-       foo
-       ^
 
 scala> :quit

test/files/run/macro-repl-basic.check

@@ -36,39 +36,15 @@ scala> object Macros {
 }; class Macros {
   def quux(x: Int): Int = macro Impls.quux
 }
-<console>:14: error: macro definition needs to be enabled
-by making the implicit value scala.language.experimental.macros visible.
-This can be achieved by adding the import clause 'import scala.language.experimental.macros'
-or by setting the compiler option -language:experimental.macros.
-See the Scaladoc for value scala.language.experimental.macros for a discussion
-why the feature needs to be explicitly enabled.
-           def foo(x: Int): Int = macro Impls.foo
-               ^
-<console>:16: error: macro definition needs to be enabled
-by making the implicit value scala.language.experimental.macros visible.
-         def bar(x: Int): Int = macro Impls.bar
-             ^
-<console>:18: error: macro definition needs to be enabled
-by making the implicit value scala.language.experimental.macros visible.
-         def quux(x: Int): Int = macro Impls.quux
-             ^
+defined object Macros
+defined class Macros
 
 scala> 
 
 scala> import Macros.Shmacros._
-<console>:13: error: not found: value Macros
-       import Macros.Shmacros._
-              ^
+import Macros.Shmacros._
 
 scala> println(foo(2) + Macros.bar(2) * new Macros().quux(4))
-<console>:14: error: not found: value foo
-       println(foo(2) + Macros.bar(2) * new Macros().quux(4))
-               ^
-<console>:14: error: not found: value Macros
-       println(foo(2) + Macros.bar(2) * new Macros().quux(4))
-                        ^
-<console>:14: error: not found: type Macros
-       println(foo(2) + Macros.bar(2) * new Macros().quux(4))
-                                            ^
+31
 
 scala> :quit

test/files/run/macro-repl-dontexpand.check

@@ -3,20 +3,12 @@ scala> def bar1(c: scala.reflect.macros.blackbox.Context) = ???
 bar1: (c: scala.reflect.macros.blackbox.Context)Nothing
 
 scala> def foo1 = macro bar1
-<console>:12: error: macro implementation reference has wrong shape. required:
-macro [<static object>].<method name>[[<type args>]] or
-macro [<macro bundle>].<method name>[[<type args>]]
-       def foo1 = macro bar1
-                        ^
+defined term macro foo1: Nothing
 
 scala> def bar2(c: scala.reflect.macros.whitebox.Context) = ???
 bar2: (c: scala.reflect.macros.whitebox.Context)Nothing
 
 scala> def foo2 = macro bar2
-<console>:12: error: macro implementation reference has wrong shape. required:
-macro [<static object>].<method name>[[<type args>]] or
-macro [<macro bundle>].<method name>[[<type args>]]
-       def foo2 = macro bar2
-                        ^
+defined term macro foo2: Nothing
 
 scala> :quit

test/files/run/macro-system-properties.check

@@ -9,20 +9,12 @@ scala>     object GrabContext {
       def impl(c: Context)() = { import c.universe._; System.getProperties.put("lastContext", c); c.Expr[Unit](q"()") }
       def grab(): Unit = macro impl
     }
-<console>:19: error: macro implementation reference has wrong shape. required:
-macro [<static object>].<method name>[[<type args>]] or
-macro [<macro bundle>].<method name>[[<type args>]]
-             def grab(): Unit = macro impl
-                                      ^
+defined object GrabContext
 
 scala>     object Test { class C(implicit a: Any) { GrabContext.grab } }
-<console>:15: error: not found: value GrabContext
-           object Test { class C(implicit a: Any) { GrabContext.grab } }
-                                                    ^
+defined object Test
 
 scala>     object Test { class C(implicit a: Any) { GrabContext.grab } }
-<console>:15: error: not found: value GrabContext
-           object Test { class C(implicit a: Any) { GrabContext.grab } }
-                                                    ^
+defined object Test
 
 scala> :quit

test/files/run/repl-colon-type.check

@@ -34,12 +34,12 @@ scala> :type lazy val f = 5
 Int
 
 scala> :type protected lazy val f = 5
-<console>:5: error: lazy value f cannot be accessed in INSTANCE.$iw
+<console>:5: error: lazy value f cannot be accessed in object $iw
  Access to protected lazy value f not permitted because
  enclosing object $eval in package $line13 is not a subclass of
- class $iw where target is defined
-         lazy val $result = INSTANCE.f
-                                                       ^
+ object $iw where target is defined
+         lazy val $result = f
+                                                  ^
 
 scala> :type def f = 5
 => Int

test/files/run/repl-no-imports-no-predef.check

@@ -175,21 +175,21 @@ scala> 55 ; (x: scala.Int) => x + 1 ; () => ((5))
 <console>:12: warning: a pure expression does nothing in statement position; multiline expressions may require enclosing parentheses
        55 ; (x: scala.Int) => x + 1 ;;
        ^
-res30: () => Int = $Lambda$6544/1050942041@5302ef22
+res30: () => Int = <function0>
 
 scala> 
 
 scala> () => 5
-res31: () => Int = $Lambda$6545/1676295269@33eff142
+res31: () => Int = <function0>
 
 scala> 55 ; () => 5
 <console>:11: warning: a pure expression does nothing in statement position; multiline expressions may require enclosing parentheses
        55 ;;
        ^
-res32: () => Int = $Lambda$6546/1582681622@1c38b0a0
+res32: () => Int = <function0>
 
 scala> () => { class X ; new X }
-res33: () => AnyRef = $Lambda$6549/2038305728@428804e0
+res33: () => AnyRef = <function0>
 
 scala> 
 

test/files/run/repl-out-dir.check

@@ -13,27 +13,31 @@ repl-out-dir-run.obj
     $line2
         $eval$.class
         $eval.class
-        $read$$iw.class
+        $read$$iw$$iw$.class
+        $read$$iw$.class
         $read$.class
         $read.class
     $line3
         $eval$.class
         $eval.class
-        $read$$iw$Bippy$.class
-        $read$$iw$Bippy.class
-        $read$$iw.class
+        $read$$iw$$iw$.class
+        $read$$iw$$iw$Bippy$.class
+        $read$$iw$$iw$Bippy.class
+        $read$$iw$.class
         $read$.class
         $read.class
     $line4
         $eval$.class
         $eval.class
-        $read$$iw.class
+        $read$$iw$$iw$.class
+        $read$$iw$.class
         $read$.class
         $read.class
     $line5
         $eval$.class
         $eval.class
-        $read$$iw.class
+        $read$$iw$$iw$.class
+        $read$$iw$.class
         $read$.class
         $read.class
     $repl_$init.class

test/files/run/repl-parens.check

@@ -50,21 +50,21 @@ scala> 55 ; (x: Int) => x + 1 ; () => ((5))
 <console>:11: warning: a pure expression does nothing in statement position; multiline expressions may require enclosing parentheses
        55 ; (x: Int) => x + 1 ;;
        ^
-res11: () => Int = $Lambda$6705/1778997070@17df7cde
+res11: () => Int = <function0>
 
 scala> 
 
 scala> () => 5
-res12: () => Int = $Lambda$6706/75596657@457092e2
+res12: () => Int = <function0>
 
 scala> 55 ; () => 5
 <console>:11: warning: a pure expression does nothing in statement position; multiline expressions may require enclosing parentheses
        55 ;;
        ^
-res13: () => Int = $Lambda$6707/1795994857@65fa5379
+res13: () => Int = <function0>
 
 scala> () => { class X ; new X }
-res14: () => AnyRef = $Lambda$6708/863796198@6a98e293
+res14: () => AnyRef = <function0>
 
 scala>