5 files changed, 32 insertions, 22 deletions
diff --git a/test/files/run/deeps.check b/test/files/run/deeps.check
index 55ae698241..f1925fcbc1 100644
--- a/test/files/run/deeps.check
+++ b/test/files/run/deeps.check
@@ -12,14 +12,14 @@ false
 false
 true
 
-x=Array(Array(1),Array(1))
-y=Array(Array(1),Array(1))
+x=Array(Array(1), Array(1))
+y=Array(Array(1), Array(1))
 false
 false
 true
 
-x=Array(Array(Array(1),Array(1)),Array(Array(1),Array(1)))
-y=Array(Array(Array(1),Array(1)),Array(Array(1),Array(1)))
+x=Array(Array(Array(1), Array(1)), Array(Array(1), Array(1)))
+y=Array(Array(Array(1), Array(1)), Array(Array(1), Array(1)))
 false
 false
 true
@@ -31,47 +31,47 @@ false
 false
 true
 Array(true, false)
-Array(true,false)
+Array(true, false)
 [true;false]
 true;false
 
 Array([Z@0000000, [Z@0000000)
-Array(Array(true,false),Array(true,false))
+Array(Array(true, false), Array(true, false))
 [[true;false];[true;false]]
 true;false;true;false
 
 Array([[Z@0000000, [[Z@0000000)
-Array(Array(Array(true,false),Array(true,false)),Array(Array(true,false),Array(true,false)))
+Array(Array(Array(true, false), Array(true, false)), Array(Array(true, false), Array(true, false)))
 [[[true;false];[true;false]];[[true;false];[true;false]]]
 true;false;true;false;true;false;true;false
 
 Array(1.0, 0.0)
-Array(1.0,0.0)
+Array(1.0, 0.0)
 [1.0;0.0]
 1.0;0.0
 
 Array([D@0000000, [D@0000000)
-Array(Array(1.0,0.0),Array(1.0,0.0))
+Array(Array(1.0, 0.0), Array(1.0, 0.0))
 [[1.0;0.0];[1.0;0.0]]
 1.0;0.0;1.0;0.0
 
 Array([[D@0000000, [[D@0000000)
-Array(Array(Array(1.0,0.0),Array(1.0,0.0)),Array(Array(1.0,0.0),Array(1.0,0.0)))
+Array(Array(Array(1.0, 0.0), Array(1.0, 0.0)), Array(Array(1.0, 0.0), Array(1.0, 0.0)))
 [[[1.0;0.0];[1.0;0.0]];[[1.0;0.0];[1.0;0.0]]]
 1.0;0.0;1.0;0.0;1.0;0.0;1.0;0.0
 
 Array(a, b)
-Array(a,b)
+Array(a, b)
 [a;b]
 a;b
 
 Array([Ljava.lang.String;@0000000, [Ljava.lang.String;@0000000)
-Array(Array(a,b),Array(a,b))
+Array(Array(a, b), Array(a, b))
 [[a;b];[a;b]]
 a;b;a;b
 
 Array([[Ljava.lang.String;@0000000, [[Ljava.lang.String;@0000000)
-Array(Array(Array(a,b),Array(a,b)),Array(Array(a,b),Array(a,b)))
+Array(Array(Array(a, b), Array(a, b)), Array(Array(a, b), Array(a, b)))
 [[[a;b];[a;b]];[[a;b];[a;b]]]
 a;b;a;b;a;b;a;b
 
@@ -79,5 +79,5 @@ a;b;a;b;a;b;a;b
 [[1; 2]; [3]]
 [[1; 2]; [3]]
 
-Array(boo,and,foo)
+Array(boo, and, foo)
 Array(a)
diff --git a/test/files/run/interpreter.check b/test/files/run/interpreter.check
index 313a817968..722a8d1fd1 100644
--- a/test/files/run/interpreter.check
+++ b/test/files/run/interpreter.check
@@ -37,11 +37,18 @@ scala>
 scala> atom: scala.xml.Atom[Unit] = ()
 
 scala> 
+scala> defined class S
+
+scala> fish: S = fish
+
 scala> 
+scala> arr: Array[java.lang.String] = Array(What's, up, doc?)
+
 scala> 
+scala> arrInt: Any = Array(1, 2, 3)
+
 scala> 
-scala> 
-scala> arr: Array[java.lang.String] = Array(What's, up, doc?)
+scala> arrArrInt: Any = Array(Array(1, 2), Array(3, 4))
 
 scala> 
 scala> 
diff --git a/test/files/run/interpreter.scala b/test/files/run/interpreter.scala
index dbfffd70d3..d68b6f6632 100644
--- a/test/files/run/interpreter.scala
+++ b/test/files/run/interpreter.scala
@@ -25,11 +25,14 @@ println("hello")
 // ambiguous toString problem from #547
 val atom = new scala.xml.Atom()
 // overriding toString problem from #1404
-// commented out because the fix had to be reverted for arrays
-//class S(override val toString : String)
-//val fish = new S("fish")
+class S(override val toString : String)
+val fish = new S("fish")
 // Test that arrays pretty print nicely.
 val arr = Array("What's", "up", "doc?")
+// Test that arrays pretty print nicely, even when we give them type Any
+val arrInt : Any = Array(1,2,3)
+// Test that nested arrays are pretty-printed correctly
+val arrArrInt : Any = Array(Array(1, 2), Array(3, 4))
 
 // implicit conversions
 case class Foo(n: Int)
diff --git a/test/files/run/multi-array.check b/test/files/run/multi-array.check
index c43d9c6172..2f236b99cf 100644
--- a/test/files/run/multi-array.check
+++ b/test/files/run/multi-array.check
@@ -1,3 +1,3 @@
-Array(1,2,3)
+Array(1, 2, 3)
 null
-Array(Array(0,1,2),Array(1,2,3),Array(2,3,4))
+Array(Array(0, 1, 2), Array(1, 2, 3), Array(2, 3, 4))
diff --git a/test/files/run/t0017.check b/test/files/run/t0017.check
index dd7ea0aae7..ab580f848e 100644
--- a/test/files/run/t0017.check
+++ b/test/files/run/t0017.check
@@ -1 +1 @@
-Array(Array(1,3),Array(2,4))
+Array(Array(1, 3), Array(2, 4))