8000 Naming guess · scala/scala@7152f67 · GitHub
[go: up one dir, main page]

Skip to content

Commit 7152f67

Browse files
committed
Naming guess
1 parent 6b9224e commit 7152f67

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/library/scala/collection/mutable/ListBuffer.scala

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class ListBuffer[A]
187187
}
188188

189189
// returns the `::` at `i - 1` (such that its `next` at position `i` can be mutated), or `null` if `i == 0`.
190-
private def locate(i: Int): Predecessor =
190+
private def predecessor(i: Int): Predecessor =
191191
if (i == 0) null
192192
else if (i == len) last0
193193
else {
@@ -214,7 +214,7 @@ class ListBuffer[A]
214214
first = newElem
215215
} else {
216216
// `p` can not be `null` because the case where `idx == 0` is handled above
217-
val p = locate(idx)
217+
val p = predecessor(idx)
218218
val newElem = new :: (elem, p.tail.tail)
219219
if (last0 eq p.tail) {
220220
last0 = newElem
@@ -228,7 +228,7 @@ class ListBuffer[A]
228228
if (idx < 0 || idx > len) throw CommonErrors.indexOutOfBounds(index = idx, max = len - 1)
229229
if (idx == len) addOne(elem)
230230
else {
231-
val p = locate(idx)
231+
val p = predecessor(idx)
232232
val nx = elem :: getNext(p)
233233
if(p eq null) first = nx else p.next = nx
234234
len += 1
@@ -259,15 +259,15 @@ class ListBuffer[A]
259259
else {
260260
val fresh = new ListBuffer[A].freshFrom(it)
261261
ensureUnaliased()
262-
insertAfter(locate(idx), fresh)
262+
insertAfter(predecessor(idx), fresh)
263263
}
264264
}
265265
}
266266

267267
def remove(idx: Int): A = {
268268
ensureUnaliased()
269269
if (idx < 0 || idx >= len) throw CommonErrors.indexOutOfBounds(index = idx, max = len - 1)
270-
val p = locate(idx)
270+
val p = predecessor(idx)
271271
val nx = getNext(p)
272272
if(p eq null) {
273273
first = nx.tail
@@ -284,7 +284,7 @@ class ListBuffer[A]
284284
if (count > 0) {
285285
ensureUnaliased()
286286
if (idx < 0 || idx + count > len) throw new IndexOutOfBoundsException(s"$idx to ${idx + count} is out of bounds (min 0, max ${len - 1})")
287-
removeAfter(locate(idx), count)
287+
removeAfter(predecessor(idx), count)
288288
} else if (count < 0) {
289289
throw new IllegalArgumentException("removing negative number of elements: " + count)
290290
}
@@ -379,7 +379,7 @@ class ListBuffer[A]
379379
ensureUnaliased()
380380
val i = math.min(_from, _len)
381381
val n = math.min(_replaced, _len)
382-
val p = locate(i)
382+
val p = predecessor(i)
383383
removeAfter(p, math.min(n, _len - i))
384384
insertAfter(p, fresh)
385385
}

0 commit comments

Comments
 (0)
0