Rename mappedBy to map.

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 80 matching lines @@
   }
 
   void forEach(f(E element)) {
     IterableMixinWorkaround.forEach(this, f);
   }
 
   String join([String separator]) {
     return IterableMixinWorkaround.joinList(this, separator);
   }
 
-  List mappedBy(f(E element)) {
+  Iterable map(f(E element)) {

[floitsch, 2013/01/30 14:48:44]

map should return an iterable right away (since there is nobody using it yet).
mappedBy should continue returning a List.

[Lasse Reichstein Nielsen, 2013/01/30 16:58:01]

Do you mean that map should return an element that is not a List, and not just
be typed as returning one?

That would mean we would need an extra IterableMixinWorkaround.mapList method
since we want an iterable over a List to use indexing.

[Lasse Reichstein Nielsen, 2013/01/31 11:33:49]

Ok, changed all List.mappedBy implementations to return List, and all List.map
implementations to return a non-List Iterable.

     return IterableMixinWorkaround.mappedByList(this, f);
   }
 
+  Iterable mappedBy(f(E element)) => map(f);
+
   reduce(initialValue, combine(previousValue, E element)) {
     return IterableMixinWorkaround.reduce(this, initialValue, combine);
   }
 
   Iterable<E> where(bool f(E element)) {
     return IterableMixinWorkaround.where(this, f);
   }
 
-  List<E> take(int n) {
+  Iterable<E> take(int n) {
     return IterableMixinWorkaround.takeList(this, n);
   }
 
   Iterable<E> takeWhile(bool test(E value)) {
     return IterableMixinWorkaround.takeWhile(this, test);
   }
 
-  List<E> skip(int n) {
+  Iterable<E> skip(int n) {
     return IterableMixinWorkaround.skipList(this, n);
   }
 
   Iterable<E> skipWhile(bool test(E value)) {
     return IterableMixinWorkaround.skipWhile(this, test);
   }
 
   bool every(bool f(E element)) {
     return IterableMixinWorkaround.every(this, f);
   }
@@ skipping 185 matching lines @@
   // Collection interface.
 
   bool contains(E element) {
     return IterableMixinWorkaround.contains(this, element);
   }
 
   void forEach(f(E element)) {
     IterableMixinWorkaround.forEach(this, f);
   }
 
-  List mappedBy(f(E element)) {
+  Iterable map(f(E element)) {

[floitsch, 2013/01/30 14:48:44]

ditto.

[Lasse Reichstein Nielsen, 2013/01/31 11:33:49]

Done.

     return IterableMixinWorkaround.mappedByList(this, f);
   }
 
+  Iterable mappedBy(f(E element)) => map(f);
+
   String join([String separator]) {
     return IterableMixinWorkaround.joinList(this, separator);
   }
 
   reduce(initialValue, combine(previousValue, E element)) {
     return IterableMixinWorkaround.reduce(this, initialValue, combine);
   }
 
   Iterable<E> where(bool f(E element)) {
     return IterableMixinWorkaround.where(this, f);
   }
 
-  List<E> take(int n) {
+  Iterable<E> take(int n) {
     return IterableMixinWorkaround.takeList(this, n);
   }
 
   Iterable<E> takeWhile(bool test(E value)) {
     return IterableMixinWorkaround.takeWhile(this, test);
   }
 
-  List<E> skip(int n) {
+  Iterable<E> skip(int n) {
     return IterableMixinWorkaround.skipList(this, n);
   }
 
   Iterable<E> skipWhile(bool test(E value)) {
     return IterableMixinWorkaround.skipWhile(this, test);
   }
 
   bool every(bool f(E element)) {
     return IterableMixinWorkaround.every(this, f);
   }
@@ skipping 126 matching lines @@
     }
     _position = _length;
     _current = null;
     return false;
   }
 
   E get current {
     return _current;
   }
 }