remove unused code; reduce scope of when Windows classpath unglobbing occurs

Author: philwalk

compiler/src/dotty/tools/MainGenericRunner.scala

@@ -105,17 +105,17 @@ object MainGenericRunner {
     case "-run" :: fqName :: tail =>
       process(tail, settings.withExecuteMode(ExecuteMode.Run).withTargetToRun(fqName))
     case ("-cp" | "-classpath" | "--class-path") :: cp :: tail =>
-      val (tailargs, cpstr) = if classpathSeparator != ";" || cp.contains(classpathSeparator) then
+      val globdir = cp.replaceAll("[\\/][^\\/]*$","") // slash/backslash agnostic
+      val (tailargs, cpstr) = if globdir.nonEmpty && classpathSeparator != ";" || cp.contains(classpathSeparator) then
         (tail, cp)
       else
         // combine globbed classpath entries into a classpath
-        val globdir = cp.replaceAll("[\\/][^\\/]*$","") // must be forward-backward-slash-agnostic
         val jarfiles = cp :: tail
         val cpfiles = jarfiles.takeWhile( f => f.startsWith(globdir) && ((f.toLowerCase.endsWith(".jar") || f.endsWith(".zip"))) )
         val tailargs = jarfiles.drop(cpfiles.size)
         (tailargs, cpfiles.mkString(classpathSeparator))
 
-      process(tailargs, settings.copy(classPath = settings.classPath.appended(cpstr)))
+      process(tailargs, settings.copy(classPath = settings.classPath ++ cpstr.split(classpathSeparator).filter(_.nonEmpty)))
 
     case ("-version" | "--version") :: _ =>
       settings.copy(
@@ -201,7 +201,6 @@ object MainGenericRunner {
         }
         errorFn("", res)
       case ExecuteMode.Script =>
-        val targetScriptPath: String = settings.targetScript.toString.replace('\\', '/')
         val properArgs =
           List("-classpath", settings.classPath.mkString(classpathSeparator)).filter(Function.const(settings.classPath.nonEmpty))
             ++ settings.residualArgs