Removing more unneeded code.

5 files changed, 4 insertions, 101 deletions

diff --git a/test/files/run/repl-backticks.scala b/test/files/run/repl-backticks.scala
index 11c58e18a1..5eaa1ec4c1 100644
--- a/test/files/run/repl-backticks.scala
+++ b/test/files/run/repl-backticks.scala
@@ -11,7 +11,7 @@ object Test {
   def main(args: Array[String]) = {
     val settings = new Settings()
     settings.classpath.value = System.getProperty("java.class.path")
-    val repl = new Interpreter(settings)
+    val repl = new interpreter.IMain(settings)
     repl.interpret(testCode)    
   }
 }
diff --git a/test/files/run/repl-suppressed-warnings.check b/test/files/run/repl-suppressed-warnings.check
deleted file mode 100644
index ef9e5c1270..0000000000
--- a/test/files/run/repl-suppressed-warnings.check
+++ /dev/null
@@ -1,65 +0,0 @@
-Type in expressions to have them evaluated.
-Type :help for more information.
-
-scala> 
-
-scala> 
-
-scala> // "Is this thing on?" Not working on first couple
-
-scala> // commands, needs investigation.
-
-scala> 123
-res0: Int = 123
-
-scala> 123
-res1: Int = 123
-
-scala> 123
-res2: Int = 123
-
-scala> 
-
-scala> object o {
-  case class Bippy()
-  case class Dingus {
-    def f[T](xs: TraversableOnce[T]) = xs match {
-      case _: List[Int]   => 1
-      case _: Set[String] => 2
-      case _              => xs.isInstanceOf[Iterator[Double]]
-    }
-  }
-  case class DingDangDoobie(ding: Int, dang: Int, doobie: Double)
-  case class Dongoo
-  @serializable case class Heyooooo 
-
-  @deprecated("I'm an ironic deprecation warning") def f0 = 5 // where's this disappearing?
-  def f1 = Double.Epsilon   // and this?
-}
-warning: there were 6 deprecation warnings; re-run with -deprecation for details
-warning: there were 3 unchecked warnings; re-run with -unchecked for details
-defined module o
-
-scala> 
-
-scala> :warnings
-<console>:3: warning: case classes without a parameter list have been deprecated;
-use either case objects or case classes with `()' as parameter list.
-  case class Dingus {
-                   ^
-<console>:11: warning: case classes without a parameter list have been deprecated;
-use either case objects or case classes with `()' as parameter list.
-  case class Dongoo
-                  ^
-<console>:11: warning: case classes without a parameter list have been deprecated;
-use either case objects or case classes with `()' as parameter list.
-  case class Dongoo
-                   ^
-<console>:12: warning: case classes without a parameter list have been deprecated;
-use either case objects or case classes with `()' as parameter list.
-  @serializable case class Heyooooo 
-                                   ^
-
-scala> 
-
-scala> 
diff --git a/test/files/run/repl-suppressed-warnings.scala b/test/files/run/repl-suppressed-warnings.scala
deleted file mode 100644
index 1a51afe34f..0000000000
--- a/test/files/run/repl-suppressed-warnings.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-import scala.tools.partest.ReplTest
-
-object Test extends ReplTest {
-  override def extraSettings = ""
-  def code = """
-
-// "Is this thing on?" Not working on first couple
-// commands, needs investigation.
-123
-123
-123
-
-object o {
-  case class Bippy()
-  case class Dingus {
-    def f[T](xs: TraversableOnce[T]) = xs match {
-      case _: List[Int]   => 1
-      case _: Set[String] => 2
-      case _              => xs.isInstanceOf[Iterator[Double]]
-    }
-  }
-  case class DingDangDoobie(ding: Int, dang: Int, doobie: Double)
-  case class Dongoo
-  @serializable case class Heyooooo 
-
-  @deprecated("I'm an ironic deprecation warning") def f0 = 5 // where's this disappearing?
-  def f1 = Double.Epsilon   // and this?
-}
-
-:warnings
-  """
-}
diff --git a/test/files/run/t1500.scala b/test/files/run/t1500.scala
index 586a2666ad..ab132b724f 100644
--- a/test/files/run/t1500.scala
+++ b/test/files/run/t1500.scala
@@ -1,4 +1,4 @@
-import scala.tools.nsc._  
+import scala.tools.nsc._
 
 object Test {
   
@@ -20,7 +20,7 @@ object Test {
     
     val settings = new Settings()
     settings.classpath.value = System.getProperty("java.class.path")
-    val tool = new Interpreter(settings)
+    val tool = new interpreter.IMain(settings)
     val global = tool.compiler
 
     import global._
diff --git a/test/files/run/t1501.scala b/test/files/run/t1501.scala
index dee6e0c68e..aba206bc7a 100644
--- a/test/files/run/t1501.scala
+++ b/test/files/run/t1501.scala
@@ -30,7 +30,7 @@ object Test {
   def main(args: Array[String]) = {
     val settings = new Settings()
     settings.classpath.value = System.getProperty("java.class.path")
-    val tool = new Interpreter(settings)
+    val tool = new interpreter.IMain(settings)
     val global = tool.compiler
 
     import global._