Address obvious bug in MutableSettings.

If x startsWith "-" it seems unlikely that x == "".
Free with purchase: test case with 100 argument permutations.
That's only a smidgen shy of infinity.

4 files changed, 608 insertions, 22 deletions

diff --git a/src/compiler/scala/tools/nsc/settings/AbsSettings.scala b/src/compiler/scala/tools/nsc/settings/AbsSettings.scala
index adabeb02a3..e965370713 100644
--- a/src/compiler/scala/tools/nsc/settings/AbsSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/AbsSettings.scala
@@ -133,7 +133,7 @@ trait AbsSettings extends scala.reflect.internal.settings.AbsSettings {
       case _                          => false
     }
     override def hashCode() = name.hashCode + value.hashCode
-    override def toString() = name + " = " + value
+    override def toString() = name + " = " + (if (value == "") "\"\"" else value)
   }
 
   trait InternalSetting extends AbsSetting {
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
index 7eae2295f6..4f4f0544da 100644
--- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
@@ -62,30 +62,23 @@ class MutableSettings(val errorFn: String => Unit)
         (checkDependencies, residualArgs)
       case "--" :: xs =>
         (checkDependencies, xs)
+      // discard empties, sometimes they appear because of ant or etc.
+      // but discard carefully, because an empty string is valid as an argument
+      // to an option, e.g. -cp "" .  So we discard them only when they appear
+      // where an option should be, not where an argument to an option should be.
+      case "" :: xs =>
+        loop(xs, residualArgs)
       case x :: xs  =>
-        val isOpt = x startsWith "-"
-        if (isOpt) {
-          val newArgs = parseParams(args)
-          if (args eq newArgs) {
-            errorFn(s"bad option: '$x'")
-            (false, args)
+        if (x startsWith "-") {
+          parseParams(args) match {
+            case newArgs if newArgs eq args => errorFn(s"bad option: '$x'") ; (false, args)
+            case newArgs                    => loop(newArgs, residualArgs)
           }
-          // discard empties, sometimes they appear because of ant or etc.
-          // but discard carefully, because an empty string is valid as an argument
-          // to an option, e.g. -cp "" .  So we discard them only when they appear
-          // in option position.
-          else if (x == "") {
-            loop(xs, residualArgs)
-          }
-          else lookupSetting(x) match {
-            case Some(s) if s.shouldStopProcessing  => (checkDependencies, newArgs)
-            case _                                  => loop(newArgs, residualArgs)
-          }
-        }
-        else {
-          if (processAll) loop(xs, residualArgs :+ x)
-          else (checkDependencies, args)
         }
+        else if (processAll)
+          loop(xs, residualArgs :+ x)
+        else
+          (checkDependencies, args)
     }
     loop(arguments, Nil)
   }
diff --git a/test/files/run/settings-parse.check b/test/files/run/settings-parse.check
new file mode 100644
index 0000000000..18145c9100
--- /dev/null
+++ b/test/files/run/settings-parse.check
@@ -0,0 +1,566 @@
+0) List(-cp, ) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+1) List(-cp, , ) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+2) List(, -cp, ) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+3) List(-cp, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+4) List(-cp, , , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+5) List(-cp, , -deprecation, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+6) List(, -cp, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+7) List(-cp, , -deprecation, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+8) List(-cp, , , -deprecation, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+9) List(-cp, , -deprecation, , foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+10) List(-cp, , -deprecation, foo.scala, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+11) List(, -cp, , -deprecation, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+12) List(-cp, , foo.scala) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+13) List(-cp, , , foo.scala) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+14) List(-cp, , foo.scala, ) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+15) List(, -cp, , foo.scala) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+16) List(-cp, , foo.scala, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+17) List(-cp, , , foo.scala, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+18) List(-cp, , foo.scala, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+19) List(-cp, , foo.scala, -deprecation, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+20) List(, -cp, , foo.scala, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+21) List(-deprecation, -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+22) List(, -deprecation, -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+23) List(-deprecation, -cp, , ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+24) List(-deprecation, , -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+25) List(-deprecation, -cp, , foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+26) List(, -deprecation, -cp, , foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+27) List(-deprecation, -cp, , , foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+28) List(-deprecation, -cp, , foo.scala, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+29) List(-deprecation, , -cp, , foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+30) List(-deprecation, foo.scala, -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+31) List(, -deprecation, foo.scala, -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+32) List(-deprecation, , foo.scala, -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+33) List(-deprecation, foo.scala, -cp, , ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+34) List(-deprecation, foo.scala, , -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+35) List(foo.scala, -cp, ) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+36) List(, foo.scala, -cp, ) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+37) List(foo.scala, -cp, , ) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+38) List(foo.scala, , -cp, ) ==> Settings {
+  -d = .
+  -classpath = ""
+}
+
+39) List(foo.scala, -cp, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+40) List(, foo.scala, -cp, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+41) List(foo.scala, -cp, , , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+42) List(foo.scala, -cp, , -deprecation, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+43) List(foo.scala, , -cp, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+44) List(foo.scala, -deprecation, -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+45) List(, foo.scala, -deprecation, -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+46) List(foo.scala, , -deprecation, -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+47) List(foo.scala, -deprecation, -cp, , ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+48) List(foo.scala, -deprecation, , -cp, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = ""
+}
+
+0) List(-cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+1) List(-cp, /tmp:/bippy, ) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+2) List(, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+3) List(-cp, /tmp:/bippy, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+4) List(-cp, /tmp:/bippy, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+5) List(-cp, /tmp:/bippy, -deprecation, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+6) List(, -cp, /tmp:/bippy, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+7) List(-cp, /tmp:/bippy, -deprecation, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+8) List(-cp, /tmp:/bippy, , -deprecation, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+9) List(-cp, /tmp:/bippy, -deprecation, , foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+10) List(-cp, /tmp:/bippy, -deprecation, foo.scala, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+11) List(, -cp, /tmp:/bippy, -deprecation, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+12) List(-cp, /tmp:/bippy, foo.scala) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+13) List(-cp, /tmp:/bippy, , foo.scala) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+14) List(-cp, /tmp:/bippy, foo.scala, ) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+15) List(, -cp, /tmp:/bippy, foo.scala) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+16) List(-cp, /tmp:/bippy, foo.scala, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+17) List(-cp, /tmp:/bippy, , foo.scala, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+18) List(-cp, /tmp:/bippy, foo.scala, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+19) List(-cp, /tmp:/bippy, foo.scala, -deprecation, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+20) List(, -cp, /tmp:/bippy, foo.scala, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+21) List(-deprecation, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+22) List(, -deprecation, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+23) List(-deprecation, -cp, /tmp:/bippy, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+24) List(-deprecation, , -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+25) List(-deprecation, -cp, /tmp:/bippy, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+26) List(, -deprecation, -cp, /tmp:/bippy, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+27) List(-deprecation, -cp, /tmp:/bippy, , foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+28) List(-deprecation, -cp, /tmp:/bippy, foo.scala, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+29) List(-deprecation, , -cp, /tmp:/bippy, foo.scala) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+30) List(-deprecation, foo.scala, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+31) List(, -deprecation, foo.scala, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+32) List(-deprecation, , foo.scala, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+33) List(-deprecation, foo.scala, -cp, /tmp:/bippy, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+34) List(-deprecation, foo.scala, , -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+35) List(foo.scala, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+36) List(, foo.scala, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+37) List(foo.scala, -cp, /tmp:/bippy, ) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+38) List(foo.scala, , -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -classpath = /tmp:/bippy
+}
+
+39) List(foo.scala, -cp, /tmp:/bippy, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+40) List(, foo.scala, -cp, /tmp:/bippy, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+41) List(foo.scala, -cp, /tmp:/bippy, , -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+42) List(foo.scala, -cp, /tmp:/bippy, -deprecation, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+43) List(foo.scala, , -cp, /tmp:/bippy, -deprecation) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+44) List(foo.scala, -deprecation, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+45) List(, foo.scala, -deprecation, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+46) List(foo.scala, , -deprecation, -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+47) List(foo.scala, -deprecation, -cp, /tmp:/bippy, ) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
+48) List(foo.scala, -deprecation, , -cp, /tmp:/bippy) ==> Settings {
+  -d = .
+  -deprecation = true
+  -classpath = /tmp:/bippy
+}
+
diff --git a/test/files/run/settings-parse.scala b/test/files/run/settings-parse.scala
new file mode 100644
index 0000000000..2b04f55b24
--- /dev/null
+++ b/test/files/run/settings-parse.scala
@@ -0,0 +1,27 @@
+import scala.tools.nsc._
+
+object Test {
+  val tokens        = List("", "-deprecation", "foo.scala")
+  val subsets       = tokens.toSet.subsets.toList
+  val permutations0 = subsets.flatMap(_.toList.permutations).distinct
+
+  def runWithCp(cp: String) = {
+    val permutations = permutations0 flatMap ("-cp CPTOKEN" :: _ permutations)
+
+    for ((p, i) <- permutations.distinct.sortBy(_ mkString "").zipWithIndex) {
+      val args           = p flatMap (_ split "\\s+") map (x => if (x == "CPTOKEN") cp else x)
+      val s              = new settings.MutableSettings(println)
+      val (ok, residual) = s.processArguments(args, processAll = true)
+
+      val expected = args filter (_ == "foo.scala")
+      assert(residual == expected, residual)
+      assert(ok, args)
+      println(s"$i) $args ==> $s")
+    }
+  }
+
+  def main(args0: Array[String]): Unit = {
+    runWithCp("")
+    runWithCp("/tmp:/bippy")
+  }
+}