summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-10-14 15:50:50 +0000
committerMartin Odersky <odersky@gmail.com>2009-10-14 15:50:50 +0000
commit7e05907065b90c4e2a8b28fb6f246f15ab6294fd (patch)
tree5728c9187b6ae99c1b6c3edd663d3d061c4bb6dd /src
parentc3137e6293289350af9500228fbb48bc48a857bd (diff)
downloadscala-7e05907065b90c4e2a8b28fb6f246f15ab6294fd.tar.gz
scala-7e05907065b90c4e2a8b28fb6f246f15ab6294fd.tar.bz2
scala-7e05907065b90c4e2a8b28fb6f246f15ab6294fd.zip
++: replaced by ++=:
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/mutable/ArrayBuffer.scala2
-rw-r--r--src/library/scala/collection/mutable/BufferLike.scala16
-rw-r--r--src/library/scala/collection/mutable/BufferProxy.scala9
-rw-r--r--src/library/scala/collection/mutable/SynchronizedBuffer.scala4
4 files changed, 16 insertions, 15 deletions
diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala
index 1b2a346b81..f5437d4494 100644
--- a/src/library/scala/collection/mutable/ArrayBuffer.scala
+++ b/src/library/scala/collection/mutable/ArrayBuffer.scala
@@ -101,7 +101,7 @@ class ArrayBuffer[A](override protected val initialSize: Int)
* @param iter the iterable object.
* @return the updated buffer.
*/
- override def ++:(iter: Traversable[A]): this.type = { insertAll(0, iter); this }
+ override def ++=:(iter: Traversable[A]): this.type = { insertAll(0, iter); this }
/** Inserts new elements at the index <code>n</code>. Opposed to method
* <code>update</code>, this method will not replace an element with a
diff --git a/src/library/scala/collection/mutable/BufferLike.scala b/src/library/scala/collection/mutable/BufferLike.scala
index 51554c4782..7788989b1e 100644
--- a/src/library/scala/collection/mutable/BufferLike.scala
+++ b/src/library/scala/collection/mutable/BufferLike.scala
@@ -126,7 +126,10 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]]
*
* @param iter the iterable object.
*/
- def ++:(iter: Traversable[A]): This = { for (x <- iter) x +: this; repr }
+ def ++=:(iter: Traversable[A]): This = { for (x <- iter) x +=: this; repr }
+
+ @deprecated("use ++=: instead")
+ final def ++:(iter: Traversable[A]): This = ++=:(iter)
/** Prepends a number of elements provided by an iterator
* The identity of the buffer is returned.
@@ -134,7 +137,10 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]]
* @param iter the iterator
* @return the updated buffer.
*/
- def ++:(iter: Iterator[A]): This = { for (x <- iter) x +: this; repr }
+ def ++=:(iter: Iterator[A]): This = { for (x <- iter) x +=: this; repr }
+
+ @deprecated("use ++=: instead")
+ final def ++:(iter: Iterator[A]): This = ++=:(iter)
/** Appends elements to this buffer.
*
@@ -153,7 +159,7 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]]
*
* @param elem the element to prepend.
*/
- def prepend(elems: A*) { elems ++: this }
+ def prepend(elems: A*) { elems ++=: this }
/** Prepends a number of elements provided by an iterable object
* via its <code>iterator</code> method. The identity of the
@@ -161,7 +167,7 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]]
*
* @param iter the iterable object.
*/
- def prependAll(iter: Traversable[A]) { iter ++: this }
+ def prependAll(iter: Traversable[A]) { iter ++=: this }
/** Prepends a number of elements provided by an iterable object
* via its <code>iterator</code> method. The identity of the
@@ -169,7 +175,7 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]]
*
* @param iter the iterable object.
*/
- def prependAll(iter: Iterator[A]) { iter ++: this }
+ def prependAll(iter: Iterator[A]) { iter ++=: this }
/** Inserts new elements at the index <code>n</code>. Opposed to method
* <code>update</code>, this method will not replace an element with a
diff --git a/src/library/scala/collection/mutable/BufferProxy.scala b/src/library/scala/collection/mutable/BufferProxy.scala
index 6468896510..343233e351 100644
--- a/src/library/scala/collection/mutable/BufferProxy.scala
+++ b/src/library/scala/collection/mutable/BufferProxy.scala
@@ -86,13 +86,8 @@ trait BufferProxy[A] extends Buffer[A] with Proxy {
*/
def +=:(elem: A): Buffer[A] = self.+=:(elem)
- /** Prepends a number of elements provided by an iterable object
- * via its <code>iterator</code> method. The identity of the
- * buffer is returned.
- *
- * @param iter the iterable object.
- */
- def ++:(iter: scala.collection.Iterable[A]): Buffer[A] = self.++:(iter)
+ override def ++=:(iter: scala.collection.Traversable[A]): Buffer[A] = self.++=:(iter)
+ override def ++=:(iter: scala.collection.Iterator[A]): Buffer[A] = self.++=:(iter)
/** Prepend an element to this list.
*
diff --git a/src/library/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
index 7da96f1e61..590757be61 100644
--- a/src/library/scala/collection/mutable/SynchronizedBuffer.scala
+++ b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
@@ -105,8 +105,8 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
*
* @param iter the iterable object.
*/
- override def ++:(iter: Traversable[A]): Buffer[A] = synchronized {
- super.++:(iter)
+ override def ++=:(iter: Traversable[A]): Buffer[A] = synchronized {
+ super.++=:(iter)
}
/** Prepend an element to this list.