diff options
author | Paul Phillips <paulp@improving.org> | 2010-02-10 19:51:38 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-02-10 19:51:38 +0000 |
commit | 6e76af56f708d345bda2fff580634107945ef3fb (patch) | |
tree | 563058a03d54463fbe9139e8f9f74db23a944400 /src/scalap | |
parent | 06ae221de943d7258dfa2ffcbc6c59fe9493497f (diff) | |
download | scala-6e76af56f708d345bda2fff580634107945ef3fb.tar.gz scala-6e76af56f708d345bda2fff580634107945ef3fb.tar.bz2 scala-6e76af56f708d345bda2fff580634107945ef3fb.zip |
More work on classpaths.
to have command line options following source files, at the price of
temporarily breaking tools/pathResolver. Working my way through all the
usages of classpath in trunk zeroing in on fully consistent handling.
Review by community.
Diffstat (limited to 'src/scalap')
-rw-r--r-- | src/scalap/scala/tools/scalap/Main.scala | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala index 90f1963d14..9534b2f84e 100644 --- a/src/scalap/scala/tools/scalap/Main.scala +++ b/src/scalap/scala/tools/scalap/Main.scala @@ -13,6 +13,7 @@ import java.io.{File, PrintStream, OutputStreamWriter, ByteArrayOutputStream} import scalax.rules.scalasig._ import tools.nsc.io.AbstractFile import tools.nsc.util.{ ClassPath, JavaClassPath } +import tools.util.PathResolver import ClassPath.DefaultJavaContext /**The main object used to execute scalap on the command-line. @@ -264,13 +265,8 @@ object Main { verbose = arguments contains "-verbose" printPrivates = arguments contains "-private" // construct a custom class path - val path = arguments.getArgument("-classpath") match { - case None => arguments.getArgument("-cp") match { - case None => EmptyClasspath - case Some(path) => new JavaClassPath("", "", path, "", "", DefaultJavaContext) - } - case Some(path) => new JavaClassPath("", "", path, "", "", DefaultJavaContext) - } + def cparg = List("-classpath", "-cp") map (arguments getArgument _) reduceLeft (_ orElse _) + val path = cparg map (PathResolver fromPathString _) getOrElse EmptyClasspath // print the classpath if output is verbose if (verbose) { Console.println(Console.BOLD + "CLASSPATH" + Console.RESET + " = " + path) |