summaryrefslogtreecommitdiff
path: root/src/library/scala/collection/mutable/FlatHashTable.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-09-18 00:09:46 -0700
committerPaul Phillips <paulp@improving.org>2013-09-18 07:13:38 -0700
commitf4267ccd96a9143c910c66a5b0436aaa64b7c9dc (patch)
tree174861715807c23ba332f78769a9f7e1377b7f02 /src/library/scala/collection/mutable/FlatHashTable.scala
parentd45a3c8cc8e9f1d95d797d548a85abd8597f5bc7 (diff)
downloadscala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.tar.gz
scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.tar.bz2
scala-f4267ccd96a9143c910c66a5b0436aaa64b7c9dc.zip
Cull extraneous whitespace.
One last flurry with the broom before I leave you slobs to code in your own filth. Eliminated all the trailing whitespace I could manage, with special prejudice reserved for the test cases which depended on the preservation of trailing whitespace. Was reminded I cannot figure out how to eliminate the trailing space on the "scala> " prompt in repl transcripts. At least reduced the number of such empty prompts by trimming transcript code on the way in. Routed ConsoleReporter's "printMessage" through a trailing whitespace stripping method which might help futureproof against the future of whitespace diseases. Deleted the up-to-40 lines of trailing whitespace found in various library files. It seems like only yesterday we performed whitespace surgery on the whole repo. Clearly it doesn't stick very well. I suggest it would work better to enforce a few requirements on the way in.
Diffstat (limited to 'src/library/scala/collection/mutable/FlatHashTable.scala')
-rw-r--r--src/library/scala/collection/mutable/FlatHashTable.scala22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala
index 1cdf150cb8..293faeca2d 100644
--- a/src/library/scala/collection/mutable/FlatHashTable.scala
+++ b/src/library/scala/collection/mutable/FlatHashTable.scala
@@ -107,7 +107,7 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {
}
/** Finds an entry in the hash table if such an element exists. */
- protected def findEntry(elem: A): Option[A] =
+ protected def findEntry(elem: A): Option[A] =
findElemImpl(elem) match {
case null => None
case entry => Some(entryToElem(entry))
@@ -136,10 +136,10 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {
protected def addElem(elem: A) : Boolean = {
addEntry(elemToEntry(elem))
}
-
+
/**
* Add an entry (an elem converted to an entry via elemToEntry) if not yet in
- * table.
+ * table.
* @return Returns `true` if a new elem was added, `false` otherwise.
*/
protected def addEntry(newEntry : AnyRef) : Boolean = {
@@ -156,10 +156,10 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {
nnSizeMapAdd(h)
if (tableSize >= threshold) growTable()
true
-
+
}
- /**
+ /**
* Removes an elem from the hash table returning true if the element was found (and thus removed)
* or false if it didn't exist.
*/
@@ -231,7 +231,7 @@ trait FlatHashTable[A] extends FlatHashTable.HashUtils[A] {
if (table(i) != null && !containsElem(entryToElem(table(i))))
assert(assertion = false, i+" "+table(i)+" "+table.mkString)
}
-
+
/* Size map handling code */
@@ -374,7 +374,7 @@ private[collection] object FlatHashTable {
final def seedGenerator = new ThreadLocal[scala.util.Random] {
override def initialValue = new scala.util.Random
}
-
+
private object NullSentinel {
override def hashCode = 0
override def toString = "NullSentinel"
@@ -421,18 +421,18 @@ private[collection] object FlatHashTable {
val rotated = (improved >>> rotation) | (improved << (32 - rotation))
rotated
}
-
+
/**
* Elems have type A, but we store AnyRef in the table. Plus we need to deal with
* null elems, which need to be stored as NullSentinel
*/
- protected final def elemToEntry(elem : A) : AnyRef =
+ protected final def elemToEntry(elem : A) : AnyRef =
if (null == elem) NullSentinel else elem.asInstanceOf[AnyRef]
-
+
/**
* Does the inverse translation of elemToEntry
*/
- protected final def entryToElem(entry : AnyRef) : A =
+ protected final def entryToElem(entry : AnyRef) : A =
(if (entry.isInstanceOf[NullSentinel.type]) null else entry).asInstanceOf[A]
}