separated Vector impl from IndexedSeq

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@19354 5e8d7ff9-d8ef-0310-90f0-a4852d11357a

src/library/scala/collection/IndexedSeq.scala

@@ -12,7 +12,7 @@
 package scala.collection
 
 import generic._
-import scala.collection.mutable.Builder
+import mutable.Builder
 
 /** <p>
  *    Sequences that support O(1) element access and O(1) length computation.
@@ -34,9 +34,7 @@ trait IndexedSeq[+A] extends Seq[A]
 }
 
 object IndexedSeq extends SeqFactory[IndexedSeq] {
-  override def empty[A]: IndexedSeq[A] = immutable.IndexedSeq.empty[A]
   implicit def canBuildFrom[A]: CanBuildFrom[Coll, A, IndexedSeq[A]] = new GenericCanBuildFrom[A]
   def newBuilder[A]: Builder[A, IndexedSeq[A]] = immutable.IndexedSeq.newBuilder[A]
-
-  @deprecated("use collection.mutable.IndexedSeq instead") type Mutable[A] = scala.collection.mutable.IndexedSeq[A]
 }
+

src/library/scala/collection/immutable/LinearSeq.scala

@@ -15,7 +15,7 @@ package immutable
 import generic._
 import mutable.Builder
 
-/** A subtrait of <code>collection.Seq</code> which represents sequences
+/** A subtrait of <code>collection.LinearSeq</code> which represents sequences
  *  that cannot be mutated.
  *
  *  @since 2.8

src/library/scala/package.scala

@@ -40,6 +40,9 @@ package object scala {
   val Stream = scala.collection.immutable.Stream
   val #:: = scala.collection.immutable.Stream.#::
 
+  type Vector[+A] = scala.collection.immutable.Vector[A]
+  val Vector = scala.collection.immutable.Vector
+
   type StringBuilder = scala.collection.mutable.StringBuilder
   val StringBuilder = scala.collection.mutable.StringBuilder
 

test/files/pos/collectGenericCC.scala

@@ -8,7 +8,7 @@ object Test {
     b.result
   }
   
-  collect[Int, IndexedSeq[Int]](List(1,2,3,4)) 
+  collect[Int, Vector[Int]](List(1,2,3,4)) 
   collect[Char, String](List('1','2','3','4'))
   collect[Char, Array[Char]](List('1','2','3','4'))  
 }

test/files/pos/spec-List.scala

@@ -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, IndexedSeq}
+  import scala.collection.{Iterable, Traversable, Seq}
 
   /** 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, IndexedSeq}
+  import collection.{Iterable, Seq}
 
   implicit def builderFactory[A]: CanBuildFrom[Coll, A, List[A]] = 
     new GenericCanBuildFrom[A] {

test/files/run/colltest1.check

@@ -72,6 +72,16 @@ new test starting with List()
 9: List(2, 3, 4, 5, 6, 7, 8, 9, 10)
 1
 List(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+new test starting with IndexedSeq()
+10: IndexedSeq(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+9: IndexedSeq(2, 3, 4, 5, 6, 7, 8, 9, 10)
+1
+IndexedSeq(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+new test starting with Vector()
+10: Vector(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
+9: Vector(2, 3, 4, 5, 6, 7, 8, 9, 10)
+1
+Vector(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
 new test starting with List()
 10: List(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)
 9: List(2, 3, 4, 5, 6, 7, 8, 9, 10)

test/files/run/colltest1.scala

@@ -213,6 +213,8 @@ object Test extends Application {
   sequenceTest(mutable.Seq())
   sequenceTest(immutable.Seq())
   sequenceTest(LinearSeq())
+  sequenceTest(IndexedSeq())
+  sequenceTest(Vector())
 //  sequenceTest(mutable.LinearSeq())
   sequenceTest(immutable.LinearSeq())
   sequenceTest(mutable.IndexedSeq())