summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-01-07 08:30:04 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-01-07 08:30:04 +0000
commit7da478591fa9db1d0719a3a9fa8ad78a8cf5a732 (patch)
treeb4322df477a501454effff340ebc8c3e08763b7c
parente054b90b63b83c7988664b324d262d00b865350a (diff)
downloadscala-7da478591fa9db1d0719a3a9fa8ad78a8cf5a732.tar.gz
scala-7da478591fa9db1d0719a3a9fa8ad78a8cf5a732.tar.bz2
scala-7da478591fa9db1d0719a3a9fa8ad78a8cf5a732.zip
Fixed ticket #305.
-rw-r--r--src/compiler/scala/tools/nsc/Interpreter.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 3517c75132..fb20106aaf 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -700,9 +700,12 @@ class Interpreter(val settings: Settings, out: PrintWriter) {
" = \" + " +
" (if(" +
fullPath(vname) +
+ ".asInstanceOf[AnyRef] != null) " +
+ " ((if(" +
+ fullPath(vname) +
".toString.contains('\\n')) " +
" \"\\n\" else \"\") + " +
- fullPath(vname) + " + \"\\n\"")
+ fullPath(vname) + " + \"\\n\") else \"null\\n\") ")
}
}