423 |
|
return (E) elementData[index]; |
424 |
|
} |
425 |
|
|
426 |
+ |
@SuppressWarnings("unchecked") |
427 |
+ |
static <E> E elementAt(Object[] es, int index) { |
428 |
+ |
return (E) es[index]; |
429 |
+ |
} |
430 |
+ |
|
431 |
|
/** |
432 |
|
* Returns the element at the specified position in this list. |
433 |
|
* |
501 |
|
s - index); |
502 |
|
elementData[index] = element; |
503 |
|
size = s + 1; |
504 |
+ |
// checkInvariants(); |
505 |
|
} |
506 |
|
|
507 |
|
/** |
525 |
|
numMoved); |
526 |
|
elementData[--size] = null; // clear to let GC do its work |
527 |
|
|
528 |
+ |
// checkInvariants(); |
529 |
|
return oldValue; |
530 |
|
} |
531 |
|
|
559 |
|
return false; |
560 |
|
} |
561 |
|
|
562 |
< |
/* |
562 |
> |
/** |
563 |
|
* Private remove method that skips bounds checking and does not |
564 |
|
* return the value removed. |
565 |
|
*/ |
578 |
|
*/ |
579 |
|
public void clear() { |
580 |
|
modCount++; |
581 |
< |
|
575 |
< |
// clear to let GC do its work |
576 |
< |
for (int i = 0; i < size; i++) |
577 |
< |
elementData[i] = null; |
578 |
< |
|
581 |
> |
Arrays.fill(elementData, 0, size, null); |
582 |
|
size = 0; |
583 |
|
} |
584 |
|
|
607 |
|
elementData = grow(s + numNew); |
608 |
|
System.arraycopy(a, 0, elementData, s, numNew); |
609 |
|
size = s + numNew; |
610 |
+ |
// checkInvariants(); |
611 |
|
return true; |
612 |
|
} |
613 |
|
|
646 |
|
numMoved); |
647 |
|
System.arraycopy(a, 0, elementData, index, numNew); |
648 |
|
size = s + numNew; |
649 |
+ |
// checkInvariants(); |
650 |
|
return true; |
651 |
|
} |
652 |
|
|
669 |
|
outOfBoundsMsg(fromIndex, toIndex)); |
670 |
|
} |
671 |
|
modCount++; |
672 |
< |
int numMoved = size - toIndex; |
673 |
< |
System.arraycopy(elementData, toIndex, elementData, fromIndex, |
674 |
< |
numMoved); |
675 |
< |
|
676 |
< |
// clear to let GC do its work |
672 |
< |
int newSize = size - (toIndex-fromIndex); |
673 |
< |
for (int i = newSize; i < size; i++) { |
674 |
< |
elementData[i] = null; |
675 |
< |
} |
676 |
< |
size = newSize; |
672 |
> |
final Object[] es = elementData; |
673 |
> |
final int oldSize = size; |
674 |
> |
System.arraycopy(es, toIndex, es, fromIndex, oldSize - toIndex); |
675 |
> |
Arrays.fill(es, size -= (toIndex - fromIndex), oldSize, null); |
676 |
> |
// checkInvariants(); |
677 |
|
} |
678 |
|
|
679 |
|
/** |
716 |
|
* @see Collection#contains(Object) |
717 |
|
*/ |
718 |
|
public boolean removeAll(Collection<?> c) { |
719 |
< |
Objects.requireNonNull(c); |
720 |
< |
return batchRemove(c, false); |
719 |
> |
return batchRemove(c, false, 0, size); |
720 |
|
} |
721 |
|
|
722 |
|
/** |
736 |
|
* @see Collection#contains(Object) |
737 |
|
*/ |
738 |
|
public boolean retainAll(Collection<?> c) { |
739 |
< |
Objects.requireNonNull(c); |
741 |
< |
return batchRemove(c, true); |
739 |
> |
return batchRemove(c, true, 0, size); |
740 |
|
} |
741 |
|
|
742 |
< |
private boolean batchRemove(Collection<?> c, boolean complement) { |
743 |
< |
final Object[] elementData = this.elementData; |
744 |
< |
int r = 0, w = 0; |
745 |
< |
boolean modified = false; |
746 |
< |
try { |
747 |
< |
for (; r < size; r++) |
748 |
< |
if (c.contains(elementData[r]) == complement) |
749 |
< |
elementData[w++] = elementData[r]; |
750 |
< |
} finally { |
751 |
< |
// Preserve behavioral compatibility with AbstractCollection, |
752 |
< |
// even if c.contains() throws. |
753 |
< |
if (r != size) { |
754 |
< |
System.arraycopy(elementData, r, |
755 |
< |
elementData, w, |
756 |
< |
size - r); |
757 |
< |
w += size - r; |
758 |
< |
} |
759 |
< |
if (w != size) { |
760 |
< |
// clear to let GC do its work |
761 |
< |
for (int i = w; i < size; i++) |
762 |
< |
elementData[i] = null; |
763 |
< |
modCount += size - w; |
764 |
< |
size = w; |
765 |
< |
modified = true; |
742 |
> |
boolean batchRemove(Collection<?> c, boolean complement, |
743 |
> |
final int from, final int end) { |
744 |
> |
Objects.requireNonNull(c); |
745 |
> |
final Object[] es = elementData; |
746 |
> |
final boolean modified; |
747 |
> |
int r; |
748 |
> |
// Optimize for initial run of survivors |
749 |
> |
for (r = from; r < end && c.contains(es[r]) == complement; r++) |
750 |
> |
; |
751 |
> |
if (modified = (r < end)) { |
752 |
> |
int w = r++; |
753 |
> |
try { |
754 |
> |
for (Object e; r < end; r++) |
755 |
> |
if (c.contains(e = es[r]) == complement) |
756 |
> |
es[w++] = e; |
757 |
> |
} catch (Throwable ex) { |
758 |
> |
// Preserve behavioral compatibility with AbstractCollection, |
759 |
> |
// even if c.contains() throws. |
760 |
> |
System.arraycopy(es, r, es, w, end - r); |
761 |
> |
w += end - r; |
762 |
> |
throw ex; |
763 |
> |
} finally { |
764 |
> |
final int oldSize = size, deleted = end - w; |
765 |
> |
modCount += deleted; |
766 |
> |
System.arraycopy(es, end, es, w, oldSize - end); |
767 |
> |
Arrays.fill(es, size -= deleted, oldSize, null); |
768 |
|
} |
769 |
|
} |
770 |
+ |
// checkInvariants(); |
771 |
|
return modified; |
772 |
|
} |
773 |
|
|
912 |
|
} |
913 |
|
|
914 |
|
@Override |
915 |
< |
@SuppressWarnings("unchecked") |
916 |
< |
public void forEachRemaining(Consumer<? super E> consumer) { |
916 |
< |
Objects.requireNonNull(consumer); |
915 |
> |
public void forEachRemaining(Consumer<? super E> action) { |
916 |
> |
Objects.requireNonNull(action); |
917 |
|
final int size = ArrayList.this.size; |
918 |
|
int i = cursor; |
919 |
< |
if (i >= size) { |
920 |
< |
return; |
921 |
< |
} |
922 |
< |
final Object[] elementData = ArrayList.this.elementData; |
923 |
< |
if (i >= elementData.length) { |
924 |
< |
throw new ConcurrentModificationException(); |
925 |
< |
} |
926 |
< |
while (i != size && modCount == expectedModCount) { |
927 |
< |
consumer.accept((E) elementData[i++]); |
919 |
> |
if (i < size) { |
920 |
> |
final Object[] es = elementData; |
921 |
> |
if (i >= es.length) |
922 |
> |
throw new ConcurrentModificationException(); |
923 |
> |
for (; i < size && modCount == expectedModCount; i++) |
924 |
> |
action.accept(elementAt(es, i)); |
925 |
> |
// update once at end to reduce heap write traffic |
926 |
> |
cursor = i; |
927 |
> |
lastRet = i - 1; |
928 |
> |
checkForComodification(); |
929 |
|
} |
929 |
– |
// update once at end of iteration to reduce heap write traffic |
930 |
– |
cursor = i; |
931 |
– |
lastRet = i - 1; |
932 |
– |
checkForComodification(); |
930 |
|
} |
931 |
|
|
932 |
|
final void checkForComodification() { |
1113 |
|
return true; |
1114 |
|
} |
1115 |
|
|
1116 |
+ |
public boolean removeAll(Collection<?> c) { |
1117 |
+ |
return batchRemove(c, false); |
1118 |
+ |
} |
1119 |
+ |
|
1120 |
+ |
public boolean retainAll(Collection<?> c) { |
1121 |
+ |
return batchRemove(c, true); |
1122 |
+ |
} |
1123 |
+ |
|
1124 |
+ |
private boolean batchRemove(Collection<?> c, boolean complement) { |
1125 |
+ |
checkForComodification(); |
1126 |
+ |
int oldSize = root.size; |
1127 |
+ |
boolean modified = |
1128 |
+ |
root.batchRemove(c, complement, offset, offset + size); |
1129 |
+ |
if (modified) |
1130 |
+ |
updateSizeAndModCount(root.size - oldSize); |
1131 |
+ |
return modified; |
1132 |
+ |
} |
1133 |
+ |
|
1134 |
+ |
public boolean removeIf(Predicate<? super E> filter) { |
1135 |
+ |
checkForComodification(); |
1136 |
+ |
int oldSize = root.size; |
1137 |
+ |
boolean modified = root.removeIf(filter, offset, offset + size); |
1138 |
+ |
if (modified) |
1139 |
+ |
updateSizeAndModCount(root.size - oldSize); |
1140 |
+ |
return modified; |
1141 |
+ |
} |
1142 |
+ |
|
1143 |
|
public Iterator<E> iterator() { |
1144 |
|
return listIterator(); |
1145 |
|
} |
1187 |
|
return (E) elementData[offset + (lastRet = i)]; |
1188 |
|
} |
1189 |
|
|
1190 |
< |
@SuppressWarnings("unchecked") |
1191 |
< |
public void forEachRemaining(Consumer<? super E> consumer) { |
1168 |
< |
Objects.requireNonNull(consumer); |
1190 |
> |
public void forEachRemaining(Consumer<? super E> action) { |
1191 |
> |
Objects.requireNonNull(action); |
1192 |
|
final int size = SubList.this.size; |
1193 |
|
int i = cursor; |
1194 |
< |
if (i >= size) { |
1195 |
< |
return; |
1196 |
< |
} |
1197 |
< |
final Object[] elementData = root.elementData; |
1198 |
< |
if (offset + i >= elementData.length) { |
1199 |
< |
throw new ConcurrentModificationException(); |
1200 |
< |
} |
1201 |
< |
while (i != size && modCount == expectedModCount) { |
1202 |
< |
consumer.accept((E) elementData[offset + (i++)]); |
1194 |
> |
if (i < size) { |
1195 |
> |
final Object[] es = root.elementData; |
1196 |
> |
if (offset + i >= es.length) |
1197 |
> |
throw new ConcurrentModificationException(); |
1198 |
> |
for (; i < size && modCount == expectedModCount; i++) |
1199 |
> |
action.accept(elementAt(es, offset + i)); |
1200 |
> |
// update once at end to reduce heap write traffic |
1201 |
> |
cursor = i; |
1202 |
> |
lastRet = i - 1; |
1203 |
> |
checkForComodification(); |
1204 |
|
} |
1181 |
– |
// update once at end of iteration to reduce heap write traffic |
1182 |
– |
lastRet = cursor = i; |
1183 |
– |
checkForComodification(); |
1205 |
|
} |
1206 |
|
|
1207 |
|
public int nextIndex() { |
1368 |
|
public void forEach(Consumer<? super E> action) { |
1369 |
|
Objects.requireNonNull(action); |
1370 |
|
final int expectedModCount = modCount; |
1371 |
< |
@SuppressWarnings("unchecked") |
1351 |
< |
final E[] elementData = (E[]) this.elementData; |
1371 |
> |
final Object[] es = elementData; |
1372 |
|
final int size = this.size; |
1373 |
< |
for (int i=0; modCount == expectedModCount && i < size; i++) { |
1374 |
< |
action.accept(elementData[i]); |
1375 |
< |
} |
1356 |
< |
if (modCount != expectedModCount) { |
1373 |
> |
for (int i = 0; modCount == expectedModCount && i < size; i++) |
1374 |
> |
action.accept(elementAt(es, i)); |
1375 |
> |
if (modCount != expectedModCount) |
1376 |
|
throw new ConcurrentModificationException(); |
1358 |
– |
} |
1377 |
|
} |
1378 |
|
|
1379 |
|
/** |
1434 |
|
private int fence; // -1 until used; then one past last index |
1435 |
|
private int expectedModCount; // initialized when fence set |
1436 |
|
|
1437 |
< |
/** Create new spliterator covering the given range */ |
1437 |
> |
/** Create new spliterator covering the given range */ |
1438 |
|
ArrayListSpliterator(ArrayList<E> list, int origin, int fence, |
1439 |
|
int expectedModCount) { |
1440 |
|
this.list = list; // OK if null unless traversed |
1512 |
|
} |
1513 |
|
} |
1514 |
|
|
1515 |
+ |
// A tiny bit set implementation |
1516 |
+ |
|
1517 |
+ |
private static long[] nBits(int n) { |
1518 |
+ |
return new long[((n - 1) >> 6) + 1]; |
1519 |
+ |
} |
1520 |
+ |
private static void setBit(long[] bits, int i) { |
1521 |
+ |
bits[i >> 6] |= 1L << i; |
1522 |
+ |
} |
1523 |
+ |
private static boolean isClear(long[] bits, int i) { |
1524 |
+ |
return (bits[i >> 6] & (1L << i)) == 0; |
1525 |
+ |
} |
1526 |
+ |
|
1527 |
|
@Override |
1528 |
|
public boolean removeIf(Predicate<? super E> filter) { |
1529 |
+ |
return removeIf(filter, 0, size); |
1530 |
+ |
} |
1531 |
+ |
|
1532 |
+ |
/** |
1533 |
+ |
* Removes all elements satisfying the given predicate, from index |
1534 |
+ |
* i (inclusive) to index end (exclusive). |
1535 |
+ |
*/ |
1536 |
+ |
boolean removeIf(Predicate<? super E> filter, int i, final int end) { |
1537 |
|
Objects.requireNonNull(filter); |
1538 |
< |
final int expectedModCount = modCount; |
1539 |
< |
final Object[] elementData = this.elementData; |
1540 |
< |
int r = 0, w = 0, remaining = size, deleted = 0; |
1541 |
< |
try { |
1542 |
< |
for (; remaining > 0; remaining--, r++) { |
1543 |
< |
@SuppressWarnings("unchecked") E e = (E) elementData[r]; |
1544 |
< |
if (filter.test(e)) |
1545 |
< |
deleted++; |
1546 |
< |
else { |
1547 |
< |
if (r != w) |
1548 |
< |
elementData[w] = e; |
1549 |
< |
w++; |
1550 |
< |
} |
1551 |
< |
} |
1538 |
> |
int expectedModCount = modCount; |
1539 |
> |
final Object[] es = elementData; |
1540 |
> |
// Optimize for initial run of survivors |
1541 |
> |
for (; i < end && !filter.test(elementAt(es, i)); i++) |
1542 |
> |
; |
1543 |
> |
// Tolerate predicates that reentrantly access the collection for |
1544 |
> |
// read (but writers still get CME), so traverse once to find |
1545 |
> |
// elements to delete, a second pass to physically expunge. |
1546 |
> |
if (i < end) { |
1547 |
> |
final int beg = i; |
1548 |
> |
final long[] deathRow = nBits(end - beg); |
1549 |
> |
deathRow[0] = 1L; // set bit 0 |
1550 |
> |
for (i = beg + 1; i < end; i++) |
1551 |
> |
if (filter.test(elementAt(es, i))) |
1552 |
> |
setBit(deathRow, i - beg); |
1553 |
|
if (modCount != expectedModCount) |
1554 |
|
throw new ConcurrentModificationException(); |
1555 |
< |
return deleted > 0; |
1556 |
< |
} catch (Throwable ex) { |
1557 |
< |
if (deleted > 0) |
1558 |
< |
for (; remaining > 0; remaining--, r++, w++) |
1559 |
< |
elementData[w] = elementData[r]; |
1560 |
< |
throw ex; |
1561 |
< |
} finally { |
1562 |
< |
if (deleted > 0) { |
1563 |
< |
modCount++; |
1564 |
< |
size -= deleted; |
1565 |
< |
while (--deleted >= 0) |
1566 |
< |
elementData[w++] = null; |
1567 |
< |
} |
1555 |
> |
expectedModCount++; |
1556 |
> |
modCount++; |
1557 |
> |
int w = beg; |
1558 |
> |
for (i = beg; i < end; i++) |
1559 |
> |
if (isClear(deathRow, i - beg)) |
1560 |
> |
es[w++] = es[i]; |
1561 |
> |
final int oldSize = size; |
1562 |
> |
System.arraycopy(es, end, es, w, oldSize - end); |
1563 |
> |
Arrays.fill(es, size -= (end - w), oldSize, null); |
1564 |
> |
// checkInvariants(); |
1565 |
> |
return true; |
1566 |
> |
} else { |
1567 |
> |
if (modCount != expectedModCount) |
1568 |
> |
throw new ConcurrentModificationException(); |
1569 |
> |
// checkInvariants(); |
1570 |
> |
return false; |
1571 |
|
} |
1572 |
|
} |
1573 |
|
|
1574 |
|
@Override |
1533 |
– |
@SuppressWarnings("unchecked") |
1575 |
|
public void replaceAll(UnaryOperator<E> operator) { |
1576 |
|
Objects.requireNonNull(operator); |
1577 |
|
final int expectedModCount = modCount; |
1578 |
+ |
final Object[] es = elementData; |
1579 |
|
final int size = this.size; |
1580 |
< |
for (int i=0; modCount == expectedModCount && i < size; i++) { |
1581 |
< |
elementData[i] = operator.apply((E) elementData[i]); |
1582 |
< |
} |
1541 |
< |
if (modCount != expectedModCount) { |
1580 |
> |
for (int i = 0; modCount == expectedModCount && i < size; i++) |
1581 |
> |
es[i] = operator.apply(elementAt(es, i)); |
1582 |
> |
if (modCount != expectedModCount) |
1583 |
|
throw new ConcurrentModificationException(); |
1543 |
– |
} |
1584 |
|
modCount++; |
1585 |
+ |
// checkInvariants(); |
1586 |
|
} |
1587 |
|
|
1588 |
|
@Override |
1590 |
|
public void sort(Comparator<? super E> c) { |
1591 |
|
final int expectedModCount = modCount; |
1592 |
|
Arrays.sort((E[]) elementData, 0, size, c); |
1593 |
< |
if (modCount != expectedModCount) { |
1593 |
> |
if (modCount != expectedModCount) |
1594 |
|
throw new ConcurrentModificationException(); |
1554 |
– |
} |
1595 |
|
modCount++; |
1596 |
+ |
// checkInvariants(); |
1597 |
+ |
} |
1598 |
+ |
|
1599 |
+ |
void checkInvariants() { |
1600 |
+ |
// assert size >= 0; |
1601 |
+ |
// assert size == elementData.length || elementData[size] == null; |
1602 |
|
} |
1603 |
|
} |