Disable closure wrapping by default

test/dart_codegen/expect/core/uri.dart

 part of dart.core;
  class Uri {final String _host;
  num _port;
  String _path;
  final String scheme;
  String get authority {
   if (!hasAuthority) return "";
    var sb = new StringBuffer();
    _writeAuthority(sb);
    return sb.toString();
@@ skipping 261 matching lines @@
   }
  factory Uri.file(String path, {
   bool windows}
 ) {
   windows = windows == null ? Uri._isWindows : windows;
    return ((__x12) => DEVC$RT.cast(__x12, dynamic, Uri, "DynamicCast", """line 698, column 12 of dart:core/uri.dart: """, __x12 is Uri, true))(windows ? _makeWindowsFileUrl(path) : _makeFileUri(path));
   }
  external static Uri get base;
  external static bool get _isWindows;
  static _checkNonWindowsPathReservedCharacters(List<String> segments, bool argumentError) {
-  segments.forEach(((__x18) => DEVC$RT.wrap((dynamic f(dynamic __u13)) {
-    dynamic c(dynamic x0) => f(x0);
-     return f == null ? null : c;
-    }
-  , __x18, __t16, __t14, "WrapLiteral", """line 716, column 22 of dart:core/uri.dart: """, __x18 is __t14))((segment) {
+  segments.forEach(((__x17) => DEVC$RT.cast(__x17, __t15, __t13, "InferableClosure", """line 716, column 22 of dart:core/uri.dart: """, __x17 is __t13, false))((segment) {
     if (segment.contains("/")) {
       if (argumentError) {
         throw new ArgumentError("Illegal path character $segment");
         }
        else {
         throw new UnsupportedError("Illegal path character $segment");
         }
       }
     }
   ));
   }
  static _checkWindowsPathReservedCharacters(List<String> segments, bool argumentError, [int firstSegment = 0]) {
-  segments.skip(firstSegment).forEach(((__x20) => DEVC$RT.wrap((dynamic f(dynamic __u19)) {
-    dynamic c(dynamic x0) => f(x0);
-     return f == null ? null : c;
-    }
-  , __x20, __t16, __t14, "WrapLiteral", """line 730, column 41 of dart:core/uri.dart: """, __x20 is __t14))((segment) {
+  segments.skip(firstSegment).forEach(((__x18) => DEVC$RT.cast(__x18, __t15, __t13, "InferableClosure", """line 730, column 41 of dart:core/uri.dart: """, __x18 is __t13, false))((segment) {
     if (segment.contains(new RegExp(r'["*/:<>?\\|]'))) {
       if (argumentError) {
         throw new ArgumentError("Illegal character in path");
         }
        else {
         throw new UnsupportedError("Illegal character in path");
         }
       }
     }
   ));
@@ skipping 78 matching lines @@
    if (userInfo != null) {
     userInfo = _makeUserInfo(userInfo, 0, userInfo.length);
     }
    else {
     userInfo = this.userInfo;
     }
    if (port != null) {
     port = _makePort(port, scheme);
     }
    else {
-    port = ((__x21) => DEVC$RT.cast(__x21, num, int, "ImplicitCast", """line 889, column 14 of dart:core/uri.dart: """, __x21 is int, true))(this._port);
+    port = ((__x19) => DEVC$RT.cast(__x19, num, int, "ImplicitCast", """line 889, column 14 of dart:core/uri.dart: """, __x19 is int, true))(this._port);
      if (schemeChanged) {
       port = _makePort(port, scheme);
       }
     }
    if (host != null) {
     host = _makeHost(host, 0, host.length, false);
     }
    else if (this.hasAuthority) {
     host = this.host;
     }
@@ skipping 169 matching lines @@
     }
    var result;
    if (path != null) {
     result = _normalize(path, start, end, DEVC$RT.cast(_pathCharOrSlashTable, DEVC$RT.type((List<dynamic> _) {
       }
     ), DEVC$RT.type((List<int> _) {
       }
     ), "CompositeCast", """line 1139, column 45 of dart:core/uri.dart: """, _pathCharOrSlashTable is List<int>, false));
     }
    else {
-    result = pathSegments.map(((__x27) => DEVC$RT.wrap((String f(dynamic __u22)) {
-      String c(dynamic x0) => f(x0);
-       return f == null ? null : c;
-      }
-    , __x27, __t25, __t23, "WrapLiteral", """line 1141, column 33 of dart:core/uri.dart: """, __x27 is __t23))((s) => _uriEncode(DEVC$RT.cast(_pathCharTable, DEVC$RT.type((List<dynamic> _) {
+    result = pathSegments.map(((__x24) => DEVC$RT.cast(__x24, __t22, __t20, "InferableClosure", """line 1141, column 33 of dart:core/uri.dart: """, __x24 is __t20, false))((s) => _uriEncode(DEVC$RT.cast(_pathCharTable, DEVC$RT.type((List<dynamic> _) {
       }
     ), DEVC$RT.type((List<int> _) {
       }
     ), "CompositeCast", """line 1141, column 51 of dart:core/uri.dart: """, _pathCharTable is List<int>, false), DEVC$RT.cast(s, dynamic, String, "DynamicCast", """line 1141, column 67 of dart:core/uri.dart: """, s is String, true)))).join("/");
     }
    if (result.isEmpty) {
     if (isFile) return "/";
     }
    else if ((isFile || ensureLeadingSlash) && result.codeUnitAt(0) != _SLASH) {
     return "/$result";
     }
    return DEVC$RT.cast(result, dynamic, String, "DynamicCast", """line 1149, column 12 of dart:core/uri.dart: """, result is String, true);
   }
  static String _makeQuery(String query, int start, int end, Map<String, String> queryParameters) {
   if (query == null && queryParameters == null) return null;
    if (query != null && queryParameters != null) {
     throw new ArgumentError('Both query and queryParameters specified');
     }
    if (query != null) return _normalize(query, start, end, DEVC$RT.cast(_queryCharTable, DEVC$RT.type((List<dynamic> _) {
     }
   ), DEVC$RT.type((List<int> _) {
     }
   ), "CompositeCast", """line 1158, column 61 of dart:core/uri.dart: """, _queryCharTable is List<int>, false));
    var result = new StringBuffer();
    var first = true;
-   queryParameters.forEach(((__x36) => DEVC$RT.wrap((dynamic f(dynamic __u28, dynamic __u29)) {
-    dynamic c(dynamic x0, dynamic x1) => f(x0, x1);
-     return f == null ? null : c;
-    }
-  , __x36, __t33, __t30, "WrapLiteral", """line 1162, column 29 of dart:core/uri.dart: """, __x36 is __t30))((key, value) {
+   queryParameters.forEach(((__x31) => DEVC$RT.cast(__x31, __t28, __t25, "InferableClosure", """line 1162, column 29 of dart:core/uri.dart: """, __x31 is __t25, false))((key, value) {
     if (!first) {
       result.write("&");
       }
      first = false;
      result.write(Uri.encodeQueryComponent(DEVC$RT.cast(key, dynamic, String, "DynamicCast", """line 1167, column 45 of dart:core/uri.dart: """, key is String, true)));
      if (value != null && !value.isEmpty) {
       result.write("=");
        result.write(Uri.encodeQueryComponent(DEVC$RT.cast(value, dynamic, String, "DynamicCast", """line 1170, column 47 of dart:core/uri.dart: """, value is String, true)));
       }
     }
@@ skipping 42 matching lines @@
   }
  static bool _isUnreservedChar(int ch) {
   return ch < 127 && ((_unreservedTable[ch >> 4] & (1 << (ch & 0x0f))) != 0);
   }
  static String _escapeChar(char) {
   assert (char <= 0x10ffff); const hexDigits = "0123456789ABCDEF";
    List codeUnits;
    if (char < 0x80) {
     codeUnits = new List(3);
      codeUnits[0] = _PERCENT;
-     codeUnits[1] = hexDigits.codeUnitAt(((__x37) => DEVC$RT.cast(__x37, dynamic, int, "DynamicCast", """line 1248, column 43 of dart:core/uri.dart: """, __x37 is int, true))(char >> 4));
-     codeUnits[2] = hexDigits.codeUnitAt(((__x38) => DEVC$RT.cast(__x38, dynamic, int, "DynamicCast", """line 1249, column 43 of dart:core/uri.dart: """, __x38 is int, true))(char & 0xf));
+     codeUnits[1] = hexDigits.codeUnitAt(((__x32) => DEVC$RT.cast(__x32, dynamic, int, "DynamicCast", """line 1248, column 43 of dart:core/uri.dart: """, __x32 is int, true))(char >> 4));
+     codeUnits[2] = hexDigits.codeUnitAt(((__x33) => DEVC$RT.cast(__x33, dynamic, int, "DynamicCast", """line 1249, column 43 of dart:core/uri.dart: """, __x33 is int, true))(char & 0xf));
     }
    else {
     int flag = 0xc0;
      int encodedBytes = 2;
      if (char > 0x7ff) {
       flag = 0xe0;
        encodedBytes = 3;
        if (char > 0xffff) {
         encodedBytes = 4;
          flag = 0xf0;
         }
       }
      codeUnits = new List(3 * encodedBytes);
      int index = 0;
      while (--encodedBytes >= 0) {
-      int byte = ((__x39) => DEVC$RT.cast(__x39, dynamic, int, "DynamicCast", """line 1265, column 20 of dart:core/uri.dart: """, __x39 is int, true))(((char >> (6 * encodedBytes)) & 0x3f) | flag);
+      int byte = ((__x34) => DEVC$RT.cast(__x34, dynamic, int, "DynamicCast", """line 1265, column 20 of dart:core/uri.dart: """, __x34 is int, true))(((char >> (6 * encodedBytes)) & 0x3f) | flag);
        codeUnits[index] = _PERCENT;
        codeUnits[index + 1] = hexDigits.codeUnitAt(byte >> 4);
        codeUnits[index + 2] = hexDigits.codeUnitAt(byte & 0xf);
        index += 3;
        flag = 0x80;
       }
     }
    return new String.fromCharCodes(DEVC$RT.cast(codeUnits, DEVC$RT.type((List<dynamic> _) {
     }
   ), DEVC$RT.type((Iterable<int> _) {
@@ skipping 157 matching lines @@
         if (reference.path.startsWith("/")) {
           targetPath = _removeDotSegments(reference.path);
           }
          else {
           targetPath = _removeDotSegments(_merge(this._path, reference.path));
           }
          if (reference.hasQuery) targetQuery = reference.query;
         }
        targetUserInfo = this._userInfo;
        targetHost = this._host;
-       targetPort = ((__x40) => DEVC$RT.cast(__x40, num, int, "ImplicitCast", """line 1489, column 22 of dart:core/uri.dart: """, __x40 is int, true))(this._port);
+       targetPort = ((__x35) => DEVC$RT.cast(__x35, num, int, "ImplicitCast", """line 1489, column 22 of dart:core/uri.dart: """, __x35 is int, true))(this._port);
       }
     }
    String fragment = reference.hasFragment ? reference.fragment : null;
    return new Uri._internal(targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, fragment);
   }
  bool get hasAuthority => _host != null;
  bool get hasPort => _port != null;
  bool get hasQuery => _query != null;
  bool get hasFragment => _fragment != null;
  String get origin {
@@ skipping 84 matching lines @@
     }
    return sb.toString();
   }
  bool operator ==(other) {
   if (other is! Uri) return false;
    Uri uri = DEVC$RT.cast(other, dynamic, Uri, "DynamicCast", """line 1698, column 15 of dart:core/uri.dart: """, other is Uri, true);
    return scheme == uri.scheme && hasAuthority == uri.hasAuthority && userInfo == uri.userInfo && host == uri.host && port == uri.port && path == uri.path && hasQuery == uri.hasQuery && query == uri.query && hasFragment == uri.hasFragment && fragment == uri.fragment;
   }
  int get hashCode {
   int combine(part, current) {
-    return ((__x41) => DEVC$RT.cast(__x41, dynamic, int, "DynamicCast", """line 1714, column 14 of dart:core/uri.dart: """, __x41 is int, true))((current * 31 + part.hashCode) & 0x3FFFFFFF);
+    return ((__x36) => DEVC$RT.cast(__x36, dynamic, int, "DynamicCast", """line 1714, column 14 of dart:core/uri.dart: """, __x36 is int, true))((current * 31 + part.hashCode) & 0x3FFFFFFF);
     }
    return combine(scheme, combine(userInfo, combine(host, combine(port, combine(path, combine(query, combine(fragment, 1)))))));
   }
  static void _addIfNonEmpty(StringBuffer sb, String test, String first, String second) {
   if ("" != test) {
     sb.write(first);
      sb.write(second);
     }
   }
  static String encodeComponent(String component) {
@@ skipping 26 matching lines @@
   ), DEVC$RT.type((List<int> _) {
     }
   ), "CompositeCast", """line 1832, column 23 of dart:core/uri.dart: """, _encodeFullTable is List<int>, false), uri);
   }
  static String decodeFull(String uri) {
   return _uriDecode(uri);
   }
  static Map<String, String> splitQueryString(String query, {
   Encoding encoding : UTF8}
 ) {
-  return ((__x42) => DEVC$RT.cast(__x42, dynamic, DEVC$RT.type((Map<String, String> _) {
+  return ((__x37) => DEVC$RT.cast(__x37, dynamic, DEVC$RT.type((Map<String, String> _) {
     }
-  ), "CompositeCast", """line 1864, column 12 of dart:core/uri.dart: """, __x42 is Map<String, String>, false))(query.split("&").fold({
+  ), "CompositeCast", """line 1864, column 12 of dart:core/uri.dart: """, __x37 is Map<String, String>, false))(query.split("&").fold({
     }
-  , ((__x48) => DEVC$RT.wrap((dynamic f(dynamic __u43, dynamic __u44)) {
-    dynamic c(dynamic x0, dynamic x1) => f(x0, x1);
-     return f == null ? null : c;
-    }
-  , __x48, __t33, __t45, "WrapLiteral", """line 1864, column 38 of dart:core/uri.dart: """, __x48 is __t45))((map, element) {
-    int index = ((__x49) => DEVC$RT.cast(__x49, dynamic, int, "DynamicCast", """line 1865, column 19 of dart:core/uri.dart: """, __x49 is int, true))(element.indexOf("="));
+  , ((__x41) => DEVC$RT.cast(__x41, __t28, __t38, "InferableClosure", """line 1864, column 38 of dart:core/uri.dart: """, __x41 is __t38, false))((map, element) {
+    int index = ((__x42) => DEVC$RT.cast(__x42, dynamic, int, "DynamicCast", """line 1865, column 19 of dart:core/uri.dart: """, __x42 is int, true))(element.indexOf("="));
      if (index == -1) {
       if (element != "") {
         map[decodeQueryComponent(DEVC$RT.cast(element, dynamic, String, "DynamicCast", """line 1868, column 36 of dart:core/uri.dart: """, element is String, true), encoding: encoding)] = "";
         }
       }
      else if (index != 0) {
       var key = element.substring(0, index);
        var value = element.substring(index + 1);
        map[Uri.decodeQueryComponent(DEVC$RT.cast(key, dynamic, String, "DynamicCast", """line 1873, column 38 of dart:core/uri.dart: """, key is String, true), encoding: encoding)] = decodeQueryComponent(DEVC$RT.cast(value, dynamic, String, "DynamicCast", """line 1874, column 34 of dart:core/uri.dart: """, value is String, true), encoding: encoding);
       }
      return map;
     }
   )));
   }
  static List<int> parseIPv4Address(String host) {
   void error(String msg) {
     throw new FormatException('Illegal IPv4 address, $msg');
     }
    var bytes = host.split('.');
    if (bytes.length != 4) {
     error('IPv4 address should contain exactly 4 parts');
     }
-   return ((__x50) => DEVC$RT.cast(__x50, DEVC$RT.type((List<dynamic> _) {
+   return ((__x43) => DEVC$RT.cast(__x43, DEVC$RT.type((List<dynamic> _) {
     }
   ), DEVC$RT.type((List<int> _) {
     }
-  ), "CompositeCast", """line 1896, column 12 of dart:core/uri.dart: """, __x50 is List<int>, false))(bytes.map(((__x52) => DEVC$RT.wrap((dynamic f(dynamic __u51)) {
-    dynamic c(dynamic x0) => f(x0);
-     return f == null ? null : c;
-    }
-  , __x52, __t16, __t23, "WrapLiteral", """line 1897, column 14 of dart:core/uri.dart: """, __x52 is __t23))((byteString) {
+  ), "CompositeCast", """line 1896, column 12 of dart:core/uri.dart: """, __x43 is List<int>, false))(bytes.map(((__x44) => DEVC$RT.cast(__x44, __t15, __t20, "InferableClosure", """line 1897, column 14 of dart:core/uri.dart: """, __x44 is __t20, false))((byteString) {
     int byte = int.parse(DEVC$RT.cast(byteString, dynamic, String, "DynamicCast", """line 1898, column 32 of dart:core/uri.dart: """, byteString is String, true));
      if (byte < 0 || byte > 255) {
       error('each part must be in the range of `0..255`');
       }
      return byte;
     }
   )).toList());
   }
  static List<int> parseIPv6Address(String host, [int start = 0, int end]) {
   if (end == null) end = host.length;
@@ skipping 111 matching lines @@
  static const int _RIGHT_BRACKET = 0x5D;
  static const int _LOWER_CASE_A = 0x61;
  static const int _LOWER_CASE_F = 0x66;
  static const int _LOWER_CASE_Z = 0x7A;
  static const int _BAR = 0x7C;
  static String _uriEncode(List<int> canonicalTable, String text, {
   Encoding encoding : UTF8, bool spaceToPlus : false}
 ) {
   byteToHex(byte, buffer) {
     const String hex = '0123456789ABCDEF';
-     buffer.writeCharCode(hex.codeUnitAt(((__x53) => DEVC$RT.cast(__x53, dynamic, int, "DynamicCast", """line 2059, column 43 of dart:core/uri.dart: """, __x53 is int, true))(byte >> 4)));
-     buffer.writeCharCode(hex.codeUnitAt(((__x54) => DEVC$RT.cast(__x54, dynamic, int, "DynamicCast", """line 2060, column 43 of dart:core/uri.dart: """, __x54 is int, true))(byte & 0x0f)));
+     buffer.writeCharCode(hex.codeUnitAt(((__x45) => DEVC$RT.cast(__x45, dynamic, int, "DynamicCast", """line 2059, column 43 of dart:core/uri.dart: """, __x45 is int, true))(byte >> 4)));
+     buffer.writeCharCode(hex.codeUnitAt(((__x46) => DEVC$RT.cast(__x46, dynamic, int, "DynamicCast", """line 2060, column 43 of dart:core/uri.dart: """, __x46 is int, true))(byte & 0x0f)));
     }
    StringBuffer result = new StringBuffer();
    var bytes = encoding.encode(text);
    for (int i = 0; i < bytes.length; i++) {
     int byte = bytes[i];
      if (byte < 128 && ((canonicalTable[byte >> 4] & (1 << (byte & 0x0f))) != 0)) {
       result.writeCharCode(byte);
       }
      else if (spaceToPlus && byte == _SPACE) {
       result.writeCharCode(_PLUS);
@@ skipping 72 matching lines @@
  static const _schemeTable = const [0x0000, 0x0000, 0x6800, 0x03ff, 0xfffe, 0x07ff, 0xfffe, 0x07ff];
  static const _schemeLowerTable = const [0x0000, 0x0000, 0x6800, 0x03ff, 0x0000, 0x0000, 0xfffe, 0x07ff];
  static const _subDelimitersTable = const [0x0000, 0x0000, 0x7fd2, 0x2bff, 0xfffe, 0x87ff, 0xfffe, 0x47ff];
  static const _genDelimitersTable = const [0x0000, 0x0000, 0x8008, 0x8400, 0x0001, 0x2800, 0x0000, 0x0000];
  static const _userinfoTable = const [0x0000, 0x0000, 0x7fd2, 0x2fff, 0xfffe, 0x87ff, 0xfffe, 0x47ff];
  static const _regNameTable = const [0x0000, 0x0000, 0x7ff2, 0x2bff, 0xfffe, 0x87ff, 0xfffe, 0x47ff];
  static const _pathCharTable = const [0x0000, 0x0000, 0x7fd2, 0x2fff, 0xffff, 0x87ff, 0xfffe, 0x47ff];
  static const _pathCharOrSlashTable = const [0x0000, 0x0000, 0xffd2, 0x2fff, 0xffff, 0x87ff, 0xfffe, 0x47ff];
  static const _queryCharTable = const [0x0000, 0x0000, 0xffd2, 0xafff, 0xffff, 0x87ff, 0xfffe, 0x47ff];
 }
- typedef void __t14(String __u15);
- typedef dynamic __t16(dynamic __u17);
- typedef dynamic __t23(String __u24);
- typedef String __t25(dynamic __u26);
- typedef void __t30(String __u31, String __u32);
- typedef dynamic __t33(dynamic __u34, dynamic __u35);
- typedef dynamic __t45(dynamic __u46, String __u47);
+ typedef void __t13(String __u14);
+ typedef dynamic __t15(dynamic __u16);
+ typedef dynamic __t20(String __u21);
+ typedef String __t22(dynamic __u23);
+ typedef void __t25(String __u26, String __u27);
+ typedef dynamic __t28(dynamic __u29, dynamic __u30);
+ typedef dynamic __t38(dynamic __u39, String __u40);