diff options
author | Ruslan Shevchenko <ruslan@shevchenko.kiev.ua> | 2012-10-07 13:11:24 +0300 |
---|---|---|
committer | Ruslan Shevchenko <ruslan@shevchenko.kiev.ua> | 2012-10-07 13:11:24 +0300 |
commit | 1abc9013b825942ef0373a4e383efb627b379617 (patch) | |
tree | 05122538dff9ef9a26bda2aa79ad984bffa04bb6 /src/compiler/scala/tools/nsc | |
parent | d562ef92e491828e82712ad50dbe82c034ed5f2c (diff) | |
download | scala-1abc9013b825942ef0373a4e383efb627b379617.tar.gz scala-1abc9013b825942ef0373a4e383efb627b379617.tar.bz2 scala-1abc9013b825942ef0373a4e383efb627b379617.zip |
using existing scala.tools.nsc.util.stackTraceString
Diffstat (limited to 'src/compiler/scala/tools/nsc')
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 68ba217b48..7a960c4d57 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -12,7 +12,7 @@ import scala.tools.util.PathResolver import scala.collection.{ mutable, immutable } import io.{ SourceReader, AbstractFile, Path } import reporters.{ Reporter, ConsoleReporter } -import util.{ Exceptional, ClassPath, MergedClassPath, StatisticsInfo, ScalaClassLoader, returning } +import util.{ Exceptional, ClassPath, MergedClassPath, StatisticsInfo, ScalaClassLoader, returning, stackTraceString } import scala.reflect.internal.util.{ NoPosition, OffsetPosition, SourceFile, NoSourceFile, BatchSourceFile, ScriptSourceFile } import scala.reflect.internal.pickling.{ PickleBuffer, PickleFormat } import symtab.{ Flags, SymbolTable, SymbolLoaders, SymbolTrackers } @@ -1519,13 +1519,10 @@ class Global(var currentSettings: Settings, var reporter: Reporter) def compileUnits(units: List[CompilationUnit], fromPhase: Phase) { try compileUnitsInternal(units, fromPhase) catch { case ex: Throwable => - val shown = if (settings.verbose.value) { - val sw = new java.io.StringWriter() - val pw = new java.io.PrintWriter(sw) - ex.printStackTrace(pw) - pw.flush() - sw.toString - } else ex.getClass.getName + val shown = if (settings.verbose.value) + stackTraceString(ex) + else + ex.getClass.getName // ex.printStackTrace(Console.out) // DEBUG for fsc, note that error stacktraces do not print in fsc globalError(supplementErrorMessage("uncaught exception during compilation: " + shown)) throw ex |