Move toString() to collection classes.

R=floitsch@google.com

Review URL: https://codereview.chromium.org//18837002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@24836 260f80e4-7a28-3924-810f-c04153c831b5

Author: szakarias

runtime/lib/array.dart

@@ -14,7 +14,7 @@ class _ObjectArray<E> implements List<E> {
   void operator []=(int index, E value) native "ObjectArray_setIndexed";
 
   String toString() {
-    return ToString.iterableToString(this);
+    return IterableMixinWorkaround.toStringIterable(this,'[' , ']');
   }
 
   int get length native "ObjectArray_getLength";
@@ -457,7 +457,7 @@ class _ImmutableArray<E> implements List<E> {
   }
 
   String toString() {
-    return ToString.iterableToString(this);
+    return IterableMixinWorkaround.toStringIterable(this, '[', ']');
   }
 
   int indexOf(Object element, [int start = 0]) {

runtime/lib/growable_array.dart

@@ -337,7 +337,7 @@ class _GrowableObjectArray<T> implements List<T> {
   }
 
   String toString() {
-    return ToString.iterableToString(this);
+    return IterableMixinWorkaround.toStringIterable(this, '[', ']');
   }
 
   Iterator<T> get iterator {

runtime/lib/typed_data.dart

@@ -279,6 +279,7 @@ patch class ByteData {
 // the collection and list interfaces.
 
 abstract class _TypedListBase {
+
   // Method(s) implementing the Collection interface.
   bool contains(element) => IterableMixinWorkaround.contains(this, element);
 
@@ -505,7 +506,7 @@ abstract class _TypedListBase {
   // Method(s) implementing Object interface.
 
   String toString() {
-    return ToString.iterableToString(this);
+    return IterableMixinWorkaround.toStringIterable(this, '[', ']');
   }
 
 

sdk/lib/_collection_dev/iterable.dart

@@ -710,6 +710,9 @@ abstract class BidirectionalIterator<T> implements Iterator<T> {
  * The uses of this class will be replaced by mixins.
  */
 class IterableMixinWorkaround {
+  // A list to identify cyclic collections during toString() calls.
+  static List _toStringList = new List();
+
   static bool contains(Iterable iterable, var element) {
     for (final e in iterable) {
       if (e == element) return true;
@@ -903,6 +906,27 @@ class IterableMixinWorkaround {
     return buffer.toString();
   }
 
+  static String toStringIterable(Iterable iterable, String leftDelimiter,
+                                 String rightDelimiter) {
+    for (int i = 0; i < _toStringList.length; i++) {
+      if (identical(_toStringList[i], iterable)) {
+        return '$leftDelimiter...$rightDelimiter';
+        }
+    }
+
+    StringBuffer result = new StringBuffer();
+    try {
+      _toStringList.add(iterable);
+      result.write(leftDelimiter);
+      result.writeAll(iterable, ', ');
+      result.write(rightDelimiter);
+    } finally {
+      assert(identical(_toStringList.last, iterable));
+      _toStringList.removeLast();
+    }
+    return result.toString();
+  }
+
   static Iterable where(Iterable iterable, bool f(var element)) {
     return new WhereIterable(iterable, f);
   }

sdk/lib/_internal/lib/js_array.dart

@@ -11,10 +11,11 @@ part of _interceptors;
  * argument added to each member.
  */
 class JSArray<E> extends Interceptor implements List<E>, JSIndexable {
+
   const JSArray();
 
   checkMutable(reason) {
-    if (this is !JSMutableArray) { 
+    if (this is !JSMutableArray) {
       throw new UnsupportedError(reason);
     }
   }
@@ -261,7 +262,7 @@ class JSArray<E> extends Interceptor implements List<E>, JSIndexable {
 
   bool get isNotEmpty => !isEmpty;
 
-  String toString() => ToString.iterableToString(this);
+  String toString() => IterableMixinWorkaround.toStringIterable(this, '[', ']');
 
   List<E> toList({ bool growable: true }) =>
       new List<E>.from(this, growable: growable);

sdk/lib/collection/hash_set.dart

@@ -6,6 +6,7 @@ part of dart.collection;
 
 /** Common parts of [HashSet] and [LinkedHashSet] implementations. */
 abstract class _HashSetBase<E> extends IterableBase<E> implements Set<E> {
+
   // Set.
   bool containsAll(Iterable<Object> other) {
     for (Object object in other) {
@@ -53,7 +54,8 @@ abstract class _HashSetBase<E> extends IterableBase<E> implements Set<E> {
     retainWhere(retainSet.contains);
   }
 
-  String toString() => ToString.iterableToString(this);
+  // TODO(zarah) Remove this, and let it be inherited by IterableBase
+  String toString() => IterableMixinWorkaround.toStringIterable(this, '{', '}');
 }
 
 /**

sdk/lib/collection/linked_list.dart

@@ -14,6 +14,7 @@ part of dart.collection;
 class LinkedList<E extends LinkedListEntry<E>>
     extends IterableBase<E>
     implements _LinkedListLink {
+
   int _modificationCount = 0;
   int _length = 0;
   _LinkedListLink _next;
@@ -60,7 +61,8 @@ class LinkedList<E extends LinkedListEntry<E>>
 
   Iterator<E> get iterator => new _LinkedListIterator<E>(this);
 
-  String toString() => ToString.iterableToString(this);
+  // TODO(zarah) Remove this, and let it be inherited by IterableMixin
+  String toString() => IterableMixinWorkaround.toStringIterable(this, '{', '}');
 
   int get length => _length;
 

sdk/lib/collection/list.dart

@@ -28,6 +28,9 @@ typedef ListBase<E> = Object with ListMixin<E>;
  * mixin to prevent all modifications.
  */
 abstract class ListMixin<E> implements List<E> {
+  // A list to identify cyclic lists during toString() calls. 
+  static List _toStringList = new List();
+  
   // Iterable interface.
   Iterator<E> get iterator => new ListIterator<E>(this);
 
@@ -477,5 +480,22 @@ abstract class ListMixin<E> implements List<E> {
 
   Iterable<E> get reversed => new ReversedListIterable(this);
 
-  String toString() => ToString.iterableToString(this);
+  String toString() {
+    for (int i = 0; i < _toStringList.length; i++) {
+      if (identical(_toStringList[i], this)) { return '[...]'; }
+    }
+
+    var result = new StringBuffer();
+    try {
+      _toStringList.add(this);
+      result.write('[');
+      result.writeAll(this, ', ');
+      result.write(']');
+     } finally {
+       assert(identical(_toStringList.last, this));
+       _toStringList.removeLast();  
+     }
+     
+    return result.toString();
+  }
 }

sdk/lib/collection/maps.dart

@@ -60,6 +60,9 @@ class Maps {
 
   static bool isNotEmpty(Map map) => map.keys.isNotEmpty;
 
+  // A list to identify cyclic maps during toString() calls.
+  static List _toStringList = new List();
+
   /**
    * Returns a string representing the specified map. The returned string
    * looks like this: [:'{key0: value0, key1: value1, ... keyN: valueN}':].
@@ -76,7 +79,33 @@ class Maps {
    * A typical implementation of a map's [toString] method will
    * simply return the results of this method applied to the collection.
    */
-  static String mapToString(Map m) => ToString.mapToString(m);
+  static String mapToString(Map m) {
+    for (int i = 0; i < _toStringList.length; i++) {
+      if (identical(_toStringList[i], m)) { return '{...}'; }
+    }
+
+    var result = new StringBuffer();
+    try {
+      _toStringList.add(m);
+      result.write('{');
+      bool first = true;
+      m.forEach((k, v) {
+        if(!first) {
+          result.write(', ');
+        }
+        first = false;
+        result.write(k);
+        result.write(': ');
+        result.write(v);
+      });
+      result.write('}');
+    } finally {
+      assert(identical(_toStringList.last, m));
+      _toStringList.removeLast();
+    }
+
+    return result.toString();
+  }
 
   static _id(x) => x;
 

sdk/lib/collection/queue.dart

@@ -301,9 +301,8 @@ class DoubleLinkedQueue<E> extends IterableBase<E> implements Queue<E> {
     return new _DoubleLinkedQueueIterator<E>(_sentinel);
   }
 
-  String toString() {
-    return ToString.iterableToString(this);
-  }
+  // TODO(zarah)  Remove this, and let it be inherited by IterableBase
+  String toString() => IterableMixinWorkaround.toStringIterable(this, '{', '}');
 }
 
 class _DoubleLinkedQueueIterator<E> implements Iterator<E> {
@@ -530,9 +529,8 @@ class ListQueue<E> extends IterableBase<E> implements Queue<E> {
     }
   }
 
-  String toString() {
-    return ToString.iterableToString(this);
-  }
+  // TODO(zarah)  Remove this, and let it be inherited by IterableBase
+  String toString() => IterableMixinWorkaround.toStringIterable(this, '{', '}');
 
   // Queue interface.