cleanup patch generation to preseve comments and remove @patch

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();
@@ skipping 272 matching lines @@
         port: port,
         pathSegments: unencodedPath.split("/"),
         queryParameters: queryParameters);
   }
   factory Uri.file(String path, {bool windows}) {
     windows = windows == null ? Uri._isWindows : windows;
     return ((__x41) => DDC$RT.cast(__x41, dynamic, Uri, "CastGeneral",
         """line 698, column 12 of dart:core/uri.dart: """, __x41 is Uri,
         true))(windows ? _makeWindowsFileUrl(path) : _makeFileUri(path));
   }
-  @patch static Uri get base {
+  static Uri get base {
     String uri = ((__x42) => DDC$RT.cast(__x42, dynamic, String, "CastGeneral",
-        """line 703, column 18 of dart:core/uri.dart: """, __x42 is String,
+        """line 711, column 18 of dart:core/uri.dart: """, __x42 is String,
         true))(Primitives.currentUri());
     if (uri != null) return Uri.parse(uri);
     throw new UnsupportedError("'Uri.base' is not supported");
   }
-  @patch static bool get _isWindows => false;
+  static bool get _isWindows => false;
   static _checkNonWindowsPathReservedCharacters(
       List<String> segments, bool argumentError) {
     segments.forEach((segment) {
       if (segment.contains("/")) {
         if (argumentError) {
           throw new ArgumentError("Illegal path character $segment");
         } else {
           throw new UnsupportedError("Illegal path character $segment");
         }
       }
@@ skipping 93 matching lines @@
     bool isFile = (scheme == "file");
     if (userInfo != null) {
       userInfo = _makeUserInfo(userInfo, 0, userInfo.length);
     } else {
       userInfo = this.userInfo;
     }
     if (port != null) {
       port = _makePort(port, scheme);
     } else {
       port = ((__x43) => DDC$RT.cast(__x43, num, int, "CastGeneral",
-          """line 886, column 14 of dart:core/uri.dart: """, __x43 is int,
+          """line 893, column 14 of dart:core/uri.dart: """, __x43 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;
     } else if (userInfo.isNotEmpty || port != null || isFile) {
@@ skipping 24 matching lines @@
         scheme, userInfo, host, port, path, query, fragment);
   }
   List<String> get pathSegments {
     if (_pathSegments == null) {
       var pathToSplit = !path.isEmpty && path.codeUnitAt(0) == _SLASH
           ? path.substring(1)
           : path;
       _pathSegments = ((__x44) => DDC$RT.cast(__x44,
               DDC$RT.type((DDC$collection$.UnmodifiableListView<dynamic> _) {}),
               DDC$RT.type((List<String> _) {}), "CastExact",
-              """line 942, column 23 of dart:core/uri.dart: """,
+              """line 949, column 23 of dart:core/uri.dart: """,
               __x44 is List<String>, false))(new UnmodifiableListView(
           pathToSplit == ""
               ? const <String>[]
               : pathToSplit
                   .split("/")
                   .map(Uri.decodeComponent)
                   .toList(growable: false)));
     }
     return _pathSegments;
   }
   Map<String, String> get queryParameters {
     if (_queryParameters == null) {
       _queryParameters = ((__x45) => DDC$RT.cast(__x45, DDC$RT.type(
               (DDC$collection$.UnmodifiableMapView<dynamic, dynamic> _) {}),
           DDC$RT.type((Map<String, String> _) {}), "CastExact",
-          """line 966, column 26 of dart:core/uri.dart: """,
+          """line 973, column 26 of dart:core/uri.dart: """,
           __x45 is Map<String, String>,
           false))(new UnmodifiableMapView(splitQueryString(query)));
     }
     return _queryParameters;
   }
   static int _makePort(int port, String scheme) {
     if (port != null && port == _defaultPort(scheme)) return ((__x46) => DDC$RT
         .cast(__x46, Null, int, "CastLiteral",
-            """line 973, column 62 of dart:core/uri.dart: """, __x46 is int,
+            """line 980, column 62 of dart:core/uri.dart: """, __x46 is int,
             true))(null);
     return port;
   }
   static String _makeHost(String host, int start, int end, bool strictIPv6) {
     if (host == null) return null;
     if (start == end) return "";
     if (host.codeUnitAt(start) == _LEFT_BRACKET) {
       if (host.codeUnitAt(end - 1) != _RIGHT_BRACKET) {
         _fail(host, start, 'Missing end `]` to match `[` in host');
       }
@@ skipping 96 matching lines @@
       }
     }
     scheme = scheme.substring(0, end);
     if (!allLowercase) scheme = scheme.toLowerCase();
     return scheme;
   }
   static String _makeUserInfo(String userInfo, int start, int end) {
     if (userInfo == null) return "";
     return _normalize(userInfo, start, end, DDC$RT.cast(_userinfoTable, dynamic,
         DDC$RT.type((List<int> _) {}), "CastGeneral",
-        """line 1123, column 45 of dart:core/uri.dart: """,
+        """line 1130, column 45 of dart:core/uri.dart: """,
         _userinfoTable is List<int>, false));
   }
   static String _makePath(String path, int start, int end,
       Iterable<String> pathSegments, bool ensureLeadingSlash, bool isFile) {
     if (path == null && pathSegments == null) return isFile ? "/" : "";
     if (path != null && pathSegments != null) {
       throw new ArgumentError('Both path and pathSegments specified');
     }
     var result;
     if (path != null) {
       result = _normalize(path, start, end, DDC$RT.cast(_pathCharOrSlashTable,
           dynamic, DDC$RT.type((List<int> _) {}), "CastGeneral",
-          """line 1136, column 45 of dart:core/uri.dart: """,
+          """line 1143, column 45 of dart:core/uri.dart: """,
           _pathCharOrSlashTable is List<int>, false));
     } else {
       result = pathSegments
           .map((s) => _uriEncode(DDC$RT.cast(_pathCharTable, dynamic,
               DDC$RT.type((List<int> _) {}), "CastGeneral",
-              """line 1138, column 51 of dart:core/uri.dart: """,
+              """line 1145, column 51 of dart:core/uri.dart: """,
               _pathCharTable is List<int>, false), DDC$RT.cast(s, dynamic,
               String, "CastGeneral",
-              """line 1138, column 67 of dart:core/uri.dart: """, s is String,
+              """line 1145, 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 DDC$RT.cast(result, dynamic, String, "CastGeneral",
-        """line 1146, column 12 of dart:core/uri.dart: """, result is String,
+        """line 1153, 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, DDC$RT.cast(
         _queryCharTable, dynamic, DDC$RT.type((List<int> _) {}), "CastGeneral",
-        """line 1155, column 61 of dart:core/uri.dart: """,
+        """line 1162, column 61 of dart:core/uri.dart: """,
         _queryCharTable is List<int>, false));
     var result = new StringBuffer();
     var first = true;
     queryParameters.forEach((key, value) {
       if (!first) {
         result.write("&");
       }
       first = false;
       result.write(Uri.encodeQueryComponent(DDC$RT.cast(key, dynamic, String,
-          "CastGeneral", """line 1164, column 45 of dart:core/uri.dart: """,
+          "CastGeneral", """line 1171, column 45 of dart:core/uri.dart: """,
           key is String, true)));
       if (value != null && !value.isEmpty) {
         result.write("=");
         result.write(Uri.encodeQueryComponent(DDC$RT.cast(value, dynamic,
             String, "CastGeneral",
-            """line 1167, column 47 of dart:core/uri.dart: """, value is String,
+            """line 1174, column 47 of dart:core/uri.dart: """, value is String,
             true)));
       }
     });
     return result.toString();
   }
   static String _makeFragment(String fragment, int start, int end) {
     if (fragment == null) return null;
     return _normalize(fragment, start, end, DDC$RT.cast(_queryCharTable,
         dynamic, DDC$RT.type((List<int> _) {}), "CastGeneral",
-        """line 1175, column 45 of dart:core/uri.dart: """,
+        """line 1182, column 45 of dart:core/uri.dart: """,
         _queryCharTable is List<int>, false));
   }
   static int _stringOrNullLength(String s) => (s == null) ? 0 : s.length;
   static bool _isHexDigit(int char) {
     if (_NINE >= char) return _ZERO <= char;
     char |= 0x20;
     return _LOWER_CASE_A <= char && _LOWER_CASE_F >= char;
   }
   static int _hexValue(int char) {
     assert(_isHexDigit(char));
@@ skipping 28 matching lines @@
   }
   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(((__x47) => DDC$RT.cast(__x47,
           dynamic, int, "CastGeneral",
-          """line 1245, column 43 of dart:core/uri.dart: """, __x47 is int,
+          """line 1252, column 43 of dart:core/uri.dart: """, __x47 is int,
           true))(char >> 4));
       codeUnits[2] = hexDigits.codeUnitAt(((__x48) => DDC$RT.cast(__x48,
           dynamic, int, "CastGeneral",
-          """line 1246, column 43 of dart:core/uri.dart: """, __x48 is int,
+          """line 1253, column 43 of dart:core/uri.dart: """, __x48 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 = ((__x49) => DDC$RT.cast(__x49, dynamic, int, "CastGeneral",
-            """line 1262, column 20 of dart:core/uri.dart: """, __x49 is int,
+            """line 1269, column 20 of dart:core/uri.dart: """, __x49 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(codeUnits);
   }
@@ skipping 87 matching lines @@
   }
   bool _hasDotSegments(String path) {
     if (path.length > 0 && path.codeUnitAt(0) == _DOT) return true;
     int index = path.indexOf("/.");
     return index != -1;
   }
   String _removeDotSegments(String path) {
     if (!_hasDotSegments(path)) return path;
     List<String> output = ((__x50) => DDC$RT.cast(__x50,
         DDC$RT.type((List<dynamic> _) {}), DDC$RT.type((List<String> _) {}),
-        "CastLiteral", """line 1399, column 27 of dart:core/uri.dart: """,
+        "CastLiteral", """line 1406, column 27 of dart:core/uri.dart: """,
         __x50 is List<String>, false))([]);
     bool appendSlash = false;
     for (String segment in path.split("/")) {
       appendSlash = false;
       if (segment == "..") {
         if (!output.isEmpty &&
             ((output.length != 1) || (output[0] != ""))) output.removeLast();
         appendSlash = true;
       } else if ("." == segment) {
         appendSlash = true;
@@ skipping 13 matching lines @@
     String targetHost;
     int targetPort;
     String targetPath;
     String targetQuery;
     if (reference.scheme.isNotEmpty) {
       targetScheme = reference.scheme;
       if (reference.hasAuthority) {
         targetUserInfo = reference.userInfo;
         targetHost = reference.host;
         targetPort = ((__x51) => DDC$RT.cast(__x51, dynamic, int, "CastGeneral",
-            """line 1453, column 22 of dart:core/uri.dart: """, __x51 is int,
+            """line 1460, column 22 of dart:core/uri.dart: """, __x51 is int,
             true))(reference.hasPort ? reference.port : null);
       }
       targetPath = _removeDotSegments(reference.path);
       if (reference.hasQuery) {
         targetQuery = reference.query;
       }
     } else {
       targetScheme = this.scheme;
       if (reference.hasAuthority) {
         targetUserInfo = reference.userInfo;
         targetHost = reference.host;
         targetPort = _makePort(((__x52) => DDC$RT.cast(__x52, dynamic, int,
-            "CastGeneral", """line 1464, column 32 of dart:core/uri.dart: """,
+            "CastGeneral", """line 1471, column 32 of dart:core/uri.dart: """,
             __x52 is int,
             true))(reference.hasPort ? reference.port : null), targetScheme);
         targetPath = _removeDotSegments(reference.path);
         if (reference.hasQuery) targetQuery = reference.query;
       } else {
         if (reference.path == "") {
           targetPath = this._path;
           if (reference.hasQuery) {
             targetQuery = reference.query;
           } else {
             targetQuery = this._query;
           }
         } else {
           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 = ((__x53) => DDC$RT.cast(__x53, num, int, "CastGeneral",
-            """line 1486, column 22 of dart:core/uri.dart: """, __x53 is int,
+            """line 1493, column 22 of dart:core/uri.dart: """, __x53 is int,
             true))(this._port);
       }
     }
     String fragment = ((__x54) => DDC$RT.cast(__x54, dynamic, String,
-        "CastGeneral", """line 1489, column 23 of dart:core/uri.dart: """,
+        "CastGeneral", """line 1496, column 23 of dart:core/uri.dart: """,
         __x54 is String,
         true))(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 88 matching lines @@
     if (_fragment != null) {
       sb
         ..write("#")
         ..write(_fragment);
     }
     return sb.toString();
   }
   bool operator ==(other) {
     if (other is! Uri) return false;
     Uri uri = DDC$RT.cast(other, dynamic, Uri, "CastGeneral",
-        """line 1695, column 15 of dart:core/uri.dart: """, other is Uri, true);
+        """line 1702, 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 ((__x55) => DDC$RT.cast(__x55, dynamic, int, "CastGeneral",
-          """line 1711, column 14 of dart:core/uri.dart: """, __x55 is int,
+          """line 1718, column 14 of dart:core/uri.dart: """, __x55 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) {
     return _uriEncode(DDC$RT.cast(_unreserved2396Table, dynamic,
         DDC$RT.type((List<int> _) {}), "CastGeneral",
-        """line 1746, column 23 of dart:core/uri.dart: """,
+        """line 1753, column 23 of dart:core/uri.dart: """,
         _unreserved2396Table is List<int>, false), component);
   }
   static String encodeQueryComponent(String component,
       {Encoding encoding: UTF8}) {
     return _uriEncode(DDC$RT.cast(_unreservedTable, dynamic,
             DDC$RT.type((List<int> _) {}), "CastGeneral",
-            """line 1785, column 9 of dart:core/uri.dart: """,
+            """line 1792, column 9 of dart:core/uri.dart: """,
             _unreservedTable is List<int>, false), component,
         encoding: encoding, spaceToPlus: true);
   }
   static String decodeComponent(String encodedComponent) {
     return _uriDecode(encodedComponent);
   }
   static String decodeQueryComponent(String encodedComponent,
       {Encoding encoding: UTF8}) {
     return _uriDecode(encodedComponent, plusToSpace: true, encoding: encoding);
   }
   static String encodeFull(String uri) {
     return _uriEncode(DDC$RT.cast(_encodeFullTable, dynamic,
         DDC$RT.type((List<int> _) {}), "CastGeneral",
-        """line 1829, column 23 of dart:core/uri.dart: """,
+        """line 1836, 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 ((__x56) => DDC$RT.cast(__x56, dynamic,
             DDC$RT.type((Map<String, String> _) {}), "CastGeneral",
-            """line 1861, column 12 of dart:core/uri.dart: """,
+            """line 1868, column 12 of dart:core/uri.dart: """,
             __x56 is Map<String, String>, false))(query
         .split("&")
         .fold({}, (map, element) {
       int index = ((__x57) => DDC$RT.cast(__x57, dynamic, int, "CastGeneral",
-          """line 1862, column 19 of dart:core/uri.dart: """, __x57 is int,
+          """line 1869, column 19 of dart:core/uri.dart: """, __x57 is int,
           true))(element.indexOf("="));
       if (index == -1) {
         if (element != "") {
           map[decodeQueryComponent(DDC$RT.cast(element, dynamic, String,
-              "CastGeneral", """line 1865, column 36 of dart:core/uri.dart: """,
+              "CastGeneral", """line 1872, 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(DDC$RT.cast(key, dynamic, String,
                 "CastGeneral",
-                """line 1870, column 38 of dart:core/uri.dart: """,
+                """line 1877, column 38 of dart:core/uri.dart: """,
                 key is String, true),
             encoding: encoding)] = decodeQueryComponent(DDC$RT.cast(value,
                 dynamic, String, "CastGeneral",
-                """line 1871, column 34 of dart:core/uri.dart: """,
+                """line 1878, 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 ((__x58) => DDC$RT.cast(__x58, DDC$RT.type((List<dynamic> _) {}),
         DDC$RT.type((List<int> _) {}), "CastDynamic",
-        """line 1893, column 12 of dart:core/uri.dart: """, __x58 is List<int>,
+        """line 1900, column 12 of dart:core/uri.dart: """, __x58 is List<int>,
         false))(bytes.map((byteString) {
       int byte = int.parse(DDC$RT.cast(byteString, dynamic, String,
-          "CastGeneral", """line 1895, column 32 of dart:core/uri.dart: """,
+          "CastGeneral", """line 1902, 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;
     void error(String msg, [position]) {
       throw new FormatException('Illegal IPv6 address, $msg', host, position);
     }
     int parseHex(int start, int end) {
       if (end - start > 4) {
         error('an IPv6 part can only contain a maximum of 4 hex digits', start);
       }
       int value = int.parse(host.substring(start, end), radix: 16);
       if (value < 0 || value > (1 << 16) - 1) {
         error('each part must be in the range of `0x0..0xFFFF`', start);
       }
       return value;
     }
     if (host.length < 2) error('address is too short');
     List<int> parts = ((__x59) => DDC$RT.cast(__x59,
         DDC$RT.type((List<dynamic> _) {}), DDC$RT.type((List<int> _) {}),
-        "CastLiteral", """line 1943, column 23 of dart:core/uri.dart: """,
+        "CastLiteral", """line 1950, column 23 of dart:core/uri.dart: """,
         __x59 is List<int>, false))([]);
     bool wildcardSeen = false;
     int partStart = start;
     for (int i = start; i < end; i++) {
       if (host.codeUnitAt(i) == _COLON) {
         if (i == start) {
           i++;
           if (host.codeUnitAt(i) != _COLON) {
             error('invalid start colon.', i);
           }
@@ skipping 48 matching lines @@
           index += 2;
         }
       } else {
         bytes[index] = value >> 8;
         bytes[index + 1] = value & 0xff;
         index += 2;
       }
     }
     return DDC$RT.cast(bytes, DDC$RT.type((List<dynamic> _) {}),
         DDC$RT.type((List<int> _) {}), "CastDynamic",
-        """line 2015, column 12 of dart:core/uri.dart: """, bytes is List<int>,
+        """line 2022, column 12 of dart:core/uri.dart: """, bytes is List<int>,
         false);
   }
   static const int _SPACE = 0x20;
   static const int _DOUBLE_QUOTE = 0x22;
   static const int _NUMBER_SIGN = 0x23;
   static const int _PERCENT = 0x25;
   static const int _ASTERISK = 0x2A;
   static const int _PLUS = 0x2B;
   static const int _DOT = 0x2E;
   static const int _SLASH = 0x2F;
@@ skipping 13 matching lines @@
   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(((__x60) => DDC$RT.cast(__x60,
           dynamic, int, "CastGeneral",
-          """line 2056, column 43 of dart:core/uri.dart: """, __x60 is int,
+          """line 2063, column 43 of dart:core/uri.dart: """, __x60 is int,
           true))(byte >> 4)));
       buffer.writeCharCode(hex.codeUnitAt(((__x61) => DDC$RT.cast(__x61,
           dynamic, int, "CastGeneral",
-          """line 2057, column 43 of dart:core/uri.dart: """, __x61 is int,
+          """line 2064, column 43 of dart:core/uri.dart: """, __x61 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) {
@@ skipping 32 matching lines @@
     List<int> bytes;
     if (simple) {
       if (encoding == UTF8 || encoding == LATIN1) {
         return text;
       } else {
         bytes = text.codeUnits;
       }
     } else {
       bytes = ((__x62) => DDC$RT.cast(__x62, DDC$RT.type((List<dynamic> _) {}),
           DDC$RT.type((List<int> _) {}), "CastExact",
-          """line 2131, column 15 of dart:core/uri.dart: """,
+          """line 2138, column 15 of dart:core/uri.dart: """,
           __x62 is List<int>, false))(new List());
       for (int i = 0; i < text.length; i++) {
         var codeUnit = text.codeUnitAt(i);
         if (codeUnit > 127) {
           throw new ArgumentError("Illegal percent encoding in URI");
         }
         if (codeUnit == _PERCENT) {
           if (i + 3 > text.length) {
             throw new ArgumentError('Truncated URI');
           }
@@ skipping 125 matching lines @@
     0x0000,
     0x0000,
     0xffd2,
     0xafff,
     0xffff,
     0x87ff,
     0xfffe,
     0x47ff
   ];
 }