summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-04-08 14:16:31 +0000
committerAleksandar Pokopec <aleksandar.prokopec@epfl.ch>2010-04-08 14:16:31 +0000
commit24bc8b350a9a54b5286fa5fbdf308dd34c2a736e (patch)
tree59cf7393e420faefaca1c72002b7b41a76f790b7
parent67959c59138e01a141a4eb9813b0063a2a1693f7 (diff)
downloadscala-24bc8b350a9a54b5286fa5fbdf308dd34c2a736e.tar.gz
scala-24bc8b350a9a54b5286fa5fbdf308dd34c2a736e.tar.bz2
scala-24bc8b350a9a54b5286fa5fbdf308dd34c2a736e.zip
Another set of typos fixed.
-rw-r--r--src/library/scala/collection/DefaultMap.scala2
-rw-r--r--src/library/scala/collection/IterableLike.scala8
-rw-r--r--src/library/scala/collection/Map.scala2
-rw-r--r--src/library/scala/collection/SeqLike.scala6
-rw-r--r--src/library/scala/collection/TraversableLike.scala4
-rw-r--r--src/library/scala/collection/generic/GenericTraversableTemplate.scala1
-rw-r--r--src/library/scala/collection/interfaces/TraversableMethods.scala2
7 files changed, 14 insertions, 11 deletions
diff --git a/src/library/scala/collection/DefaultMap.scala b/src/library/scala/collection/DefaultMap.scala
index 6dd922a5b1..4ac4ad66c5 100644
--- a/src/library/scala/collection/DefaultMap.scala
+++ b/src/library/scala/collection/DefaultMap.scala
@@ -14,7 +14,7 @@ package scala.collection
import generic._
/** <p>
- * A default map which implements the <code>updated</code> and <code>-</code>
+ * A default map which implements the <code>+</code> and <code>-</code>
* methods of maps.<br/>
* Instances that inherit from <code>DefaultMap[A, B]</code> still have to
* define:
diff --git a/src/library/scala/collection/IterableLike.scala b/src/library/scala/collection/IterableLike.scala
index 6f88c72ffd..e348ba12e5 100644
--- a/src/library/scala/collection/IterableLike.scala
+++ b/src/library/scala/collection/IterableLike.scala
@@ -228,7 +228,7 @@ self =>
* @param bf $zipbfinfo
* @return a new collection of type `That` containing pairs consisting of
* corresponding elements of this $coll and `that`. The length
- * of the returned collection is the minimum of the lengths of this $coll$ and `that`.
+ * of the returned collection is the minimum of the lengths of this $coll and `that`.
*
* @usecase def zip[B](that: Iterable[B]): $Coll[(A, B)]
*
@@ -236,7 +236,7 @@ self =>
* @tparam B the type of the second half of the returned pairs
* @return a new $coll containing pairs consisting of
* corresponding elements of this $coll and `that`. The length
- * of the returned collection is the minimum of the lengths of this $coll$ and `that`.
+ * of the returned collection is the minimum of the lengths of this $coll and `that`.
*/
def zip[A1 >: A, B, That](that: Iterable[B])(implicit bf: CanBuildFrom[Repr, (A1, B), That]): That = {
val b = bf(repr)
@@ -259,7 +259,7 @@ self =>
* @param thatElem the element to be used to fill up the result if `that` is shorter than this $coll.
* @return a new collection of type `That` containing pairs consisting of
* corresponding elements of this $coll and `that`. The length
- * of the returned collection is the maximum of the lengths of this $coll$ and `that`.
+ * of the returned collection is the maximum of the lengths of this $coll and `that`.
* If this $coll is shorter than `that`, `thisElem` values are used to pad the result.
* If `that` is shorter than this $coll, `thatElem` values are used to pad the result.
*
@@ -271,7 +271,7 @@ self =>
* @tparam B the type of the second half of the returned pairs
* @return a new $coll containing pairs consisting of
* corresponding elements of this $coll and `that`. The length
- * of the returned collection is the maximum of the lengths of this $coll$ and `that`.
+ * of the returned collection is the maximum of the lengths of this $coll and `that`.
* If this $coll is shorter than `that`, `thisElem` values are used to pad the result.
* If `that` is shorter than this $coll, `thatElem` values are used to pad the result.
*/
diff --git a/src/library/scala/collection/Map.scala b/src/library/scala/collection/Map.scala
index c5d7b03687..9d44a950de 100644
--- a/src/library/scala/collection/Map.scala
+++ b/src/library/scala/collection/Map.scala
@@ -23,7 +23,7 @@ import generic._
* <b>def</b> + [B1 >: B](kv: (A, B1)): This
* <b>def</b> -(key: A): This</pre>
* <p>
- * If you wish that methods like, take, drop, filter return the same kind
+ * If you wish that methods like `take`, `drop`, `filter` return the same kind
* of map, you should also override:
* </p><pre>
* <b>def</b> empty: This</pre>
diff --git a/src/library/scala/collection/SeqLike.scala b/src/library/scala/collection/SeqLike.scala
index 3d47bcad71..6c33873820 100644
--- a/src/library/scala/collection/SeqLike.scala
+++ b/src/library/scala/collection/SeqLike.scala
@@ -523,7 +523,7 @@ trait SeqLike[+A, +Repr] extends IterableLike[A, Repr] { self =>
*
* Another way to express this
* is that `xs union ys` computes the order-presevring multi-set union of `xs` and `ys`.
- * `union` is hence a counter-oart of `diff` and `intersect` which also work on multi-sets.
+ * `union` is hence a counter-part of `diff` and `intersect` which also work on multi-sets.
*
* $willNotTerminateInf
*
@@ -552,7 +552,7 @@ trait SeqLike[+A, +Repr] extends IterableLike[A, Repr] { self =>
* If an element value `x` appears
* ''n'' times in `that`, then the first ''n'' occurrences of `x` will not form
* part of the result, but any following occurrences will.
- * @usecase def union(that: Seq[A]): $Coll[A]
+ * @usecase def diff(that: Seq[A]): $Coll[A]
* @return a new $coll which contains all elements of this $coll
* except some of occurrences of elements that also appear in `that`.
* If an element value `x` appears
@@ -580,7 +580,7 @@ trait SeqLike[+A, +Repr] extends IterableLike[A, Repr] { self =>
* If an element value `x` appears
* ''n'' times in `that`, then the first ''n'' occurrences of `x` will be retained
* in the result, but any following occurrences will be omitted.
- * @usecase def union(that: Seq[A]): $Coll[A]
+ * @usecase def intersect(that: Seq[A]): $Coll[A]
* @return a new $coll which contains all elements of this $coll
* which also appear in `that`.
* If an element value `x` appears
diff --git a/src/library/scala/collection/TraversableLike.scala b/src/library/scala/collection/TraversableLike.scala
index 0bbc9c40d1..a220bda833 100644
--- a/src/library/scala/collection/TraversableLike.scala
+++ b/src/library/scala/collection/TraversableLike.scala
@@ -743,7 +743,7 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] with Traversable
* @return an object of class `WithFilter`, which supports
* `map`, `flatMap`, `foreach`, and `withFilter` operations.
* All these operations apply to those elements of this $coll which
- * satify the predicate `p`.
+ * satisfy the predicate `p`.
*/
def withFilter(p: A => Boolean): WithFilter = new WithFilter(p)
@@ -820,7 +820,7 @@ trait TraversableLike[+A, +Repr] extends HasNewBuilder[A, Repr] with Traversable
* @return an object of class `WithFilter`, which supports
* `map`, `flatMap`, `foreach`, and `withFilter` operations.
* All these operations apply to those elements of this $coll which
- * satify the predicate `q` in addition to the predicate `p`.
+ * satisfy the predicate `q` in addition to the predicate `p`.
*/
def withFilter(q: A => Boolean): WithFilter =
new WithFilter(x => p(x) && q(x))
diff --git a/src/library/scala/collection/generic/GenericTraversableTemplate.scala b/src/library/scala/collection/generic/GenericTraversableTemplate.scala
index 683f609686..ecbfa8c20c 100644
--- a/src/library/scala/collection/generic/GenericTraversableTemplate.scala
+++ b/src/library/scala/collection/generic/GenericTraversableTemplate.scala
@@ -100,6 +100,7 @@ trait GenericTraversableTemplate[+A, +CC[X] <: Traversable[X]] extends HasNewBui
}
/** Transposes this $coll of traversable collections into
+ * a $coll of ${coll}s.
* @tparam B the type of the elements of each traversable collection.
* @param asTraversable an implicit conversion which asserts that the element type of this
* $coll is a `Traversable`.
diff --git a/src/library/scala/collection/interfaces/TraversableMethods.scala b/src/library/scala/collection/interfaces/TraversableMethods.scala
index 1fc2451ec0..7ec878b3d3 100644
--- a/src/library/scala/collection/interfaces/TraversableMethods.scala
+++ b/src/library/scala/collection/interfaces/TraversableMethods.scala
@@ -25,6 +25,8 @@ trait TraversableMethods[+A, +This <: TraversableLike[A, This] with Traversable[
def flatMap[B, That](f: A => Traversable[B])(implicit bf: CanBuildFrom[This, B, That]): That
def map[B, That](f: A => B)(implicit bf: CanBuildFrom[This, B, That]): That
def collect[B, That](pf: PartialFunction[A, B])(implicit bf: CanBuildFrom[This, B, That]): That
+ def scanLeft[B, That](z: B)(op: (B, A) => B)(implicit bf: CanBuildFrom[This, B, That]): That // could be fold or new collection too - where to put it?
+ def scanRight[B, That](z: B)(op: (A, B) => B)(implicit bf: CanBuildFrom[This, B, That]): That
// new collections
def ++[B >: A, That](xs: TraversableOnce[B])(implicit bf: CanBuildFrom[This, B, That]): That