Make IOSink implement StringSink

runtime/bin/socket_patch.dart

 // Copyright (c) 2013, 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.
 
 patch class RawServerSocket  {
   /* patch */ static Future<RawServerSocket> bind([String address = "127.0.0.1",
                                                    int port = 0,
                                                    int backlog = 0]) {
     return _RawServerSocket.bind(address, port, backlog);
   }
@@ skipping 715 matching lines @@
   _SocketStreamConsumer _consumer;
   IOSink<Socket> _sink;
   Completer _doneCompleter;
   var _subscription;
 
   _Socket(RawSocket this._raw) {
     _controller = new StreamController<List<int>>(
         onSubscriptionStateChange: _onSubscriptionStateChange,
         onPauseStateChange: _onPauseStateChange);
     _consumer = new _SocketStreamConsumer(this);
-    _sink = new IOSink(_consumer);
+    _sink = new IOSink(_consumer, Encoding.ASCII);
 
     // Disable read events until there is a subscription.
     _raw.readEventsEnabled = false;
 
     // Disable write events until the consumer needs it for pending writes.
     _raw.writeEventsEnabled = false;
   }
 
   factory _Socket._writePipe([int fd]) {
     return new _Socket(new _RawSocket._writePipe(fd));
   }
 
   factory _Socket._readPipe([int fd]) {
     return new _Socket(new _RawSocket._readPipe(fd));
   }
 
   _NativeSocket get _nativeSocket => _raw._socket;
 
   StreamSubscription<List<int>> listen(void onData(List<int> event),
                                        {void onError(AsyncError error),
                                         void onDone(),
                                         bool unsubscribeOnError}) {
     return _controller.stream.listen(
         onData,
         onError: onError,
         onDone: onDone,
         unsubscribeOnError: unsubscribeOnError);
   }
 
+  Encoding get encoding => _sink.encoding;
+  void set encoding(Encoding value) => _sink.encoding = value;
+
+  void write(Object obj) => _sink.write(obj);
+  void writeln(Object obj) => _sink.writeln(obj);
+  void writeCharCode(int charCode) => _sink.writeCharCode(charCode);
+  void writeAll(Iterable objects) => _sink.writeAll(objects);
+

[Mads Ager (google), 2013/03/07 07:57:36]

Nit: remove the empty line or consistently have one between the write methods?

[Søren Gjesse, 2013/03/07 16:28:47]

Done.

+  void writeBytes(List<int> bytes) => _sink.writeBytes(bytes);
+
   Future<Socket> consume(Stream<List<int>> stream) {
     return _sink.consume(stream);
   }
 
   Future<Socket> addStream(Stream<List<int>> stream) {
     return _sink.addStream(stream);
   }
 
   void add(List<int> data) {

[Anders Johnsen, 2013/03/07 08:48:44]

Remove these?

[Søren Gjesse, 2013/03/07 16:28:47]

Done.

     return _sink.add(data);
   }
 
   void addString(String string, [Encoding encoding = Encoding.UTF_8]) {
     return _sink.addString(string, encoding);
   }
 
   close() => _sink.close();
 
   Future<Socket> get done => _sink.done;
@@ skipping 137 matching lines @@
     _raw.onBadCertificate = callback;
   }
 
   X509Certificate get peerCertificate {
     if (_raw == null) {
      throw new StateError("peerCertificate called on destroyed SecureSocket");
     }
     return _raw.peerCertificate;
   }
 }