Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: sdk/lib/collection/queue.dart

Issue 13598015: Revert 20969: Reduce usage of IterableMixinWorkaround (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « sdk/lib/collection/linked_hash_set.dart ('k') | tests/corelib/iterable_min_max_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/collection/queue.dart
diff --git a/sdk/lib/collection/queue.dart b/sdk/lib/collection/queue.dart
index c5d5d367ea67d876ce5f4aed0af2a3eb1d9e3c8e..c6cca9f8b8057208a98507d71ca3bd5b035c5b76 100644
--- a/sdk/lib/collection/queue.dart
+++ b/sdk/lib/collection/queue.dart
@@ -224,29 +224,16 @@ class DoubleLinkedQueue<E> extends Collection<E> implements Queue<E> {
}
}
- void retainAll(Iterable elements) {
- _filterIterable(elements, true);
- }
-
void removeAll(Iterable elements) {
- _filterIterable(elements, false);
+ // Use this method when remove is slow and removeWhere more efficient.
+ IterableMixinWorkaround.removeAllList(this, elements);
}
- void _filterIterable(Iterable elements, bool retainMatching) {
- Set elementSet;
- if (elements is Set) {
- elementSet = elements;
- } else {
- elementSet = elements.toSet();
- }
- _filter(elementSet.contains, retainMatching);
- }
-
- void _filter(bool test(E element), bool retainMatching) {
+ void removeWhere(bool test(E element)) {
DoubleLinkedQueueEntry<E> entry = firstEntry();
while (!identical(entry, _sentinel)) {
DoubleLinkedQueueEntry<E> next = entry._next;
- if (test(entry.element) != retainMatching) {
+ if (test(entry.element)) {
entry.remove();
_elementCount--;
}
@@ -254,12 +241,16 @@ class DoubleLinkedQueue<E> extends Collection<E> implements Queue<E> {
}
}
- void removeWhere(bool test(E element)) {
- _filter(test, false);
- }
-
void retainWhere(bool test(E element)) {
- _filter(test, true);
+ DoubleLinkedQueueEntry<E> entry = firstEntry();
+ while (!identical(entry, _sentinel)) {
+ DoubleLinkedQueueEntry<E> next = entry._next;
+ if (!test(entry.element)) {
+ entry.remove();
+ _elementCount--;
+ }
+ entry = next;
+ }
}
E get first {
« no previous file with comments | « sdk/lib/collection/linked_hash_set.dart ('k') | tests/corelib/iterable_min_max_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698