more care around generated names, fixes #60 #82 and #97

lib/runtime/dart/convert.js

 var convert;
 (function(exports) {
   'use strict';
   let ASCII = new AsciiCodec();
   let _ASCII_MASK = 127;
   let _allowInvalid = Symbol('_allowInvalid');
   let Codec$ = dart.generic(function(S, T) {
     class Codec extends core.Object {
       Codec() {
       }
@@ skipping 27 matching lines @@
       return _nameToEncoding.get(name);
     }
   }
   dart.defineLazyProperties(Encoding, {
     get _nameToEncoding() {
       return dart.map({"iso_8859-1:1987": LATIN1, "iso-ir-100": LATIN1, "iso_8859-1": LATIN1, "iso-8859-1": LATIN1, latin1: LATIN1, l1: LATIN1, ibm819: LATIN1, cp819: LATIN1, csisolatin1: LATIN1, "iso-ir-6": ASCII, "ansi_x3.4-1968": ASCII, "ansi_x3.4-1986": ASCII, "iso_646.irv:1991": ASCII, "iso646-us": ASCII, "us-ascii": ASCII, us: ASCII, ibm367: ASCII, cp367: ASCII, csascii: ASCII, ascii: ASCII, csutf8: UTF8, "utf-8": UTF8});
     },
     set _nameToEncoding(_) {}
   });
   class AsciiCodec extends Encoding {
-    AsciiCodec(opt$) {
-      let allowInvalid = opt$ && 'allowInvalid' in opt$ ? opt$.allowInvalid : false;
+    AsciiCodec(opts) {
+      let allowInvalid = opts && 'allowInvalid' in opts ? opts.allowInvalid : false;
       this[_allowInvalid] = allowInvalid;
       super.Encoding();
     }
     get name() {
       return "us-ascii";
     }
-    decode(bytes, opt$) {
-      let allowInvalid = opt$ && 'allowInvalid' in opt$ ? opt$.allowInvalid : null;
+    decode(bytes, opts) {
+      let allowInvalid = opts && 'allowInvalid' in opts ? opts.allowInvalid : null;
       if (allowInvalid === null)
         allowInvalid = this[_allowInvalid];
       if (allowInvalid) {
         return new AsciiDecoder({allowInvalid: true}).convert(bytes);
       } else {
         return new AsciiDecoder({allowInvalid: false}).convert(bytes);
       }
     }
     get encoder() {
       return new AsciiEncoder();
@@ skipping 14 matching lines @@
         throw new core.UnsupportedError(`This converter does not support chunked conversions: ${this}`);
       }
       bind(source) {
         return new async.Stream.eventTransformed(source, ((sink) => new _ConverterStreamEventSink(this, sink)).bind(this));
       }
     }
     return Converter;
   });
   let Converter = Converter$(dart.dynamic, dart.dynamic);
   class _UnicodeSubsetEncoder extends Converter$(core.String, core.List$(core.int)) {
-    _UnicodeSubsetEncoder($_subsetMask) {
-      this[_subsetMask] = $_subsetMask;
+    _UnicodeSubsetEncoder(subsetMask) {
+      this[_subsetMask] = subsetMask;
       super.Converter();
     }
     convert(string, start, end) {
       if (start === void 0)
         start = 0;
       if (end === void 0)
         end = null;
       let stringLength = string.length;
       core.RangeError.checkValidRange(start, end, stringLength);
       if (end === null)
@@ skipping 32 matching lines @@
     asUtf8Sink(allowMalformed) {
       return new _Utf8ConversionSink(this, allowMalformed);
     }
     asStringSink() {
       return new _StringConversionSinkAsStringSinkAdapter(this);
     }
   }
   class StringConversionSinkBase extends StringConversionSinkMixin {
   }
   class _UnicodeSubsetEncoderSink extends StringConversionSinkBase {
-    _UnicodeSubsetEncoderSink($_subsetMask, $_sink) {
-      this[_subsetMask] = $_subsetMask;
-      this[_sink] = $_sink;
+    _UnicodeSubsetEncoderSink(subsetMask, sink$) {
+      this[_subsetMask] = subsetMask;
+      this[_sink] = sink$;
       super.StringConversionSinkBase();
     }
     close() {
       this[_sink].close();
     }
     addSlice(source, start, end, isLast) {
       core.RangeError.checkValidRange(start, end, source.length);
       for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
         let codeUnit = source.codeUnitAt(i);
         if ((dart.notNull(codeUnit) & ~dart.notNull(this[_subsetMask])) !== 0) {
           throw new core.ArgumentError(`Source contains invalid character with code point: ${codeUnit}.`);
         }
       }
       this[_sink].add(source.codeUnits.sublist(start, end));
       if (isLast) {
         this.close();
       }
     }
   }
   let _convertInvalid = Symbol('_convertInvalid');
   class _UnicodeSubsetDecoder extends Converter$(core.List$(core.int), core.String) {
-    _UnicodeSubsetDecoder($_allowInvalid, $_subsetMask) {
-      this[_allowInvalid] = $_allowInvalid;
-      this[_subsetMask] = $_subsetMask;
+    _UnicodeSubsetDecoder(allowInvalid$, subsetMask) {
+      this[_allowInvalid] = allowInvalid$;
+      this[_subsetMask] = subsetMask;
       super.Converter();
     }
     convert(bytes, start, end) {
       if (start === void 0)
         start = 0;
       if (end === void 0)
         end = null;
       let byteCount = bytes.length;
       core.RangeError.checkValidRange(start, end, byteCount);
       if (end === null)
@@ skipping 18 matching lines @@
           value = 65533;
         buffer.writeCharCode(value);
       }
       return buffer.toString();
     }
     bind(stream) {
       return dart.as(super.bind(stream), async.Stream$(core.String));
     }
   }
   class AsciiDecoder extends _UnicodeSubsetDecoder {
-    AsciiDecoder(opt$) {
-      let allowInvalid = opt$ && 'allowInvalid' in opt$ ? opt$.allowInvalid : false;
+    AsciiDecoder(opts) {
+      let allowInvalid = opts && 'allowInvalid' in opts ? opts.allowInvalid : false;
       super._UnicodeSubsetDecoder(allowInvalid, _ASCII_MASK);
     }
     startChunkedConversion(sink) {
       let stringSink = null;
       if (dart.is(sink, StringConversionSink)) {
         stringSink = sink;
       } else {
         stringSink = new StringConversionSink.from(sink);
       }
       if (this[_allowInvalid]) {
@@ skipping 30 matching lines @@
   dart.defineNamedConstructor(ByteConversionSink, 'withCallback');
   dart.defineNamedConstructor(ByteConversionSink, 'from');
   class ByteConversionSinkBase extends ByteConversionSink {
     addSlice(chunk, start, end, isLast) {
       this.add(chunk.sublist(start, end));
       if (isLast)
         this.close();
     }
   }
   class _ErrorHandlingAsciiDecoderSink extends ByteConversionSinkBase {
-    _ErrorHandlingAsciiDecoderSink($_utf8Sink) {
-      this[_utf8Sink] = $_utf8Sink;
+    _ErrorHandlingAsciiDecoderSink(utf8Sink) {
+      this[_utf8Sink] = utf8Sink;
       super.ByteConversionSinkBase();
     }
     close() {
       this[_utf8Sink].close();
     }
     add(source) {
       this.addSlice(source, 0, source.length, false);
     }
     addSlice(source, start, end, isLast) {
       core.RangeError.checkValidRange(start, end, source.length);
       for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
         if ((dart.notNull(source.get(i)) & ~dart.notNull(_ASCII_MASK)) !== 0) {
           if (dart.notNull(i) > dart.notNull(start))
             this[_utf8Sink].addSlice(source, start, i, false);
           this[_utf8Sink].add(/* Unimplemented const */new List.from([239, 191, 189]));
           start = dart.notNull(i) + 1;
         }
       }
       if (dart.notNull(start) < dart.notNull(end)) {
         this[_utf8Sink].addSlice(source, start, end, isLast);
       } else if (isLast) {
         this.close();
       }
     }
   }
   class _SimpleAsciiDecoderSink extends ByteConversionSinkBase {
-    _SimpleAsciiDecoderSink($_sink) {
-      this[_sink] = $_sink;
+    _SimpleAsciiDecoderSink(sink$) {
+      this[_sink] = sink$;
       super.ByteConversionSinkBase();
     }
     close() {
       this[_sink].close();
     }
     add(source) {
       for (let i = 0; dart.notNull(i) < dart.notNull(source.length); i = dart.notNull(i) + 1) {
         if ((dart.notNull(source.get(i)) & ~dart.notNull(_ASCII_MASK)) !== 0) {
           throw new core.FormatException("Source contains non-ASCII bytes.");
         }
       }
       this[_sink].add(new core.String.fromCharCodes(source));
     }
     addSlice(source, start, end, isLast) {
       let length = source.length;
       core.RangeError.checkValidRange(start, end, length);
       if (dart.notNull(start) < dart.notNull(end)) {
         if (start !== 0 || end !== length) {
           source = source.sublist(start, end);
         }
         this.add(source);
       }
       if (isLast)
         this.close();
     }
   }
   class _ByteAdapterSink extends ByteConversionSinkBase {
-    _ByteAdapterSink($_sink) {
-      this[_sink] = $_sink;
+    _ByteAdapterSink(sink$) {
+      this[_sink] = sink$;
       super.ByteConversionSinkBase();
     }
     add(chunk) {
       return this[_sink].add(chunk);
     }
     close() {
       return this[_sink].close();
     }
   }
   let _buffer = Symbol('_buffer');
   let _callback = Symbol('_callback');
   let _bufferIndex = Symbol('_bufferIndex');
-  let _roundToPowerOf2 = Symbol('_roundToPowerOf2');
+  let _roundToPowerOf2$ = Symbol('_roundToPowerOf2');
   class _ByteCallbackSink extends ByteConversionSinkBase {
     _ByteCallbackSink(callback) {
       this[_buffer] = new typed_data.Uint8List(_ByteCallbackSink._INITIAL_BUFFER_SIZE);
       this[_callback] = callback;
       this[_bufferIndex] = 0;
       super.ByteConversionSinkBase();
     }
     add(chunk) {
       let freeCount = dart.notNull(this[_buffer].length) - dart.notNull(this[_bufferIndex]);
       if (dart.notNull(chunk.length) > dart.notNull(freeCount)) {
         let oldLength = this[_buffer].length;
         let newLength = dart.notNull(_roundToPowerOf2(dart.notNull(chunk.length) + dart.notNull(oldLength))) * 2;
         let grown = new typed_data.Uint8List(newLength);
         grown.setRange(0, this[_buffer].length, this[_buffer]);
         this[_buffer] = grown;
       }
       this[_buffer].setRange(this[_bufferIndex], dart.notNull(this[_bufferIndex]) + dart.notNull(chunk.length), chunk);
       this[_bufferIndex] = chunk.length;
     }
-    static [_roundToPowerOf2](v) {
+    static [_roundToPowerOf2$](v) {
       dart.assert(dart.notNull(v) > 0);
       v = dart.notNull(v) - 1;
       v = dart.notNull(v) >> 1;
       v = dart.notNull(v) >> 2;
       v = dart.notNull(v) >> 4;
       v = dart.notNull(v) >> 8;
       v = dart.notNull(v) >> 16;
       v = dart.notNull(v) + 1;
       return v;
     }
     close() {
       this[_callback](this[_buffer].sublist(0, this[_bufferIndex]));
     }
   }
   _ByteCallbackSink._INITIAL_BUFFER_SIZE = 1024;
   let _accumulated = Symbol('_accumulated');
   let _SimpleCallbackSink$ = dart.generic(function(T) {
     class _SimpleCallbackSink extends ChunkedConversionSink$(T) {
-      _SimpleCallbackSink($_callback) {
+      _SimpleCallbackSink(callback$) {
         this[_accumulated] = new List.from([]);
-        this[_callback] = $_callback;
+        this[_callback] = callback$;
         super.ChunkedConversionSink();
       }
       add(chunk) {
         this[_accumulated].add(chunk);
       }
       close() {
         this[_callback](this[_accumulated]);
       }
     }
     return _SimpleCallbackSink;
   });
   let _SimpleCallbackSink = _SimpleCallbackSink$(dart.dynamic);
   let _EventSinkAdapter$ = dart.generic(function(T) {
     class _EventSinkAdapter extends core.Object {
-      _EventSinkAdapter($_sink) {
-        this[_sink] = $_sink;
+      _EventSinkAdapter(sink$) {
+        this[_sink] = sink$;
       }
       add(data) {
         return this[_sink].add(data);
       }
       close() {
         return this[_sink].close();
       }
     }
     return _EventSinkAdapter;
   });
@@ skipping 24 matching lines @@
   let _first = Symbol('_first');
   let _second = Symbol('_second');
   let _FusedCodec$ = dart.generic(function(S, M, T) {
     class _FusedCodec extends Codec$(S, T) {
       get encoder() {
         return dart.as(this[_first].encoder.fuse(this[_second].encoder), Converter$(S, T));
       }
       get decoder() {
         return dart.as(this[_second].decoder.fuse(this[_first].decoder), Converter$(T, S));
       }
-      _FusedCodec($_first, $_second) {
-        this[_first] = $_first;
-        this[_second] = $_second;
+      _FusedCodec(first$, second) {
+        this[_first] = first$;
+        this[_second] = second;
         super.Codec();
       }
     }
     return _FusedCodec;
   });
   let _FusedCodec = _FusedCodec$(dart.dynamic, dart.dynamic, dart.dynamic);
   let _codec = Symbol('_codec');
   let _InvertedCodec$ = dart.generic(function(T, S) {
     class _InvertedCodec extends Codec$(T, S) {
       _InvertedCodec(codec) {
         this[_codec] = codec;
         super.Codec();
       }
       get encoder() {
         return this[_codec].decoder;
       }
       get decoder() {
         return this[_codec].encoder;
       }
       get inverted() {
         return this[_codec];
       }
     }
     return _InvertedCodec;
   });
   let _InvertedCodec = _InvertedCodec$(dart.dynamic, dart.dynamic);
   let _FusedConverter$ = dart.generic(function(S, M, T) {
     class _FusedConverter extends Converter$(S, T) {
-      _FusedConverter($_first, $_second) {
-        this[_first] = $_first;
-        this[_second] = $_second;
+      _FusedConverter(first$, second) {
+        this[_first] = first$;
+        this[_second] = second;
         super.Converter();
       }
       convert(input) {
         return dart.as(this[_second].convert(this[_first].convert(input)), T);
       }
       startChunkedConversion(sink) {
         return this[_first].startChunkedConversion(this[_second].startChunkedConversion(sink));
       }
     }
     return _FusedConverter;
   });
   let _FusedConverter = _FusedConverter$(dart.dynamic, dart.dynamic, dart.dynamic);
   let HTML_ESCAPE = new HtmlEscape();
   let _name = Symbol('_name');
   class HtmlEscapeMode extends core.Object {
-    HtmlEscapeMode$_($_name, escapeLtGt, escapeQuot, escapeApos, escapeSlash) {
-      this[_name] = $_name;
+    HtmlEscapeMode$_(name$, escapeLtGt, escapeQuot, escapeApos, escapeSlash) {
+      this[_name] = name$;
       this.escapeLtGt = escapeLtGt;
       this.escapeQuot = escapeQuot;
       this.escapeApos = escapeApos;
       this.escapeSlash = escapeSlash;
     }
     toString() {
       return this[_name];
     }
   }
   dart.defineNamedConstructor(HtmlEscapeMode, '_');
@@ skipping 57 matching lines @@
     }
     startChunkedConversion(sink) {
       if (!dart.is(sink, StringConversionSink)) {
         sink = new StringConversionSink.from(sink);
       }
       return new _HtmlEscapeSink(this, dart.as(sink, StringConversionSink));
     }
   }
   let _escape = Symbol('_escape');
   class _HtmlEscapeSink extends StringConversionSinkBase {
-    _HtmlEscapeSink($_escape, $_sink) {
-      this[_escape] = $_escape;
-      this[_sink] = $_sink;
+    _HtmlEscapeSink(escape, sink$) {
+      this[_escape] = escape;
+      this[_sink] = sink$;
       super.StringConversionSinkBase();
     }
     addSlice(chunk, start, end, isLast) {
       let val = this[_escape]._convert(chunk, start, end);
       if (val === null) {
         this[_sink].addSlice(chunk, start, end, isLast);
       } else {
         this[_sink].add(val);
         if (isLast)
           this[_sink].close();
       }
     }
     close() {
       return this[_sink].close();
     }
   }
   class JsonUnsupportedObjectError extends core.Error {
-    JsonUnsupportedObjectError(unsupportedObject, opt$) {
-      let cause = opt$ && 'cause' in opt$ ? opt$.cause : null;
+    JsonUnsupportedObjectError(unsupportedObject, opts) {
+      let cause = opts && 'cause' in opts ? opts.cause : null;
       this.unsupportedObject = unsupportedObject;
       this.cause = cause;
       super.Error();
     }
     toString() {
       if (this.cause !== null) {
         return "Converting object to an encodable object failed.";
       } else {
         return "Converting object did not return an encodable object.";
       }
     }
   }
   class JsonCyclicError extends JsonUnsupportedObjectError {
     JsonCyclicError(object) {
       super.JsonUnsupportedObjectError(object);
     }
     toString() {
       return "Cyclic error in JSON stringify";
     }
   }
   let JSON = new JsonCodec();
   let _reviver = Symbol('_reviver');
-  let _toEncodable = Symbol('_toEncodable');
+  let _toEncodable$ = Symbol('_toEncodable');
   class JsonCodec extends Codec$(core.Object, core.String) {
-    JsonCodec(opt$) {
-      let reviver = opt$ && 'reviver' in opt$ ? opt$.reviver : null;
-      let toEncodable = opt$ && 'toEncodable' in opt$ ? opt$.toEncodable : null;
+    JsonCodec(opts) {
+      let reviver = opts && 'reviver' in opts ? opts.reviver : null;
+      let toEncodable = opts && 'toEncodable' in opts ? opts.toEncodable : null;
       this[_reviver] = reviver;
-      this[_toEncodable] = toEncodable;
+      this[_toEncodable$] = toEncodable;
       super.Codec();
     }
     JsonCodec$withReviver(reviver) {
       this.JsonCodec({reviver: reviver});
     }
-    decode(source, opt$) {
-      let reviver = opt$ && 'reviver' in opt$ ? opt$.reviver : null;
+    decode(source, opts) {
+      let reviver = opts && 'reviver' in opts ? opts.reviver : null;
       if (reviver === null)
         reviver = this[_reviver];
       if (reviver === null)
         return this.decoder.convert(source);
       return new JsonDecoder(reviver).convert(source);
     }
-    encode(value, opt$) {
-      let toEncodable = opt$ && 'toEncodable' in opt$ ? opt$.toEncodable : null;
+    encode(value, opts) {
+      let toEncodable = opts && 'toEncodable' in opts ? opts.toEncodable : null;
       if (toEncodable === null)
-        toEncodable = this[_toEncodable];
+        toEncodable = this[_toEncodable$];
       if (toEncodable === null)
         return this.encoder.convert(value);
       return new JsonEncoder(dart.closureWrap(toEncodable, "(Object) → Object")).convert(value);
     }
     get encoder() {
-      if (this[_toEncodable] === null)
+      if (this[_toEncodable$] === null)
         return new JsonEncoder();
-      return new JsonEncoder(dart.closureWrap(this[_toEncodable], "(Object) → Object"));
+      return new JsonEncoder(dart.closureWrap(this[_toEncodable$], "(Object) → Object"));
     }
     get decoder() {
       if (this[_reviver] === null)
         return new JsonDecoder();
       return new JsonDecoder(this[_reviver]);
     }
   }
   dart.defineNamedConstructor(JsonCodec, 'withReviver');
   class JsonEncoder extends Converter$(core.Object, core.String) {
     JsonEncoder(toEncodable) {
       if (toEncodable === void 0)
         toEncodable = null;
       this.indent = null;
-      this[_toEncodable] = toEncodable;
+      this[_toEncodable$] = toEncodable;
       super.Converter();
     }
     JsonEncoder$withIndent(indent, toEncodable) {
       if (toEncodable === void 0)
         toEncodable = null;
       this.indent = indent;
-      this[_toEncodable] = toEncodable;
+      this[_toEncodable$] = toEncodable;
       super.Converter();
     }
     convert(object) {
-      return _JsonStringStringifier.stringify(object, dart.as(this[_toEncodable], dart.throw_("Unimplemented type (dynamic) → dynamic")), this.indent);
+      return _JsonStringStringifier.stringify(object, dart.as(this[_toEncodable$], dart.throw_("Unimplemented type (dynamic) → dynamic")), this.indent);
     }
     startChunkedConversion(sink) {
       if (!dart.is(sink, StringConversionSink)) {
         sink = new StringConversionSink.from(sink);
       } else if (dart.is(sink, _Utf8EncoderSink)) {
-        return new _JsonUtf8EncoderSink(sink[_sink], this[_toEncodable], JsonUtf8Encoder._utf8Encode(this.indent), JsonUtf8Encoder.DEFAULT_BUFFER_SIZE);
+        return new _JsonUtf8EncoderSink(sink[_sink], this[_toEncodable$], JsonUtf8Encoder._utf8Encode(this.indent), JsonUtf8Encoder.DEFAULT_BUFFER_SIZE);
       }
-      return new _JsonEncoderSink(dart.as(sink, StringConversionSink), this[_toEncodable], this.indent);
+      return new _JsonEncoderSink(dart.as(sink, StringConversionSink), this[_toEncodable$], this.indent);
     }
     bind(stream) {
       return dart.as(super.bind(stream), async.Stream$(core.String));
     }
     fuse(other) {
       if (dart.is(other, Utf8Encoder)) {
-        return new JsonUtf8Encoder(this.indent, dart.as(this[_toEncodable], dart.throw_("Unimplemented type (Object) → dynamic")));
+        return new JsonUtf8Encoder(this.indent, dart.as(this[_toEncodable$], dart.throw_("Unimplemented type (Object) → dynamic")));
       }
       return super.fuse(other);
     }
   }
   dart.defineNamedConstructor(JsonEncoder, 'withIndent');
   let _indent = Symbol('_indent');
   let _bufferSize = Symbol('_bufferSize');
-  let _utf8Encode = Symbol('_utf8Encode');
+  let _utf8Encode$ = Symbol('_utf8Encode');
   class JsonUtf8Encoder extends Converter$(core.Object, core.List$(core.int)) {
     JsonUtf8Encoder(indent, toEncodable, bufferSize) {
       if (indent === void 0)
         indent = null;
       if (toEncodable === void 0)
         toEncodable = null;
       if (bufferSize === void 0)
         bufferSize = JsonUtf8Encoder.DEFAULT_BUFFER_SIZE;
       this[_indent] = _utf8Encode(indent);
-      this[_toEncodable] = toEncodable;
+      this[_toEncodable$] = toEncodable;
       this[_bufferSize] = bufferSize;
       super.Converter();
     }
-    static [_utf8Encode](string) {
+    static [_utf8Encode$](string) {
       if (string === null)
         return null;
       if (string.isEmpty)
         return new typed_data.Uint8List(0);
       checkAscii: {
         for (let i = 0; dart.notNull(i) < dart.notNull(string.length); i = dart.notNull(i) + 1) {
           if (dart.notNull(string.codeUnitAt(i)) >= 128)
             break checkAscii;
         }
         return string.codeUnits;
       }
       return UTF8.encode(string);
     }
     convert(object) {
       let bytes = dart.as(new List.from([]), core.List$(core.List$(core.int)));
       // Function addChunk: (Uint8List, int, int) → void
       function addChunk(chunk, start, end) {
         if (dart.notNull(start) > 0 || dart.notNull(end) < dart.notNull(chunk.length)) {
           let length = dart.notNull(end) - dart.notNull(start);
           chunk = new typed_data.Uint8List.view(chunk.buffer, dart.notNull(chunk.offsetInBytes) + dart.notNull(start), length);
         }
         bytes.add(chunk);
       }
-      _JsonUtf8Stringifier.stringify(object, this[_indent], dart.as(this[_toEncodable], dart.throw_("Unimplemented type (Object) → dynamic")), this[_bufferSize], addChunk);
+      _JsonUtf8Stringifier.stringify(object, this[_indent], dart.as(this[_toEncodable$], dart.throw_("Unimplemented type (Object) → dynamic")), this[_bufferSize], addChunk);
       if (bytes.length === 1)
         return bytes.get(0);
       let length = 0;
       for (let i = 0; dart.notNull(i) < dart.notNull(bytes.length); i = dart.notNull(i) + 1) {
         length = bytes.get(i).length;
       }
       let result = new typed_data.Uint8List(length);
       for (let i = 0, offset = 0; dart.notNull(i) < dart.notNull(bytes.length); i = dart.notNull(i) + 1) {
         let byteList = bytes.get(i);
         let end = dart.notNull(offset) + dart.notNull(byteList.length);
         result.setRange(offset, end, byteList);
         offset = end;
       }
       return result;
     }
     startChunkedConversion(sink) {
       let byteSink = null;
       if (dart.is(sink, ByteConversionSink)) {
         byteSink = sink;
       } else {
         byteSink = new ByteConversionSink.from(sink);
       }
-      return new _JsonUtf8EncoderSink(byteSink, this[_toEncodable], this[_indent], this[_bufferSize]);
+      return new _JsonUtf8EncoderSink(byteSink, this[_toEncodable$], this[_indent], this[_bufferSize]);
     }
     bind(stream) {
       return dart.as(super.bind(stream), async.Stream$(core.List$(core.int)));
     }
     fuse(other) {
       return super.fuse(other);
     }
   }
   JsonUtf8Encoder.DEFAULT_BUFFER_SIZE = 256;
   let _isDone = Symbol('_isDone');
   class _JsonEncoderSink extends ChunkedConversionSink$(core.Object) {
-    _JsonEncoderSink($_sink, $_toEncodable, $_indent) {
-      this[_sink] = $_sink;
-      this[_toEncodable] = $_toEncodable;
-      this[_indent] = $_indent;
+    _JsonEncoderSink(sink$, toEncodable$, indent$) {
+      this[_sink] = sink$;
+      this[_toEncodable$] = toEncodable$;
+      this[_indent] = indent$;
       this[_isDone] = false;
       super.ChunkedConversionSink();
     }
     add(o) {
       if (this[_isDone]) {
         throw new core.StateError("Only one call to add allowed");
       }
       this[_isDone] = true;
       let stringSink = this[_sink].asStringSink();
-      _JsonStringStringifier.printOn(o, stringSink, dart.as(this[_toEncodable], dart.throw_("Unimplemented type (dynamic) → dynamic")), this[_indent]);
+      _JsonStringStringifier.printOn(o, stringSink, dart.as(this[_toEncodable$], dart.throw_("Unimplemented type (dynamic) → dynamic")), this[_indent]);
       stringSink.close();
     }
     close() {}
   }
   let _addChunk = Symbol('_addChunk');
   class _JsonUtf8EncoderSink extends ChunkedConversionSink$(core.Object) {
-    _JsonUtf8EncoderSink($_sink, $_toEncodable, $_indent, $_bufferSize) {
-      this[_sink] = $_sink;
-      this[_toEncodable] = $_toEncodable;
-      this[_indent] = $_indent;
-      this[_bufferSize] = $_bufferSize;
+    _JsonUtf8EncoderSink(sink$, toEncodable$, indent$, bufferSize$) {
+      this[_sink] = sink$;
+      this[_toEncodable$] = toEncodable$;
+      this[_indent] = indent$;
+      this[_bufferSize] = bufferSize$;
       this[_isDone] = false;
       super.ChunkedConversionSink();
     }
     [_addChunk](chunk, start, end) {
       this[_sink].addSlice(chunk, start, end, false);
     }
     add(object) {
       if (this[_isDone]) {
         throw new core.StateError("Only one call to add allowed");
       }
       this[_isDone] = true;
-      _JsonUtf8Stringifier.stringify(object, this[_indent], dart.as(this[_toEncodable], dart.throw_("Unimplemented type (Object) → dynamic")), this[_bufferSize], this[_addChunk]);
+      _JsonUtf8Stringifier.stringify(object, this[_indent], dart.as(this[_toEncodable$], dart.throw_("Unimplemented type (Object) → dynamic")), this[_bufferSize], this[_addChunk]);
       this[_sink].close();
     }
     close() {
       if (!dart.notNull(this[_isDone])) {
         this[_isDone] = true;
         this[_sink].close();
       }
     }
   }
   class JsonDecoder extends Converter$(core.String, core.Object) {
@@ skipping 33 matching lines @@
   // Function _defaultToEncodable: (dynamic) → Object
   function _defaultToEncodable(object) {
     return dart.dinvoke(object, 'toJson');
   }
   let _seen = Symbol('_seen');
   let _checkCycle = Symbol('_checkCycle');
   let _removeSeen = Symbol('_removeSeen');
   class _JsonStringifier extends core.Object {
     _JsonStringifier(_toEncodable) {
       this[_seen] = new core.List();
-      this[_toEncodable] = dart.as(_toEncodable !== null ? _toEncodable : _defaultToEncodable, core.Function);
+      this[_toEncodable$] = dart.as(_toEncodable !== null ? _toEncodable : _defaultToEncodable, core.Function);
     }
     static hexDigit(x) {
       return dart.notNull(x) < 10 ? 48 + dart.notNull(x) : 87 + dart.notNull(x);
     }
     writeStringContent(s) {
       let offset = 0;
       let length = s.length;
       for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
         let charCode = s.codeUnitAt(i);
         if (dart.notNull(charCode) > dart.notNull(_JsonStringifier.BACKSLASH))
@@ skipping 52 matching lines @@
     [_removeSeen](object) {
       dart.assert(!dart.notNull(this[_seen].isEmpty));
       dart.assert(core.identical(this[_seen].last, object));
       this[_seen].removeLast();
     }
     writeObject(object) {
       if (this.writeJsonValue(object))
         return;
       this[_checkCycle](object);
       try {
-        let customJson = dart.dinvokef(this[_toEncodable], object);
+        let customJson = dart.dinvokef(this[_toEncodable$], object);
         if (!dart.notNull(this.writeJsonValue(customJson))) {
           throw new JsonUnsupportedObjectError(object);
         }
         this[_removeSeen](object);
       } catch (e) {
         throw new JsonUnsupportedObjectError(object, {cause: e});
       }
 
     }
     writeJsonValue(object) {
@@ skipping 111 matching lines @@
           first = false;
         }).bind(this));
         this.writeString('\n');
         this[_indentLevel] = dart.notNull(this[_indentLevel]) - 1;
         this.writeIndentation(this[_indentLevel]);
         this.writeString('}');
       }
     }
   }
   class _JsonStringStringifier extends _JsonStringifier {
-    _JsonStringStringifier($_sink, _toEncodable) {
-      this[_sink] = $_sink;
+    _JsonStringStringifier(sink$, _toEncodable) {
+      this[_sink] = sink$;
       super._JsonStringifier(dart.as(_toEncodable, dart.throw_("Unimplemented type (Object) → Object")));
     }
     static stringify(object, toEncodable, indent) {
       let output = new core.StringBuffer();
       printOn(object, output, toEncodable, indent);
       return output.toString();
     }
     static printOn(object, output, toEncodable, indent) {
       let stringifier = null;
       if (indent === null) {
@@ skipping 10 matching lines @@
       this[_sink].write(string);
     }
     writeStringSlice(string, start, end) {
       this[_sink].write(string.substring(start, end));
     }
     writeCharCode(charCode) {
       this[_sink].writeCharCode(charCode);
     }
   }
   class _JsonStringStringifierPretty extends dart.mixin(_JsonStringStringifier, _JsonPrettyPrintMixin) {
-    _JsonStringStringifierPretty(sink, toEncodable, $_indent) {
-      this[_indent] = $_indent;
+    _JsonStringStringifierPretty(sink, toEncodable, indent$) {
+      this[_indent] = indent$;
       super._JsonStringStringifier(sink, toEncodable);
     }
     writeIndentation(count) {
       for (let i = 0; dart.notNull(i) < dart.notNull(count); i = dart.notNull(i) + 1)
         this.writeString(this[_indent]);
     }
   }
   class _JsonUtf8Stringifier extends _JsonStringifier {
     _JsonUtf8Stringifier(toEncodable, bufferSize, addChunk) {
       this.addChunk = addChunk;
@@ skipping 79 matching lines @@
       this.writeByte(128 | dart.notNull(charCode) >> 6 & 63);
       this.writeByte(128 | dart.notNull(charCode) & 63);
     }
     writeByte(byte) {
       dart.assert(dart.notNull(byte) <= 255);
       if (this.index === this.buffer.length) {
         dart.dinvokef(this.addChunk, this.buffer, 0, this.index);
         this.buffer = new typed_data.Uint8List(this.bufferSize);
         this.index = 0;
       }
-      this.buffer.set((($tmp) => this.index = dart.notNull($tmp) + 1, $tmp).bind(this)(this.index), byte);
+      this.buffer.set(((x) => this.index = dart.notNull(x$) + 1, x$).bind(this)(this.index), byte);
     }
   }
   class _JsonUtf8StringifierPretty extends dart.mixin(_JsonUtf8Stringifier, _JsonPrettyPrintMixin) {
     _JsonUtf8StringifierPretty(toEncodableFunction, indent, bufferSize, addChunk) {
       this.indent = indent;
       super._JsonUtf8Stringifier(toEncodableFunction, dart.as(bufferSize, core.int), dart.as(addChunk, core.Function));
     }
     writeIndentation(count) {
       let indent = this.indent;
       let indentLength = indent.length;
@@ skipping 15 matching lines @@
           for (let i = 0; dart.notNull(i) < dart.notNull(indentLength); i = dart.notNull(i) + 1) {
             this.writeByte(indent.get(i));
           }
         }
       }
     }
   }
   let LATIN1 = new Latin1Codec();
   let _LATIN1_MASK = 255;
   class Latin1Codec extends Encoding {
-    Latin1Codec(opt$) {
-      let allowInvalid = opt$ && 'allowInvalid' in opt$ ? opt$.allowInvalid : false;
+    Latin1Codec(opts) {
+      let allowInvalid = opts && 'allowInvalid' in opts ? opts.allowInvalid : false;
       this[_allowInvalid] = allowInvalid;
       super.Encoding();
     }
     get name() {
       return "iso-8859-1";
     }
-    decode(bytes, opt$) {
-      let allowInvalid = opt$ && 'allowInvalid' in opt$ ? opt$.allowInvalid : null;
+    decode(bytes, opts) {
+      let allowInvalid = opts && 'allowInvalid' in opts ? opts.allowInvalid : null;
       if (allowInvalid === null)
         allowInvalid = this[_allowInvalid];
       if (allowInvalid) {
         return new Latin1Decoder({allowInvalid: true}).convert(bytes);
       } else {
         return new Latin1Decoder({allowInvalid: false}).convert(bytes);
       }
     }
     get encoder() {
       return new Latin1Encoder();
     }
     get decoder() {
       return this[_allowInvalid] ? new Latin1Decoder({allowInvalid: true}) : new Latin1Decoder({allowInvalid: false});
     }
   }
   class Latin1Encoder extends _UnicodeSubsetEncoder {
     Latin1Encoder() {
       super._UnicodeSubsetEncoder(_LATIN1_MASK);
     }
   }
   class Latin1Decoder extends _UnicodeSubsetDecoder {
-    Latin1Decoder(opt$) {
-      let allowInvalid = opt$ && 'allowInvalid' in opt$ ? opt$.allowInvalid : false;
+    Latin1Decoder(opts) {
+      let allowInvalid = opts && 'allowInvalid' in opts ? opts.allowInvalid : false;
       super._UnicodeSubsetDecoder(allowInvalid, _LATIN1_MASK);
     }
     startChunkedConversion(sink) {
       let stringSink = null;
       if (dart.is(sink, StringConversionSink)) {
         stringSink = sink;
       } else {
         stringSink = new StringConversionSink.from(sink);
       }
       if (!dart.notNull(this[_allowInvalid]))
         return new _Latin1DecoderSink(stringSink);
       return new _Latin1AllowInvalidDecoderSink(stringSink);
     }
   }
   let _addSliceToSink = Symbol('_addSliceToSink');
   class _Latin1DecoderSink extends ByteConversionSinkBase {
-    _Latin1DecoderSink($_sink) {
-      this[_sink] = $_sink;
+    _Latin1DecoderSink(sink$) {
+      this[_sink] = sink$;
       super.ByteConversionSinkBase();
     }
     close() {
       this[_sink].close();
     }
     add(source) {
       this.addSlice(source, 0, source.length, false);
     }
     [_addSliceToSink](source, start, end, isLast) {
       this[_sink].add(new core.String.fromCharCodes(source, start, end));
@@ skipping 49 matching lines @@
       return lines;
     }
     startChunkedConversion(sink) {
       if (!dart.is(sink, StringConversionSink)) {
         sink = new StringConversionSink.from(sink);
       }
       return new _LineSplitterSink(dart.as(sink, StringConversionSink));
     }
   }
   let _carry = Symbol('_carry');
-  let _addSlice = Symbol('_addSlice');
+  let _addSlice$ = Symbol('_addSlice');
   class _LineSplitterSink extends StringConversionSinkBase {
-    _LineSplitterSink($_sink) {
-      this[_sink] = $_sink;
+    _LineSplitterSink(sink$) {
+      this[_sink] = sink$;
       this[_carry] = null;
       super.StringConversionSinkBase();
     }
     addSlice(chunk, start, end, isLast) {
       if (this[_carry] !== null) {
         chunk = core.String['+'](this[_carry], chunk.substring(start, end));
         start = 0;
         end = chunk.length;
         this[_carry] = null;
       }
       this[_carry] = _addSlice(chunk, start, end, isLast, this[_sink].add);
       if (isLast)
         this[_sink].close();
     }
     close() {
       this.addSlice('', 0, 0, true);
     }
-    static [_addSlice](chunk, start, end, isLast, adder) {
+    static [_addSlice$](chunk, start, end, isLast, adder) {
       let pos = start;
       while (dart.notNull(pos) < dart.notNull(end)) {
         let skip = 0;
         let char = chunk.codeUnitAt(pos);
         if (char === _LineSplitterSink._LF) {
           skip = 1;
         } else if (char === _LineSplitterSink._CR) {
           skip = 1;
           if (dart.notNull(pos) + 1 < dart.notNull(end)) {
             if (chunk.codeUnitAt(dart.notNull(pos) + 1) === _LineSplitterSink._LF) {
@@ skipping 40 matching lines @@
   dart.defineNamedConstructor(StringConversionSink, 'withCallback');
   dart.defineNamedConstructor(StringConversionSink, 'from');
   dart.defineNamedConstructor(StringConversionSink, 'fromStringSink');
   class ClosableStringSink extends core.StringSink {
     ClosableStringSink$fromStringSink(sink, onClose) {
       return new _ClosableStringSink(sink, onClose);
     }
   }
   dart.defineNamedConstructor(ClosableStringSink, 'fromStringSink');
   class _ClosableStringSink extends core.Object {
-    _ClosableStringSink($_sink, $_callback) {
-      this[_sink] = $_sink;
-      this[_callback] = $_callback;
+    _ClosableStringSink(sink$, callback$) {
+      this[_sink] = sink$;
+      this[_callback] = callback$;
     }
     close() {
       return this[_callback]();
     }
     writeCharCode(charCode) {
       return this[_sink].writeCharCode(charCode);
     }
     write(o) {
       return this[_sink].write(o);
     }
     writeln(o) {
       if (o === void 0)
         o = "";
       return this[_sink].writeln(o);
     }
     writeAll(objects, separator) {
       if (separator === void 0)
         separator = "";
       return this[_sink].writeAll(objects, separator);
     }
   }
   let _flush = Symbol('_flush');
   class _StringConversionSinkAsStringSinkAdapter extends core.Object {
-    _StringConversionSinkAsStringSinkAdapter($_chunkedSink) {
-      this[_chunkedSink] = $_chunkedSink;
+    _StringConversionSinkAsStringSinkAdapter(chunkedSink) {
+      this[_chunkedSink] = chunkedSink;
       this[_buffer] = new core.StringBuffer();
     }
     close() {
       if (this[_buffer].isNotEmpty)
         this[_flush]();
       this[_chunkedSink].close();
     }
     writeCharCode(charCode) {
       this[_buffer].writeCharCode(charCode);
       if (dart.notNull(this[_buffer].length) > dart.notNull(_StringConversionSinkAsStringSinkAdapter._MIN_STRING_SIZE))
@@ skipping 34 matching lines @@
     }
     [_flush]() {
       let accumulated = this[_buffer].toString();
       this[_buffer].clear();
       this[_chunkedSink].add(accumulated);
     }
   }
   _StringConversionSinkAsStringSinkAdapter._MIN_STRING_SIZE = 16;
   let _stringSink = Symbol('_stringSink');
   class _StringSinkConversionSink extends StringConversionSinkBase {
-    _StringSinkConversionSink($_stringSink) {
-      this[_stringSink] = $_stringSink;
+    _StringSinkConversionSink(stringSink$) {
+      this[_stringSink] = stringSink$;
       super.StringConversionSinkBase();
     }
     close() {}
     addSlice(str, start, end, isLast) {
       if (start !== 0 || end !== str.length) {
         for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
           this[_stringSink].writeCharCode(str.codeUnitAt(i));
         }
       } else {
         this[_stringSink].write(str);
       }
       if (isLast)
         this.close();
     }
     add(str) {
       return this[_stringSink].write(str);
     }
     asUtf8Sink(allowMalformed) {
       return new _Utf8StringSinkAdapter(this, this[_stringSink], allowMalformed);
     }
     asStringSink() {
       return new ClosableStringSink.fromStringSink(this[_stringSink], this.close);
     }
   }
   class _StringCallbackSink extends _StringSinkConversionSink {
-    _StringCallbackSink($_callback) {
-      this[_callback] = $_callback;
+    _StringCallbackSink(callback$) {
+      this[_callback] = callback$;
       super._StringSinkConversionSink(new core.StringBuffer());
     }
     close() {
       let buffer = dart.as(this[_stringSink], core.StringBuffer);
       let accumulated = buffer.toString();
       buffer.clear();
       this[_callback](accumulated);
     }
     asUtf8Sink(allowMalformed) {
       return new _Utf8StringSinkAdapter(this, this[_stringSink], allowMalformed);
     }
   }
   class _StringAdapterSink extends StringConversionSinkBase {
-    _StringAdapterSink($_sink) {
-      this[_sink] = $_sink;
+    _StringAdapterSink(sink$) {
+      this[_sink] = sink$;
       super.StringConversionSinkBase();
     }
     add(str) {
       return this[_sink].add(str);
     }
     addSlice(str, start, end, isLast) {
       if (start === 0 && end === str.length) {
         this.add(str);
       } else {
         this.add(str.substring(start, end));
       }
       if (isLast)
         this.close();
     }
     close() {
       return this[_sink].close();
     }
   }
   let _decoder = Symbol('_decoder');
   class _Utf8StringSinkAdapter extends ByteConversionSink {
-    _Utf8StringSinkAdapter($_sink, stringSink, allowMalformed) {
-      this[_sink] = $_sink;
+    _Utf8StringSinkAdapter(sink$, stringSink, allowMalformed) {
+      this[_sink] = sink$;
       this[_decoder] = new _Utf8Decoder(stringSink, allowMalformed);
       super.ByteConversionSink();
     }
     close() {
       this[_decoder].close();
       if (this[_sink] !== null)
         this[_sink].close();
     }
     add(chunk) {
       this.addSlice(chunk, 0, chunk.length, false);
     }
     addSlice(codeUnits, startIndex, endIndex, isLast) {
       this[_decoder].convert(codeUnits, startIndex, endIndex);
       if (isLast)
         this.close();
     }
   }
   let _Utf8ConversionSink$_ = Symbol('_Utf8ConversionSink$_');
   class _Utf8ConversionSink extends ByteConversionSink {
     _Utf8ConversionSink(sink, allowMalformed) {
       this[_Utf8ConversionSink$_](sink, new core.StringBuffer(), allowMalformed);
     }
-    _Utf8ConversionSink$_($_chunkedSink, stringBuffer, allowMalformed) {
-      this[_chunkedSink] = $_chunkedSink;
+    _Utf8ConversionSink$_(chunkedSink, stringBuffer, allowMalformed) {
+      this[_chunkedSink] = chunkedSink;
       this[_decoder] = new _Utf8Decoder(stringBuffer, allowMalformed);
       this[_buffer] = stringBuffer;
       super.ByteConversionSink();
     }
     close() {
       this[_decoder].close();
       if (this[_buffer].isNotEmpty) {
         let accumulated = this[_buffer].toString();
         this[_buffer].clear();
         this[_chunkedSink].addSlice(accumulated, 0, accumulated.length, true);
@@ skipping 15 matching lines @@
       if (isLast)
         this.close();
     }
   }
   dart.defineNamedConstructor(_Utf8ConversionSink, '_');
   let UNICODE_REPLACEMENT_CHARACTER_RUNE = 65533;
   let UNICODE_BOM_CHARACTER_RUNE = 65279;
   let UTF8 = new Utf8Codec();
   let _allowMalformed = Symbol('_allowMalformed');
   class Utf8Codec extends Encoding {
-    Utf8Codec(opt$) {
-      let allowMalformed = opt$ && 'allowMalformed' in opt$ ? opt$.allowMalformed : false;
+    Utf8Codec(opts) {
+      let allowMalformed = opts && 'allowMalformed' in opts ? opts.allowMalformed : false;
       this[_allowMalformed] = allowMalformed;
       super.Encoding();
     }
     get name() {
       return "utf-8";
     }
-    decode(codeUnits, opt$) {
-      let allowMalformed = opt$ && 'allowMalformed' in opt$ ? opt$.allowMalformed : null;
+    decode(codeUnits, opts) {
+      let allowMalformed = opts && 'allowMalformed' in opts ? opts.allowMalformed : null;
       if (allowMalformed === null)
         allowMalformed = this[_allowMalformed];
       return new Utf8Decoder({allowMalformed: allowMalformed}).convert(codeUnits);
     }
     get encoder() {
       return new Utf8Encoder();
     }
     get decoder() {
       return new Utf8Decoder({allowMalformed: this[_allowMalformed]});
     }
@@ skipping 29 matching lines @@
       if (!dart.is(sink, ByteConversionSink)) {
         sink = new ByteConversionSink.from(sink);
       }
       return new _Utf8EncoderSink(dart.as(sink, ByteConversionSink));
     }
     bind(stream) {
       return dart.as(super.bind(stream), async.Stream$(core.List$(core.int)));
     }
   }
   let _Utf8Encoder$withBufferSize = Symbol('_Utf8Encoder$withBufferSize');
-  let _createBuffer = Symbol('_createBuffer');
+  let _createBuffer$ = Symbol('_createBuffer');
   let _writeSurrogate = Symbol('_writeSurrogate');
   let _fillBuffer = Symbol('_fillBuffer');
   class _Utf8Encoder extends core.Object {
     _Utf8Encoder() {
       this[_Utf8Encoder$withBufferSize](_Utf8Encoder._DEFAULT_BYTE_BUFFER_SIZE);
     }
     _Utf8Encoder$withBufferSize(bufferSize) {
       this[_buffer] = _createBuffer(bufferSize);
       this[_carry] = 0;
       this[_bufferIndex] = 0;
     }
-    static [_createBuffer](size) {
+    static [_createBuffer$](size) {
       return new typed_data.Uint8List(size);
     }
     [_writeSurrogate](leadingSurrogate, nextCodeUnit) {
       if (_isTailSurrogate(nextCodeUnit)) {
         let rune = _combineSurrogatePair(leadingSurrogate, nextCodeUnit);
         dart.assert(dart.notNull(rune) > dart.notNull(_THREE_BYTE_LIMIT));
         dart.assert(dart.notNull(rune) <= dart.notNull(_FOUR_BYTE_LIMIT));
-        this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 240 | dart.notNull(rune) >> 18);
-        this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) >> 12 & 63);
-        this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) >> 6 & 63);
-        this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) & 63);
+        this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 240 | dart.notNull(rune) >> 18);
+        this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) >> 12 & 63);
+        this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) >> 6 & 63);
+        this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) & 63);
         return true;
       } else {
-        this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 224 | dart.notNull(leadingSurrogate) >> 12);
-        this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 128 | dart.notNull(leadingSurrogate) >> 6 & 63);
-        this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 128 | dart.notNull(leadingSurrogate) & 63);
+        this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 224 | dart.notNull(leadingSurrogate) >> 12);
+        this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 128 | dart.notNull(leadingSurrogate) >> 6 & 63);
+        this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 128 | dart.notNull(leadingSurrogate) & 63);
         return false;
       }
     }
     [_fillBuffer](str, start, end) {
       if (start !== end && dart.notNull(_isLeadSurrogate(str.codeUnitAt(dart.notNull(end) - 1)))) {
         end = dart.notNull(end) - 1;
       }
       let stringIndex = null;
       for (stringIndex = start; dart.notNull(stringIndex) < dart.notNull(end); stringIndex = dart.notNull(stringIndex) + 1) {
         let codeUnit = str.codeUnitAt(stringIndex);
         if (dart.notNull(codeUnit) <= dart.notNull(_ONE_BYTE_LIMIT)) {
           if (dart.notNull(this[_bufferIndex]) >= dart.notNull(this[_buffer].length))
             break;
-          this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), codeUnit);
+          this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), codeUnit);
         } else if (_isLeadSurrogate(codeUnit)) {
           if (dart.notNull(this[_bufferIndex]) + 3 >= dart.notNull(this[_buffer].length))
             break;
           let nextCodeUnit = str.codeUnitAt(dart.notNull(stringIndex) + 1);
           let wasCombined = this[_writeSurrogate](codeUnit, nextCodeUnit);
           if (wasCombined)
             stringIndex = dart.notNull(stringIndex) + 1;
         } else {
           let rune = codeUnit;
           if (dart.notNull(rune) <= dart.notNull(_TWO_BYTE_LIMIT)) {
             if (dart.notNull(this[_bufferIndex]) + 1 >= dart.notNull(this[_buffer].length))
               break;
-            this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 192 | dart.notNull(rune) >> 6);
-            this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) & 63);
+            this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 192 | dart.notNull(rune) >> 6);
+            this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) & 63);
           } else {
             dart.assert(dart.notNull(rune) <= dart.notNull(_THREE_BYTE_LIMIT));
             if (dart.notNull(this[_bufferIndex]) + 2 >= dart.notNull(this[_buffer].length))
               break;
-            this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 224 | dart.notNull(rune) >> 12);
-            this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) >> 6 & 63);
-            this[_buffer].set((($tmp) => this[_bufferIndex] = dart.notNull($tmp) + 1, $tmp).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) & 63);
+            this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 224 | dart.notNull(rune) >> 12);
+            this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) >> 6 & 63);
+            this[_buffer].set(((x) => this[_bufferIndex] = dart.notNull(x$) + 1, x$).bind(this)(this[_bufferIndex]), 128 | dart.notNull(rune) & 63);
           }
         }
       }
       return stringIndex;
     }
   }
   dart.defineNamedConstructor(_Utf8Encoder, 'withBufferSize');
   _Utf8Encoder._DEFAULT_BYTE_BUFFER_SIZE = 1024;
   class _Utf8EncoderSink extends dart.mixin(_Utf8Encoder, StringConversionSinkMixin) {
-    _Utf8EncoderSink($_sink) {
-      this[_sink] = $_sink;
+    _Utf8EncoderSink(sink$) {
+      this[_sink] = sink$;
       super._Utf8Encoder();
     }
     close() {
       if (this[_carry] !== 0) {
         this.addSlice("", 0, 0, true);
         return;
       }
       this[_sink].close();
     }
     addSlice(str, start, end, isLast) {
@@ skipping 27 matching lines @@
           start = dart.notNull(start) + 1;
         }
         this[_sink].addSlice(this[_buffer], 0, this[_bufferIndex], isLastSlice);
         this[_bufferIndex] = 0;
       } while (dart.notNull(start) < dart.notNull(end));
       if (isLast)
         this.close();
     }
   }
   class Utf8Decoder extends Converter$(core.List$(core.int), core.String) {
-    Utf8Decoder(opt$) {
-      let allowMalformed = opt$ && 'allowMalformed' in opt$ ? opt$.allowMalformed : false;
+    Utf8Decoder(opts) {
+      let allowMalformed = opts && 'allowMalformed' in opts ? opts.allowMalformed : false;
       this[_allowMalformed] = allowMalformed;
       super.Converter();
     }
     convert(codeUnits, start, end) {
       if (start === void 0)
         start = 0;
       if (end === void 0)
         end = null;
       let length = codeUnits.length;
       core.RangeError.checkValidRange(start, end, length);
@@ skipping 44 matching lines @@
   }
   // Function _combineSurrogatePair: (int, int) → int
   function _combineSurrogatePair(lead, tail) {
     return 65536 + ((dart.notNull(lead) & dart.notNull(_SURROGATE_VALUE_MASK)) << 10) | dart.notNull(tail) & dart.notNull(_SURROGATE_VALUE_MASK);
   }
   let _isFirstCharacter = Symbol('_isFirstCharacter');
   let _value = Symbol('_value');
   let _expectedUnits = Symbol('_expectedUnits');
   let _extraUnits = Symbol('_extraUnits');
   class _Utf8Decoder extends core.Object {
-    _Utf8Decoder($_stringSink, $_allowMalformed) {
-      this[_stringSink] = $_stringSink;
-      this[_allowMalformed] = $_allowMalformed;
+    _Utf8Decoder(stringSink$, allowMalformed$) {
+      this[_stringSink] = stringSink$;
+      this[_allowMalformed] = allowMalformed$;
       this[_isFirstCharacter] = true;
       this[_value] = 0;
       this[_expectedUnits] = 0;
       this[_extraUnits] = 0;
     }
     get hasPartialInput() {
       return dart.notNull(this[_expectedUnits]) > 0;
     }
     close() {
       this.flush();
@@ skipping 77 matching lines @@
             }
           while (dart.notNull(i) < dart.notNull(endIndex)) {
             let oneBytes = scanOneByteCharacters(codeUnits, i);
             if (dart.notNull(oneBytes) > 0) {
               this[_isFirstCharacter] = false;
               addSingleBytes(i, dart.notNull(i) + dart.notNull(oneBytes));
               i = oneBytes;
               if (i === endIndex)
                 break;
             }
-            let unit = codeUnits.get((($tmp) => i = dart.notNull($tmp) + 1, $tmp)(i));
+            let unit = codeUnits.get(((x) => i = dart.notNull(x$) + 1, x$)(i));
             if (dart.notNull(unit) < 0) {
               if (!dart.notNull(this[_allowMalformed])) {
                 throw new core.FormatException(`Negative UTF-8 code unit: -0x${(-dart.notNull(unit)).toRadixString(16)}`);
               }
               this[_stringSink].writeCharCode(UNICODE_REPLACEMENT_CHARACTER_RUNE);
             } else {
               dart.assert(dart.notNull(unit) > dart.notNull(_ONE_BYTE_LIMIT));
               if ((dart.notNull(unit) & 224) === 192) {
                 value = dart.notNull(unit) & 31;
                 expectedUnits = extraUnits = 1;
@@ skipping 73 matching lines @@
       object[i] = _convertJsonToDartLazy(item);
     }
     return object;
   }
   let _data = Symbol('_data');
   let _isUpgraded = Symbol('_isUpgraded');
   let _upgradedMap = Symbol('_upgradedMap');
   let _process = Symbol('_process');
   let _computeKeys = Symbol('_computeKeys');
   let _upgrade = Symbol('_upgrade');
-  let _hasProperty = Symbol('_hasProperty');
-  let _getProperty = Symbol('_getProperty');
-  let _setProperty = Symbol('_setProperty');
-  let _getPropertyNames = Symbol('_getPropertyNames');
-  let _isUnprocessed = Symbol('_isUnprocessed');
-  let _newJavaScriptObject = Symbol('_newJavaScriptObject');
+  let _hasProperty$ = Symbol('_hasProperty');
+  let _getProperty$ = Symbol('_getProperty');
+  let _setProperty$ = Symbol('_setProperty');
+  let _getPropertyNames$ = Symbol('_getPropertyNames');
+  let _isUnprocessed$ = Symbol('_isUnprocessed');
+  let _newJavaScriptObject$ = Symbol('_newJavaScriptObject');
   class _JsonMap extends core.Object {
-    _JsonMap($_original) {
+    _JsonMap(original$) {
       this[_processed] = _newJavaScriptObject();
-      this[_original] = $_original;
+      this[_original] = original$;
       this[_data] = null;
     }
     get(key) {
       if (this[_isUpgraded]) {
         return this[_upgradedMap].get(key);
       } else if (!(typeof key == string)) {
         return null;
       } else {
         let result = _getProperty(this[_processed], dart.as(key, core.String));
         if (_isUnprocessed(result))
@@ skipping 133 matching lines @@
       this[_data] = result;
       dart.assert(this[_isUpgraded]);
       return result;
     }
     [_process](key) {
       if (!dart.notNull(_hasProperty(this[_original], key)))
         return null;
       let result = _convertJsonToDartLazy(_getProperty(this[_original], key));
       return _setProperty(this[_processed], key, result);
     }
-    static [_hasProperty](object, key) {
+    static [_hasProperty$](object, key) {
       return Object.prototype.hasOwnProperty.call(object, key);
     }
-    static [_getProperty](object, key) {
+    static [_getProperty$](object, key) {
       return object[key];
     }
-    static [_setProperty](object, key, value) {
+    static [_setProperty$](object, key, value) {
       return object[key] = value;
     }
-    static [_getPropertyNames](object) {
+    static [_getPropertyNames$](object) {
       return dart.as(Object.keys(object), core.List);
     }
-    static [_isUnprocessed](object) {
+    static [_isUnprocessed$](object) {
       return typeof object == "undefined";
     }
-    static [_newJavaScriptObject]() {
+    static [_newJavaScriptObject$]() {
       return Object.create(null);
     }
   }
   let _parent = Symbol('_parent');
   class _JsonMapKeyIterable extends _internal.ListIterable {
-    _JsonMapKeyIterable($_parent) {
-      this[_parent] = $_parent;
+    _JsonMapKeyIterable(parent) {
+      this[_parent] = parent;
       super.ListIterable();
     }
     get length() {
       return this[_parent].length;
     }
     elementAt(index) {
       return dart.as(this[_parent][_isUpgraded] ? this[_parent].keys.elementAt(index) : this[_parent]._computeKeys().get(index), core.String);
     }
     get iterator() {
       return dart.as(this[_parent][_isUpgraded] ? this[_parent].keys.iterator : this[_parent]._computeKeys().iterator, core.Iterator);
     }
     contains(key) {
       return this[_parent].containsKey(key);
     }
   }
   class _JsonDecoderSink extends _StringSinkConversionSink {
-    _JsonDecoderSink($_reviver, $_sink) {
-      this[_reviver] = $_reviver;
-      this[_sink] = $_sink;
+    _JsonDecoderSink(reviver$, sink$) {
+      this[_reviver] = reviver$;
+      this[_sink] = sink$;
       super._StringSinkConversionSink(new core.StringBuffer());
     }
     close() {
       super.close();
       let buffer = dart.as(this[_stringSink], core.StringBuffer);
       let accumulated = buffer.toString();
       buffer.clear();
       let decoded = _parseJson(accumulated, this[_reviver]);
       this[_sink].add(decoded);
       this[_sink].close();
@@ skipping 32 matching lines @@
   exports.LineSplitter = LineSplitter;
   exports.StringConversionSink = StringConversionSink;
   exports.ClosableStringSink = ClosableStringSink;
   exports.UNICODE_REPLACEMENT_CHARACTER_RUNE = UNICODE_REPLACEMENT_CHARACTER_RUNE;
   exports.UNICODE_BOM_CHARACTER_RUNE = UNICODE_BOM_CHARACTER_RUNE;
   exports.UTF8 = UTF8;
   exports.Utf8Codec = Utf8Codec;
   exports.Utf8Encoder = Utf8Encoder;
   exports.Utf8Decoder = Utf8Decoder;
 })(convert || (convert = {}));