Skip to content

Commit d6d99f8

Browse files
lrytzlrytz
committed
Minor cleanups
1 parent f1e1423 commit d6d99f8

20 files changed

+64
-62
lines changed

‎src/main/scala/scala/compat/java8/StreamConverters.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ trait Priority2StreamConverters {
103103

104104
trait Priority1StreamConverters extends Priority2StreamConverters {
105105
implicit class RichStream[A](stream: Stream[A]) {
106-
def accumulate = stream.collect(Accumulator.supplier[A], Accumulator.adder[A], Accumulator.merger[A])
106+
def accumulate: Accumulator[A] = stream.collect(Accumulator.supplier[A], Accumulator.adder[A], Accumulator.merger[A])
107107

108108
def toScala[Coll[_]](implicit factory: collection.Factory[A, Coll[A]]): Coll[A] = {
109109
if (stream.isParallel) accumulate.to[Coll](factory)

‎src/main/scala/scala/compat/java8/collectionImpl/Accumulator.scala‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ import scala.language.higherKinds
1919
* Accumulators can contain more than `Int.MaxValue` elements.
2020
*/
2121
final class Accumulator[A] extends AccumulatorLike[A, Accumulator[A]] { self =>
22+
// Elements are added to `current`. Once full, it's added to `history`, and a new `current` is
23+
// created with `nextBlockSize` (which depends on `totalSize`).
24+
// `cumul(i)` is `(0 until i).map(history(_).length)`
2225
private[java8] var current: Array[AnyRef] = Accumulator.emptyAnyRefArray
2326
private[java8] var history: Array[Array[AnyRef]] = Accumulator.emptyAnyRefArrayArray
2427
private[java8] var cumul: Array[Long] = Accumulator.emptyLongArray
25-
26-
private[java8] def cumulative(i: Int) = cumul(i)
28+
29+
private[java8] def cumulative(i: Int): Long = cumul(i)
2730

2831
private def expand(): Unit = {
2932
if (index > 0) {

‎src/main/scala/scala/compat/java8/collectionImpl/AccumulatorLike.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ trait AccumulatorLike[@specialized(Double, Int, Long) A, AC] {
3131
}
3232

3333
/** Size of the accumulated collection, as a `Long` */
34-
final def size = totalSize
34+
final def size: Long = totalSize
3535

3636
/** Remove all accumulated elements from this accumulator. */
3737
def clear(): Unit = {

‎src/main/scala/scala/compat/java8/collectionImpl/Stepper.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ import java.util.Spliterator
4444
* {{{
4545
* val s = Stepper.of(Vector(1,2,3,4))
4646
* if (s.hasStep) println(s.nextStep) // Prints 1
47-
* println(s.tryStep(i => println(i*i))) // Prints 4, then true
47+
* println(s.tryStep(i => println(i*i))) // Prints 2, then true
4848
* s.substep.foreach(println) // Prints 3
4949
* println(s.count(_ > 3)) // Prints 4
5050
* println(s.hasStep) // Prints `false`

‎src/main/scala/scala/compat/java8/converterImpl/StepsArray.scala‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,55 +25,55 @@ import Stepper._
2525
private[java8] class StepsObjectArray[A <: Object](underlying: Array[A], _i0: Int, _iN: Int)
2626
extends StepsLikeIndexed[A, StepsObjectArray[A]](_i0, _iN) {
2727
def next() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
28-
def semiclone(half: Int) = new StepsObjectArray[A](underlying, i0, half)
28+
protected def semiclone(half: Int) = new StepsObjectArray[A](underlying, i0, half)
2929
}
3030

3131
private[java8] class StepsBoxedBooleanArray(underlying: Array[Boolean], _i0: Int, _iN: Int)
3232
extends StepsLikeIndexed[Boolean, StepsBoxedBooleanArray](_i0, _iN) {
3333
def next() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
34-
def semiclone(half: Int) = new StepsBoxedBooleanArray(underlying, i0, half)
34+
protected def semiclone(half: Int) = new StepsBoxedBooleanArray(underlying, i0, half)
3535
}
3636

3737
private[java8] class StepsWidenedByteArray(underlying: Array[Byte], _i0: Int, _iN: Int)
3838
extends StepsIntLikeIndexed[StepsWidenedByteArray](_i0, _iN) {
3939
def nextInt() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
40-
def semiclone(half: Int) = new StepsWidenedByteArray(underlying, i0, half)
40+
protected def semiclone(half: Int) = new StepsWidenedByteArray(underlying, i0, half)
4141
}
4242

4343
private[java8] class StepsWidenedCharArray(underlying: Array[Char], _i0: Int, _iN: Int)
4444
extends StepsIntLikeIndexed[StepsWidenedCharArray](_i0, _iN) {
4545
def nextInt() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
46-
def semiclone(half: Int) = new StepsWidenedCharArray(underlying, i0, half)
46+
protected def semiclone(half: Int) = new StepsWidenedCharArray(underlying, i0, half)
4747
}
4848

4949
private[java8] class StepsWidenedShortArray(underlying: Array[Short], _i0: Int, _iN: Int)
5050
extends StepsIntLikeIndexed[StepsWidenedShortArray](_i0, _iN) {
5151
def nextInt() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
52-
def semiclone(half: Int) = new StepsWidenedShortArray(underlying, i0, half)
52+
protected def semiclone(half: Int) = new StepsWidenedShortArray(underlying, i0, half)
5353
}
5454

5555
private[java8] class StepsWidenedFloatArray(underlying: Array[Float], _i0: Int, _iN: Int)
5656
extends StepsDoubleLikeIndexed[StepsWidenedFloatArray](_i0, _iN) {
5757
def nextDouble() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
58-
def semiclone(half: Int) = new StepsWidenedFloatArray(underlying, i0, half)
58+
protected def semiclone(half: Int) = new StepsWidenedFloatArray(underlying, i0, half)
5959
}
6060

6161
private[java8] class StepsDoubleArray(underlying: Array[Double], _i0: Int, _iN: Int)
6262
extends StepsDoubleLikeIndexed[StepsDoubleArray](_i0, _iN) {
6363
def nextDouble() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
64-
def semiclone(half: Int) = new StepsDoubleArray(underlying, i0, half)
64+
protected def semiclone(half: Int) = new StepsDoubleArray(underlying, i0, half)
6565
}
6666

6767
private[java8] class StepsIntArray(underlying: Array[Int], _i0: Int, _iN: Int)
6868
extends StepsIntLikeIndexed[StepsIntArray](_i0, _iN) {
6969
def nextInt() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
70-
def semiclone(half: Int) = new StepsIntArray(underlying, i0, half)
70+
protected def semiclone(half: Int) = new StepsIntArray(underlying, i0, half)
7171
}
7272

7373
private[java8] class StepsLongArray(underlying: Array[Long], _i0: Int, _iN: Int)
7474
extends StepsLongLikeIndexed[StepsLongArray](_i0, _iN) {
7575
def nextLong() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
76-
def semiclone(half: Int) = new StepsLongArray(underlying, i0, half)
76+
protected def semiclone(half: Int) = new StepsLongArray(underlying, i0, half)
7777
}
7878

7979
//////////////////////////

‎src/main/scala/scala/compat/java8/converterImpl/StepsBitSet.scala‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extends StepsIntLikeSliced[Array[Long], StepsIntBitSet](_underlying, _i0, _iN) {
2626
private var mask: Long = (-1L) << (i & 0x3F)
2727
private var cache: Long = underlying(i >>> 6)
2828
private var found: Boolean = false
29-
def semiclone(half: Int) = {
29+
protected def semiclone(half: Int) = {
3030
val ans = new StepsIntBitSet(underlying, i, half)
3131
i = half
3232
mask = (-1L) << (i & 0x3F)
@@ -50,8 +50,7 @@ extends StepsIntLikeSliced[Array[Long], StepsIntBitSet](_underlying, _i0, _iN) {
5050
if (i < 0 || i >= iN) {
5151
i = iN
5252
false
53-
}
54-
else {
53+
} else {
5554
found = true
5655
true
5756
}

‎src/main/scala/scala/compat/java8/converterImpl/StepsFlatHashTable.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@ import Stepper._
2626
private[java8] class StepsAnyFlatHashTable[A](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
2727
extends StepsLikeGapped[A, StepsAnyFlatHashTable[A]](_underlying, _i0, _iN) {
2828
def next() = if (currentEntry eq null) throwNSEE else { val ans = currentEntry.asInstanceOf[A]; currentEntry = null; ans }
29-
def semiclone(half: Int) = new StepsAnyFlatHashTable[A](underlying, i0, half)
29+
protected def semiclone(half: Int) = new StepsAnyFlatHashTable[A](underlying, i0, half)
3030
}
3131

3232
private[java8] class StepsDoubleFlatHashTable(_underlying: Array[AnyRef], _i0: Int, _iN: Int)
3333
extends StepsDoubleLikeGapped[StepsDoubleFlatHashTable](_underlying, _i0, _iN) {
3434
def nextDouble() = if (currentEntry eq null) throwNSEE else { val ans = currentEntry.asInstanceOf[Double]; currentEntry = null; ans }
35-
def semiclone(half: Int) = new StepsDoubleFlatHashTable(underlying, i0, half)
35+
protected def semiclone(half: Int) = new StepsDoubleFlatHashTable(underlying, i0, half)
3636
}
3737

3838
private[java8] class StepsIntFlatHashTable(_underlying: Array[AnyRef], _i0: Int, _iN: Int)
3939
extends StepsIntLikeGapped[StepsIntFlatHashTable](_underlying, _i0, _iN) {
4040
def nextInt() = if (currentEntry eq null) throwNSEE else { val ans = currentEntry.asInstanceOf[Int]; currentEntry = null; ans }
41-
def semiclone(half: Int) = new StepsIntFlatHashTable(underlying, i0, half)
41+
protected def semiclone(half: Int) = new StepsIntFlatHashTable(underlying, i0, half)
4242
}
4343

4444
private[java8] class StepsLongFlatHashTable(_underlying: Array[AnyRef], _i0: Int, _iN: Int)
4545
extends StepsLongLikeGapped[StepsLongFlatHashTable](_underlying, _i0, _iN) {
4646
def nextLong() = if (currentEntry eq null) throwNSEE else { val ans = currentEntry.asInstanceOf[Long]; currentEntry = null; ans }
47-
def semiclone(half: Int) = new StepsLongFlatHashTable(underlying, i0, half)
47+
protected def semiclone(half: Int) = new StepsLongFlatHashTable(underlying, i0, half)
4848
}
4949

5050
//////////////////////////

‎src/main/scala/scala/compat/java8/converterImpl/StepsHashTable.scala‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,25 +28,25 @@ import Stepper._
2828
private[java8] class StepsAnyHashTableKey[K](_underlying: Array[AnyRef], _i0: Int, _iN: Int)
2929
extends StepsLikeGapped[K, StepsAnyHashTableKey[K]](_underlying, _i0, _iN) {
3030
def next() = if (currentEntry eq null) throwNSEE else { val ans = CollectionInternals.hashEntryKey[K](currentEntry); currentEntry = CollectionInternals.hashEntryNext(currentEntry); ans }
31-
def semiclone(half: Int) = new StepsAnyHashTableKey[K](underlying, i0, half)
31+
protected def semiclone(half: Int) = new StepsAnyHashTableKey[K](underlying, i0, half)
3232
}
3333

3434
private[java8] class StepsDoubleHashTableKey(_underlying: Array[AnyRef], _i0: Int, _iN: Int)
3535
extends StepsDoubleLikeGapped[StepsDoubleHashTableKey](_underlying, _i0, _iN) {
3636
def nextDouble() = if (currentEntry eq null) throwNSEE else { val ans = CollectionInternals.hashEntryKey[Double](currentEntry); currentEntry = CollectionInternals.hashEntryNext(currentEntry); ans }
37-
def semiclone(half: Int) = new StepsDoubleHashTableKey(underlying, i0, half)
37+
protected def semiclone(half: Int) = new StepsDoubleHashTableKey(underlying, i0, half)
3838
}
3939

4040
private[java8] class StepsIntHashTableKey(_underlying: Array[AnyRef], _i0: Int, _iN: Int)
4141
extends StepsIntLikeGapped[StepsIntHashTableKey](_underlying, _i0, _iN) {
4242
def nextInt() = if (currentEntry eq null) throwNSEE else { val ans = CollectionInternals.hashEntryKey[Int](currentEntry); currentEntry = CollectionInternals.hashEntryNext(currentEntry); ans }
43-
def semiclone(half: Int) = new StepsIntHashTableKey(underlying, i0, half)
43+
protected def semiclone(half: Int) = new StepsIntHashTableKey(underlying, i0, half)
4444
}
4545

4646
private[java8] class StepsLongHashTableKey(_underlying: Array[AnyRef], _i0: Int, _iN: Int)
4747
extends StepsLongLikeGapped[StepsLongHashTableKey](_underlying, _i0, _iN) {
4848
def nextLong() = if (currentEntry eq null) throwNSEE else { val ans = CollectionInternals.hashEntryKey[Long](currentEntry); currentEntry = CollectionInternals.hashEntryNext(currentEntry); ans }
49-
def semiclone(half: Int) = new StepsLongHashTableKey(underlying, i0, half)
49+
protected def semiclone(half: Int) = new StepsLongHashTableKey(underlying, i0, half)
5050
}
5151

5252
// Steppers for entries stored in DefaultEntry HashEntry
@@ -57,7 +57,7 @@ extends StepsLikeGapped[(K, V), StepsAnyDefaultHashTable[K, V]](_underlying, _i0
5757
def next() =
5858
if (currentEntry eq null) throwNSEE
5959
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); (CollectionInternals.hashEntryKey[K](e), CollectionInternals.defaultEntryValue[V](e)) }
60-
def semiclone(half: Int) =
60+
protected def semiclone(half: Int) =
6161
new StepsAnyDefaultHashTable[K, V](underlying, i0, half)
6262
}
6363

@@ -66,7 +66,7 @@ extends StepsLikeGapped[V, StepsAnyDefaultHashTableValue[K, V]](_underlying, _i0
6666
def next() =
6767
if (currentEntry eq null) throwNSEE
6868
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); CollectionInternals.defaultEntryValue[V](e) }
69-
def semiclone(half: Int) =
69+
protected def semiclone(half: Int) =
7070
new StepsAnyDefaultHashTableValue[K, V](underlying, i0, half)
7171
}
7272

@@ -75,7 +75,7 @@ extends StepsDoubleLikeGapped[StepsDoubleDefaultHashTableValue[K]](_underlying,
7575
def nextDouble() =
7676
if (currentEntry eq null) throwNSEE
7777
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); CollectionInternals.defaultEntryValue[Double](e) }
78-
def semiclone(half: Int) =
78+
protected def semiclone(half: Int) =
7979
new StepsDoubleDefaultHashTableValue[K](underlying, i0, half)
8080
}
8181

@@ -84,7 +84,7 @@ extends StepsIntLikeGapped[StepsIntDefaultHashTableValue[K]](_underlying, _i0, _
8484
def nextInt() =
8585
if (currentEntry eq null) throwNSEE
8686
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); CollectionInternals.defaultEntryValue[Int](e) }
87-
def semiclone(half: Int) =
87+
protected def semiclone(half: Int) =
8888
new StepsIntDefaultHashTableValue[K](underlying, i0, half)
8989
}
9090

@@ -93,7 +93,7 @@ extends StepsLongLikeGapped[StepsLongDefaultHashTableValue[K]](_underlying, _i0,
9393
def nextLong() =
9494
if (currentEntry eq null) throwNSEE
9595
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); CollectionInternals.defaultEntryValue[Long](e) }
96-
def semiclone(half: Int) =
96+
protected def semiclone(half: Int) =
9797
new StepsLongDefaultHashTableValue[K](underlying, i0, half)
9898
}
9999

@@ -105,7 +105,7 @@ extends StepsLikeGapped[(K, V), StepsAnyLinkedHashTable[K, V]](_underlying, _i0,
105105
def next() =
106106
if (currentEntry eq null) throwNSEE
107107
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); (CollectionInternals.hashEntryKey[K](e), CollectionInternals.linkedEntryValue[V](e)) }
108-
def semiclone(half: Int) =
108+
protected def semiclone(half: Int) =
109109
new StepsAnyLinkedHashTable[K, V](underlying, i0, half)
110110
}
111111

@@ -114,7 +114,7 @@ extends StepsLikeGapped[V, StepsAnyLinkedHashTableValue[K, V]](_underlying, _i0,
114114
def next() =
115115
if (currentEntry eq null) throwNSEE
116116
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); CollectionInternals.linkedEntryValue[V](e) }
117-
def semiclone(half: Int) =
117+
protected def semiclone(half: Int) =
118118
new StepsAnyLinkedHashTableValue[K, V](underlying, i0, half)
119119
}
120120

@@ -123,7 +123,7 @@ extends StepsDoubleLikeGapped[StepsDoubleLinkedHashTableValue[K]](_underlying, _
123123
def nextDouble() =
124124
if (currentEntry eq null) throwNSEE
125125
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); CollectionInternals.linkedEntryValue[Double](e) }
126-
def semiclone(half: Int) =
126+
protected def semiclone(half: Int) =
127127
new StepsDoubleLinkedHashTableValue[K](underlying, i0, half)
128128
}
129129

