summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/collection/mutable/RedBlackTree.scala2
-rw-r--r--src/library/scala/collection/mutable/TreeMap.scala4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/library/scala/collection/mutable/RedBlackTree.scala b/src/library/scala/collection/mutable/RedBlackTree.scala
index 7f12264d45..a3be011ae2 100644
--- a/src/library/scala/collection/mutable/RedBlackTree.scala
+++ b/src/library/scala/collection/mutable/RedBlackTree.scala
@@ -55,7 +55,9 @@ private[collection] object RedBlackTree {
// ---- size ----
def size(node: Node[_, _]): Int = if (node eq null) 0 else 1 + size(node.left) + size(node.right)
+ def size(tree: Tree[_, _]): Int = tree.size
def isEmpty(tree: Tree[_, _]) = tree.root eq null
+ def clear(tree: Tree[_, _]): Unit = { tree.root = null; tree.size = 0 }
// ---- search ----
diff --git a/src/library/scala/collection/mutable/TreeMap.scala b/src/library/scala/collection/mutable/TreeMap.scala
index 244cc18735..b96cef5bee 100644
--- a/src/library/scala/collection/mutable/TreeMap.scala
+++ b/src/library/scala/collection/mutable/TreeMap.scala
@@ -64,7 +64,7 @@ sealed class TreeMap[A, B] private (tree: RB.Tree[A, B])(implicit val ordering:
def keysIteratorFrom(start: A) = RB.keysIterator(tree, Some(start))
def valuesIteratorFrom(start: A) = RB.valuesIterator(tree, Some(start))
- override def size = tree.size
+ override def size = RB.size(tree)
override def isEmpty = RB.isEmpty(tree)
override def contains(key: A) = RB.contains(tree, key)
@@ -78,7 +78,7 @@ sealed class TreeMap[A, B] private (tree: RB.Tree[A, B])(implicit val ordering:
override def foreach[U](f: ((A, B)) => U): Unit = RB.foreach(tree, f)
override def transform(f: (A, B) => B) = { RB.transform(tree, f); this }
- override def clear(): Unit = tree.root = null
+ override def clear(): Unit = RB.clear(tree)
override def stringPrefix = "TreeMap"