diff options
author | Seth Tisue <seth@tisue.net> | 2017-02-17 05:41:47 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-17 05:41:47 -0800 |
commit | 1758e0071e35c3859fd53158053b80ca49b1ffbe (patch) | |
tree | 236a579121c8054ba5de0016a37217de652d0610 /src/library/scala | |
parent | d5aad25db74bc5cc8fed6a42b9f81d44b0e29db9 (diff) | |
parent | 6c713793446de4b9c3cf5479b2d21f41eff83552 (diff) | |
download | scala-1758e0071e35c3859fd53158053b80ca49b1ffbe.tar.gz scala-1758e0071e35c3859fd53158053b80ca49b1ffbe.tar.bz2 scala-1758e0071e35c3859fd53158053b80ca49b1ffbe.zip |
Merge pull request #5697 from som-snytt/issue/10164
SI-10164 BitSet.tail zigs where it zagged
Diffstat (limited to 'src/library/scala')
-rw-r--r-- | src/library/scala/collection/BitSetLike.scala | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/library/scala/collection/BitSetLike.scala b/src/library/scala/collection/BitSetLike.scala index 209b00ebf9..f0a70170c2 100644 --- a/src/library/scala/collection/BitSetLike.scala +++ b/src/library/scala/collection/BitSetLike.scala @@ -77,26 +77,26 @@ trait BitSetLike[+This <: BitSetLike[This] with SortedSet[Int]] extends SortedSe def rangeImpl(from: Option[Int], until: Option[Int]): This = { val a = toBitMask val len = a.length - if(from.isDefined) { + if (from.isDefined) { var f = from.get var pos = 0 - while(f >= 64 && pos < len) { + while (f >= 64 && pos < len) { f -= 64 a(pos) = 0 pos += 1 } - if(f > 0 && pos < len) a(pos) &= ~((1L << f)-1) + if (f > 0 && pos < len) a(pos) &= ~((1L << f)-1) } - if(until.isDefined) { + if (until.isDefined) { val u = until.get val w = u / 64 val b = u % 64 var clearw = w+1 - while(clearw < len) { + while (clearw < len) { a(clearw) = 0 clearw += 1 } - if(w < len) a(w) &= (1L << b)-1 + if (w < len) a(w) &= (1L << b)-1 } fromBitMaskNoCopy(a) } @@ -220,7 +220,7 @@ trait BitSetLike[+This <: BitSetLike[This] with SortedSet[Int]] extends SortedSe while (i >= 0) { val wi = word(i) if (wi != 0L) return WordLength*i + 63 - java.lang.Long.numberOfLeadingZeros(wi) - i += 1 + i -= 1 } throw new NoSuchElementException("Empty BitSet") } @@ -230,7 +230,7 @@ trait BitSetLike[+This <: BitSetLike[This] with SortedSet[Int]] extends SortedSe var pre = "" val max = nwords * WordLength var i = 0 - while(i != max) { + while (i != max) { if (contains(i)) { sb append pre append i pre = sep |