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

lib/runtime/dart/core.js

 var core;
 (function(exports) {
   'use strict';
   class Object {
     constructor() {
       var name = this.constructor.name;
       var init = this[name];
       var result = void 0;
       if (init)
         result = init.apply(this, arguments);
@@ skipping 28 matching lines @@
     }
   }
   let deprecated = new Deprecated("next release");
   let override = new _Override();
   class _Proxy extends Object {
     _Proxy() {
     }
   }
   let proxy = new _Proxy();
   class bool extends Object {
-    bool$fromEnvironment(name, opt$) {
-      let defaultValue = opt$ && 'defaultValue' in opt$ ? opt$.defaultValue : false;
+    bool$fromEnvironment(name, opts) {
+      let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : false;
       throw new UnsupportedError('bool.fromEnvironment can only be used as a const constructor');
     }
     toString() {
       return this ? "true" : "false";
     }
   }
   dart.defineNamedConstructor(bool, 'fromEnvironment');
   let Comparable$ = dart.generic(function(T) {
     class Comparable extends Object {
       static compare(a, b) {
         return a.compareTo(b);
       }
     }
     return Comparable;
   });
   let Comparable = Comparable$(dart.dynamic);
-  let _fourDigits = dart.JsSymbol('_fourDigits');
-  let _sixDigits = dart.JsSymbol('_sixDigits');
-  let _threeDigits = dart.JsSymbol('_threeDigits');
-  let _twoDigits = dart.JsSymbol('_twoDigits');
-  let _brokenDownDateToMillisecondsSinceEpoch = dart.JsSymbol('_brokenDownDateToMillisecondsSinceEpoch');
+  let _fourDigits$ = dart.JsSymbol('_fourDigits');
+  let _sixDigits$ = dart.JsSymbol('_sixDigits');
+  let _threeDigits$ = dart.JsSymbol('_threeDigits');
+  let _twoDigits$ = dart.JsSymbol('_twoDigits');
+  let _brokenDownDateToMillisecondsSinceEpoch$ = dart.JsSymbol('_brokenDownDateToMillisecondsSinceEpoch');
   class DateTime extends Object {
     DateTime(year, month, day, hour, minute, second, millisecond) {
       if (month === void 0)
         month = 1;
       if (day === void 0)
         day = 1;
       if (hour === void 0)
         hour = 0;
       if (minute === void 0)
         minute = 0;
@@ skipping 64 matching lines @@
         if (millisecondsSinceEpoch === null) {
           throw new FormatException("Time out of range", formattedString);
         }
         if (addOneMillisecond)
           millisecondsSinceEpoch = dart.notNull(millisecondsSinceEpoch) + 1;
         return new DateTime.fromMillisecondsSinceEpoch(millisecondsSinceEpoch, {isUtc: isUtc});
       } else {
         throw new FormatException("Invalid date format", formattedString);
       }
     }
-    DateTime$fromMillisecondsSinceEpoch(millisecondsSinceEpoch, opt$) {
-      let isUtc = opt$ && 'isUtc' in opt$ ? opt$.isUtc : false;
+    DateTime$fromMillisecondsSinceEpoch(millisecondsSinceEpoch, opts) {
+      let isUtc = opts && 'isUtc' in opts ? opts.isUtc : false;
       this.millisecondsSinceEpoch = millisecondsSinceEpoch;
       this.isUtc = isUtc;
       if (dart.notNull(millisecondsSinceEpoch.abs()) > dart.notNull(DateTime._MAX_MILLISECONDS_SINCE_EPOCH)) {
         throw new ArgumentError(millisecondsSinceEpoch);
       }
       if (isUtc === null)
         throw new ArgumentError(isUtc);
     }
     ['=='](other) {
       if (!dart.notNull(dart.is(other, DateTime)))
@@ skipping 19 matching lines @@
       if (this.isUtc) {
         return new DateTime.fromMillisecondsSinceEpoch(this.millisecondsSinceEpoch, {isUtc: false});
       }
       return this;
     }
     toUtc() {
       if (this.isUtc)
         return this;
       return new DateTime.fromMillisecondsSinceEpoch(this.millisecondsSinceEpoch, {isUtc: true});
     }
-    static [_fourDigits](n) {
+    static [_fourDigits$](n) {
       let absN = n.abs();
       let sign = dart.notNull(n) < 0 ? "-" : "";
       if (dart.notNull(absN) >= 1000)
         return `${n}`;
       if (dart.notNull(absN) >= 100)
         return `${sign}0${absN}`;
       if (dart.notNull(absN) >= 10)
         return `${sign}00${absN}`;
       return `${sign}000${absN}`;
     }
-    static [_sixDigits](n) {
+    static [_sixDigits$](n) {
       dart.assert(dart.notNull(n) < -9999 || dart.notNull(n) > 9999);
       let absN = n.abs();
       let sign = dart.notNull(n) < 0 ? "-" : "+";
       if (dart.notNull(absN) >= 100000)
         return `${sign}${absN}`;
       return `${sign}0${absN}`;
     }
-    static [_threeDigits](n) {
+    static [_threeDigits$](n) {
       if (dart.notNull(n) >= 100)
         return `${n}`;
       if (dart.notNull(n) >= 10)
         return `0${n}`;
       return `00${n}`;
     }
-    static [_twoDigits](n) {
+    static [_twoDigits$](n) {
       if (dart.notNull(n) >= 10)
         return `${n}`;
       return `0${n}`;
     }
     toString() {
       let y = _fourDigits(this.year);
       let m = _twoDigits(this.month);
       let d = _twoDigits(this.day);
       let h = _twoDigits(this.hour);
       let min = _twoDigits(this.minute);
@@ skipping 33 matching lines @@
       return new Duration({milliseconds: dart.notNull(ms) - dart.notNull(otherMs)});
     }
     DateTime$_internal(year, month, day, hour, minute, second, millisecond, isUtc) {
       this.isUtc = typeof isUtc == boolean ? isUtc : dart.throw_(new ArgumentError(isUtc));
       this.millisecondsSinceEpoch = dart.as(_js_helper.checkInt(_js_helper.Primitives.valueFromDecomposedDate(year, month, day, hour, minute, second, millisecond, isUtc)), int);
     }
     DateTime$_now() {
       this.isUtc = false;
       this.millisecondsSinceEpoch = _js_helper.Primitives.dateNow();
     }
-    static [_brokenDownDateToMillisecondsSinceEpoch](year, month, day, hour, minute, second, millisecond, isUtc) {
+    static [_brokenDownDateToMillisecondsSinceEpoch$](year, month, day, hour, minute, second, millisecond, isUtc) {
       return dart.as(_js_helper.Primitives.valueFromDecomposedDate(year, month, day, hour, minute, second, millisecond, isUtc), int);
     }
     get timeZoneName() {
       if (this.isUtc)
         return "UTC";
       return _js_helper.Primitives.getTimeZoneName(this);
     }
     get timeZoneOffset() {
       if (this.isUtc)
         return new Duration();
@@ skipping 44 matching lines @@
   DateTime.MAY = 5;
   DateTime.JUNE = 6;
   DateTime.JULY = 7;
   DateTime.AUGUST = 8;
   DateTime.SEPTEMBER = 9;
   DateTime.OCTOBER = 10;
   DateTime.NOVEMBER = 11;
   DateTime.DECEMBER = 12;
   DateTime.MONTHS_PER_YEAR = 12;
   DateTime._MAX_MILLISECONDS_SINCE_EPOCH = 8640000000000000;
-  let _onParseErrorInt = dart.JsSymbol('_onParseErrorInt');
-  let _onParseErrorDouble = dart.JsSymbol('_onParseErrorDouble');
+  let _onParseErrorInt$ = dart.JsSymbol('_onParseErrorInt');
+  let _onParseErrorDouble$ = dart.JsSymbol('_onParseErrorDouble');
   class num extends Object {
     static parse(input, onError) {
       if (onError === void 0)
         onError = null;
       let source = input.trim();
       _parseError = false;
       let result = int.parse(source, {onError: _onParseErrorInt});
       if (!dart.notNull(_parseError))
         return result;
       _parseError = false;
       result = double.parse(source, _onParseErrorDouble);
       if (!dart.notNull(_parseError))
         return result;
       if (onError === null)
         throw new FormatException(input);
       return onError(input);
     }
-    static [_onParseErrorInt](_) {
+    static [_onParseErrorInt$](_) {
       _parseError = true;
       return 0;
     }
-    static [_onParseErrorDouble](_) {
+    static [_onParseErrorDouble$](_) {
       _parseError = true;
       return 0.0;
     }
   }
   num._parseError = false;
   class double extends num {
     static parse(source, onError) {
       if (onError === void 0)
         onError = null;
       return _js_helper.Primitives.parseDouble(source, onError);
     }
   }
   double.NAN = 0.0 / 0.0;
   double.INFINITY = 1.0 / 0.0;
   double.NEGATIVE_INFINITY = -dart.notNull(double.INFINITY);
   double.MIN_POSITIVE = 5e-324;
   double.MAX_FINITE = 1.7976931348623157e+308;
   let _duration = dart.JsSymbol('_duration');
   class Duration extends Object {
-    Duration(opt$) {
-      let days = opt$ && 'days' in opt$ ? opt$.days : 0;
-      let hours = opt$ && 'hours' in opt$ ? opt$.hours : 0;
-      let minutes = opt$ && 'minutes' in opt$ ? opt$.minutes : 0;
-      let seconds = opt$ && 'seconds' in opt$ ? opt$.seconds : 0;
-      let milliseconds = opt$ && 'milliseconds' in opt$ ? opt$.milliseconds : 0;
-      let microseconds = opt$ && 'microseconds' in opt$ ? opt$.microseconds : 0;
+    Duration(opts) {
+      let days = opts && 'days' in opts ? opts.days : 0;
+      let hours = opts && 'hours' in opts ? opts.hours : 0;
+      let minutes = opts && 'minutes' in opts ? opts.minutes : 0;
+      let seconds = opts && 'seconds' in opts ? opts.seconds : 0;
+      let milliseconds = opts && 'milliseconds' in opts ? opts.milliseconds : 0;
+      let microseconds = opts && 'microseconds' in opts ? opts.microseconds : 0;
       this.Duration$_microseconds(dart.notNull(days) * dart.notNull(Duration.MICROSECONDS_PER_DAY) + dart.notNull(hours) * dart.notNull(Duration.MICROSECONDS_PER_HOUR) + dart.notNull(minutes) * dart.notNull(Duration.MICROSECONDS_PER_MINUTE) + dart.notNull(seconds) * dart.notNull(Duration.MICROSECONDS_PER_SECOND) + dart.notNull(milliseconds) * dart.notNull(Duration.MICROSECONDS_PER_MILLISECOND) + dart.notNull(microseconds));
     }
-    Duration$_microseconds($_duration) {
-      this[_duration] = $_duration;
+    Duration$_microseconds(duration$) {
+      this[_duration] = duration$;
     }
     ['+'](other) {
       return new Duration._microseconds(dart.notNull(this[_duration]) + dart.notNull(other[_duration]));
     }
     ['-'](other) {
       return new Duration._microseconds(dart.notNull(this[_duration]) - dart.notNull(other[_duration]));
     }
     ['*'](factor) {
       return new Duration._microseconds((dart.notNull(this[_duration]) * dart.notNull(factor)).round());
     }
@@ skipping 92 matching lines @@
   Duration.MICROSECONDS_PER_MINUTE = dart.notNull(Duration.MICROSECONDS_PER_SECOND) * dart.notNull(Duration.SECONDS_PER_MINUTE);
   Duration.MICROSECONDS_PER_HOUR = dart.notNull(Duration.MICROSECONDS_PER_MINUTE) * dart.notNull(Duration.MINUTES_PER_HOUR);
   Duration.MICROSECONDS_PER_DAY = dart.notNull(Duration.MICROSECONDS_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
   Duration.MILLISECONDS_PER_MINUTE = dart.notNull(Duration.MILLISECONDS_PER_SECOND) * dart.notNull(Duration.SECONDS_PER_MINUTE);
   Duration.MILLISECONDS_PER_HOUR = dart.notNull(Duration.MILLISECONDS_PER_MINUTE) * dart.notNull(Duration.MINUTES_PER_HOUR);
   Duration.MILLISECONDS_PER_DAY = dart.notNull(Duration.MILLISECONDS_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
   Duration.SECONDS_PER_HOUR = dart.notNull(Duration.SECONDS_PER_MINUTE) * dart.notNull(Duration.MINUTES_PER_HOUR);
   Duration.SECONDS_PER_DAY = dart.notNull(Duration.SECONDS_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
   Duration.MINUTES_PER_DAY = dart.notNull(Duration.MINUTES_PER_HOUR) * dart.notNull(Duration.HOURS_PER_DAY);
   Duration.ZERO = new Duration({seconds: 0});
-  let _stringToSafeString = dart.JsSymbol('_stringToSafeString');
-  let _objectToString = dart.JsSymbol('_objectToString');
+  let _stringToSafeString$ = dart.JsSymbol('_stringToSafeString');
+  let _objectToString$ = dart.JsSymbol('_objectToString');
   class Error extends Object {
     Error() {
     }
     static safeToString(object) {
       if (dart.notNull(dart.is(object, num)) || dart.notNull(typeof object == boolean) || dart.notNull(null === object)) {
         return object.toString();
       }
       if (typeof object == string) {
         return _stringToSafeString(object);
       }
       return _objectToString(object);
     }
-    static [_stringToSafeString](string) {
+    static [_stringToSafeString$](string) {
       return _js_helper.jsonEncodeNative(string);
     }
-    static [_objectToString](object) {
+    static [_objectToString$](object) {
       return _js_helper.Primitives.objectToString(object);
     }
     get stackTrace() {
       return _js_helper.Primitives.extractStackTrace(this);
     }
   }
   class AssertionError extends Error {
   }
   class TypeError extends AssertionError {
   }
@@ skipping 177 matching lines @@
       return `RangeError: ${this.message} (${target}[${this.invalidValue}]): ${explanation}`;
     }
   }
   class FallThroughError extends Error {
     FallThroughError() {
       super.Error();
     }
   }
   let _className = dart.JsSymbol('_className');
   class AbstractClassInstantiationError extends Error {
-    AbstractClassInstantiationError($_className) {
-      this[_className] = $_className;
+    AbstractClassInstantiationError(className) {
+      this[_className] = className;
       super.Error();
     }
     toString() {
       return `Cannot instantiate abstract class: '${this[_className]}'`;
     }
   }
   let _receiver = dart.JsSymbol('_receiver');
   let _memberName = dart.JsSymbol('_memberName');
   let _arguments = dart.JsSymbol('_arguments');
   let _namedArguments = dart.JsSymbol('_namedArguments');
@@ skipping 254 matching lines @@
         let values = _js_helper.Primitives.getProperty(object, Expando._EXPANDO_PROPERTY_NAME);
         if (values === null) {
           values = new Object();
           _js_helper.Primitives.setProperty(object, Expando._EXPANDO_PROPERTY_NAME, values);
         }
         _js_helper.Primitives.setProperty(values, this[_getKey](), value);
       }
       [_getKey]() {
         let key = dart.as(_js_helper.Primitives.getProperty(this, Expando._KEY_PROPERTY_NAME), String);
         if (key === null) {
-          key = `expando$key$${(($tmp) => _keyCount = dart.notNull($tmp) + 1, $tmp)(_keyCount)}`;
+          key = `expando$key$${((x) => _keyCount = dart.notNull(x$) + 1, x$)(_keyCount)}`;
           _js_helper.Primitives.setProperty(this, Expando._KEY_PROPERTY_NAME, key);
         }
         return key;
       }
     }
     Expando._KEY_PROPERTY_NAME = 'expando$key';
     Expando._EXPANDO_PROPERTY_NAME = 'expando$values';
     Expando._keyCount = 0;
     return Expando;
   });
   let Expando = Expando$(dart.dynamic);
-  let _toMangledNames = dart.JsSymbol('_toMangledNames');
+  let _toMangledNames$ = dart.JsSymbol('_toMangledNames');
   class Function extends Object {
     static apply(f, positionalArguments, namedArguments) {
       if (namedArguments === void 0)
         namedArguments = null;
       return _js_helper.Primitives.applyFunction(f, positionalArguments, namedArguments === null ? null : _toMangledNames(namedArguments));
     }
-    static [_toMangledNames](namedArguments) {
+    static [_toMangledNames$](namedArguments) {
       let result = dart.as(dart.map(), Map$(String, dynamic));
       namedArguments.forEach(dart.closureWrap((symbol, value) => {
         result.set(_symbolToString(dart.as(symbol, Symbol)), value);
       }, "(Symbol, dynamic) → void"));
       return result;
     }
   }
   // Function identical: (Object, Object) → bool
   function identical(a, b) {
     return _js_helper.Primitives.identicalImplementation(a, b);
   }
   // Function identityHashCode: (Object) → int
   function identityHashCode(object) {
     return _js_helper.objectHashCode(object);
   }
   class int extends num {
-    int$fromEnvironment(name, opt$) {
-      let defaultValue = opt$ && 'defaultValue' in opt$ ? opt$.defaultValue : null;
+    int$fromEnvironment(name, opts) {
+      let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : null;
       throw new UnsupportedError('int.fromEnvironment can only be used as a const constructor');
     }
-    static parse(source, opt$) {
-      let radix = opt$ && 'radix' in opt$ ? opt$.radix : null;
-      let onError = opt$ && 'onError' in opt$ ? opt$.onError : null;
+    static parse(source, opts) {
+      let radix = opts && 'radix' in opts ? opts.radix : null;
+      let onError = opts && 'onError' in opts ? opts.onError : null;
       return Number(source);
     }
   }
   dart.defineNamedConstructor(int, 'fromEnvironment');
   class Invocation extends Object {
     get isAccessor() {
       return dart.notNull(this.isGetter) || dart.notNull(this.isSetter);
     }
   }
   let Iterable$ = dart.generic(function(E) {
@@ skipping 24 matching lines @@
         };
       }
     }
     dart.defineNamedConstructor(Iterable, 'generate');
     return Iterable;
   });
   let Iterable = Iterable$(dart.dynamic);
   let _end = dart.JsSymbol('_end');
   let _start = dart.JsSymbol('_start');
   let _generator = dart.JsSymbol('_generator');
-  let _id = dart.JsSymbol('_id');
+  let _id$ = dart.JsSymbol('_id');
   let _GeneratorIterable$ = dart.generic(function(E) {
     class _GeneratorIterable extends collection.IterableBase$(E) {
-      _GeneratorIterable($_end, generator) {
-        this[_end] = $_end;
+      _GeneratorIterable(end$, generator) {
+        this[_end] = end$;
         this[_start] = 0;
         this[_generator] = dart.as(generator !== null ? generator : _id, _Generator);
         super.IterableBase();
       }
-      _GeneratorIterable$slice($_start, $_end, $_generator) {
-        this[_start] = $_start;
-        this[_end] = $_end;
-        this[_generator] = $_generator;
+      _GeneratorIterable$slice(start$, end$, generator$) {
+        this[_start] = start$;
+        this[_end] = end$;
+        this[_generator] = generator$;
         super.IterableBase();
       }
       get iterator() {
         return new _GeneratorIterator(this[_start], this[_end], this[_generator]);
       }
       get length() {
         return dart.notNull(this[_end]) - dart.notNull(this[_start]);
       }
       skip(count) {
         RangeError.checkNotNegative(count, "count");
         if (count === 0)
           return this;
         let newStart = dart.notNull(this[_start]) + dart.notNull(count);
         if (dart.notNull(newStart) >= dart.notNull(this[_end]))
           return new _internal.EmptyIterable();
         return new _GeneratorIterable.slice(newStart, this[_end], this[_generator]);
       }
       take(count) {
         RangeError.checkNotNegative(count, "count");
         if (count === 0)
           return new _internal.EmptyIterable();
         let newEnd = dart.notNull(this[_start]) + dart.notNull(count);
         if (dart.notNull(newEnd) >= dart.notNull(this[_end]))
           return this;
         return new _GeneratorIterable.slice(this[_start], newEnd, this[_generator]);
       }
-      static [_id](n) {
+      static [_id$](n) {
         return n;
       }
     }
     dart.defineNamedConstructor(_GeneratorIterable, 'slice');
     return _GeneratorIterable;
   });
   dart.defineLazyClassGeneric(exports, '_GeneratorIterable', {get: _GeneratorIterable$});
   let _index = dart.JsSymbol('_index');
   let _current = dart.JsSymbol('_current');
   let _GeneratorIterator$ = dart.generic(function(E) {
     class _GeneratorIterator extends Object {
-      _GeneratorIterator($_index, $_end, $_generator) {
-        this[_index] = $_index;
-        this[_end] = $_end;
-        this[_generator] = $_generator;
+      _GeneratorIterator(index$, end$, generator$) {
+        this[_index] = index$;
+        this[_end] = end$;
+        this[_generator] = generator$;
         this[_current] = null;
       }
       moveNext() {
         if (dart.notNull(this[_index]) < dart.notNull(this[_end])) {
           this[_current] = this[_generator](this[_index]);
           this[_index] = dart.notNull(this[_index]) + 1;
           return true;
         } else {
           this[_current] = null;
           return false;
@@ skipping 30 matching lines @@
       }
       List$filled(length, fill) {
         let result = new _interceptors.JSArray.fixed(length);
         if (length !== 0 && dart.notNull(fill !== null)) {
           for (let i = 0; dart.notNull(i) < dart.notNull(result.length); i = dart.notNull(i) + 1) {
             result.set(i, fill);
           }
         }
         return dart.as(result, List$(E));
       }
-      List$from(elements, opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      List$from(elements, opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         return null;
       }
-      List$generate(length, generator, opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      List$generate(length, generator, opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         let result = null;
         if (growable) {
-          result = ((_) => {
-            _.length = length;
-            return _;
+          result = ((_$) => {
+            _$.length = length;
+            return _$;
           }).bind(this)(new List.from([]));
         } else {
           result = new List(length);
         }
         for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           result.set(i, generator(i));
         }
         return result;
       }
     }
     dart.defineNamedConstructor(List, 'filled');
     dart.defineNamedConstructor(List, 'from');
     dart.defineNamedConstructor(List, 'generate');
     return List;
   });
   let List = List$(dart.dynamic);
   let Map$ = dart.generic(function(K, V) {
     class Map extends Object {
       Map() {
         return new collection.LinkedHashMap();
       }
       Map$from(other) {
         return new collection.LinkedHashMap.from(other);
       }
       Map$identity() {
         return new collection.LinkedHashMap.identity();
       }
-      Map$fromIterable(iterable, opt$) {
-        return new collection.LinkedHashMap.fromIterable(iterable, opt$);
+      Map$fromIterable(iterable, opts) {
+        return new collection.LinkedHashMap.fromIterable(iterable, opts);
       }
       Map$fromIterables(keys, values) {
         return new collection.LinkedHashMap.fromIterables(keys, values);
       }
     }
     dart.defineNamedConstructor(Map, 'from');
     dart.defineNamedConstructor(Map, 'identity');
     dart.defineNamedConstructor(Map, 'fromIterable');
     dart.defineNamedConstructor(Map, 'fromIterables');
     return Map;
@@ skipping 15 matching lines @@
     let line = `${object}`;
     if (_internal.printToZone === null) {
       _internal.printToConsole(line);
     } else {
       dart.dinvokef(_internal.printToZone, line);
     }
   }
   class Match extends Object {
   }
   class RegExp extends Object {
-    RegExp(source, opt$) {
-      let multiLine = opt$ && 'multiLine' in opt$ ? opt$.multiLine : false;
-      let caseSensitive = opt$ && 'caseSensitive' in opt$ ? opt$.caseSensitive : true;
+    RegExp(source, opts) {
+      let multiLine = opts && 'multiLine' in opts ? opts.multiLine : false;
+      let caseSensitive = opts && 'caseSensitive' in opts ? opts.caseSensitive : true;
       return new _js_helper.JSSyntaxRegExp(source, {multiLine: multiLine, caseSensitive: caseSensitive});
     }
   }
   let Set$ = dart.generic(function(E) {
     class Set extends collection.IterableBase$(E) {
       Set() {
         return new collection.LinkedHashSet();
       }
       Set$identity() {
         return new collection.LinkedHashSet.identity();
       }
       Set$from(elements) {
         return new collection.LinkedHashSet.from(elements);
       }
     }
     dart.defineNamedConstructor(Set, 'identity');
     dart.defineNamedConstructor(Set, 'from');
     return Set;
   });
   dart.defineLazyClassGeneric(exports, 'Set', {get: Set$});
   let Sink$ = dart.generic(function(T) {
     class Sink extends Object {
     }
     return Sink;
   });
   let Sink = Sink$(dart.dynamic);
   class StackTrace extends Object {
   }
   let _stop = dart.JsSymbol('_stop');
-  let _initTicker = dart.JsSymbol('_initTicker');
-  let _now = dart.JsSymbol('_now');
+  let _initTicker$ = dart.JsSymbol('_initTicker');
+  let _now$ = dart.JsSymbol('_now');
   class Stopwatch extends Object {
     get frequency() {
       return _frequency;
     }
     Stopwatch() {
       this[_start] = null;
       this[_stop] = null;
       _initTicker();
     }
     start() {
@@ skipping 30 matching lines @@
     }
     get elapsedMicroseconds() {
       return (dart.notNull(this.elapsedTicks) * 1000000 / dart.notNull(this.frequency)).truncate();
     }
     get elapsedMilliseconds() {
       return (dart.notNull(this.elapsedTicks) * 1000 / dart.notNull(this.frequency)).truncate();
     }
     get isRunning() {
       return this[_start] !== null && this[_stop] === null;
     }
-    static [_initTicker]() {
+    static [_initTicker$]() {
       _js_helper.Primitives.initTicker();
       _frequency = _js_helper.Primitives.timerFrequency;
     }
-    static [_now]() {
+    static [_now$]() {
       return dart.as(dart.dinvoke(_js_helper.Primitives, 'timerTicks'), int);
     }
   }
   Stopwatch._frequency = null;
-  let _stringFromIterable = dart.JsSymbol('_stringFromIterable');
+  let _stringFromIterable$ = dart.JsSymbol('_stringFromIterable');
   class String extends Object {
     String$fromCharCodes(charCodes, start, end) {
       if (start === void 0)
         start = 0;
       if (end === void 0)
         end = null;
       if (!dart.is(charCodes, _interceptors.JSArray)) {
         return _stringFromIterable(charCodes, start, end);
       }
       let list = dart.as(charCodes, List);
       let len = list.length;
       if (dart.notNull(start) < 0 || dart.notNull(start) > dart.notNull(len)) {
         throw new RangeError.range(start, 0, len);
       }
       if (end === null) {
         end = len;
       } else if (dart.notNull(end) < dart.notNull(start) || dart.notNull(end) > dart.notNull(len)) {
         throw new RangeError.range(end, start, len);
       }
       if (dart.notNull(start) > 0 || dart.notNull(end) < dart.notNull(len)) {
         list = list.sublist(start, end);
       }
       return _js_helper.Primitives.stringFromCharCodes(list);
     }
     String$fromCharCode(charCode) {
       return _js_helper.Primitives.stringFromCharCode(charCode);
     }
-    String$fromEnvironment(name, opt$) {
-      let defaultValue = opt$ && 'defaultValue' in opt$ ? opt$.defaultValue : null;
+    String$fromEnvironment(name, opts) {
+      let defaultValue = opts && 'defaultValue' in opts ? opts.defaultValue : null;
       throw new UnsupportedError('String.fromEnvironment can only be used as a const constructor');
     }
-    static [_stringFromIterable](charCodes, start, end) {
+    static [_stringFromIterable$](charCodes, start, end) {
       if (dart.notNull(start) < 0)
         throw new RangeError.range(start, 0, charCodes.length);
       if (end !== null && dart.notNull(end) < dart.notNull(start)) {
         throw new RangeError.range(end, start, charCodes.length);
       }
       let it = charCodes.iterator;
       for (let i = 0; dart.notNull(i) < dart.notNull(start); i = dart.notNull(i) + 1) {
         if (!dart.notNull(it.moveNext())) {
           throw new RangeError.range(start, 0, i);
         }
@@ skipping 214 matching lines @@
     Symbol(name) {
       return new _internal.Symbol(name);
     }
   }
   class Type extends Object {
   }
   let _writeAuthority = dart.JsSymbol('_writeAuthority');
   let _userInfo = dart.JsSymbol('_userInfo');
   let _host = dart.JsSymbol('_host');
   let _port = dart.JsSymbol('_port');
-  let _defaultPort = dart.JsSymbol('_defaultPort');
+  let _defaultPort$ = dart.JsSymbol('_defaultPort');
   let _path = dart.JsSymbol('_path');
   let _query = dart.JsSymbol('_query');
   let _fragment = dart.JsSymbol('_fragment');
-  let _fail = dart.JsSymbol('_fail');
+  let _fail$ = dart.JsSymbol('_fail');
   let _pathSegments = dart.JsSymbol('_pathSegments');
   let _queryParameters = dart.JsSymbol('_queryParameters');
-  let _makeHttpUri = dart.JsSymbol('_makeHttpUri');
-  let _isWindows = dart.JsSymbol('_isWindows');
-  let _checkNonWindowsPathReservedCharacters = dart.JsSymbol('_checkNonWindowsPathReservedCharacters');
-  let _checkWindowsPathReservedCharacters = dart.JsSymbol('_checkWindowsPathReservedCharacters');
-  let _checkWindowsDriveLetter = dart.JsSymbol('_checkWindowsDriveLetter');
-  let _makeFileUri = dart.JsSymbol('_makeFileUri');
-  let _makeWindowsFileUrl = dart.JsSymbol('_makeWindowsFileUrl');
-  let _makePort = dart.JsSymbol('_makePort');
-  let _makeHost = dart.JsSymbol('_makeHost');
-  let _isRegNameChar = dart.JsSymbol('_isRegNameChar');
-  let _normalizeRegName = dart.JsSymbol('_normalizeRegName');
-  let _makeScheme = dart.JsSymbol('_makeScheme');
-  let _makeUserInfo = dart.JsSymbol('_makeUserInfo');
-  let _makePath = dart.JsSymbol('_makePath');
-  let _makeQuery = dart.JsSymbol('_makeQuery');
-  let _makeFragment = dart.JsSymbol('_makeFragment');
-  let _stringOrNullLength = dart.JsSymbol('_stringOrNullLength');
-  let _isHexDigit = dart.JsSymbol('_isHexDigit');
-  let _hexValue = dart.JsSymbol('_hexValue');
-  let _normalizeEscape = dart.JsSymbol('_normalizeEscape');
-  let _isUnreservedChar = dart.JsSymbol('_isUnreservedChar');
-  let _escapeChar = dart.JsSymbol('_escapeChar');
-  let _normalize = dart.JsSymbol('_normalize');
-  let _isSchemeCharacter = dart.JsSymbol('_isSchemeCharacter');
-  let _isGeneralDelimiter = dart.JsSymbol('_isGeneralDelimiter');
+  let _makeHttpUri$ = dart.JsSymbol('_makeHttpUri');
+  let _isWindows$ = dart.JsSymbol('_isWindows');
+  let _checkNonWindowsPathReservedCharacters$ = dart.JsSymbol('_checkNonWindowsPathReservedCharacters');
+  let _checkWindowsPathReservedCharacters$ = dart.JsSymbol('_checkWindowsPathReservedCharacters');
+  let _checkWindowsDriveLetter$ = dart.JsSymbol('_checkWindowsDriveLetter');
+  let _makeFileUri$ = dart.JsSymbol('_makeFileUri');
+  let _makeWindowsFileUrl$ = dart.JsSymbol('_makeWindowsFileUrl');
+  let _makePort$ = dart.JsSymbol('_makePort');
+  let _makeHost$ = dart.JsSymbol('_makeHost');
+  let _isRegNameChar$ = dart.JsSymbol('_isRegNameChar');
+  let _normalizeRegName$ = dart.JsSymbol('_normalizeRegName');
+  let _makeScheme$ = dart.JsSymbol('_makeScheme');
+  let _makeUserInfo$ = dart.JsSymbol('_makeUserInfo');
+  let _makePath$ = dart.JsSymbol('_makePath');
+  let _makeQuery$ = dart.JsSymbol('_makeQuery');
+  let _makeFragment$ = dart.JsSymbol('_makeFragment');
+  let _stringOrNullLength$ = dart.JsSymbol('_stringOrNullLength');
+  let _isHexDigit$ = dart.JsSymbol('_isHexDigit');
+  let _hexValue$ = dart.JsSymbol('_hexValue');
+  let _normalizeEscape$ = dart.JsSymbol('_normalizeEscape');
+  let _isUnreservedChar$ = dart.JsSymbol('_isUnreservedChar');
+  let _escapeChar$ = dart.JsSymbol('_escapeChar');
+  let _normalize$ = dart.JsSymbol('_normalize');
+  let _isSchemeCharacter$ = dart.JsSymbol('_isSchemeCharacter');
+  let _isGeneralDelimiter$ = dart.JsSymbol('_isGeneralDelimiter');
   let _merge = dart.JsSymbol('_merge');
   let _hasDotSegments = dart.JsSymbol('_hasDotSegments');
   let _removeDotSegments = dart.JsSymbol('_removeDotSegments');
   let _toWindowsFilePath = dart.JsSymbol('_toWindowsFilePath');
   let _toFilePath = dart.JsSymbol('_toFilePath');
   let _isPathAbsolute = dart.JsSymbol('_isPathAbsolute');
-  let _addIfNonEmpty = dart.JsSymbol('_addIfNonEmpty');
-  let _uriEncode = dart.JsSymbol('_uriEncode');
-  let _hexCharPairToByte = dart.JsSymbol('_hexCharPairToByte');
-  let _uriDecode = dart.JsSymbol('_uriDecode');
-  let _isAlphabeticCharacter = dart.JsSymbol('_isAlphabeticCharacter');
+  let _addIfNonEmpty$ = dart.JsSymbol('_addIfNonEmpty');
+  let _uriEncode$ = dart.JsSymbol('_uriEncode');
+  let _hexCharPairToByte$ = dart.JsSymbol('_hexCharPairToByte');
+  let _uriDecode$ = dart.JsSymbol('_uriDecode');
+  let _isAlphabeticCharacter$ = dart.JsSymbol('_isAlphabeticCharacter');
   class Uri extends Object {
     get authority() {
       if (!dart.notNull(this.hasAuthority))
         return "";
       let sb = new StringBuffer();
       this[_writeAuthority](sb);
       return sb.toString();
     }
     get userInfo() {
       return this[_userInfo];
     }
     get host() {
       if (this[_host] === null)
         return "";
       if (this[_host].startsWith('[')) {
         return this[_host].substring(1, dart.notNull(this[_host].length) - 1);
       }
       return this[_host];
     }
     get port() {
       if (this[_port] === null)
         return _defaultPort(this.scheme);
       return this[_port];
     }
-    static [_defaultPort](scheme) {
+    static [_defaultPort$](scheme) {
       if (dart.equals(scheme, "http"))
         return 80;
       if (dart.equals(scheme, "https"))
         return 443;
       return 0;
     }
     get path() {
       return this[_path];
     }
     get query() {
@@ skipping 159 matching lines @@
           query = _makeQuery(uri, dart.notNull(index) + 1, uri.length, null);
         } else {
           query = _makeQuery(uri, dart.notNull(index) + 1, numberSignIndex, null);
           fragment = _makeFragment(uri, dart.notNull(numberSignIndex) + 1, uri.length);
         }
       } else if (char === Uri._NUMBER_SIGN) {
         fragment = _makeFragment(uri, dart.notNull(index) + 1, uri.length);
       }
       return new Uri._internal(scheme, userinfo, host, port, path, query, fragment);
     }
-    static [_fail](uri, index, message) {
+    static [_fail$](uri, index, message) {
       throw new FormatException(message, uri, index);
     }
-    Uri$_internal(scheme, $_userInfo, $_host, $_port, $_path, $_query, $_fragment) {
+    Uri$_internal(scheme, userInfo$, host$, port$, path$, query$, fragment$) {
       this.scheme = scheme;
-      this[_userInfo] = $_userInfo;
-      this[_host] = $_host;
-      this[_port] = $_port;
-      this[_path] = $_path;
-      this[_query] = $_query;
-      this[_fragment] = $_fragment;
+      this[_userInfo] = userInfo$;
+      this[_host] = host$;
+      this[_port] = port$;
+      this[_path] = path$;
+      this[_query] = query$;
+      this[_fragment] = fragment$;
       this[_pathSegments] = null;
       this[_queryParameters] = null;
     }
-    Uri(opt$) {
-      let scheme = opt$ && 'scheme' in opt$ ? opt$.scheme : "";
-      let userInfo = opt$ && 'userInfo' in opt$ ? opt$.userInfo : "";
-      let host = opt$ && 'host' in opt$ ? opt$.host : null;
-      let port = opt$ && 'port' in opt$ ? opt$.port : null;
-      let path = opt$ && 'path' in opt$ ? opt$.path : null;
-      let pathSegments = opt$ && 'pathSegments' in opt$ ? opt$.pathSegments : null;
-      let query = opt$ && 'query' in opt$ ? opt$.query : null;
-      let queryParameters = opt$ && 'queryParameters' in opt$ ? opt$.queryParameters : null;
-      let fragment = opt$ && 'fragment' in opt$ ? opt$.fragment : null;
+    Uri(opts) {
+      let scheme = opts && 'scheme' in opts ? opts.scheme : "";
+      let userInfo = opts && 'userInfo' in opts ? opts.userInfo : "";
+      let host = opts && 'host' in opts ? opts.host : null;
+      let port = opts && 'port' in opts ? opts.port : null;
+      let path = opts && 'path' in opts ? opts.path : null;
+      let pathSegments = opts && 'pathSegments' in opts ? opts.pathSegments : null;
+      let query = opts && 'query' in opts ? opts.query : null;
+      let queryParameters = opts && 'queryParameters' in opts ? opts.queryParameters : null;
+      let fragment = opts && 'fragment' in opts ? opts.fragment : null;
       scheme = _makeScheme(scheme, _stringOrNullLength(scheme));
       userInfo = _makeUserInfo(userInfo, 0, _stringOrNullLength(userInfo));
       host = _makeHost(host, 0, _stringOrNullLength(host), false);
       if (dart.equals(query, ""))
         query = null;
       query = _makeQuery(query, 0, _stringOrNullLength(query), queryParameters);
       fragment = _makeFragment(fragment, 0, _stringOrNullLength(fragment));
       port = _makePort(port, scheme);
       let isFile = dart.equals(scheme, "file");
       if (dart.notNull(host === null) && (dart.notNull(userInfo.isNotEmpty) || port !== null || dart.notNull(isFile))) {
         host = "";
       }
       let ensureLeadingSlash = host !== null;
       path = _makePath(path, 0, _stringOrNullLength(path), pathSegments, ensureLeadingSlash, isFile);
       return new Uri._internal(scheme, userInfo, host, port, path, query, fragment);
     }
     Uri$http(authority, unencodedPath, queryParameters) {
       if (queryParameters === void 0)
         queryParameters = null;
       return _makeHttpUri("http", authority, unencodedPath, queryParameters);
     }
     Uri$https(authority, unencodedPath, queryParameters) {
       if (queryParameters === void 0)
         queryParameters = null;
       return _makeHttpUri("https", authority, unencodedPath, queryParameters);
     }
-    static [_makeHttpUri](scheme, authority, unencodedPath, queryParameters) {
+    static [_makeHttpUri$](scheme, authority, unencodedPath, queryParameters) {
       let userInfo = "";
       let host = null;
       let port = null;
       if (dart.notNull(authority !== null) && dart.notNull(authority.isNotEmpty)) {
         let hostStart = 0;
         let hasUserInfo = false;
         for (let i = 0; dart.notNull(i) < dart.notNull(authority.length); i = dart.notNull(i) + 1) {
           if (authority.codeUnitAt(i) === Uri._AT_SIGN) {
             hasUserInfo = true;
             userInfo = authority.substring(0, i);
@@ skipping 22 matching lines @@
             let portString = authority.substring(dart.notNull(hostEnd) + 1);
             if (portString.isNotEmpty)
               port = int.parse(portString);
             break;
           }
         }
         host = authority.substring(hostStart, hostEnd);
       }
       return new Uri({scheme: scheme, userInfo: userInfo, host: dart.as(host, String), port: dart.as(port, int), pathSegments: unencodedPath.split("/"), queryParameters: queryParameters});
     }
-    Uri$file(path, opt$) {
-      let windows = opt$ && 'windows' in opt$ ? opt$.windows : null;
-      windows = windows === null ? Uri[_isWindows] : windows;
+    Uri$file(path, opts) {
+      let windows = opts && 'windows' in opts ? opts.windows : null;
+      windows = windows === null ? Uri[_isWindows$] : windows;
       return dart.as(windows ? _makeWindowsFileUrl(path) : _makeFileUri(path), Uri);
     }
     static get base() {
       let uri = _js_helper.Primitives.currentUri();
       if (uri !== null)
         return Uri.parse(uri);
       throw new UnsupportedError("'Uri.base' is not supported");
     }
-    static get [_isWindows]() {
+    static get [_isWindows$]() {
       return false;
     }
-    static [_checkNonWindowsPathReservedCharacters](segments, argumentError) {
+    static [_checkNonWindowsPathReservedCharacters$](segments, argumentError) {
       segments.forEach(dart.closureWrap((segment) => {
         if (dart.dinvoke(segment, 'contains', "/")) {
           if (argumentError) {
             throw new ArgumentError(`Illegal path character ${segment}`);
           } else {
             throw new UnsupportedError(`Illegal path character ${segment}`);
           }
         }
       }, "(String) → void"));
     }
-    static [_checkWindowsPathReservedCharacters](segments, argumentError, firstSegment) {
+    static [_checkWindowsPathReservedCharacters$](segments, argumentError, firstSegment) {
       if (firstSegment === void 0)
         firstSegment = 0;
       segments.skip(firstSegment).forEach(dart.closureWrap((segment) => {
         if (dart.dinvoke(segment, 'contains', new RegExp('["*/:<>?\\\\|]'))) {
           if (argumentError) {
             throw new ArgumentError("Illegal character in path");
           } else {
             throw new UnsupportedError("Illegal character in path");
           }
         }
       }, "(String) → void"));
     }
-    static [_checkWindowsDriveLetter](charCode, argumentError) {
+    static [_checkWindowsDriveLetter$](charCode, argumentError) {
       if (dart.notNull(Uri._UPPER_CASE_A) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri._UPPER_CASE_Z) || dart.notNull(Uri._LOWER_CASE_A) <= dart.notNull(charCode) && dart.notNull(charCode) <= dart.notNull(Uri._LOWER_CASE_Z)) {
         return;
       }
       if (argumentError) {
         throw new ArgumentError(String['+']("Illegal drive letter ", new String.fromCharCode(charCode)));
       } else {
         throw new UnsupportedError(String['+']("Illegal drive letter ", new String.fromCharCode(charCode)));
       }
     }
-    static [_makeFileUri](path) {
+    static [_makeFileUri$](path) {
       let sep = "/";
       if (path.startsWith(sep)) {
         return new Uri({scheme: "file", pathSegments: path.split(sep)});
       } else {
         return new Uri({pathSegments: path.split(sep)});
       }
     }
-    static [_makeWindowsFileUrl](path) {
+    static [_makeWindowsFileUrl$](path) {
       if (path.startsWith("\\\\?\\")) {
         if (path.startsWith("\\\\?\\UNC\\")) {
           path = `\\${path.substring(7)}`;
         } else {
           path = path.substring(4);
           if (dart.notNull(path.length) < 3 || path.codeUnitAt(1) !== Uri._COLON || path.codeUnitAt(2) !== Uri._BACKSLASH) {
             throw new ArgumentError("Windows paths with \\\\?\\ prefix must be absolute");
           }
         }
       } else {
@@ skipping 21 matching lines @@
           let pathSegments = path.split(sep);
           _checkWindowsPathReservedCharacters(pathSegments, true);
           return new Uri({scheme: "file", pathSegments: pathSegments});
         }
       } else {
         let pathSegments = path.split(sep);
         _checkWindowsPathReservedCharacters(pathSegments, true);
         return new Uri({pathSegments: pathSegments});
       }
     }
-    replace(opt$) {
-      let scheme = opt$ && 'scheme' in opt$ ? opt$.scheme : null;
-      let userInfo = opt$ && 'userInfo' in opt$ ? opt$.userInfo : null;
-      let host = opt$ && 'host' in opt$ ? opt$.host : null;
-      let port = opt$ && 'port' in opt$ ? opt$.port : null;
-      let path = opt$ && 'path' in opt$ ? opt$.path : null;
-      let pathSegments = opt$ && 'pathSegments' in opt$ ? opt$.pathSegments : null;
-      let query = opt$ && 'query' in opt$ ? opt$.query : null;
-      let queryParameters = opt$ && 'queryParameters' in opt$ ? opt$.queryParameters : null;
-      let fragment = opt$ && 'fragment' in opt$ ? opt$.fragment : null;
+    replace(opts) {
+      let scheme = opts && 'scheme' in opts ? opts.scheme : null;
+      let userInfo = opts && 'userInfo' in opts ? opts.userInfo : null;
+      let host = opts && 'host' in opts ? opts.host : null;
+      let port = opts && 'port' in opts ? opts.port : null;
+      let path = opts && 'path' in opts ? opts.path : null;
+      let pathSegments = opts && 'pathSegments' in opts ? opts.pathSegments : null;
+      let query = opts && 'query' in opts ? opts.query : null;
+      let queryParameters = opts && 'queryParameters' in opts ? opts.queryParameters : null;
+      let fragment = opts && 'fragment' in opts ? opts.fragment : null;
       let schemeChanged = false;
       if (scheme !== null) {
         scheme = _makeScheme(scheme, scheme.length);
         schemeChanged = true;
       } else {
         scheme = this.scheme;
       }
       let isFile = dart.equals(scheme, "file");
       if (userInfo !== null) {
         userInfo = _makeUserInfo(userInfo, 0, userInfo.length);
@@ skipping 42 matching lines @@
         this[_pathSegments] = dart.as(new collection.UnmodifiableListView(dart.equals(pathToSplit, "") ? /* Unimplemented const */new List.from([]) : pathToSplit.split("/").map(Uri.decodeComponent).toList({growable: false})), List$(String));
       }
       return this[_pathSegments];
     }
     get queryParameters() {
       if (this[_queryParameters] === null) {
         this[_queryParameters] = dart.as(new collection.UnmodifiableMapView(splitQueryString(this.query)), Map$(String, String));
       }
       return this[_queryParameters];
     }
-    static [_makePort](port, scheme) {
+    static [_makePort$](port, scheme) {
       if (port !== null && port === _defaultPort(scheme))
         return null;
       return port;
     }
-    static [_makeHost](host, start, end, strictIPv6) {
+    static [_makeHost$](host, start, end, strictIPv6) {
       if (host === null)
         return null;
       if (start === end)
         return "";
       if (host.codeUnitAt(start) === Uri._LEFT_BRACKET) {
         if (host.codeUnitAt(dart.notNull(end) - 1) !== Uri._RIGHT_BRACKET) {
           _fail(host, start, 'Missing end `]` to match `[` in host');
         }
         parseIPv6Address(host, dart.notNull(start) + 1, dart.notNull(end) - 1);
         return host.substring(start, end).toLowerCase();
       }
       if (!dart.notNull(strictIPv6)) {
         for (let i = start; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
           if (host.codeUnitAt(i) === Uri._COLON) {
             parseIPv6Address(host, start, end);
             return `[${host}]`;
           }
         }
       }
       return _normalizeRegName(host, start, end);
     }
-    static [_isRegNameChar](char) {
+    static [_isRegNameChar$](char) {
       return dart.notNull(char) < 127 && dart.notNull(!dart.equals(dart.dbinary(Uri._regNameTable.get(dart.notNull(char) >> 4), '&', 1 << (dart.notNull(char) & 15)), 0));
     }
-    static [_normalizeRegName](host, start, end) {
+    static [_normalizeRegName$](host, start, end) {
       let buffer = null;
       let sectionStart = start;
       let index = start;
       let isNormalized = true;
       while (dart.notNull(index) < dart.notNull(end)) {
         let char = host.codeUnitAt(index);
         if (char === Uri._PERCENT) {
           let replacement = _normalizeEscape(host, index, true);
           if (dart.notNull(replacement === null) && dart.notNull(isNormalized)) {
             index = 3;
@@ skipping 52 matching lines @@
       if (buffer === null)
         return host.substring(start, end);
       if (dart.notNull(sectionStart) < dart.notNull(end)) {
         let slice = host.substring(sectionStart, end);
         if (!dart.notNull(isNormalized))
           slice = slice.toLowerCase();
         buffer.write(slice);
       }
       return buffer.toString();
     }
-    static [_makeScheme](scheme, end) {
+    static [_makeScheme$](scheme, end) {
       if (end === 0)
         return "";
       let firstCodeUnit = scheme.codeUnitAt(0);
       if (!dart.notNull(_isAlphabeticCharacter(firstCodeUnit))) {
         _fail(scheme, 0, "Scheme not starting with alphabetic character");
       }
       let allLowercase = dart.notNull(firstCodeUnit) >= dart.notNull(Uri._LOWER_CASE_A);
       for (let i = 0; dart.notNull(i) < dart.notNull(end); i = dart.notNull(i) + 1) {
         let codeUnit = scheme.codeUnitAt(i);
         if (!dart.notNull(_isSchemeCharacter(codeUnit))) {
           _fail(scheme, i, "Illegal scheme character");
         }
         if (dart.notNull(codeUnit) < dart.notNull(Uri._LOWER_CASE_A) || dart.notNull(codeUnit) > dart.notNull(Uri._LOWER_CASE_Z)) {
           allLowercase = false;
         }
       }
       scheme = scheme.substring(0, end);
       if (!dart.notNull(allLowercase))
         scheme = scheme.toLowerCase();
       return scheme;
     }
-    static [_makeUserInfo](userInfo, start, end) {
+    static [_makeUserInfo$](userInfo, start, end) {
       if (userInfo === null)
         return "";
       return _normalize(userInfo, start, end, dart.as(Uri._userinfoTable, List$(int)));
     }
-    static [_makePath](path, start, end, pathSegments, ensureLeadingSlash, isFile) {
+    static [_makePath$](path, start, end, pathSegments, ensureLeadingSlash, isFile) {
       if (dart.notNull(path === null) && dart.notNull(pathSegments === null))
         return isFile ? "/" : "";
       if (dart.notNull(path !== null) && dart.notNull(pathSegments !== null)) {
         throw new ArgumentError('Both path and pathSegments specified');
       }
       let result = null;
       if (path !== null) {
         result = _normalize(path, start, end, dart.as(Uri._pathCharOrSlashTable, List$(int)));
       } else {
         result = pathSegments.map(dart.closureWrap((s) => _uriEncode(dart.as(Uri._pathCharTable, List$(int)), dart.as(s, String)), "(String) → dynamic")).join("/");
       }
       if (dart.dload(result, 'isEmpty')) {
         if (isFile)
           return "/";
       } else if ((dart.notNull(isFile) || dart.notNull(ensureLeadingSlash)) && dart.notNull(!dart.equals(dart.dinvoke(result, 'codeUnitAt', 0), Uri._SLASH))) {
         return `/${result}`;
       }
       return dart.as(result, String);
     }
-    static [_makeQuery](query, start, end, queryParameters) {
+    static [_makeQuery$](query, start, end, queryParameters) {
       if (dart.notNull(query === null) && dart.notNull(queryParameters === null))
         return null;
       if (dart.notNull(query !== null) && dart.notNull(queryParameters !== null)) {
         throw new ArgumentError('Both query and queryParameters specified');
       }
       if (query !== null)
         return _normalize(query, start, end, dart.as(Uri._queryCharTable, List$(int)));
       let result = new StringBuffer();
       let first = true;
       queryParameters.forEach(dart.closureWrap(((key, value) => {
         if (!dart.notNull(first)) {
           result.write("&");
         }
         first = false;
         result.write(Uri.encodeQueryComponent(dart.as(key, String)));
         if (dart.notNull(value !== null) && dart.notNull(dart.dunary('!', dart.dload(value, 'isEmpty')))) {
           result.write("=");
           result.write(Uri.encodeQueryComponent(dart.as(value, String)));
         }
       }).bind(this), "(String, String) → void"));
       return result.toString();
     }
-    static [_makeFragment](fragment, start, end) {
+    static [_makeFragment$](fragment, start, end) {
       if (fragment === null)
         return null;
       return _normalize(fragment, start, end, dart.as(Uri._queryCharTable, List$(int)));
     }
-    static [_stringOrNullLength](s) {
+    static [_stringOrNullLength$](s) {
       return s === null ? 0 : s.length;
     }
-    static [_isHexDigit](char) {
+    static [_isHexDigit$](char) {
       if (dart.notNull(Uri._NINE) >= dart.notNull(char))
         return dart.notNull(Uri._ZERO) <= dart.notNull(char);
       char = 32;
       return dart.notNull(Uri._LOWER_CASE_A) <= dart.notNull(char) && dart.notNull(Uri._LOWER_CASE_F) >= dart.notNull(char);
     }
-    static [_hexValue](char) {
+    static [_hexValue$](char) {
       dart.assert(_isHexDigit(char));
       if (dart.notNull(Uri._NINE) >= dart.notNull(char))
         return dart.notNull(char) - dart.notNull(Uri._ZERO);
       char = 32;
       return dart.notNull(char) - (dart.notNull(Uri._LOWER_CASE_A) - 10);
     }
-    static [_normalizeEscape](source, index, lowerCase) {
+    static [_normalizeEscape$](source, index, lowerCase) {
       dart.assert(source.codeUnitAt(index) === Uri._PERCENT);
       if (dart.notNull(index) + 2 >= dart.notNull(source.length)) {
         return "%";
       }
       let firstDigit = source.codeUnitAt(dart.notNull(index) + 1);
       let secondDigit = source.codeUnitAt(dart.notNull(index) + 2);
       if (!dart.notNull(_isHexDigit(firstDigit)) || !dart.notNull(_isHexDigit(secondDigit))) {
         return "%";
       }
       let value = dart.notNull(_hexValue(firstDigit)) * 16 + dart.notNull(_hexValue(secondDigit));
       if (_isUnreservedChar(value)) {
         if (dart.notNull(lowerCase) && dart.notNull(Uri._UPPER_CASE_A) <= dart.notNull(value) && dart.notNull(Uri._UPPER_CASE_Z) >= dart.notNull(value)) {
           value = 32;
         }
         return new String.fromCharCode(value);
       }
       if (dart.notNull(firstDigit) >= dart.notNull(Uri._LOWER_CASE_A) || dart.notNull(secondDigit) >= dart.notNull(Uri._LOWER_CASE_A)) {
         return source.substring(index, dart.notNull(index) + 3).toUpperCase();
       }
       return null;
     }
-    static [_isUnreservedChar](ch) {
+    static [_isUnreservedChar$](ch) {
       return dart.notNull(ch) < 127 && dart.notNull(!dart.equals(dart.dbinary(Uri._unreservedTable.get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
     }
-    static [_escapeChar](char) {
+    static [_escapeChar$](char) {
       dart.assert(dart.dbinary(char, '<=', 1114111));
       let hexDigits = "0123456789ABCDEF";
       let codeUnits = null;
       if (dart.dbinary(char, '<', 128)) {
         codeUnits = new List(3);
         codeUnits.set(0, Uri._PERCENT);
         codeUnits.set(1, hexDigits.codeUnitAt(dart.as(dart.dbinary(char, '>>', 4), int)));
         codeUnits.set(2, hexDigits.codeUnitAt(dart.as(dart.dbinary(char, '&', 15), int)));
       } else {
         let flag = 192;
@@ skipping 12 matching lines @@
           let byte = dart.as(dart.dbinary(dart.dbinary(dart.dbinary(char, '>>', 6 * dart.notNull(encodedBytes)), '&', 63), '|', flag), int);
           codeUnits.set(index, Uri._PERCENT);
           codeUnits.set(dart.notNull(index) + 1, hexDigits.codeUnitAt(dart.notNull(byte) >> 4));
           codeUnits.set(dart.notNull(index) + 2, hexDigits.codeUnitAt(dart.notNull(byte) & 15));
           index = 3;
           flag = 128;
         }
       }
       return new String.fromCharCodes(dart.as(codeUnits, Iterable$(int)));
     }
-    static [_normalize](component, start, end, charTable) {
+    static [_normalize$](component, start, end, charTable) {
       let buffer = null;
       let sectionStart = start;
       let index = start;
       while (dart.notNull(index) < dart.notNull(end)) {
         let char = component.codeUnitAt(index);
         if (dart.notNull(char) < 127 && (dart.notNull(charTable.get(dart.notNull(char) >> 4)) & 1 << (dart.notNull(char) & 15)) !== 0) {
           index = dart.notNull(index) + 1;
         } else {
           let replacement = null;
           let sourceLength = null;
@@ skipping 33 matching lines @@
         }
       }
       if (buffer === null) {
         return component.substring(start, end);
       }
       if (dart.notNull(sectionStart) < dart.notNull(end)) {
         buffer.write(component.substring(sectionStart, end));
       }
       return buffer.toString();
     }
-    static [_isSchemeCharacter](ch) {
+    static [_isSchemeCharacter$](ch) {
       return dart.notNull(ch) < 128 && dart.notNull(!dart.equals(dart.dbinary(Uri._schemeTable.get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
     }
-    static [_isGeneralDelimiter](ch) {
+    static [_isGeneralDelimiter$](ch) {
       return dart.notNull(ch) <= dart.notNull(Uri._RIGHT_BRACKET) && dart.notNull(!dart.equals(dart.dbinary(Uri._genDelimitersTable.get(dart.notNull(ch) >> 4), '&', 1 << (dart.notNull(ch) & 15)), 0));
     }
     get isAbsolute() {
       return dart.notNull(!dart.equals(this.scheme, "")) && dart.notNull(dart.equals(this.fragment, ""));
     }
     [_merge](base, reference) {
       if (base.isEmpty)
         return `/${reference}`;
       let backCount = 0;
       let refStart = 0;
@@ skipping 114 matching lines @@
       if (dart.notNull(dart.equals(this.scheme, "")) || dart.notNull(this[_host] === null) || dart.notNull(dart.equals(this[_host], ""))) {
         throw new StateError(`Cannot use origin without a scheme: ${this}`);
       }
       if (dart.notNull(!dart.equals(this.scheme, "http")) && dart.notNull(!dart.equals(this.scheme, "https"))) {
         throw new StateError(`Origin is only applicable schemes http and https: ${this}`);
       }
       if (this[_port] === null)
         return `${this.scheme}://${this[_host]}`;
       return `${this.scheme}://${this[_host]}:${this[_port]}`;
     }
-    toFilePath(opt$) {
-      let windows = opt$ && 'windows' in opt$ ? opt$.windows : null;
+    toFilePath(opts) {
+      let windows = opts && 'windows' in opts ? opts.windows : null;
       if (dart.notNull(!dart.equals(this.scheme, "")) && dart.notNull(!dart.equals(this.scheme, "file"))) {
         throw new UnsupportedError(`Cannot extract a file path from a ${this.scheme} URI`);
       }
       if (!dart.equals(this.query, "")) {
         throw new UnsupportedError("Cannot extract a file path from a URI with a query component");
       }
       if (!dart.equals(this.fragment, "")) {
         throw new UnsupportedError("Cannot extract a file path from a URI with a fragment component");
       }
       if (windows === null)
@@ skipping 75 matching lines @@
       let uri = dart.as(other, Uri);
       return dart.notNull(dart.equals(this.scheme, uri.scheme)) && this.hasAuthority === uri.hasAuthority && dart.notNull(dart.equals(this.userInfo, uri.userInfo)) && dart.notNull(dart.equals(this.host, uri.host)) && this.port === uri.port && dart.notNull(dart.equals(this.path, uri.path)) && this.hasQuery === uri.hasQuery && dart.notNull(dart.equals(this.query, uri.query)) && this.hasFragment === uri.hasFragment && dart.notNull(dart.equals(this.fragment, uri.fragment));
     }
     get hashCode() {
       // Function combine: (dynamic, dynamic) → int
       function combine(part, current) {
         return dart.as(dart.dbinary(dart.dbinary(dart.dbinary(current, '*', 31), '+', dart.dload(part, 'hashCode')), '&', 1073741823), int);
       }
       return combine(this.scheme, combine(this.userInfo, combine(this.host, combine(this.port, combine(this.path, combine(this.query, combine(this.fragment, 1)))))));
     }
-    static [_addIfNonEmpty](sb, test, first, second) {
+    static [_addIfNonEmpty$](sb, test, first, second) {
       if (!dart.equals("", test)) {
         sb.write(first);
         sb.write(second);
       }
     }
     static encodeComponent(component) {
       return _uriEncode(dart.as(Uri._unreserved2396Table, List$(int)), component);
     }
-    static encodeQueryComponent(component, opt$) {
-      let encoding = opt$ && 'encoding' in opt$ ? opt$.encoding : convert.UTF8;
+    static encodeQueryComponent(component, opts) {
+      let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
       return _uriEncode(dart.as(Uri._unreservedTable, List$(int)), component, {encoding: encoding, spaceToPlus: true});
     }
     static decodeComponent(encodedComponent) {
       return _uriDecode(encodedComponent);
     }
-    static decodeQueryComponent(encodedComponent, opt$) {
-      let encoding = opt$ && 'encoding' in opt$ ? opt$.encoding : convert.UTF8;
+    static decodeQueryComponent(encodedComponent, opts) {
+      let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
       return _uriDecode(encodedComponent, {plusToSpace: true, encoding: encoding});
     }
     static encodeFull(uri) {
       return _uriEncode(dart.as(Uri._encodeFullTable, List$(int)), uri);
     }
     static decodeFull(uri) {
       return _uriDecode(uri);
     }
-    static splitQueryString(query, opt$) {
-      let encoding = opt$ && 'encoding' in opt$ ? opt$.encoding : convert.UTF8;
+    static splitQueryString(query, opts) {
+      let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
       return dart.as(query.split("&").fold(dart.map(), dart.closureWrap((map, element) => {
         let index = dart.as(dart.dinvoke(element, 'indexOf', "="), int);
         if (index === -1) {
           if (!dart.equals(element, "")) {
             dart.dsetindex(map, decodeQueryComponent(dart.as(element, String), {encoding: encoding}), "");
           }
         } else if (index !== 0) {
           let key = dart.dinvoke(element, 'substring', 0, index);
           let value = dart.dinvoke(element, 'substring', dart.notNull(index) + 1);
           dart.dsetindex(map, Uri.decodeQueryComponent(dart.as(key, String), {encoding: encoding}), decodeQueryComponent(dart.as(value, String), {encoding: encoding}));
@@ skipping 108 matching lines @@
             index = 2;
           }
         } else {
           bytes.set(index, dart.notNull(value) >> 8);
           bytes.set(dart.notNull(index) + 1, dart.notNull(value) & 255);
           index = 2;
         }
       }
       return dart.as(bytes, List$(int));
     }
-    static [_uriEncode](canonicalTable, text, opt$) {
-      let encoding = opt$ && 'encoding' in opt$ ? opt$.encoding : convert.UTF8;
-      let spaceToPlus = opt$ && 'spaceToPlus' in opt$ ? opt$.spaceToPlus : false;
+    static [_uriEncode$](canonicalTable, text, opts) {
+      let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
+      let spaceToPlus = opts && 'spaceToPlus' in opts ? opts.spaceToPlus : false;
       // Function byteToHex: (dynamic, dynamic) → dynamic
       function byteToHex(byte, buffer) {
         let hex = '0123456789ABCDEF';
         dart.dinvoke(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dbinary(byte, '>>', 4), int)));
         dart.dinvoke(buffer, 'writeCharCode', hex.codeUnitAt(dart.as(dart.dbinary(byte, '&', 15), int)));
       }
       let result = new StringBuffer();
       let bytes = encoding.encode(text);
       for (let i = 0; dart.notNull(i) < dart.notNull(bytes.length); i = dart.notNull(i) + 1) {
         let byte = bytes.get(i);
         if (dart.notNull(byte) < 128 && (dart.notNull(canonicalTable.get(dart.notNull(byte) >> 4)) & 1 << (dart.notNull(byte) & 15)) !== 0) {
           result.writeCharCode(byte);
         } else if (dart.notNull(spaceToPlus) && byte === Uri._SPACE) {
           result.writeCharCode(Uri._PLUS);
         } else {
           result.writeCharCode(Uri._PERCENT);
           byteToHex(byte, result);
         }
       }
       return result.toString();
     }
-    static [_hexCharPairToByte](s, pos) {
+    static [_hexCharPairToByte$](s, pos) {
       let byte = 0;
       for (let i = 0; dart.notNull(i) < 2; i = dart.notNull(i) + 1) {
         let charCode = s.codeUnitAt(dart.notNull(pos) + dart.notNull(i));
         if (48 <= dart.notNull(charCode) && dart.notNull(charCode) <= 57) {
           byte = dart.notNull(byte) * 16 + dart.notNull(charCode) - 48;
         } else {
           charCode = 32;
           if (97 <= dart.notNull(charCode) && dart.notNull(charCode) <= 102) {
             byte = dart.notNull(byte) * 16 + dart.notNull(charCode) - 87;
           } else {
             throw new ArgumentError("Invalid URL encoding");
           }
         }
       }
       return byte;
     }
-    static [_uriDecode](text, opt$) {
-      let plusToSpace = opt$ && 'plusToSpace' in opt$ ? opt$.plusToSpace : false;
-      let encoding = opt$ && 'encoding' in opt$ ? opt$.encoding : convert.UTF8;
+    static [_uriDecode$](text, opts) {
+      let plusToSpace = opts && 'plusToSpace' in opts ? opts.plusToSpace : false;
+      let encoding = opts && 'encoding' in opts ? opts.encoding : convert.UTF8;
       let simple = true;
       for (let i = 0; dart.notNull(i) < dart.notNull(text.length) && dart.notNull(simple); i = dart.notNull(i) + 1) {
         let codeUnit = text.codeUnitAt(i);
         simple = codeUnit !== Uri._PERCENT && codeUnit !== Uri._PLUS;
       }
       let bytes = null;
       if (simple) {
         if (dart.notNull(dart.equals(encoding, convert.UTF8)) || dart.notNull(dart.equals(encoding, convert.LATIN1))) {
           return text;
         } else {
@@ skipping 14 matching lines @@
             i = 2;
           } else if (dart.notNull(plusToSpace) && codeUnit === Uri._PLUS) {
             bytes.add(Uri._SPACE);
           } else {
             bytes.add(codeUnit);
           }
         }
       }
       return encoding.decode(bytes);
     }
-    static [_isAlphabeticCharacter](codeUnit) {
+    static [_isAlphabeticCharacter$](codeUnit) {
       return dart.notNull(codeUnit) >= dart.notNull(Uri._LOWER_CASE_A) && dart.notNull(codeUnit) <= dart.notNull(Uri._LOWER_CASE_Z) || dart.notNull(codeUnit) >= dart.notNull(Uri._UPPER_CASE_A) && dart.notNull(codeUnit) <= dart.notNull(Uri._UPPER_CASE_Z);
     }
   }
   dart.defineNamedConstructor(Uri, '_internal');
   dart.defineNamedConstructor(Uri, 'http');
   dart.defineNamedConstructor(Uri, 'https');
   dart.defineNamedConstructor(Uri, 'file');
   Uri._SPACE = 32;
   Uri._DOUBLE_QUOTE = 34;
   Uri._NUMBER_SIGN = 35;
@@ skipping 110 matching lines @@
   exports.StackTrace = StackTrace;
   exports.Stopwatch = Stopwatch;
   exports.String = String;
   exports.RuneIterator = RuneIterator;
   exports.StringBuffer = StringBuffer;
   exports.StringSink = StringSink;
   exports.Symbol = Symbol;
   exports.Type = Type;
   exports.Uri = Uri;
 })(core || (core = {}));