diff options
author | Paul Phillips <paulp@improving.org> | 2010-11-12 14:18:44 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-11-12 14:18:44 +0000 |
commit | 505a858ea1328227f18d116926a57296fd63dddd (patch) | |
tree | 41b56325e39c7415b9a96bd200a3e67b62c237c4 /src/compiler | |
parent | 91eff8e6d903a9eab2bc83c120774d623df5ad7d (diff) | |
download | scala-505a858ea1328227f18d116926a57296fd63dddd.tar.gz scala-505a858ea1328227f18d116926a57296fd63dddd.tar.bz2 scala-505a858ea1328227f18d116926a57296fd63dddd.zip |
A revival of r21442, which I had reverted based...
A revival of r21442, which I had reverted based on the mistaken belief
it was causing mysterious trunk issues of the day. No review.
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/Interpreter.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala index 17f543f8e3..0200773e05 100644 --- a/src/compiler/scala/tools/nsc/Interpreter.scala +++ b/src/compiler/scala/tools/nsc/Interpreter.scala @@ -20,7 +20,7 @@ import scala.reflect.Manifest import scala.collection.mutable.{ ListBuffer, HashSet, HashMap, ArrayBuffer } import scala.tools.nsc.util.ScalaClassLoader import ScalaClassLoader.URLClassLoader -import scala.util.control.Exception.{ Catcher, catching, ultimately, unwrapping } +import scala.util.control.Exception.{ Catcher, catching, catchingPromiscuously, ultimately, unwrapping } import io.{ PlainFile, VirtualDirectory } import reporters.{ ConsoleReporter, Reporter } @@ -981,7 +981,7 @@ class Interpreter(val settings: Settings, out: PrintWriter) { } } - catching(onErr) { + catchingPromiscuously(onErr) { unwrapping(wrapperExceptions: _*) { (resultValMethod.invoke(loadedResultObject).toString, true) } |