Fixed ticket #305.

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@13664 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
2008-01-07 08:30:04 +00:00 · 2008-01-07 08:30:04 +00:00 · 525f731cf4
parent ad5163e370
commit 525f731cf4
1 changed files with 5 additions and 2 deletions
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@ -698,11 +698,14 @@ class Interpreter(val settings: Settings, out: PrintWriter) {
        code.print(" + \"" + vname + ": " + 
 		   string2code(typeOf(vname)) +
 		   " = \" + " +
-                   " (if(" + 
+                   " (if(" +
+		   fullPath(vname) + 
+                   ".asInstanceOf[AnyRef] != null) " +
+                   " ((if(" + 
 		   fullPath(vname) + 
 		   ".toString.contains('\\n')) " +
                   " \"\\n\" else \"\") + " +
-                   fullPath(vname) + " + \"\\n\"")
+                   fullPath(vname) + " + \"\\n\") else \"null\\n\") ")
      }
    }