diff options
| author | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-27 19:35:02 +0000 |
|---|---|---|
| committer | Gilles Dubochet <gilles.dubochet@epfl.ch> | 2009-05-27 19:35:02 +0000 |
| commit | cc5e79c9ec9cea8d0f22020b528877d8f6e00153 (patch) | |
| tree | 94e43f77c7b7271b3d0b6f9fb7372ae83b39360d /src/library/scala/collection/immutable/Map.scala | |
| parent | 4b8be5d8bec86358276407d6521c41702ccda835 (diff) | |
| download | scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.gz scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.tar.bz2 scala-cc5e79c9ec9cea8d0f22020b528877d8f6e00153.zip | |
In "Iterable" and in all its subclasses, "itera...
In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).
Diffstat (limited to 'src/library/scala/collection/immutable/Map.scala')
| -rw-r--r-- | src/library/scala/collection/immutable/Map.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/library/scala/collection/immutable/Map.scala b/src/library/scala/collection/immutable/Map.scala index 103d8f3d5a..ef3c3006f0 100644 --- a/src/library/scala/collection/immutable/Map.scala +++ b/src/library/scala/collection/immutable/Map.scala @@ -48,7 +48,7 @@ object Map extends ImmutableMapFactory[Map] { class WithDefault[A, +B](underlying: Map[A, B], d: A => B) extends Map[A, B] { override def size = underlying.size def get(key: A) = underlying.get(key) - def elements = underlying.elements + def iterator = underlying.iterator override def empty = new WithDefault(underlying.empty, d) override def updated[B1 >: B](key: A, value: B1): WithDefault[A, B1] = new WithDefault[A, B1](underlying.updated[B1](key, value), d) def + [B1 >: B](kv: (A, B1)): WithDefault[A, B1] = updated(kv._1, kv._2) @@ -60,7 +60,7 @@ object Map extends ImmutableMapFactory[Map] { class EmptyMap[A, +B] extends Map[A, B] { override def size: Int = 0 def get(key: A): Option[B] = None - def elements: Iterator[(A, B)] = Iterator.empty + def iterator: Iterator[(A, B)] = Iterator.empty override def updated [B1 >: B] (key: A, value: B1): Map[A, B1] = new Map1(key, value) def + [B1 >: B](kv: (A, B1)): Map[A, B1] = updated(kv._1, kv._2) def - (key: A): Map[A, B] = this @@ -71,7 +71,7 @@ object Map extends ImmutableMapFactory[Map] { override def size = 1 def get(key: A): Option[B] = if (key == key1) Some(value1) else None - def elements = Iterator((key1, value1)) + def iterator = Iterator((key1, value1)) override def updated [B1 >: B] (key: A, value: B1): Map[A, B1] = if (key == key1) new Map1(key1, value) else new Map2(key1, value1, key, value) @@ -90,7 +90,7 @@ object Map extends ImmutableMapFactory[Map] { if (key == key1) Some(value1) else if (key == key2) Some(value2) else None - def elements = Iterator((key1, value1), (key2, value2)) + def iterator = Iterator((key1, value1), (key2, value2)) override def updated [B1 >: B] (key: A, value: B1): Map[A, B1] = if (key == key1) new Map2(key1, value, key2, value2) else if (key == key2) new Map2(key1, value1, key2, value) @@ -113,7 +113,7 @@ object Map extends ImmutableMapFactory[Map] { else if (key == key2) Some(value2) else if (key == key3) Some(value3) else None - def elements = Iterator((key1, value1), (key2, value2), (key3, value3)) + def iterator = Iterator((key1, value1), (key2, value2), (key3, value3)) override def updated [B1 >: B] (key: A, value: B1): Map[A, B1] = if (key == key1) new Map3(key1, value, key2, value2, key3, value3) else if (key == key2) new Map3(key1, value1, key2, value, key3, value3) @@ -139,7 +139,7 @@ object Map extends ImmutableMapFactory[Map] { else if (key == key3) Some(value3) else if (key == key4) Some(value4) else None - def elements = Iterator((key1, value1), (key2, value2), (key3, value3), (key4, value4)) + def iterator = Iterator((key1, value1), (key2, value2), (key3, value3), (key4, value4)) override def updated [B1 >: B] (key: A, value: B1): Map[A, B1] = if (key == key1) new Map4(key1, value, key2, value2, key3, value3, key4, value4) else if (key == key2) new Map4(key1, value1, key2, value, key3, value3, key4, value4) |