Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1050)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: lib/runtime/dart/collection.js

Issue 1111863002: fix static members in _emitMemberName (Closed) Base URL: git@github.com:dart-lang/dev_compiler.git@master
Patch Set: catch more cases Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lib/runtime/dart/async.js ('k') | lib/runtime/dart/convert.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/runtime/dart/collection.js
diff --git a/lib/runtime/dart/collection.js b/lib/runtime/dart/collection.js
index 41bd6311bb8a7bfe4d1321355967e4d0d29b3e99..fb349ba24347530099bf6ad4f1f96d0c7972340e 100644
--- a/lib/runtime/dart/collection.js
+++ b/lib/runtime/dart/collection.js
@@ -35,8 +35,6 @@ var collection;
return _Hasher;
});
let _Hasher = _Hasher$();
- let _fillMapWithMappedIterable = Symbol('_fillMapWithMappedIterable');
- let _fillMapWithIterables = Symbol('_fillMapWithIterables');
let HashMap$ = dart.generic(function(K, V) {
class HashMap extends core.Object {
HashMap(opts) {
@@ -81,12 +79,12 @@ var collection;
let key = opts && 'key' in opts ? opts.key : null;
let value = opts && 'value' in opts ? opts.value : null;
let map = new (HashMap$(K, V))();
- Maps[_fillMapWithMappedIterable](map, iterable, key, value);
+ Maps._fillMapWithMappedIterable(map, iterable, key, value);
return map;
}
fromIterables(keys, values) {
let map = new (HashMap$(K, V))();
- Maps[_fillMapWithIterables](map, keys, values);
+ Maps._fillMapWithIterables(map, keys, values);
return map;
}
}
@@ -650,9 +648,6 @@ var collection;
return IterableMixin;
});
let IterableMixin = IterableMixin$();
- let _isToStringVisiting = Symbol('_isToStringVisiting');
- let _toStringVisiting = Symbol('_toStringVisiting');
- let _iterablePartsToStrings = Symbol('_iterablePartsToStrings');
let IterableBase$ = dart.generic(function(E) {
class IterableBase extends core.Object {
IterableBase() {
@@ -851,19 +846,19 @@ var collection;
leftDelimiter = '(';
if (rightDelimiter === void 0)
rightDelimiter = ')';
- if (IterableBase[_isToStringVisiting](iterable)) {
+ if (IterableBase._isToStringVisiting(iterable)) {
if (leftDelimiter == "(" && rightDelimiter == ")") {
return "(...)";
}
return `${leftDelimiter}...${rightDelimiter}`;
}
let parts = [];
- IterableBase[_toStringVisiting][core.$add](iterable);
+ IterableBase._toStringVisiting[core.$add](iterable);
try {
- IterableBase[_iterablePartsToStrings](iterable, parts);
+ IterableBase._iterablePartsToStrings(iterable, parts);
} finally {
- dart.assert(core.identical(IterableBase[_toStringVisiting][core.$last], iterable));
- IterableBase[_toStringVisiting][core.$removeLast]();
+ dart.assert(core.identical(IterableBase._toStringVisiting[core.$last], iterable));
+ IterableBase._toStringVisiting[core.$removeLast]();
}
return dart.toString((() => {
let _ = new core.StringBuffer(leftDelimiter);
@@ -877,28 +872,28 @@ var collection;
leftDelimiter = '(';
if (rightDelimiter === void 0)
rightDelimiter = ')';
- if (IterableBase[_isToStringVisiting](iterable)) {
+ if (IterableBase._isToStringVisiting(iterable)) {
return `${leftDelimiter}...${rightDelimiter}`;
}
let buffer = new core.StringBuffer(leftDelimiter);
- IterableBase[_toStringVisiting][core.$add](iterable);
+ IterableBase._toStringVisiting[core.$add](iterable);
try {
buffer.writeAll(iterable, ", ");
} finally {
- dart.assert(core.identical(IterableBase[_toStringVisiting][core.$last], iterable));
- IterableBase[_toStringVisiting][core.$removeLast]();
+ dart.assert(core.identical(IterableBase._toStringVisiting[core.$last], iterable));
+ IterableBase._toStringVisiting[core.$removeLast]();
}
buffer.write(rightDelimiter);
return dart.toString(buffer);
}
- static [_isToStringVisiting](o) {
- for (let i = 0; dart.notNull(i) < dart.notNull(IterableBase[_toStringVisiting][core.$length]); i = dart.notNull(i) + 1) {
- if (core.identical(o, IterableBase[_toStringVisiting][core.$get](i)))
+ static _isToStringVisiting(o) {
+ for (let i = 0; dart.notNull(i) < dart.notNull(IterableBase._toStringVisiting[core.$length]); i = dart.notNull(i) + 1) {
+ if (core.identical(o, IterableBase._toStringVisiting[core.$get](i)))
return true;
}
return false;
}
- static [_iterablePartsToStrings](iterable, parts) {
+ static _iterablePartsToStrings(iterable, parts) {
let LENGTH_LIMIT = 80;
let HEAD_COUNT = 3;
let TAIL_COUNT = 2;
@@ -979,43 +974,40 @@ var collection;
}
IterableBase[dart.implements] = () => [core.Iterable$(E)];
dart.defineLazyProperties(IterableBase, {
- get [_toStringVisiting]() {
+ get _toStringVisiting() {
return [];
}
});
return IterableBase;
});
let IterableBase = IterableBase$();
- let _NOT_MOVED_YET = Symbol('_NOT_MOVED_YET');
let _iterator = Symbol('_iterator');
let _state = Symbol('_state');
let _move = Symbol('_move');
- let _HAS_NEXT_AND_NEXT_IN_CURRENT = Symbol('_HAS_NEXT_AND_NEXT_IN_CURRENT');
- let _NO_NEXT = Symbol('_NO_NEXT');
let HasNextIterator$ = dart.generic(function(E) {
class HasNextIterator extends core.Object {
HasNextIterator(iterator) {
this[_iterator] = iterator;
- this[_state] = HasNextIterator[_NOT_MOVED_YET];
+ this[_state] = HasNextIterator._NOT_MOVED_YET;
}
get hasNext() {
- if (this[_state] == HasNextIterator[_NOT_MOVED_YET])
+ if (this[_state] == HasNextIterator._NOT_MOVED_YET)
this[_move]();
- return this[_state] == HasNextIterator[_HAS_NEXT_AND_NEXT_IN_CURRENT];
+ return this[_state] == HasNextIterator._HAS_NEXT_AND_NEXT_IN_CURRENT;
}
next() {
if (!dart.notNull(this.hasNext))
throw new core.StateError("No more elements");
- dart.assert(this[_state] == HasNextIterator[_HAS_NEXT_AND_NEXT_IN_CURRENT]);
+ dart.assert(this[_state] == HasNextIterator._HAS_NEXT_AND_NEXT_IN_CURRENT);
let result = dart.as(this[_iterator].current, E);
this[_move]();
return result;
}
[_move]() {
if (this[_iterator].moveNext()) {
- this[_state] = HasNextIterator[_HAS_NEXT_AND_NEXT_IN_CURRENT];
+ this[_state] = HasNextIterator._HAS_NEXT_AND_NEXT_IN_CURRENT;
} else {
- this[_state] = HasNextIterator[_NO_NEXT];
+ this[_state] = HasNextIterator._NO_NEXT;
}
}
}
@@ -1025,8 +1017,6 @@ var collection;
return HasNextIterator;
});
let HasNextIterator = HasNextIterator$();
- let _literal = Symbol('_literal');
- let _empty = Symbol('_empty');
let LinkedHashMap$ = dart.generic(function(K, V) {
class LinkedHashMap extends core.Object {
LinkedHashMap(opts) {
@@ -1071,18 +1061,18 @@ var collection;
let key = opts && 'key' in opts ? opts.key : null;
let value = opts && 'value' in opts ? opts.value : null;
let map = new (LinkedHashMap$(K, V))();
- Maps[_fillMapWithMappedIterable](map, iterable, key, value);
+ Maps._fillMapWithMappedIterable(map, iterable, key, value);
return map;
}
fromIterables(keys, values) {
let map = new (LinkedHashMap$(K, V))();
- Maps[_fillMapWithIterables](map, keys, values);
+ Maps._fillMapWithIterables(map, keys, values);
return map;
}
- [_literal](keyValuePairs) {
+ _literal(keyValuePairs) {
return dart.as(_js_helper.fillLiteralMap(keyValuePairs, new (_LinkedHashMap$(K, V))()), LinkedHashMap$(K, V));
}
- [_empty]() {
+ _empty() {
return new (_LinkedHashMap$(K, V))();
}
}
@@ -1091,8 +1081,8 @@ var collection;
dart.defineNamedConstructor(LinkedHashMap, 'from');
dart.defineNamedConstructor(LinkedHashMap, 'fromIterable');
dart.defineNamedConstructor(LinkedHashMap, 'fromIterables');
- dart.defineNamedConstructor(LinkedHashMap, _literal);
- dart.defineNamedConstructor(LinkedHashMap, _empty);
+ dart.defineNamedConstructor(LinkedHashMap, '_literal');
+ dart.defineNamedConstructor(LinkedHashMap, '_empty');
return LinkedHashMap;
});
let LinkedHashMap = LinkedHashMap$();
@@ -1343,7 +1333,6 @@ var collection;
return LinkedListEntry;
});
let LinkedListEntry = LinkedListEntry$();
- let _filter = Symbol('_filter');
let ListMixin$ = dart.generic(function(E) {
class ListMixin extends core.Object {
get [core.$iterator]() {
@@ -1571,12 +1560,12 @@ var collection;
return false;
}
[core.$removeWhere](test) {
- ListMixin[_filter](this, test, false);
+ ListMixin._filter(this, test, false);
}
[core.$retainWhere](test) {
- ListMixin[_filter](this, test, true);
+ ListMixin._filter(this, test, true);
}
- static [_filter](source, test, retainMatching) {
+ static _filter(source, test, retainMatching) {
let retained = [];
let length = source[core.$length];
for (let i = 0; dart.notNull(i) < dart.notNull(length); i = dart.notNull(i) + 1) {
@@ -2015,7 +2004,6 @@ var collection;
return UnmodifiableMapView;
});
let UnmodifiableMapView = UnmodifiableMapView$();
- let _id = Symbol('_id');
class Maps extends core.Object {
static containsValue(map, value) {
for (let v of map.values) {
@@ -2064,12 +2052,12 @@ var collection;
return map.keys[core.$isNotEmpty];
}
static mapToString(m) {
- if (IterableBase[_isToStringVisiting](m)) {
+ if (IterableBase._isToStringVisiting(m)) {
return '{...}';
}
let result = new core.StringBuffer();
try {
- IterableBase[_toStringVisiting][core.$add](m);
+ IterableBase._toStringVisiting[core.$add](m);
result.write('{');
let first = true;
m.forEach((k, v) => {
@@ -2083,24 +2071,24 @@ var collection;
});
result.write('}');
} finally {
- dart.assert(core.identical(IterableBase[_toStringVisiting][core.$last], m));
- IterableBase[_toStringVisiting][core.$removeLast]();
+ dart.assert(core.identical(IterableBase._toStringVisiting[core.$last], m));
+ IterableBase._toStringVisiting[core.$removeLast]();
}
return dart.toString(result);
}
- static [_id](x) {
+ static _id(x) {
return x;
}
- static [_fillMapWithMappedIterable](map, iterable, key, value) {
+ static _fillMapWithMappedIterable(map, iterable, key, value) {
if (key == null)
- key = Maps[_id];
+ key = Maps._id;
if (value == null)
- value = Maps[_id];
+ value = Maps._id;
for (let element of iterable) {
map.set(dart.dcall(key, element), dart.dcall(value, element));
}
}
- static [_fillMapWithIterables](map, keys, values) {
+ static _fillMapWithIterables(map, keys, values) {
let keyIterator = keys[core.$iterator];
let valueIterator = values[core.$iterator];
let hasNextKey = keyIterator.moveNext();
@@ -2201,6 +2189,7 @@ var collection;
let _DoubleLinkedQueueEntrySentinel = _DoubleLinkedQueueEntrySentinel$();
let _sentinel = Symbol('_sentinel');
let _elementCount = Symbol('_elementCount');
+ let _filter = Symbol('_filter');
let DoubleLinkedQueue$ = dart.generic(function(E) {
class DoubleLinkedQueue extends IterableBase$(E) {
DoubleLinkedQueue() {
@@ -2351,9 +2340,6 @@ var collection;
let _head = Symbol('_head');
let _tail = Symbol('_tail');
let _table = Symbol('_table');
- let _INITIAL_CAPACITY = Symbol('_INITIAL_CAPACITY');
- let _isPowerOf2 = Symbol('_isPowerOf2');
- let _nextPowerOf2 = Symbol('_nextPowerOf2');
let _checkModification = Symbol('_checkModification');
let _writeToList = Symbol('_writeToList');
let _add = Symbol('_add');
@@ -2371,12 +2357,12 @@ var collection;
this[_table] = null;
this[_modificationCount] = 0;
super.IterableBase();
- if (initialCapacity == null || dart.notNull(initialCapacity) < dart.notNull(ListQueue[_INITIAL_CAPACITY])) {
- initialCapacity = ListQueue[_INITIAL_CAPACITY];
- } else if (!dart.notNull(ListQueue[_isPowerOf2](initialCapacity))) {
- initialCapacity = ListQueue[_nextPowerOf2](initialCapacity);
+ if (initialCapacity == null || dart.notNull(initialCapacity) < dart.notNull(ListQueue._INITIAL_CAPACITY)) {
+ initialCapacity = ListQueue._INITIAL_CAPACITY;
+ } else if (!dart.notNull(ListQueue._isPowerOf2(initialCapacity))) {
+ initialCapacity = ListQueue._nextPowerOf2(initialCapacity);
}
- dart.assert(ListQueue[_isPowerOf2](initialCapacity));
+ dart.assert(ListQueue._isPowerOf2(initialCapacity));
this[_table] = new (core.List$(E))(initialCapacity);
}
from(elements) {
@@ -2389,7 +2375,7 @@ var collection;
queue[_tail] = length;
return queue;
} else {
- let capacity = ListQueue[_INITIAL_CAPACITY];
+ let capacity = ListQueue._INITIAL_CAPACITY;
if (dart.is(elements, _internal.EfficientLength)) {
capacity = elements[core.$length];
}
@@ -2552,10 +2538,10 @@ var collection;
this[_table][core.$set](this[_tail], null);
return result;
}
- static [_isPowerOf2](number) {
+ static _isPowerOf2(number) {
return (dart.notNull(number) & dart.notNull(number) - 1) == 0;
}
- static [_nextPowerOf2](number) {
+ static _nextPowerOf2(number) {
dart.assert(dart.notNull(number) > 0);
number = (dart.notNull(number) << 1) - 1;
for (;;) {
@@ -2628,7 +2614,7 @@ var collection;
[_preGrow](newElementCount) {
dart.assert(dart.notNull(newElementCount) >= dart.notNull(this[core.$length]));
newElementCount = dart.notNull(newElementCount) + (dart.notNull(newElementCount) >> 1);
- let newCapacity = ListQueue[_nextPowerOf2](newElementCount);
+ let newCapacity = ListQueue._nextPowerOf2(newElementCount);
let newTable = new (core.List$(E))(newCapacity);
this[_tail] = this[_writeToList](newTable);
this[_table] = newTable;
@@ -2859,7 +2845,6 @@ var collection;
let _TypeTest = _TypeTest$();
let _comparator = Symbol('_comparator');
let _validKey = Symbol('_validKey');
- let _internal$ = Symbol('_internal');
let SplayTreeMap$ = dart.generic(function(K, V) {
class SplayTreeMap extends _SplayTree$(K) {
SplayTreeMap(compare, isValidKey) {
@@ -2888,7 +2873,7 @@ var collection;
let compare = opts && 'compare' in opts ? opts.compare : null;
let isValidKey = opts && 'isValidKey' in opts ? opts.isValidKey : null;
let map = new (SplayTreeMap$(K, V))(compare, isValidKey);
- Maps[_fillMapWithMappedIterable](map, iterable, key, value);
+ Maps._fillMapWithMappedIterable(map, iterable, key, value);
return map;
}
fromIterables(keys, values, compare, isValidKey) {
@@ -2897,13 +2882,13 @@ var collection;
if (isValidKey === void 0)
isValidKey = null;
let map = new (SplayTreeMap$(K, V))(compare, isValidKey);
- Maps[_fillMapWithIterables](map, keys, values);
+ Maps._fillMapWithIterables(map, keys, values);
return map;
}
[_compare](key1, key2) {
return this[_comparator](key1, key2);
}
- [_internal$]() {
+ _internal() {
this[_comparator] = null;
this[_validKey] = null;
super._SplayTree();
@@ -3064,7 +3049,7 @@ var collection;
dart.defineNamedConstructor(SplayTreeMap, 'from');
dart.defineNamedConstructor(SplayTreeMap, 'fromIterable');
dart.defineNamedConstructor(SplayTreeMap, 'fromIterables');
- dart.defineNamedConstructor(SplayTreeMap, _internal$);
+ dart.defineNamedConstructor(SplayTreeMap, '_internal');
return SplayTreeMap;
});
let SplayTreeMap = SplayTreeMap$();
@@ -3402,22 +3387,15 @@ var collection;
let _strings = Symbol('_strings');
let _nums = Symbol('_nums');
let _rest = Symbol('_rest');
- let _isStringKey = Symbol('_isStringKey');
- let _hasTableEntry = Symbol('_hasTableEntry');
- let _isNumericKey = Symbol('_isNumericKey');
let _containsKey = Symbol('_containsKey');
let _getBucket = Symbol('_getBucket');
let _findBucketIndex = Symbol('_findBucketIndex');
let _computeKeys = Symbol('_computeKeys');
- let _getTableEntry = Symbol('_getTableEntry');
let _get = Symbol('_get');
- let _newHashTable = Symbol('_newHashTable');
let _addHashTableEntry = Symbol('_addHashTableEntry');
let _set = Symbol('_set');
let _computeHashCode = Symbol('_computeHashCode');
- let _setTableEntry = Symbol('_setTableEntry');
let _removeHashTableEntry = Symbol('_removeHashTableEntry');
- let _deleteTableEntry = Symbol('_deleteTableEntry');
let _HashMap$ = dart.generic(function(K, V) {
class _HashMap extends core.Object {
_HashMap() {
@@ -3443,12 +3421,12 @@ var collection;
return new (_internal.MappedIterable$(K, V))(this.keys, (each => this.get(each)).bind(this));
}
containsKey(key) {
- if (_HashMap[_isStringKey](key)) {
+ if (_HashMap._isStringKey(key)) {
let strings = this[_strings];
- return strings == null ? false : _HashMap[_hasTableEntry](strings, key);
- } else if (_HashMap[_isNumericKey](key)) {
+ return strings == null ? false : _HashMap._hasTableEntry(strings, key);
+ } else if (_HashMap._isNumericKey(key)) {
let nums = this[_nums];
- return nums == null ? false : _HashMap[_hasTableEntry](nums, key);
+ return nums == null ? false : _HashMap._hasTableEntry(nums, key);
} else {
return this[_containsKey](key);
}
@@ -3469,12 +3447,12 @@ var collection;
}).bind(this));
}
get(key) {
- if (_HashMap[_isStringKey](key)) {
+ if (_HashMap._isStringKey(key)) {
let strings = this[_strings];
- return dart.as(strings == null ? null : _HashMap[_getTableEntry](strings, key), V);
- } else if (_HashMap[_isNumericKey](key)) {
+ return dart.as(strings == null ? null : _HashMap._getTableEntry(strings, key), V);
+ } else if (_HashMap._isNumericKey(key)) {
let nums = this[_nums];
- return dart.as(nums == null ? null : _HashMap[_getTableEntry](nums, key), V);
+ return dart.as(nums == null ? null : _HashMap._getTableEntry(nums, key), V);
} else {
return this[_get](key);
}
@@ -3488,15 +3466,15 @@ var collection;
return dart.as(dart.notNull(index) < 0 ? null : bucket[dart.notNull(index) + 1], V);
}
set(key, value) {
- if (_HashMap[_isStringKey](key)) {
+ if (_HashMap._isStringKey(key)) {
let strings = this[_strings];
if (strings == null)
- this[_strings] = strings = _HashMap[_newHashTable]();
+ this[_strings] = strings = _HashMap._newHashTable();
this[_addHashTableEntry](strings, key, value);
- } else if (_HashMap[_isNumericKey](key)) {
+ } else if (_HashMap._isNumericKey(key)) {
let nums = this[_nums];
if (nums == null)
- this[_nums] = nums = _HashMap[_newHashTable]();
+ this[_nums] = nums = _HashMap._newHashTable();
this[_addHashTableEntry](nums, key, value);
} else {
this[_set](key, value);
@@ -3505,11 +3483,11 @@ var collection;
[_set](key, value) {
let rest = this[_rest];
if (rest == null)
- this[_rest] = rest = _HashMap[_newHashTable]();
+ this[_rest] = rest = _HashMap._newHashTable();
let hash = this[_computeHashCode](key);
let bucket = rest[hash];
if (bucket == null) {
- _HashMap[_setTableEntry](rest, hash, [key, value]);
+ _HashMap._setTableEntry(rest, hash, [key, value]);
this[_length] = dart.notNull(this[_length]) + 1;
this[_keys] = null;
} else {
@@ -3531,9 +3509,9 @@ var collection;
return value;
}
remove(key) {
- if (_HashMap[_isStringKey](key)) {
+ if (_HashMap._isStringKey(key)) {
return this[_removeHashTableEntry](this[_strings], key);
- } else if (_HashMap[_isNumericKey](key)) {
+ } else if (_HashMap._isNumericKey(key)) {
return this[_removeHashTableEntry](this[_nums], key);
} else {
return this[_remove](key);
@@ -3611,16 +3589,16 @@ var collection;
return this[_keys] = result;
}
[_addHashTableEntry](table, key, value) {
- if (!dart.notNull(_HashMap[_hasTableEntry](table, key))) {
+ if (!dart.notNull(_HashMap._hasTableEntry(table, key))) {
this[_length] = dart.notNull(this[_length]) + 1;
this[_keys] = null;
}
- _HashMap[_setTableEntry](table, key, value);
+ _HashMap._setTableEntry(table, key, value);
}
[_removeHashTableEntry](table, key) {
- if (dart.notNull(table != null) && dart.notNull(_HashMap[_hasTableEntry](table, key))) {
- let value = dart.as(_HashMap[_getTableEntry](table, key), V);
- _HashMap[_deleteTableEntry](table, key);
+ if (dart.notNull(table != null) && dart.notNull(_HashMap._hasTableEntry(table, key))) {
+ let value = dart.as(_HashMap._getTableEntry(table, key), V);
+ _HashMap._deleteTableEntry(table, key);
this[_length] = dart.notNull(this[_length]) - 1;
this[_keys] = null;
return value;
@@ -3628,31 +3606,31 @@ var collection;
return null;
}
}
- static [_isStringKey](key) {
+ static _isStringKey(key) {
return typeof key == 'string' && dart.notNull(!dart.equals(key, '__proto__'));
}
- static [_isNumericKey](key) {
+ static _isNumericKey(key) {
return dart.is(key, core.num) && (key & 0x3ffffff) === key;
}
[_computeHashCode](key) {
return dart.hashCode(key) & 0x3ffffff;
}
- static [_hasTableEntry](table, key) {
+ static _hasTableEntry(table, key) {
let entry = table[key];
return entry != null;
}
- static [_getTableEntry](table, key) {
+ static _getTableEntry(table, key) {
let entry = table[key];
return entry === table ? null : entry;
}
- static [_setTableEntry](table, key, value) {
+ static _setTableEntry(table, key, value) {
if (value == null) {
table[key] = table;
} else {
table[key] = value;
}
}
- static [_deleteTableEntry](table, key) {
+ static _deleteTableEntry(table, key) {
delete table[key];
}
[_getBucket](table, key) {
@@ -3669,11 +3647,11 @@ var collection;
}
return -1;
}
- static [_newHashTable]() {
+ static _newHashTable() {
let table = Object.create(null);
let temporaryKey = '<non-identifier-key>';
- _HashMap[_setTableEntry](table, temporaryKey, table);
- _HashMap[_deleteTableEntry](table, temporaryKey);
+ _HashMap._setTableEntry(table, temporaryKey, table);
+ _HashMap._deleteTableEntry(table, temporaryKey);
return table;
}
}
@@ -3844,17 +3822,17 @@ var collection;
return new (_internal.MappedIterable$(K, V))(this.keys, (each => this.get(each)).bind(this));
}
containsKey(key) {
- if (_LinkedHashMap[_isStringKey](key)) {
+ if (_LinkedHashMap._isStringKey(key)) {
let strings = this[_strings];
if (strings == null)
return false;
- let cell = dart.as(_LinkedHashMap[_getTableEntry](strings, key), LinkedHashMapCell);
+ let cell = dart.as(_LinkedHashMap._getTableEntry(strings, key), LinkedHashMapCell);
return cell != null;
- } else if (_LinkedHashMap[_isNumericKey](key)) {
+ } else if (_LinkedHashMap._isNumericKey(key)) {
let nums = this[_nums];
if (nums == null)
return false;
- let cell = dart.as(_LinkedHashMap[_getTableEntry](nums, key), LinkedHashMapCell);
+ let cell = dart.as(_LinkedHashMap._getTableEntry(nums, key), LinkedHashMapCell);
return cell != null;
} else {
return this[_containsKey](key);
@@ -3876,17 +3854,17 @@ var collection;
}).bind(this));
}
get(key) {
- if (_LinkedHashMap[_isStringKey](key)) {
+ if (_LinkedHashMap._isStringKey(key)) {
let strings = this[_strings];
if (strings == null)
return null;
- let cell = dart.as(_LinkedHashMap[_getTableEntry](strings, key), LinkedHashMapCell);
+ let cell = dart.as(_LinkedHashMap._getTableEntry(strings, key), LinkedHashMapCell);
return dart.as(cell == null ? null : cell[_value], V);
- } else if (_LinkedHashMap[_isNumericKey](key)) {
+ } else if (_LinkedHashMap._isNumericKey(key)) {
let nums = this[_nums];
if (nums == null)
return null;
- let cell = dart.as(_LinkedHashMap[_getTableEntry](nums, key), LinkedHashMapCell);
+ let cell = dart.as(_LinkedHashMap._getTableEntry(nums, key), LinkedHashMapCell);
return dart.as(cell == null ? null : cell[_value], V);
} else {
return this[_get](key);
@@ -3904,15 +3882,15 @@ var collection;
return dart.as(cell[_value], V);
}
set(key, value) {
- if (_LinkedHashMap[_isStringKey](key)) {
+ if (_LinkedHashMap._isStringKey(key)) {
let strings = this[_strings];
if (strings == null)
- this[_strings] = strings = _LinkedHashMap[_newHashTable]();
+ this[_strings] = strings = _LinkedHashMap._newHashTable();
this[_addHashTableEntry](strings, key, value);
- } else if (_LinkedHashMap[_isNumericKey](key)) {
+ } else if (_LinkedHashMap._isNumericKey(key)) {
let nums = this[_nums];
if (nums == null)
- this[_nums] = nums = _LinkedHashMap[_newHashTable]();
+ this[_nums] = nums = _LinkedHashMap._newHashTable();
this[_addHashTableEntry](nums, key, value);
} else {
this[_set](key, value);
@@ -3921,12 +3899,12 @@ var collection;
[_set](key, value) {
let rest = this[_rest];
if (rest == null)
- this[_rest] = rest = _LinkedHashMap[_newHashTable]();
+ this[_rest] = rest = _LinkedHashMap._newHashTable();
let hash = this[_computeHashCode](key);
let bucket = rest[hash];
if (bucket == null) {
let cell = this[_newLinkedCell](key, value);
- _LinkedHashMap[_setTableEntry](rest, hash, [cell]);
+ _LinkedHashMap._setTableEntry(rest, hash, [cell]);
} else {
let index = this[_findBucketIndex](bucket, key);
if (dart.notNull(index) >= 0) {
@@ -3946,9 +3924,9 @@ var collection;
return value;
}
remove(key) {
- if (_LinkedHashMap[_isStringKey](key)) {
+ if (_LinkedHashMap._isStringKey(key)) {
return this[_removeHashTableEntry](this[_strings], key);
- } else if (_LinkedHashMap[_isNumericKey](key)) {
+ } else if (_LinkedHashMap._isNumericKey(key)) {
return this[_removeHashTableEntry](this[_nums], key);
} else {
return this[_remove](key);
@@ -3985,9 +3963,9 @@ var collection;
}
}
[_addHashTableEntry](table, key, value) {
- let cell = dart.as(_LinkedHashMap[_getTableEntry](table, key), LinkedHashMapCell);
+ let cell = dart.as(_LinkedHashMap._getTableEntry(table, key), LinkedHashMapCell);
if (cell == null) {
- _LinkedHashMap[_setTableEntry](table, key, this[_newLinkedCell](key, value));
+ _LinkedHashMap._setTableEntry(table, key, this[_newLinkedCell](key, value));
} else {
cell[_value] = value;
}
@@ -3995,11 +3973,11 @@ var collection;
[_removeHashTableEntry](table, key) {
if (table == null)
return null;
- let cell = dart.as(_LinkedHashMap[_getTableEntry](table, key), LinkedHashMapCell);
+ let cell = dart.as(_LinkedHashMap._getTableEntry(table, key), LinkedHashMapCell);
if (cell == null)
return null;
this[_unlinkCell](cell);
- _LinkedHashMap[_deleteTableEntry](table, key);
+ _LinkedHashMap._deleteTableEntry(table, key);
return dart.as(cell[_value], V);
}
[_modified]() {
@@ -4036,23 +4014,23 @@ var collection;
this[_length] = dart.notNull(this[_length]) - 1;
this[_modified]();
}
- static [_isStringKey](key) {
+ static _isStringKey(key) {
return typeof key == 'string' && dart.notNull(!dart.equals(key, '__proto__'));
}
- static [_isNumericKey](key) {
+ static _isNumericKey(key) {
return dart.is(key, core.num) && (key & 0x3ffffff) === key;
}
[_computeHashCode](key) {
return dart.hashCode(key) & 0x3ffffff;
}
- static [_getTableEntry](table, key) {
+ static _getTableEntry(table, key) {
return table[key];
}
- static [_setTableEntry](table, key, value) {
+ static _setTableEntry(table, key, value) {
dart.assert(value != null);
table[key] = value;
}
- static [_deleteTableEntry](table, key) {
+ static _deleteTableEntry(table, key) {
delete table[key];
}
[_getBucket](table, key) {
@@ -4070,11 +4048,11 @@ var collection;
}
return -1;
}
- static [_newHashTable]() {
+ static _newHashTable() {
let table = Object.create(null);
let temporaryKey = '<non-identifier-key>';
- _LinkedHashMap[_setTableEntry](table, temporaryKey, table);
- _LinkedHashMap[_deleteTableEntry](table, temporaryKey);
+ _LinkedHashMap._setTableEntry(table, temporaryKey, table);
+ _LinkedHashMap._deleteTableEntry(table, temporaryKey);
return table;
}
toString() {
@@ -4223,8 +4201,6 @@ var collection;
let LinkedHashMapKeyIterator = LinkedHashMapKeyIterator$();
let _elements = Symbol('_elements');
let _computeElements = Symbol('_computeElements');
- let _isStringElement = Symbol('_isStringElement');
- let _isNumericElement = Symbol('_isNumericElement');
let _contains = Symbol('_contains');
let _lookup = Symbol('_lookup');
let _HashSet$ = dart.generic(function(E) {
@@ -4252,12 +4228,12 @@ var collection;
return !dart.notNull(this[core.$isEmpty]);
}
[core.$contains](object) {
- if (_HashSet[_isStringElement](object)) {
+ if (_HashSet._isStringElement(object)) {
let strings = this[_strings];
- return strings == null ? false : _HashSet[_hasTableEntry](strings, object);
- } else if (_HashSet[_isNumericElement](object)) {
+ return strings == null ? false : _HashSet._hasTableEntry(strings, object);
+ } else if (_HashSet._isNumericElement(object)) {
let nums = this[_nums];
- return nums == null ? false : _HashSet[_hasTableEntry](nums, object);
+ return nums == null ? false : _HashSet._hasTableEntry(nums, object);
} else {
return this[_contains](object);
}
@@ -4270,7 +4246,7 @@ var collection;
return dart.notNull(this[_findBucketIndex](bucket, object)) >= 0;
}
lookup(object) {
- if (dart.notNull(_HashSet[_isStringElement](object)) || dart.notNull(_HashSet[_isNumericElement](object))) {
+ if (dart.notNull(_HashSet._isStringElement(object)) || dart.notNull(_HashSet._isNumericElement(object))) {
return dart.as(this[core.$contains](object) ? object : null, E);
}
return this[_lookup](object);
@@ -4286,15 +4262,15 @@ var collection;
return dart.as(bucket[core.$get](index), E);
}
add(element) {
- if (_HashSet[_isStringElement](element)) {
+ if (_HashSet._isStringElement(element)) {
let strings = this[_strings];
if (strings == null)
- this[_strings] = strings = _HashSet[_newHashTable]();
+ this[_strings] = strings = _HashSet._newHashTable();
return this[_addHashTableEntry](strings, element);
- } else if (_HashSet[_isNumericElement](element)) {
+ } else if (_HashSet._isNumericElement(element)) {
let nums = this[_nums];
if (nums == null)
- this[_nums] = nums = _HashSet[_newHashTable]();
+ this[_nums] = nums = _HashSet._newHashTable();
return this[_addHashTableEntry](nums, element);
} else {
return this[_add](element);
@@ -4303,11 +4279,11 @@ var collection;
[_add](element) {
let rest = this[_rest];
if (rest == null)
- this[_rest] = rest = _HashSet[_newHashTable]();
+ this[_rest] = rest = _HashSet._newHashTable();
let hash = this[_computeHashCode](element);
let bucket = rest[hash];
if (bucket == null) {
- _HashSet[_setTableEntry](rest, hash, [element]);
+ _HashSet._setTableEntry(rest, hash, [element]);
} else {
let index = this[_findBucketIndex](bucket, element);
if (dart.notNull(index) >= 0)
@@ -4324,9 +4300,9 @@ var collection;
}
}
remove(object) {
- if (_HashSet[_isStringElement](object)) {
+ if (_HashSet._isStringElement(object)) {
return this[_removeHashTableEntry](this[_strings], object);
- } else if (_HashSet[_isNumericElement](object)) {
+ } else if (_HashSet._isNumericElement(object)) {
return this[_removeHashTableEntry](this[_nums], object);
} else {
return this[_remove](object);
@@ -4394,16 +4370,16 @@ var collection;
return this[_elements] = result;
}
[_addHashTableEntry](table, element) {
- if (_HashSet[_hasTableEntry](table, element))
+ if (_HashSet._hasTableEntry(table, element))
return false;
- _HashSet[_setTableEntry](table, element, 0);
+ _HashSet._setTableEntry(table, element, 0);
this[_length] = dart.notNull(this[_length]) + 1;
this[_elements] = null;
return true;
}
[_removeHashTableEntry](table, element) {
- if (dart.notNull(table != null) && dart.notNull(_HashSet[_hasTableEntry](table, element))) {
- _HashSet[_deleteTableEntry](table, element);
+ if (dart.notNull(table != null) && dart.notNull(_HashSet._hasTableEntry(table, element))) {
+ _HashSet._deleteTableEntry(table, element);
this[_length] = dart.notNull(this[_length]) - 1;
this[_elements] = null;
return true;
@@ -4411,24 +4387,24 @@ var collection;
return false;
}
}
- static [_isStringElement](element) {
+ static _isStringElement(element) {
return typeof element == 'string' && dart.notNull(!dart.equals(element, '__proto__'));
}
- static [_isNumericElement](element) {
+ static _isNumericElement(element) {
return dart.is(element, core.num) && (element & 0x3ffffff) === element;
}
[_computeHashCode](element) {
return dart.hashCode(element) & 0x3ffffff;
}
- static [_hasTableEntry](table, key) {
+ static _hasTableEntry(table, key) {
let entry = table[key];
return entry != null;
}
- static [_setTableEntry](table, key, value) {
+ static _setTableEntry(table, key, value) {
dart.assert(value != null);
table[key] = value;
}
- static [_deleteTableEntry](table, key) {
+ static _deleteTableEntry(table, key) {
delete table[key];
}
[_getBucket](table, element) {
@@ -4445,11 +4421,11 @@ var collection;
}
return -1;
}
- static [_newHashTable]() {
+ static _newHashTable() {
let table = Object.create(null);
let temporaryKey = '<non-identifier-key>';
- _HashSet[_setTableEntry](table, temporaryKey, table);
- _HashSet[_deleteTableEntry](table, temporaryKey);
+ _HashSet._setTableEntry(table, temporaryKey, table);
+ _HashSet._deleteTableEntry(table, temporaryKey);
return table;
}
}
@@ -4588,17 +4564,17 @@ var collection;
return !dart.notNull(this[core.$isEmpty]);
}
[core.$contains](object) {
- if (_LinkedHashSet[_isStringElement](object)) {
+ if (_LinkedHashSet._isStringElement(object)) {
let strings = this[_strings];
if (strings == null)
return false;
- let cell = dart.as(_LinkedHashSet[_getTableEntry](strings, object), LinkedHashSetCell);
+ let cell = dart.as(_LinkedHashSet._getTableEntry(strings, object), LinkedHashSetCell);
return cell != null;
- } else if (_LinkedHashSet[_isNumericElement](object)) {
+ } else if (_LinkedHashSet._isNumericElement(object)) {
let nums = this[_nums];
if (nums == null)
return false;
- let cell = dart.as(_LinkedHashSet[_getTableEntry](nums, object), LinkedHashSetCell);
+ let cell = dart.as(_LinkedHashSet._getTableEntry(nums, object), LinkedHashSetCell);
return cell != null;
} else {
return this[_contains](object);
@@ -4612,7 +4588,7 @@ var collection;
return dart.notNull(this[_findBucketIndex](bucket, object)) >= 0;
}
lookup(object) {
- if (dart.notNull(_LinkedHashSet[_isStringElement](object)) || dart.notNull(_LinkedHashSet[_isNumericElement](object))) {
+ if (dart.notNull(_LinkedHashSet._isStringElement(object)) || dart.notNull(_LinkedHashSet._isNumericElement(object))) {
return dart.as(this[core.$contains](object) ? object : null, E);
} else {
return this[_lookup](object);
@@ -4650,15 +4626,15 @@ var collection;
return dart.as(this[_last][_element], E);
}
add(element) {
- if (_LinkedHashSet[_isStringElement](element)) {
+ if (_LinkedHashSet._isStringElement(element)) {
let strings = this[_strings];
if (strings == null)
- this[_strings] = strings = _LinkedHashSet[_newHashTable]();
+ this[_strings] = strings = _LinkedHashSet._newHashTable();
return this[_addHashTableEntry](strings, element);
- } else if (_LinkedHashSet[_isNumericElement](element)) {
+ } else if (_LinkedHashSet._isNumericElement(element)) {
let nums = this[_nums];
if (nums == null)
- this[_nums] = nums = _LinkedHashSet[_newHashTable]();
+ this[_nums] = nums = _LinkedHashSet._newHashTable();
return this[_addHashTableEntry](nums, element);
} else {
return this[_add](element);
@@ -4667,12 +4643,12 @@ var collection;
[_add](element) {
let rest = this[_rest];
if (rest == null)
- this[_rest] = rest = _LinkedHashSet[_newHashTable]();
+ this[_rest] = rest = _LinkedHashSet._newHashTable();
let hash = this[_computeHashCode](element);
let bucket = rest[hash];
if (bucket == null) {
let cell = this[_newLinkedCell](element);
- _LinkedHashSet[_setTableEntry](rest, hash, [cell]);
+ _LinkedHashSet._setTableEntry(rest, hash, [cell]);
} else {
let index = this[_findBucketIndex](bucket, element);
if (dart.notNull(index) >= 0)
@@ -4683,9 +4659,9 @@ var collection;
return true;
}
remove(object) {
- if (_LinkedHashSet[_isStringElement](object)) {
+ if (_LinkedHashSet._isStringElement(object)) {
return this[_removeHashTableEntry](this[_strings], object);
- } else if (_LinkedHashSet[_isNumericElement](object)) {
+ } else if (_LinkedHashSet._isNumericElement(object)) {
return this[_removeHashTableEntry](this[_nums], object);
} else {
return this[_remove](object);
@@ -4732,20 +4708,20 @@ var collection;
}
}
[_addHashTableEntry](table, element) {
- let cell = dart.as(_LinkedHashSet[_getTableEntry](table, element), LinkedHashSetCell);
+ let cell = dart.as(_LinkedHashSet._getTableEntry(table, element), LinkedHashSetCell);
if (cell != null)
return false;
- _LinkedHashSet[_setTableEntry](table, element, this[_newLinkedCell](element));
+ _LinkedHashSet._setTableEntry(table, element, this[_newLinkedCell](element));
return true;
}
[_removeHashTableEntry](table, element) {
if (table == null)
return false;
- let cell = dart.as(_LinkedHashSet[_getTableEntry](table, element), LinkedHashSetCell);
+ let cell = dart.as(_LinkedHashSet._getTableEntry(table, element), LinkedHashSetCell);
if (cell == null)
return false;
this[_unlinkCell](cell);
- _LinkedHashSet[_deleteTableEntry](table, element);
+ _LinkedHashSet._deleteTableEntry(table, element);
return true;
}
[_modified]() {
@@ -4782,23 +4758,23 @@ var collection;
this[_length] = dart.notNull(this[_length]) - 1;
this[_modified]();
}
- static [_isStringElement](element) {
+ static _isStringElement(element) {
return typeof element == 'string' && dart.notNull(!dart.equals(element, '__proto__'));
}
- static [_isNumericElement](element) {
+ static _isNumericElement(element) {
return dart.is(element, core.num) && (element & 0x3ffffff) === element;
}
[_computeHashCode](element) {
return dart.hashCode(element) & 0x3ffffff;
}
- static [_getTableEntry](table, key) {
+ static _getTableEntry(table, key) {
return table[key];
}
- static [_setTableEntry](table, key, value) {
+ static _setTableEntry(table, key, value) {
dart.assert(value != null);
table[key] = value;
}
- static [_deleteTableEntry](table, key) {
+ static _deleteTableEntry(table, key) {
delete table[key];
}
[_getBucket](table, element) {
@@ -4816,11 +4792,11 @@ var collection;
}
return -1;
}
- static [_newHashTable]() {
+ static _newHashTable() {
let table = Object.create(null);
let temporaryKey = '<non-identifier-key>';
- _LinkedHashSet[_setTableEntry](table, temporaryKey, table);
- _LinkedHashSet[_deleteTableEntry](table, temporaryKey);
+ _LinkedHashSet._setTableEntry(table, temporaryKey, table);
+ _LinkedHashSet._deleteTableEntry(table, temporaryKey);
return table;
}
}
« no previous file with comments | « lib/runtime/dart/async.js ('k') | lib/runtime/dart/convert.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698