Changed erasure behavior of arrays to use always boxed representation.

Conflicts:

	test/files/run/Meter.scala

1 files changed, 41 insertions, 0 deletions

diff --git a/test/files/run/Meter.scala b/test/files/run/Meter.scala
index 0db917aeee..66d35bfc75 100644
--- a/test/files/run/Meter.scala
+++ b/test/files/run/Meter.scala
@@ -6,6 +6,28 @@ class Meter(val underlying: Double) extends AnyVal with Printable {
    def < (other: Meter): Boolean = this.underlying < other.underlying
    override def toString: String = underlying.toString+"m"
 }
+object Meter extends (Double => Meter) {
+
+  def apply(x: Double): Meter = new Meter(x)
+
+  class FlatArray(underlying: Array[Double]) {
+    def length = underlying.length
+    def apply(i: Int): Meter = new Meter(underlying(i))
+    def update(i: Int, m: Meter) = underlying(i) = m.underlying
+    override def toString = underlying.toList map Meter mkString ("Meter.FlatArray(", ", ", ")")
+  }
+
+  object FlatArray {
+
+    def apply(xs: Meter*) = {
+      val elems = Array.ofDim[Double](xs.length)
+      for (i <- 0 until xs.length)
+        elems(i) = xs(i).asInstanceOf[Double]
+      new FlatArray(elems)
+    }
+  }
+
+}
 trait Printable extends Any { def print: Unit = Console.print(this) }
 
 object Test extends App {
@@ -37,5 +59,24 @@ object Test extends App {
   val b: Any = y
   println("a == b: "+(a == b))
 
+  {
   val arr = Array(x, y + x)
+  println(arr.deep)
+  def foo[T <: Printable](x: Array[T]) {
+    for (i <- 0 until x.length) { x(i).print; println(" "+x(i)) }
+  }
+  val m = arr(0)
+  println(m)
+  foo(arr)
+  }
+
+  val arr = Meter.FlatArray(x, y + x)
+  println(arr)
+  def foo(x: Meter.FlatArray) {
+    for (i <- 0 until x.length) { x(i).print; println(" "+x(i)) }
+  }
+  val m = arr(0)
+  println(m)
+  foo(arr)
+
 }