Merge pull request #2313 from dotty-staging/topic/kill-reflect-io

Kill reflect io

Author: felixmulder

bin/common

@@ -115,6 +115,11 @@ else
         echo "Failed to parse .packages file"
         build_all
     fi
+
+    if [ ! -f "$INTERFACES_JAR" -o ! -f "$MAIN_JAR" -o ! -f "$DOTTY_LIB_JAR" -o ! -f "$TEST_JAR" ]; then
+        echo ".packages file corrupted, rebuilding"
+        build_all
+    fi
 fi
 
 ################# After this point, jar variables will be set #################
@@ -142,10 +147,6 @@ if [ "$SCALA_LIBRARY_JAR" == "" ]; then
     SCALA_LIBRARY_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-lang/scala-library/jars" "scala-library-$SCALA_VERSION.jar")
 fi
 
-if [ "$SCALA_REFLECT_JAR" == "" ]; then
-    SCALA_REFLECT_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-lang/scala-reflect/jars" "scala-reflect-$SCALA_VERSION.jar")
-fi
-
 if [ "$SCALA_ASM_JAR" == "" ]; then
     SCALA_ASM_JAR=$(find_jar "$HOME/.ivy2/cache/org.scala-lang.modules/scala-asm/bundles" "scala-asm-$SCALA_ASM_VERSION.jar")
 fi

bin/dotc

@@ -20,11 +20,10 @@ CompilerMain=dotty.tools.dotc.Main
 FromTasty=dotty.tools.dotc.FromTasty
 ReplMain=dotty.tools.dotc.repl.Main
 
-if [ ! -f "$SCALA_LIBRARY_JAR" -o ! -f "$SCALA_REFLECT_JAR"  -o ! -f "$SCALA_ASM_JAR" -o ! -f "$SBT_INTERFACE_JAR" ]
+if [ ! -f "$SCALA_LIBRARY_JAR" -o ! -f "$SCALA_ASM_JAR" -o ! -f "$SBT_INTERFACE_JAR" ]
 then
   echo To use this script please set
   echo SCALA_LIBRARY_JAR to point to scala-library-$SCALA_VERSION.jar "(currently $SCALA_LIBRARY_JAR)"
-  echo SCALA_REFLECT_JAR to point to scala-reflect-$SCALA_VERSION.jar "(currently $SCALA_REFLECT_JAR)"
   echo SCALA_ASM_JAR to point to scala-asm-$SCALA_ASM_VERSION.jar "(currently $SCALA_ASM_JAR)"
   echo SBT_INTERFACE_JAR to point to interface-$SBT_VERSION.jar "(currently $SBT_INTERFACE_JAR)"
 fi
