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

lib/runtime/dart/_internal.js

 var _internal;
 (function(exports) {
   'use strict';
   class EfficientLength extends core.Object {
   }
   let ListIterable$ = dart.generic(function(E) {
     class ListIterable extends collection.IterableBase$(E) {
       ListIterable() {
         super.IterableBase();
       }
@@ skipping 55 matching lines @@
         let length = this.length;
         for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           if (test(this.elementAt(i)))
             return true;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         return false;
       }
-      firstWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      firstWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         let length = this.length;
         for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
           let element = this.elementAt(i);
           if (test(element))
             return element;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         if (orElse !== null)
           return orElse();
         throw IterableElementError.noElement();
       }
-      lastWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      lastWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         let length = this.length;
         for (let i = dart.notNull(length) - 1; dart.notNull(i) >= 0; i = dart.notNull(i) - 1) {
           let element = this.elementAt(i);
           if (test(element))
             return element;
           if (length !== this.length) {
             throw new core.ConcurrentModificationError(this);
           }
         }
         if (orElse !== null)
@@ skipping 87 matching lines @@
       }
       skipWhile(test) {
         return super.skipWhile(test);
       }
       take(count) {
         return new SubListIterable(this, 0, count);
       }
       takeWhile(test) {
         return super.takeWhile(test);
       }
-      toList(opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      toList(opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         let result = null;
         if (growable) {
           result = ((_) => {
             _.length = this.length;
             return _;
           }).bind(this)(new core.List());
         } else {
           result = new core.List(this.length);
         }
         for (let i = 0; dart.notNull(i) < dart.notNull(this.length); i = dart.notNull(i) + 1) {
@@ skipping 12 matching lines @@
     return ListIterable;
   });
   let ListIterable = ListIterable$(dart.dynamic);
   let _iterable = Symbol('_iterable');
   let _start = Symbol('_start');
   let _endOrLength = Symbol('_endOrLength');
   let _endIndex = Symbol('_endIndex');
   let _startIndex = Symbol('_startIndex');
   let SubListIterable$ = dart.generic(function(E) {
     class SubListIterable extends ListIterable$(E) {
-      SubListIterable($_iterable, $_start, $_endOrLength) {
-        this[_iterable] = $_iterable;
-        this[_start] = $_start;
-        this[_endOrLength] = $_endOrLength;
+      SubListIterable(iterable$, start$, endOrLength) {
+        this[_iterable] = iterable$;
+        this[_start] = start$;
+        this[_endOrLength] = endOrLength;
         super.ListIterable();
         core.RangeError.checkNotNegative(this[_start], "start");
         if (this[_endOrLength] !== null) {
           core.RangeError.checkNotNegative(this[_endOrLength], "end");
           if (dart.notNull(this[_start]) > dart.notNull(this[_endOrLength])) {
             throw new core.RangeError.range(this[_start], 0, this[_endOrLength], "start");
           }
         }
       }
       get [_endIndex]() {
@@ skipping 36 matching lines @@
         core.RangeError.checkNotNegative(count, "count");
         if (this[_endOrLength] === null) {
           return new SubListIterable(this[_iterable], this[_start], dart.notNull(this[_start]) + dart.notNull(count));
         } else {
           let newEnd = dart.notNull(this[_start]) + dart.notNull(count);
           if (dart.notNull(this[_endOrLength]) < dart.notNull(newEnd))
             return this;
           return new SubListIterable(this[_iterable], this[_start], newEnd);
         }
       }
-      toList(opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      toList(opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         let start = this[_start];
         let end = this[_iterable].length;
         if (this[_endOrLength] !== null && dart.notNull(this[_endOrLength]) < dart.notNull(end))
           end = this[_endOrLength];
         let length = dart.notNull(end) - dart.notNull(start);
         if (dart.notNull(length) < 0)
           length = 0;
         let result = growable ? ((_) => {
           _.length = length;
           return _;
@@ skipping 36 matching lines @@
         this[_index] = dart.notNull(this[_index]) + 1;
         return true;
       }
     }
     return ListIterator;
   });
   let ListIterator = ListIterator$(dart.dynamic);
   let _f = Symbol('_f');
   let MappedIterable$ = dart.generic(function(S, T) {
     class MappedIterable extends collection.IterableBase$(T) {
-      MappedIterable(iterable, function) {
+      MappedIterable(iterable, func) {
         if (dart.is(iterable, EfficientLength)) {
-          return new EfficientLengthMappedIterable(iterable, function);
+          return new EfficientLengthMappedIterable(iterable, func);
         }
-        return new MappedIterable._(dart.as(iterable, core.Iterable$(S)), function);
+        return new MappedIterable._(dart.as(iterable, core.Iterable$(S)), func);
       }
-      MappedIterable$_($_iterable, $_f) {
-        this[_iterable] = $_iterable;
-        this[_f] = $_f;
+      MappedIterable$_(iterable$, f$) {
+        this[_iterable] = iterable$;
+        this[_f] = f$;
         super.IterableBase();
       }
       get iterator() {
         return new MappedIterator(this[_iterable].iterator, this[_f]);
       }
       get length() {
         return this[_iterable].length;
       }
       get isEmpty() {
         return this[_iterable].isEmpty;
@@ skipping 10 matching lines @@
       elementAt(index) {
         return this[_f](this[_iterable].elementAt(index));
       }
     }
     dart.defineNamedConstructor(MappedIterable, '_');
     return MappedIterable;
   });
   let MappedIterable = MappedIterable$(dart.dynamic, dart.dynamic);
   let EfficientLengthMappedIterable$ = dart.generic(function(S, T) {
     class EfficientLengthMappedIterable extends MappedIterable$(S, T) {
-      EfficientLengthMappedIterable(iterable, function) {
-        super.MappedIterable$_(dart.as(iterable, core.Iterable$(S)), function);
+      EfficientLengthMappedIterable(iterable, func) {
+        super.MappedIterable$_(dart.as(iterable, core.Iterable$(S)), func);
       }
     }
     return EfficientLengthMappedIterable;
   });
   let EfficientLengthMappedIterable = EfficientLengthMappedIterable$(dart.dynamic, dart.dynamic);
   let _iterator = Symbol('_iterator');
   let MappedIterator$ = dart.generic(function(S, T) {
     class MappedIterator extends core.Iterator$(T) {
-      MappedIterator($_iterator, $_f) {
-        this[_iterator] = $_iterator;
-        this[_f] = $_f;
+      MappedIterator(iterator$, f$) {
+        this[_iterator] = iterator$;
+        this[_f] = f$;
         this[_current] = null;
         super.Iterator();
       }
       moveNext() {
         if (this[_iterator].moveNext()) {
           this[_current] = this[_f](this[_iterator].current);
           return true;
         }
         this[_current] = null;
         return false;
       }
       get current() {
         return this[_current];
       }
     }
     return MappedIterator;
   });
   let MappedIterator = MappedIterator$(dart.dynamic, dart.dynamic);
   let _source = Symbol('_source');
   let MappedListIterable$ = dart.generic(function(S, T) {
     class MappedListIterable extends ListIterable$(T) {
-      MappedListIterable($_source, $_f) {
-        this[_source] = $_source;
-        this[_f] = $_f;
+      MappedListIterable(source, f$) {
+        this[_source] = source;
+        this[_f] = f$;
         super.ListIterable();
       }
       get length() {
         return this[_source].length;
       }
       elementAt(index) {
         return this[_f](this[_source].elementAt(index));
       }
     }
     return MappedListIterable;
   });
   let MappedListIterable = MappedListIterable$(dart.dynamic, dart.dynamic);
   let WhereIterable$ = dart.generic(function(E) {
     class WhereIterable extends collection.IterableBase$(E) {
-      WhereIterable($_iterable, $_f) {
-        this[_iterable] = $_iterable;
-        this[_f] = $_f;
+      WhereIterable(iterable$, f$) {
+        this[_iterable] = iterable$;
+        this[_f] = f$;
         super.IterableBase();
       }
       get iterator() {
         return new WhereIterator(this[_iterable].iterator, this[_f]);
       }
     }
     return WhereIterable;
   });
   let WhereIterable = WhereIterable$(dart.dynamic);
   let WhereIterator$ = dart.generic(function(E) {
     class WhereIterator extends core.Iterator$(E) {
-      WhereIterator($_iterator, $_f) {
-        this[_iterator] = $_iterator;
-        this[_f] = $_f;
+      WhereIterator(iterator$, f$) {
+        this[_iterator] = iterator$;
+        this[_f] = f$;
         super.Iterator();
       }
       moveNext() {
         while (this[_iterator].moveNext()) {
           if (this[_f](this[_iterator].current)) {
             return true;
           }
         }
         return false;
       }
       get current() {
         return this[_iterator].current;
       }
     }
     return WhereIterator;
   });
   let WhereIterator = WhereIterator$(dart.dynamic);
   let ExpandIterable$ = dart.generic(function(S, T) {
     class ExpandIterable extends collection.IterableBase$(T) {
-      ExpandIterable($_iterable, $_f) {
-        this[_iterable] = $_iterable;
-        this[_f] = $_f;
+      ExpandIterable(iterable$, f$) {
+        this[_iterable] = iterable$;
+        this[_f] = f$;
         super.IterableBase();
       }
       get iterator() {
         return new ExpandIterator(this[_iterable].iterator, dart.closureWrap(this[_f], "(S) → Iterable<T>"));
       }
     }
     return ExpandIterable;
   });
   let ExpandIterable = ExpandIterable$(dart.dynamic, dart.dynamic);
   let _currentExpansion = Symbol('_currentExpansion');
   let _nextExpansion = Symbol('_nextExpansion');
   let ExpandIterator$ = dart.generic(function(S, T) {
     class ExpandIterator extends core.Object {
-      ExpandIterator($_iterator, $_f) {
-        this[_iterator] = $_iterator;
-        this[_f] = $_f;
+      ExpandIterator(iterator$, f$) {
+        this[_iterator] = iterator$;
+        this[_f] = f$;
         this[_currentExpansion] = dart.as(new EmptyIterator(), core.Iterator$(T));
         this[_current] = null;
       }
       [_nextExpansion]() {}
       get current() {
         return this[_current];
       }
       moveNext() {
         if (this[_currentExpansion] === null)
           return false;
@@ skipping 18 matching lines @@
     class TakeIterable extends collection.IterableBase$(E) {
       TakeIterable(iterable, takeCount) {
         if (dart.notNull(!(typeof takeCount == number)) || dart.notNull(takeCount) < 0) {
           throw new core.ArgumentError(takeCount);
         }
         if (dart.is(iterable, EfficientLength)) {
           return new EfficientLengthTakeIterable(iterable, takeCount);
         }
         return new TakeIterable._(iterable, takeCount);
       }
-      TakeIterable$_($_iterable, $_takeCount) {
-        this[_iterable] = $_iterable;
-        this[_takeCount] = $_takeCount;
+      TakeIterable$_(iterable$, takeCount$) {
+        this[_iterable] = iterable$;
+        this[_takeCount] = takeCount$;
         super.IterableBase();
       }
       get iterator() {
         return new TakeIterator(this[_iterable].iterator, this[_takeCount]);
       }
     }
     dart.defineNamedConstructor(TakeIterable, '_');
     return TakeIterable;
   });
   let TakeIterable = TakeIterable$(dart.dynamic);
   let EfficientLengthTakeIterable$ = dart.generic(function(E) {
     class EfficientLengthTakeIterable extends TakeIterable$(E) {
       EfficientLengthTakeIterable(iterable, takeCount) {
         super.TakeIterable$_(iterable, takeCount);
       }
       get length() {
         let iterableLength = this[_iterable].length;
         if (dart.notNull(iterableLength) > dart.notNull(this[_takeCount]))
           return this[_takeCount];
         return iterableLength;
       }
     }
     return EfficientLengthTakeIterable;
   });
   let EfficientLengthTakeIterable = EfficientLengthTakeIterable$(dart.dynamic);
   let _remaining = Symbol('_remaining');
   let TakeIterator$ = dart.generic(function(E) {
     class TakeIterator extends core.Iterator$(E) {
-      TakeIterator($_iterator, $_remaining) {
-        this[_iterator] = $_iterator;
-        this[_remaining] = $_remaining;
+      TakeIterator(iterator$, remaining) {
+        this[_iterator] = iterator$;
+        this[_remaining] = remaining;
         super.Iterator();
         dart.assert(dart.notNull(typeof this[_remaining] == number) && dart.notNull(this[_remaining]) >= 0);
       }
       moveNext() {
         this[_remaining] = dart.notNull(this[_remaining]) - 1;
         if (dart.notNull(this[_remaining]) >= 0) {
           return this[_iterator].moveNext();
         }
         this[_remaining] = -1;
         return false;
       }
       get current() {
         if (dart.notNull(this[_remaining]) < 0)
           return null;
         return this[_iterator].current;
       }
     }
     return TakeIterator;
   });
   let TakeIterator = TakeIterator$(dart.dynamic);
   let TakeWhileIterable$ = dart.generic(function(E) {
     class TakeWhileIterable extends collection.IterableBase$(E) {
-      TakeWhileIterable($_iterable, $_f) {
-        this[_iterable] = $_iterable;
-        this[_f] = $_f;
+      TakeWhileIterable(iterable$, f$) {
+        this[_iterable] = iterable$;
+        this[_f] = f$;
         super.IterableBase();
       }
       get iterator() {
         return new TakeWhileIterator(this[_iterable].iterator, dart.closureWrap(this[_f], "(E) → bool"));
       }
     }
     return TakeWhileIterable;
   });
   let TakeWhileIterable = TakeWhileIterable$(dart.dynamic);
   let _isFinished = Symbol('_isFinished');
   let TakeWhileIterator$ = dart.generic(function(E) {
     class TakeWhileIterator extends core.Iterator$(E) {
-      TakeWhileIterator($_iterator, $_f) {
-        this[_iterator] = $_iterator;
-        this[_f] = $_f;
+      TakeWhileIterator(iterator$, f$) {
+        this[_iterator] = iterator$;
+        this[_f] = f$;
         this[_isFinished] = false;
         super.Iterator();
       }
       moveNext() {
         if (this[_isFinished])
           return false;
         if (!dart.notNull(this[_iterator].moveNext()) || !dart.notNull(dart.dinvokef(this[_f], this[_iterator].current))) {
           this[_isFinished] = true;
           return false;
         }
@@ skipping 10 matching lines @@
   let TakeWhileIterator = TakeWhileIterator$(dart.dynamic);
   let _skipCount = Symbol('_skipCount');
   let SkipIterable$ = dart.generic(function(E) {
     class SkipIterable extends collection.IterableBase$(E) {
       SkipIterable(iterable, count) {
         if (dart.is(iterable, EfficientLength)) {
           return new EfficientLengthSkipIterable(iterable, count);
         }
         return new SkipIterable._(iterable, count);
       }
-      SkipIterable$_($_iterable, $_skipCount) {
-        this[_iterable] = $_iterable;
-        this[_skipCount] = $_skipCount;
+      SkipIterable$_(iterable$, skipCount$) {
+        this[_iterable] = iterable$;
+        this[_skipCount] = skipCount$;
         super.IterableBase();
         if (!(typeof this[_skipCount] == number)) {
           throw new core.ArgumentError.value(this[_skipCount], "count is not an integer");
         }
         core.RangeError.checkNotNegative(this[_skipCount], "count");
       }
       skip(count) {
         if (!(typeof this[_skipCount] == number)) {
           throw new core.ArgumentError.value(this[_skipCount], "count is not an integer");
         }
@@ skipping 18 matching lines @@
         if (dart.notNull(length) >= 0)
           return length;
         return 0;
       }
     }
     return EfficientLengthSkipIterable;
   });
   let EfficientLengthSkipIterable = EfficientLengthSkipIterable$(dart.dynamic);
   let SkipIterator$ = dart.generic(function(E) {
     class SkipIterator extends core.Iterator$(E) {
-      SkipIterator($_iterator, $_skipCount) {
-        this[_iterator] = $_iterator;
-        this[_skipCount] = $_skipCount;
+      SkipIterator(iterator$, skipCount$) {
+        this[_iterator] = iterator$;
+        this[_skipCount] = skipCount$;
         super.Iterator();
         dart.assert(dart.notNull(typeof this[_skipCount] == number) && dart.notNull(this[_skipCount]) >= 0);
       }
       moveNext() {
         for (let i = 0; dart.notNull(i) < dart.notNull(this[_skipCount]); i = dart.notNull(i) + 1)
           this[_iterator].moveNext();
         this[_skipCount] = 0;
         return this[_iterator].moveNext();
       }
       get current() {
         return this[_iterator].current;
       }
     }
     return SkipIterator;
   });
   let SkipIterator = SkipIterator$(dart.dynamic);
   let SkipWhileIterable$ = dart.generic(function(E) {
     class SkipWhileIterable extends collection.IterableBase$(E) {
-      SkipWhileIterable($_iterable, $_f) {
-        this[_iterable] = $_iterable;
-        this[_f] = $_f;
+      SkipWhileIterable(iterable$, f$) {
+        this[_iterable] = iterable$;
+        this[_f] = f$;
         super.IterableBase();
       }
       get iterator() {
         return new SkipWhileIterator(this[_iterable].iterator, dart.closureWrap(this[_f], "(E) → bool"));
       }
     }
     return SkipWhileIterable;
   });
   let SkipWhileIterable = SkipWhileIterable$(dart.dynamic);
   let _hasSkipped = Symbol('_hasSkipped');
   let SkipWhileIterator$ = dart.generic(function(E) {
     class SkipWhileIterator extends core.Iterator$(E) {
-      SkipWhileIterator($_iterator, $_f) {
-        this[_iterator] = $_iterator;
-        this[_f] = $_f;
+      SkipWhileIterator(iterator$, f$) {
+        this[_iterator] = iterator$;
+        this[_f] = f$;
         this[_hasSkipped] = false;
         super.Iterator();
       }
       moveNext() {
         if (!dart.notNull(this[_hasSkipped])) {
           this[_hasSkipped] = true;
           while (this[_iterator].moveNext()) {
             if (!dart.notNull(dart.dinvokef(this[_f], this[_iterator].current)))
               return true;
           }
@@ skipping 36 matching lines @@
       }
       contains(element) {
         return false;
       }
       every(test) {
         return true;
       }
       any(test) {
         return false;
       }
-      firstWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      firstWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         if (orElse !== null)
           return orElse();
         throw IterableElementError.noElement();
       }
-      lastWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      lastWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         if (orElse !== null)
           return orElse();
         throw IterableElementError.noElement();
       }
-      singleWhere(test, opt$) {
-        let orElse = opt$ && 'orElse' in opt$ ? opt$.orElse : null;
+      singleWhere(test, opts) {
+        let orElse = opts && 'orElse' in opts ? opts.orElse : null;
         if (orElse !== null)
           return orElse();
         throw IterableElementError.noElement();
       }
       join(separator) {
         if (separator === void 0)
           separator = "";
         return "";
       }
       where(test) {
@@ skipping 15 matching lines @@
       skipWhile(test) {
         return this;
       }
       take(count) {
         core.RangeError.checkNotNegative(count, "count");
         return this;
       }
       takeWhile(test) {
         return this;
       }
-      toList(opt$) {
-        let growable = opt$ && 'growable' in opt$ ? opt$.growable : true;
+      toList(opts) {
+        let growable = opts && 'growable' in opts ? opts.growable : true;
         return growable ? new List.from([]) : new core.List(0);
       }
       toSet() {
         return new core.Set();
       }
     }
     return EmptyIterable;
   });
   let EmptyIterable = EmptyIterable$(dart.dynamic);
   let EmptyIterator$ = dart.generic(function(E) {
     class EmptyIterator extends core.Object {
       EmptyIterator() {
       }
       moveNext() {
         return false;
       }
       get current() {
         return null;
       }
     }
     return EmptyIterator;
   });
   let EmptyIterator = EmptyIterator$(dart.dynamic);
   let BidirectionalIterator$ = dart.generic(function(T) {
     class BidirectionalIterator extends core.Object {
     }
     return BidirectionalIterator;
   });
   let BidirectionalIterator = BidirectionalIterator$(dart.dynamic);
-  let _rangeCheck = Symbol('_rangeCheck');
+  let _rangeCheck$ = Symbol('_rangeCheck');
   let IterableMixinWorkaround$ = dart.generic(function(T) {
     class IterableMixinWorkaround extends core.Object {
       static contains(iterable, element) {
         for (let e of iterable) {
           if (dart.equals(e, element))
             return true;
         }
         return false;
       }
       static forEach(iterable, f) {
@@ skipping 215 matching lines @@
         }
       }
       static indexOfList(list, element, start) {
         return Lists.indexOf(list, element, start, list.length);
       }
       static lastIndexOfList(list, element, start) {
         if (start === null)
           start = dart.notNull(list.length) - 1;
         return Lists.lastIndexOf(list, element, start);
       }
-      static [_rangeCheck](list, start, end) {
+      static [_rangeCheck$](list, start, end) {
         core.RangeError.checkValidRange(start, end, list.length);
       }
       getRangeList(list, start, end) {
         _rangeCheck(list, start, end);
         return new SubListIterable(dart.as(list, core.Iterable$(T)), start, end);
       }
       static setRangeList(list, start, end, from, skipCount) {
         _rangeCheck(list, start, end);
         let length = dart.notNull(end) - dart.notNull(start);
         if (length === 0)
@@ skipping 47 matching lines @@
       }
       static insertAllList(list, index, iterable) {
         core.RangeError.checkValueInInterval(index, 0, list.length, "index");
         if (!dart.is(iterable, EfficientLength)) {
           iterable = iterable.toList({growable: false});
         }
         let insertionLength = iterable.length;
         list.length = insertionLength;
         list.setRange(dart.notNull(index) + dart.notNull(insertionLength), list.length, list, index);
         for (let element of iterable) {
-          list.set((($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index), element);
+          list.set(((x) => index = dart.notNull(x$) + 1, x$)(index), element);
         }
       }
       static setAllList(list, index, iterable) {
         core.RangeError.checkValueInInterval(index, 0, list.length, "index");
         for (let element of iterable) {
-          list.set((($tmp) => index = dart.notNull($tmp) + 1, $tmp)(index), element);
+          list.set(((x) => index = dart.notNull(x$) + 1, x$)(index), element);
         }
       }
       asMapList(l) {
         return new ListMapView(dart.as(l, core.List$(T)));
       }
       static setContainsAll(set, other) {
         for (let element of other) {
           if (!dart.notNull(set.contains(element)))
             return false;
         }
@@ skipping 167 matching lines @@
   });
   let FixedLengthListBase = FixedLengthListBase$(dart.dynamic);
   let UnmodifiableListBase$ = dart.generic(function(E) {
     class UnmodifiableListBase extends dart.mixin(UnmodifiableListMixin$(E)) {
     }
     return UnmodifiableListBase;
   });
   let UnmodifiableListBase = UnmodifiableListBase$(dart.dynamic);
   let _backedList = Symbol('_backedList');
   class _ListIndicesIterable extends ListIterable$(core.int) {
-    _ListIndicesIterable($_backedList) {
-      this[_backedList] = $_backedList;
+    _ListIndicesIterable(backedList) {
+      this[_backedList] = backedList;
       super.ListIterable();
     }
     get length() {
       return this[_backedList].length;
     }
     elementAt(index) {
       core.RangeError.checkValidIndex(index, this);
       return index;
     }
   }
   let _values = Symbol('_values');
   let ListMapView$ = dart.generic(function(E) {
     class ListMapView extends core.Object {
-      ListMapView($_values) {
-        this[_values] = $_values;
+      ListMapView(values) {
+        this[_values] = values;
       }
       get(key) {
         return this.containsKey(key) ? this[_values].get(key) : null;
       }
       get length() {
         return this[_values].length;
       }
       get values() {
         return new SubListIterable(this[_values], 0, null);
       }
@@ skipping 38 matching lines @@
       }
       toString() {
         return collection.Maps.mapToString(this);
       }
     }
     return ListMapView;
   });
   let ListMapView = ListMapView$(dart.dynamic);
   let ReversedListIterable$ = dart.generic(function(E) {
     class ReversedListIterable extends ListIterable$(E) {
-      ReversedListIterable($_source) {
-        this[_source] = $_source;
+      ReversedListIterable(source) {
+        this[_source] = source;
         super.ListIterable();
       }
       get length() {
         return this[_source].length;
       }
       elementAt(index) {
         return this[_source].elementAt(dart.notNull(this[_source].length) - 1 - dart.notNull(index));
       }
     }
     return ReversedListIterable;
@@ skipping 93 matching lines @@
         let message = `${start} + ${length} must be in the range [0..${a.length}]`;
         throw new core.RangeError.range(length, 0, dart.notNull(a.length) - dart.notNull(start), "length", message);
       }
     }
   }
   exports.printToZone = null;
   // Function printToConsole: (String) → void
   function printToConsole(line) {
     _js_primitives.printString(`${line}`);
   }
-  let _doSort = Symbol('_doSort');
-  let _insertionSort = Symbol('_insertionSort');
-  let _dualPivotQuicksort = Symbol('_dualPivotQuicksort');
+  let _doSort$ = Symbol('_doSort');
+  let _insertionSort$ = Symbol('_insertionSort');
+  let _dualPivotQuicksort$ = Symbol('_dualPivotQuicksort');
   class Sort extends core.Object {
     static sort(a, compare) {
       _doSort(a, 0, dart.notNull(a.length) - 1, compare);
     }
     static sortRange(a, from, to, compare) {
       if (dart.notNull(from) < 0 || dart.notNull(to) > dart.notNull(a.length) || dart.notNull(to) < dart.notNull(from)) {
         throw "OutOfRange";
       }
       _doSort(a, from, dart.notNull(to) - 1, compare);
     }
-    static [_doSort](a, left, right, compare) {
+    static [_doSort$](a, left, right, compare) {
       if (dart.notNull(right) - dart.notNull(left) <= dart.notNull(Sort._INSERTION_SORT_THRESHOLD)) {
         _insertionSort(a, left, right, compare);
       } else {
         _dualPivotQuicksort(a, left, right, compare);
       }
     }
-    static [_insertionSort](a, left, right, compare) {
+    static [_insertionSort$](a, left, right, compare) {
       for (let i = dart.notNull(left) + 1; dart.notNull(i) <= dart.notNull(right); i = dart.notNull(i) + 1) {
         let el = a.get(i);
         let j = i;
         while (dart.notNull(j) > dart.notNull(left) && dart.notNull(dart.dinvokef(compare, a.get(dart.notNull(j) - 1), el)) > 0) {
           a.set(j, a.get(dart.notNull(j) - 1));
           j = dart.notNull(j) - 1;
         }
         a.set(j, el);
       }
     }
-    static [_dualPivotQuicksort](a, left, right, compare) {
+    static [_dualPivotQuicksort$](a, left, right, compare) {
       dart.assert(dart.notNull(right) - dart.notNull(left) > dart.notNull(Sort._INSERTION_SORT_THRESHOLD));
       let sixth = ((dart.notNull(right) - dart.notNull(left) + 1) / 6).truncate();
       let index1 = dart.notNull(left) + dart.notNull(sixth);
       let index5 = dart.notNull(right) - dart.notNull(sixth);
       let index3 = ((dart.notNull(left) + dart.notNull(right)) / 2).truncate();
       let index2 = dart.notNull(index3) - dart.notNull(sixth);
       let index4 = dart.notNull(index3) + dart.notNull(sixth);
       let el1 = a.get(index1);
       let el2 = a.get(index2);
       let el3 = a.get(index3);
@@ skipping 68 matching lines @@
             }
             less = dart.notNull(less) + 1;
           } else {
             while (true) {
               comp = dart.dinvokef(compare, a.get(great), pivot);
               if (dart.notNull(comp) > 0) {
                 great = dart.notNull(great) - 1;
                 continue;
               } else if (dart.notNull(comp) < 0) {
                 a.set(k, a.get(less));
-                a.set((($tmp) => less = dart.notNull($tmp) + 1, $tmp)(less), a.get(great));
-                a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
+                a.set(((x) => less = dart.notNull(x$) + 1, x$)(less), a.get(great));

[alexandre.ardhuin, 2015/03/27 07:55:59]

Shouldn't the parameter be `x$` instead of `x` ?

This happens in several places.

[Jennifer Messerly, 2015/03/27 14:27:22]

good catch! Missed one place we were sending the raw name straight to code.
Landed a fix.

+                a.set(((x) => great = dart.notNull(x$) - 1, x$)(great), ak);
                 break;
               } else {
                 a.set(k, a.get(great));
-                a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
+                a.set(((x) => great = dart.notNull(x$) - 1, x$)(great), ak);
                 break;
               }
             }
           }
         }
       } else {
         for (let k = less; dart.notNull(k) <= dart.notNull(great); k = dart.notNull(k) + 1) {
           let ak = a.get(k);
           let comp_pivot1 = dart.dinvokef(compare, ak, pivot1);
           if (dart.notNull(comp_pivot1) < 0) {
             if (k !== less) {
               a.set(k, a.get(less));
               a.set(less, ak);
             }
             less = dart.notNull(less) + 1;
           } else {
             let comp_pivot2 = dart.dinvokef(compare, ak, pivot2);
             if (dart.notNull(comp_pivot2) > 0) {
               while (true) {
                 let comp = dart.dinvokef(compare, a.get(great), pivot2);
                 if (dart.notNull(comp) > 0) {
                   great = dart.notNull(great) - 1;
                   if (dart.notNull(great) < dart.notNull(k))
                     break;
                   continue;
                 } else {
                   comp = dart.dinvokef(compare, a.get(great), pivot1);
                   if (dart.notNull(comp) < 0) {
                     a.set(k, a.get(less));
-                    a.set((($tmp) => less = dart.notNull($tmp) + 1, $tmp)(less), a.get(great));
-                    a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
+                    a.set(((x) => less = dart.notNull(x$) + 1, x$)(less), a.get(great));
+                    a.set(((x) => great = dart.notNull(x$) - 1, x$)(great), ak);
                   } else {
                     a.set(k, a.get(great));
-                    a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
+                    a.set(((x) => great = dart.notNull(x$) - 1, x$)(great), ak);
                   }
                   break;
                 }
               }
             }
           }
         }
       }
       a.set(left, a.get(dart.notNull(less) - 1));
       a.set(dart.notNull(less) - 1, pivot1);
@@ skipping 27 matching lines @@
                 let comp = dart.dinvokef(compare, a.get(great), pivot2);
                 if (comp === 0) {
                   great = dart.notNull(great) - 1;
                   if (dart.notNull(great) < dart.notNull(k))
                     break;
                   continue;
                 } else {
                   comp = dart.dinvokef(compare, a.get(great), pivot1);
                   if (dart.notNull(comp) < 0) {
                     a.set(k, a.get(less));
-                    a.set((($tmp) => less = dart.notNull($tmp) + 1, $tmp)(less), a.get(great));
-                    a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
+                    a.set(((x) => less = dart.notNull(x$) + 1, x$)(less), a.get(great));
+                    a.set(((x) => great = dart.notNull(x$) - 1, x$)(great), ak);
                   } else {
                     a.set(k, a.get(great));
-                    a.set((($tmp) => great = dart.notNull($tmp) - 1, $tmp)(great), ak);
+                    a.set(((x) => great = dart.notNull(x$) - 1, x$)(great), ak);
                   }
                   break;
                 }
               }
             }
           }
         }
         _doSort(a, less, great, compare);
       } else {
         _doSort(a, less, great, compare);
       }
     }
   }
   Sort._INSERTION_SORT_THRESHOLD = 32;
   let _name = Symbol('_name');
   class Symbol extends core.Object {
     Symbol(name) {
       this[_name] = name;
     }
-    Symbol$unvalidated($_name) {
-      this[_name] = $_name;
+    Symbol$unvalidated(name$) {
+      this[_name] = name$;
     }
     Symbol$validated(name) {
       this[_name] = validatePublicSymbol(name);
     }
     ['=='](other) {
       return dart.notNull(dart.is(other, Symbol)) && dart.notNull(dart.equals(this[_name], dart.dload(other, '_name')));
     }
     get hashCode() {
       let arbitraryPrime = 664597;
       return 536870911 & dart.notNull(arbitraryPrime) * dart.notNull(this[_name].hashCode);
@@ skipping 98 matching lines @@
   exports.ReversedListIterable$ = ReversedListIterable$;
   exports.UnmodifiableListError = UnmodifiableListError;
   exports.NonGrowableListError = NonGrowableListError;
   exports.makeListFixedLength = makeListFixedLength;
   exports.Lists = Lists;
   exports.printToConsole = printToConsole;
   exports.Sort = Sort;
   exports.Symbol = Symbol;
   exports.POWERS_OF_TEN = POWERS_OF_TEN;
 })(_internal || (_internal = {}));