implement scalac script in Scala #15212
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| package dotty.tools | ||
|
|
||
| import scala.language.unsafeNulls | ||
|
|
||
| import scala.annotation.tailrec | ||
| import scala.io.Source | ||
| import scala.util.Try | ||
| import java.io.File | ||
| import java.lang.Thread | ||
| import scala.annotation.internal.sharable | ||
| import dotty.tools.dotc.util.ClasspathFromClassloader | ||
| import dotty.tools.runner.ObjectRunner | ||
| import dotty.tools.dotc.config.Properties.envOrNone | ||
| import dotty.tools.io.Jar | ||
| import dotty.tools.runner.ScalaClassLoader | ||
| import java.nio.file.Paths | ||
| import dotty.tools.dotc.config.CommandLineParser | ||
| import dotty.tools.scripting.StringDriver | ||
|
|
||
| enum CompileMode: | ||
| case Guess | ||
| case Compile | ||
| case Decompile | ||
| case PrintTasty | ||
| case Script | ||
| case Repl | ||
| case Run | ||
|
|
||
| case class CompileSettings( | ||
| verbose: Boolean = false, | ||
| classPath: List[String] = List.empty, | ||
| compileMode: CompileMode = CompileMode.Guess, | ||
| exitCode: Int = 0, | ||
| javaArgs: List[String] = List.empty, | ||
| javaProps: List[(String, String)] = List.empty, | ||
| scalaArgs: List[String] = List.empty, | ||
| residualArgs: List[String] = List.empty, | ||
| scriptArgs: List[String] = List.empty, | ||
| targetScript: String = "", | ||
| compiler: Boolean = false, | ||
| quiet: Boolean = false, | ||
| colors: Boolean = false, | ||
| ) { | ||
| def withCompileMode(em: CompileMode): CompileSettings = this.compileMode match | ||
| case CompileMode.Guess => | ||
| this.copy(compileMode = em) | ||
| case _ => | ||
| println(s"compile_mode==[$compileMode], attempted overwrite by [$em]") | ||
| this.copy(exitCode = 1) | ||
| end withCompileMode | ||
|
|
||
| def withScalaArgs(args: String*): CompileSettings = | ||
| this.copy(scalaArgs = scalaArgs.appendedAll(args.toList.filter(_.nonEmpty))) | ||
|
|
||
| def withJavaArgs(args: String*): CompileSettings = | ||
| this.copy(javaArgs = javaArgs.appendedAll(args.toList.filter(_.nonEmpty))) | ||
|
|
||
| def withJavaProps(args: (String, String)*): CompileSettings = | ||
| this.copy(javaProps = javaProps.appendedAll(args.toList)) | ||
|
|
||
| def withResidualArgs(args: String*): CompileSettings = | ||
| this.copy(residualArgs = residualArgs.appendedAll(args.toList.filter(_.nonEmpty))) | ||
|
|
||
| def withScriptArgs(args: String*): CompileSettings = | ||
| this.copy(scriptArgs = scriptArgs.appendedAll(args.toList.filter(_.nonEmpty))) | ||
|
|
||
| def withTargetScript(file: String): CompileSettings = | ||
| Try(Source.fromFile(file)).toOption match | ||
| case Some(_) => this.copy(targetScript = file) | ||
| case None => | ||
| println(s"not found $file") | ||
| this.copy(exitCode = 2) | ||
| end withTargetScript | ||
|
|
||
| def withCompiler: CompileSettings = | ||
| this.copy(compiler = true) | ||
|
|
||
| def withQuiet: CompileSettings = | ||
| this.copy(quiet = true) | ||
|
|
||
| def withColors: CompileSettings = | ||
| this.copy(colors = true) | ||
|
|
||
| def withNoColors: CompileSettings = | ||
| this.copy(colors = false) | ||
| } | ||
|
|
||
| object MainGenericCompiler { | ||
|
|
||
| val classpathSeparator = File.pathSeparator | ||
|
|
||
| @sharable val javaOption = raw"""-J(.*)""".r | ||
| @sharable val javaPropOption = raw"""-D(.+?)=(.?)""".r | ||
| @tailrec | ||
| def process(args: List[String], settings: CompileSettings): CompileSettings = args match | ||
| case Nil => | ||
| settings | ||
| case "--" :: tail => | ||
| process(Nil, settings.withResidualArgs(tail.toList*)) | ||
| case ("-v" | "-verbose" | "--verbose") :: tail => | ||
| process(tail, settings.withScalaArgs("-verbose")) | ||
| case ("-q" | "-quiet") :: tail => | ||
| process(tail, settings.withQuiet) | ||
| case "-repl" :: tail => | ||
| process(tail, settings.withCompileMode(CompileMode.Repl)) | ||
| case "-script" :: targetScript :: tail => | ||
| process(Nil, settings | ||
| .withCompileMode(CompileMode.Script) | ||
| .withJavaProps("script.path" -> targetScript) | ||
| .withTargetScript(targetScript) | ||
| .withScriptArgs(tail*)) | ||
| case "-compile" :: tail => | ||
| process(tail, settings.withCompileMode(CompileMode.Compile)) | ||
| case "-decompile" :: tail => | ||
| process(tail, settings.withCompileMode(CompileMode.Decompile)) | ||
| case "-print-tasty" :: tail => | ||
| process(tail, settings.withCompileMode(CompileMode.PrintTasty)) | ||
| case "-run" :: tail => | ||
| process(tail, settings.withCompileMode(CompileMode.Run)) | ||
| case "-colors" :: tail => | ||
| process(tail, settings.withColors) | ||
| case "-no-colors" :: tail => | ||
| process(tail, settings.withNoColors) | ||
| case "-with-compiler" :: tail => | ||
| process(tail, settings.withCompiler) | ||
| case ("-cp" | "-classpath" | "--class-path") :: cp :: tail => | ||
| val (tailargs, newEntries) = MainGenericRunner.processClasspath(cp, tail) | ||
| process(tailargs, settings.copy(classPath = settings.classPath ++ newEntries.filter(_.nonEmpty))) | ||
| case "-Oshort" :: tail => | ||
| // Nothing is to be done here. Request that the user adds the relevant flags manually. | ||
| // i.e this has no effect when MainGenericRunner is invoked programatically. | ||
| val addTC="-XX:+TieredCompilation" | ||
| val tStopAtLvl="-XX:TieredStopAtLevel=1" | ||
| println(s"ignoring deprecated -Oshort flag, please add `-J$addTC` and `-J$tStopAtLvl` flags manually") | ||
| process(tail, settings) | ||
| case javaOption(stripped) :: tail => | ||
| process(tail, settings.withJavaArgs(stripped)) | ||
| case javaPropOption(opt, value) :: tail => | ||
| process(tail, settings.withJavaProps(opt -> value)) | ||
| case arg :: tail => | ||
| process(tail, settings.withResidualArgs(arg)) | ||
| end process | ||
|
|
||
| def main(args: Array[String]): Unit = | ||
| val settings = process(args.toList, CompileSettings()) | ||
| if settings.exitCode != 0 then System.exit(settings.exitCode) | ||
|
|
||
| def classpathSetting = | ||
| if settings.classPath.isEmpty then List() | ||
| else List("-classpath", settings.classPath.mkString(classpathSeparator)) | ||
|
|
||
| def reconstructedArgs() = | ||
| classpathSetting ++ settings.scalaArgs ++ settings.residualArgs | ||
|
|
||
| def addJavaProps(): Unit = | ||
| settings.javaProps.foreach { (k, v) => sys.props(k) = v } | ||
|
|
||
| def run(settings: CompileSettings): Unit = settings.compileMode match | ||
| case CompileMode.Compile => | ||
| addJavaProps() | ||
| val properArgs = reconstructedArgs() | ||
| dotty.tools.dotc.Main.main(properArgs.toArray) | ||
| case CompileMode.Decompile => | ||
| addJavaProps() | ||
| val properArgs = reconstructedArgs() | ||
| dotty.tools.dotc.decompiler.Main.main(properArgs.toArray) | ||
| case CompileMode.PrintTasty => | ||
| addJavaProps() | ||
| val properArgs = reconstructedArgs() | ||
| dotty.tools.dotc.core.tasty.TastyPrinter.main(properArgs.toArray) | ||
| case CompileMode.Script => // Naive copy from scalac bash script | ||
| addJavaProps() | ||
| val properArgs = | ||
| reconstructedArgs() | ||
| ++ List("-script", settings.targetScript) | ||
| ++ settings.scriptArgs | ||
| scripting.Main.main(properArgs.toArray) | ||
| case CompileMode.Repl | CompileMode.Run => | ||
| addJavaProps() | ||
| val properArgs = reconstructedArgs() | ||
| repl.Main.main(properArgs.toArray) | ||
| case CompileMode.Guess => | ||
| run(settings.withCompileMode(CompileMode.Compile)) | ||
| end run | ||
|
|
||
| run(settings) | ||
| end main | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,43 +30,54 @@ source "$PROG_HOME/bin/common" | |
|
|
||
| [ -z "$PROG_NAME" ] && PROG_NAME=$CompilerMain | ||
|
|
||
| while [[ $# -gt 0 ]]; do | ||
| case "$1" in | ||
| --) | ||
| # pass all remaining arguments to scala, e.g. to avoid interpreting them here as -D or -J | ||
| while [[ $# -gt 0 ]]; do addScala "$1" && shift ; done | ||
| ;; | ||
| -script) | ||
| # pass all remaining arguments to scala, e.g. to avoid interpreting them here as -D or -J | ||
| while [[ $# -gt 0 ]]; do addScala "$1" && shift ; done | ||
| ;; | ||
| # Optimize for short-running applications, see https://github.com/lampepfl/dotty/issues/222 | ||
| -Oshort) | ||
| addScala "-Oshort" && \ | ||
| addJava "-XX:+TieredCompilation" && addJava "-XX:TieredStopAtLevel=1" && shift ;; | ||
| -D*) | ||
| # pass to scala as well: otherwise we lose it sometimes when we | ||
| # need it, e.g. communicating with a server compiler. | ||
| # respect user-supplied -Dscala.usejavacp | ||
| addJava "$1" | ||
| addScala "$1" | ||
| shift | ||
| ;; | ||
| -J*) | ||
| # as with -D, pass to scala even though it will almost | ||
| # never be used. | ||
| addJava "${1:2}" | ||
| addScala "$1" | ||
| shift | ||
| ;; | ||
| -classpath*) | ||
|
There was a problem hiding this comment. Same confusion here. This did not use to be special in the old script. Why is it special now? There was a problem hiding this comment. This is copied from the Scala script, I think there was the same Cygwin bug there There was a problem hiding this comment. I don't think it's related to cygwin; the code and comments appear to be inherited from the scala2 version of the script. |
||
| if [ "$1" != "${1##* }" ]; then | ||
| # -classpath and its value have been supplied in a single string e.g. "-classpath 'lib/*'" | ||
| A=$1 ; shift # consume $1 before adding its substrings back | ||
| set -- $A "$@" # split $1 on whitespace and put it back | ||
| else | ||
| addScala "$1" | ||
| shift | ||
| fi | ||
| ;; | ||
| *) | ||
| addScala "$1" | ||
| shift | ||
| ;; | ||
| esac | ||
| done | ||
|
|
||
| compilerJavaClasspathArgs | ||
|
|
||
| [ -n "$script_trace" ] && set -x | ||
| [ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405 | ||
|
|
||
|
|
@@ -75,11 +86,10 @@ eval "\"$JAVACMD\"" \ | |
| ${JAVA_OPTS:-$default_java_opts} \ | ||
| "${java_args[@]}" \ | ||
| "-classpath \"$jvm_cp_args\"" \ | ||
| "-Dscala.usejavacp=true" \ | ||
| "-Dscala.home=$PROG_HOME" \ | ||
|
Comment on lines
+89
to
+90
There was a problem hiding this comment. Are these things that the cs runner would be able to pass to There was a problem hiding this comment. CS can configure properties, but probably does not have a magic variable for the launch directory (-Dscala.home was copied from the Scala script for use in programs), I don't think it should be supported in CS because the directory structure is not equivalent There was a problem hiding this comment. Some scripts will fail if There was a problem hiding this comment. I've had a look and we can check if the property There was a problem hiding this comment. Idea from @sjrd it could likely be much more useful to provide properties that have the classpath of the scala compiler and scala standard libraries, that can be provided as arguments to the java command, this is more uniform than a fragile directory structure that depends on the package manager. There was a problem hiding this comment. I like this suggestion, it would then be possible to find the first scala3-library*.jar in the classpath, and two directories up would be |
||
| "dotty.tools.MainGenericCompiler" \ | ||
| "${scala_args[@]}" | ||
|
|
||
| scala_exit_status=$? | ||
| onExit | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.