Revert Scanners and Tokens to their original form

Since we decided to go with the non dotty-scanner approach these are
unnecessary to have altered, might just as well revert them.

2 files changed, 1 insertions, 36 deletions

diff --git a/tests/repl/imports.check b/tests/repl/imports.check
index 3fa103283..3a7e9341e 100644
--- a/tests/repl/imports.check
+++ b/tests/repl/imports.check
@@ -2,9 +2,7 @@ scala> import scala.collection.mutable
 import scala.collection.mutable
 scala> val buf = mutable.ListBuffer[Int]()
 buf: scala.collection.mutable.ListBuffer[Int] = ListBuffer()
-scala> object o {
-     |   val xs = List(1, 2, 3)
-     | }
+scala> object o { val xs = List(1, 2, 3) }
 defined module o
 scala> import o._
 import o._
diff --git a/tests/repl/multilines.check b/tests/repl/multilines.check
deleted file mode 100644
index 3bc32707e..000000000
--- a/tests/repl/multilines.check
+++ /dev/null
@@ -1,33 +0,0 @@
-scala> val x = """alpha
-     | 
-     | omega"""
-x: String = 
-alpha
-
-omega
-scala> val y = """abc
-     |           |def
-     |           |ghi
-     |         """.stripMargin
-y: String = 
-abc
-def
-ghi
-        
-scala> val z = {
-     |   def square(x: Int) = x * x
-     |   val xs = List(1, 2, 3)
-     |   square(xs)
-     | }
-<console>:8: error: type mismatch:
- found   : scala.collection.immutable.List[Int](xs)
- required: Int
-  square(xs)
-         ^
-scala> val z = {
-     |    def square(x: Int) = x * x
-     |    val xs = List(1, 2, 3)
-     |    xs.map(square)
-     | }
-z: scala.collection.immutable.List[Int] = List(1, 4, 9)
-scala> :quit