fixes private named constructors

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, opts) {
+    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 _internal$ = dart.JsSymbol('_internal');
+  let _now = dart.JsSymbol('_now');
   let _brokenDownDateToMillisecondsSinceEpoch = dart.JsSymbol('_brokenDownDateToMillisecondsSinceEpoch');
   let _MAX_MILLISECONDS_SINCE_EPOCH = dart.JsSymbol('_MAX_MILLISECONDS_SINCE_EPOCH');
   let _fourDigits = dart.JsSymbol('_fourDigits');
   let _sixDigits = dart.JsSymbol('_sixDigits');
   let _threeDigits = dart.JsSymbol('_threeDigits');
   let _twoDigits = dart.JsSymbol('_twoDigits');
-  let _internal$ = dart.JsSymbol('_internal');
-  let _now = dart.JsSymbol('_now');
   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;
       if (second === void 0)
         second = 0;
       if (millisecond === void 0)
         millisecond = 0;
-      this.DateTime$_internal(year, month, day, hour, minute, second, millisecond, false);
+      this[_internal$](year, month, day, hour, minute, second, millisecond, false);
     }
-    DateTime$utc(year, month, day, hour, minute, second, millisecond) {
+    utc(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;
       if (second === void 0)
         second = 0;
       if (millisecond === void 0)
         millisecond = 0;
-      this.DateTime$_internal(year, month, day, hour, minute, second, millisecond, true);
+      this[_internal$](year, month, day, hour, minute, second, millisecond, true);
     }
-    DateTime$now() {
-      this.DateTime$_now();
+    now() {
+      this[_now]();
     }
     static parse(formattedString) {
       let re = new RegExp('^([+-]?\\d{4,6})-?(\\d\\d)-?(\\d\\d)' + '(?:[ T](\\d\\d)(?::?(\\d\\d)(?::?(\\d\\d)(.\\d{1,6})?)?)?' + '( ?[zZ]| ?([-+])(\\d\\d)(?::?(\\d\\d))?)?)?$');
       let match = re.firstMatch(formattedString);
       if (match !== null) {
         // Function parseIntOrZero: (String) → int
         function parseIntOrZero(matched) {
           if (matched === null)
             return 0;
           return int.parse(matched);
@@ skipping 31 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, opts) {
+    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) {
@@ skipping 92 matching lines @@
     }
     subtract(duration) {
       let ms = this.millisecondsSinceEpoch;
       return new DateTime.fromMillisecondsSinceEpoch(dart.notNull(ms) - dart.notNull(duration.inMilliseconds), {isUtc: this.isUtc});
     }
     difference(other) {
       let ms = this.millisecondsSinceEpoch;
       let otherMs = other.millisecondsSinceEpoch;
       return new Duration({milliseconds: dart.notNull(ms) - dart.notNull(otherMs)});
     }
-    DateTime$_internal(year, month, day, hour, minute, second, millisecond, isUtc) {
+    [_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() {
+    [_now]() {
       this.isUtc = false;
       this.millisecondsSinceEpoch = _js_helper.Primitives.dateNow();
     }
     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);
@@ skipping 90 matching lines @@
       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 _microseconds = dart.JsSymbol('_microseconds');
   let _duration = dart.JsSymbol('_duration');
-  let _microseconds = dart.JsSymbol('_microseconds');
   class Duration extends Object {
     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));
+      this[_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$) {
+    [_microseconds](duration$) {
       this[_duration] = duration$;
     }
     ['+'](other) {
-      return new Duration._microseconds(dart.notNull(this[_duration]) + dart.notNull(other[_duration]));
+      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]));
+      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());
+      return new Duration[_microseconds]((dart.notNull(this[_duration]) * dart.notNull(factor)).round());
     }
     ['~/'](quotient) {
       if (quotient === 0)
         throw new IntegerDivisionByZeroException();
-      return new Duration._microseconds((dart.notNull(this[_duration]) / dart.notNull(quotient)).truncate());
+      return new Duration[_microseconds]((dart.notNull(this[_duration]) / dart.notNull(quotient)).truncate());
     }
     ['<'](other) {
       return dart.notNull(this[_duration]) < dart.notNull(other[_duration]);
     }
     ['>'](other) {
       return dart.notNull(this[_duration]) > dart.notNull(other[_duration]);
     }
     ['<='](other) {
       return dart.notNull(this[_duration]) <= dart.notNull(other[_duration]);
     }
@@ skipping 55 matching lines @@
       }
       let twoDigitMinutes = twoDigits(this.inMinutes.remainder(Duration.MINUTES_PER_HOUR));
       let twoDigitSeconds = twoDigits(this.inSeconds.remainder(Duration.SECONDS_PER_MINUTE));
       let sixDigitUs = sixDigits(this.inMicroseconds.remainder(Duration.MICROSECONDS_PER_SECOND));
       return `${this.inHours}:${twoDigitMinutes}:${twoDigitSeconds}.${sixDigitUs}`;
     }
     get isNegative() {
       return dart.notNull(this[_duration]) < 0;
     }
     abs() {
-      return new Duration._microseconds(this[_duration].abs());
+      return new Duration[_microseconds](this[_duration].abs());
     }
     ['-']() {
-      return new Duration._microseconds(-dart.notNull(this[_duration]));
+      return new Duration[_microseconds](-dart.notNull(this[_duration]));
     }
   }
   dart.defineNamedConstructor(Duration, _microseconds);
   Duration.MICROSECONDS_PER_MILLISECOND = 1000;
   Duration.MILLISECONDS_PER_SECOND = 1000;
   Duration.SECONDS_PER_MINUTE = 60;
   Duration.MINUTES_PER_HOUR = 60;
   Duration.HOURS_PER_DAY = 24;
   Duration.MICROSECONDS_PER_SECOND = dart.notNull(Duration.MICROSECONDS_PER_MILLISECOND) * dart.notNull(Duration.MILLISECONDS_PER_SECOND);
   Duration.MICROSECONDS_PER_MINUTE = dart.notNull(Duration.MICROSECONDS_PER_SECOND) * dart.notNull(Duration.SECONDS_PER_MINUTE);
