diff options
author | Paul Phillips <paulp@improving.org> | 2010-03-05 14:30:44 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-03-05 14:30:44 +0000 |
commit | 34b2093601b4047d27d848df603895629ed31c0e (patch) | |
tree | 73a1162670af52904552deed7cf5049a0350c1e6 | |
parent | 4e7fd5ce080a42fb4c6eeba5f8a005bd973d6c8e (diff) | |
download | scala-34b2093601b4047d27d848df603895629ed31c0e.tar.gz scala-34b2093601b4047d27d848df603895629ed31c0e.tar.bz2 scala-34b2093601b4047d27d848df603895629ed31c0e.zip |
Removed quotes from quoted tokens in command li...
Removed quotes from quoted tokens in command line parser to soothe
Windows. Review by community.
-rw-r--r-- | src/compiler/scala/tools/nsc/util/CommandLineParser.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/util/CommandLineParser.scala b/src/compiler/scala/tools/nsc/util/CommandLineParser.scala index 680c2130d7..a640b36477 100644 --- a/src/compiler/scala/tools/nsc/util/CommandLineParser.scala +++ b/src/compiler/scala/tools/nsc/util/CommandLineParser.scala @@ -93,8 +93,9 @@ object CommandLineParser extends RegexParsers with ParserUtil { | failure("Unmatched %s in input." format ch) ) - lazy val squoted: Parser[String] = mkQuoted('\'') ^^ (x => "'%s'" format x) - lazy val dquoted: Parser[String] = mkQuoted('"') ^^ (x => "\"" + x + "\"") + /** Apparently windows can't deal with the quotes sticking around. */ + lazy val squoted: Parser[String] = mkQuoted('\'') // ^^ (x => "'%s'" format x) + lazy val dquoted: Parser[String] = mkQuoted('"') // ^^ (x => "\"" + x + "\"") lazy val token: Parser[String] = """\S+""".r lazy val argument: Parser[String] = squoted | dquoted | token |