diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2013-04-06 16:44:39 +0200 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2013-04-06 16:46:18 +0200 |
commit | f93c4c906994d17cd62083d1431dca35f7da74bf (patch) | |
tree | d095a02396bb1cb841e6b8aea55033620f5dde0a /src | |
parent | c57c4f8c6227cff8ff9c1392428f97f036a34f2c (diff) | |
download | scala-f93c4c906994d17cd62083d1431dca35f7da74bf.tar.gz scala-f93c4c906994d17cd62083d1431dca35f7da74bf.tar.bz2 scala-f93c4c906994d17cd62083d1431dca35f7da74bf.zip |
SI-7337 Error out on missing -d directory.
This check was removed without comment in 3a30af154, the addition
of JSR-223 support for the interpreter.
After this commit, I manually tested that JSR-223 support works.
scala> import javax.script._, collection.JavaConverters._; val manager = new ScriptEngineManager; manager.getEngineByName("scala").eval("List(1)")
import javax.script._
import collection.JavaConverters._
manager: javax.script.ScriptEngineManager = javax.script.ScriptEngineManager@4418f61b
res1: Object = List(1)
3a30af154 did not include a test case, so I don't know whether I've
broken some other aspect of it. I tried the above as a `run` test,
but hit two problems, one of them seemingly our fault, and the other
a MacOS JDK wrinkle.
1. scala.reflect.internal.MissingRequirementError: object scala.runtime in compiler mirror not found.
2. java.lang.UnsatisfiedLinkError: no AppleScriptEngine in java.library.path
I can't find my way to fix these, so JSR-223 remains untested. I don't
think that commit was really up to standard; it could handle additional
review, documentation, and testing. It might even be modularized so as
not to pollute the REPL itself.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/settings/MutableSettings.scala | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala index 4d086e787e..cd23ad74e4 100644 --- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala +++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala @@ -251,8 +251,7 @@ class MutableSettings(val errorFn: String => Unit) else if (allowJar && dir == null && Jar.isJarOrZip(name, examineFile = false)) new PlainFile(Path(name)) else -// throw new FatalError(name + " does not exist or is not a directory") - dir + throw new FatalError(name + " does not exist or is not a directory") ) /** Set the single output directory. From now on, all files will |