@@ -132,7 +132,7 @@ extends StepsIntLikeGapped[StepsIntLinkedHashTableValue[K]](_underlying, _i0, _i
132132
def nextInt() =
133133
if (currentEntry eq null) throwNSEE
134134
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); CollectionInternals.linkedEntryValue[Int](e) }
135-
def semiclone(half: Int) =
135+
protected def semiclone(half: Int) =
136136
new StepsIntLinkedHashTableValue[K](underlying, i0, half)
137137
}
138138

@@ -141,7 +141,7 @@ extends StepsLongLikeGapped[StepsLongLinkedHashTableValue[K]](_underlying, _i0,
141141
def nextLong() =
142142
if (currentEntry eq null) throwNSEE
143143
else { val e = currentEntry; currentEntry = CollectionInternals.hashEntryNext(e); CollectionInternals.linkedEntryValue[Long](e) }
144-
def semiclone(half: Int) =
144+
protected def semiclone(half: Int) =
145145
new StepsLongLinkedHashTableValue[K](underlying, i0, half)
146146
}
147147

‎src/main/scala/scala/compat/java8/converterImpl/StepsIndexedSeq.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@ import Stepper._
2323
private[java8] class StepsAnyIndexedSeq[A](underlying: collection.IndexedSeqOps[A, Any, _], _i0: Int, _iN: Int)
2424
extends StepsLikeIndexed[A, StepsAnyIndexedSeq[A]](_i0, _iN) {
2525
def next() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
26-
def semiclone(half: Int) = new StepsAnyIndexedSeq[A](underlying, i0, half)
26+
protected def semiclone(half: Int) = new StepsAnyIndexedSeq[A](underlying, i0, half)
2727
}
2828

