Rename XMatching to XWhere.

sdk/lib/collection/collections.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 part of dart.collection;
 
 /**
  * This class provides default implementations for Iterables (including Lists).
  *
  * Once Dart receives Mixins it will be replaced with mixin classes.
@@ skipping 56 matching lines @@
    * instead of just repeatedly calling remove.
    */
   static void removeAllList(Collection collection, Iterable elementsToRemove) {
     Set setToRemove;
     // Assume [contains] is efficient on a Set.
     if (elementsToRemove is Set) {
       setToRemove = elementsToRemove;
     } else {
       setToRemove = elementsToRemove.toSet();
     }
-    collection.removeMatching(setToRemove.contains);
+    collection.removeWhere(setToRemove.contains);
   }
 
   /**
    * Simple implemenation for [Collection.retainAll].
    *
-   * This implementation assumes that [Collecton.retainMatching] on [collection]
+   * This implementation assumes that [Collecton.retainWhere] on [collection]
    * is efficient.
    */
   static void retainAll(Collection collection, Iterable elementsToRetain) {
     Set lookup;
     if (elementsToRetain is Set) {
       lookup = elementsToRetain;
     } else {
       lookup = elementsToRetain.toSet();
     }
     if (lookup.isEmpty) {
       collection.clear();
       return;
     }
-    collection.retainMatching(lookup.contains);
+    collection.retainWhere(lookup.contains);
   }
 
   /**
-   * Simple implemenation for [Collection.removeMatching].
+   * Simple implemenation for [Collection.removeWhere].
    *
    * This implementation assumes that [Collecton.removeAll] on [collection] is
    * efficient.
    */
-  static void removeMatching(Collection collection, bool test(var element)) {
+  static void removeWhere(Collection collection, bool test(var element)) {
     List elementsToRemove = [];
     for (var element in collection) {
       if (test(element)) elementsToRemove.add(element);
     }
     collection.removeAll(elementsToRemove);
   }
 
   /**
    * Removes elements matching [test] from [list].
    *
    * This is performed in two steps, to avoid exposing an inconsistent state
    * to the [test] function. First the elements to retain are found, and then
    * the original list is updated to contain those elements.
    */
-  static void removeMatchingList(List list, bool test(var element)) {
+  static void removeWhereList(List list, bool test(var element)) {
     List retained = [];
     int length = list.length;
     for (int i = 0; i < length; i++) {
       var element = list[i];
       if (!test(element)) {
         retained.add(element);
       }
       if (length != list.length) {
         throw new ConcurrentModificationError(list);
       }
     }
     if (retained.length == length) return;
     list.length = retained.length;
     for (int i = 0; i < retained.length; i++) {
       list[i] = retained[i];
     }
   }
 
   /**
-   * Simple implemenation for [Collection.retainMatching].
+   * Simple implemenation for [Collection.retainWhere].
    *
    * This implementation assumes that [Collecton.removeAll] on [collection] is
    * efficient.
    */
-  static void retainMatching(Collection collection, bool test(var element)) {
+  static void retainWhere(Collection collection, bool test(var element)) {
     List elementsToRemove = [];
     for (var element in collection) {
       if (!test(element)) elementsToRemove.add(element);
     }
     collection.removeAll(elementsToRemove);
   }
 
   static bool isEmpty(Iterable iterable) {
     return !iterable.iterator.moveNext();
   }
@@ skipping 45 matching lines @@
   }
 
   static dynamic single(Iterable iterable) {
     Iterator it = iterable.iterator;
     if (!it.moveNext()) throw new StateError("No elements");
     dynamic result = it.current;
     if (it.moveNext()) throw new StateError("More than one element");
     return result;
   }
 
-  static dynamic firstMatching(Iterable iterable,
+  static dynamic firstWhere(Iterable iterable,
                                bool test(dynamic value),
                                dynamic orElse()) {
     for (dynamic element in iterable) {
       if (test(element)) return element;
     }
     if (orElse != null) return orElse();
     throw new StateError("No matching element");
   }
 
-  static dynamic lastMatching(Iterable iterable,
-                              bool test(dynamic value),
-                              dynamic orElse()) {
+  static dynamic lastWhere(Iterable iterable,
+                           bool test(dynamic value),
+                           dynamic orElse()) {
     dynamic result = null;
     bool foundMatching = false;
     for (dynamic element in iterable) {
       if (test(element)) {
         result = element;
         foundMatching = true;
       }
     }
     if (foundMatching) return result;
     if (orElse != null) return orElse();
     throw new StateError("No matching element");
   }
 
-  static dynamic lastMatchingInList(List list,
-                                    bool test(dynamic value),
-                                    dynamic orElse()) {
+  static dynamic lastWhereList(List list,
+                               bool test(dynamic value),
+                               dynamic orElse()) {
     // TODO(floitsch): check that arguments are of correct type?
     for (int i = list.length - 1; i >= 0; i--) {
       dynamic element = list[i];
       if (test(element)) return element;
     }
     if (orElse != null) return orElse();
     throw new StateError("No matching element");
   }
 
-  static dynamic singleMatching(Iterable iterable, bool test(dynamic value)) {
+  static dynamic singleWhere(Iterable iterable, bool test(dynamic value)) {
     dynamic result = null;
     bool foundMatching = false;
     for (dynamic element in iterable) {
       if (test(element)) {
         if (foundMatching) {
           throw new StateError("More than one matching element");
         }
         result = element;
         foundMatching = true;
       }
@@ skipping 133 matching lines @@
  * The source of the elements may be a [List] or any [Iterable] with
  * efficient [Iterable.length] and [Iterable.elementAt].
  */
 class UnmodifiableListView<E> extends UnmodifiableListBase<E> {
   Iterable<E> _source;
   /** Create an unmodifiable list backed by [source]. */
   UnmodifiableListView(Iterable<E> source) : _source = source;
   int get length => _source.length;
   E operator[](int index) => _source.elementAt(index);
 }