Imported sbt.Process into trunk, in the guise o...

Imported sbt.Process into trunk, in the guise of package
scala.sys.process. It is largely indistinguishable from the version in
sbt, at least from the outside.

Also, I renamed package system to sys. I wanted to do that from the
beginning and the desire has only grown since then. Sometimes a short
identifier is just critical to usability: with a function like error("")
called from hundreds of places, the difference between system.error and
sys.error is too big. sys.error and sys.exit have good vibes (at least
as good as the vibes can be for functions which error and exit.)

Note: this is just the first cut. I need to check this in to finish
fixing partest. I will be going over it with a comb and writing
documentation which will leave you enchanted, as well as removing other
bits which are now redundant or inferior. No review.

49 files changed, 87 insertions, 81 deletions

diff --git a/src/compiler/scala/tools/ant/Same.scala b/src/compiler/scala/tools/ant/Same.scala
index 2c68e12ba8..deaa9135a1 100644
--- a/src/compiler/scala/tools/ant/Same.scala
+++ b/src/compiler/scala/tools/ant/Same.scala
@@ -90,8 +90,8 @@ class Same extends ScalaMatchingTask {
 
   /** Tests if all mandatory attributes are set and valid. */
   private def validateAttributes = {
-    if (origin.isEmpty) system.error("Mandatory attribute 'dir' is not set.")
-    if (destination.isEmpty) system.error("Mandatory attribute 'todir' is not set.")
+    if (origin.isEmpty) sys.error("Mandatory attribute 'dir' is not set.")
+    if (destination.isEmpty) sys.error("Mandatory attribute 'todir' is not set.")
   }
 
   private def reportDiff(f1: File, f2: File) = {
@@ -150,7 +150,7 @@ class Same extends ScalaMatchingTask {
     }
     if (!allEqualNow)
       if (failing)
-        system.error("There were differences between '" + origin.get + "' and '" + destination.get + "'")
+        sys.error("There were differences between '" + origin.get + "' and '" + destination.get + "'")
       else
         log("There were differences between '" + origin.get + "' and '" + destination.get + "'")
     else {
diff --git a/src/compiler/scala/tools/ant/sabbus/Break.scala b/src/compiler/scala/tools/ant/sabbus/Break.scala
index 5d1f82e77a..e22d804f93 100644
--- a/src/compiler/scala/tools/ant/sabbus/Break.scala
+++ b/src/compiler/scala/tools/ant/sabbus/Break.scala
@@ -20,7 +20,7 @@ class Break extends Task {
   private var id: Option[String] = None
 
   override def execute {
-    if (id.isEmpty) system.error("Attribute 'id' is not set")
+    if (id.isEmpty) sys.error("Attribute 'id' is not set")
     Compilers.break(id.get)
   }
 
diff --git a/src/compiler/scala/tools/ant/sabbus/Make.scala b/src/compiler/scala/tools/ant/sabbus/Make.scala
index 31244ea7b4..88b4b371fb 100644
--- a/src/compiler/scala/tools/ant/sabbus/Make.scala
+++ b/src/compiler/scala/tools/ant/sabbus/Make.scala
@@ -14,8 +14,8 @@ import org.apache.tools.ant.Task
 
 class Make extends Task with TaskArgs {
   override def execute {
-    if (id.isEmpty) system.error("Mandatory attribute 'id' is not set.")
-    if (compilerPath.isEmpty) system.error("Mandatory attribute 'compilerpath' is not set.")
+    if (id.isEmpty) sys.error("Mandatory attribute 'id' is not set.")
+    if (compilerPath.isEmpty) sys.error("Mandatory attribute 'compilerpath' is not set.")
     val settings = new Settings
     if (!destinationDir.isEmpty) settings.d = destinationDir.get
     if (!compTarget.isEmpty) settings.target = compTarget.get
diff --git a/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala b/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala
index f83f476695..5ce42326e2 100644
--- a/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala
+++ b/src/compiler/scala/tools/ant/sabbus/ScalacFork.scala
@@ -62,9 +62,9 @@ class ScalacFork extends ScalaMatchingTask with ScalacShared with TaskArgs {
 
     log("Executing ant task scalacfork, origin: %s".format(originOfThis), Project.MSG_VERBOSE)
 
-    val compilerPath = this.compilerPath getOrElse system.error("Mandatory attribute 'compilerpath' is not set.")
-    val sourceDir = this.sourceDir getOrElse system.error("Mandatory attribute 'srcdir' is not set.")
-    val destinationDir = this.destinationDir getOrElse system.error("Mandatory attribute 'destdir' is not set.")
+    val compilerPath = this.compilerPath getOrElse sys.error("Mandatory attribute 'compilerpath' is not set.")
+    val sourceDir = this.sourceDir getOrElse sys.error("Mandatory attribute 'srcdir' is not set.")
+    val destinationDir = this.destinationDir getOrElse sys.error("Mandatory attribute 'destdir' is not set.")
 
     val settings = new Settings
     settings.d = destinationDir
@@ -114,7 +114,7 @@ class ScalacFork extends ScalaMatchingTask with ScalacShared with TaskArgs {
     val res = execWithArgFiles(java, paths)
 
     if (failOnError && res != 0)
-      system.error("Compilation failed because of an internal compiler error;"+
+      sys.error("Compilation failed because of an internal compiler error;"+
             " see the error output for details.")
   }
 }
diff --git a/src/compiler/scala/tools/ant/sabbus/Use.scala b/src/compiler/scala/tools/ant/sabbus/Use.scala
index 703cf233e1..ed93bcdcce 100644
--- a/src/compiler/scala/tools/ant/sabbus/Use.scala
+++ b/src/compiler/scala/tools/ant/sabbus/Use.scala
@@ -39,8 +39,8 @@ class Use extends ScalaMatchingTask {
   private var failOnError: Boolean = true
 
   override def execute() {
-    if (id.isEmpty) system.error("Mandatory attribute 'id' is not set.")
-    if (sourceDir.isEmpty) system.error("Mandatory attribute 'srcdir' is not set.")
+    if (id.isEmpty) sys.error("Mandatory attribute 'id' is not set.")
+    if (sourceDir.isEmpty) sys.error("Mandatory attribute 'srcdir' is not set.")
     val compiler = Compilers(id.get)
     if (!destinationDir.isEmpty) compiler.settings.d = destinationDir.get
     val mapper = new GlobPatternMapper()
@@ -58,7 +58,7 @@ class Use extends ScalaMatchingTask {
         log("Compiling " + includedFiles.size + " file" + (if (includedFiles.size > 1) "s" else "") + " to " + compiler.settings.d.getAbsolutePath)
         val (errors, warnings) = compiler.compile(includedFiles)
         if (errors > 0)
-          system.error("Compilation failed with " + errors + " error" + (if (errors > 1) "s" else "") + ".")
+          sys.error("Compilation failed with " + errors + " error" + (if (errors > 1) "s" else "") + ".")
         else if (warnings > 0)
           log("Compilation succeeded with " + warnings + " warning" + (if (warnings > 1) "s" else "") + ".")
       }
@@ -67,7 +67,7 @@ class Use extends ScalaMatchingTask {
           ex.printStackTrace
           val errorMsg =
             "Compilation failed because of an internal compiler error (" + msg + "); see the error output for details."
-          if (failOnError) system.error(errorMsg) else log(errorMsg)
+          if (failOnError) sys.error(errorMsg) else log(errorMsg)
       }
   }
 
diff --git a/src/compiler/scala/tools/cmd/Demo.scala b/src/compiler/scala/tools/cmd/Demo.scala
index c471c455ae..c01338f916 100644
--- a/src/compiler/scala/tools/cmd/Demo.scala
+++ b/src/compiler/scala/tools/cmd/Demo.scala
@@ -48,7 +48,7 @@ object DemoSpec extends DemoSpec with Property {
   type ThisCommandLine = SpecCommandLine
   def creator(args: List[String]) =
     new SpecCommandLine(args) {
-      override def errorFn(msg: String) = { println("Error: " + msg) ; system.exit(0) }
+      override def errorFn(msg: String) = { println("Error: " + msg) ; sys.exit(0) }
     }
 }
 
diff --git a/src/compiler/scala/tools/cmd/package.scala b/src/compiler/scala/tools/cmd/package.scala
index a5cd7c1bc2..089e473546 100644
--- a/src/compiler/scala/tools/cmd/package.scala
+++ b/src/compiler/scala/tools/cmd/package.scala
@@ -12,7 +12,7 @@ package object cmd {
 
   def runAndExit(body: => Unit): Nothing = {
     body
-    system.exit(0)
+    sys.exit(0)
   }
 
   def toOpt(s: String)              = if (s startsWith "--") s else "--" + s
diff --git a/src/compiler/scala/tools/cmd/program/Simple.scala b/src/compiler/scala/tools/cmd/program/Simple.scala
index a38239a119..9d687083c7 100644
--- a/src/compiler/scala/tools/cmd/program/Simple.scala
+++ b/src/compiler/scala/tools/cmd/program/Simple.scala
@@ -66,8 +66,8 @@ object Simple {
    *  inaccessible due to the overriding var.
    */
   trait Ticket2338WontFixWorkaround {
-    def enforceArity_=(x: Boolean): Unit = system.error("unreachable")
-    def onlyKnownOptions_=(x: Boolean): Unit = system.error("unreachable")
+    def enforceArity_=(x: Boolean): Unit = sys.error("unreachable")
+    def onlyKnownOptions_=(x: Boolean): Unit = sys.error("unreachable")
   }
 
   /** Configurability simplicity achieved by turning defs into vars and letting
diff --git a/src/compiler/scala/tools/nsc/CompileClient.scala b/src/compiler/scala/tools/nsc/CompileClient.scala
index db5dae0cd9..7fca0687fe 100644
--- a/src/compiler/scala/tools/nsc/CompileClient.scala
+++ b/src/compiler/scala/tools/nsc/CompileClient.scala
@@ -114,7 +114,7 @@ class StandardCompileClient {
   }
 
   def main(args: Array[String]): Unit =
-    system.exit(try main0(args) catch { case e: Exception => 1 })
+    sys.exit(try main0(args) catch { case e: Exception => 1 })
 }
 
 
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index a1198409dc..108a54ca83 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -36,7 +36,7 @@ class StandardCompileServer extends SocketServer {
   private def exit(code: Int): Nothing = {
     System.err.close()
     System.out.close()
-    system.exit(code)
+    sys.exit(code)
   }
 
   private val runtime = Runtime.getRuntime()
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 56fe04055c..aca34ec3a0 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -236,7 +236,7 @@ class Global(var settings: Settings, var reporter: Reporter) extends SymbolTable
 
     // XXX: short term, but I can't bear to add another option.
     // scalac -Dscala.timings will make this true.
-    def timings       = system.props contains "scala.timings"
+    def timings       = sys.props contains "scala.timings"
 
     def debug           = settings.debug.value
     def deprecation     = settings.deprecation.value
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 9fa77baeac..3425c04277 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -1367,7 +1367,7 @@ object Interpreter {
     intLoop.createInterpreter
     intLoop.in = InteractiveReader.createDefault(intLoop.interpreter)
 
-    // rebind exit so people don't accidentally call system.exit by way of predef
+    // rebind exit so people don't accidentally call sys.exit by way of predef
     intLoop.interpreter.beQuietDuring {
       intLoop.interpreter.interpret("""def exit = println("Type :quit to resume program execution.")""")
       for (p <- args) {
diff --git a/src/compiler/scala/tools/nsc/InterpreterLoop.scala b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
index 55f361cf1f..aba4d66165 100644
--- a/src/compiler/scala/tools/nsc/InterpreterLoop.scala
+++ b/src/compiler/scala/tools/nsc/InterpreterLoop.scala
@@ -117,7 +117,7 @@ class InterpreterLoop(in0: Option[BufferedReader], protected val out: PrintWrite
   private def installSigIntHandler() {
     def onExit() {
       Console.println("") // avoiding "shell prompt in middle of line" syndrome
-      system.exit(1)
+      sys.exit(1)
     }
     ignoring(classOf[Exception]) {
       SignalManager("INT") = {
diff --git a/src/compiler/scala/tools/nsc/Main.scala b/src/compiler/scala/tools/nsc/Main.scala
index 7f79c69f52..22d884a04e 100644
--- a/src/compiler/scala/tools/nsc/Main.scala
+++ b/src/compiler/scala/tools/nsc/Main.scala
@@ -120,7 +120,7 @@ object Main extends AnyRef with EvalLoop {
 
   def main(args: Array[String]) {
     process(args)
-    system exit (if (reporter.hasErrors) 1 else 0)
+    sys.exit(if (reporter.hasErrors) 1 else 0)
   }
 
 }
diff --git a/src/compiler/scala/tools/nsc/MainGenericRunner.scala b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
index 116c06179a..7fa41a5803 100644
--- a/src/compiler/scala/tools/nsc/MainGenericRunner.scala
+++ b/src/compiler/scala/tools/nsc/MainGenericRunner.scala
@@ -31,7 +31,7 @@ object MainGenericRunner {
 
   def main(args: Array[String]) {
     if (!process(args))
-      system.exit(1)
+      sys.exit(1)
   }
 
   def process(args: Array[String]): Boolean = {
diff --git a/src/compiler/scala/tools/nsc/MainTokenMetric.scala b/src/compiler/scala/tools/nsc/MainTokenMetric.scala
index 33e91759f8..0137b33cd0 100644
--- a/src/compiler/scala/tools/nsc/MainTokenMetric.scala
+++ b/src/compiler/scala/tools/nsc/MainTokenMetric.scala
@@ -34,7 +34,7 @@ object MainTokenMetric {
   }
 
   def process(args: Array[String]) {
-    val settings = new Settings(system.error)
+    val settings = new Settings(sys.error)
     reporter = new ConsoleReporter(settings)
     val command = new CompilerCommand(args.toList, settings)
     try {
@@ -50,7 +50,7 @@ object MainTokenMetric {
 
   def main(args: Array[String]) {
     process(args)
-    system.exit(if (reporter.hasErrors) 1 else 0)
+    sys.exit(if (reporter.hasErrors) 1 else 0)
   }
 
 }
diff --git a/src/compiler/scala/tools/nsc/ScalaDoc.scala b/src/compiler/scala/tools/nsc/ScalaDoc.scala
index 0549e2c758..6cc30eb8c8 100644
--- a/src/compiler/scala/tools/nsc/ScalaDoc.scala
+++ b/src/compiler/scala/tools/nsc/ScalaDoc.scala
@@ -79,6 +79,6 @@ object ScalaDoc {
 
   def main(args: Array[String]): Unit = {
     process(args)
-    system.exit(if (reporter.hasErrors) 1 else 0)
+    sys.exit(if (reporter.hasErrors) 1 else 0)
   }
 }
diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index a3a04e34b9..e7fd22d00c 100644
--- a/src/compiler/scala/tools/nsc/ScriptRunner.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -134,7 +134,7 @@ object ScriptRunner {
       scriptFileIn: String): Boolean =
   {
     val scriptFile        = Path(scriptFileIn).toAbsolute.path
-    val compSettingNames  = new Settings(system.error).visibleSettings.toList map (_.name)
+    val compSettingNames  = new Settings(sys.error).visibleSettings.toList map (_.name)
     val compSettings      = settings.visibleSettings.toList filter (compSettingNames contains _.name)
     val coreCompArgs      = compSettings flatMap (_.unparse)
     val compArgs          = coreCompArgs ::: List("-Xscript", scriptMain(settings), scriptFile)
@@ -178,7 +178,7 @@ object ScriptRunner {
       val compiledPath = Directory makeTemp "scalascript"
 
       // delete the directory after the user code has finished
-      system.addShutdownHook(compiledPath.deleteRecursively())
+      sys.addShutdownHook(compiledPath.deleteRecursively())
 
       settings.outdir.value = compiledPath.path
 
@@ -198,7 +198,7 @@ object ScriptRunner {
       else None
     }
 
-    /** The script runner calls system.exit to communicate a return value, but this must
+    /** The script runner calls sys.exit to communicate a return value, but this must
      *  not take place until there are no non-daemon threads running.  Tickets #1955, #2006.
      */
     waitingForThreads {
diff --git a/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala b/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
index cdc18ed566..8fa27c04f6 100644
--- a/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreeBrowsers.scala
@@ -684,7 +684,7 @@ abstract class TreeBrowsers {
                         toDocument(thistpe) :/: ", " :/:
                         toDocument(supertpe) ::")"))
       case _ =>
-        system.error("Unknown case: " + t.toString() +", "+ t.getClass)
+        sys.error("Unknown case: " + t.toString() +", "+ t.getClass)
     }
   }
 
diff --git a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
index 70ab35b13c..54e6acb082 100644
--- a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
+++ b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala
@@ -581,7 +581,7 @@ abstract class ScalaPrimitives {
       val arrayParent = tpe :: tpe.parents collectFirst {
         case TypeRef(_, ArrayClass, elem :: Nil) => elem
       }
-      arrayParent getOrElse system.error(fun.fullName + " : " + (tpe :: tpe.baseTypeSeq.toList).mkString(", "))
+      arrayParent getOrElse sys.error(fun.fullName + " : " + (tpe :: tpe.baseTypeSeq.toList).mkString(", "))
     }
 
     code match {
diff --git a/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala b/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala
index e38d14c10b..993002dc1d 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/ExceptionHandlers.scala
@@ -75,8 +75,8 @@ trait ExceptionHandlers {
   }
 
   object NoFinalizer extends Finalizer(null, "<no finalizer>", NoPosition) {
-    override def startBlock: BasicBlock             = system.error("NoFinalizer cannot have a start block.");
-    override def setStartBlock(b: BasicBlock): Unit = system.error("NoFinalizer cannot have a start block.");
+    override def startBlock: BasicBlock             = sys.error("NoFinalizer cannot have a start block.");
+    override def setStartBlock(b: BasicBlock): Unit = sys.error("NoFinalizer cannot have a start block.");
     override def dup = this
   }
 }
diff --git a/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala b/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
index ad85ded12b..9f22a6de90 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Linearizers.scala
@@ -191,7 +191,7 @@ trait Linearizers {
    */
   class DumpLinearizer extends Linearizer {
     def linearize(m: IMethod): List[BasicBlock] = m.code.blocks.toList
-    def linearizeAt(m: IMethod, start: BasicBlock): List[BasicBlock] = system.error("not implemented")
+    def linearizeAt(m: IMethod, start: BasicBlock): List[BasicBlock] = sys.error("not implemented")
   }
 
   /** The MSIL linearizer is used only for methods with at least one exception handler.
@@ -328,7 +328,7 @@ trait Linearizers {
     }
 
     def linearizeAt(m: IMethod, start: BasicBlock): List[BasicBlock] = {
-      system.error("not implemented")
+      sys.error("not implemented")
     }
   }
 }
diff --git a/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
index 6da0279ffe..3f7383daf9 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/Opcodes.scala
@@ -578,7 +578,7 @@ trait Opcodes { self: ICodes =>
      *        then pushes one exception instance.
      */
     case class LOAD_EXCEPTION(clasz: Symbol) extends Instruction {
-      override def consumed = system.error("LOAD_EXCEPTION does clean the whole stack, no idea how many things it consumes!")
+      override def consumed = sys.error("LOAD_EXCEPTION does clean the whole stack, no idea how many things it consumes!")
       override def produced = 1
       override def producedTypes = REFERENCE(clasz) :: Nil
     }
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
index 43ab35b83e..49f5cf78c9 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/CopyPropagation.scala
@@ -301,7 +301,7 @@ abstract class CopyPropagation {
                   out.bindings += (LocalVar(local) -> v)
               }
             case Nil =>
-              system.error("Incorrect icode in " + method + ". Expecting something on the stack.")
+              sys.error("Incorrect icode in " + method + ". Expecting something on the stack.")
           }
           out.stack = out.stack drop 1;
 
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala
index c45983d5b6..58ca183359 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/DataFlowAnalysis.scala
@@ -82,7 +82,7 @@ trait DataFlowAnalysis[L <: SemiLattice] {
       Console.println("in: " + in.mkString("", "\n", ""))
       Console.println("out: " + out.mkString("", "\n", ""))
       e.printStackTrace
-      system.error("Could not find element " + e.getMessage)
+      sys.error("Could not find element " + e.getMessage)
   }
 
   /** ...
diff --git a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
index 03bb2bae3f..acc28bd445 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/analysis/TypeFlowAnalysis.scala
@@ -46,7 +46,7 @@ abstract class TypeFlowAnalysis {
     def lub2(exceptional: Boolean)(s1: TypeStack, s2: TypeStack) = {
       if (s1 eq bottom) s2
       else if (s2 eq bottom) s1
-      else if ((s1 eq exceptionHandlerStack) || (s2 eq exceptionHandlerStack)) system.error("merging with exhan stack")
+      else if ((s1 eq exceptionHandlerStack) || (s2 eq exceptionHandlerStack)) sys.error("merging with exhan stack")
       else {
 //        if (s1.length != s2.length)
 //          throw new CheckerException("Incompatible stacks: " + s1 + " and " + s2);
diff --git a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
index 66dc3c78b2..aeea6b5452 100644
--- a/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
+++ b/src/compiler/scala/tools/nsc/backend/opt/Inliners.scala
@@ -296,7 +296,7 @@ abstract class Inliners extends SubComponent {
       def isMonadic     = isMonadicMethod(sym)
 
       def handlers      = m.exh
-      def blocks        = if (m.code eq null) system.error("blocks = null + " + m) else m.code.blocks
+      def blocks        = if (m.code eq null) sys.error("blocks = null + " + m) else m.code.blocks
       def locals        = m.locals
       def length        = blocks.length
       def openBlocks    = blocks filterNot (_.closed)
diff --git a/src/compiler/scala/tools/nsc/doc/SourcelessComments.scala b/src/compiler/scala/tools/nsc/doc/SourcelessComments.scala
index 46e45a861b..647a17b66b 100644
--- a/src/compiler/scala/tools/nsc/doc/SourcelessComments.scala
+++ b/src/compiler/scala/tools/nsc/doc/SourcelessComments.scala
@@ -214,7 +214,7 @@ abstract class SourcelessComments {
       /** Class `AnyVal` is the root class of all ''value types''.
         *
         * `AnyVal` has a fixed number of subclasses, which describe values which are not implemented as objects in the
-        * underlying host system.
+        * underlying host sys.
         *
         * Classes [[scala.Double]], [[scala.Float]], [[scala.Long]], [[scala.Int]], [[scala.Char]], [[scala.Short]],
         * and [[scala.Byte]] are together called ''numeric value types''. Classes [[scala.Byte]], [[scala.Short]], and
@@ -235,7 +235,7 @@ abstract class SourcelessComments {
       val minValue = "MIN_" + sym.name.toString().toUpperCase()
       comment(sym) = new DocComment("""
         /** Class `""" + sym.name + """` belongs to the value classes whose instances are not represented as objects by
-          * the underlying host system.  There is an implicit conversion from instances of `""" + sym.name + """` to
+          * the underlying host sys.  There is an implicit conversion from instances of `""" + sym.name + """` to
           * instances of [[scala.runtime.Rich""" + sym.name + """]] which provides useful non-primitive operations.
           * All value classes inherit from class [[scala.AnyVal]].
           *
diff --git a/src/compiler/scala/tools/nsc/interactive/REPL.scala b/src/compiler/scala/tools/nsc/interactive/REPL.scala
index 47807ccdac..4e5d5668cb 100644
--- a/src/compiler/scala/tools/nsc/interactive/REPL.scala
+++ b/src/compiler/scala/tools/nsc/interactive/REPL.scala
@@ -56,7 +56,7 @@ object REPL {
 
   def main(args: Array[String]) {
     process(args)
-    system.exit(if (reporter.hasErrors) 1 else 0)
+    sys.exit(if (reporter.hasErrors) 1 else 0)
   }
 
   def loop(action: (String) => Unit) {
@@ -125,7 +125,7 @@ object REPL {
           doComplete(makePos(file, off1, off1))
         case List("quit") =>
           comp.askShutdown()
-          system.exit(1)
+          sys.exit(1)
         case _ =>
           println("unrecongized command")
       }
diff --git a/src/compiler/scala/tools/nsc/interactive/tests/Tester.scala b/src/compiler/scala/tools/nsc/interactive/tests/Tester.scala
index 6e380027b6..36a715ba26 100644
--- a/src/compiler/scala/tools/nsc/interactive/tests/Tester.scala
+++ b/src/compiler/scala/tools/nsc/interactive/tests/Tester.scala
@@ -199,6 +199,6 @@ object Tester {
     println("filenames = "+filenames)
     val files = filenames.toArray map (str => new BatchSourceFile(AbstractFile.getFile(str)): SourceFile)
     new Tester(args(0).toInt, files, settings).run()
-    system.exit(0)
+    sys.exit(0)
   }
 }
diff --git a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
index 4fdcbafa83..5e78cb4ebb 100644
--- a/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/InteractiveReader.scala
@@ -23,7 +23,7 @@ trait InteractiveReader {
 
   def readLine(prompt: String): String = {
     def handler: Catcher[String] = {
-      case e: ClosedByInterruptException          => system.error("Reader closed by interrupt.")
+      case e: ClosedByInterruptException          => sys.error("Reader closed by interrupt.")
       // Terminal has to be re-initialized after SIGSTP or up arrow etc. stop working.
       case e: IOException if restartSystemCall(e) => reset() ; readLine(prompt)
     }
diff --git a/src/compiler/scala/tools/nsc/interpreter/ReflectionCompletion.scala b/src/compiler/scala/tools/nsc/interpreter/ReflectionCompletion.scala
index 440f2933f9..932326ecc7 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ReflectionCompletion.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ReflectionCompletion.scala
@@ -19,12 +19,12 @@ trait ReflectionCompletion extends CompletionAware {
   def reflectName(m: AccessibleObject) = m match {
     case x: reflect.Method  => x.getName
     case x: reflect.Field   => x.getName
-    case x                  => system.error(x.toString)
+    case x                  => sys.error(x.toString)
   }
   def isPublic(m: AccessibleObject) = m match {
     case x: reflect.Method  => Modifier isPublic x.getModifiers
     case x: reflect.Field   => Modifier isPublic x.getModifiers
-    case x                  => system.error(x.toString)
+    case x                  => sys.error(x.toString)
   }
 
   lazy val (staticMethods, instanceMethods) = clazz.getMethods.toList partition (x => isStatic(x.getModifiers))
diff --git a/src/compiler/scala/tools/nsc/interpreter/package.scala b/src/compiler/scala/tools/nsc/interpreter/package.scala
index 9d131f4786..dcbc84334c 100644
--- a/src/compiler/scala/tools/nsc/interpreter/package.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/package.scala
@@ -8,7 +8,7 @@ package scala.tools.nsc
 package object interpreter {
   private[nsc] val DebugProperty = "scala.repl.debug"
   private[nsc] var _debug = false
-  private[nsc] def isReplDebug = _debug || (system.props contains DebugProperty)
+  private[nsc] def isReplDebug = _debug || (sys.props contains DebugProperty)
 
   /** Debug output */
   def repldbg(msg: String) = if (isReplDebug) Console println msg
diff --git a/src/compiler/scala/tools/nsc/io/AbstractFile.scala b/src/compiler/scala/tools/nsc/io/AbstractFile.scala
index 01aaa6c007..c2b73b2831 100644
--- a/src/compiler/scala/tools/nsc/io/AbstractFile.scala
+++ b/src/compiler/scala/tools/nsc/io/AbstractFile.scala
@@ -61,7 +61,7 @@ object AbstractFile {
  * <p>
  *   This class and its children serve to unify handling of files and
  *   directories. These files and directories may or may not have some
- *   real counter part within the file system. For example, some file
+ *   real counter part within the file sys. For example, some file
  *   handles reference files within a zip archive or virtual ones
  *   that exist only in memory.
  * </p>
diff --git a/src/compiler/scala/tools/nsc/io/File.scala b/src/compiler/scala/tools/nsc/io/File.scala
index 7bf04cbe5c..eddc9c0de6 100644
--- a/src/compiler/scala/tools/nsc/io/File.scala
+++ b/src/compiler/scala/tools/nsc/io/File.scala
@@ -112,6 +112,12 @@ class File(jfile: JFile)(implicit constructorCodec: Codec) extends Path(jfile) w
     finally out close
   }
 
+  def writeBytes(bytes: Array[Byte]): Unit = {
+    val out = bufferedOutput()
+    try out write bytes
+    finally out close
+  }
+
   def appendAll(strings: String*): Unit = {
     val out = bufferedWriter(append = true)
     try strings foreach (out write _)
diff --git a/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala b/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala
index eac7530aa3..8f5ad5c820 100644
--- a/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala
+++ b/src/compiler/scala/tools/nsc/io/VirtualDirectory.scala
@@ -27,8 +27,8 @@ extends AbstractFile {
   var lastModified: Long = System.currentTimeMillis
 
   override def file = null
-  override def input = system.error("directories cannot be read")
-  override def output = system.error("directories cannot be written")
+  override def input = sys.error("directories cannot be read")
+  override def output = sys.error("directories cannot be written")
 
   /** Does this abstract file denote an existing file? */
   def create { unsupported }
diff --git a/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala b/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
index 3131c78bd0..a4699cfd88 100644
--- a/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/AbsScalaSettings.scala
@@ -32,7 +32,7 @@ trait AbsScalaSettings {
   /** **/
   abstract class SettingGroup(val prefix: String) extends AbsSetting {
     def name = prefix
-    def helpDescription: String = system.error("todo")
+    def helpDescription: String = sys.error("todo")
     def unparse: List[String] = List(name)
   }
 }
diff --git a/src/compiler/scala/tools/nsc/symtab/Scopes.scala b/src/compiler/scala/tools/nsc/symtab/Scopes.scala
index b5e23d61f0..6ce244b772 100644
--- a/src/compiler/scala/tools/nsc/symtab/Scopes.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Scopes.scala
@@ -227,7 +227,7 @@ trait Scopes {
 
     /** lookup a symbol entry matching given name.
      *  @note from Martin: I believe this is a hotspot or will be one
-     *  in future versions of the type system. I have reverted the previous
+     *  in future versions of the type sys. I have reverted the previous
      *  change to use iterators as too costly.
      */
     def lookupEntry(name: Name): ScopeEntry = {
@@ -248,7 +248,7 @@ trait Scopes {
 
     /** lookup next entry with same name as this one
      *  @note from Martin: I believe this is a hotspot or will be one
-     *  in future versions of the type system. I have reverted the previous
+     *  in future versions of the type sys. I have reverted the previous
      *  change to use iterators as too costly.
      */
     def lookupNextEntry(entry: ScopeEntry): ScopeEntry = {
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
index f944a168e9..5bc10a4fef 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ICodeReader.scala
@@ -360,12 +360,12 @@ abstract class ICodeReader extends ClassfileParser {
         case JVM.pop         => code.emit(DROP(INT))   // any 1-word type would do
         case JVM.pop2        => code.emit(DROP(LONG))  // any 2-word type would do
         case JVM.dup         => code.emit(DUP(ObjectReference)) // TODO: Is the kind inside DUP ever needed?
-        case JVM.dup_x1      => code.emit(DUP_X1)      // system.error("Unsupported JVM bytecode: dup_x1")
-        case JVM.dup_x2      => code.emit(DUP_X2)      // system.error("Unsupported JVM bytecode: dup_x2")
+        case JVM.dup_x1      => code.emit(DUP_X1)      // sys.error("Unsupported JVM bytecode: dup_x1")
+        case JVM.dup_x2      => code.emit(DUP_X2)      // sys.error("Unsupported JVM bytecode: dup_x2")
         case JVM.dup2        => code.emit(DUP(LONG))   // TODO: Is the kind inside DUP ever needed?
-        case JVM.dup2_x1     => code.emit(DUP2_X1)     // system.error("Unsupported JVM bytecode: dup2_x1")
-        case JVM.dup2_x2     => code.emit(DUP2_X2)     // system.error("Unsupported JVM bytecode: dup2_x2")
-        case JVM.swap        => system.error("Unsupported JVM bytecode: swap")
+        case JVM.dup2_x1     => code.emit(DUP2_X1)     // sys.error("Unsupported JVM bytecode: dup2_x1")
+        case JVM.dup2_x2     => code.emit(DUP2_X2)     // sys.error("Unsupported JVM bytecode: dup2_x2")
+        case JVM.swap        => sys.error("Unsupported JVM bytecode: swap")
 
         case JVM.iadd        => code.emit(CALL_PRIMITIVE(Arithmetic(ADD, INT)))
         case JVM.ladd        => code.emit(CALL_PRIMITIVE(Arithmetic(ADD, LONG)))
@@ -452,8 +452,8 @@ abstract class ICodeReader extends ClassfileParser {
         case JVM.if_acmpne   => code.emit(LCJUMP(parseJumpTarget, pc + size, NE, ObjectReference))
 
         case JVM.goto        => emit(LJUMP(parseJumpTarget))
-        case JVM.jsr         => system.error("Cannot handle jsr/ret")
-        case JVM.ret         => system.error("Cannot handle jsr/ret")
+        case JVM.jsr         => sys.error("Cannot handle jsr/ret")
+        case JVM.ret         => sys.error("Cannot handle jsr/ret")
         case JVM.tableswitch =>
           val padding = if ((pc + size) % 4 != 0) 4 - ((pc + size) % 4) else 0
           size += padding
@@ -578,14 +578,14 @@ abstract class ICodeReader extends ClassfileParser {
             case JVM.fstore => code.emit(STORE_LOCAL(code.getLocal(in.nextChar, FLOAT)));  size += 2
             case JVM.dstore => code.emit(STORE_LOCAL(code.getLocal(in.nextChar, DOUBLE))); size += 2
             case JVM.astore => code.emit(STORE_LOCAL(code.getLocal(in.nextChar, ObjectReference))); size += 2
-            case JVM.ret => system.error("Cannot handle jsr/ret")
+            case JVM.ret => sys.error("Cannot handle jsr/ret")
             case JVM.iinc =>
               size += 4
               val local = code.getLocal(in.nextChar, INT)
               code.emit(CONSTANT(Constant(in.nextChar)))
               code.emit(CALL_PRIMITIVE(Arithmetic(ADD, INT)))
               code.emit(STORE_LOCAL(local))
-            case _ => system.error("Invalid 'wide' operand")
+            case _ => sys.error("Invalid 'wide' operand")
           }
 
         case JVM.multianewarray =>
@@ -598,9 +598,9 @@ abstract class ICodeReader extends ClassfileParser {
         case JVM.ifnull    => code.emit(LCZJUMP(parseJumpTarget, pc + size, EQ, ObjectReference))
         case JVM.ifnonnull => code.emit(LCZJUMP(parseJumpTarget, pc + size, NE, ObjectReference))
         case JVM.goto_w    => code.emit(LJUMP(parseJumpTargetW))
-        case JVM.jsr_w     => system.error("Cannot handle jsr/ret")
+        case JVM.jsr_w     => sys.error("Cannot handle jsr/ret")
 
-//        case _ => system.error("Unknown bytecode")
+//        case _ => sys.error("Unknown bytecode")
       }
       pc += size
     }
diff --git a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
index 6e5a8ac817..153aa0faf5 100644
--- a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
+++ b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala
@@ -450,7 +450,7 @@ abstract class ExplicitOuter extends InfoTransform
           if (sym.isClassConstructor) {
             rhs match {
               case Literal(_) =>
-                system.error("unexpected case") //todo: remove
+                sys.error("unexpected case") //todo: remove
               case _ =>
                 val clazz = sym.owner
                 val vparamss1 =
diff --git a/src/compiler/scala/tools/nsc/transform/TailCalls.scala b/src/compiler/scala/tools/nsc/transform/TailCalls.scala
index 758c28a238..0e190a0da1 100644
--- a/src/compiler/scala/tools/nsc/transform/TailCalls.scala
+++ b/src/compiler/scala/tools/nsc/transform/TailCalls.scala
@@ -301,7 +301,7 @@ abstract class TailCalls extends Transform {
             rewriteApply(fun, fun, Nil, args)
 
         case Alternative(_) | Star(_) | Bind(_, _) =>
-          system.error("We should've never gotten inside a pattern")
+          sys.error("We should've never gotten inside a pattern")
         case EmptyTree | Super(_, _) | This(_) | Select(_, _) | Ident(_) | Literal(_) | Function(_, _) | TypeTree() =>
           tree
         case _ =>
diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
index c06d2ce7dc..2f56180c8d 100644
--- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala
+++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala
@@ -587,7 +587,7 @@ abstract class UnCurry extends InfoTransform with TypingTransformers with ast.Tr
           val args1 = transformTrees(fn.symbol.name match {
             case nme.unapply    => args
             case nme.unapplySeq => transformArgs(tree.pos, fn.symbol, args, analyzer.unapplyTypeListFromReturnTypeSeq(fn.tpe))
-            case _              => system.error("internal error: UnApply node has wrong symbol")
+            case _              => sys.error("internal error: UnApply node has wrong symbol")
           })
           treeCopy.UnApply(tree, fn1, args1)
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
index 95bf16db5b..3e8f7bd2c7 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
@@ -39,7 +39,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
     private var accDefs: List[(Symbol, ListBuffer[Tree])] = List()
 
     private def accDefBuf(clazz: Symbol) =
-      accDefs collectFirst { case (`clazz`, buf) => buf } getOrElse system.error("no acc def buf for "+clazz)
+      accDefs collectFirst { case (`clazz`, buf) => buf } getOrElse sys.error("no acc def buf for "+clazz)
 
     private def transformArgs(args: List[Tree], params: List[Symbol]) =
       ((args, params).zipped map { (arg, param) =>
@@ -406,7 +406,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT
      *  self type is a Java class, and a protected accessor is needed, we issue
      *  an error. If the self type is a Scala class, we don't add an accessor.
      *  An accessor is not needed if the access boundary is larger than the
-     *  enclosing package, since that translates to 'public' on the host system.
+     *  enclosing package, since that translates to 'public' on the host sys.
      *  (as Java has no real package nesting).
      *
      * If the access happens inside a 'trait', access is more problematic since
diff --git a/src/compiler/scala/tools/nsc/util/MsilClassPath.scala b/src/compiler/scala/tools/nsc/util/MsilClassPath.scala
index 019f40d72f..fb03f8d159 100644
--- a/src/compiler/scala/tools/nsc/util/MsilClassPath.scala
+++ b/src/compiler/scala/tools/nsc/util/MsilClassPath.scala
@@ -112,7 +112,7 @@ class AssemblyClassPath(types: Array[MSILType], namespace: String, val context:
     else namespace drop (i + 1)
   }
   def asURLs = List(new java.net.URL(name))
-  def asClasspathString = system.error("Unknown")  // I don't know what if anything makes sense here?
+  def asClasspathString = sys.error("Unknown")  // I don't know what if anything makes sense here?
 
   private lazy val first: Int = {
     var m = 0
diff --git a/src/compiler/scala/tools/nsc/util/Origins.scala b/src/compiler/scala/tools/nsc/util/Origins.scala
index 29ef9f3f03..62fb0dab00 100644
--- a/src/compiler/scala/tools/nsc/util/Origins.scala
+++ b/src/compiler/scala/tools/nsc/util/Origins.scala
@@ -85,7 +85,7 @@ object Origins {
 
   {
     // Console.println("\nOrigins loaded: registering shutdown hook to display results.")
-    system.addShutdownHook(counters foreach (_.purge()))
+    sys.addShutdownHook(counters foreach (_.purge()))
   }
 
   def apply[T: Manifest](tag: String): Origins = apply(tag, manifest[T].erasure)
diff --git a/src/compiler/scala/tools/nsc/util/ShowPickled.scala b/src/compiler/scala/tools/nsc/util/ShowPickled.scala
index a11038104b..dfa9f1c7cf 100644
--- a/src/compiler/scala/tools/nsc/util/ShowPickled.scala
+++ b/src/compiler/scala/tools/nsc/util/ShowPickled.scala
@@ -28,10 +28,10 @@ object ShowPickled extends Names {
     }
     def readName =
       if (isName) new String(bytes, "UTF-8")
-      else system.error("%s is no name" format tagName)
+      else sys.error("%s is no name" format tagName)
     def nameIndex =
       if (hasName) readNat(bytes, 0)
-      else system.error("%s has no name" format tagName)
+      else sys.error("%s has no name" format tagName)
 
     def tagName = tag2string(tag)
     override def toString = "%d,%d: %s".format(num, startIndex, tagName)
diff --git a/src/compiler/scala/tools/nsc/util/package.scala b/src/compiler/scala/tools/nsc/util/package.scala
index 6de2f35796..06e4de80f9 100644
--- a/src/compiler/scala/tools/nsc/util/package.scala
+++ b/src/compiler/scala/tools/nsc/util/package.scala
@@ -22,9 +22,9 @@ package object util {
    *  execution to complete.
    */
   def waitingForThreads[T](body: => T) = {
-    val ts1        = system.allThreads()
+    val ts1        = sys.allThreads()
     val result     = body
-    val ts2        = system.allThreads()
+    val ts2        = sys.allThreads()
     val newThreads = ts2.toSet -- ts1 filterNot (_.isDaemon())
 
     newThreads foreach (_.join())
diff --git a/src/compiler/scala/tools/reflect/Mock.scala b/src/compiler/scala/tools/reflect/Mock.scala
index 56bef2caa4..2b06d808ae 100644
--- a/src/compiler/scala/tools/reflect/Mock.scala
+++ b/src/compiler/scala/tools/reflect/Mock.scala
@@ -53,7 +53,7 @@ object Mock {
   /** Tries to implement all the class's interfaces.
    */
   def fromClass(clazz: Class[_])(pf: PartialFunction[Invoked, AnyRef]): AnyRef = allInterfaces(clazz) match {
-    case Nil      => system.error(clazz + " implements no interfaces.")
+    case Nil      => sys.error(clazz + " implements no interfaces.")
     case x :: xs  => fromInterfaces(x, xs: _*)(pf)
   }
 }
diff --git a/src/compiler/scala/tools/util/SocketServer.scala b/src/compiler/scala/tools/util/SocketServer.scala
index f647660193..cc3024d3e4 100644
--- a/src/compiler/scala/tools/util/SocketServer.scala
+++ b/src/compiler/scala/tools/util/SocketServer.scala
@@ -42,7 +42,7 @@ abstract class SocketServer
 
   def fatal(msg: String): Nothing = {
     System.err.println(msg)
-    system.exit(1)
+    sys.exit(1)
   }
 
   private def warn(msg: String) {