Revert "Create IterableMixinWorkaround and move most of the Collections methods there."

runtime/lib/array.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.
 
 
 // TODO(srdjan): Use shared array implementation.
 class _ObjectArray<E> implements List<E> {
 
   factory _ObjectArray(int length) native "ObjectArray_allocate";
 
@@ skipping 44 matching lines @@
     Arrays.rangeCheck(this, start, length);
     List list = new _GrowableObjectArray<E>.withCapacity(length);
     list.length = length;
     Arrays.copy(this, start, list, 0, length);
     return list;
   }
 
   // Collection interface.
 
   bool contains(E element) {
-    return IterableMixinWorkaround.contains(this, element);
+    return Collections.contains(this, element);
   }
 
   void forEach(f(E element)) {
-    IterableMixinWorkaround.forEach(this, f);
+    Collections.forEach(this, f);
   }
 
   String join([String separator]) {
-    return IterableMixinWorkaround.joinList(this, separator);
+    return Collections.joinList(this, separator);
   }
 
   List mappedBy(f(E element)) {
-    return IterableMixinWorkaround.mappedByList(this, f);
+    return new MappedList<E, dynamic>(this, f);
   }
 
   reduce(initialValue, combine(previousValue, E element)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
   Iterable<E> where(bool f(E element)) {
-    return IterableMixinWorkaround.where(this, f);
+    return new WhereIterable<E>(this, f);
   }
 
   List<E> take(int n) {
-    return IterableMixinWorkaround.takeList(this, n);
+    return new ListView<E>(this, 0, n);
   }
 
   Iterable<E> takeWhile(bool test(E value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<E>(this, test);
   }
 
   List<E> skip(int n) {
-    return IterableMixinWorkaround.skipList(this, n);
+    return new ListView<E>(this, n, null);
   }
 
   Iterable<E> skipWhile(bool test(E value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<E>(this, test);
   }
 
   bool every(bool f(E element)) {
-    return IterableMixinWorkaround.every(this, f);
+    return Collections.every(this, f);
   }
 
   bool any(bool f(E element)) {
-    return IterableMixinWorkaround.any(this, f);
+    return Collections.any(this, f);
   }
 
   E firstMatching(bool test(E value), {E orElse()}) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   E lastMatching(bool test(E value), {E orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   E singleMatching(bool test(E value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   E elementAt(int index) {
     return this[index];
   }
 
   bool get isEmpty {
     return this.length == 0;
   }
 
@@ skipping 53 matching lines @@
     if (length > 0) return this[length - 1];
     throw new StateError("No elements");
   }
 
   E get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  E min([int compare(E a, E b)]) => IterableMixinWorkaround.min(this, compare);
+  E min([int compare(E a, E b)]) => Collections.min(this, compare);
 
-  E max([int compare(E a, E b)]) => IterableMixinWorkaround.max(this, compare);
+  E max([int compare(E a, E b)]) => Collections.max(this, compare);
 
   List<E> toList() {
     return new List<E>.from(this);
   }
 
   Set<E> toSet() {
     return new Set<E>.from(this);
   }
 }
 
@@ skipping 51 matching lines @@
     Arrays.rangeCheck(this, start, length);
     List list = new List<E>();
     list.length = length;
     Arrays.copy(this, start, list, 0, length);
     return list;
   }
 
   // Collection interface.
 
   bool contains(E element) {
-    return IterableMixinWorkaround.contains(this, element);
+    return Collections.contains(this, element);
   }
 
   void forEach(f(E element)) {
-    IterableMixinWorkaround.forEach(this, f);
+    Collections.forEach(this, f);
   }
 
   List mappedBy(f(E element)) {
-    return IterableMixinWorkaround.mappedByList(this, f);
+    return new MappedList<E, dynamic>(this, f);
   }
 
   String join([String separator]) {
-    return IterableMixinWorkaround.joinList(this, separator);
+    return Collections.joinList(this, separator);
   }
 
   reduce(initialValue, combine(previousValue, E element)) {
-    return IterableMixinWorkaround.reduce(this, initialValue, combine);
+    return Collections.reduce(this, initialValue, combine);
   }
 
   Iterable<E> where(bool f(E element)) {
-    return IterableMixinWorkaround.where(this, f);
+    return new WhereIterable<E>(this, f);
   }
 
   List<E> take(int n) {
-    return IterableMixinWorkaround.takeList(this, n);
+    return new ListView<E>(this, 0, n);
   }
 
   Iterable<E> takeWhile(bool test(E value)) {
-    return IterableMixinWorkaround.takeWhile(this, test);
+    return new TakeWhileIterable<E>(this, test);
   }
 
   List<E> skip(int n) {
-    return IterableMixinWorkaround.skipList(this, n);
+    return new ListView<E>(this, n, null);
   }
 
   Iterable<E> skipWhile(bool test(E value)) {
-    return IterableMixinWorkaround.skipWhile(this, test);
+    return new SkipWhileIterable<E>(this, test);
   }
 
   bool every(bool f(E element)) {
-    return IterableMixinWorkaround.every(this, f);
+    return Collections.every(this, f);
   }
 
   bool any(bool f(E element)) {
-    return IterableMixinWorkaround.any(this, f);
+    return Collections.any(this, f);
   }
 
   E firstMatching(bool test(E value), {E orElse()}) {
-    return IterableMixinWorkaround.firstMatching(this, test, orElse);
+    return Collections.firstMatching(this, test, orElse);
   }
 
   E lastMatching(bool test(E value), {E orElse()}) {
-    return IterableMixinWorkaround.lastMatchingInList(this, test, orElse);
+    return Collections.lastMatchingInList(this, test, orElse);
   }
 
   E singleMatching(bool test(E value)) {
-    return IterableMixinWorkaround.singleMatching(this, test);
+    return Collections.singleMatching(this, test);
   }
 
   E elementAt(int index) {
     return this[index];
   }
 
   bool get isEmpty {
     return this.length == 0;
   }
 
@@ skipping 57 matching lines @@
     if (length > 0) return this[length - 1];
     throw new StateError("No elements");
   }
 
   E get single {
     if (length == 1) return this[0];
     if (length == 0) throw new StateError("No elements");
     throw new StateError("More than one element");
   }
 
-  E min([int compare(E a, E b)]) => IterableMixinWorkaround.min(this, compare);
+  E min([int compare(E a, E b)]) => Collections.min(this, compare);
 
-  E max([int compare(E a, E b)]) => IterableMixinWorkaround.max(this, compare);
+  E max([int compare(E a, E b)]) => Collections.max(this, compare);
 
   List<E> toList() {
     return new List<E>.from(this);
   }
 
   Set<E> toSet() {
     return new Set<E>.from(this);
   }
 }
 
@@ skipping 19 matching lines @@
     }
     _position = _length;
     _current = null;
     return false;
   }
 
   E get current {
     return _current;
   }
 }