@@ -116,9 +115,9 @@ trap onExit INT
 classpathArgs () {
   if [[ "true" == "$bootstrapped" ]]; then
     check_jar "dotty-bootstrapped" "$DOTTY_JAR" "target" 'build_jar "test:runMain dotc.build" target' &> /dev/null
-    toolchain="$DOTTY_JAR:$DOTTY_LIB_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_ASM_JAR:$SBT_INTERFACE_JAR"
+    toolchain="$DOTTY_JAR:$DOTTY_LIB_JAR:$SCALA_LIBRARY_JAR:$SCALA_ASM_JAR:$SBT_INTERFACE_JAR"
   else
-    toolchain="$SCALA_LIBRARY_JAR:$DOTTY_LIB_JAR:$SCALA_REFLECT_JAR:$SCALA_ASM_JAR:$SBT_INTERFACE_JAR"
+    toolchain="$SCALA_LIBRARY_JAR:$DOTTY_LIB_JAR:$SCALA_ASM_JAR:$SBT_INTERFACE_JAR"
   fi
   bcpJars="$INTERFACES_JAR:$MAIN_JAR:$DOTTY_LIB_JAR"
   cpJars="$INTERFACES_JAR:$MAIN_JAR:$DOTTY_LIB_JAR:$TEST_JAR"

bin/test/TestScripts.scala

@@ -17,9 +17,8 @@ class TestScripts {
 
   private def executeScript(script: String): (Int, String) = {
     val sb = new StringBuilder
-    val ret = Process(script) ! ProcessLogger { line => println(line); sb.append(line) }
+    val ret = Process(script) ! ProcessLogger { line => println(line); sb.append(line + "\n") }
     val output = sb.toString
-    println(output) // For CI, otherwise "terminal inactive for 5m0s, build cancelled"
     (ret, output)
   }
 
@@ -59,7 +58,7 @@ class TestScripts {
 
     val (retDotr, dotrOutput) = executeScript("./bin/dotr HelloWorld")
     assert(
-      retDotr == 0 && dotrOutput == "hello world",
+      retDotr == 0 && dotrOutput == "hello world\n",
       s"Running hello world exited with status: $retDotr and output: $dotrOutput"
     )
   }
@@ -93,8 +92,19 @@ class TestScripts {
 
   /** dotc script should work after corrupting .packages */
   @Test def reCreatesPackagesIfNecessary = doUnlessWindows {
-    executeScript("sed -i.old 's/2.1/2.X/' ./.packages") // That's going to replace 2.11 with 2.X1
-    val (retFirstBuild, _) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
+    import java.nio.file.{Paths, Files}
+    import java.nio.charset.StandardCharsets
+    val contents =
+      """|/Users/fixel/Projects/dotty/interfaces/target/dotty-interfaces-0.1.1-bin-SNAPSHOT-X.jar
+         |/Users/fixel/Projects/dotty/compiler/target/scala-2.11/dotty-compiler_2.1X-0.1.1-bin-SNAPSHOT.jar
+         |/Users/fixel/Projects/dotty/library/target/scala-2.11/dotty-library_2.1X-0.1.1-bin-SNAPSHOT.jar
+         |/Users/fixel/Projects/dotty/doc-tool/target/scala-2.11/dotty-doc_2.1X-0.1.1-bin-SNAPSHOT-tests.jar"""
+      .stripMargin
+
+    Files.write(Paths.get("./.packages"), contents.getBytes(StandardCharsets.UTF_8))
+
+    val (retFirstBuild, output) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
+    assert(output.contains(".packages file corrupted"))
     assert(retFirstBuild == 0, "building dotc failed")
   }
 }

compiler/sjs/backend/sjs/JSCodeGen.scala

@@ -182,7 +182,7 @@ class JSCodeGen()(implicit ctx: Context) {
 
   private def getFileFor(cunit: CompilationUnit, sym: Symbol,
       suffix: String) = {
-    import scala.reflect.io._
+    import dotty.tools.io._
 
     val outputDirectory: AbstractFile = // TODO Support virtual files
       new PlainDirectory(new Directory(new java.io.File(ctx.settings.d.value)))

compiler/src/dotty/tools/backend/jvm/CollectEntryPoints.scala

@@ -15,7 +15,7 @@ import java.io.{File => JFile}
 import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.reflect.ClassTag
-import scala.reflect.io.{Directory, PlainDirectory, AbstractFile}
+import dotty.tools.io.{Directory, PlainDirectory, AbstractFile}
 import scala.tools.asm.{ClassVisitor, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
 import dotty.tools.dotc.core._

compiler/src/dotty/tools/backend/jvm/DottyBackendInterface.scala

@@ -12,7 +12,7 @@ import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.reflect.ClassTag
 import scala.reflect.internal.util.WeakHashSet
-import scala.reflect.io.{AbstractFile, Directory, PlainDirectory}
+import dotty.tools.io.{AbstractFile, Directory, PlainDirectory}
 import scala.tools.asm.{AnnotationVisitor, ClassVisitor, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
 import dotty.tools.dotc.core._

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -33,7 +33,7 @@ import dotty.tools.dotc.util.{DotClass, Positions}
 import tpd._
 import StdNames._
 
-import scala.reflect.io.{AbstractFile, Directory, PlainDirectory}
+import dotty.tools.io.{AbstractFile, Directory, PlainDirectory}
 
 class GenBCode extends Phase {
   def phaseName: String = "genBCode"
@@ -62,10 +62,10 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
 
   val sourceFile = ctx.compilationUnit.source
 
-  /** Convert a `scala.reflect.io.AbstractFile` into a
+  /** Convert a `dotty.tools.io.AbstractFile` into a
    *  `dotty.tools.dotc.interfaces.AbstractFile`.
    */
-  private[this] def convertAbstractFile(absfile: scala.reflect.io.AbstractFile): interfaces.AbstractFile =
+  private[this] def convertAbstractFile(absfile: dotty.tools.io.AbstractFile): interfaces.AbstractFile =
     new interfaces.AbstractFile {
       override def name = absfile.name
       override def path = absfile.path

compiler/src/dotty/tools/backend/jvm/LabelDefs.scala

@@ -16,7 +16,7 @@ import scala.collection.generic.Clearable
 import scala.collection.mutable
 import scala.collection.mutable.{ListBuffer, ArrayBuffer}
 import scala.reflect.ClassTag
-import scala.reflect.io.{Directory, PlainDirectory, AbstractFile}
+import dotty.tools.io.{Directory, PlainDirectory, AbstractFile}
 import scala.tools.asm.{ClassVisitor, FieldVisitor, MethodVisitor}
 import scala.tools.nsc.backend.jvm.{BCodeHelpers, BackendInterface}
 import dotty.tools.dotc.core._

compiler/src/dotty/tools/dotc/Run.scala

@@ -18,7 +18,7 @@ import java.io.{BufferedWriter, OutputStreamWriter}
 import printing.XprintMode
 
 import scala.annotation.tailrec
-import scala.reflect.io.VirtualFile
+import dotty.tools.io.VirtualFile
 import scala.util.control.NonFatal
 
 /** A compiler run. Exports various methods to compile source files */

compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala

@@ -1,15 +1,13 @@
 /*
  * Copyright (c) 2014 Contributor. All rights reserved.
  */
-package dotty.tools.dotc.classpath
+package dotty.tools
+package dotc.classpath
 
 import java.net.URL
 import scala.annotation.tailrec
 import scala.collection.mutable.ArrayBuffer
-import scala.reflect.internal.FatalError
-import scala.reflect.io.AbstractFile
-import dotty.tools.io.ClassPath
-import dotty.tools.io.ClassRepresentation
+import dotty.tools.io.{ AbstractFile, ClassPath, ClassRepresentation }
 
 /**
  * A classpath unifying multiple class- and sourcepath entries.