Fixing an interpreter output regression and upd...

Fixing an interpreter output regression and updated repl debugging and
tracing code. No review.

1 files changed, 16 insertions, 14 deletions

diff --git a/src/compiler/scala/tools/nsc/interpreter/ReplConfig.scala b/src/compiler/scala/tools/nsc/interpreter/ReplConfig.scala
index a8287e3a9a..5c24e492cf 100644
--- a/src/compiler/scala/tools/nsc/interpreter/ReplConfig.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/ReplConfig.scala
@@ -9,7 +9,6 @@ package interpreter
 import sys.{ Prop, BooleanProp }
 
 trait ReplConfig {
-
   class ReplProps {
     private def bool(name: String) = BooleanProp.keyExists(name)
 
@@ -20,23 +19,26 @@ trait ReplConfig {
     val trace = bool("scala.repl.trace")
     val power = bool("scala.repl.power")
 
-    val replInitCode = Prop[JFile]("scala.repl.initcode")
+    val replInitCode  = Prop[JFile]("scala.repl.initcode")
     val powerInitCode = Prop[JFile]("scala.repl.power.initcode")
-    val powerBanner = Prop[JFile]("scala.repl.power.banner")
+    val powerBanner   = Prop[JFile]("scala.repl.power.banner")
   }
   lazy val replProps = new ReplProps
 
   /** Debug output */
-  private[nsc] def repldbg(msg: String) = if (isReplDebug) Console println msg
-
-  /** Tracing */
-  private[nsc] def tracing[T](msg: String)(x: T): T = {
-    if (isReplDebug)
-      println("(" + msg + ") " + x)
-
-    x
-  }
-
-  def isReplDebug: Boolean = replProps.debug
+  private[nsc] def repldbg(msg: => String)   =
+    if (isReplDebug) {
+      try Console println msg
+      catch { case x: AssertionError => Console.println("Assertion error in repldbg:\n  " + x) }
+    }
+
+  private[nsc] def repltrace(msg: => String) =
+    if (isReplTrace) {
+      try Console println msg
+      catch { case x: AssertionError => Console.println("Assertion error in repltrace:\n  " + x) }
+    }
+
+  def isReplTrace: Boolean = replProps.trace
+  def isReplDebug: Boolean = replProps.debug || isReplTrace
   def isReplPower: Boolean = replProps.power
 }