ViewVC Help

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

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

Comparing jsr166/src/main/java/util/ArrayDeque.java (file contents):
Revision 1.121 by jsr166, Mon Nov 21 15:30:44 2016 UTC vs.
Revision 1.124 by jsr166, Mon Nov 28 02:52:36 2016 UTC

#	Line 235 | Line 235 | public class ArrayDeque<E> extends Abstr
235		* @return index 0 <= i < modulus
236		*/
237		static final int add(int i, int distance, int modulus) {
238	<	if ((i += distance) - modulus >= 0) distance -= modulus;
238	>	if ((i += distance) - modulus >= 0) i -= modulus;
239		return i;
240		}
241
#	Line 710 | Line 710 | public class ArrayDeque<E> extends Abstr
710		throw new NoSuchElementException();
711		final Object[] es = elements;
712		E e = nonNullElementAt(es, cursor);
713	<	lastRet = cursor;
714	<	cursor = inc(cursor, es.length);
713	>	cursor = inc(lastRet = cursor, es.length);
714		remaining--;
715		return e;
716		}
#	Line 759 | Line 758 | public class ArrayDeque<E> extends Abstr
758		throw new NoSuchElementException();
759		final Object[] es = elements;
760		E e = nonNullElementAt(es, cursor);
761	<	lastRet = cursor;
763	<	cursor = dec(cursor, es.length);
761	>	cursor = dec(lastRet = cursor, es.length);
762		remaining--;
763		return e;
764		}
#	Line 822 | Line 820 | public class ArrayDeque<E> extends Abstr
820
821		/** Constructs spliterator over the given range. */
822		DeqSpliterator(int origin, int fence) {
823	+	// assert 0 <= origin && origin < elements.length;
824	+	// assert 0 <= fence && fence < elements.length;
825		this.cursor = origin;
826		this.fence = fence;
827		}
#	Line 1244 | Line 1244 | public class ArrayDeque<E> extends Abstr
1244		// head == tail disambiguates to "empty".
1245		try {
1246		int capacity = elements.length;
1247	<	// assert head >= 0 && head < capacity;
1248	<	// assert tail >= 0 && tail < capacity;
1247	>	// assert 0 <= head && head < capacity;
1248	>	// assert 0 <= tail && tail < capacity;
1249		// assert capacity > 0;
1250		// assert size() < capacity;
1251		// assert head == tail || elements[head] != null;

Diff Legend

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