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 |
< |
|
580 |
< |
// clear to let GC do its work |
581 |
< |
for (int i = 0; i < size; i++) |
582 |
< |
elementData[i] = null; |
583 |
< |
|
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 |
677 |
< |
int newSize = size - (toIndex-fromIndex); |
678 |
< |
for (int i = newSize; i < size; i++) { |
679 |
< |
elementData[i] = null; |
680 |
< |
} |
681 |
< |
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 |
< |
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 |
< |
return batchRemove(c, true); |
739 |
> |
return batchRemove(c, true, 0, size); |
740 |
|
} |
741 |
|
|
742 |
< |
private boolean batchRemove(Collection<?> c, boolean complement) { |
742 |
> |
boolean batchRemove(Collection<?> c, boolean complement, |
743 |
> |
final int from, final int end) { |
744 |
|
Objects.requireNonNull(c); |
745 |
|
final Object[] es = elementData; |
750 |
– |
final int end = size; |
746 |
|
final boolean modified; |
747 |
|
int r; |
748 |
|
// Optimize for initial run of survivors |
749 |
< |
for (r = 0; r < end && c.contains(es[r]) == complement; r++) |
749 |
> |
for (r = from; r < end && c.contains(es[r]) == complement; r++) |
750 |
|
; |
751 |
|
if (modified = (r < end)) { |
752 |
|
int w = r++; |
761 |
|
w += end - r; |
762 |
|
throw ex; |
763 |
|
} finally { |
764 |
< |
modCount += end - w; |
765 |
< |
Arrays.fill(es, size = w, end, null); |
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 |
|
|
1117 |
|
return true; |
1118 |
|
} |
1119 |
|
|
1120 |
+ |
public boolean removeAll(Collection<?> c) { |
1121 |
+ |
return batchRemove(c, false); |
1122 |
+ |
} |
1123 |
+ |
|
1124 |
+ |
public boolean retainAll(Collection<?> c) { |
1125 |
+ |
return batchRemove(c, true); |
1126 |
+ |
} |
1127 |
+ |
|
1128 |
+ |
private boolean batchRemove(Collection<?> c, boolean complement) { |
1129 |
+ |
checkForComodification(); |
1130 |
+ |
int oldSize = root.size; |
1131 |
+ |
boolean modified = |
1132 |
+ |
root.batchRemove(c, complement, offset, offset + size); |
1133 |
+ |
if (modified) |
1134 |
+ |
updateSizeAndModCount(root.size - oldSize); |
1135 |
+ |
return modified; |
1136 |
+ |
} |
1137 |
+ |
|
1138 |
+ |
public boolean removeIf(Predicate<? super E> filter) { |
1139 |
+ |
checkForComodification(); |
1140 |
+ |
int oldSize = root.size; |
1141 |
+ |
boolean modified = root.removeIf(filter, offset, offset + size); |
1142 |
+ |
if (modified) |
1143 |
+ |
updateSizeAndModCount(root.size - oldSize); |
1144 |
+ |
return modified; |
1145 |
+ |
} |
1146 |
+ |
|
1147 |
|
public Iterator<E> iterator() { |
1148 |
|
return listIterator(); |
1149 |
|
} |
1377 |
|
final int expectedModCount = modCount; |
1378 |
|
final Object[] es = elementData; |
1379 |
|
final int size = this.size; |
1380 |
< |
for (int i = 0; modCount == expectedModCount && i < size; i++) { |
1380 |
> |
for (int i = 0; modCount == expectedModCount && i < size; i++) |
1381 |
|
action.accept(elementAt(es, i)); |
1382 |
< |
} |
1358 |
< |
if (modCount != expectedModCount) { |
1382 |
> |
if (modCount != expectedModCount) |
1383 |
|
throw new ConcurrentModificationException(); |
1360 |
– |
} |
1384 |
|
} |
1385 |
|
|
1386 |
|
/** |
1441 |
|
private int fence; // -1 until used; then one past last index |
1442 |
|
private int expectedModCount; // initialized when fence set |
1443 |
|
|
1444 |
< |
/** Create new spliterator covering the given range */ |
1444 |
> |
/** Create new spliterator covering the given range */ |
1445 |
|
ArrayListSpliterator(ArrayList<E> list, int origin, int fence, |
1446 |
|
int expectedModCount) { |
1447 |
|
this.list = list; // OK if null unless traversed |
1532 |
|
} |
1533 |
|
|
1534 |
|
@Override |
1535 |
< |
public boolean removeIf(Predicate<? super E> filter) { |
1535 |
> |
public boolean removeIf(Predicate<? super E> filter) { |
1536 |
> |
return removeIf(filter, 0, size); |
1537 |
> |
} |
1538 |
> |
|
1539 |
> |
boolean removeIf(Predicate<? super E> filter, |
1540 |
> |
final int from, final int end) { |
1541 |
|
Objects.requireNonNull(filter); |
1542 |
|
int expectedModCount = modCount; |
1543 |
|
final Object[] es = elementData; |
1516 |
– |
final int end = size; |
1544 |
|
final boolean modified; |
1545 |
|
int i; |
1546 |
|
// Optimize for initial run of survivors |
1547 |
< |
for (i = 0; i < end && !filter.test(elementAt(es, i)); i++) |
1547 |
> |
for (i = from; i < end && !filter.test(elementAt(es, i)); i++) |
1548 |
|
; |
1549 |
|
// Tolerate predicates that reentrantly access the collection for |
1550 |
|
// read (but writers still get CME), so traverse once to find |
1558 |
|
for (i = beg + 1; i < end; i++) |
1559 |
|
if (filter.test(elementAt(es, i))) |
1560 |
|
setBit(deathRow, i - beg); |
1561 |
+ |
if (modCount != expectedModCount) |
1562 |
+ |
throw new ConcurrentModificationException(); |
1563 |
|
int w = beg; |
1564 |
|
for (i = beg; i < end; i++) |
1565 |
|
if (isClear(deathRow, i - beg)) |
1566 |
|
es[w++] = es[i]; |
1567 |
< |
Arrays.fill(es, size = w, end, null); |
1567 |
> |
final int oldSize = size; |
1568 |
> |
System.arraycopy(es, end, es, w, oldSize - end); |
1569 |
> |
Arrays.fill(es, size -= (end - w), oldSize, null); |
1570 |
|
} |
1571 |
|
if (modCount != expectedModCount) |
1572 |
|
throw new ConcurrentModificationException(); |
1573 |
+ |
// checkInvariants(); |
1574 |
|
return modified; |
1575 |
|
} |
1576 |
|
|
1580 |
|
final int expectedModCount = modCount; |
1581 |
|
final Object[] es = elementData; |
1582 |
|
final int size = this.size; |
1583 |
< |
for (int i=0; modCount == expectedModCount && i < size; i++) { |
1583 |
> |
for (int i = 0; modCount == expectedModCount && i < size; i++) |
1584 |
|
es[i] = operator.apply(elementAt(es, i)); |
1585 |
< |
} |
1554 |
< |
if (modCount != expectedModCount) { |
1585 |
> |
if (modCount != expectedModCount) |
1586 |
|
throw new ConcurrentModificationException(); |
1556 |
– |
} |
1587 |
|
modCount++; |
1588 |
+ |
// checkInvariants(); |
1589 |
|
} |
1590 |
|
|
1591 |
|
@Override |
1593 |
|
public void sort(Comparator<? super E> c) { |
1594 |
|
final int expectedModCount = modCount; |
1595 |
|
Arrays.sort((E[]) elementData, 0, size, c); |
1596 |
< |
if (modCount != expectedModCount) { |
1596 |
> |
if (modCount != expectedModCount) |
1597 |
|
throw new ConcurrentModificationException(); |
1567 |
– |
} |
1598 |
|
modCount++; |
1599 |
+ |
// checkInvariants(); |
1600 |
+ |
} |
1601 |
+ |
|
1602 |
+ |
void checkInvariants() { |
1603 |
+ |
// assert size >= 0; |
1604 |
+ |
// assert size == elementData.length || elementData[size] == null; |
1605 |
|
} |
1606 |
|
} |