diff options
author | Matthias Zenger <mzenger@gmail.com> | 2003-07-09 15:47:40 +0000 |
---|---|---|
committer | Matthias Zenger <mzenger@gmail.com> | 2003-07-09 15:47:40 +0000 |
commit | 916bc3b9cdcbf2a8d864988dbd1cb3a76197b86d (patch) | |
tree | 1f5b37947ea18866f0cee7cbd999e9193cd5dd07 | |
parent | 1203341cb21b8f29208ac9bab15da34906bde96e (diff) | |
download | scala-916bc3b9cdcbf2a8d864988dbd1cb3a76197b86d.tar.gz scala-916bc3b9cdcbf2a8d864988dbd1cb3a76197b86d.tar.bz2 scala-916bc3b9cdcbf2a8d864988dbd1cb3a76197b86d.zip |
Names are now consistent in the immutable package.
-rw-r--r-- | sources/scala/collection/immutable/Map.scala | 24 | ||||
-rw-r--r-- | sources/scala/collection/immutable/Set.scala | 16 |
2 files changed, 19 insertions, 21 deletions
diff --git a/sources/scala/collection/immutable/Map.scala b/sources/scala/collection/immutable/Map.scala index 7f181884fb..74e0eaa3a8 100644 --- a/sources/scala/collection/immutable/Map.scala +++ b/sources/scala/collection/immutable/Map.scala @@ -16,27 +16,27 @@ trait Map[A, B, This <: Map[A, B, This]]: This with scala.collection.Map[A, B] { def -(key: A): This; - def remove(keys: A*): This = removeElems(keys); + def +(key: A): MapTo = new MapTo(key); - def removeElems(keys: Iterable[A]): This = { - val iter = keys.elements; + def incl(mappings: Pair[A, B]*): This = incl(mappings); + + def incl(map: Iterable[Pair[A, B]]): This = { + val iter = map.elements; var res = this; while (iter.hasNext) { - res = res - iter.next; + val Pair(key, value) = iter.next; + res = res.update(key, value); } res; } - def +(key: A): MapTo = new MapTo(key); - - def add(mappings: Pair[A, B]*): This = addElems(mappings); + def excl(keys: A*): This = excl(keys); - def addElems(map: Iterable[Pair[A, B]]): This = { - val iter = map.elements; + def excl(keys: Iterable[A]): This = { + val iter = keys.elements; var res = this; while (iter.hasNext) { - val Pair(key, value) = iter.next; - res = res.update(key, value); + res = res - iter.next; } res; } @@ -52,7 +52,7 @@ trait Map[A, B, This <: Map[A, B, This]]: This with scala.collection.Map[A, B] { def filter(p: (A, B) => Boolean): This = { var res = this; toList foreach { - case Pair(key, value) => if (p(key, value)) { res = res.remove(key); } + case Pair(key, value) => if (p(key, value)) { res = res.excl(key); } } res; } diff --git a/sources/scala/collection/immutable/Set.scala b/sources/scala/collection/immutable/Set.scala index 993d2c3fa8..5f76065eb2 100644 --- a/sources/scala/collection/immutable/Set.scala +++ b/sources/scala/collection/immutable/Set.scala @@ -14,32 +14,30 @@ trait Set[A, This <: Set[A, This]]: This with scala.collection.Set[A] { def +(elem: A): This; - def add(elems: A*): This = addElems(elems); + def incl(elems: A*): This = incl(elems); - def addElems(that: Iterable[A]): This = { + def incl(that: Iterable[A]): This = { var res = this; - that.elements.foreach(elem => res = res.add(elem)); + that.elements.foreach(elem => res = res + elem); res; } def -(elem: A): This; - def remove(elems: A*): This = removeElems(elems); + def excl(elems: A*): This = excl(elems); - def removeElems(that: Iterable[A]): This = { + def excl(that: Iterable[A]): This = { var res = this; - that.elements.foreach(elem => res = res.remove(elem)); + that.elements.foreach(elem => res = res - elem); res; } def intersect(that: scala.collection.Set[A]): This = filter(that.contains); - def clear: This; - def filter(p: A => Boolean): This = { var res = this; toList foreach { - elem => if (p(elem)) { res = res.remove(elem); } + elem => if (p(elem)) { res = res - elem; } } res; } |