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

sdk/lib/io/http_headers.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;
 
 class _HttpHeaders implements HttpHeaders {
   final Map<String, List<String>> _headers;
   final String protocolVersion;
 
   bool _mutable = true;  // Are the headers currently mutable?
   List<String> _noFoldingHeaders;
 
   int _contentLength = -1;
   bool _persistentConnection = true;
   bool _chunkedTransferEncoding = false;
   String _host;
   int _port;
 
-  _HttpHeaders(String this.protocolVersion)
+  _HttpHeaders(this.protocolVersion)
       : _headers = new HashMap<String, List<String>>() {
     if (protocolVersion == "1.0") {
       _persistentConnection = false;
     }
   }
 
-  List<String> operator[](String name) {
-    name = name.toLowerCase();
-    return _headers[name];
-  }
+  List<String> operator[](String name) => _headers[name.toLowerCase()];
 
   String value(String name) {
     name = name.toLowerCase();
     List<String> values = _headers[name];
     if (values == null) return null;
     if (values.length > 1) {
       throw new HttpException("More than one value for header $name");
     }
     return values[0];
   }
 
   void add(String name, value) {
     _checkMutable();
     _addAll(name.toLowerCase(), value);
   }
 
   void _addAll(String name, value) {
     if (value is List) {
-      for (int i = 0; i < value.length; i++) {
-        _add(name, value[i]);
-      }
+      value.forEach((v) => _add(name, v));

[Lasse Reichstein Nielsen, 2014/01/06 09:29:30]

This may be a little slower than the original.
Probably not noticeably so, so I'm fine with it.

     } else {
       _add(name, value);
     }
   }
 
   void set(String name, Object value) {
     _checkMutable();
     name = name.toLowerCase();
     _headers.remove(name);
     _addAll(name, value);
@@ skipping 183 matching lines @@
   }
 
   void set contentType(ContentType contentType) {
     _checkMutable();
     _set(HttpHeaders.CONTENT_TYPE, contentType.toString());
   }
 
   // [name] must be a lower-case version of the name.
   void _add(String name, value) {
     // TODO(sgjesse): Add immutable state throw HttpException is immutable.
-    if (name == HttpHeaders.CONTENT_LENGTH) {
-      if (value is int) {
-        contentLength = value;
-      } else if (value is String) {
-        contentLength = int.parse(value);
-      } else {
-        throw new HttpException("Unexpected type for header named $name");
-      }
-    } else if (name == HttpHeaders.TRANSFER_ENCODING) {
-      if (value == "chunked") {
-        chunkedTransferEncoding = true;
-      } else {
-        _addValue(name, value);
-      }
-    } else if (name == HttpHeaders.DATE) {
-      if (value is DateTime) {
-        date = value;
-      } else if (value is String) {
-        _set(HttpHeaders.DATE, value);
-      } else {
-        throw new HttpException("Unexpected type for header named $name");
-      }
-    } else if (name == HttpHeaders.EXPIRES) {
-      if (value is DateTime) {
-        expires = value;
-      } else if (value is String) {
-        _set(HttpHeaders.EXPIRES, value);
-      } else {
-        throw new HttpException("Unexpected type for header named $name");
-      }
-    } else if (name == HttpHeaders.IF_MODIFIED_SINCE) {
-      if (value is DateTime) {
-        ifModifiedSince = value;
-      } else if (value is String) {
-        _set(HttpHeaders.IF_MODIFIED_SINCE, value);
-      } else {
-        throw new HttpException("Unexpected type for header named $name");
-      }
-    } else if (name == HttpHeaders.HOST) {
-      if (value is String) {
-        int pos = value.indexOf(":");
-        if (pos == -1) {
-          _host = value;
-          _port = HttpClient.DEFAULT_HTTP_PORT;
+    switch (name) {
+      case  HttpHeaders.CONTENT_LENGTH:
+        if (value is int) {
+          contentLength = value;
+        } else if (value is String) {
+          contentLength = int.parse(value);
         } else {
-          if (pos > 0) {
-            _host = value.substring(0, pos);
-          } else {
-            _host = null;
-          }
-          if (pos + 1 == value.length) {
+          throw new HttpException("Unexpected type for header named $name");
+        }
+        break;
+
+      case HttpHeaders.TRANSFER_ENCODING:
+        if (value == "chunked") {
+          chunkedTransferEncoding = true;
+        } else {
+          _addValue(name, value);
+        }
+        break;
+
+      case HttpHeaders.DATE:
+        if (value is DateTime) {
+          date = value;
+        } else if (value is String) {
+          _set(HttpHeaders.DATE, value);
+        } else {
+          throw new HttpException("Unexpected type for header named $name");
+        }
+        break;
+
+      case HttpHeaders.EXPIRES:
+        if (value is DateTime) {
+          expires = value;
+        } else if (value is String) {
+          _set(HttpHeaders.EXPIRES, value);
+        } else {
+          throw new HttpException("Unexpected type for header named $name");
+        }
+        break;
+
+      case HttpHeaders.IF_MODIFIED_SINCE:
+        if (value is DateTime) {
+          ifModifiedSince = value;
+        } else if (value is String) {
+          _set(HttpHeaders.IF_MODIFIED_SINCE, value);
+        } else {
+          throw new HttpException("Unexpected type for header named $name");
+        }
+        break;
+
+      case HttpHeaders.HOST:
+        if (value is String) {
+          int pos = value.indexOf(":");
+          if (pos == -1) {
+            _host = value;
             _port = HttpClient.DEFAULT_HTTP_PORT;
           } else {
-            try {
-              _port = int.parse(value.substring(pos + 1));
-            } on FormatException catch (e) {
-              _port = null;
+            if (pos > 0) {
+              _host = value.substring(0, pos);
+            } else {
+              _host = null;
+            }
+            if (pos + 1 == value.length) {
+              _port = HttpClient.DEFAULT_HTTP_PORT;
+            } else {
+              try {
+                _port = int.parse(value.substring(pos + 1));
+              } on FormatException catch (e) {
+                _port = null;
+              }
             }
           }
+          _set(HttpHeaders.HOST, value);
+        } else {
+          throw new HttpException("Unexpected type for header named $name");
         }
-        _set(HttpHeaders.HOST, value);
-      } else {
-        throw new HttpException("Unexpected type for header named $name");
-      }
-    } else if (name == HttpHeaders.CONNECTION) {
-      var lowerCaseValue = value.toLowerCase();
-      if (lowerCaseValue == 'close') {
-        _persistentConnection = false;
-      } else if (lowerCaseValue == 'keep-alive') {
-        _persistentConnection = true;
-      }
-      _addValue(name, value);
-    } else if (name == HttpHeaders.CONTENT_TYPE) {
-      _set(HttpHeaders.CONTENT_TYPE, value);
-    } else {
-      _addValue(name, value);
+        break;
+
+      case HttpHeaders.CONNECTION:
+        var lowerCaseValue = value.toLowerCase();
+        if (lowerCaseValue == 'close') {
+          _persistentConnection = false;
+        } else if (lowerCaseValue == 'keep-alive') {
+          _persistentConnection = true;
+        }
+        _addValue(name, value);
+        break;
+
+      case HttpHeaders.CONTENT_TYPE:
+        _set(HttpHeaders.CONTENT_TYPE, value);
+        break;
+
+      default:
+        _addValue(name, value);
     }
   }
 
   void _addValue(String name, Object value) {
     List<String> values = _headers[name];
     if (values == null) {
       values = new List<String>();
       _headers[name] = values;
     }
     if (value is DateTime) {
@@ skipping 61 matching lines @@
         write(values[i].codeUnits);
       }
       write(const [_CharCode.CR, _CharCode.LF]);
     });
     return offset;
   }
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     _headers.forEach((String name, List<String> values) {
-      sb.write(name);
-      sb.write(": ");
+      sb..write(name)
+        ..write(": ");

[Lasse Reichstein Nielsen, 2014/01/06 09:29:30]

Hmm, technically the second line should be indented by 4, but I really don't
want to do that here.

       bool fold = _foldHeader(name);
       for (int i = 0; i < values.length; i++) {
         if (i > 0) {
           if (fold) {
             sb.write(", ");
           } else {
-            sb.write("\n");
-            sb.write(name);
-            sb.write(": ");
+            sb..write("\n")
+              ..write(name)
+              ..write(": ");
           }
         }
         sb.write(values[i]);
       }
       sb.write("\n");
     });
     return sb.toString();
   }
 
   List<Cookie> _parseCookies() {
@@ skipping 93 matching lines @@
   Map<String, String> get parameters {
     _ensureParameters();
     return _parameters;
   }
 
   String toString() {
     StringBuffer sb = new StringBuffer();
     sb.write(_value);
     if (parameters != null && parameters.length > 0) {
       _parameters.forEach((String name, String value) {
-        sb.write("; ");
-        sb.write(name);
-        sb.write("=");
-        sb.write(value);
+        sb..write("; ")
+          ..write(name)
+          ..write("=")
+          ..write(value);
       });
     }
     return sb.toString();
   }
 
   void _parse(String s, String parameterSeparator, bool preserveBackslash) {
     int index = 0;
 
     bool done() => index == s.length;
 
@@ skipping 137 matching lines @@
 
   String get primaryType => _primaryType;
 
   String get subType => _subType;
 
   String get charset => parameters["charset"];
 }
 
 
 class _Cookie implements Cookie {
-  _Cookie([String this.name, String this.value]);
+  String name;

[Lasse Reichstein Nielsen, 2014/01/06 09:29:30]

Are none of these really final?

+  String value;
+  DateTime expires;
+  int maxAge;
+  String domain;
+  String path;
+  bool httpOnly = false;
+  bool secure = false;
+
+  _Cookie([this.name, this.value]);
 
   _Cookie.fromSetCookieValue(String value) {
     // Parse the 'set-cookie' header value.
     _parseSetCookieValue(value);
   }
 
   // Parse a 'set-cookie' header value according to the rules in RFC 6265.
   void _parseSetCookieValue(String s) {
     int index = 0;
 
@@ skipping 74 matching lines @@
     }
     index++;  // Skip the = character.
     value = parseValue();
     if (done()) return;
     index++;  // Skip the ; character.
     parseAttributes();
   }
 
   String toString() {
     StringBuffer sb = new StringBuffer();
-    sb.write(name);
-    sb.write("=");
-    sb.write(value);
+    sb..write(name)
+      ..write("=")
+      ..write(value);
     if (expires != null) {
-      sb.write("; Expires=");
-      sb.write(HttpDate.format(expires));
+      sb..write("; Expires=")
+        ..write(HttpDate.format(expires));
     }
     if (maxAge != null) {
-      sb.write("; Max-Age=");
-      sb.write(maxAge);
+      sb..write("; Max-Age=")
+        ..write(maxAge);
     }
     if (domain != null) {
-      sb.write("; Domain=");
-      sb.write(domain);
+      sb..write("; Domain=")
+        ..write(domain);
     }
     if (path != null) {
-      sb.write("; Path=");
-      sb.write(path);
+      sb..write("; Path=")
+        ..write(path);
     }
     if (secure) sb.write("; Secure");
     if (httpOnly) sb.write("; HttpOnly");
     return sb.toString();
   }
-
-  String name;
-  String value;
-  DateTime expires;
-  int maxAge;
-  String domain;
-  String path;
-  bool httpOnly = false;
-  bool secure = false;
 }
 
 
 class _UnmodifiableMap<K, V> implements Map<K, V> {
   final Map _map;
   const _UnmodifiableMap(this._map);
 
   bool containsValue(Object value) => _map.containsValue(value);
   bool containsKey(Object key) => _map.containsKey(key);
   V operator [](Object key) => _map[key];
@@ skipping 12 matching lines @@
   void clear() {
     throw new UnsupportedError("Cannot modify an unmodifiable map");
   }
   void forEach(void f(K key, V value)) => _map.forEach(f);
   Iterable<K> get keys => _map.keys;
   Iterable<V> get values => _map.values;
   int get length => _map.length;
   bool get isEmpty => _map.isEmpty;
   bool get isNotEmpty => _map.isNotEmpty;
 }