Raised the level of abstraction (slightly, not ...

Raised the level of abstraction (slightly, not enough) on ClassPath by
defining the difference between optimized and regular classpaths in
terms of an arbitrary name filter instead of in terms of settings.XO.
Altered the decision logic to look at the value of -Yinline instead of
-optimise. Closes #2950. Review by rytz.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala
index 3a4779c6b7..338143f671 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, "", "", false)
+          case Some(path) => new JavaClassPath("", "", path, "", "")
         }
-        case Some(path) => new JavaClassPath("", "", path, "", "", false)
+        case Some(path) => new JavaClassPath("", "", path, "", "")
       }
       // print the classpath if output is verbose
       if (verbose) {
@@ -286,6 +286,6 @@ object Main {
     val classes: List[ClassRep] = Nil
     val packages: List[ClassPath[AbstractFile]] = Nil
     val sourcepaths: List[AbstractFile] = Nil
-    def isOptimized = false
+    val validName: String => Boolean = ClassPath.noTraitImplFilter
   }
 }