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.42 by jsr166, Mon Nov 14 21:16:43 2016 UTC vs.
Revision 1.54 by jsr166, Sun Oct 22 17:44:03 2017 UTC

#	Line 1 | Line 1
1		/*
2	<	* Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
2	>	* Copyright (c) 1997, 2017, Oracle and/or its affiliates. All rights reserved.
3		* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4		*
5		* This code is free software; you can redistribute it and/or modify it
#	Line 28 | Line 28 | package java.util;
28		import java.util.function.Consumer;
29		import java.util.function.Predicate;
30		import java.util.function.UnaryOperator;
31	+	import jdk.internal.misc.SharedSecrets;
32
33		/**
34		* Resizable-array implementation of the {@code List} interface.  Implements
#	Line 91 | Line 92 | import java.util.function.UnaryOperator;
92		* should be used only to detect bugs.</i>
93		*
94		* <p>This class is a member of the
95	<	* <a href="{@docRoot}/../technotes/guides/collections/index.html">
95	>	* <a href="{@docRoot}/java/util/package-summary.html#CollectionsFramework">
96		* Java Collections Framework</a>.
97		*
98		* @param <E> the type of elements in this list
#	Line 515 | Line 516 | public class ArrayList<E> extends Abstra
516		*/
517		public E remove(int index) {
518		Objects.checkIndex(index, size);
519	+	final Object[] es = elementData;
520
521	<	modCount++;
522	<	E oldValue = elementData(index);
521	<
522	<	int numMoved = size - index - 1;
523	<	if (numMoved > 0)
524	<	System.arraycopy(elementData, index+1, elementData, index,
525	<	numMoved);
526	<	elementData[--size] = null; // clear to let GC do its work
521	>	@SuppressWarnings("unchecked") E oldValue = (E) es[index];
522	>	fastRemove(es, index);
523
524		// checkInvariants();
525		return oldValue;
#	Line 543 | Line 539 | public class ArrayList<E> extends Abstra
539		* @return {@code true} if this list contained the specified element
540		*/
541		public boolean remove(Object o) {
542	<	if (o == null) {
543	<	for (int index = 0; index < size; index++)
544	<	if (elementData[index] == null) {
545	<	fastRemove(index);
546	<	return true;
547	<	}
548	<	} else {
549	<	for (int index = 0; index < size; index++)
550	<	if (o.equals(elementData[index])) {
551	<	fastRemove(index);
552	<	return true;
553	<	}
542	>	final Object[] es = elementData;
543	>	final int size = this.size;
544	>	int i = 0;
545	>	found: {
546	>	if (o == null) {
547	>	for (; i < size; i++)
548	>	if (es[i] == null)
549	>	break found;
550	>	} else {
551	>	for (; i < size; i++)
552	>	if (o.equals(es[i]))
553	>	break found;
554	>	}
555	>	return false;
556		}
557	<	return false;
557	>	fastRemove(es, i);
558	>	return true;
559		}
560
561		/**
562		* Private remove method that skips bounds checking and does not
563		* return the value removed.
564		*/
565	<	private void fastRemove(int index) {
565	>	private void fastRemove(Object[] es, int i) {
566		modCount++;
567	<	int numMoved = size - index - 1;
568	<	if (numMoved > 0)
569	<	System.arraycopy(elementData, index+1, elementData, index,
570	<	numMoved);
572	<	elementData[--size] = null; // clear to let GC do its work
567	>	final int newSize;
568	>	if ((newSize = size - 1) > i)
569	>	System.arraycopy(es, i + 1, es, i, newSize - i);
570	>	es[size = newSize] = null;
571		}
572
573		/**
#	Line 578 | Line 576 | public class ArrayList<E> extends Abstra
576		*/
577		public void clear() {
578		modCount++;
579	<	Arrays.fill(elementData, 0, size, null);
580	<	size = 0;
579	>	final Object[] es = elementData;
580	>	for (int to = size, i = size = 0; i < to; i++)
581	>	es[i] = null;
582		}
583
584		/**
#	Line 669 | Line 668 | public class ArrayList<E> extends Abstra
668		outOfBoundsMsg(fromIndex, toIndex));
669		}
670		modCount++;
671	<	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);
671	>	shiftTailOverGap(elementData, fromIndex, toIndex);
672		// checkInvariants();
673		}
674
675	+	/** Erases the gap from lo to hi, by sliding down following elements. */
676	+	private void shiftTailOverGap(Object[] es, int lo, int hi) {
677	+	System.arraycopy(es, hi, es, lo, size - hi);
678	+	for (int to = size, i = (size -= hi - lo); i < to; i++)
679	+	es[i] = null;
680	+	}
681	+
682		/**
683		* A version of rangeCheck used by add and addAll.
684		*/
#	Line 743 | Line 746 | public class ArrayList<E> extends Abstra
746		final int from, final int end) {
747		Objects.requireNonNull(c);
748		final Object[] es = elementData;
746	–	final boolean modified;
749		int r;
750		// Optimize for initial run of survivors
751	<	for (r = from; r < end && c.contains(es[r]) == complement; r++)
752	<	;
753	<	if (modified = (r < end)) {
754	<	int w = r++;
755	<	try {
756	<	for (Object e; r < end; r++)
757	<	if (c.contains(e = es[r]) == complement)
758	<	es[w++] = e;
759	<	} catch (Throwable ex) {
760	<	// Preserve behavioral compatibility with AbstractCollection,
761	<	// even if c.contains() throws.
762	<	System.arraycopy(es, r, es, w, end - r);
763	<	w += end - r;
764	<	throw ex;
765	<	} finally {
766	<	final int oldSize = size, deleted = end - w;
767	<	modCount += deleted;
768	<	System.arraycopy(es, end, es, w, oldSize - end);
769	<	Arrays.fill(es, size -= deleted, oldSize, null);
770	<	}
751	>	for (r = from;; r++) {
752	>	if (r == end)
753	>	return false;
754	>	if (c.contains(es[r]) != complement)
755	>	break;
756	>	}
757	>	int w = r++;
758	>	try {
759	>	for (Object e; r < end; r++)
760	>	if (c.contains(e = es[r]) == complement)
761	>	es[w++] = e;
762	>	} catch (Throwable ex) {
763	>	// Preserve behavioral compatibility with AbstractCollection,
764	>	// even if c.contains() throws.
765	>	System.arraycopy(es, r, es, w, end - r);
766	>	w += end - r;
767	>	throw ex;
768	>	} finally {
769	>	modCount += end - w;
770	>	shiftTailOverGap(es, w, end);
771		}
772		// checkInvariants();
773	<	return modified;
773	>	return true;
774		}
775
776		/**
777	<	* Save the state of the {@code ArrayList} instance to a stream (that
778	<	* is, serialize it).
777	>	* Saves the state of the {@code ArrayList} instance to a stream
778	>	* (that is, serializes it).
779		*
780	+	* @param s the stream
781	+	* @throws java.io.IOException if an I/O error occurs
782		* @serialData The length of the array backing the {@code ArrayList}
783		*             instance is emitted (int), followed by all of its elements
784		*             (each an {@code Object}) in the proper order.
785		*/
786		private void writeObject(java.io.ObjectOutputStream s)
787	<	throws java.io.IOException{
787	>	throws java.io.IOException {
788		// Write out element count, and any hidden stuff
789		int expectedModCount = modCount;
790		s.defaultWriteObject();
791
792	<	// Write out size as capacity for behavioural compatibility with clone()
792	>	// Write out size as capacity for behavioral compatibility with clone()
793		s.writeInt(size);
794
795		// Write out all elements in the proper order.
#	Line 799 | Line 803 | public class ArrayList<E> extends Abstra
803		}
804
805		/**
806	<	* Reconstitute the {@code ArrayList} instance from a stream (that is,
807	<	* deserialize it).
806	>	* Reconstitutes the {@code ArrayList} instance from a stream (that is,
807	>	* deserializes it).
808	>	* @param s the stream
809	>	* @throws ClassNotFoundException if the class of a serialized object
810	>	*         could not be found
811	>	* @throws java.io.IOException if an I/O error occurs
812		*/
813		private void readObject(java.io.ObjectInputStream s)
814		throws java.io.IOException, ClassNotFoundException {
#	Line 813 | Line 821 | public class ArrayList<E> extends Abstra
821
822		if (size > 0) {
823		// like clone(), allocate array based upon size not capacity
824	+	SharedSecrets.getJavaObjectInputStreamAccess().checkArray(s, Object[].class, size);
825		Object[] elements = new Object[size];
826
827		// Read in all elements in the proper order.
#	Line 912 | Line 921 | public class ArrayList<E> extends Abstra
921		}
922
923		@Override
924	<	@SuppressWarnings("unchecked")
925	<	public void forEachRemaining(Consumer<? super E> consumer) {
917	<	Objects.requireNonNull(consumer);
924	>	public void forEachRemaining(Consumer<? super E> action) {
925	>	Objects.requireNonNull(action);
926		final int size = ArrayList.this.size;
927		int i = cursor;
928	<	if (i >= size) {
929	<	return;
930	<	}
931	<	final Object[] elementData = ArrayList.this.elementData;
932	<	if (i >= elementData.length) {
933	<	throw new ConcurrentModificationException();
934	<	}
935	<	while (i != size && modCount == expectedModCount) {
936	<	consumer.accept((E) elementData[i++]);
928	>	if (i < size) {
929	>	final Object[] es = elementData;
930	>	if (i >= es.length)
931	>	throw new ConcurrentModificationException();
932	>	for (; i < size && modCount == expectedModCount; i++)
933	>	action.accept(elementAt(es, i));
934	>	// update once at end to reduce heap write traffic
935	>	cursor = i;
936	>	lastRet = i - 1;
937	>	checkForComodification();
938		}
930	–	// update once at end of iteration to reduce heap write traffic
931	–	cursor = i;
932	–	lastRet = i - 1;
933	–	checkForComodification();
939		}
940
941		final void checkForComodification() {
#	Line 1191 | Line 1196 | public class ArrayList<E> extends Abstra
1196		return (E) elementData[offset + (lastRet = i)];
1197		}
1198
1199	<	@SuppressWarnings("unchecked")
1200	<	public void forEachRemaining(Consumer<? super E> consumer) {
1196	<	Objects.requireNonNull(consumer);
1199	>	public void forEachRemaining(Consumer<? super E> action) {
1200	>	Objects.requireNonNull(action);
1201		final int size = SubList.this.size;
1202		int i = cursor;
1203	<	if (i >= size) {
1204	<	return;
1205	<	}
1206	<	final Object[] elementData = root.elementData;
1207	<	if (offset + i >= elementData.length) {
1208	<	throw new ConcurrentModificationException();
1209	<	}
1210	<	while (i != size && modCount == expectedModCount) {
1211	<	consumer.accept((E) elementData[offset + (i++)]);
1203	>	if (i < size) {
1204	>	final Object[] es = root.elementData;
1205	>	if (offset + i >= es.length)
1206	>	throw new ConcurrentModificationException();
1207	>	for (; i < size && modCount == expectedModCount; i++)
1208	>	action.accept(elementAt(es, offset + i));
1209	>	// update once at end to reduce heap write traffic
1210	>	cursor = i;
1211	>	lastRet = i - 1;
1212	>	checkForComodification();
1213		}
1209	–	// update once at end of iteration to reduce heap write traffic
1210	–	cursor = i;
1211	–	lastRet = i - 1;
1212	–	checkForComodification();
1214		}
1215
1216		public int nextIndex() {
#	Line 1299 | Line 1300 | public class ArrayList<E> extends Abstra
1300		public Spliterator<E> spliterator() {
1301		checkForComodification();
1302
1303	<	// ArrayListSpliterator is not used because late-binding logic
1304	<	// is different here
1304	<	return new Spliterator<>() {
1303	>	// ArrayListSpliterator not used here due to late-binding
1304	>	return new Spliterator<E>() {
1305		private int index = offset; // current index, modified on advance/split
1306		private int fence = -1; // -1 until used; then one past last index
1307		private int expectedModCount; // initialized when fence set
#	Line 1315 | Line 1315 | public class ArrayList<E> extends Abstra
1315		return hi;
1316		}
1317
1318	<	public ArrayListSpliterator<E> trySplit() {
1318	>	public ArrayList<E>.ArrayListSpliterator trySplit() {
1319		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1320	<	// ArrayListSpliterator could be used here as the source is already bound
1320	>	// ArrayListSpliterator can be used here as the source is already bound
1321		return (lo >= mid) ? null : // divide range in half unless too small
1322	<	new ArrayListSpliterator<>(root, lo, index = mid,
1323	<	expectedModCount);
1322	>	root.new ArrayListSpliterator(lo, index = mid, expectedModCount);
1323		}
1324
1325		public boolean tryAdvance(Consumer<? super E> action) {
#	Line 1362 | Line 1361 | public class ArrayList<E> extends Abstra
1361		}
1362
1363		public long estimateSize() {
1364	<	return (long) (getFence() - index);
1364	>	return getFence() - index;
1365		}
1366
1367		public int characteristics() {
#	Line 1372 | Line 1371 | public class ArrayList<E> extends Abstra
1371		}
1372		}
1373
1374	+	/**
1375	+	* @throws NullPointerException {@inheritDoc}
1376	+	*/
1377		@Override
1378		public void forEach(Consumer<? super E> action) {
1379		Objects.requireNonNull(action);
#	Line 1399 | Line 1401 | public class ArrayList<E> extends Abstra
1401		*/
1402		@Override
1403		public Spliterator<E> spliterator() {
1404	<	return new ArrayListSpliterator<>(this, 0, -1, 0);
1404	>	return new ArrayListSpliterator(0, -1, 0);
1405		}
1406
1407		/** Index-based split-by-two, lazily initialized Spliterator */
1408	<	static final class ArrayListSpliterator<E> implements Spliterator<E> {
1408	>	final class ArrayListSpliterator implements Spliterator<E> {
1409
1410		/*
1411		* If ArrayLists were immutable, or structurally immutable (no
#	Line 1437 | Line 1439 | public class ArrayList<E> extends Abstra
1439		* these streamlinings.
1440		*/
1441
1440	–	private final ArrayList<E> list;
1442		private int index; // current index, modified on advance/split
1443		private int fence; // -1 until used; then one past last index
1444		private int expectedModCount; // initialized when fence set
1445
1446	<	/** Create new spliterator covering the given range */
1447	<	ArrayListSpliterator(ArrayList<E> list, int origin, int fence,
1447	<	int expectedModCount) {
1448	<	this.list = list; // OK if null unless traversed
1446	>	/** Creates new spliterator covering the given range. */
1447	>	ArrayListSpliterator(int origin, int fence, int expectedModCount) {
1448		this.index = origin;
1449		this.fence = fence;
1450		this.expectedModCount = expectedModCount;
#	Line 1453 | Line 1452 | public class ArrayList<E> extends Abstra
1452
1453		private int getFence() { // initialize fence to size on first use
1454		int hi; // (a specialized variant appears in method forEach)
1456	–	ArrayList<E> lst;
1455		if ((hi = fence) < 0) {
1456	<	if ((lst = list) == null)
1457	<	hi = fence = 0;
1460	<	else {
1461	<	expectedModCount = lst.modCount;
1462	<	hi = fence = lst.size;
1463	<	}
1456	>	expectedModCount = modCount;
1457	>	hi = fence = size;
1458		}
1459		return hi;
1460		}
1461
1462	<	public ArrayListSpliterator<E> trySplit() {
1462	>	public ArrayListSpliterator trySplit() {
1463		int hi = getFence(), lo = index, mid = (lo + hi) >>> 1;
1464		return (lo >= mid) ? null : // divide range in half unless too small
1465	<	new ArrayListSpliterator<>(list, lo, index = mid,
1472	<	expectedModCount);
1465	>	new ArrayListSpliterator(lo, index = mid, expectedModCount);
1466		}
1467
1468		public boolean tryAdvance(Consumer<? super E> action) {
#	Line 1478 | Line 1471 | public class ArrayList<E> extends Abstra
1471		int hi = getFence(), i = index;
1472		if (i < hi) {
1473		index = i + 1;
1474	<	@SuppressWarnings("unchecked") E e = (E)list.elementData[i];
1474	>	@SuppressWarnings("unchecked") E e = (E)elementData[i];
1475		action.accept(e);
1476	<	if (list.modCount != expectedModCount)
1476	>	if (modCount != expectedModCount)
1477		throw new ConcurrentModificationException();
1478		return true;
1479		}
#	Line 1489 | Line 1482 | public class ArrayList<E> extends Abstra
1482
1483		public void forEachRemaining(Consumer<? super E> action) {
1484		int i, hi, mc; // hoist accesses and checks from loop
1485	<	ArrayList<E> lst; Object[] a;
1485	>	Object[] a;
1486		if (action == null)
1487		throw new NullPointerException();
1488	<	if ((lst = list) != null && (a = lst.elementData) != null) {
1488	>	if ((a = elementData) != null) {
1489		if ((hi = fence) < 0) {
1490	<	mc = lst.modCount;
1491	<	hi = lst.size;
1490	>	mc = modCount;
1491	>	hi = size;
1492		}
1493		else
1494		mc = expectedModCount;
#	Line 1504 | Line 1497 | public class ArrayList<E> extends Abstra
1497		@SuppressWarnings("unchecked") E e = (E) a[i];
1498		action.accept(e);
1499		}
1500	<	if (lst.modCount == mc)
1500	>	if (modCount == mc)
1501		return;
1502		}
1503		}
#	Line 1512 | Line 1505 | public class ArrayList<E> extends Abstra
1505		}
1506
1507		public long estimateSize() {
1508	<	return (long) (getFence() - index);
1508	>	return getFence() - index;
1509		}
1510
1511		public int characteristics() {
#	Line 1532 | Line 1525 | public class ArrayList<E> extends Abstra
1525		return (bits[i >> 6] & (1L << i)) == 0;
1526		}
1527
1528	+	/**
1529	+	* @throws NullPointerException {@inheritDoc}
1530	+	*/
1531		@Override
1532		public boolean removeIf(Predicate<? super E> filter) {
1533		return removeIf(filter, 0, size);
1534		}
1535
1536	<	boolean removeIf(Predicate<? super E> filter,
1537	<	final int from, final int end) {
1536	>	/**
1537	>	* Removes all elements satisfying the given predicate, from index
1538	>	* i (inclusive) to index end (exclusive).
1539	>	*/
1540	>	boolean removeIf(Predicate<? super E> filter, int i, final int end) {
1541		Objects.requireNonNull(filter);
1542		int expectedModCount = modCount;
1543		final Object[] es = elementData;
1545	–	final boolean modified;
1546	–	int i;
1544		// Optimize for initial run of survivors
1545	<	for (i = from; i < end && !filter.test(elementAt(es, i)); i++)
1545	>	for (; i < end && !filter.test(elementAt(es, i)); i++)
1546		;
1547		// Tolerate predicates that reentrantly access the collection for
1548		// read (but writers still get CME), so traverse once to find
1549		// elements to delete, a second pass to physically expunge.
1550	<	if (modified = (i < end)) {
1554	<	expectedModCount++;
1555	<	modCount++;
1550	>	if (i < end) {
1551		final int beg = i;
1552		final long[] deathRow = nBits(end - beg);
1553		deathRow[0] = 1L;   // set bit 0
#	Line 1561 | Line 1556 | public class ArrayList<E> extends Abstra
1556		setBit(deathRow, i - beg);
1557		if (modCount != expectedModCount)
1558		throw new ConcurrentModificationException();
1559	+	expectedModCount++;
1560	+	modCount++;
1561		int w = beg;
1562		for (i = beg; i < end; i++)
1563		if (isClear(deathRow, i - beg))
1564		es[w++] = es[i];
1565	<	final int oldSize = size;
1566	<	System.arraycopy(es, end, es, w, oldSize - end);
1567	<	Arrays.fill(es, size -= (end - w), oldSize, null);
1565	>	shiftTailOverGap(es, w, end);
1566	>	// checkInvariants();
1567	>	return true;
1568	>	} else {
1569	>	if (modCount != expectedModCount)
1570	>	throw new ConcurrentModificationException();
1571	>	// checkInvariants();
1572	>	return false;
1573		}
1572	–	if (modCount != expectedModCount)
1573	–	throw new ConcurrentModificationException();
1574	–	// checkInvariants();
1575	–	return modified;
1574		}
1575
1576		@Override

Diff Legend

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