summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-10-08 15:32:52 +0000
committerGeoffrey Washburn <geoffrey.washburn@epfl.ch>2008-10-08 15:32:52 +0000
commitbd46c931f0fba3a9bee8816a7b2fb77ed33bc361 (patch)
treeefef9c3b5c5e59e7d8d42bb2b6e22adac94d13f5 /src
parent29a8a8f77998b640f5083e87cd735301dd63922a (diff)
downloadscala-bd46c931f0fba3a9bee8816a7b2fb77ed33bc361.tar.gz
scala-bd46c931f0fba3a9bee8816a7b2fb77ed33bc361.tar.bz2
scala-bd46c931f0fba3a9bee8816a7b2fb77ed33bc361.zip
Fix for #547 and #1404.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/Interpreter.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/Interpreter.scala b/src/compiler/scala/tools/nsc/Interpreter.scala
index 99606e856f..09b8c6f068 100644
--- a/src/compiler/scala/tools/nsc/Interpreter.scala
+++ b/src/compiler/scala/tools/nsc/Interpreter.scala
@@ -627,7 +627,8 @@ class Interpreter(val settings: Settings, out: PrintWriter) {
".asInstanceOf[AnyRef] != null) " +
" { val tmp = " +
req.fullPath(vname) +
- ".toString(); " +
+ // Cast to Any to avoid ambiguity in choice of toString
+ ".asInstanceOf[Any].toString(); " +
" (if(tmp.contains('\\n')) \"\\n\" else \"\") + tmp + \"\\n\"} else \"null\\n\") ")
}
}