Fix for conditional expressions

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 256 matching lines @@
         }
       }
      host = authority.substring(hostStart, hostEnd);
     }
    return new Uri(scheme: scheme, userInfo: userInfo, host: DEVC$RT.cast(host, dynamic, String, "CastGeneral", """line 609, column 26 of dart:core/uri.dart: """, host is String, true), port: DEVC$RT.cast(port, dynamic, int, "CastGeneral", """line 610, column 26 of dart:core/uri.dart: """, port is int, true), pathSegments: unencodedPath.split("/"), queryParameters: queryParameters);
   }
  factory Uri.file(String path, {
   bool windows}
 ) {
   windows = windows == null ? Uri._isWindows : windows;
-   return ((__x13) => DEVC$RT.cast(__x13, dynamic, Uri, "CastGeneral", """line 698, column 12 of dart:core/uri.dart: """, __x13 is Uri, true))(windows ? _makeWindowsFileUrl(path) : _makeFileUri(path));
+   return ((__x12) => DEVC$RT.cast(__x12, dynamic, Uri, "CastGeneral", """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((segment) {
     if (segment.contains("/")) {
       if (argumentError) {
         throw new ArgumentError("Illegal path character $segment");
         }
        else {
@@ skipping 96 matching lines @@
    if (userInfo != null) {
     userInfo = _makeUserInfo(userInfo, 0, userInfo.length);
     }
    else {
     userInfo = this.userInfo;
     }
    if (port != null) {
     port = _makePort(port, scheme);
     }
    else {
-    port = ((__x14) => DEVC$RT.cast(__x14, num, int, "CastGeneral", """line 889, column 14 of dart:core/uri.dart: """, __x14 is int, true))(this._port);
+    port = ((__x13) => DEVC$RT.cast(__x13, num, int, "CastGeneral", """line 889, column 14 of dart:core/uri.dart: """, __x13 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 20 matching lines @@
     fragment = _makeFragment(fragment, 0, fragment.length);
     }
    else if (this.hasFragment) {
     fragment = this.fragment;
     }
    return new Uri._internal(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 = ((__x15) => DEVC$RT.cast(__x15, DEVC$RT.type((DDC$collection$.UnmodifiableListView<dynamic> _) {
+     _pathSegments = ((__x14) => DEVC$RT.cast(__x14, DEVC$RT.type((DDC$collection$.UnmodifiableListView<dynamic> _) {
       }
     ), DEVC$RT.type((List<String> _) {
       }
-    ), "CastExact", """line 945, column 23 of dart:core/uri.dart: """, __x15 is List<String>, false))(new UnmodifiableListView(pathToSplit == "" ? const <String> [] : pathToSplit.split("/").map(Uri.decodeComponent).toList(growable: false)));
+    ), "CastExact", """line 945, column 23 of dart:core/uri.dart: """, __x14 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 = ((__x16) => DEVC$RT.cast(__x16, DEVC$RT.type((DDC$collection$.UnmodifiableMapView<dynamic, dynamic> _) {
+    _queryParameters = ((__x15) => DEVC$RT.cast(__x15, DEVC$RT.type((DDC$collection$.UnmodifiableMapView<dynamic, dynamic> _) {
       }
     ), DEVC$RT.type((Map<String, String> _) {
       }
-    ), "CastExact", """line 969, column 26 of dart:core/uri.dart: """, __x16 is Map<String, String>, false))(new UnmodifiableMapView(splitQueryString(query)));
+    ), "CastExact", """line 969, column 26 of dart:core/uri.dart: """, __x15 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 null;
    return port;
   }
  static String _makeHost(String host, int start, int end, bool strictIPv6) {
   if (host == null) return null;
    if (start == end) return "";
@@ skipping 201 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(((__x17) => DEVC$RT.cast(__x17, dynamic, int, "CastGeneral", """line 1248, column 43 of dart:core/uri.dart: """, __x17 is int, true))(char >> 4));
-     codeUnits[2] = hexDigits.codeUnitAt(((__x18) => DEVC$RT.cast(__x18, dynamic, int, "CastGeneral", """line 1249, column 43 of dart:core/uri.dart: """, __x18 is int, true))(char & 0xf));
+     codeUnits[1] = hexDigits.codeUnitAt(((__x16) => DEVC$RT.cast(__x16, dynamic, int, "CastGeneral", """line 1248, column 43 of dart:core/uri.dart: """, __x16 is int, true))(char >> 4));
+     codeUnits[2] = hexDigits.codeUnitAt(((__x17) => DEVC$RT.cast(__x17, dynamic, int, "CastGeneral", """line 1249, column 43 of dart:core/uri.dart: """, __x17 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 = ((__x19) => DEVC$RT.cast(__x19, dynamic, int, "CastGeneral", """line 1265, column 20 of dart:core/uri.dart: """, __x19 is int, true))(((char >> (6 * encodedBytes)) & 0x3f) | flag);
+      int byte = ((__x18) => DEVC$RT.cast(__x18, dynamic, int, "CastGeneral", """line 1265, column 20 of dart:core/uri.dart: """, __x18 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 87 matching lines @@
     }
    return base.substring(0, baseEnd + 1) + reference.substring(refStart - 3 * backCount);
   }
  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 = ((__x20) => DEVC$RT.cast(__x20, DEVC$RT.type((List<dynamic> _) {
+   List<String> output = ((__x19) => DEVC$RT.cast(__x19, DEVC$RT.type((List<dynamic> _) {
     }
   ), DEVC$RT.type((List<String> _) {
     }
-  ), "CastLiteral", """line 1402, column 27 of dart:core/uri.dart: """, __x20 is List<String>, false))([]);
+  ), "CastLiteral", """line 1402, column 27 of dart:core/uri.dart: """, __x19 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 12 matching lines @@
    String targetUserInfo = "";
    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 = ((__x21) => DEVC$RT.cast(__x21, dynamic, int, "CastGeneral", """line 1456, column 22 of dart:core/uri.dart: """, __x21 is int, true))(reference.hasPort ? reference.port : null);
+       targetPort = 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(((__x22) => DEVC$RT.cast(__x22, dynamic, int, "CastGeneral", """line 1467, column 32 of dart:core/uri.dart: """, __x22 is int, true))(reference.hasPort ? reference.port : null), targetScheme);
+       targetPort = _makePort(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 = ((__x23) => DEVC$RT.cast(__x23, num, int, "CastGeneral", """line 1489, column 22 of dart:core/uri.dart: """, __x23 is int, true))(this._port);
+       targetPort = ((__x20) => DEVC$RT.cast(__x20, num, int, "CastGeneral", """line 1489, column 22 of dart:core/uri.dart: """, __x20 is int, true))(this._port);
       }
     }
-   String fragment = ((__x24) => DEVC$RT.cast(__x24, dynamic, String, "CastGeneral", """line 1492, column 23 of dart:core/uri.dart: """, __x24 is String, true))(reference.hasFragment ? reference.fragment : null);
+   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 {
   if (scheme == "" || _host == null || _host == "") {
     throw new StateError("Cannot use origin without a scheme: $this");
     }
@@ skipping 81 matching lines @@
     }
    return sb.toString();
   }
  bool operator ==(other) {
   if (other is! Uri) return false;
    Uri uri = DEVC$RT.cast(other, dynamic, Uri, "CastGeneral", """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 ((__x25) => DEVC$RT.cast(__x25, dynamic, int, "CastGeneral", """line 1714, column 14 of dart:core/uri.dart: """, __x25 is int, true))((current * 31 + part.hashCode) & 0x3FFFFFFF);
+    return ((__x21) => DEVC$RT.cast(__x21, dynamic, int, "CastGeneral", """line 1714, column 14 of dart:core/uri.dart: """, __x21 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 20 matching lines @@
   return _uriEncode(DEVC$RT.cast(_encodeFullTable, dynamic, DEVC$RT.type((List<int> _) {
     }
   ), "CastGeneral", """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 ((__x26) => DEVC$RT.cast(__x26, dynamic, DEVC$RT.type((Map<String, String> _) {
+  return ((__x22) => DEVC$RT.cast(__x22, dynamic, DEVC$RT.type((Map<String, String> _) {
     }
-  ), "CastGeneral", """line 1864, column 12 of dart:core/uri.dart: """, __x26 is Map<String, String>, false))(query.split("&").fold({
+  ), "CastGeneral", """line 1864, column 12 of dart:core/uri.dart: """, __x22 is Map<String, String>, false))(query.split("&").fold({
     }
   , (map, element) {
-    int index = ((__x27) => DEVC$RT.cast(__x27, dynamic, int, "CastGeneral", """line 1865, column 19 of dart:core/uri.dart: """, __x27 is int, true))(element.indexOf("="));
+    int index = ((__x23) => DEVC$RT.cast(__x23, dynamic, int, "CastGeneral", """line 1865, column 19 of dart:core/uri.dart: """, __x23 is int, true))(element.indexOf("="));
      if (index == -1) {
       if (element != "") {
         map[decodeQueryComponent(DEVC$RT.cast(element, dynamic, String, "CastGeneral", """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, "CastGeneral", """line 1873, column 38 of dart:core/uri.dart: """, key is String, true), encoding: encoding)] = decodeQueryComponent(DEVC$RT.cast(value, dynamic, String, "CastGeneral", """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 ((__x28) => DEVC$RT.cast(__x28, DEVC$RT.type((List<dynamic> _) {
+   return ((__x24) => DEVC$RT.cast(__x24, DEVC$RT.type((List<dynamic> _) {
     }
   ), DEVC$RT.type((List<int> _) {
     }
-  ), "CastDynamic", """line 1896, column 12 of dart:core/uri.dart: """, __x28 is List<int>, false))(bytes.map((byteString) {
+  ), "CastDynamic", """line 1896, column 12 of dart:core/uri.dart: """, __x24 is List<int>, false))(bytes.map((byteString) {
     int byte = int.parse(DEVC$RT.cast(byteString, dynamic, String, "CastGeneral", """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;
    void error(String msg, [position]) {
     throw new FormatException('Illegal IPv6 address, $msg', host, DEVC$RT.cast(position, dynamic, int, "CastGeneral", """line 1933, column 69 of dart:core/uri.dart: """, position is int, true));
     }
    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 = ((__x29) => DEVC$RT.cast(__x29, DEVC$RT.type((List<dynamic> _) {
+   List<int> parts = ((__x25) => DEVC$RT.cast(__x25, DEVC$RT.type((List<dynamic> _) {
     }
   ), DEVC$RT.type((List<int> _) {
     }
-  ), "CastLiteral", """line 1946, column 23 of dart:core/uri.dart: """, __x29 is List<int>, false))([]);
+  ), "CastLiteral", """line 1946, column 23 of dart:core/uri.dart: """, __x25 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);
           }
          partStart = i;
@@ skipping 86 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(((__x30) => DEVC$RT.cast(__x30, dynamic, int, "CastGeneral", """line 2059, column 43 of dart:core/uri.dart: """, __x30 is int, true))(byte >> 4)));
-     buffer.writeCharCode(hex.codeUnitAt(((__x31) => DEVC$RT.cast(__x31, dynamic, int, "CastGeneral", """line 2060, column 43 of dart:core/uri.dart: """, __x31 is int, true))(byte & 0x0f)));
+     buffer.writeCharCode(hex.codeUnitAt(((__x26) => DEVC$RT.cast(__x26, dynamic, int, "CastGeneral", """line 2059, column 43 of dart:core/uri.dart: """, __x26 is int, true))(byte >> 4)));
+     buffer.writeCharCode(hex.codeUnitAt(((__x27) => DEVC$RT.cast(__x27, dynamic, int, "CastGeneral", """line 2060, column 43 of dart:core/uri.dart: """, __x27 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 35 matching lines @@
    List<int> bytes;
    if (simple) {
     if (encoding == UTF8 || encoding == LATIN1) {
       return text;
       }
      else {
       bytes = text.codeUnits;
       }
     }
    else {
-    bytes = ((__x32) => DEVC$RT.cast(__x32, DEVC$RT.type((List<dynamic> _) {
+    bytes = ((__x28) => DEVC$RT.cast(__x28, DEVC$RT.type((List<dynamic> _) {
       }
     ), DEVC$RT.type((List<int> _) {
       }
-    ), "CastExact", """line 2134, column 15 of dart:core/uri.dart: """, __x32 is List<int>, false))(new List());
+    ), "CastExact", """line 2134, column 15 of dart:core/uri.dart: """, __x28 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');
           }
          bytes.add(_hexCharPairToByte(text, i + 1));
@@ skipping 16 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];
 }