@@ skipping 45 matching lines @@
   class ArgumentError extends Error {
     ArgumentError(message) {
       if (message === void 0)
         message = null;
       this.message = message;
       this.invalidValue = null;
       this[_hasValue] = false;
       this.name = null;
       super.Error();
     }
-    ArgumentError$value(value, name, message) {
+    value(value, name, message) {
       if (name === void 0)
         name = null;
       if (message === void 0)
         message = "Invalid argument";
       this.name = name;
       this.message = message;
       this.invalidValue = value;
       this[_hasValue] = true;
       super.Error();
     }
-    ArgumentError$notNull(name) {
+    notNull(name) {
       if (name === void 0)
         name = null;
-      this.ArgumentError$value(null, name, "Must not be null");
+      this.value(null, name, "Must not be null");
     }
     toString() {
       if (!dart.notNull(this[_hasValue])) {
         let result = "Invalid arguments(s)";
         if (this.message !== null) {
           result = `${result}: ${this.message}`;
         }
         return result;
       }
       let nameString = "";
       if (this.name !== null) {
         nameString = ` (${this.name})`;
       }
       return `${this.message}${nameString}: ${Error.safeToString(this.invalidValue)}`;
     }
   }
   dart.defineNamedConstructor(ArgumentError, 'value');
   dart.defineNamedConstructor(ArgumentError, 'notNull');
   class RangeError extends ArgumentError {
     RangeError(message) {
       this.start = null;
       this.end = null;
       super.ArgumentError(message);
     }
-    RangeError$value(value, name, message) {
+    value(value, name, message) {
       if (name === void 0)
         name = null;
       if (message === void 0)
         message = null;
       this.start = null;
       this.end = null;
-      super.ArgumentError$value(value, name, message !== null ? message : "Value not in range");
+      super.value(value, name, message !== null ? message : "Value not in range");
     }
-    RangeError$range(invalidValue, minValue, maxValue, name, message) {
+    range(invalidValue, minValue, maxValue, name, message) {
       if (name === void 0)
         name = null;
       if (message === void 0)
         message = null;
       this.start = minValue;
       this.end = maxValue;
-      super.ArgumentError$value(invalidValue, name, message !== null ? message : "Invalid value");
+      super.value(invalidValue, name, message !== null ? message : "Invalid value");
     }
-    RangeError$index(index, indexable, name, message, length) {
+    index(index, indexable, name, message, length) {
       return new IndexError(index, indexable, name, message, length);
     }
     static checkValueInInterval(value, minValue, maxValue, name, message) {
       if (name === void 0)
         name = null;
       if (message === void 0)
         message = null;
       if (dart.notNull(value) < dart.notNull(minValue) || dart.notNull(value) > dart.notNull(maxValue)) {
         throw new RangeError.range(value, minValue, maxValue, name, message);
       }
@@ skipping 66 matching lines @@
   class IndexError extends ArgumentError {
     IndexError(invalidValue, indexable, name, message, length) {
       if (name === void 0)
         name = null;
       if (message === void 0)
         message = null;
       if (length === void 0)
         length = null;
       this.indexable = indexable;
       this.length = dart.as(length !== null ? length : dart.dload(indexable, 'length'), int);
-      super.ArgumentError$value(invalidValue, name, message !== null ? message : "Index out of range");
+      super.value(invalidValue, name, message !== null ? message : "Index out of range");
     }
     get start() {
       return 0;
     }
     get end() {
       return dart.notNull(this.length) - 1;
     }
     toString() {
       dart.assert(this[_hasValue]);
       let target = Error.safeToString(this.indexable);
@@ skipping 319 matching lines @@
   }
   // 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, opts) {
+    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, 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) {
     class Iterable extends Object {
       Iterable() {
       }
-      Iterable$generate(count, generator) {
+      generate(count, generator) {
         if (generator === void 0)
           generator = null;
         if (dart.notNull(count) <= 0)
           return new _internal.EmptyIterable();
         return new _GeneratorIterable(count, generator);
       }
       join(separator) {
         if (separator === void 0)
           separator = "";
         let buffer = new StringBuffer();
@@ skipping 19 matching lines @@
   let _generator = dart.JsSymbol('_generator');
   let _id = dart.JsSymbol('_id');
   let _GeneratorIterable$ = dart.generic(function(E) {
     class _GeneratorIterable extends collection.IterableBase$(E) {
       _GeneratorIterable(end$, generator) {
         this[_end] = end$;
         this[_start] = 0;
         this[_generator] = dart.as(generator !== null ? generator : _GeneratorIterable[_id], _Generator);
         super.IterableBase();
       }
-      _GeneratorIterable$slice(start$, end$, generator$) {
+      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]);
@@ skipping 66 matching lines @@
   let List$ = dart.generic(function(E) {
     class List extends Object {
       List(length) {
         if (length === void 0)
           length = new _ListConstructorSentinel();
         if (length === new _ListConstructorSentinel()) {
           return new _interceptors.JSArray.emptyGrowable();
         }
         return new _interceptors.JSArray.fixed(length);
       }
-      List$filled(length, fill) {
+      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, opts) {
+      from(elements, opts) {
         let growable = opts && 'growable' in opts ? opts.growable : true;
         return null;
       }
-      List$generate(length, generator, opts) {
+      generate(length, generator, opts) {
         let growable = opts && 'growable' in opts ? opts.growable : true;
         let result = null;
         if (growable) {
           result = ((_$) => {
             _$.length = length;
             return _$;
           }).bind(this)(new List$(E).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) {
+      from(other) {
         return new collection.LinkedHashMap.from(other);
       }
-      Map$identity() {
+      identity() {
         return new collection.LinkedHashMap.identity();
       }
-      Map$fromIterable(iterable, opts) {
+      fromIterable(iterable, opts) {
         return new collection.LinkedHashMap.fromIterable(iterable, opts);
       }
-      Map$fromIterables(keys, values) {
+      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;
   });
   let Map = Map$(dart.dynamic, dart.dynamic);
   let _uninstantiable = dart.JsSymbol('_uninstantiable');
   class Null extends Object {
-    Null$_uninstantiable() {
+    [_uninstantiable]() {
       throw new UnsupportedError('class Null cannot be instantiated');
     }
     toString() {
       return "null";
     }
   }
   dart.defineNamedConstructor(Null, _uninstantiable);
   class Pattern extends Object {
   }
   // Function print: (Object) → void
@@ skipping 12 matching lines @@
       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() {
+      identity() {
         return new collection.LinkedHashSet.identity();
       }
-      Set$from(elements) {
+      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 {
@@ skipping 60 matching lines @@
       _js_helper.Primitives.initTicker();
       Stopwatch[_frequency] = _js_helper.Primitives.timerFrequency;
     }
     static [_now]() {
       return dart.as(dart.dinvoke(_js_helper.Primitives, 'timerTicks'), int);
     }
   }
   Stopwatch._frequency = null;
   let _stringFromIterable = dart.JsSymbol('_stringFromIterable');
   class String extends Object {
-    String$fromCharCodes(charCodes, start, end) {
+    fromCharCodes(charCodes, start, end) {
       if (start === void 0)
         start = 0;
       if (end === void 0)
         end = null;
       if (!dart.is(charCodes, _interceptors.JSArray)) {
         return String[_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) {
+    fromCharCode(charCode) {
       return _js_helper.Primitives.stringFromCharCode(charCode);
     }
-    String$fromEnvironment(name, opts) {
+    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) {
       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;
@@ skipping 64 matching lines @@
   let _nextPosition = dart.JsSymbol('_nextPosition');
   let _currentCodePoint = dart.JsSymbol('_currentCodePoint');
   let _checkSplitSurrogate = dart.JsSymbol('_checkSplitSurrogate');
   class RuneIterator extends Object {
     RuneIterator(string) {
       this.string = string;
       this[_position] = 0;
       this[_nextPosition] = 0;
       this[_currentCodePoint] = null;
     }
-    RuneIterator$at(string, index) {
+    at(string, index) {
       this.string = string;
       this[_position] = index;
       this[_nextPosition] = index;
       this[_currentCodePoint] = null;
       RangeError.checkValueInInterval(index, 0, string.length);
       this[_checkSplitSurrogate](index);
     }
     [_checkSplitSurrogate](index) {
       if (dart.notNull(index) > 0 && dart.notNull(index) < dart.notNull(this.string.length) && dart.notNull(_isLeadSurrogate(this.string.codeUnitAt(dart.notNull(index) - 1))) && dart.notNull(_isTrailSurrogate(this.string.codeUnitAt(index)))) {
         throw new ArgumentError(`Index inside surrogate pair: ${index}`);
@@ skipping 407 matching lines @@
         let numberSignIndex = uri.indexOf('#', dart.notNull(index) + 1);
         if (dart.notNull(numberSignIndex) < 0) {
           query = Uri[_makeQuery](uri, dart.notNull(index) + 1, uri.length, null);
         } else {
           query = Uri[_makeQuery](uri, dart.notNull(index) + 1, numberSignIndex, null);
           fragment = Uri[_makeFragment](uri, dart.notNull(numberSignIndex) + 1, uri.length);
         }
       } else if (char === Uri[_NUMBER_SIGN]) {
         fragment = Uri[_makeFragment](uri, dart.notNull(index) + 1, uri.length);
       }
-      return new Uri._internal(scheme, userinfo, host, port, path, query, fragment);
+      return new Uri[_internal$](scheme, userinfo, host, port, path, query, fragment);
     }
     static [_fail](uri, index, message) {
       throw new FormatException(message, uri, index);
     }
-    Uri$_internal(scheme, userInfo$, host$, port$, path$, query$, fragment$) {
+    [_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[_pathSegments] = null;
       this[_queryParameters] = null;
     }
@@ skipping 14 matching lines @@
         query = null;
       query = Uri[_makeQuery](query, 0, Uri[_stringOrNullLength](query), queryParameters);
       fragment = Uri[_makeFragment](fragment, 0, Uri[_stringOrNullLength](fragment));
       port = Uri[_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 = Uri[_makePath](path, 0, Uri[_stringOrNullLength](path), pathSegments, ensureLeadingSlash, isFile);
-      return new Uri._internal(scheme, userInfo, host, port, path, query, fragment);
+      return new Uri[_internal$](scheme, userInfo, host, port, path, query, fragment);
     }
-    Uri$http(authority, unencodedPath, queryParameters) {
+    http(authority, unencodedPath, queryParameters) {
       if (queryParameters === void 0)
         queryParameters = null;
       return Uri[_makeHttpUri]("http", authority, unencodedPath, queryParameters);
     }
-    Uri$https(authority, unencodedPath, queryParameters) {
+    https(authority, unencodedPath, queryParameters) {
       if (queryParameters === void 0)
         queryParameters = null;
       return Uri[_makeHttpUri]("https", 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;
@@ skipping 27 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, opts) {
+    file(path, opts) {
       let windows = opts && 'windows' in opts ? opts.windows : null;
       windows = windows === null ? Uri[_isWindows] : windows;
       return dart.as(windows ? Uri[_makeWindowsFileUrl](path) : Uri[_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");
     }
@@ skipping 134 matching lines @@
       if (dart.notNull(query !== null) || dart.notNull(queryParameters !== null)) {
         query = Uri[_makeQuery](query, 0, Uri[_stringOrNullLength](query), queryParameters);
       } else if (this.hasQuery) {
         query = this.query;
       }
       if (fragment !== null) {
         fragment = Uri[_makeFragment](fragment, 0, fragment.length);
       } else if (this.hasFragment) {
         fragment = this.fragment;
       }
-      return new Uri._internal(scheme, userInfo, host, port, path, query, fragment);
+      return new Uri[_internal$](scheme, userInfo, host, port, path, query, fragment);
     }
     get pathSegments() {
       if (this[_pathSegments] === null) {
         let pathToSplit = !dart.notNull(this.path.isEmpty) && this.path.codeUnitAt(0) === Uri[_SLASH] ? this.path.substring(1) : this.path;
         this[_pathSegments] = dart.as(new collection.UnmodifiableListView(dart.equals(pathToSplit, "") ? /* Unimplemented const */new List$(String).from([]) : pathToSplit.split("/").map(Uri.decodeComponent).toList({growable: false})), List$(String));
       }
       return this[_pathSegments];
     }
     get queryParameters() {
       if (this[_queryParameters] === null) {
@@ skipping 413 matching lines @@
             }
             if (reference.hasQuery)
               targetQuery = reference.query;
           }
           targetUserInfo = this[_userInfo];
           targetHost = this[_host];
           targetPort = this[_port];
         }
       }
       let fragment = reference.hasFragment ? reference.fragment : null;
-      return new Uri._internal(targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, fragment);
+      return new Uri[_internal$](targetScheme, targetUserInfo, targetHost, targetPort, targetPath, targetQuery, fragment);
     }
     get hasAuthority() {
       return this[_host] !== null;
     }
     get hasPort() {
       return this[_port] !== null;
     }
     get hasQuery() {
       return this[_query] !== null;
     }
@@ skipping 466 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 = {}));