diff options
author | Paul Phillips <paulp@improving.org> | 2012-11-09 21:29:06 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-11-09 21:33:02 -0700 |
commit | 3baa06debb0c8a1be401e4338960569d71fa1af8 (patch) | |
tree | 7c2a24592ddd5e932d7593e7a59ae7348216d907 | |
parent | 62c3ace394b3d2fa52d47aec02effb70fed1f8ad (diff) | |
download | scala-3baa06debb0c8a1be401e4338960569d71fa1af8.tar.gz scala-3baa06debb0c8a1be401e4338960569d71fa1af8.tar.bz2 scala-3baa06debb0c8a1be401e4338960569d71fa1af8.zip |
Fix merge error.
I fixed that already and somehow it didn't appear in my push.
-rw-r--r-- | src/compiler/scala/tools/nsc/Global.scala | 2 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/interpreter/ILoop.scala | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala index 552146b9d4..13bec828ca 100644 --- a/src/compiler/scala/tools/nsc/Global.scala +++ b/src/compiler/scala/tools/nsc/Global.scala @@ -11,7 +11,7 @@ import scala.compat.Platform.currentTime import scala.collection.{ mutable, immutable } import io.{ SourceReader, AbstractFile, Path } import reporters.{ Reporter, ConsoleReporter } -import util.{ ClassPath, MergedClassPath, StatisticsInfo, returning, stackTraceString } +import util.{ ClassPath, MergedClassPath, StatisticsInfo, returning, stackTraceString, stackTraceHeadString } import scala.reflect.internal.util.{ OffsetPosition, SourceFile, NoSourceFile, BatchSourceFile, ScriptSourceFile } import scala.reflect.internal.pickling.{ PickleBuffer, PickleFormat } import symtab.{ Flags, SymbolTable, SymbolLoaders, SymbolTrackers } diff --git a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala index cf525d5cfc..74549ef558 100644 --- a/src/compiler/scala/tools/nsc/interpreter/ILoop.scala +++ b/src/compiler/scala/tools/nsc/interpreter/ILoop.scala @@ -9,6 +9,7 @@ package interpreter import Predef.{ println => _, _ } import java.io.{ BufferedReader, FileReader } import session._ +import scala.annotation.tailrec import scala.util.Properties.{ jdkHome, javaVersion, versionString, javaVmName } import scala.tools.util.{ Javap } import util.{ ClassPath, Exceptional, stringFromWriter, stringFromStream } |