@@ -55,10 +55,10 @@ private[collection] final class INode[K, V](bn: MainNode[K, V] | Null, g: Gen, e
5555 prev match {
5656 case null =>
5757 m
58- case fn : FailedNode [_, _ ] => // try to commit to previous value
58+ case fn : FailedNode [? , ? ] => // try to commit to previous value
5959 if (CAS (m, fn.prev)) fn.prev
6060 else GCAS_Complete (/* READ*/ mainnode, ct)
61- case vn : MainNode [_, _ ] =>
61+ case vn : MainNode [? , ? ] =>
6262 // Assume that you've read the root from the generation G.
6363 // Assume that the snapshot algorithm is correct.
6464 // ==> you can only reach nodes in generations <= G.
@@ -284,7 +284,7 @@ private[collection] final class INode[K, V](bn: MainNode[K, V] | Null, g: Gen, e
284284 case basicNode => throw new MatchError (basicNode)
285285 }
286286 }
287- case tn : TNode [_, _ ] => // 3) non-live node
287+ case tn : TNode [? , ? ] => // 3) non-live node
288288 def cleanReadOnly (tn : TNode [K , V ]) = if (ct.nonReadOnly) {
289289 clean(parent.nn, ct, lev - 5 )
290290 RESTART
@@ -412,9 +412,9 @@ private[collection] final class INode[K, V](bn: MainNode[K, V] | Null, g: Gen, e
412412 /* this is a quiescent method! */
413413 def string (lev : Int ): String = " %sINode -> %s" .format(" " * lev, mainnode match {
414414 case null => " <null>"
415- case tn : TNode [_, _ ] => " TNode(%s, %s, %d, !)" .format(tn.k, tn.v, tn.hc)
416- case cn : CNode [_, _ ] => cn.string(lev)
417- case ln : LNode [_, _ ] => ln.string(lev)
415+ case tn : TNode [? , ? ] => " TNode(%s, %s, %d, !)" .format(tn.k, tn.v, tn.hc)
416+ case cn : CNode [? , ? ] => cn.string(lev)
417+ case ln : LNode [? , ? ] => ln.string(lev)
418418 case x => " <elem: %s>" .format(x)
419419 })
420420
@@ -549,7 +549,7 @@ private[collection] final class CNode[K, V](val bitmap: Int, val array: Array[Ba
549549 while (i < array.length) {
550550 val pos = (i + offset) % array.length
551551 array(pos) match {
552- case sn : SNode [_, _ ] => sz += 1
552+ case sn : SNode [? , ? ] => sz += 1
553553 case in : INode [K , V ] @ uc => sz += in.cachedSize(ct)
554554 case basicNode => throw new MatchError (basicNode)
555555 }
@@ -604,7 +604,7 @@ private[collection] final class CNode[K, V](val bitmap: Int, val array: Array[Ba
604604 }
605605
606606 private def resurrect (inode : INode [K , V ], inodemain : AnyRef ): BasicNode = inodemain match {
607- case tn : TNode [_, _ ] => tn.copyUntombed
607+ case tn : TNode [? , ? ] => tn.copyUntombed
608608 case _ => inode
609609 }
610610
0 commit comments