lib/scala-compiler.jar lib/scala-library-src.jar lib/scala-library.jar @@ -8,7 +8,7 @@ object Test { b.result } - collect[Int, Vector[Int]](List(1,2,3,4)) + collect[Int, IndexedSeq[Int]](List(1,2,3,4)) collect[Char, String](List('1','2','3','4')) collect[Char, Array[Char]](List('1','2','3','4')) } \ No newline at end of file test/files/pos/collectGenericCC.scala @@ -1,4 +1,4 @@ -import scala.collection.mutable.Vector; +import scala.collection.mutable.IndexedSeq; import test.Outer; /* Test correct generation of java signatures. The Outer class should not test/files/pos/signatures/Test.java @@ -29,7 +29,7 @@ sealed abstract class List[@specialized +A] extends LinearSeq[A] with LinearSeqLike[A, List[A]] { override def companion: GenericCompanion[List] = List - import scala.collection.{Iterable, Traversable, Seq, Vector} + import scala.collection.{Iterable, Traversable, Seq, IndexedSeq} /** Returns true if the list does not contain any elements. * @return <code>true</code>, iff the list is empty. @@ -494,7 +494,7 @@ final case class ::[@specialized B](private var hd: B, private[scala] var tl: Li */ object List extends SeqFactory[List] { - import collection.{Iterable, Seq, Vector} + import collection.{Iterable, Seq, IndexedSeq} implicit def builderFactory[A]: CanBuildFrom[Coll, A, List[A]] = new GenericCanBuildFrom[A] { test/files/pos/spec-List.scala @@ -215,7 +215,7 @@ object Test extends Application { sequenceTest(LinearSeq()) // sequenceTest(mutable.LinearSeq()) sequenceTest(immutable.LinearSeq()) - sequenceTest(mutable.Vector()) + sequenceTest(mutable.IndexedSeq()) rangeTest(1 to 10) setTest(Set()) test/files/run/colltest1.scala @@ -24,7 +24,7 @@ object Test { mutable.Seq(_: _*), // immutable.Stack(_: _*), // mutable.Stack(_: _*), - immutable.Vector(_: _*), + immutable.IndexedSeq(_: _*), // was Vector //mutable.Vector(_: _*), immutable.List(_: _*), immutable.Stream(_: _*) test/files/run/sequenceComparisons.scala @@ -1,3 +1,3 @@ -VectorView(1, 2, 3) -VectorView(1, 2, 3) -VectorViewZ((1,1), (2,2), (3,3)) +IndexedSeqView(1, 2, 3) +IndexedSeqView(1, 2, 3) +IndexedSeqViewZ((1,1), (2,2), (3,3)) test/files/run/t2074_2.check @@ -1,13 +1,14 @@ -import scala.collection.immutable.Vector -import scala.collection.VectorView +// replaced all occurrences of 'Vector' with 'IndexedSeq' +import scala.collection.immutable.IndexedSeq +import scala.collection.IndexedSeqView object Test { - val v = new VectorView[Int, Vector[Int]] { - def underlying = Vector(1,2,3) + val v = new IndexedSeqView[Int, IndexedSeq[Int]] { + def underlying = IndexedSeq(1,2,3) def apply(idx: Int) = underlying(idx) def length = underlying.length } - val w = Vector(1, 2, 3).view + val w = IndexedSeq(1, 2, 3).view def main(args: Array[String]): Unit = { println(v) test/files/run/t2074_2.scala e723e07dc704d46be1f337d65bd02be6b3bc6e22 rompf rompf@5e8d7ff9-d8ef-0310-90f0-a4852d11357a http://github.com/jorgeortiz85/scala/commit/e3b8433465bd80cd18e143deb99654fdab489a5b e3b8433465bd80cd18e143deb99654fdab489a5b 2009-10-21T14:17:09-07:00 2009-10-21T14:17:09-07:00 built new starr and fixed test cases git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19211 5e8d7ff9-d8ef-0310-90f0-a4852d11357a 3e5b8efdf6909a70c53f4bd4c1ae197294086264 rompf rompf@5e8d7ff9-d8ef-0310-90f0-a4852d11357a