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.

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
   }
 }