Make -tasty a ScalaSettings flag and remove FromTasty

Author: nicolasstucki

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

@@ -6,6 +6,7 @@ import core.Contexts.{Context, ContextBase}
 import util.DotClass
 import reporting._
 import scala.util.control.NonFatal
+import fromtasty.TASTYCompiler
 
 /** Run the Dotty compiler.
  *
@@ -15,7 +16,9 @@ import scala.util.control.NonFatal
  */
 class Driver extends DotClass {
 
-  protected def newCompiler(implicit ctx: Context): Compiler = new Compiler
+  protected def newCompiler(implicit ctx: Context): Compiler =
+    if (ctx.settings.tasty.value) new TASTYCompiler
+    else new Compiler
 
   protected def emptyReporter: Reporter = new StoreReporter(null)
 

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

@@ -1,7 +1,5 @@
 package dotty.tools
 package dotc
 
-import core.Contexts.Context
-
 /** Main class of the `dotc` batch compiler. */
 object Main extends Driver

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

@@ -43,6 +43,7 @@ class ScalaSettings extends Settings.SettingGroup {
   val language = MultiStringSetting("-language", "feature", "Enable one or more language features.")
   val rewrite = OptionSetting[Rewrites]("-rewrite", "When used in conjunction with -language:Scala2 rewrites sources to migrate to new syntax")
   val silentWarnings = BooleanSetting("-nowarn", "Silence all warnings.")
+  val tasty = BooleanSetting("-tasty", "Compile classes from tasty in classpath. The arguments are used as class names.")
 
   /** -X "Advanced" settings
    */

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

@@ -395,7 +395,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
     protected def compileFromTasty(flags0: TestFlags, suppressErrors: Boolean, targetDir: JFile): TestReporter = {
       val tastyOutput = new JFile(targetDir.getPath + "_from-tasty")
       tastyOutput.mkdir()
-      val flags = flags0 and ("-d", tastyOutput.getAbsolutePath)
+      val flags = flags0 and ("-d", tastyOutput.getAbsolutePath) and "-tasty"
 
       def hasTastyFileToClassName(f: JFile): String =
         targetDir.toPath.relativize(f.toPath).toString.dropRight(".hasTasty".length).replace('/', '.')
@@ -405,9 +405,11 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         TestReporter.reporter(realStdout, logLevel =
           if (suppressErrors || suppressAllOutput) ERROR + 1 else ERROR)
 
+      val driver = new Driver
+
       // Compile with a try to catch any StackTrace generated by the compiler:
       try {
-        dotc.FromTasty.process(flags.all ++ classes, reporter = reporter)
+        driver.process(flags.all ++ classes, reporter = reporter)
       }
       catch {
         case NonFatal(ex) => reporter.logStackTrace(ex)

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -31,7 +31,6 @@ default_java_opts="-Xmx768m -Xms768m"
 bootcp=true
 
 CompilerMain=dotty.tools.dotc.Main
-FromTasty=dotty.tools.dotc.FromTasty
 ReplMain=dotty.tools.repl.Main
 
 PROG_NAME=$CompilerMain
@@ -82,7 +81,7 @@ case "$1" in
     # Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222
     -Oshort) addJava "-XX:+TieredCompilation -XX:TieredStopAtLevel=1" && shift ;;
         -repl) PROG_NAME="$ReplMain" && shift ;;
-       -tasty) addScala "-Yretain-trees" && PROG_NAME="$FromTasty" && shift ;;
+       -tasty) addScala "-Yretain-trees" && PROG_NAME="$CompilerMain" && shift ;;
      -compile) PROG_NAME="$CompilerMain" && shift ;;
          -run) PROG_NAME="$ReplMain" && shift ;;
       -bootcp) bootcp=true && shift ;;

dist/bin/dotc

@@ -523,8 +523,8 @@ object Build {
         }
       },
       run := dotc.evaluated,
-      dotc := runCompilerMain(Nil).evaluated,
-      repl := runCompilerMain(List("-repl")).evaluated,
+      dotc := runCompilerMain(false).evaluated,
+      repl := runCompilerMain(true).evaluated,
 
       // enable verbose exception messages for JUnit
       testOptions in Test += Tests.Argument(
@@ -618,17 +618,15 @@ object Build {
       }
   )
 
-  def runCompilerMain(otherArgs: List[String]) = Def.inputTaskDyn {
+  def runCompilerMain(repl: Boolean) = Def.inputTaskDyn {
     val dottyLib = packageAll.value("dotty-library")
-    val args0: List[String] = spaceDelimited("<arg>").parsed.toList ++ otherArgs
-    val args = args0.filter(arg => arg != "-tasty" && arg != "-repl")
+    val args0: List[String] = spaceDelimited("<arg>").parsed.toList
+    val args = args0.filter(arg => arg != "-repl")
 
-    val repl = args0.contains("-repl")
     val tasty = args0.contains("-tasty")
 
     val main =
       if (repl) "dotty.tools.repl.Main"
-      else if (tasty) "dotty.tools.dotc.FromTasty"
       else "dotty.tools.dotc.Main"
 
     val extraArgs =