diff options
author | Paul Phillips <paulp@improving.org> | 2010-01-20 05:51:12 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-01-20 05:51:12 +0000 |
commit | 2d487cd460dd5b5064383ebf968d6fb47c7c696d (patch) | |
tree | a06fa506cc9d77083af0b2d564689efe3be4e59b /src/scalap | |
parent | a3d41894e7efd4be5c9e9ce50dec8f116c3c0fc3 (diff) | |
download | scala-2d487cd460dd5b5064383ebf968d6fb47c7c696d.tar.gz scala-2d487cd460dd5b5064383ebf968d6fb47c7c696d.tar.bz2 scala-2d487cd460dd5b5064383ebf968d6fb47c7c696d.zip |
Removed static state from global object ClassPa...
Removed static state from global object ClassPath object, and some minor
repositioning while in there. Closes #2928, but the intentions behind
-optimise being intertwined with ClassPath could really use some source
comments. Review by rytz.
Diffstat (limited to 'src/scalap')
-rw-r--r-- | src/scalap/scala/tools/scalap/Main.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala index 59c46df25f..dcc028d489 100644 --- a/src/scalap/scala/tools/scalap/Main.scala +++ b/src/scalap/scala/tools/scalap/Main.scala @@ -265,9 +265,9 @@ object Main { val path = arguments.getArgument("-classpath") match { case None => arguments.getArgument("-cp") match { case None => EmptyClasspath - case Some(path) => new JavaClassPath("", "", path, "", "") + case Some(path) => new JavaClassPath("", "", path, "", "", false) } - case Some(path) => new JavaClassPath("", "", path, "", "") + case Some(path) => new JavaClassPath("", "", path, "", "", false) } // print the classpath if output is verbose if (verbose) { @@ -287,5 +287,6 @@ object Main { val classes: List[ClassRep[AbstractFile]] = Nil val packages: List[ClassPath[AbstractFile]] = Nil val sourcepaths: List[AbstractFile] = Nil + def isOptimized = false } } |