Added toMultiSubscriber on Stream.

sdk/lib/async/stream_pipe.dart

Index: sdk/lib/async/stream_pipe.dart
diff --git a/sdk/lib/async/stream_pipe.dart b/sdk/lib/async/stream_pipe.dart
index bc887c8af707c06b258e3ab7227158531e85c994..284330ccc1f237ad8e97404caf7f90afb0995066 100644
--- a/sdk/lib/async/stream_pipe.dart
+++ b/sdk/lib/async/stream_pipe.dart
@@ -5,20 +5,18 @@
 part of dart.async;
 
 /**
- * A pipe between two streams.
+ * A wrapper around a stream that allows independent subscribers.
  *
- * The default pipe subscribes to the [source] and sends on the
- * [stream].
+ * The default behavior is to subscribes to the [source] and sends on the

[floitsch, 2013/01/09 16:02:49]

By default [this] subscribes to [_source] and forwards all events to its own
subscribers.

[Lasse Reichstein Nielsen, 2013/01/09 16:16:43]

Done.

+ * this [Stream].
  *
  * The events are passed through the [_handleData], [_handleError] and
  * [_handleDone] methods. Subclasses are supposed to add handling of some of
  * the events by overriding these methods.
  *
- * This class is intended for internal use only. Users can use the [PipeStream]
- * to configure similar behavior.
+ * This class is intended for internal use only.
  */
-abstract class _ForwardingStream<S, T> extends _MultiStreamImpl<T>
-                                       implements StreamTransformer<S, T> {
+class _ForwardingMultiStream<S, T> extends _MultiStreamImpl<T> {
   Stream<S> _source = null;
   StreamSubscription _subscription = null;
 
@@ -31,15 +29,6 @@ abstract class _ForwardingStream<S, T> extends _MultiStreamImpl<T>
     }
   }
 
-  Stream<T> bind(Stream<S> source) {
-    assert(_source == null);
-    _source = source;
-    if (_hasSubscribers) {
-      _subscribeToSource();
-    }
-    return this;
-  }
-
   /**
     * Subscribe or unsubscribe on [source] depending on whether
     * [stream] has subscribers.
@@ -82,13 +71,25 @@ abstract class _ForwardingStream<S, T> extends _MultiStreamImpl<T>
 }
 
 
+abstract class _ForwardingTransformer<S, T> extends _ForwardingMultiStream<S, T>
+                                            implements StreamTransformer<S, T> {
+  Stream<T> bind(Stream<S> source) {
+    assert(_source == null);
+    _source = source;
+    if (_hasSubscribers) {
+      _subscribeToSource();
+    }
+    return this;
+  }
+}
+
 // -------------------------------------------------------------------
-// Stream pipes used by the default Stream implementation.
+// Stream transformers used by the default Stream implementation.
 // -------------------------------------------------------------------
 
 typedef bool _Predicate<T>(T value);
 
-class WhereStream<T> extends _ForwardingStream<T, T> {
+class WhereStream<T> extends _ForwardingTransformer<T, T> {
   final _Predicate<T> _test;
 
   WhereStream(bool test(T value))
@@ -114,7 +115,7 @@ typedef T _Transformation<S, T>(S value);
 /**
  * A stream pipe that converts data events before passing them on.
  */
-class MapStream<S, T> extends _ForwardingStream<S, T> {
+class MapStream<S, T> extends _ForwardingTransformer<S, T> {
   final _Transformation _transform;
 
   MapStream(T transform(S event))
@@ -135,7 +136,7 @@ class MapStream<S, T> extends _ForwardingStream<S, T> {
 /**
  * A stream pipe that converts data events before passing them on.
  */
-class ExpandStream<S, T> extends _ForwardingStream<S, T> {
+class ExpandStream<S, T> extends _ForwardingTransformer<S, T> {
   final _Transformation<S, Iterable<T>> _expand;
 
   ExpandStream(Iterable<T> expand(S event))
@@ -161,7 +162,7 @@ typedef AsyncError _ErrorTransformation(AsyncError error);
  * A stream pipe that converts or disposes error events
  * before passing them on.
  */
-class HandleErrorStream<T> extends _ForwardingStream<T, T> {
+class HandleErrorStream<T> extends _ForwardingTransformer<T, T> {
   final _ErrorTransformation _transform;
 
   HandleErrorStream(AsyncError transform(AsyncError event))
@@ -192,7 +193,7 @@ typedef void _TransformDoneHandler<T>(StreamSink<T> sink);
  * this pipe.
  * The handler can then decide which events to send to the output
  */
-class PipeStream<S, T> extends _ForwardingStream<S, T> {
+class PipeStream<S, T> extends _ForwardingTransformer<S, T> {
   final _TransformDataHandler<S, T> _onData;
   final _TransformErrorHandler<T> _onError;
   final _TransformDoneHandler<T> _onDone;
@@ -264,7 +265,7 @@ class _StreamImplSink<T> implements StreamSink<T> {
  * this pipe.
  * The handler can then decide which events to send to the output
  */
-class TransformStream<S, T> extends _ForwardingStream<S, T> {
+class TransformStream<S, T> extends _ForwardingTransformer<S, T> {
   final StreamTransformer<S, T> _transform;
   StreamSink<T> _sink;
 
@@ -330,7 +331,7 @@ class _StreamTransformerFunctionWrapper<S, T>
 }
 
 
-class TakeStream<T> extends _ForwardingStream<T, T> {
+class TakeStream<T> extends _ForwardingTransformer<T, T> {
   int _remaining;
 
   TakeStream(int count)
@@ -352,7 +353,7 @@ class TakeStream<T> extends _ForwardingStream<T, T> {
 }
 
 
-class TakeWhileStream<T> extends _ForwardingStream<T, T> {
+class TakeWhileStream<T> extends _ForwardingTransformer<T, T> {
   final _Predicate<T> _test;
 
   TakeWhileStream(bool test(T value))
@@ -376,7 +377,7 @@ class TakeWhileStream<T> extends _ForwardingStream<T, T> {
   }
 }
 
-class SkipStream<T> extends _ForwardingStream<T, T> {
+class SkipStream<T> extends _ForwardingTransformer<T, T> {
   int _remaining;
 
   SkipStream(int count)
@@ -393,7 +394,7 @@ class SkipStream<T> extends _ForwardingStream<T, T> {
   }
 }
 
-class SkipWhileStream<T> extends _ForwardingStream<T, T> {
+class SkipWhileStream<T> extends _ForwardingTransformer<T, T> {
   final _Predicate<T> _test;
   bool _hasFailed = false;
 
@@ -422,7 +423,7 @@ class SkipWhileStream<T> extends _ForwardingStream<T, T> {
 
 typedef bool _Equality<T>(T a, T b);
 
-class DistinctStream<T> extends _ForwardingStream<T, T> {
+class DistinctStream<T> extends _ForwardingTransformer<T, T> {
   static var _SENTINEL = new Object();
 
   _Equality<T> _equals;