New implementation of {,Linked}Hash{Set,Map}.

sdk/lib/collection/hash_table.dart

Index: sdk/lib/collection/hash_table.dart
diff --git a/sdk/lib/collection/hash_table.dart b/sdk/lib/collection/hash_table.dart
new file mode 100644
index 0000000000000000000000000000000000000000..ed44b9ef5b27eb558fce171a7de8c163e31c556b
--- /dev/null
+++ b/sdk/lib/collection/hash_table.dart
@@ -0,0 +1,390 @@
+part of dart.collection;
+
+class _DeadEntry {
+  const _DeadEntry();
+}
+
+class _NullKey {
+  const _NullKey();
+  int get hashCode => null.hashCode;
+  bool operator ==(Object other) => other == null || identical(this, other);

[floitsch, 2013/02/08 16:48:35]

that can't happen. other will never be 'null'.

[Lasse Reichstein Nielsen, 2013/02/11 14:07:37]

Actually, it will never be _NULL.
The incoming value isn't converted to _NULL prematurely. It's only converted to
null when the key is written, and converted back before being used for anything.

[floitsch, 2013/02/11 14:09:43]

But the spec for x == y already guarantees that if one side is "null" it won't
do the method call.

[Lasse Reichstein Nielsen, 2013/02/12 10:34:47]

Doh. So it's not working. More tests needed.

+}
+
+const _TOMBSTONE = const _DeadEntry();
+const _NULL = const _NullKey();
+
+class _HashTable<K> {
+  /**
+   * Table of entries with [_entrySize] slots per entry.
+   *
+   * Capacity in entries must be factor of two.
+   */
+  List _table;
+  /** Current capacity. Always equal to [:_table.length ~/ _entrySize:]. */
+  int _capacity;
+  /** Count of occupied entries, including deleted ones. */
+  int _entryCount = 0;
+  /** Count of deleted entries. */
+  int _deletedCount = 0;
+  /** Counter incremented when table is modified. */
+  int _modificationCount = 0;
+
+  _HashTable(int initialCapacity) : _capacity = initialCapacity {
+    _table = _createTable(initialCapacity);
+  }
+
+  /** Reads key from table. Converts _NULL marker to null. */
+  Object _key(offset) {
+    assert(!_isFree(_table[offset]));
+    Object key = _table[offset];
+    if (!identical(key, _NULL)) return key;
+    return null;
+  }
+
+  /** Writes key to table. Converts _NULL marker to null. */

[floitsch, 2013/02/08 16:48:35]

Converts null to _NULL marker.

[Lasse Reichstein Nielsen, 2013/02/11 14:07:37]

Done.

+  void _setKey(int offset, Object key) {
+    if (key == null) key = _NULL;
+    _table[offset] = key;
+  }
+
+  int get _elementCount => _entryCount - _deletedCount;
+
+  /** Size of each entry. */
+  int get _entrySize => 1;
+
+  void _checkModification(int expectedModificationCount) {
+    if (_modificationCount != expectedModificationCount) {
+      throw new ConcurrentModificationError(this);
+    }
+  }
+
+  void _recordModification() {
+    // Value cycles after 2^30 modifications. If you keep hold of an
+    // iterator for that long, you might miss a modification detection,
+    // and iteration can go sour. Don't do that.
+    _modificationCount = (_modificationCount + 1) & (0x3FFFFFFF);
+  }
+
+  /**
+   * Create an empty table.
+   */
+  List _createTable(int capacity) {
+    List table = new List.fixedLength(capacity * _entrySize);
+    return table;
+  }
+
+  /** First table probe. */
+  int _firstProbe(int hashCode, int capacity) {
+    return hashCode & (capacity - 1);
+  }
+
+  /** Following table probes. */
+  int _nextProbe(int previousIndex, int probeCount, int capacity) {
+    return (previousIndex + probeCount) & (capacity - 1);
+  }
+
+  /** Whether an object is a free-marker (either tombstone or free). */
+  bool _isFree(Object marker) =>
+      marker == null || identical(marker, _TOMBSTONE);
+
+  /**
+   * Look up the offset for an object in the table.
+   *
+   * Finds the offset of the object in the table, if it is there,
+   * or the first free offset for its hashCode.
+   */
+  int _probeForAdd(int hashCode, Object object) {
+    int entrySize = _entrySize;
+    int index = _firstProbe(hashCode, _capacity);
+    int firstTombstone = -1;
+    int probeCount = 0;
+    while (true) {
+      int offset = index * entrySize;
+      Object entry = _table[offset];
+      if (identical(entry, _TOMBSTONE)) {
+        if (firstTombstone < 0) firstTombstone = offset;
+      } else if (entry == null) {
+        if (firstTombstone < 0) return offset;
+        return firstTombstone;
+      } else if (_equals(entry, object)) {
+        // TODO(lrn): Test if caching the last found key
+        // is better than (almost) always reading it again.
+        return offset;
+      }
+      // The _nextProbe must be designed so that it hits
+      // every index eventually.
+      index = _nextProbe(index, ++probeCount, _capacity);
+    }
+  }
+
+  int _probeForLookup(int hashCode, Object object) {
+    int entrySize = _entrySize;
+    int index = _firstProbe(hashCode, _capacity);
+    int probeCount = 0;
+    while (true) {
+      int offset = index * entrySize;
+      Object entry = _table[offset];
+      if (entry == null) {
+        return -1;
+      } else if (_equals(entry, object)) {
+        // If entry it's _TOMBSTONE, it matches nothing.
+        // Consider special casing it to make equals calls monomorphic.
+        return offset;
+      }
+      // The _nextProbe must be designed so that it hits
+      // every index eventually.
+      index = _nextProbe(index, ++probeCount, _capacity);
+    }
+  }
+
+  // Override the following two to change equality/hashCode computations
+
+  /**
+   * Compare two object for equality.
+   *
+   * The first object is the one already in the table,
+   * and the second is the one being searched for.
+   */
+  bool _equals(Object element, Object other) {
+    return element == other;
+  }
+
+  /**
+   * Compute hash-code for an object.
+   */
+  int _hashCodeOf(Object object) => object.hashCode;
+
+  /**
+   * Ensure that the table has room to add [moreElements] entries.
+   *
+   * Call this before adding one or more elements.
+   */
+  int _ensureCapacity(int moreElements) {
+    // Compute everything in multiples of entrySize to avoid division.
+    int entrySize = _entrySize;
+    int capacity = _capacity;
+    // Assume worst-case where no deleted elements are reused.
+    int newEntryCount = _entryCount + moreElements;
+    int newFreeCount = capacity - newEntryCount;
+    if (newFreeCount * 4 < capacity ||
+        newFreeCount < _deletedCount) {
+      // Less than 25% free or fewer free entries than deleted entries.
+      _grow(_entryCount - _deletedCount + moreElements);
+    }
+  }
+
+  void _grow(int contentCount) {
+    int capacity = _capacity;
+    // Don't grow to less than twice the needed capacity.
+    int minCapacity = contentCount * 2;
+    while (capacity < minCapacity) {
+      capacity *= 2;
+    }
+    // Reset to another table and add all existing elements.
+    List oldTable = _table;
+    _table = _createTable(capacity);
+    _capacity = capacity;
+    _entryCount = 0;
+    _deletedCount = 0;
+    _addAllEntries(oldTable);
+    _recordModification();
+  }
+
+  /**
+   * Copies all non-free entries from the old table to the new empty table.
+   */
+  void _addAllEntries(List oldTable) {
+    for (int i = 0; i < oldTable.length; i += _entrySize) {
+      Object object = oldTable[i];
+      if (!_isFree(object)) {
+        int toOffset = _put(object);
+        _copyEntry(oldTable, i, toOffset);
+      }
+    }
+  }
+
+  /**
+   * Copies everything but the key element from one entry to another.
+   *
+   * Called while growing the base array.
+   *
+   * Override this if any non-key fields need copying.
+   */
+  void _copyEntry(List fromTable, int fromOffset, int toOffset) {}
+
+  // The following three methods are for simple get/set/remove operations.
+  // They only affect the key of an entry. The remaining fields must be
+  // filled by the caller.
+
+  /**
+   * Returns the offset of a key in [_table], or negative if it's not there.
+   */
+  int _get(K key) {
+    return _probeForLookup(_hashCodeOf(key), key);
+  }
+
+  /**
+   * Puts the key into the table and returns its offset into [_table].
+   *
+   * If [_entrySize] is greater than 1, the caller should fill the
+   * remaining fields.
+   *
+   * Remember to call [_ensureCapacity] before using this method.
+   * You can call it once with a larger number before doing a sequence
+   * of put operations.
+   */
+  int _put(K key) {
+    int offset = _probeForAdd(_hashCodeOf(key), key);
+    Object oldEntry = _table[offset];
+    if (oldEntry == null) {
+      _entryCount++;
+    } else if (identical(oldEntry, _TOMBSTONE)) {
+      _deletedCount--;
+    } else {
+      return offset;
+    }
+    _setKey(offset, key);
+    _recordModification();
+    return offset;
+  }
+
+  /**
+   * Removes a key from the table and returns its offset into [_table].
+   *
+   * Returns null if the key was not in the table.
+   * If [_entrySize] is greater than 1, the caller should clean up the
+   * remaining fields.
+   */
+  int _remove(K key) {
+    int offset = _probeForLookup(_hashCodeOf(key), key);
+    if (offset >= 0) {
+      _deleteEntry(offset);
+    }
+    return offset;
+  }
+
+  /** Clears the table completely, leaving it empty. */
+  void _clear() {
+    if (_elementCount == 0) return;
+    for (int i = 0; i < _table.length; i++) {
+      _table[i] = null;
+    }
+    _entryCount = _deletedCount = 0;
+    _recordModification();
+  }
+
+  /** Clears an entry in the table. */
+  void _deleteEntry(int offset) {
+    assert(!_isFree(_table[offset]));
+    _setKey(offset, _TOMBSTONE);
+    _deletedCount++;
+    _recordModification();
+  }
+}
+
+class _HashTableKeyIterable<K> extends Iterable<K> {
+  final _HashTable<K> _hashTable;
+  _HashTableKeyIterable(this._hashTable);
+  Iterator<K> get iterator => new _HashTableKeyIterator<K>(_hashTable);
+
+  int get length => _hashTable._elementCount;
+
+  bool contains(Object value) => _hashTable._get(value) >= 0;
+
+  bool get isEmpty => _hashTable._elementCount == 0;
+
+  K get single {
+    if (_hashTable._elementCount > 1) {
+      throw new StateError("More than one element");
+    }
+    return first;
+  }
+}
+
+class _HashTableKeyIterator<K> implements Iterator<K> {
+  final _HashTable<K> _hashTable;
+  final int _modificationCount;
+  /** Location right after last found element. */
+  int _offset = 0;
+  K _current = null;
+
+  _HashTableKeyIterator(_HashTable<K> hashTable)
+      : _hashTable = hashTable,
+        _modificationCount = hashTable._modificationCount;
+
+  bool moveNext() {
+    _hashTable._checkModification(_modificationCount);
+
+    List table = _hashTable._table;
+    int entrySize = _hashTable._entrySize;
+
+    while (_offset < table.length) {
+      Object entry = table[_offset];
+      _offset += entrySize;
+      if (!_hashTable._isFree(entry)) {
+        if (identical(entry, _NULL)) {
+          _current = null;
+        } else {
+          _current = entry;
+        }
+        return true;
+      }
+    }
+    _current = null;
+    return false;
+  }
+
+  K get current => _current;
+}
+
+class _HashTableValueIterable<V> extends Iterable<V> {
+  final _HashTable _hashTable;
+  final int _entryIndex;
+  _HashTableValueIterable(this._hashTable, this._entryIndex);
+
+  Iterator<V> get iterator =>
+      new _HashTableValueIterator<V>(_hashTable, _entryIndex);
+
+  int get length => _hashTable._elementCount;
+}
+
+/**
+ * Iterator traversing a [HashTable] and returning a value for each entry.
+ */
+class _HashTableValueIterator<V> implements Iterator<V> {
+  final _HashTable _hashTable;
+  /** The index of the value in the entry.*/
+  final int _entryIndex;
+  final int _modificationCount;
+  /** Location right after last found element. */
+  int _offset = 0;
+  V _current = null;
+
+  _HashTableValueIterator(_HashTable hashTable, this._entryIndex)
+      : _hashTable = hashTable,
+        _modificationCount = hashTable._modificationCount {
+    assert(_entryIndex > 0);  // Use key-iterator above for index 0.
+    assert(_entryIndex < hashTable._entrySize);
+  }
+
+  bool moveNext() {
+    _hashTable._checkModification(_modificationCount);
+
+    List table = _hashTable._table;
+    int entrySize = _hashTable._entrySize;
+
+    while (_offset < table.length) {
+      Object entry = table[_offset];
+      int currentOffset = _offset;
+      _offset += entrySize;
+      if (!_hashTable._isFree(entry)) {
+        _current = table[currentOffset + _entryIndex];
+        return true;
+      }
+    }
+    _current = null;
+    return false;
+  }
+
+  V get current => _current;
+}