Allow -cp argument to 'apply' command to be quoted. Fixes #724.

This commit is contained in:
Mark Harrah
2013-04-29 15:12:16 -04:00
parent f7476e4800
commit bb884ebe8b
3 changed files with 7 additions and 9 deletions
+3 -5
View File
@@ -96,11 +96,9 @@ object BasicCommands
token(base, compl)
}
private[this] def classpathOptionParser: Parser[Seq[String]] =
token( ("-cp" | "-classpath") ~> Space ) ~> rep1sep(classpathString, token(File.pathSeparatorChar)) <~ token(Space)
private[this] def classpathString: Parser[String] =
token(charClass(entryClass, "<classpath-entry>").+.string, "<classpath-entry>")
private[this] def entryClass(c: Char): Boolean =
c != File.pathSeparatorChar && !java.lang.Character.isWhitespace(c)
token( ("-cp" | "-classpath") ~> Space ) ~> classpathStrings <~ token(Space)
private[this] def classpathStrings: Parser[Seq[String]] =
token(StringBasic.map(s => IO.pathSplit(s).toSeq), "<classpath>")
def exit = Command.command(TerminateAction, exitBrief, exitBrief ) ( _ exit true )