Small change to the code generated by the inter...

Small change to the code generated by the interperter not to call
toString on the result twice. Probably not much of a concern in terms of
efficiency, but useful if toString is effectful.

1 files changed, 3 insertions, 4 deletions

diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 1fbc80ab82..99606e856f 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -625,11 +625,10 @@ class Interpreter(val settings: Settings, out: PrintWriter) {
                    " (if(" +
 	           req.fullPath(vname) +
                    ".asInstanceOf[AnyRef] != null) " +
-                   " ((if(" +
+                   " { val tmp = " +
 	           req.fullPath(vname) +
-	           ".toString().contains('\\n')) " +
-                   " \"\\n\" else \"\") + " +
-                   req.fullPath(vname) + ".toString() + \"\\n\") else \"null\\n\") ")
+		   ".toString(); " +
+                   " (if(tmp.contains('\\n')) \"\\n\" else \"\") + tmp + \"\\n\"} else \"null\\n\") ")
       }
     }
   }