diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-24 13:55:02 -0700 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-06-25 08:56:54 -0700 |
| commit | d863c7152cf8c363b4f9c086c62d28b37baf07ea (patch) | |
| tree | aa4199b059aa7632f268ab41fc3dac42507f8489 /src/partest | |
| parent | 2a17db002758379fe0b9ee2a4e41ac9e3ca6c30d (diff) | |
| download | scala-d863c7152cf8c363b4f9c086c62d28b37baf07ea.tar.gz scala-d863c7152cf8c363b4f9c086c62d28b37baf07ea.tar.bz2 scala-d863c7152cf8c363b4f9c086c62d28b37baf07ea.zip | |
Remove dependency on combinators from CommandLinerParser.
tools.cmd.CommandLineParser uses a small hand-rolled parser
TODO: replace partest's usage of scala.tools.nsc.util.CommandLine
by scala.tools.cmd.CommandLine
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/DirectTest.scala | 3 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/ConsoleRunner.scala | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/DirectTest.scala b/src/partest/scala/tools/partest/DirectTest.scala index 953b5e5535..2e6c3baa02 100644 --- a/src/partest/scala/tools/partest/DirectTest.scala +++ b/src/partest/scala/tools/partest/DirectTest.scala @@ -7,8 +7,9 @@ package scala.tools.partest import scala.tools.nsc._ import settings.ScalaVersion -import util.{ SourceFile, BatchSourceFile, CommandLineParser } +import util.{ SourceFile, BatchSourceFile } import reporters.{Reporter, ConsoleReporter} +import scala.tools.cmd.CommandLineParser /** A class for testing code which is embedded as a string. * It allows for more complete control over settings, compiler diff --git a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala index 8161e53bf9..33bf836a7b 100644 --- a/src/partest/scala/tools/partest/nest/ConsoleRunner.scala +++ b/src/partest/scala/tools/partest/nest/ConsoleRunner.scala @@ -9,7 +9,7 @@ package nest import utils.Properties._ import scala.tools.nsc.Properties.{ versionMsg, setProp } -import scala.tools.nsc.util.CommandLineParser +import scala.tools.nsc.util.CommandLine import scala.collection.{ mutable, immutable } import PathSettings.srcDir import TestKinds._ @@ -97,7 +97,7 @@ class ConsoleRunner extends DirectRunner { ) def main(argstr: String) { - val parsed = CommandLineParser(argstr) withUnaryArgs unaryArgs withBinaryArgs binaryArgs + val parsed = (new CommandLine(argstr)) withUnaryArgs unaryArgs withBinaryArgs binaryArgs if (parsed isSet "--debug") NestUI.setDebug() if (parsed isSet "--verbose") NestUI.setVerbose() |