Move sjs, make sure that partest compiles everything in dirs

Author: felixmulder

src/scalaShadowing/language.scala renamed to library/src/scalaShadowing/language.scala

@@ -25,18 +25,18 @@ package scalaShadowing
  *   - [[higherKinds         `higherKinds`]]         enables writing higher-kinded types
  *   - [[existentials        `existentials`]]        enables writing existential types
  *   - [[experimental        `experimental`]]        contains newer features that have not yet been tested in production
- *   
+ *
  *  and, for dotty:
- *  
+ *
  *   - [[Scala2              `Scala2`]               backwards compatibility mode for Scala2
- *   - [[noAtoTupling        `noAutoTupling`]]       disable auto-tupling   
+ *   - [[noAtoTupling        `noAutoTupling`]]       disable auto-tupling
  *
  *  @groupname production   Language Features
  *  @groupname experimental Experimental Language Features
  *  @groupprio experimental 10
- *  
+ *
  *  Dotty-specific features come at the end.
- *  
+ *
  *  Note: Due to the more restricted language import mechanism in dotty (only
  *  imports count, implicits are disregarded) we don't need the constructions
  *  of the inherited language features. A simple object for each feature is
@@ -189,10 +189,10 @@ object language {
      */
     @volatile implicit lazy val macros: macros = languageFeature.experimental.macros
   }
-  
+
   /** Where imported, a backwards compatibility mode for Scala2 is enabled */
   object Scala2
-  
+
   /** Where imported, auto-tupling is disabled */
   object noAutoTupling
 }

project/Build.scala

@@ -135,9 +135,13 @@ object DottyBuild extends Build {
         // command line arguments get passed to the last task in an aliased
         // sequence (see partest alias below), so this works.
         val args = Def.spaceDelimited("<arg>").parsed
-        val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++
-            getJarPaths(partestDeps.value, ivyPaths.value.ivyHome)
-        val dottyJars  = "-dottyJars " + (jars.length + 1) + " dotty-lib.jar" + " " + jars.mkString(" ")
+        val jars = List(
+          (packageBin in Compile).value.getAbsolutePath,
+          (packageBin in (`dotty-library`, Compile)).value.getAbsolutePath,
+          (packageBin in (`dotty-interfaces`, Compile)).value.getAbsolutePath
+        ) ++ getJarPaths(partestDeps.value, ivyPaths.value.ivyHome)
+        val dottyJars  =
+          s"""-dottyJars ${jars.length + 2} dotty.jar dotty-lib.jar ${jars.mkString(" ")}"""
         // Provide the jars required on the classpath of run tests
         runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" "))
       },
