add exit code tests, fix exit code for tastyprinter flag, improve temp file creation for expression for better error messages

Author: rochala

compiler/src/dotty/tools/dotc/core/tasty/TastyPrinter.scala

@@ -37,20 +37,22 @@ object TastyPrinter:
     for arg <- args do
       if arg == "-color:never" then () // skip
       else if arg.startsWith("-") then println(s"bad option '$arg' was ignored")
-      else if arg.endsWith(".tasty") then {
+      else if arg.endsWith(".tasty") then
         val path = Paths.get(arg)
-        if Files.exists(path) then printTasty(arg, Files.readAllBytes(path).nn)
-        else println("File not found: " + arg)
-      }
-      else if arg.endsWith(".jar") then {
+        if Files.exists(path) then
+          printTasty(arg, Files.readAllBytes(path).nn)
+        else
+          println("File not found: " + arg)
+          System.exit(1)
+      else if arg.endsWith(".jar") then
         val jar = JarArchive.open(Path(arg), create = false)
         try
           for file <- jar.iterator() if file.name.endsWith(".tasty") do
             printTasty(s"$arg ${file.path}", file.toByteArray)
         finally jar.close()
-
-      }
-      else println(s"Not a '.tasty' or '.jar' file: $arg")
+      else
+        println(s"Not a '.tasty' or '.jar' file: $arg")
+        System.exit(1)
 
     if printLastLine then
       println(line)

compiler/src/dotty/tools/io/Path.scala

@@ -170,7 +170,7 @@ class Path private[io] (val jpath: JPath) {
   // returns the filename without the extension.
   def stripExtension: String = name stripSuffix ("." + extension)
   // returns the Path with the extension.
-  def addExtension(ext: String): Path = new Path(jpath.resolveSibling(name + ext))
+  def addExtension(ext: String): Path = new Path(jpath.resolveSibling(name + "." + ext))
   // changes the existing extension out for a new one, or adds it
   // if the current path has none.
   def changeExtension(ext: String): Path =

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

@@ -43,11 +43,10 @@ object Main:
         // write a standalone jar to the script parent directory
         writeJarfile(outDir, scriptFile, scriptArgs, classpathEntries, mainClass)
       invokeFlag
-    } match
-      case Some(ex) =>
-        println(ex.getMessage)
-        sys.exit(1)
-      case _ =>
+    }.map {
+      case ScriptingException(msg) => println(msg)
+      case ex => ex.printStackTrace
+    }.foreach(_ => System.exit(1))
 
   private def writeJarfile(outDir: Path, scriptFile: File, scriptArgs:Array[String],
       classpathEntries:Seq[Path], mainClassName: String): Unit =

compiler/src/dotty/tools/scripting/StringDriver.scala

@@ -8,6 +8,7 @@ import dotty.tools.dotc.Driver
 import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ctx }
 import dotty.tools.io.{ PlainDirectory, Directory, ClassPath }
 import Util.*
+import dotty.tools.dotc.util.SourceFile
 
 class StringDriver(compilerArgs: Array[String], scalaSource: String) extends Driver:
   override def sourcesRequired: Boolean = false
@@ -18,11 +19,12 @@ class StringDriver(compilerArgs: Array[String], scalaSource: String) extends Dri
 
     setup(compilerArgs, initCtx.fresh) match
       case Some((toCompile, rootCtx)) =>
-        given Context = rootCtx.fresh.setSetting(rootCtx.settings.outputDir,
-          new PlainDirectory(Directory(outDir)))
+        given Context = rootCtx.fresh.setSetting(rootCtx.settings.outputDir, new PlainDirectory(Directory(outDir)))
 
         val compiler = newCompiler
-        compiler.newRun.compileFromStrings(List(scalaSource))
+
+        val source = SourceFile.virtual("expression", scalaSource)
+        compiler.newRun.compileSources(List(source))
 
         val output = ctx.settings.outputDir.value
         if ctx.reporter.hasErrors then
@@ -39,7 +41,7 @@ class StringDriver(compilerArgs: Array[String], scalaSource: String) extends Dri
               case Left(ex) => Some(ex)
           catch
             case e: java.lang.reflect.InvocationTargetException =>
-              throw e.getCause
+              Some(e.getCause)
           finally
             deleteFile(outDir.toFile)
       case None => None

compiler/test-resources/scripting/compileError.scala

@@ -0,0 +1 @@
+@main def compileError = prin

compiler/test-resources/scripting/positiveTest.scala

@@ -0,0 +1 @@
+@main def positiveTest = println("Hello World!")

compiler/test-resources/scripting/runtimeError.scala

@@ -0,0 +1 @@
+@main def runtimeError = throw RuntimeException()

compiler/test-resources/scripting/scriptCompileError.sc

@@ -0,0 +1 @@
+@main def main = prin

compiler/test-resources/scripting/scriptPositive.sc

@@ -0,0 +1 @@
+@main def scriptPositive = println("Hello world!")

compiler/test-resources/scripting/scriptRuntimeError.sc

@@ -0,0 +1 @@
+@main def scriptRuntimeError = throw RuntimeException()