diff options
author | Martin Odersky <odersky@gmail.com> | 2009-08-27 14:45:35 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2009-08-27 14:45:35 +0000 |
commit | a04195e63727872f04ad01900a18f6ca9ec5cf2b (patch) | |
tree | 48964da67438a04e802a5c2324f0a02f2d22efb7 /test/files/run | |
parent | 2c39b8b0839a5dfd48dfd073944f7b176cc63f4b (diff) | |
download | scala-a04195e63727872f04ad01900a18f6ca9ec5cf2b.tar.gz scala-a04195e63727872f04ad01900a18f6ca9ec5cf2b.tar.bz2 scala-a04195e63727872f04ad01900a18f6ca9ec5cf2b.zip |
added manifests to most parts of standard libra...
added manifests to most parts of standard library which deal with
arrays. One test is temporarily disabled, as it shows a deep problem
with multi-dimensional arrays (which was present all along).
Diffstat (limited to 'test/files/run')
-rw-r--r-- | test/files/run/bug1300.scala | 3 | ||||
-rwxr-xr-x | test/files/run/colltest1.scala | 2 | ||||
-rw-r--r-- | test/files/run/multi-array.disabled (renamed from test/files/run/multi-array.scala) | 2 | ||||
-rw-r--r-- | test/files/run/t0677.scala | 5 |
4 files changed, 8 insertions, 4 deletions
diff --git a/test/files/run/bug1300.scala b/test/files/run/bug1300.scala index 3d26c0f4da..1a759f4e1e 100644 --- a/test/files/run/bug1300.scala +++ b/test/files/run/bug1300.scala @@ -1,6 +1,7 @@ object Test extends Application { val a1 = Array(0,1,2,3).toArray[Any] +// val a1 = x1.toArray[Any] val a2 = Array('a','b','c','d').toArray[Any] val a3 = Array("e","f","g","h").toArray[Any] @@ -9,4 +10,4 @@ object Test extends Application Array.copy(a2, 0, a1, 0, 4) println(a1.mkString + a2.mkString + a3.mkString) -}
\ No newline at end of file +} diff --git a/test/files/run/colltest1.scala b/test/files/run/colltest1.scala index a918546be2..b407e776a4 100755 --- a/test/files/run/colltest1.scala +++ b/test/files/run/colltest1.scala @@ -31,7 +31,7 @@ object Test extends Application { assert(o.size == e.size) val gs = ten groupBy (x => x / 4) val vs1 = (for (k <- gs.keysIterator; v <- gs(k).toIterable.iterator) yield v).toList - val vs2 = Traversable.traversableTraversableWrapper[List[Traversable[Int]], Int](gs.values.toList).flatten + val vs2 = gs.values.toList.flatten // val vs2 = gs.values.toList flatMap (xs => xs) assert(ten.head == 1) assert(ten.tail.head == 2) diff --git a/test/files/run/multi-array.scala b/test/files/run/multi-array.disabled index 1dbbad32a8..8c95453735 100644 --- a/test/files/run/multi-array.scala +++ b/test/files/run/multi-array.disabled @@ -5,7 +5,7 @@ object Test extends Application { val aaiIncomplete = new Array[Array[Array[Int]]](3) println(aaiIncomplete(0)) - val aaiComplete: Array[Array[Int]] = new Array[Array[Int]](3, 3) + val aaiComplete: Array[Array[Int]] = Array.ofDim[Int](3, 3) // new Array[Array[Int]](3, 3) for (i <- 0 until 3; j <- 0 until 3) aaiComplete(i)(j) = i + j println(aaiComplete.deepToString) diff --git a/test/files/run/t0677.scala b/test/files/run/t0677.scala index 7978e3d142..eb01a85fcb 100644 --- a/test/files/run/t0677.scala +++ b/test/files/run/t0677.scala @@ -1,5 +1,8 @@ object Test extends Application { - class X[T] { val a = new Array[Array[T]](3,4) } + class X[T: ClassManifest] { + val a = new Array[Array[T]](3,4) + val b = Array.ofDim[T](3, 4) + } val x = new X[String] x.a(1)(2) = "hello" assert(x.a(1)(2) == "hello") |