summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-10-13 17:07:32 +0000
committerMartin Odersky <odersky@gmail.com>2009-10-13 17:07:32 +0000
commit5bfb4e7a569f779c5d0b06bb5c22bae515314033 (patch)
tree488011cf63e02c80b398b9cc8ffad4a4b75c1990 /src/library
parente76f8f00cd4fea45de53dc196cc77336958f8125 (diff)
downloadscala-5bfb4e7a569f779c5d0b06bb5c22bae515314033.tar.gz
scala-5bfb4e7a569f779c5d0b06bb5c22bae515314033.tar.bz2
scala-5bfb4e7a569f779c5d0b06bb5c22bae515314033.zip
Changed mutable +: to +=:
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/collection/JavaConversions.scala2
-rw-r--r--src/library/scala/collection/mutable/ArrayBuffer.scala2
-rw-r--r--src/library/scala/collection/mutable/BufferLike.scala5
-rw-r--r--src/library/scala/collection/mutable/BufferProxy.scala2
-rw-r--r--src/library/scala/collection/mutable/ListBuffer.scala2
-rw-r--r--src/library/scala/collection/mutable/ObservableBuffer.scala4
-rw-r--r--src/library/scala/collection/mutable/SynchronizedBuffer.scala4
7 files changed, 12 insertions, 9 deletions
diff --git a/src/library/scala/collection/JavaConversions.scala b/src/library/scala/collection/JavaConversions.scala
index dbac5a564c..b19abf6271 100644
--- a/src/library/scala/collection/JavaConversions.scala
+++ b/src/library/scala/collection/JavaConversions.scala
@@ -359,7 +359,7 @@ object JavaConversions {
override def iterator : Iterator[A] = underlying.iterator
def apply(i : Int) = underlying.get(i)
def update(i : Int, elem : A) = underlying.set(i, elem)
- def +:(elem : A) = { underlying.subList(0, 0).add(elem) ; this }
+ def +=:(elem : A) = { underlying.subList(0, 0).add(elem) ; this }
def +=(elem : A): this.type = { underlying.add(elem); this }
def insertAll(i : Int, elems : Traversable[A]) = { val ins = underlying.subList(0, i) ; elems.foreach(ins.add(_)) }
def remove(i : Int) = underlying.remove(i)
diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala
index 6c2f092505..1b2a346b81 100644
--- a/src/library/scala/collection/mutable/ArrayBuffer.scala
+++ b/src/library/scala/collection/mutable/ArrayBuffer.scala
@@ -86,7 +86,7 @@ class ArrayBuffer[A](override protected val initialSize: Int)
* @param elem the element to append.
* @return the updated buffer.
*/
- def +:(elem: A): this.type = {
+ def +=:(elem: A): this.type = {
ensureSize(size0 + 1)
copy(0, 1, size0)
array(0) = elem.asInstanceOf[AnyRef]
diff --git a/src/library/scala/collection/mutable/BufferLike.scala b/src/library/scala/collection/mutable/BufferLike.scala
index a1506ce6ed..51554c4782 100644
--- a/src/library/scala/collection/mutable/BufferLike.scala
+++ b/src/library/scala/collection/mutable/BufferLike.scala
@@ -76,7 +76,10 @@ trait BufferLike[A, +This <: BufferLike[A, This] with Buffer[A]]
* the identity of the buffer.
* @param elem the element to prepend.
*/
- def +:(elem: A): This
+ def +=:(elem: A): This
+
+ @deprecated("use `+=:' instead")
+ final def +:(elem: A): This = +=:(elem)
/** 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 68e25f71ea..6468896510 100644
--- a/src/library/scala/collection/mutable/BufferProxy.scala
+++ b/src/library/scala/collection/mutable/BufferProxy.scala
@@ -84,7 +84,7 @@ trait BufferProxy[A] extends Buffer[A] with Proxy {
*
* @param elem the element to append.
*/
- def +:(elem: A): Buffer[A] = self.+:(elem)
+ 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
diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala
index fa8d777977..483c516e30 100644
--- a/src/library/scala/collection/mutable/ListBuffer.scala
+++ b/src/library/scala/collection/mutable/ListBuffer.scala
@@ -114,7 +114,7 @@ final class ListBuffer[A]
* @param x the element to prepend.
* @return this buffer.
*/
- def +: (x: A): this.type = {
+ def +=: (x: A): this.type = {
if (exported) copy()
val newElem = new :: (x, start)
if (start.isEmpty) last0 = newElem
diff --git a/src/library/scala/collection/mutable/ObservableBuffer.scala b/src/library/scala/collection/mutable/ObservableBuffer.scala
index 200ffbb223..e1cd8ace4d 100644
--- a/src/library/scala/collection/mutable/ObservableBuffer.scala
+++ b/src/library/scala/collection/mutable/ObservableBuffer.scala
@@ -36,8 +36,8 @@ trait ObservableBuffer[A, This <: ObservableBuffer[A, This]]
this
}
- abstract override def +:(element: A): this.type = {
- super.+:(element)
+ abstract override def +=:(element: A): this.type = {
+ super.+=:(element)
publish(new Include(Start, element) with Undoable {
def undo() { trimStart(1) }
})
diff --git a/src/library/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
index a089572f98..7da96f1e61 100644
--- a/src/library/scala/collection/mutable/SynchronizedBuffer.scala
+++ b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
@@ -95,8 +95,8 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
*
* @param elem the element to append.
*/
- abstract override def +:(elem: A): Buffer[A] = synchronized {
- super.+:(elem)
+ abstract override def +=:(elem: A): Buffer[A] = synchronized {
+ super.+=:(elem)
}
/** Prepends a number of elements provided by an iterable object