2929
private[java8] class StepsDoubleIndexedSeq[CC <: collection.IndexedSeqOps[Double, Any, _]](underlying: CC, _i0: Int, _iN: Int)
3030
extends StepsDoubleLikeIndexed[StepsDoubleIndexedSeq[CC]](_i0, _iN) {
3131
def nextDouble() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
32-
def semiclone(half: Int) = new StepsDoubleIndexedSeq[CC](underlying, i0, half)
32+
protected def semiclone(half: Int) = new StepsDoubleIndexedSeq[CC](underlying, i0, half)
3333
}
3434

3535
private[java8] class StepsIntIndexedSeq[CC <: collection.IndexedSeqOps[Int, Any, _]](underlying: CC, _i0: Int, _iN: Int)
3636
extends StepsIntLikeIndexed[StepsIntIndexedSeq[CC]](_i0, _iN) {
3737
def nextInt() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
38-
def semiclone(half: Int) = new StepsIntIndexedSeq[CC](underlying, i0, half)
38+
protected def semiclone(half: Int) = new StepsIntIndexedSeq[CC](underlying, i0, half)
3939
}
4040

4141
private[java8] class StepsLongIndexedSeq[CC <: collection.IndexedSeqOps[Long, Any, _]](underlying: CC, _i0: Int, _iN: Int)
4242
extends StepsLongLikeIndexed[StepsLongIndexedSeq[CC]](_i0, _iN) {
4343
def nextLong() = if (hasNext()) { val j = i0; i0 += 1; underlying(j) } else throwNSEE
44-
def semiclone(half: Int) = new StepsLongIndexedSeq[CC](underlying, i0, half)
44+
protected def semiclone(half: Int) = new StepsLongIndexedSeq[CC](underlying, i0, half)
4545
}
4646

