From cc5695df4172262670f4b5b14704afb1e0a1483f Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Mon, 12 Jan 2009 11:53:53 +0000 Subject: removed colelction.generic.nonvariant --- .../generic/nonvariant/IterableFactory.scala | 3 --- .../generic/nonvariant/IterableTemplate.scala | 24 ---------------------- .../generic/nonvariant/IterableView.scala | 19 ----------------- .../nonvariant/OrderedIterableTemplate.scala | 15 -------------- .../generic/nonvariant/SequenceFactory.scala | 3 --- .../generic/nonvariant/SequenceTemplate.scala | 15 -------------- .../generic/nonvariant/SequenceView.scala | 21 ------------------- .../generic/nonvariant/VectorTemplate.scala | 15 -------------- src/library/scalax/collection/mutable/Vector.scala | 2 +- 9 files changed, 1 insertion(+), 116 deletions(-) delete mode 100755 src/library/scalax/collection/generic/nonvariant/IterableFactory.scala delete mode 100755 src/library/scalax/collection/generic/nonvariant/IterableTemplate.scala delete mode 100755 src/library/scalax/collection/generic/nonvariant/IterableView.scala delete mode 100755 src/library/scalax/collection/generic/nonvariant/OrderedIterableTemplate.scala delete mode 100755 src/library/scalax/collection/generic/nonvariant/SequenceFactory.scala delete mode 100755 src/library/scalax/collection/generic/nonvariant/SequenceTemplate.scala delete mode 100755 src/library/scalax/collection/generic/nonvariant/SequenceView.scala delete mode 100644 src/library/scalax/collection/generic/nonvariant/VectorTemplate.scala (limited to 'src/library/scalax') diff --git a/src/library/scalax/collection/generic/nonvariant/IterableFactory.scala b/src/library/scalax/collection/generic/nonvariant/IterableFactory.scala deleted file mode 100755 index a3786a246d..0000000000 --- a/src/library/scalax/collection/generic/nonvariant/IterableFactory.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scalax.collection.generic.nonvariant - -trait IterableFactory[CC[A] <: Iterable[A]] extends generic.IterableFactory[CC] diff --git a/src/library/scalax/collection/generic/nonvariant/IterableTemplate.scala b/src/library/scalax/collection/generic/nonvariant/IterableTemplate.scala deleted file mode 100755 index ae916b3ffb..0000000000 --- a/src/library/scalax/collection/generic/nonvariant/IterableTemplate.scala +++ /dev/null @@ -1,24 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ - - -package scalax.collection.generic.nonvariant - -/** Collection classes mixing in this class provide a method - * elements which returns an iterator over all the - * elements contained in the collection. - * - * @note If a collection has a known size, it should also sub-type Collection. - * Only potentially unbounded collections should directly sub-class Iterable. - * @author Matthias Zenger - * @version 1.1, 04/02/2004 - */ -trait IterableTemplate[+CC[B] <: IterableTemplate[CC, B] with Iterable[B] , A] - extends generic.IterableTemplate[CC, A] { self /*: CC[A]*/ => } diff --git a/src/library/scalax/collection/generic/nonvariant/IterableView.scala b/src/library/scalax/collection/generic/nonvariant/IterableView.scala deleted file mode 100755 index 356c4c174f..0000000000 --- a/src/library/scalax/collection/generic/nonvariant/IterableView.scala +++ /dev/null @@ -1,19 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ - -package scalax.collection.generic.nonvariant - -/** A non-strict projection of an iterable. - * @author Sean McDirmid - * @author Martin Odersky - * @note this should really be a virtual class of SequenceFactory - */ -trait IterableView[+UC[B] <: Iterable[B], A] - extends generic.IterableView[UC, A] diff --git a/src/library/scalax/collection/generic/nonvariant/OrderedIterableTemplate.scala b/src/library/scalax/collection/generic/nonvariant/OrderedIterableTemplate.scala deleted file mode 100755 index 6bebf21a11..0000000000 --- a/src/library/scalax/collection/generic/nonvariant/OrderedIterableTemplate.scala +++ /dev/null @@ -1,15 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id: Iterable.scala 15188 2008-05-24 15:01:02Z stepancheg $ - - -package scalax.collection.generic.nonvariant - -trait OrderedIterableTemplate[+CC[B] <: OrderedIterableTemplate[CC, B] with OrderedIterable[B], A] - extends generic.OrderedIterableTemplate[CC, A] {self /*: CC[A]*/ => } diff --git a/src/library/scalax/collection/generic/nonvariant/SequenceFactory.scala b/src/library/scalax/collection/generic/nonvariant/SequenceFactory.scala deleted file mode 100755 index 5c658b0bfb..0000000000 --- a/src/library/scalax/collection/generic/nonvariant/SequenceFactory.scala +++ /dev/null @@ -1,3 +0,0 @@ -package scalax.collection.generic.nonvariant - -trait SequenceFactory[CC[A] <: Sequence[A]] extends IterableFactory[CC] with generic.SequenceFactory[CC] diff --git a/src/library/scalax/collection/generic/nonvariant/SequenceTemplate.scala b/src/library/scalax/collection/generic/nonvariant/SequenceTemplate.scala deleted file mode 100755 index c547b5baff..0000000000 --- a/src/library/scalax/collection/generic/nonvariant/SequenceTemplate.scala +++ /dev/null @@ -1,15 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ - - -package scalax.collection.generic.nonvariant - -trait SequenceTemplate[+CC[B] <: SequenceTemplate[CC, B] with Sequence[B], A] - extends generic.SequenceTemplate[CC, A] {self /*: CC[A]*/ => } diff --git a/src/library/scalax/collection/generic/nonvariant/SequenceView.scala b/src/library/scalax/collection/generic/nonvariant/SequenceView.scala deleted file mode 100755 index 54b94a82d9..0000000000 --- a/src/library/scalax/collection/generic/nonvariant/SequenceView.scala +++ /dev/null @@ -1,21 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ - - -package scalax.collection.generic.nonvariant - - -/** A non-strict projection of an iterable. - * @author Sean McDirmid - * @author Martin Odersky - * @note this should really be a virtual class of SequenceFactory - */ -trait SequenceView[+UC[B] <: Sequence[B], A] - extends IterableView[UC, A] with generic.SequenceView[UC, A] diff --git a/src/library/scalax/collection/generic/nonvariant/VectorTemplate.scala b/src/library/scalax/collection/generic/nonvariant/VectorTemplate.scala deleted file mode 100644 index f0719ea286..0000000000 --- a/src/library/scalax/collection/generic/nonvariant/VectorTemplate.scala +++ /dev/null @@ -1,15 +0,0 @@ -/* __ *\ -** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2003-2009, LAMP/EPFL ** -** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** -** /____/\___/_/ |_/____/_/ | | ** -** |/ ** -\* */ - -// $Id: Sequence.scala 16092 2008-09-12 10:37:06Z nielsen $ - - -package scalax.collection.generic.nonvariant - -trait VectorTemplate[+CC[B] <: VectorTemplate[CC, B] with Vector[B], A] - extends generic.VectorTemplate[CC, A] {self /*: CC[A]*/ => } diff --git a/src/library/scalax/collection/mutable/Vector.scala b/src/library/scalax/collection/mutable/Vector.scala index 28320fea4d..5569bfa283 100644 --- a/src/library/scalax/collection/mutable/Vector.scala +++ b/src/library/scalax/collection/mutable/Vector.scala @@ -12,7 +12,7 @@ package scalax.collection.mutable trait Vector[A] extends collection.Vector[A] with generic.mutable.VectorTemplate[Vector, A] -object Vector extends generic.nonvariant.SequenceFactory[Vector] { +object Vector extends generic.SequenceFactory[Vector] { /** The empty iterable */ def apply[A](args: A*): Vector[A] = new ArrayBuffer[A] ++ args.asInstanceOf[Iterable[A]] // !@! -- cgit v1.2.3