Code cleanup (mostly io lib and some http lib).

sdk/lib/io/http_parser.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.
 
 part of dart.io;
 
 // Global constants.
 class _Const {
   // Bytes for "HTTP".
   static const HTTP = const [72, 84, 84, 80];
@@ skipping 87 matching lines @@
 
 class _HttpDetachedIncoming extends Stream<List<int>> {
   StreamController<List<int>> controller;
   final StreamSubscription subscription;
 
   List<int> bufferedData;
   bool paused;
 
   Completer resumeCompleter;
 
-  _HttpDetachedIncoming(StreamSubscription this.subscription,
-                        List<int> this.bufferedData) {
+  _HttpDetachedIncoming(this.subscription, this.bufferedData) {
     controller = new StreamController<List<int>>(
         sync: true,
         onListen: resume,
         onPause: pause,
         onResume: resume,
         onCancel: () => subscription.cancel());
     if (subscription == null) {
       // Socket was already closed.
       if (bufferedData != null) controller.add(bufferedData);
       controller.close();
     } else {
       pause();
-      subscription.resume();
-      subscription.onData(controller.add);
-      subscription.onDone(controller.close);
-      subscription.onError(controller.addError);
+      subscription
+          ..resume()
+          ..onData(controller.add)
+          ..onDone(controller.close)
+          ..onError(controller.addError);
     }
   }
 
   StreamSubscription<List<int>> listen(void onData(List<int> event),
                                        {Function onError,
                                         void onDone(),
                                         bool cancelOnError}) {
     return controller.stream.listen(
         onData,
         onError: onError,
@@ skipping 43 matching lines @@
  * there is no more HTTP data. After the upgrade the method
  * [:readUnparsedData:] can be used to read any remaining bytes in the
  * HTTP parser which are part of the protocol the connection is
  * upgrading to. These bytes cannot be processed by the HTTP parser
  * and should be handled according to whatever protocol is being
  * upgraded to.
  */
 class _HttpParser
     extends Stream<_HttpIncoming>
     implements StreamConsumer<List<int>> {
+  // State.
+  bool _parserCalled = false;
+
+  // The data that is currently being parsed.
+  Uint8List _buffer;
+  int _index;
+
+  final bool _requestParser;
+  int _state;
+  int _httpVersionIndex;
+  int _messageType;
+  int _statusCode = 0;
+  List _method_or_status_code;
+  List _uri_or_reason_phrase;
+  List _headerField;
+  List _headerValue;
+
+  int _httpVersion;
+  int _transferLength = -1;
+  bool _persistentConnection;
+  bool _connectionUpgrade;
+  bool _chunked;
+
+  bool _noMessageBody;
+  String _responseToMethod;  // Indicates the method used for the request.
+  int _remainingContent = -1;
+
+  _HttpHeaders _headers;
+
+  // The current incoming connection.
+  _HttpIncoming _incoming;
+  StreamSubscription _socketSubscription;
+  bool _paused = true;
+  bool _bodyPaused = false;
+  StreamController<_HttpIncoming> _controller;
+  StreamController<List<int>> _bodyController;
 
   factory _HttpParser.requestParser() {
     return new _HttpParser._(true);
   }
 
   factory _HttpParser.responseParser() {
     return new _HttpParser._(false);
   }
 
   _HttpParser._(this._requestParser) {
@@ skipping 749 matching lines @@
       }
     }
   }
 
   void _reportError(error, [stackTrace]) {
     if (_socketSubscription != null) _socketSubscription.cancel();
     _state = _State.FAILURE;
     _controller.addError(error, stackTrace);
     _controller.close();
   }
-
-  // State.
-  bool _parserCalled = false;
-
-  // The data that is currently being parsed.
-  Uint8List _buffer;
-  int _index;
-
-  final bool _requestParser;
-  int _state;
-  int _httpVersionIndex;
-  int _messageType;
-  int _statusCode = 0;
-  List _method_or_status_code;
-  List _uri_or_reason_phrase;
-  List _headerField;
-  List _headerValue;
-
-  int _httpVersion;
-  int _transferLength = -1;
-  bool _persistentConnection;
-  bool _connectionUpgrade;
-  bool _chunked;
-
-  bool _noMessageBody;
-  String _responseToMethod;  // Indicates the method used for the request.
-  int _remainingContent = -1;
-
-  _HttpHeaders _headers;
-
-  // The current incoming connection.
-  _HttpIncoming _incoming;
-  StreamSubscription _socketSubscription;
-  bool _paused = true;
-  bool _bodyPaused = false;
-  StreamController<_HttpIncoming> _controller;
-  StreamController<List<int>> _bodyController;
 }