@@ -147,32 +151,33 @@ object DottyBuild extends Build {
        * of scalajs-ir built with a different Scala compiler, we add its
        * sources instead of depending on the binaries.
        */
-      ivyConfigurations += config("sourcedeps").hide,
-      libraryDependencies +=
-        "org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps",
-      sourceGenerators in Compile += Def.task {
-        val s = streams.value
-        val cacheDir = s.cacheDirectory
-        val trgDir = (sourceManaged in Compile).value / "scalajs-ir-src"
-
-        val report = updateClassifiers.value
-        val scalaJSIRSourcesJar = report.select(
-            configuration = Set("sourcedeps"),
-            module = (_: ModuleID).name.startsWith("scalajs-ir_"),
-            artifact = artifactFilter(`type` = "src")).headOption.getOrElse {
-          sys.error(s"Could not fetch scalajs-ir sources")
-        }
-
-        FileFunction.cached(cacheDir / s"fetchScalaJSIRSource",
-            FilesInfo.lastModified, FilesInfo.exists) { dependencies =>
-          s.log.info(s"Unpacking scalajs-ir sources to $trgDir...")
-          if (trgDir.exists)
-            IO.delete(trgDir)
-          IO.createDirectory(trgDir)
-          IO.unzip(scalaJSIRSourcesJar, trgDir)
-          (trgDir ** "*.scala").get.toSet
-        } (Set(scalaJSIRSourcesJar)).toSeq
-      }.taskValue,
+      //TODO: disabling until moved to separate project
+      //ivyConfigurations += config("sourcedeps").hide,
+      //libraryDependencies +=
+      //  "org.scala-js" %% "scalajs-ir" % scalaJSVersion % "sourcedeps",
+      //sourceGenerators in Compile += Def.task {
+      //  val s = streams.value
+      //  val cacheDir = s.cacheDirectory
+      //  val trgDir = (sourceManaged in Compile).value / "scalajs-ir-src"
+
+      //  val report = updateClassifiers.value
+      //  val scalaJSIRSourcesJar = report.select(
+      //      configuration = Set("sourcedeps"),
+      //      module = (_: ModuleID).name.startsWith("scalajs-ir_"),
+      //      artifact = artifactFilter(`type` = "src")).headOption.getOrElse {
+      //    sys.error(s"Could not fetch scalajs-ir sources")
+      //  }
+
+      //  FileFunction.cached(cacheDir / s"fetchScalaJSIRSource",
+      //      FilesInfo.lastModified, FilesInfo.exists) { dependencies =>
+      //    s.log.info(s"Unpacking scalajs-ir sources to $trgDir...")
+      //    if (trgDir.exists)
+      //      IO.delete(trgDir)
+      //    IO.createDirectory(trgDir)
+      //    IO.unzip(scalaJSIRSourcesJar, trgDir)
+      //    (trgDir ** "*.scala").get.toSet
+      //  } (Set(scalaJSIRSourcesJar)).toSeq
+      //}.taskValue,
 
       // Adjust classpath for running dotty
       mainClass in (Compile, run) := Some("dotty.tools.dotc.Main"),
@@ -185,29 +190,34 @@ object DottyBuild extends Build {
 
       // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
       javaOptions <++= (dependencyClasspath in Runtime, packageBin in Compile) map { (attList, bin) =>
-        // put the Scala {library, reflect} in the classpath
+        // put needed dependencies on classpath:
         val path = for {
           file <- attList.map(_.data)
           path = file.getAbsolutePath
+          // FIXME: when we snip the cord, this should go bye-bye
+          if path.contains("scala-library") ||
+            // FIXME: currently needed for tests referencing scalac internals
+            path.contains("scala-reflect") ||
+            // FIXME: currently needed for tests referencing scalac internals
+            path.contains("scala-compile") ||
+            // FIXME: should go away when xml literal parsing is removed
+            path.contains("scala-xml") ||
+            // needed for the xsbti interface
+            path.contains("sbt-interface")
         } yield "-Xbootclasspath/p:" + path
-        // dotty itself needs to be in the bootclasspath
-        val fullpath = /*("-Xbootclasspath/p:" + "dotty.jar") ::*/ ("-Xbootclasspath/a:" + bin) :: path.toList
-        // System.err.println("BOOTPATH: " + fullpath)
 
         val travis_build = // propagate if this is a travis build
           if (sys.props.isDefinedAt(JENKINS_BUILD))
             List(s"-D$JENKINS_BUILD=${sys.props(JENKINS_BUILD)}") ::: jenkinsMemLimit
-          else
-            List()
+          else List()
 
         val tuning =
           if (sys.props.isDefinedAt("Oshort"))
             // Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222
             List("-XX:+TieredCompilation", "-XX:TieredStopAtLevel=1")
-          else
-            List()
+          else List()
 
-        ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: fullpath
+        ("-DpartestParentID=" + pid) :: tuning ::: agentOptions ::: travis_build ::: path.toList
       }
     ).
     settings(

src/dotty/tools/backend/sjs/GenSJSIR.scala renamed to sjs/backend/sjs/GenSJSIR.scala

@@ -17,7 +17,6 @@ import core.DenotTransformers.DenotTransformer
 import core.Denotations.SingleDenotation
 
 import dotty.tools.backend.jvm.{LabelDefs, GenBCode, CollectSuperCalls}
-import dotty.tools.backend.sjs.GenSJSIR
 
 /** The central class of the dotc compiler. The job of a compiler is to create
  *  runs, which process given `phases` in a given `rootContext`.
@@ -98,7 +97,6 @@ class Compiler {
            new DropInlined,         // Drop Inlined nodes, since backend has no use for them
            new MoveStatics,         // Move static methods to companion classes
            new LabelDefs),          // Converts calls to labels to jumps
-      List(new GenSJSIR),           // Generate .js code
       List(new GenBCode)            // Generate JVM bytecode
     )
 
@@ -117,20 +115,7 @@ class Compiler {
    */
   def rootContext(implicit ctx: Context): Context = {
     ctx.initialize()(ctx)
-    val actualPhases = if (ctx.settings.scalajs.value) {
-      // Remove phases that Scala.js does not want
-      phases.mapConserve(_.filter {
-        case _: FunctionalInterfaces => false
-        case _ => true
-      }).filter(_.nonEmpty)
-    } else {
-      // Remove Scala.js-related phases
-      phases.mapConserve(_.filter {
-        case _: GenSJSIR => false
-        case _ => true
-      }).filter(_.nonEmpty)
-    }
-    ctx.setPhasePlan(actualPhases)
+    ctx.setPhasePlan(phases)
     val rootScope = new MutableScope
     val bootstrap = ctx.fresh
       .setPeriod(Period(nextRunId, FirstPhaseId))

src/dotty/tools/backend/sjs/JSCodeGen.scala renamed to sjs/backend/sjs/JSCodeGen.scala

@@ -46,18 +46,7 @@ object PathResolver {
     def classPathEnv        =  envOrElse("CLASSPATH", "")
     def sourcePathEnv       =  envOrElse("SOURCEPATH", "")
 
-    def javaBootClassPath   =
-      propOrElse("sun.boot.class.path", searchForBootClasspath)
-        .split(":")
-        .filterNot { jar =>
-          // let's blacklist locally compiled classes:
-          jar.contains("/dotty/library/target/classes") ||
-          jar.contains("/dotty/library/target/scala-2.11/classes") ||
-          jar.contains("/dotty/interfaces/target/classes") ||
-          jar.contains("/dotty/target/scala-2.11/classes") ||
-          jar.contains("/dotty/target/classes")
-        }
-        .mkString(":")
+    def javaBootClassPath   = propOrElse("sun.boot.class.path", searchForBootClasspath)
 
     def javaExtDirs         = propOrEmpty("java.ext.dirs")
     def scalaHome           = propOrEmpty("scala.home")
@@ -266,8 +255,15 @@ class PathResolver(implicit ctx: Context) {
   def containers = Calculated.containers
 
   lazy val result: JavaClassPath = {
-    val (dottyJars, others) = containers.partition(_.name.contains("dotty"))
-    val cp = new JavaClassPath((dottyJars ++ others).toIndexedSeq, context)
+    // Prioritize `dotty.jar` and `dotty-lib.jar` to shadow others
+    val (dottyJars, others) =
+      containers.partition(x => x.name.contains("dotty-lib.jar") || x.name.contains("dotty.jar"))
+    // Then any jars with `dotty` in the name - putting them before scala-library
+    val (dottyCp, remaining) =
+      others.partition(_.name.contains("dotty-"))
+
+    val cp = new JavaClassPath((dottyJars ++ dottyCp ++ remaining).toIndexedSeq, context)
+
     if (settings.Ylogcp.value) {
       Console.println("Classpath built from " + settings.toConciseString(ctx.sstate))
       Console.println("Defaults: " + PathResolver.Defaults)

src/dotty/tools/backend/sjs/JSDefinitions.scala renamed to sjs/backend/sjs/JSDefinitions.scala

@@ -27,7 +27,7 @@ import reporting._
 import collection.mutable
 import collection.immutable.BitSet
 import printing._
-import config.{Settings, ScalaSettings, Platform, JavaPlatform, SJSPlatform}
+import config.{Settings, ScalaSettings, Platform, JavaPlatform}
 import language.implicitConversions
 import DenotTransformers.DenotTransformer
 import util.Property.Key
@@ -550,8 +550,7 @@ object Contexts {
     }
 
     protected def newPlatform(implicit ctx: Context): Platform =
-      if (settings.scalajs.value) new SJSPlatform
-      else new JavaPlatform
+      new JavaPlatform
 
     /** The loader that loads the members of _root_ */
     def rootLoader(root: TermSymbol)(implicit ctx: Context): SymbolLoader = platform.rootLoader(root)

src/dotty/tools/backend/sjs/JSEncoding.scala renamed to sjs/backend/sjs/JSEncoding.scala

@@ -3,6 +3,7 @@ package dotc
 import test._
 import org.junit.{Before, Test}
 
+import java.io.{ File => JFile }
 import scala.reflect.io.Directory
 import scala.io.Source
 
@@ -23,20 +24,34 @@ class tests extends CompilerTest {
     "-d", defaultOutputDir
   )
 
-  val classPath = List(
+  val checkOptions = List(
     "-Yno-deep-subtypes",
     "-Yno-double-bindings",
     "-Yforce-sbt-phases",
-    "-color:never",
-    "-classpath",
-    "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar" +
-    ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar"
+    "-color:never"
   )
 
+  val classPath = {
+    val paths = List(
+      "./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar",
+      "./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar",
+      "./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar"
+    ).map { p =>
+      val file = new JFile(p)
+      assert(
+        file.exists,
+        s"""File "$p" couldn't be found. Run `packageAll` from build tool before testing"""
+      )
+      file.getAbsolutePath
+    }.mkString(":")
+
+    List("-classpath", paths)
+  }
+
   implicit val defaultOptions = noCheckOptions ++ {
     if (isRunByJenkins) List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef") // should be Ycheck:all, but #725
     else List("-Ycheck:tailrec,resolveSuper,mixin,restoreScopes,labelDef")
-  } ++ classPath
+  } ++ checkOptions ++ classPath
 
   val testPickling = List("-Xprint-types", "-Ytest-pickler", "-Ystop-after:pickler", "-Yprintpos")
 
@@ -189,32 +204,10 @@ class tests extends CompilerTest {
   @Test def compileIndexedSeq = compileLine("./scala-scala/src/library/scala/collection/immutable/IndexedSeq.scala")
 
   // Not a junit test anymore since it is order dependent
-  def dottyBootedLib = compileDir(
-    libDir,
-    ".",
-    List(
-      "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir +
-      ":./target/scala-2.11/dotty-compiler_2.11-0.1-SNAPSHOT.jar" +
-      ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" +
-      ":./library/target/scala-2.11/dotty-library_2.11-0.1-SNAPSHOT.jar"
-    )
-  )(allowDeepSubtypes) // note the -deep argument
+  def dottyBootedLib = compileDir(libDir, ".")(allowDeepSubtypes) // note the -deep argument
 
   // Not a junit test anymore since it is order dependent
-  def dottyDependsOnBootedLib = compileDir(
-    dottyDir,
-    ".",
-    List(
-      "-deep", "-Ycheck-reentrant", "-strict", "-classpath", defaultOutputDir +
-      ":./dotty-lib.jar" +
-      ":./interfaces/target/dotty-interfaces-0.1-SNAPSHOT.jar" +
-      // this needs to get compiled together with the compiler:
-      //":./target/scala-2.11/src_managed/main/scalajs-ir-src/"
-      // but falling back to:
-      ":/home/fixel/.ivy2/cache/org.scala-js/scalajs-ir_2.11/jars/scalajs-ir_2.11-0.6.8.jar"
-      // for the time being.
-    )
-  )(allowDeepSubtypes) // note the -deep argument
+  @Test def dottyDependsOnBootedLib = compileDir(dottyDir, ".")(allowDeepSubtypes) // note the -deep argument
 
   @Test def dotc_ast = compileDir(dotcDir, "ast")
   @Test def dotc_config = compileDir(dotcDir, "config")
@@ -279,7 +272,7 @@ class tests extends CompilerTest {
     "scalaPrimitives.scala"
   ) map (s"${backendDir}jvm/" + _), testPickling)
 
-  @Test def tasty_backend_sjs = compileDir(s"${backendDir}", "sjs", testPickling)
+  //@Test def tasty_backend_sjs = compileDir(s"${backendDir}", "sjs", testPickling)
 
   @Test def tasty_dotc = compileDir(toolsDir, "dotc", testPickling)
   @Test def tasty_dotc_ast = compileDir(dotcDir, "ast", testPickling)