Fix for conditional expressions

test/dart_codegen/expect/convert/json.dart

 part of dart.convert;
  class JsonUnsupportedObjectError extends Error {final unsupportedObject;
  final cause;
  JsonUnsupportedObjectError(this.unsupportedObject, {
   this.cause}
 );
  String toString() {
   if (cause != null) {
     return "Converting object to an encodable object failed.";
     }
@@ skipping 19 matching lines @@
 ) {
 if (reviver == null) reviver = _reviver;
  if (reviver == null) return decoder.convert(source);
  return new JsonDecoder(reviver).convert(source);
 }
  String encode(Object value, {
 toEncodable(var object)}
 ) {
 if (toEncodable == null) toEncodable = _toEncodable;
  if (toEncodable == null) return encoder.convert(value);
- return new JsonEncoder(DEVC$RT.wrap((dynamic f(dynamic __u7)) {
+ return new JsonEncoder(DEVC$RT.wrap((dynamic f(dynamic __u6)) {
 dynamic c(dynamic x0) => f(x0);
  return f == null ? null : c;
 }
-, toEncodable, __t10, __t8, "Wrap", """line 142, column 28 of dart:convert/json.dart: """, toEncodable is __t8)).convert(value);
+, toEncodable, __t9, __t7, "Wrap", """line 142, column 28 of dart:convert/json.dart: """, toEncodable is __t7)).convert(value);
 }
  JsonEncoder get encoder {
 if (_toEncodable == null) return const JsonEncoder();
- return new JsonEncoder(DEVC$RT.wrap((dynamic f(dynamic __u12)) {
+ return new JsonEncoder(DEVC$RT.wrap((dynamic f(dynamic __u11)) {
 dynamic c(dynamic x0) => f(x0);
  return f == null ? null : c;
 }
-, _toEncodable, __t10, __t8, "Wrap", """line 147, column 28 of dart:convert/json.dart: """, _toEncodable is __t8));
+, _toEncodable, __t9, __t7, "Wrap", """line 147, column 28 of dart:convert/json.dart: """, _toEncodable is __t7));
 }
  JsonDecoder get decoder {
 if (_reviver == null) return const JsonDecoder();
  return new JsonDecoder(_reviver);
 }
 }
  class JsonEncoder extends Converter<Object, String> {final String indent;
  final Function _toEncodable;
  const JsonEncoder([Object toEncodable(Object nonSerializable)]) : this.indent = null, this._toEncodable = toEncodable;
  const JsonEncoder.withIndent(this.indent, [Object toEncodable(Object nonSerializable)]) : this._toEncodable = toEncodable;
- String convert(Object object) => _JsonStringStringifier.stringify(object, DEVC$RT.cast(_toEncodable, Function, __t10, "CastGeneral", """line 243, column 48 of dart:convert/json.dart: """, _toEncodable is __t10, false), indent);
+ String convert(Object object) => _JsonStringStringifier.stringify(object, DEVC$RT.cast(_toEncodable, Function, __t9, "CastGeneral", """line 243, column 48 of dart:convert/json.dart: """, _toEncodable is __t9, false), indent);
  ChunkedConversionSink<Object> startChunkedConversion(Sink<String> sink) {
 if (sink is! StringConversionSink) {
 sink = new StringConversionSink.from(sink);
 }
  else if (sink is _Utf8EncoderSink) {
 return new _JsonUtf8EncoderSink(sink._sink, _toEncodable, JsonUtf8Encoder._utf8Encode(indent), JsonUtf8Encoder.DEFAULT_BUFFER_SIZE);
 }
  return new _JsonEncoderSink(DEVC$RT.cast(sink, DEVC$RT.type((Sink<String> _) {
 }
 ), StringConversionSink, "CastGeneral", """line 262, column 33 of dart:convert/json.dart: """, sink is StringConversionSink, true), _toEncodable, indent);
 }
- Stream<String> bind(Stream<Object> stream) => ((__x13) => DEVC$RT.cast(__x13, DEVC$RT.type((DDC$async$.Stream<dynamic> _) {
+ Stream<String> bind(Stream<Object> stream) => ((__x12) => DEVC$RT.cast(__x12, DEVC$RT.type((DDC$async$.Stream<dynamic> _) {
 }
 ), DEVC$RT.type((DDC$async$.Stream<String> _) {
 }
-), "CastDynamic", """line 266, column 49 of dart:convert/json.dart: """, __x13 is DDC$async$.Stream<String>, false))(super.bind(stream));
+), "CastDynamic", """line 266, column 49 of dart:convert/json.dart: """, __x12 is DDC$async$.Stream<String>, false))(super.bind(stream));
  Converter<Object, dynamic> fuse(Converter<String, dynamic> other) {
 if (other is Utf8Encoder) {
-return new JsonUtf8Encoder(indent, DEVC$RT.cast(_toEncodable, Function, __t14, "CastGeneral", """line 270, column 42 of dart:convert/json.dart: """, _toEncodable is __t14, false));
+return new JsonUtf8Encoder(indent, DEVC$RT.cast(_toEncodable, Function, __t13, "CastGeneral", """line 270, column 42 of dart:convert/json.dart: """, _toEncodable is __t13, false));
 }
  return super.fuse(other);
 }
 }
  class JsonUtf8Encoder extends Converter<Object, List<int>> {static const int DEFAULT_BUFFER_SIZE = 256;
  final List<int> _indent;
  final Function _toEncodable;
  final int _bufferSize;
  JsonUtf8Encoder([String indent, toEncodable(Object object), int bufferSize = DEFAULT_BUFFER_SIZE]) : _indent = _utf8Encode(indent), _toEncodable = toEncodable, _bufferSize = bufferSize;
  static List<int> _utf8Encode(String string) {
 if (string == null) return null;
  if (string.isEmpty) return new Uint8List(0);
  checkAscii: {
 for (int i = 0; i < string.length; i++) {
 if (string.codeUnitAt(i) >= 0x80) break checkAscii;
 }
  return string.codeUnits;
 }
  return UTF8.encode(string);
 }
  List<int> convert(Object object) {
-List<List<int>> bytes = ((__x16) => DEVC$RT.cast(__x16, DEVC$RT.type((List<dynamic> _) {
+List<List<int>> bytes = ((__x15) => DEVC$RT.cast(__x15, DEVC$RT.type((List<dynamic> _) {
 }
 ), DEVC$RT.type((List<List<int>> _) {
 }
-), "CastLiteral", """line 338, column 29 of dart:convert/json.dart: """, __x16 is List<List<int>>, false))([]);
+), "CastLiteral", """line 338, column 29 of dart:convert/json.dart: """, __x15 is List<List<int>>, false))([]);
  void addChunk(Uint8List chunk, int start, int end) {
 if (start > 0 || end < chunk.length) {
 int length = end - start;
  chunk = new Uint8List.view(chunk.buffer, chunk.offsetInBytes + start, length);
 }
  bytes.add(chunk);
 }
- _JsonUtf8Stringifier.stringify(object, _indent, DEVC$RT.cast(_toEncodable, Function, __t14, "CastGeneral", """line 352, column 36 of dart:convert/json.dart: """, _toEncodable is __t14, false), _bufferSize, addChunk);
+ _JsonUtf8Stringifier.stringify(object, _indent, DEVC$RT.cast(_toEncodable, Function, __t13, "CastGeneral", """line 352, column 36 of dart:convert/json.dart: """, _toEncodable is __t13, false), _bufferSize, addChunk);
  if (bytes.length == 1) return bytes[0];
  int length = 0;
  for (int i = 0; i < bytes.length; i++) {
 length += bytes[i].length;
 }
  Uint8List result = new Uint8List(length);
  for (int i = 0, offset = 0; i < bytes.length; i++) {
 var byteList = bytes[i];
  int end = offset + byteList.length;
  result.setRange(offset, end, byteList);
  offset = end;
 }
  return result;
 }
  ChunkedConversionSink<Object> startChunkedConversion(Sink<List<int>> sink) {
 ByteConversionSink byteSink;
  if (sink is ByteConversionSink) {
 byteSink = sink;
 }
  else {
 byteSink = new ByteConversionSink.from(sink);
 }
  return new _JsonUtf8EncoderSink(byteSink, _toEncodable, _indent, _bufferSize);
 }
  Stream<List<int>> bind(Stream<Object> stream) {
-return ((__x17) => DEVC$RT.cast(__x17, DEVC$RT.type((DDC$async$.Stream<dynamic> _) {
+return ((__x16) => DEVC$RT.cast(__x16, DEVC$RT.type((DDC$async$.Stream<dynamic> _) {
 }
 ), DEVC$RT.type((DDC$async$.Stream<List<int>> _) {
 }
-), "CastDynamic", """line 391, column 12 of dart:convert/json.dart: """, __x17 is DDC$async$.Stream<List<int>>, false))(super.bind(stream));
+), "CastDynamic", """line 391, column 12 of dart:convert/json.dart: """, __x16 is DDC$async$.Stream<List<int>>, false))(super.bind(stream));
 }
  Converter<Object, dynamic> fuse(Converter<List<int>, dynamic> other) {
 return super.fuse(other);
 }
 }
  class _JsonEncoderSink extends ChunkedConversionSink<Object> {final String _indent;
  final Function _toEncodable;
  final StringConversionSink _sink;
  bool _isDone = false;
  _JsonEncoderSink(this._sink, this._toEncodable, this._indent);
  void add(Object o) {
 if (_isDone) {
 throw new StateError("Only one call to add allowed");
 }
  _isDone = true;
  ClosableStringSink stringSink = _sink.asStringSink();
- _JsonStringStringifier.printOn(o, stringSink, DEVC$RT.cast(_toEncodable, Function, __t10, "CastGeneral", """line 425, column 51 of dart:convert/json.dart: """, _toEncodable is __t10, false), _indent);
+ _JsonStringStringifier.printOn(o, stringSink, DEVC$RT.cast(_toEncodable, Function, __t9, "CastGeneral", """line 425, column 51 of dart:convert/json.dart: """, _toEncodable is __t9, false), _indent);
  stringSink.close();
 }
  void close() {
 }
 }
  class _JsonUtf8EncoderSink extends ChunkedConversionSink<Object> {final ByteConversionSink _sink;
  final List<int> _indent;
  final Function _toEncodable;
  final int _bufferSize;
  bool _isDone = false;
  _JsonUtf8EncoderSink(this._sink, this._toEncodable, this._indent, this._bufferSize);
  void _addChunk(Uint8List chunk, int start, int end) {
 _sink.addSlice(chunk, start, end, false);
 }
  void add(Object object) {
 if (_isDone) {
 throw new StateError("Only one call to add allowed");
 }
  _isDone = true;
- _JsonUtf8Stringifier.stringify(object, _indent, DEVC$RT.cast(_toEncodable, Function, __t14, "CastGeneral", """line 455, column 53 of dart:convert/json.dart: """, _toEncodable is __t14, false), _bufferSize, _addChunk);
+ _JsonUtf8Stringifier.stringify(object, _indent, DEVC$RT.cast(_toEncodable, Function, __t13, "CastGeneral", """line 455, column 53 of dart:convert/json.dart: """, _toEncodable is __t13, false), _bufferSize, _addChunk);
  _sink.close();
 }
  void close() {
 if (!_isDone) {
 _isDone = true;
  _sink.close();
 }
 }
 }
  class JsonDecoder extends Converter<String, Object> {final _Reviver _reviver;
  const JsonDecoder([reviver(var key, var value)]) : this._reviver = reviver;
  dynamic convert(String input) => _parseJson(input, _reviver);
  external StringConversionSink startChunkedConversion(Sink<Object> sink);
- Stream<Object> bind(Stream<String> stream) => ((__x18) => DEVC$RT.cast(__x18, DEVC$RT.type((DDC$async$.Stream<dynamic> _) {
+ Stream<Object> bind(Stream<String> stream) => ((__x17) => DEVC$RT.cast(__x17, DEVC$RT.type((DDC$async$.Stream<dynamic> _) {
 }
 ), DEVC$RT.type((DDC$async$.Stream<Object> _) {
 }
-), "CastDynamic", """line 507, column 49 of dart:convert/json.dart: """, __x18 is DDC$async$.Stream<Object>, false))(super.bind(stream));
+), "CastDynamic", """line 507, column 49 of dart:convert/json.dart: """, __x17 is DDC$async$.Stream<Object>, false))(super.bind(stream));
 }
  external _parseJson(String source, reviver(key, value)) ;
  Object _defaultToEncodable(object) => object.toJson();
  abstract class _JsonStringifier {static const int BACKSPACE = 0x08;
  static const int TAB = 0x09;
  static const int NEWLINE = 0x0a;
  static const int CARRIAGE_RETURN = 0x0d;
  static const int FORM_FEED = 0x0c;
  static const int QUOTE = 0x22;
  static const int CHAR_0 = 0x30;
  static const int BACKSLASH = 0x5c;
  static const int CHAR_b = 0x62;
  static const int CHAR_f = 0x66;
  static const int CHAR_n = 0x6e;
  static const int CHAR_r = 0x72;
  static const int CHAR_t = 0x74;
  static const int CHAR_u = 0x75;
  final List _seen = new List();
  final Function _toEncodable;
- _JsonStringifier(Object _toEncodable(Object o)) : _toEncodable = ((__x19) => DEVC$RT.cast(__x19, dynamic, Function, "CastGeneral", """line 547, column 24 of dart:convert/json.dart: """, __x19 is Function, true))((_toEncodable != null) ? _toEncodable : _defaultToEncodable);
+ _JsonStringifier(Object _toEncodable(Object o)) : _toEncodable = ((__x18) => DEVC$RT.cast(__x18, dynamic, Function, "CastGeneral", """line 547, column 24 of dart:convert/json.dart: """, __x18 is Function, true))((_toEncodable != null) ? _toEncodable : _defaultToEncodable);
  void writeString(String characters);
  void writeStringSlice(String characters, int start, int end);
  void writeCharCode(int charCode);
  void writeNumber(num number);
  static int hexDigit(int x) => x < 10 ? 48 + x : 87 + x;
  void writeStringContent(String s) {
 int offset = 0;
  final int length = s.length;
  for (int i = 0; i < length; i++) {
 int charCode = s.codeUnitAt(i);
@@ skipping 150 matching lines @@
 }
 }
  void writeMap(Map map) {
 if (map.isEmpty) {
 writeString('{}');
 }
  else {
 writeString('{\n');
  _indentLevel++;
  bool first = true;
- map.forEach(((__x28) => DEVC$RT.wrap((dynamic f(String __u20, Object __u21)) {
+ map.forEach(((__x27) => DEVC$RT.wrap((dynamic f(String __u19, Object __u20)) {
 dynamic c(String x0, Object x1) => f(DEVC$RT.cast(x0, dynamic, String, "CastParam", """line 773, column 19 of dart:convert/json.dart: """, x0 is String, true), x1);
  return f == null ? null : c;
 }
-, __x28, __t25, __t22, "WrapLiteral", """line 773, column 19 of dart:convert/json.dart: """, __x28 is __t22))((String key, Object value) {
+, __x27, __t24, __t21, "WrapLiteral", """line 773, column 19 of dart:convert/json.dart: """, __x27 is __t21))((String key, Object value) {
 if (!first) {
 writeString(",\n");
 }
  writeIndentation(_indentLevel);
  writeString('"');
  writeStringContent(key);
  writeString('": ');
  writeObject(value);
  first = false;
 }
 ));
  writeString('\n');
  _indentLevel--;
  writeIndentation(_indentLevel);
  writeString('}');
 }
 }
 }
  class _JsonStringStringifier extends _JsonStringifier {final StringSink _sink;
- _JsonStringStringifier(this._sink, _toEncodable) : super(DEVC$RT.cast(_toEncodable, dynamic, __t8, "CastGeneral", """line 798, column 60 of dart:convert/json.dart: """, _toEncodable is __t8, false));
+ _JsonStringStringifier(this._sink, _toEncodable) : super(DEVC$RT.cast(_toEncodable, dynamic, __t7, "CastGeneral", """line 798, column 60 of dart:convert/json.dart: """, _toEncodable is __t7, false));
  static String stringify(object, toEncodable(object), String indent) {
 StringBuffer output = new StringBuffer();
  printOn(object, output, toEncodable, indent);
  return output.toString();
 }
  static void printOn(object, StringSink output, toEncodable(object), String indent) {
 var stringifier;
  if (indent == null) {
 stringifier = new _JsonStringStringifier(output, toEncodable);
 }
@@ skipping 18 matching lines @@
  class _JsonStringStringifierPretty extends _JsonStringStringifier with _JsonPrettyPrintMixin {final String _indent;
  _JsonStringStringifierPretty(StringSink sink, Function toEncodable, this._indent) : super(sink, toEncodable);
  void writeIndentation(int count) {
 for (int i = 0; i < count; i++) writeString(_indent);
 }
 }
  class _JsonUtf8Stringifier extends _JsonStringifier {final int bufferSize;
  final Function addChunk;
  Uint8List buffer;
  int index = 0;
- _JsonUtf8Stringifier(toEncodable, int bufferSize, this.addChunk) : super(DEVC$RT.cast(toEncodable, dynamic, __t8, "CastGeneral", """line 874, column 15 of dart:convert/json.dart: """, toEncodable is __t8, false)), this.bufferSize = bufferSize, buffer = new Uint8List(bufferSize);
+ _JsonUtf8Stringifier(toEncodable, int bufferSize, this.addChunk) : super(DEVC$RT.cast(toEncodable, dynamic, __t7, "CastGeneral", """line 874, column 15 of dart:convert/json.dart: """, toEncodable is __t7, false)), this.bufferSize = bufferSize, buffer = new Uint8List(bufferSize);
  static void stringify(Object object, List<int> indent, toEncodableFunction(Object o), int bufferSize, void addChunk(Uint8List chunk, int start, int end)) {
 _JsonUtf8Stringifier stringifier;
  if (indent != null) {
 stringifier = new _JsonUtf8StringifierPretty(toEncodableFunction, indent, bufferSize, addChunk);
 }
  else {
 stringifier = new _JsonUtf8Stringifier(toEncodableFunction, bufferSize, addChunk);
 }
  stringifier.writeObject(object);
  stringifier.flush();
@@ skipping 90 matching lines @@
  index = end;
 }
  else {
 for (int i = 0; i < indentLength; i++) {
 writeByte(indent[i]);
 }
 }
 }
 }
 }
- typedef Object __t8(Object __u9);
- typedef dynamic __t10(dynamic __u11);
- typedef dynamic __t14(Object __u15);
- typedef void __t22(dynamic __u23, dynamic __u24);
- typedef dynamic __t25(String __u26, Object __u27);
+ typedef Object __t7(Object __u8);
+ typedef dynamic __t9(dynamic __u10);
+ typedef dynamic __t13(Object __u14);
+ typedef void __t21(dynamic __u22, dynamic __u23);
+ typedef dynamic __t24(String __u25, Object __u26);