From a7db64605e84cd18a29eb63569a3832e62fc5d82 Mon Sep 17 00:00:00 2001 From: Geoffrey Washburn Date: Fri, 14 Nov 2008 22:17:56 +0000 Subject: Fix and test for #1513 --- src/library/scala/runtime/BoxedArray.scala | 2 +- test/files/run/interpreter.check | 3 +++ test/files/run/interpreter.scala | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/library/scala/runtime/BoxedArray.scala b/src/library/scala/runtime/BoxedArray.scala index 5f5f64a4dc..408a900437 100644 --- a/src/library/scala/runtime/BoxedArray.scala +++ b/src/library/scala/runtime/BoxedArray.scala @@ -131,7 +131,7 @@ abstract class BoxedArray extends Array.Array0[Any] { case a: AnyRef if ScalaRunTime.isArray(a) => ScalaRunTime.boxArray(a).deepMkString(start, sep, end) case _ => - x.toString + ScalaRunTime.stringOf(x) } val buf = new StringBuilder() buf.append(start) diff --git a/test/files/run/interpreter.check b/test/files/run/interpreter.check index 722a8d1fd1..aa2776f34b 100644 --- a/test/files/run/interpreter.check +++ b/test/files/run/interpreter.check @@ -33,6 +33,9 @@ y: Int = 3 scala> hello scala> +scala> +scala> t1513: Array[Null] = Array(null) + scala> scala> atom: scala.xml.Atom[Unit] = () diff --git a/test/files/run/interpreter.scala b/test/files/run/interpreter.scala index d68b6f6632..f5ce68a1b9 100644 --- a/test/files/run/interpreter.scala +++ b/test/files/run/interpreter.scala @@ -22,6 +22,8 @@ trait PointlessTrait val (x,y) = (2,3) println("hello") +// ticket #1513 +val t1513 = Array(null) // ambiguous toString problem from #547 val atom = new scala.xml.Atom() // overriding toString problem from #1404 -- cgit v1.2.3