Changed >> to >>> in Vector to unify style

Unified, since indices are always positive and unsigned shift was already used in other places

1 files changed, 118 insertions, 118 deletions

diff --git a/src/library/scala/collection/immutable/Vector.scala b/src/library/scala/collection/immutable/Vector.scala
index 034691aea2..843fc9af55 100644
--- a/src/library/scala/collection/immutable/Vector.scala
+++ b/src/library/scala/collection/immutable/Vector.scala
@@ -117,7 +117,7 @@ extends AbstractSeq[A]
 
   private def checkRangeConvert(index: Int) = {
     val idx = index + startIndex
-    if (0 <= index && idx < endIndex)
+    if (index >= 0 && idx < endIndex)
       idx
     else
       throw new IndexOutOfBoundsException(index.toString)
@@ -221,11 +221,11 @@ extends AbstractSeq[A]
         val again = if (!that.isTraversableAgain) that.toVector else that.seq
         again.size match {
           // Often it's better to append small numbers of elements (or prepend if RHS is a vector)
-          case n if n <= TinyAppendFaster || n < (this.size >> Log2ConcatFaster) =>
+          case n if n <= TinyAppendFaster || n < (this.size >>> Log2ConcatFaster) =>
             var v: Vector[B] = this
             for (x <- again) v = v :+ x
             v.asInstanceOf[That]
-          case n if this.size < (n >> Log2ConcatFaster) && again.isInstanceOf[Vector[_]] =>
+          case n if this.size < (n >>> Log2ConcatFaster) && again.isInstanceOf[Vector[_]] =>
             var v = again.asInstanceOf[Vector[B]]
             val ri = this.reverseIterator
             while (ri.hasNext) v = ri.next +: v
@@ -730,15 +730,15 @@ private[immutable] trait VectorPointer[T] {
       if        (xor < (1 <<  5)) { // level = 0
         display0(index & 31).asInstanceOf[T]
       } else if (xor < (1 << 10)) { // level = 1
-        display1((index >>  5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
+        display1((index >>>  5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
       } else if (xor < (1 << 15)) { // level = 2
-        display2((index >> 10) & 31).asInstanceOf[Array[AnyRef]]((index >>  5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
+        display2((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]((index >>>  5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
       } else if (xor < (1 << 20)) { // level = 3
-        display3((index >> 15) & 31).asInstanceOf[Array[AnyRef]]((index >> 10) & 31).asInstanceOf[Array[AnyRef]]((index >>  5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
+        display3((index >>> 15) & 31).asInstanceOf[Array[AnyRef]]((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]((index >>>  5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
       } else if (xor < (1 << 25)) { // level = 4
-        display4((index >> 20) & 31).asInstanceOf[Array[AnyRef]]((index >> 15) & 31).asInstanceOf[Array[AnyRef]]((index >> 10) & 31).asInstanceOf[Array[AnyRef]]((index >>  5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
+        display4((index >>> 20) & 31).asInstanceOf[Array[AnyRef]]((index >>> 15) & 31).asInstanceOf[Array[AnyRef]]((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]((index >>>  5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
       } else if (xor < (1 << 30)) { // level = 5
-        display5((index >> 25) & 31).asInstanceOf[Array[AnyRef]]((index >> 20) & 31).asInstanceOf[Array[AnyRef]]((index >> 15) & 31).asInstanceOf[Array[AnyRef]]((index >> 10) & 31).asInstanceOf[Array[AnyRef]]((index >> 5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
+        display5((index >>> 25) & 31).asInstanceOf[Array[AnyRef]]((index >>> 20) & 31).asInstanceOf[Array[AnyRef]]((index >>> 15) & 31).asInstanceOf[Array[AnyRef]]((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]((index >>> 5) & 31).asInstanceOf[Array[AnyRef]](index & 31).asInstanceOf[T]
       } else {                      // level = 6
         throw new IllegalArgumentException()
       }
@@ -751,25 +751,25 @@ private[immutable] trait VectorPointer[T] {
       if        (xor < (1 <<  5)) { // level = 0
         // we're already at the block start pos
       } else if (xor < (1 << 10)) { // level = 1
-        display0 = display1((index >>  5) & 31).asInstanceOf[Array[AnyRef]]
+        display0 = display1((index >>>  5) & 31).asInstanceOf[Array[AnyRef]]
       } else if (xor < (1 << 15)) { // level = 2
-        display1 = display2((index >> 10) & 31).asInstanceOf[Array[AnyRef]]
-        display0 = display1((index >>  5) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display0 = display1((index >>>  5) & 31).asInstanceOf[Array[AnyRef]]
       } else if (xor < (1 << 20)) { // level = 3
-        display2 = display3((index >> 15) & 31).asInstanceOf[Array[AnyRef]]
-        display1 = display2((index >> 10) & 31).asInstanceOf[Array[AnyRef]]
-        display0 = display1((index >>  5) & 31).asInstanceOf[Array[AnyRef]]
+        display2 = display3((index >>> 15) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display0 = display1((index >>>  5) & 31).asInstanceOf[Array[AnyRef]]
       } else if (xor < (1 << 25)) { // level = 4
-        display3 = display4((index >> 20) & 31).asInstanceOf[Array[AnyRef]]
-        display2 = display3((index >> 15) & 31).asInstanceOf[Array[AnyRef]]
-        display1 = display2((index >> 10) & 31).asInstanceOf[Array[AnyRef]]
-        display0 = display1((index >>  5) & 31).asInstanceOf[Array[AnyRef]]
+        display3 = display4((index >>> 20) & 31).asInstanceOf[Array[AnyRef]]
+        display2 = display3((index >>> 15) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display0 = display1((index >>>  5) & 31).asInstanceOf[Array[AnyRef]]
       } else if (xor < (1 << 30)) { // level = 5
-        display4 = display5((index >> 25) & 31).asInstanceOf[Array[AnyRef]]
-        display3 = display4((index >> 20) & 31).asInstanceOf[Array[AnyRef]]
-        display2 = display3((index >> 15) & 31).asInstanceOf[Array[AnyRef]]
-        display1 = display2((index >> 10) & 31).asInstanceOf[Array[AnyRef]]
-        display0 = display1((index >>  5) & 31).asInstanceOf[Array[AnyRef]]
+        display4 = display5((index >>> 25) & 31).asInstanceOf[Array[AnyRef]]
+        display3 = display4((index >>> 20) & 31).asInstanceOf[Array[AnyRef]]
+        display2 = display3((index >>> 15) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display0 = display1((index >>>  5) & 31).asInstanceOf[Array[AnyRef]]
       } else {                      // level = 6
         throw new IllegalArgumentException()
       }
@@ -780,21 +780,21 @@ private[immutable] trait VectorPointer[T] {
     // xor: oldIndex ^ index
     private[immutable] final def gotoNextBlockStart(index: Int, xor: Int): Unit = { // goto block start pos
       if        (xor < (1 << 10)) { // level = 1
-        display0 = display1((index >>  5) & 31).asInstanceOf[Array[AnyRef]]
+        display0 = display1((index >>>  5) & 31).asInstanceOf[Array[AnyRef]]
       } else if (xor < (1 << 15)) { // level = 2
-        display1 = display2((index >> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((index >>> 10) & 31).asInstanceOf[Array[AnyRef]]
         display0 = display1(0).asInstanceOf[Array[AnyRef]]
       } else if (xor < (1 << 20)) { // level = 3
-        display2 = display3((index >> 15) & 31).asInstanceOf[Array[AnyRef]]
+        display2 = display3((index >>> 15) & 31).asInstanceOf[Array[AnyRef]]
         display1 = display2(0).asInstanceOf[Array[AnyRef]]
         display0 = display1(0).asInstanceOf[Array[AnyRef]]
       } else if (xor < (1 << 25)) { // level = 4
-        display3 = display4((index >> 20) & 31).asInstanceOf[Array[AnyRef]]
+        display3 = display4((index >>> 20) & 31).asInstanceOf[Array[AnyRef]]
         display2 = display3(0).asInstanceOf[Array[AnyRef]]
         display1 = display2(0).asInstanceOf[Array[AnyRef]]
         display0 = display1(0).asInstanceOf[Array[AnyRef]]
       } else if (xor < (1 << 30)) { // level = 5
-        display4 = display5((index >> 25) & 31).asInstanceOf[Array[AnyRef]]
+        display4 = display5((index >>> 25) & 31).asInstanceOf[Array[AnyRef]]
         display3 = display4(0).asInstanceOf[Array[AnyRef]]
         display2 = display3(0).asInstanceOf[Array[AnyRef]]
         display1 = display2(0).asInstanceOf[Array[AnyRef]]
@@ -813,15 +813,15 @@ private[immutable] trait VectorPointer[T] {
           display1 = new Array(32); display1(0) = display0; depth += 1
         }
         display0 = new Array(32)
-        display1((index >>  5) & 31) = display0
+        display1((index >>>  5) & 31) = display0
       } else if (xor < (1 << 15)) { // level = 2
         if (depth == 2) {
           display2 = new Array(32); display2(0) = display1; depth += 1
         }
         display0 = new Array(32)
         display1 = new Array(32)
-        display1((index >>  5) & 31) = display0
-        display2((index >> 10) & 31) = display1
+        display1((index >>>  5) & 31) = display0
+        display2((index >>> 10) & 31) = display1
       } else if (xor < (1 << 20)) { // level = 3
         if (depth == 3) {
           display3 = new Array(32); display3(0) = display2; depth += 1
@@ -829,9 +829,9 @@ private[immutable] trait VectorPointer[T] {
         display0 = new Array(32)
         display1 = new Array(32)
         display2 = new Array(32)
-        display1((index >>  5) & 31) = display0
-        display2((index >> 10) & 31) = display1
-        display3((index >> 15) & 31) = display2
+        display1((index >>>  5) & 31) = display0
+        display2((index >>> 10) & 31) = display1
+        display3((index >>> 15) & 31) = display2
       } else if (xor < (1 << 25)) { // level = 4
         if (depth == 4) {
           display4 = new Array(32); display4(0) = display3; depth += 1
@@ -840,10 +840,10 @@ private[immutable] trait VectorPointer[T] {
         display1 = new Array(32)
         display2 = new Array(32)
         display3 = new Array(32)
-        display1((index >>  5) & 31) = display0
-        display2((index >> 10) & 31) = display1
-        display3((index >> 15) & 31) = display2
-        display4((index >> 20) & 31) = display3
+        display1((index >>>  5) & 31) = display0
+        display2((index >>> 10) & 31) = display1
+        display3((index >>> 15) & 31) = display2
+        display4((index >>> 20) & 31) = display3
       } else if (xor < (1 << 30)) { // level = 5
         if (depth == 5) {
           display5 = new Array(32); display5(0) = display4; depth += 1
@@ -853,11 +853,11 @@ private[immutable] trait VectorPointer[T] {
         display2 = new Array(32)
         display3 = new Array(32)
         display4 = new Array(32)
-        display1((index >>  5) & 31) = display0
-        display2((index >> 10) & 31) = display1
-        display3((index >> 15) & 31) = display2
-        display4((index >> 20) & 31) = display3
-        display5((index >> 25) & 31) = display4
+        display1((index >>>  5) & 31) = display0
+        display2((index >>> 10) & 31) = display1
+        display3((index >>> 15) & 31) = display2
+        display4((index >>> 20) & 31) = display3
+        display5((index >>> 25) & 31) = display4
       } else {                      // level = 6
         throw new IllegalArgumentException()
       }
@@ -888,35 +888,35 @@ private[immutable] trait VectorPointer[T] {
         display3 = copyOf(display3)
         display2 = copyOf(display2)
         display1 = copyOf(display1)
-        display5((index >> 25) & 31) = display4
-        display4((index >> 20) & 31) = display3
-        display3((index >> 15) & 31) = display2
-        display2((index >> 10) & 31) = display1
-        display1((index >>  5) & 31) = display0
+        display5((index >>> 25) & 31) = display4
+        display4((index >>> 20) & 31) = display3
+        display3((index >>> 15) & 31) = display2
+        display2((index >>> 10) & 31) = display1
+        display1((index >>>  5) & 31) = display0
       case 4 =>
         display4 = copyOf(display4)
         display3 = copyOf(display3)
         display2 = copyOf(display2)
         display1 = copyOf(display1)
-        display4((index >> 20) & 31) = display3
-        display3((index >> 15) & 31) = display2
-        display2((index >> 10) & 31) = display1
-        display1((index >>  5) & 31) = display0
+        display4((index >>> 20) & 31) = display3
+        display3((index >>> 15) & 31) = display2
+        display2((index >>> 10) & 31) = display1
+        display1((index >>>  5) & 31) = display0
       case 3 =>
         display3 = copyOf(display3)
         display2 = copyOf(display2)
         display1 = copyOf(display1)
-        display3((index >> 15) & 31) = display2
-        display2((index >> 10) & 31) = display1
-        display1((index >>  5) & 31) = display0
+        display3((index >>> 15) & 31) = display2
+        display2((index >>> 10) & 31) = display1
+        display1((index >>>  5) & 31) = display0
       case 2 =>
         display2 = copyOf(display2)
         display1 = copyOf(display1)
-        display2((index >> 10) & 31) = display1
-        display1((index >>  5) & 31) = display0
+        display2((index >>> 10) & 31) = display1
+        display1((index >>>  5) & 31) = display0
       case 1 =>
         display1 = copyOf(display1)
-        display1((index >>  5) & 31) = display0
+        display1((index >>>  5) & 31) = display0
       case 0 =>
     }
 
@@ -930,29 +930,29 @@ private[immutable] trait VectorPointer[T] {
     private[immutable] final def gotoPosWritable0(newIndex: Int, xor: Int): Unit = (depth - 1) match {
       case 5 =>
         display5 = copyOf(display5)
-        display4 = nullSlotAndCopy(display5, (newIndex >> 25) & 31)
-        display3 = nullSlotAndCopy(display4, (newIndex >> 20) & 31)
-        display2 = nullSlotAndCopy(display3, (newIndex >> 15) & 31)
-        display1 = nullSlotAndCopy(display2, (newIndex >> 10) & 31)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display4 = nullSlotAndCopy(display5, (newIndex >>> 25) & 31)
+        display3 = nullSlotAndCopy(display4, (newIndex >>> 20) & 31)
+        display2 = nullSlotAndCopy(display3, (newIndex >>> 15) & 31)
+        display1 = nullSlotAndCopy(display2, (newIndex >>> 10) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       case 4 =>
         display4 = copyOf(display4)
-        display3 = nullSlotAndCopy(display4, (newIndex >> 20) & 31)
-        display2 = nullSlotAndCopy(display3, (newIndex >> 15) & 31)
-        display1 = nullSlotAndCopy(display2, (newIndex >> 10) & 31)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display3 = nullSlotAndCopy(display4, (newIndex >>> 20) & 31)
+        display2 = nullSlotAndCopy(display3, (newIndex >>> 15) & 31)
+        display1 = nullSlotAndCopy(display2, (newIndex >>> 10) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       case 3 =>
         display3 = copyOf(display3)
-        display2 = nullSlotAndCopy(display3, (newIndex >> 15) & 31)
-        display1 = nullSlotAndCopy(display2, (newIndex >> 10) & 31)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display2 = nullSlotAndCopy(display3, (newIndex >>> 15) & 31)
+        display1 = nullSlotAndCopy(display2, (newIndex >>> 10) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       case 2 =>
         display2 = copyOf(display2)
-        display1 = nullSlotAndCopy(display2, (newIndex >> 10) & 31)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display1 = nullSlotAndCopy(display2, (newIndex >>> 10) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       case 1 =>
         display1 = copyOf(display1)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       case 0 =>
         display0 = copyOf(display0)
     }
@@ -965,54 +965,54 @@ private[immutable] trait VectorPointer[T] {
         display0 = copyOf(display0)
       } else if (xor < (1 << 10)) { // level = 1
         display1 = copyOf(display1)
-        display1((oldIndex >>  5) & 31) = display0
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display1((oldIndex >>>  5) & 31) = display0
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       } else if (xor < (1 << 15)) { // level = 2
         display1 = copyOf(display1)
         display2 = copyOf(display2)
-        display1((oldIndex >>  5) & 31) = display0
-        display2((oldIndex >> 10) & 31) = display1
-        display1 = nullSlotAndCopy(display2, (newIndex >> 10) & 31)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display1((oldIndex >>>  5) & 31) = display0
+        display2((oldIndex >>> 10) & 31) = display1
+        display1 = nullSlotAndCopy(display2, (newIndex >>> 10) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       } else if (xor < (1 << 20)) { // level = 3
         display1 = copyOf(display1)
         display2 = copyOf(display2)
         display3 = copyOf(display3)
-        display1((oldIndex >>  5) & 31) = display0
-        display2((oldIndex >> 10) & 31) = display1
-        display3((oldIndex >> 15) & 31) = display2
-        display2 = nullSlotAndCopy(display3, (newIndex >> 15) & 31)
-        display1 = nullSlotAndCopy(display2, (newIndex >> 10) & 31)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display1((oldIndex >>>  5) & 31) = display0
+        display2((oldIndex >>> 10) & 31) = display1
+        display3((oldIndex >>> 15) & 31) = display2
+        display2 = nullSlotAndCopy(display3, (newIndex >>> 15) & 31)
+        display1 = nullSlotAndCopy(display2, (newIndex >>> 10) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       } else if (xor < (1 << 25)) { // level = 4
         display1 = copyOf(display1)
         display2 = copyOf(display2)
         display3 = copyOf(display3)
         display4 = copyOf(display4)
-        display1((oldIndex >>  5) & 31) = display0
-        display2((oldIndex >> 10) & 31) = display1
-        display3((oldIndex >> 15) & 31) = display2
-        display4((oldIndex >> 20) & 31) = display3
-        display3 = nullSlotAndCopy(display4, (newIndex >> 20) & 31)
-        display2 = nullSlotAndCopy(display3, (newIndex >> 15) & 31)
-        display1 = nullSlotAndCopy(display2, (newIndex >> 10) & 31)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display1((oldIndex >>>  5) & 31) = display0
+        display2((oldIndex >>> 10) & 31) = display1
+        display3((oldIndex >>> 15) & 31) = display2
+        display4((oldIndex >>> 20) & 31) = display3
+        display3 = nullSlotAndCopy(display4, (newIndex >>> 20) & 31)
+        display2 = nullSlotAndCopy(display3, (newIndex >>> 15) & 31)
+        display1 = nullSlotAndCopy(display2, (newIndex >>> 10) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       } else if (xor < (1 << 30)) { // level = 5
         display1 = copyOf(display1)
         display2 = copyOf(display2)
         display3 = copyOf(display3)
         display4 = copyOf(display4)
         display5 = copyOf(display5)
-        display1((oldIndex >>  5) & 31) = display0
-        display2((oldIndex >> 10) & 31) = display1
-        display3((oldIndex >> 15) & 31) = display2
-        display4((oldIndex >> 20) & 31) = display3
-        display5((oldIndex >> 25) & 31) = display4
-        display4 = nullSlotAndCopy(display5, (newIndex >> 25) & 31)
-        display3 = nullSlotAndCopy(display4, (newIndex >> 20) & 31)
-        display2 = nullSlotAndCopy(display3, (newIndex >> 15) & 31)
-        display1 = nullSlotAndCopy(display2, (newIndex >> 10) & 31)
-        display0 = nullSlotAndCopy(display1, (newIndex >>  5) & 31)
+        display1((oldIndex >>>  5) & 31) = display0
+        display2((oldIndex >>> 10) & 31) = display1
+        display3((oldIndex >>> 15) & 31) = display2
+        display4((oldIndex >>> 20) & 31) = display3
+        display5((oldIndex >>> 25) & 31) = display4
+        display4 = nullSlotAndCopy(display5, (newIndex >>> 25) & 31)
+        display3 = nullSlotAndCopy(display4, (newIndex >>> 20) & 31)
+        display2 = nullSlotAndCopy(display3, (newIndex >>> 15) & 31)
+        display1 = nullSlotAndCopy(display2, (newIndex >>> 10) & 31)
+        display0 = nullSlotAndCopy(display1, (newIndex >>>  5) & 31)
       } else {                      // level = 6
         throw new IllegalArgumentException()
       }
@@ -1039,56 +1039,56 @@ private[immutable] trait VectorPointer[T] {
       } else if (xor < (1 << 10)) { // level = 1
         if (depth == 1) {
           display1 = new Array(32)
-          display1((oldIndex >>  5) & 31) = display0
+          display1((oldIndex >>>  5) & 31) = display0
           depth += 1
         }
         display0 = new Array(32)
       } else if (xor < (1 << 15)) { // level = 2
         if (depth == 2) {
           display2 = new Array(32)
-          display2((oldIndex >> 10) & 31) = display1
+          display2((oldIndex >>> 10) & 31) = display1
           depth += 1
         }
-        display1 = display2((newIndex >> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((newIndex >>> 10) & 31).asInstanceOf[Array[AnyRef]]
         if (display1 == null) display1 = new Array(32)
         display0 = new Array(32)
       } else if (xor < (1 << 20)) { // level = 3
         if (depth == 3) {
           display3 = new Array(32)
-          display3((oldIndex >> 15) & 31) = display2
+          display3((oldIndex >>> 15) & 31) = display2
           depth += 1
         }
-        display2 = display3((newIndex >> 15) & 31).asInstanceOf[Array[AnyRef]]
+        display2 = display3((newIndex >>> 15) & 31).asInstanceOf[Array[AnyRef]]
         if (display2 == null) display2 = new Array(32)
-        display1 = display2((newIndex >> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((newIndex >>> 10) & 31).asInstanceOf[Array[AnyRef]]
         if (display1 == null) display1 = new Array(32)
         display0 = new Array(32)
       } else if (xor < (1 << 25)) { // level = 4
         if (depth == 4) {
           display4 = new Array(32)
-          display4((oldIndex >> 20) & 31) = display3
+          display4((oldIndex >>> 20) & 31) = display3
           depth += 1
         }
-        display3 = display4((newIndex >> 20) & 31).asInstanceOf[Array[AnyRef]]
+        display3 = display4((newIndex >>> 20) & 31).asInstanceOf[Array[AnyRef]]
         if (display3 == null) display3 = new Array(32)
-        display2 = display3((newIndex >> 15) & 31).asInstanceOf[Array[AnyRef]]
+        display2 = display3((newIndex >>> 15) & 31).asInstanceOf[Array[AnyRef]]
         if (display2 == null) display2 = new Array(32)
-        display1 = display2((newIndex >> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((newIndex >>> 10) & 31).asInstanceOf[Array[AnyRef]]
         if (display1 == null) display1 = new Array(32)
         display0 = new Array(32)
       } else if (xor < (1 << 30)) { // level = 5
         if (depth == 5) {
           display5 = new Array(32)
-          display5((oldIndex >> 25) & 31) = display4
+          display5((oldIndex >>> 25) & 31) = display4
           depth += 1
         }
-        display4 = display5((newIndex >> 25) & 31).asInstanceOf[Array[AnyRef]]
+        display4 = display5((newIndex >>> 25) & 31).asInstanceOf[Array[AnyRef]]
         if (display4 == null) display4 = new Array(32)
-        display3 = display4((newIndex >> 20) & 31).asInstanceOf[Array[AnyRef]]
+        display3 = display4((newIndex >>> 20) & 31).asInstanceOf[Array[AnyRef]]
         if (display3 == null) display3 = new Array(32)
-        display2 = display3((newIndex >> 15) & 31).asInstanceOf[Array[AnyRef]]
+        display2 = display3((newIndex >>> 15) & 31).asInstanceOf[Array[AnyRef]]
         if (display2 == null) display2 = new Array(32)
-        display1 = display2((newIndex >> 10) & 31).asInstanceOf[Array[AnyRef]]
+        display1 = display2((newIndex >>> 10) & 31).asInstanceOf[Array[AnyRef]]
         if (display1 == null) display1 = new Array(32)
         display0 = new Array(32)
       } else {                      // level = 6