A paltry 570 cases failing in -Xcheckinit due t...

A paltry 570 cases failing in -Xcheckinit due to some uninitialized val
or other. It is but a trifle! No review.

4 files changed, 5 insertions, 5 deletions

diff --git a/src/compiler/scala/tools/nsc/CompileSocket.scala b/src/compiler/scala/tools/nsc/CompileSocket.scala
index 1fd37eb70c..1e2a367176 100644
--- a/src/compiler/scala/tools/nsc/CompileSocket.scala
+++ b/src/compiler/scala/tools/nsc/CompileSocket.scala
@@ -54,7 +54,7 @@ class CompileSocket extends CompileOutputCommon {
    *  by the port number.
    */
   protected lazy val dirName = "scalac-compile-server-port"
-  protected lazy val cmdName = Properties.scalaCmd
+  protected def cmdName = Properties.scalaCmd
 
   /** The vm part of the command to start a new scala compile server */
   protected val vmCommand = Properties.scalaHome match {
diff --git a/src/compiler/scala/tools/nsc/CompilerCommand.scala b/src/compiler/scala/tools/nsc/CompilerCommand.scala
index f2c217e290..cbf2d9b27a 100644
--- a/src/compiler/scala/tools/nsc/CompilerCommand.scala
+++ b/src/compiler/scala/tools/nsc/CompilerCommand.scala
@@ -46,7 +46,7 @@ class CompilerCommand(arguments: List[String], val settings: Settings) {
     |
   """.stripMargin.trim + "\n\n"
 
-  val shortUsage = "Usage: %s <options> <source files>" format cmdName
+  def shortUsage = "Usage: %s <options> <source files>" format cmdName
   def createUsagePreface(shouldExplain: Boolean) =
     if (shouldExplain) shortUsage + "\n" + explainAdvanced else ""
 
diff --git a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
index 86ab76b59c..7923412304 100644
--- a/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
+++ b/src/compiler/scala/tools/nsc/GenericRunnerCommand.scala
@@ -20,8 +20,8 @@ extends CompilerCommand(args, settings) {
     this(args, str => Console.println("Error: " + str))
 
   /** name of the associated compiler command */
-  override val cmdName = "scala"
-  val compCmdName = "scalac"
+  override def cmdName = "scala"
+  def compCmdName = "scalac"
 
   // change CompilerCommand behavior
   override def shouldProcessArguments: Boolean = false
diff --git a/src/compiler/scala/tools/nsc/interpreter/CommandLine.scala b/src/compiler/scala/tools/nsc/interpreter/CommandLine.scala
index 94bcf3e4c8..e96918c90c 100644
--- a/src/compiler/scala/tools/nsc/interpreter/CommandLine.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/CommandLine.scala
@@ -9,6 +9,6 @@ package interpreter
 /** A command line for the interpreter.
  */
 class CommandLine(arguments: List[String], error: String => Unit) extends CompilerCommand(arguments, error) {
-  override val cmdName = "scala"
+  override def cmdName = "scala"
   override lazy val fileEndings = List(".scalaint")
 }