Tweak repl & test

Author: Som Snytt

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

@@ -621,16 +621,14 @@ class IMain(val settings: Settings, parentClassLoaderOverride: Option[ClassLoade
   override lazy val power = new Power(this, new StdReplVals(this))(tagOfStdReplVals, classTag[StdReplVals])
 
   /** Here is where we:
-    *
-    *  1) Read some source code, and put it in the "read" object.
-    *  2) Evaluate the read object, and put the result in the "eval" object.
-    *  3) Create a String for human consumption, and put it in the "print" object.
-    *
-    *  Read! Eval! Print! Some of that not yet centralized here.
-    */
-  class ReadEvalPrint(val lineId: Int) {
-    def this() = this(freshLineId())
-
+   *
+   *  1) Read some source code, and put it in the "read" object.
+   *  2) Evaluate the read object, and put the result in the "eval" object.
+   *  3) Create a String for human consumption, and put it in the "print" object.
+   *
+   *  Read! Eval! Print! Some of that not yet centralized here.
+   */
+  class ReadEvalPrint(val lineId: Int = freshLineId()) {
     val packageName = sessionNames.packageName(lineId)
     val readName    = sessionNames.read
     val evalName    = sessionNames.eval
@@ -824,7 +822,7 @@ class IMain(val settings: Settings, parentClassLoaderOverride: Option[ClassLoade
     }
 
     /** handlers for each tree in this request */
-    val handlers: List[MemberHandler] = trees map (memberHandlers chooseHandler _)
+    val handlers: List[MemberHandler] = trees.map(memberHandlers.chooseHandler(_))
     val definesValueClass = handlers.exists(_.definesValueClass)
 
     val isClassBased = IMain.this.isClassBased && !definesValueClass
@@ -968,7 +966,8 @@ class IMain(val settings: Settings, parentClassLoaderOverride: Option[ClassLoade
 
 
     /** Compile the object file.  Returns whether the compilation succeeded.
-      *  If all goes well, the "types" map is computed. */
+     *  If all goes well, the "types" map is computed.
+     */
     def compile: Boolean = {
 
       // compile the object containing the user's code

test/files/run/repl-assign.check

@@ -1,17 +1,14 @@
 
-scala> var x = 10
-var x: Int = 10
+scala> var x = 42
+var x: Int = 42
 
-scala> var y = 11
-var y: Int = 11
-
-scala> x = 12
+scala> x = 17
 // mutated x
 
-scala> y = 13
-// mutated y
-
-scala> x += 30
+scala> x += 10
 // mutated x
 
+scala> x
+val res0: Int = 27
+
 scala> :quit

test/files/run/repl-assign.scala

@@ -1,11 +1,4 @@
-import scala.tools.partest.ReplTest
 
-object Test extends ReplTest {
-  def code = """
-var x = 10
-var y = 11
-x = 12
-y = 13
-x += 30
-  """
-}
+import scala.tools.partest.SessionTest
+
+object Test extends SessionTest

test/files/run/t8935-object.scala

@@ -1,31 +1,3 @@
 import scala.tools.partest.SessionTest
 
-import scala.tools.nsc.Settings
-
-object Test extends SessionTest {
-  /* future
-  override def transformSettings(s: Settings): Settings = {
-    //s.YreplWrap.value = "object"
-    s
-  }
-  */
-  override def session =
-"""
-scala> 41+1
-res0: Int = 42
-
-scala> $intp.valueOfTerm($intp.mostRecentVar)
-res1: Option[Any] = Some(42)
-
-scala> val i = 17 ; 64
-i: Int = 17
-res2: Int = 64
-
-scala> $intp.valueOfTerm($intp.mostRecentVar)
-res3: Option[Any] = Some(64)
-
-scala> $intp.valueOfTerm("i")
-res4: Option[Any] = Some(17)
-
-scala> :quit"""
-}
+object Test extends SessionTest