diff options
| author | Martin Odersky <odersky@gmail.com> | 2009-01-12 11:53:53 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2009-01-12 11:53:53 +0000 |
| commit | cc5695df4172262670f4b5b14704afb1e0a1483f (patch) | |
| tree | 29e6fd7df735f1ea83cbcbc3a0052e406e3cbbca /src/library | |
| parent | d215c743751a45004e6018f0c2272cb1fcaae725 (diff) | |
| download | scala-cc5695df4172262670f4b5b14704afb1e0a1483f.tar.gz scala-cc5695df4172262670f4b5b14704afb1e0a1483f.tar.bz2 scala-cc5695df4172262670f4b5b14704afb1e0a1483f.zip | |
removed colelction.generic.nonvariant
Diffstat (limited to 'src/library')
9 files changed, 1 insertions, 116 deletions
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 - * <code>elements</code> which returns an iterator over all the - * elements contained in the collection. - * - * @note If a collection has a known <code>size</code>, it should also sub-type <code>Collection</code>. - * Only potentially unbounded collections should directly sub-class <code>Iterable</code>. - * @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]] // !@! |