ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/main/java/util/ArrayList.java

Comparing jsr166/src/main/java/util/ArrayList.java (file contents):
Revision 1.39 by jsr166, Sun Nov 13 02:10:09 2016 UTC vs.
Revision 1.52 by jsr166, Wed May 31 22:37:31 2017 UTC

#	Line 91 | Line 91 | import java.util.function.UnaryOperator;
91		* should be used only to detect bugs.</i>
92		*
93		* <p>This class is a member of the
94	<	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
94	>	* <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
95		* Java Collections Framework</a>.
96		*
97		* @param <E> the type of elements in this list
#	Line 501 | Line 501 | public class ArrayList<E> extends Abstra
501		s - index);
502		elementData[index] = element;
503		size = s + 1;
504	+	// checkInvariants();
505		}
506
507		/**
#	Line 514 | Line 515 | public class ArrayList<E> extends Abstra
515		*/
516		public E remove(int index) {
517		Objects.checkIndex(index, size);
518	+	final Object[] es = elementData;
519
520	<	modCount++;
521	<	E oldValue = elementData(index);
520	<
521	<	int numMoved = size - index - 1;
522	<	if (numMoved > 0)
523	<	System.arraycopy(elementData, index+1, elementData, index,
524	<	numMoved);
525	<	elementData[--size] = null; // clear to let GC do its work
520	>	@SuppressWarnings("unchecked") E oldValue = (E) es[index];
521	>	fastRemove(es, index);
522
523	+	// checkInvariants();
524		return oldValue;
525		}
526
#	Line 541 | Line 538 | public class ArrayList<E> extends Abstra
538		* @return {@code true} if this list contained the specified element
539		*/
540		public boolean remove(Object o) {
541	<	if (o == null) {
542	<	for (int index = 0; index < size; index++)
543	<	if (elementData[index] == null) {
544	<	fastRemove(index);
545	<	return true;
546	<	}
547	<	} else {
548	<	for (int index = 0; index < size; index++)
549	<	if (o.equals(elementData[index])) {
550	<	fastRemove(index);
551	<	return true;
552	<	}
541	>	final Object[] es = elementData;
542	>	final int size = this.size;
543	>	int i = 0;
544	>	found: {
545	>	if (o == null) {
546	>	for (; i < size; i++)
547	>	if (es[i] == null)
548	>	break found;
549	>	} else {
550	>	for (; i < size; i++)
551	>	if (o.equals(es[i]))
552	>	break found;
553	>	}
554	>	return false;
555		}
556	<	return false;
556	>	fastRemove(es, i);
557	>	return true;
558		}
559
560	<	/*
560	>	/**
561		* Private remove method that skips bounds checking and does not
562		* return the value removed.
563		*/
564	<	private void fastRemove(int index) {
564	>	private void fastRemove(Object[] es, int i) {
565		modCount++;
566	<	int numMoved = size - index - 1;
567	<	if (numMoved > 0)
568	<	System.arraycopy(elementData, index+1, elementData, index,
569	<	numMoved);
570	<	elementData[--size] = null; // clear to let GC do its work
566	>	final int newSize;
567	>	if ((newSize = size - 1) > i)
568	>	System.arraycopy(es, i + 1, es, i, newSize - i);
569	>	es[size = newSize] = null;
570		}
571
572		/**
#	Line 576 | Line 575 | public class ArrayList<E> extends Abstra
575		*/
576		public void clear() {
577		modCount++;
578	<
579	<	// clear to let GC do its work
580	<	for (int i = 0; i < size; i++)
582	<	elementData[i] = null;
583	<
584	<	size = 0;
578	>	final Object[] es = elementData;
579	>	for (int to = size, i = size = 0; i < to; i++)
580	>	es[i] = null;
581		}
582
583		/**
#	Line 609 | Line 605 | public class ArrayList<E> extends Abstra
605		elementData = grow(s + numNew);
606		System.arraycopy(a, 0, elementData, s, numNew);
607		size = s + numNew;
608	+	// checkInvariants();
609		return true;
610		}
611
#	Line 647 | Line 644 | public class ArrayList<E> extends Abstra
644		numMoved);
645		System.arraycopy(a, 0, elementData, index, numNew);
646		size = s + numNew;
647	+	// checkInvariants();
648		return true;
649		}
650
#	Line 669 | Line 667 | public class ArrayList<E> extends Abstra
667		outOfBoundsMsg(fromIndex, toIndex));
668		}
669		modCount++;
670	<	int numMoved = size - toIndex;
671	<	System.arraycopy(elementData, toIndex, elementData, fromIndex,
672	<	numMoved);
673	<
674	<	// clear to let GC do its work
675	<	int newSize = size - (toIndex-fromIndex);
676	<	for (int i = newSize; i < size; i++) {
677	<	elementData[i] = null;
678	<	}
681	<	size = newSize;
670	>	shiftTailOverGap(elementData, fromIndex, toIndex);
671	>	// checkInvariants();
672	>	}
673	>
674	>	/** Erases the gap from lo to hi, by sliding down following elements. */
675	>	private void shiftTailOverGap(Object[] es, int lo, int hi) {
676	>	System.arraycopy(es, hi, es, lo, size - hi);
677	>	for (int to = size, i = (size -= hi - lo); i < to; i++)
678	>	es[i] = null;
679		}
680
681		/**
#	Line 721 | Line 718 | public class ArrayList<E> extends Abstra
718		* @see Collection#contains(Object)
719		*/
720		public boolean removeAll(Collection<?> c) {
721	<	return batchRemove(c, false);
721	>	return batchRemove(c, false, 0, size);
722		}
723
724		/**
#	Line 741 | Line 738 | public class ArrayList<E> extends Abstra
738		* @see Collection#contains(Object)
739		*/
740		public boolean retainAll(Collection<?> c) {
741	<	return batchRemove(c, true);
741	>	return batchRemove(c, true, 0, size);
742		}
743
744	<	private boolean batchRemove(Collection<?> c, boolean complement) {
744	>	boolean batchRemove(Collection<?> c, boolean complement,
745	>	final int from, final int end) {
746		Objects.requireNonNull(c);
747		final Object[] es = elementData;
750	–	final int end = size;
748		final boolean modified;
749		int r;
750		// Optimize for initial run of survivors
751	<	for (r = 0; r < end && c.contains(es[r]) == complement; r++)
751	>	for (r = from; r < end && c.contains(es[r]) == complement; r++)
752		;
753		if (modified = (r < end)) {
754		int w = r++;
#	Line 767 | Line 764 | public class ArrayList<E> extends Abstra
764		throw ex;
765		} finally {
766		modCount += end - w;
767	<	Arrays.fill(es, size = w, end, null);
767	>	shiftTailOverGap(es, w, end);
768		}
769		}
770	+	// checkInvariants();
771		return modified;
772		}
773
774		/**
775	<	* Save the state of the {@code ArrayList} instance to a stream (that
776	<	* is, serialize it).
775	>	* Saves the state of the {@code ArrayList} instance to a stream
776	>	* (that is, serializes it).
777		*
778	+	* @param s the stream
779	+	* @throws java.io.IOException if an I/O error occurs
780		* @serialData The length of the array backing the {@code ArrayList}
781		*             instance is emitted (int), followed by all of its elements
782		*             (each an {@code Object}) in the proper order.
783		*/
784		private void writeObject(java.io.ObjectOutputStream s)
785	<	throws java.io.IOException{
785	>	throws java.io.IOException {
786		// Write out element count, and any hidden stuff
787		int expectedModCount = modCount;
788		s.defaultWriteObject();
789
790	<	// Write out size as capacity for behavioural compatibility with clone()
790	>	// Write out size as capacity for behavioral compatibility with clone()
791		s.writeInt(size);
792
793		// Write out all elements in the proper order.
#	Line 801 | Line 801 | public class ArrayList<E> extends Abstra
801		}
802
803		/**
804	<	* Reconstitute the {@code ArrayList} instance from a stream (that is,
805	<	* deserialize it).
804	>	* Reconstitutes the {@code ArrayList} instance from a stream (that is,
805	>	* deserializes it).
806	>	* @param s the stream
807	>	* @throws ClassNotFoundException if the class of a serialized object
808	>	*         could not be found
809	>	* @throws java.io.IOException if an I/O error occurs
810		*/
811		private void readObject(java.io.ObjectInputStream s)
812		throws java.io.IOException, ClassNotFoundException {
#	Line 914 | Line 918 | public class ArrayList<E> extends Abstra
918		}
919
920		@Override
921	<	@SuppressWarnings("unchecked")
922	<	public void forEachRemaining(Consumer<? super E> consumer) {
919	<	Objects.requireNonNull(consumer);
921	>	public void forEachRemaining(Consumer<? super E> action) {
922	>	Objects.requireNonNull(action);
923		final int size = ArrayList.this.size;
924		int i = cursor;
925	<	if (i >= size) {
926	<	return;
927	<	}
928	<	final Object[] elementData = ArrayList.this.elementData;
929	<	if (i >= elementData.length) {
930	<	throw new ConcurrentModificationException();
931	<	}
932	<	while (i != size && modCount == expectedModCount) {
933	<	consumer.accept((E) elementData[i++]);
925	>	if (i < size) {
926	>	final Object[] es = elementData;
927	>	if (i >= es.length)
928	>	throw new ConcurrentModificationException();
929	>	for (; i < size && modCount == expectedModCount; i++)
930	>	action.accept(elementAt(es, i));
931	>	// update once at end to reduce heap write traffic
932	>	cursor = i;
933	>	lastRet = i - 1;
934	>	checkForComodification();
935		}
932	–	// update once at end of iteration to reduce heap write traffic
933	–	cursor = i;
934	–	lastRet = i - 1;
935	–	checkForComodification();
936		}
937
938		final void checkForComodification() {
#	Line 1119 | Line 1119 | public class ArrayList<E> extends Abstra
1119		return true;
1120		}
1121
1122	+	public boolean removeAll(Collection<?> c) {
1123	+	return batchRemove(c, false);
1124	+	}
1125	+
1126	+	public boolean retainAll(Collection<?> c) {
1127	+	return batchRemove(c, true);
1128	+	}
1129	+
1130	+	private boolean batchRemove(Collection<?> c, boolean complement) {
1131	+	checkForComodification();
1132	+	int oldSize = root.size;
1133	+	boolean modified =
1134	+	root.batchRemove(c, complement, offset, offset + size);
1135	+	if (modified)
1136	+	updateSizeAndModCount(root.size - oldSize);
1137	+	return modified;
1138	+	}
1139	+
1140	+	public boolean removeIf(Predicate<? super E> filter) {
1141	+	checkForComodification();
1142	+	int oldSize = root.size;
1143	+	boolean modified = root.removeIf(filter, offset, offset + size);
1144	+	if (modified)
1145	+	updateSizeAndModCount(root.size - oldSize);
1146	+	return modified;
1147	+	}
1148	+
1149		public Iterator<E> iterator() {
1150		return listIterator();
1151		}
#	Line 1166 | Line 1193 | public class ArrayList<E> extends Abstra
1193		return (E) elementData[offset + (lastRet = i)];
1194		}
1195
1196	<	@SuppressWarnings("unchecked")
1197	<	public void forEachRemaining(Consumer<? super E> consumer) {
1171	<	Objects.requireNonNull(consumer);
1196	>	public void forEachRemaining(Consumer<? super E> action) {
1197	>	Objects.requireNonNull(action);
1198		final int size = SubList.this.size;
1199		int i = cursor;
1200	<	if (i >= size) {
1201	<	return;
1202	<	}
1203	<	final Object[] elementData = root.elementData;
1204	<	if (offset + i >= elementData.length) {
1205	<	throw new ConcurrentModificationException();
1206	<	}
1207	<	while (i != size && modCount == expectedModCount) {
1208	<	consumer.accept((E) elementData[offset + (i++)]);
1200	>	if (i < size) {
1201	>	final Object[] es = root.elementData;
1202	>	if (offset + i >= es.length)
1203	>	throw new ConcurrentModificationException();
1204	>	for (; i < size && modCount == expectedModCount; i++)
1205	>	action.accept(elementAt(es, offset + i));
1206	>	// update once at end to reduce heap write traffic
1207	>	cursor = i;
1208	>	lastRet = i - 1;
1209	>	checkForComodification();
1210		}
1184	–	// update once at end of iteration to reduce heap write traffic
1185	–	lastRet = cursor = i;
1186	–	checkForComodification();
1211		}
1212
1213		public int nextIndex() {
#	Line 1273 | Line 1297 | public class ArrayList<E> extends Abstra
1297		public Spliterator<E> spliterator() {
1298		checkForComodification();
1299
1300	<	// ArrayListSpliterator is not used because late-binding logic
1301	<	// is different here
1278	<	return new Spliterator<>() {
1300	>	// ArrayListSpliterator not used here due to late-binding
1301	>	return new Spliterator<E>() {
1302		private int index = offset; // current index, modified on advance/split
1303		private int fence = -1; // -1 until used; then one past last index
1304		private int expectedModCount; // initialized when fence set
#	Line 1289 | Line 1312 | public class ArrayList<E> extends Abstra
1312		return hi;
1313		}
1314
1315	<	public ArrayListSpliterator<E> trySplit() {
1315	>	public ArrayList<E>.ArrayListSpliterator trySplit() {
1316		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1317	<	// ArrayListSpliterator could be used here as the source is already bound
1317	>	// ArrayListSpliterator can be used here as the source is already bound
1318		return (lo >= mid) ? null : // divide range in half unless too small
1319	<	new ArrayListSpliterator<>(root, lo, index = mid,
1297	<	expectedModCount);
1319	>	root.new ArrayListSpliterator(lo, index = mid, expectedModCount);
1320		}
1321
1322		public boolean tryAdvance(Consumer<? super E> action) {
#	Line 1336 | Line 1358 | public class ArrayList<E> extends Abstra
1358		}
1359
1360		public long estimateSize() {
1361	<	return (long) (getFence() - index);
1361	>	return getFence() - index;
1362		}
1363
1364		public int characteristics() {
#	Line 1346 | Line 1368 | public class ArrayList<E> extends Abstra
1368		}
1369		}
1370
1371	+	/**
1372	+	* @throws NullPointerException {@inheritDoc}
1373	+	*/
1374		@Override
1375		public void forEach(Consumer<? super E> action) {
1376		Objects.requireNonNull(action);
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		/**
#	Line 1375 | Line 1398 | public class ArrayList<E> extends Abstra
1398		*/
1399		@Override
1400		public Spliterator<E> spliterator() {
1401	<	return new ArrayListSpliterator<>(this, 0, -1, 0);
1401	>	return new ArrayListSpliterator(0, -1, 0);
1402		}
1403
1404		/** Index-based split-by-two, lazily initialized Spliterator */
1405	<	static final class ArrayListSpliterator<E> implements Spliterator<E> {
1405	>	final class ArrayListSpliterator implements Spliterator<E> {
1406
1407		/*
1408		* If ArrayLists were immutable, or structurally immutable (no
#	Line 1413 | Line 1436 | public class ArrayList<E> extends Abstra
1436		* these streamlinings.
1437		*/
1438
1416	–	private final ArrayList<E> list;
1439		private int index; // current index, modified on advance/split
1440		private int fence; // -1 until used; then one past last index
1441		private int expectedModCount; // initialized when fence set
1442
1443	<	/** Create new spliterator covering the given  range */
1444	<	ArrayListSpliterator(ArrayList<E> list, int origin, int fence,
1423	<	int expectedModCount) {
1424	<	this.list = list; // OK if null unless traversed
1443	>	/** Creates new spliterator covering the given range. */
1444	>	ArrayListSpliterator(int origin, int fence, int expectedModCount) {
1445		this.index = origin;
1446		this.fence = fence;
1447		this.expectedModCount = expectedModCount;
#	Line 1429 | Line 1449 | public class ArrayList<E> extends Abstra
1449
1450		private int getFence() { // initialize fence to size on first use
1451		int hi; // (a specialized variant appears in method forEach)
1432	–	ArrayList<E> lst;
1452		if ((hi = fence) < 0) {
1453	<	if ((lst = list) == null)
1454	<	hi = fence = 0;
1436	<	else {
1437	<	expectedModCount = lst.modCount;
1438	<	hi = fence = lst.size;
1439	<	}
1453	>	expectedModCount = modCount;
1454	>	hi = fence = size;
1455		}
1456		return hi;
1457		}
1458
1459	<	public ArrayListSpliterator<E> trySplit() {
1459	>	public ArrayListSpliterator trySplit() {
1460		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1461		return (lo >= mid) ? null : // divide range in half unless too small
1462	<	new ArrayListSpliterator<>(list, lo, index = mid,
1448	<	expectedModCount);
1462	>	new ArrayListSpliterator(lo, index = mid, expectedModCount);
1463		}
1464
1465		public boolean tryAdvance(Consumer<? super E> action) {
#	Line 1454 | Line 1468 | public class ArrayList<E> extends Abstra
1468		int hi = getFence(), i = index;
1469		if (i < hi) {
1470		index = i + 1;
1471	<	@SuppressWarnings("unchecked") E e = (E)list.elementData[i];
1471	>	@SuppressWarnings("unchecked") E e = (E)elementData[i];
1472		action.accept(e);
1473	<	if (list.modCount != expectedModCount)
1473	>	if (modCount != expectedModCount)
1474		throw new ConcurrentModificationException();
1475		return true;
1476		}
#	Line 1465 | Line 1479 | public class ArrayList<E> extends Abstra
1479
1480		public void forEachRemaining(Consumer<? super E> action) {
1481		int i, hi, mc; // hoist accesses and checks from loop
1482	<	ArrayList<E> lst; Object[] a;
1482	>	Object[] a;
1483		if (action == null)
1484		throw new NullPointerException();
1485	<	if ((lst = list) != null && (a = lst.elementData) != null) {
1485	>	if ((a = elementData) != null) {
1486		if ((hi = fence) < 0) {
1487	<	mc = lst.modCount;
1488	<	hi = lst.size;
1487	>	mc = modCount;
1488	>	hi = size;
1489		}
1490		else
1491		mc = expectedModCount;
#	Line 1480 | Line 1494 | public class ArrayList<E> extends Abstra
1494		@SuppressWarnings("unchecked") E e = (E) a[i];
1495		action.accept(e);
1496		}
1497	<	if (lst.modCount == mc)
1497	>	if (modCount == mc)
1498		return;
1499		}
1500		}
#	Line 1488 | Line 1502 | public class ArrayList<E> extends Abstra
1502		}
1503
1504		public long estimateSize() {
1505	<	return (long) (getFence() - index);
1505	>	return getFence() - index;
1506		}
1507
1508		public int characteristics() {
#	Line 1508 | Line 1522 | public class ArrayList<E> extends Abstra
1522		return (bits[i >> 6] & (1L << i)) == 0;
1523		}
1524
1525	+	/**
1526	+	* @throws NullPointerException {@inheritDoc}
1527	+	*/
1528		@Override
1529	<	public boolean removeIf(Predicate<? super E> filter) {
1529	>	public boolean removeIf(Predicate<? super E> filter) {
1530	>	return removeIf(filter, 0, size);
1531	>	}
1532	>
1533	>	/**
1534	>	* Removes all elements satisfying the given predicate, from index
1535	>	* i (inclusive) to index end (exclusive).
1536	>	*/
1537	>	boolean removeIf(Predicate<? super E> filter, int i, final int end) {
1538		Objects.requireNonNull(filter);
1539		int expectedModCount = modCount;
1540		final Object[] es = elementData;
1516	–	final int end = size;
1517	–	final boolean modified;
1518	–	int i;
1541		// Optimize for initial run of survivors
1542	<	for (i = 0; i < end && !filter.test(elementAt(es, i)); i++)
1542	>	for (; i < end && !filter.test(elementAt(es, i)); i++)
1543		;
1544		// Tolerate predicates that reentrantly access the collection for
1545		// read (but writers still get CME), so traverse once to find
1546		// elements to delete, a second pass to physically expunge.
1547	<	if (modified = (i < end)) {
1526	<	expectedModCount++;
1527	<	modCount++;
1547	>	if (i < end) {
1548		final int beg = i;
1549		final long[] deathRow = nBits(end - beg);
1550		deathRow[0] = 1L;   // set bit 0
1551		for (i = beg + 1; i < end; i++)
1552		if (filter.test(elementAt(es, i)))
1553		setBit(deathRow, i - beg);
1554	+	if (modCount != expectedModCount)
1555	+	throw new ConcurrentModificationException();
1556	+	expectedModCount++;
1557	+	modCount++;
1558		int w = beg;
1559		for (i = beg; i < end; i++)
1560		if (isClear(deathRow, i - beg))
1561		es[w++] = es[i];
1562	<	Arrays.fill(es, size = w, end, null);
1562	>	shiftTailOverGap(es, w, end);
1563	>	// checkInvariants();
1564	>	return true;
1565	>	} else {
1566	>	if (modCount != expectedModCount)
1567	>	throw new ConcurrentModificationException();
1568	>	// checkInvariants();
1569	>	return false;
1570		}
1540	–	if (modCount != expectedModCount)
1541	–	throw new ConcurrentModificationException();
1542	–	return modified;
1571		}
1572
1573		@Override
#	Line 1548 | Line 1576 | public class ArrayList<E> extends Abstra
1576		final int expectedModCount = modCount;
1577		final Object[] es = elementData;
1578		final int size = this.size;
1579	<	for (int i=0; modCount == expectedModCount && i < size; i++) {
1579	>	for (int i = 0; modCount == expectedModCount && i < size; i++)
1580		es[i] = operator.apply(elementAt(es, i));
1581	<	}
1554	<	if (modCount != expectedModCount) {
1581	>	if (modCount != expectedModCount)
1582		throw new ConcurrentModificationException();
1556	–	}
1583		modCount++;
1584	+	// checkInvariants();
1585		}
1586
1587		@Override
#	Line 1562 | Line 1589 | public class ArrayList<E> extends Abstra
1589		public void sort(Comparator<? super E> c) {
1590		final int expectedModCount = modCount;
1591		Arrays.sort((E[]) elementData, 0, size, c);
1592	<	if (modCount != expectedModCount) {
1592	>	if (modCount != expectedModCount)
1593		throw new ConcurrentModificationException();
1567	–	}
1594		modCount++;
1595	+	// checkInvariants();
1596	+	}
1597	+
1598	+	void checkInvariants() {
1599	+	// assert size >= 0;
1600	+	// assert size == elementData.length || elementData[size] == null;
1601		}
1602		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines