| Index: lib/runtime/dart/collection.js
|
| diff --git a/lib/runtime/dart/collection.js b/lib/runtime/dart/collection.js
|
| index 5522c1ee9398c0de7e455a171ef5c4c3c3dafa48..e6e0b5e3e2f959a1fb4a7a940a6e66f98f8b3ec8 100644
|
| --- a/lib/runtime/dart/collection.js
|
| +++ b/lib/runtime/dart/collection.js
|
| @@ -1113,6 +1113,12 @@ var collection;
|
| let _insertAfter = Symbol('_insertAfter');
|
| let _list = Symbol('_list');
|
| let _unlink = Symbol('_unlink');
|
| + class _LinkedListLink extends core.Object {
|
| + _LinkedListLink() {
|
| + this[_next] = null;
|
| + this[_previous] = null;
|
| + }
|
| + }
|
| let LinkedList$ = dart.generic(function(E) {
|
| class LinkedList extends IterableBase$(E) {
|
| LinkedList() {
|
| @@ -1245,12 +1251,6 @@ var collection;
|
| return _LinkedListIterator;
|
| });
|
| let _LinkedListIterator = _LinkedListIterator$(dart.dynamic);
|
| - class _LinkedListLink extends core.Object {
|
| - _LinkedListLink() {
|
| - this[_next] = null;
|
| - this[_previous] = null;
|
| - }
|
| - }
|
| let LinkedListEntry$ = dart.generic(function(E) {
|
| class LinkedListEntry extends core.Object {
|
| LinkedListEntry() {
|
| @@ -1796,8 +1796,7 @@ var collection;
|
| });
|
| let MapMixin = MapMixin$(dart.dynamic, dart.dynamic);
|
| let MapBase$ = dart.generic(function(K, V) {
|
| - class MapBase extends dart.mixin(MapMixin$(K, V)) {
|
| - }
|
| + class MapBase extends dart.mixin(MapMixin$(K, V)) {}
|
| return MapBase;
|
| });
|
| let MapBase = MapBase$(dart.dynamic, dart.dynamic);
|
| @@ -1824,8 +1823,7 @@ var collection;
|
| });
|
| let _UnmodifiableMapMixin = _UnmodifiableMapMixin$(dart.dynamic, dart.dynamic);
|
| let UnmodifiableMapBase$ = dart.generic(function(K, V) {
|
| - class UnmodifiableMapBase extends dart.mixin(_UnmodifiableMapMixin$(K, V)) {
|
| - }
|
| + class UnmodifiableMapBase extends dart.mixin(_UnmodifiableMapMixin$(K, V)) {}
|
| return UnmodifiableMapBase;
|
| });
|
| let UnmodifiableMapBase = UnmodifiableMapBase$(dart.dynamic, dart.dynamic);
|
| @@ -1861,7 +1859,7 @@ var collection;
|
| _MapBaseValueIterable[dart.implements] = [_internal.EfficientLength];
|
| return _MapBaseValueIterable;
|
| });
|
| - let _MapBaseValueIterable = _MapBaseValueIterable$(dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, '_MapBaseValueIterable', {get: _MapBaseValueIterable$});
|
| let _keys = Symbol('_keys');
|
| let _MapBaseValueIterator$ = dart.generic(function(V) {
|
| class _MapBaseValueIterator extends core.Object {
|
| @@ -1942,8 +1940,7 @@ var collection;
|
| });
|
| let MapView = MapView$(dart.dynamic, dart.dynamic);
|
| let UnmodifiableMapView$ = dart.generic(function(K, V) {
|
| - class UnmodifiableMapView extends dart.mixin(_UnmodifiableMapMixin$(K, V)) {
|
| - }
|
| + class UnmodifiableMapView extends dart.mixin(_UnmodifiableMapMixin$(K, V)) {}
|
| return UnmodifiableMapView;
|
| });
|
| let UnmodifiableMapView = UnmodifiableMapView$(dart.dynamic, dart.dynamic);
|
| @@ -2062,7 +2059,7 @@ var collection;
|
| dart.defineNamedConstructor(Queue, 'from');
|
| return Queue;
|
| });
|
| - let Queue = Queue$(dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, 'Queue', {get: Queue$});
|
| let _element = Symbol('_element');
|
| let _link = Symbol('_link');
|
| let _asNonSentinelEntry = Symbol('_asNonSentinelEntry');
|
| @@ -2144,11 +2141,11 @@ var collection;
|
| this[_sentinel] = new _DoubleLinkedQueueEntrySentinel();
|
| }
|
| from(elements) {
|
| - let list = dart.as(new DoubleLinkedQueue(), Queue$(E));
|
| + let list = dart.as(new DoubleLinkedQueue(), exports.Queue$(E));
|
| for (let e of dart.as(elements, core.Iterable$(E))) {
|
| list.addLast(e);
|
| }
|
| - return dart.as(list, DoubleLinkedQueue$(E));
|
| + return dart.as(list, exports.DoubleLinkedQueue$(E));
|
| }
|
| get length() {
|
| return this[_elementCount];
|
| @@ -2251,11 +2248,11 @@ var collection;
|
| return IterableBase.iterableToFullString(this, '{', '}');
|
| }
|
| }
|
| - DoubleLinkedQueue[dart.implements] = [Queue$(E)];
|
| + DoubleLinkedQueue[dart.implements] = [exports.Queue$(E)];
|
| dart.defineNamedConstructor(DoubleLinkedQueue, 'from');
|
| return DoubleLinkedQueue;
|
| });
|
| - let DoubleLinkedQueue = DoubleLinkedQueue$(dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, 'DoubleLinkedQueue', {get: DoubleLinkedQueue$});
|
| let _nextEntry = Symbol('_nextEntry');
|
| let _DoubleLinkedQueueIterator$ = dart.generic(function(E) {
|
| class _DoubleLinkedQueueIterator extends core.Object {
|
| @@ -2316,7 +2313,7 @@ var collection;
|
| from(elements) {
|
| if (dart.is(elements, core.List)) {
|
| let length = elements.length;
|
| - let queue = dart.as(new ListQueue(dart.notNull(length) + 1), ListQueue$(E));
|
| + let queue = dart.as(new ListQueue(dart.notNull(length) + 1), exports.ListQueue$(E));
|
| dart.assert(dart.notNull(queue[_table].length) > dart.notNull(length));
|
| let sourceList = elements;
|
| queue[_table].setRange(0, length, dart.as(sourceList, core.Iterable$(E)), 0);
|
| @@ -2571,12 +2568,12 @@ var collection;
|
| this[_head] = 0;
|
| }
|
| }
|
| - ListQueue[dart.implements] = [Queue$(E)];
|
| + ListQueue[dart.implements] = [exports.Queue$(E)];
|
| dart.defineNamedConstructor(ListQueue, 'from');
|
| ListQueue._INITIAL_CAPACITY = 8;
|
| return ListQueue;
|
| });
|
| - let ListQueue = ListQueue$(dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, 'ListQueue', {get: ListQueue$});
|
| let _queue = Symbol('_queue');
|
| let _end = Symbol('_end');
|
| let _position = Symbol('_position');
|
| @@ -3100,7 +3097,7 @@ var collection;
|
| _SplayTreeKeyIterable[dart.implements] = [_internal.EfficientLength];
|
| return _SplayTreeKeyIterable;
|
| });
|
| - let _SplayTreeKeyIterable = _SplayTreeKeyIterable$(dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, '_SplayTreeKeyIterable', {get: _SplayTreeKeyIterable$});
|
| let _SplayTreeValueIterable$ = dart.generic(function(K, V) {
|
| class _SplayTreeValueIterable extends IterableBase$(V) {
|
| _SplayTreeValueIterable(map$) {
|
| @@ -3120,7 +3117,7 @@ var collection;
|
| _SplayTreeValueIterable[dart.implements] = [_internal.EfficientLength];
|
| return _SplayTreeValueIterable;
|
| });
|
| - let _SplayTreeValueIterable = _SplayTreeValueIterable$(dart.dynamic, dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, '_SplayTreeValueIterable', {get: _SplayTreeValueIterable$});
|
| let _SplayTreeKeyIterator$ = dart.generic(function(K) {
|
| class _SplayTreeKeyIterator extends _SplayTreeIterator$(K) {
|
| _SplayTreeKeyIterator(map) {
|
| @@ -3701,7 +3698,7 @@ var collection;
|
| HashMapKeyIterable[dart.implements] = [_internal.EfficientLength];
|
| return HashMapKeyIterable;
|
| });
|
| - let HashMapKeyIterable = HashMapKeyIterable$(dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, 'HashMapKeyIterable', {get: HashMapKeyIterable$});
|
| let _offset = Symbol('_offset');
|
| let HashMapKeyIterator$ = dart.generic(function(E) {
|
| class HashMapKeyIterator extends core.Object {
|
| @@ -4006,9 +4003,9 @@ var collection;
|
| _LinkedHashMap[dart.implements] = [LinkedHashMap$(K, V), _js_helper.InternalMap];
|
| return _LinkedHashMap;
|
| });
|
| - let _LinkedHashMap = _LinkedHashMap$(dart.dynamic, dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, '_LinkedHashMap', {get: _LinkedHashMap$});
|
| let _LinkedIdentityHashMap$ = dart.generic(function(K, V) {
|
| - class _LinkedIdentityHashMap extends _LinkedHashMap$(K, V) {
|
| + class _LinkedIdentityHashMap extends exports._LinkedHashMap$(K, V) {
|
| [_computeHashCode](key) {
|
| return core.identityHashCode(key) & 0x3ffffff;
|
| }
|
| @@ -4026,9 +4023,9 @@ var collection;
|
| }
|
| return _LinkedIdentityHashMap;
|
| });
|
| - let _LinkedIdentityHashMap = _LinkedIdentityHashMap$(dart.dynamic, dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, '_LinkedIdentityHashMap', {get: _LinkedIdentityHashMap$});
|
| let _LinkedCustomHashMap$ = dart.generic(function(K, V) {
|
| - class _LinkedCustomHashMap extends _LinkedHashMap$(K, V) {
|
| + class _LinkedCustomHashMap extends exports._LinkedHashMap$(K, V) {
|
| _LinkedCustomHashMap(equals$, hashCode$, validKey) {
|
| this[_equals] = equals$;
|
| this[_hashCode] = hashCode$;
|
| @@ -4070,7 +4067,7 @@ var collection;
|
| }
|
| return _LinkedCustomHashMap;
|
| });
|
| - let _LinkedCustomHashMap = _LinkedCustomHashMap$(dart.dynamic, dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, '_LinkedCustomHashMap', {get: _LinkedCustomHashMap$});
|
| class LinkedHashMapCell extends core.Object {
|
| LinkedHashMapCell(key$, value$) {
|
| this[_key] = key$;
|
| @@ -4112,7 +4109,7 @@ var collection;
|
| LinkedHashMapKeyIterable[dart.implements] = [_internal.EfficientLength];
|
| return LinkedHashMapKeyIterable;
|
| });
|
| - let LinkedHashMapKeyIterable = LinkedHashMapKeyIterable$(dart.dynamic);
|
| + dart.defineLazyClassGeneric(exports, 'LinkedHashMapKeyIterable', {get: LinkedHashMapKeyIterable$});
|
| let _cell = Symbol('_cell');
|
| let LinkedHashMapKeyIterator$ = dart.generic(function(E) {
|
| class LinkedHashMapKeyIterator extends core.Object {
|
| @@ -4910,25 +4907,15 @@ var collection;
|
| exports.UnmodifiableMapView = UnmodifiableMapView;
|
| exports.UnmodifiableMapView$ = UnmodifiableMapView$;
|
| exports.Maps = Maps;
|
| - exports.Queue = Queue;
|
| - exports.Queue$ = Queue$;
|
| exports.DoubleLinkedQueueEntry = DoubleLinkedQueueEntry;
|
| exports.DoubleLinkedQueueEntry$ = DoubleLinkedQueueEntry$;
|
| - exports.DoubleLinkedQueue = DoubleLinkedQueue;
|
| - exports.DoubleLinkedQueue$ = DoubleLinkedQueue$;
|
| - exports.ListQueue = ListQueue;
|
| - exports.ListQueue$ = ListQueue$;
|
| exports.SplayTreeMap = SplayTreeMap;
|
| exports.SplayTreeMap$ = SplayTreeMap$;
|
| exports.SplayTreeSet = SplayTreeSet;
|
| exports.SplayTreeSet$ = SplayTreeSet$;
|
| - exports.HashMapKeyIterable = HashMapKeyIterable;
|
| - exports.HashMapKeyIterable$ = HashMapKeyIterable$;
|
| exports.HashMapKeyIterator = HashMapKeyIterator;
|
| exports.HashMapKeyIterator$ = HashMapKeyIterator$;
|
| exports.LinkedHashMapCell = LinkedHashMapCell;
|
| - exports.LinkedHashMapKeyIterable = LinkedHashMapKeyIterable;
|
| - exports.LinkedHashMapKeyIterable$ = LinkedHashMapKeyIterable$;
|
| exports.LinkedHashMapKeyIterator = LinkedHashMapKeyIterator;
|
| exports.LinkedHashMapKeyIterator$ = LinkedHashMapKeyIterator$;
|
| exports.HashSetIterator = HashSetIterator;
|
|
|