Remove -resident setting

Author: odersky

src/dotty/tools/dotc/Bench.scala

@@ -8,19 +8,7 @@ package dotc
 import core.Contexts.Context
 import reporting.Reporter
 
-/* To do:
- *   - simplify hk types
- *   - have a second look at normalization (leave at method types if pt is method type?)
- *   - Don't open package objects from class files if they are present in source
- *   - Revise the way classes are inherited - when not followed by [...] or (...),
- *     assume the unparameterized type and forward type parameters as we do now for the synthetic head class.
- */
 object Bench extends Driver {
-  def resident(compiler: Compiler): Reporter = unsupported("resident") /*loop { line =>
-    val command = new CompilerCommand(line split "\\s+" toList, new Settings(scalacError))
-    compiler.reporter.reset()
-    new compiler.Run() compile command.files
-  }*/
 
   private var numRuns = 1
 
@@ -29,29 +17,25 @@ object Bench extends Driver {
   private def ntimes(n: Int)(op: => Reporter): Reporter =
     (emptyReporter /: (0 until n)) ((_, _) => op)
 
-  override def doCompile(compiler: Compiler, fileNames: List[String], reporter: Option[Reporter] = None)
-      (implicit ctx: Context): Reporter =
-    if (new config.Settings.Setting.SettingDecorator[Boolean](ctx.base.settings.resident).value(ctx))
-      resident(compiler)
-    else
-      ntimes(numRuns) {
-        val start = System.nanoTime()
-        val r = super.doCompile(compiler, fileNames, reporter)
-        ctx.println(s"time elapsed: ${(System.nanoTime - start) / 1000000}ms")
-        r
-      }
+  override def doCompile(compiler: Compiler, fileNames: List[String])(implicit ctx: Context): Reporter =
+    ntimes(numRuns) {
+      val start = System.nanoTime()
+      val r = super.doCompile(compiler, fileNames)
+      println(s"time elapsed: ${(System.nanoTime - start) / 1000000}ms")
+      r
+    }
 
   def extractNumArg(args: Array[String], name: String, default: Int = 1): (Int, Array[String]) = {
     val pos = args indexOf name
     if (pos < 0) (default, args)
     else (args(pos + 1).toInt, (args take pos) ++ (args drop (pos + 2)))
   }
 
-  override def process(args: Array[String], rootCtx: Context, reporter: Option[Reporter] = None): Reporter = {
+  override def process(args: Array[String], rootCtx: Context): Reporter = {
     val (numCompilers, args1) = extractNumArg(args, "#compilers")
     val (numRuns, args2) = extractNumArg(args1, "#runs")
     this.numRuns = numRuns
-    ntimes(numCompilers)(super.process(args2, rootCtx, reporter))
+    ntimes(numCompilers)(super.process(args2, rootCtx))
   }
 }
 

src/dotty/tools/dotc/Main.scala

@@ -1,7 +1,3 @@
-/* NSC -- new Scala compiler
- * Copyright 2005-2013 LAMP/EPFL
- * @author  Martin Odersky
- */
 package dotty.tools
 package dotc
 
@@ -11,18 +7,5 @@ import reporting.Reporter
 /* To do:
  */
 object Main extends Driver {
-  def resident(compiler: Compiler): Reporter = unsupported("resident") /*loop { line =>
-    val command = new CompilerCommand(line split "\\s+" toList, new Settings(scalacError))
-    compiler.reporter.reset()
-    new compiler.Run() compile command.files
-  }*/
-
   override def newCompiler(): Compiler = new Compiler
-
-  override def doCompile(compiler: Compiler, fileNames: List[String], reporter: Option[Reporter] = None)(implicit ctx: Context): Reporter = {
-    if (new config.Settings.Setting.SettingDecorator[Boolean](ctx.base.settings.resident).value(ctx))
-      resident(compiler)
-    else
-      super.doCompile(compiler, fileNames, reporter)
-  }
 }

src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -81,7 +81,6 @@ class ScalaSettings extends Settings.SettingGroup {
   val Xprintpos = BooleanSetting("-Xprint-pos", "Print tree positions, as offsets.")
   val printtypes = BooleanSetting("-Xprint-types", "Print tree types (debugging option).")
   val prompt = BooleanSetting("-Xprompt", "Display a prompt after each error (debugging option).")
-  val resident = BooleanSetting("-Xresident", "Compiler stays resident: read source filenames from standard input.")
   val script = StringSetting("-Xscript", "object", "Treat the source file as a script and wrap it in a main method.", "")
   val mainClass = StringSetting("-Xmain-class", "path", "Class for manifest's Main-Class entry (only useful with -d <jar>)", "")
   val Xshowcls = StringSetting("-Xshow-class", "class", "Show internal representation of class.", "")