4747
//////////////////////////

‎src/main/scala/scala/compat/java8/converterImpl/StepsIterator.scala‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@ import scala.compat.java8.collectionImpl._
2222

2323
private[java8] class StepsAnyIterator[A](_underlying: Iterator[A])
2424
extends StepsLikeIterator[A, StepsAnyIterator[A]](_underlying) {
25-
def semiclone() = new StepsAnyIterator(null)
25+
protected def semiclone() = new StepsAnyIterator(null)
2626
def next() = if (proxied ne null) proxied.nextStep else underlying.next
2727
}
2828

2929
private[java8] class StepsDoubleIterator(_underlying: Iterator[Double])
3030
extends StepsDoubleLikeIterator[StepsDoubleIterator](_underlying) {
31-
def semiclone() = new StepsDoubleIterator(null)
31+
protected def semiclone() = new StepsDoubleIterator(null)
3232
def nextDouble() = if (proxied ne null) proxied.nextStep else underlying.next
3333
}
3434

3535
private[java8] class StepsIntIterator(_underlying: Iterator[Int])
3636
extends StepsIntLikeIterator[StepsIntIterator](_underlying) {
37-
def semiclone() = new StepsIntIterator(null)
37+
protected def semiclone() = new StepsIntIterator(null)
3838
def nextInt() = if (proxied ne null) proxied.nextStep else underlying.next
3939
}
4040

4141
private[java8] class StepsLongIterator(_underlying: Iterator[Long])
4242
extends StepsLongLikeIterator[StepsLongIterator](_underlying) {
43-
def semiclone() = new StepsLongIterator(null)
43+
protected def semiclone() = new StepsLongIterator(null)
4444
def nextLong() = if (proxied ne null) proxied.nextStep else underlying.next
4545
}
4646

0 commit comments

Comments
 (0)