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

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

Issue 2715833004: fix ListMixin _filter and sort to work in strong mode (Closed)
Patch Set: clarify comment Created 3 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/collection/list.dart
diff --git a/sdk/lib/collection/list.dart b/sdk/lib/collection/list.dart
index b81b8dd7c11fc2180336f577443e4a92fe3b66d7..f340a5ef722be39c3649a75cb8040676321c9936 100644
--- a/sdk/lib/collection/list.dart
+++ b/sdk/lib/collection/list.dart
@@ -267,30 +267,28 @@ abstract class ListMixin<E> implements List<E> {
}
void removeWhere(bool test(E element)) {
- _filter(this, test, false);
+ _filter(test, false);
}
void retainWhere(bool test(E element)) {
- _filter(this, test, true);
+ _filter(test, true);
}
- static void _filter(List source,
- bool test(var element),
- bool retainMatching) {
- List retained = [];
- int length = source.length;
+ void _filter(bool test(var element), bool retainMatching) {
+ List<E> retained = <E>[];
+ int length = this.length;
for (int i = 0; i < length; i++) {
- var element = source[i];
+ var element = this[i];
if (test(element) == retainMatching) {
retained.add(element);
}
- if (length != source.length) {
- throw new ConcurrentModificationError(source);
+ if (length != this.length) {
+ throw new ConcurrentModificationError(this);
}
}
- if (retained.length != source.length) {
- source.setRange(0, retained.length, retained);
- source.length = retained.length;
+ if (retained.length != this.length) {
+ this.setRange(0, retained.length, retained);
+ this.length = retained.length;
}
}
@@ -308,11 +306,13 @@ abstract class ListMixin<E> implements List<E> {
}
void sort([int compare(E a, E b)]) {
- if (compare == null) {
- Sort.sort(this, Comparable.compare);
- } else {
- Sort.sort(this, compare);
- }
+ Sort.sort(this, compare ?? _compareAny);
+ }
+
+ static int _compareAny(a, b) {
+ // In strong mode Comparable.compare requires an implicit cast to ensure
+ // `a` and `b` are Comparable.
+ return Comparable.compare(a, b);
}
void shuffle([Random random]) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698