From affa98fa54893830b88a9ebebd5d29740f10114c Mon Sep 17 00:00:00 2001 From: James Iry Date: Fri, 4 Jan 2013 19:41:00 -0800 Subject: SI-6916 makes FlatHashTable#remove a Boolean not Option[A] Makes FlatHashTable#remove return a boolean instead of Option[A]. Updates HashSet accordingly. Adds a test to make sure remove works as advertised. --- src/library/scala/collection/mutable/FlatHashTable.scala | 11 +++++++---- src/library/scala/collection/mutable/HashSet.scala | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala index 9f7193495d..7f4a8d1cbd 100644 --- a/src/library/scala/collection/mutable/FlatHashTable.scala +++ b/src/library/scala/collection/mutable/FlatHashTable.scala @@ -160,8 +160,11 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] { } - /** Removes an elem from the hash table, returning an option value with the element, or `None` if it didn't exist. */ - protected def removeElem(elem: A) : Option[A] = { + /** + * Removes an elem from the hash table returning true if the element was found (and thus removed) + * or false if it didn't exist. + */ + protected def removeElem(elem: A) : Boolean = { if (tableDebug) checkConsistent() def precedes(i: Int, j: Int) = { val d = table.length >> 1 @@ -189,12 +192,12 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] { tableSize -= 1 nnSizeMapRemove(h0) if (tableDebug) checkConsistent() - return Some(entryToElem(curEntry)) + return true } h = (h + 1) % table.length curEntry = table(h) } - None + false } protected def iterator: Iterator[A] = new AbstractIterator[A] { diff --git a/src/library/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala index cbbb4aaa5a..b5fa557687 100644 --- a/src/library/scala/collection/mutable/HashSet.scala +++ b/src/library/scala/collection/mutable/HashSet.scala @@ -63,7 +63,7 @@ extends AbstractSet[A] override def add(elem: A): Boolean = addElem(elem) - override def remove(elem: A): Boolean = removeElem(elem).isDefined + override def remove(elem: A): Boolean = removeElem(elem) override def clear() { clearTable() } -- cgit v1.2.3