A more MSIL-aware attempt at isolating the plat...

A more MSIL-aware attempt at isolating the platform dependent pieces
of Global and ClassPath so we don't introduce unwanted dependencies.
Introduces a small interface backend.Platform which encapsulates that
data. Review by rytz, odersky.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/scalap/scala/tools/scalap/Main.scala b/src/scalap/scala/tools/scalap/Main.scala
index 28e48a34d0..90f1963d14 100644
--- a/src/scalap/scala/tools/scalap/Main.scala
+++ b/src/scalap/scala/tools/scalap/Main.scala
@@ -12,7 +12,8 @@ package scala.tools.scalap
 import java.io.{File, PrintStream, OutputStreamWriter, ByteArrayOutputStream}
 import scalax.rules.scalasig._
 import tools.nsc.io.AbstractFile
-import tools.nsc.util.{ClassPath, JavaClassPath}
+import tools.nsc.util.{ ClassPath, JavaClassPath }
+import ClassPath.DefaultJavaContext
 
 /**The main object used to execute scalap on the command-line.
  *
@@ -266,9 +267,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, "", "", DefaultJavaContext)
         }
-        case Some(path) => new JavaClassPath("", "", path, "", "")
+        case Some(path) => new JavaClassPath("", "", path, "", "", DefaultJavaContext)
       }
       // print the classpath if output is verbose
       if (verbose) {
@@ -284,9 +285,9 @@ object Main {
      * The short name of the package (without prefix)
      */
     def name: String = ""
+    val context = DefaultJavaContext
     val classes: List[ClassRep] = Nil
     val packages: List[ClassPath[AbstractFile]] = Nil
     val sourcepaths: List[AbstractFile] = Nil
-    val validName: String => Boolean = ClassPath.noTraitImplFilter
   }
 }