[core] cleanup === and !==

lib/coreimpl/hash_map_set.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 // Hash map implementation with open addressing and quadratic probing.
 class HashMapImplementation<K, V> implements HashMap<K, V> {
 
   // The [_keys] list contains the keys inserted in the map.
   // The [_keys] list must be a raw list because it
   // will contain both elements of type K, and the [_DELETED_KEY] of type
@@ skipping 60 matching lines @@
   int _probeForAdding(K key) {
     if (key == null) throw const NullPointerException();
     int hash = _firstProbe(key.hashCode(), _keys.length);
     int numberOfProbes = 1;
     int initialHash = hash;
     // insertionIndex points to a slot where a key was deleted.
     int insertionIndex = -1;
     while (true) {
       // [existingKey] can be either of type [K] or [_DeletedKeySentinel].
       Object existingKey = _keys[hash];
-      if (existingKey === null) {
+      if (existingKey == null) {
         // We are sure the key is not already in the set.
         // If the current slot is empty and we didn't find any
         // insertion slot before, return this slot.
         if (insertionIndex < 0) return hash;
         // If we did find an insertion slot before, return it.
         return insertionIndex;
       } else if (existingKey == key) {
         // The key is already in the map. Return its slot.
         return hash;
-      } else if ((insertionIndex < 0) && (_DELETED_KEY === existingKey)) {
+      } else if ((insertionIndex < 0) && (identical(_DELETED_KEY, existingKey))) {

[ahe, 2012/10/22 09:05:21]

_DELETED_KEY == existingKey

[floitsch, 2012/10/22 12:07:37]

I prefer identical too.
Please make it fit on 80chars.

[danrubel, 2012/10/22 13:35:48]

Done.

         // The slot contains a deleted element. Because previous calls to this
         // method may not have had this slot deleted, we must continue iterate
         // to find if there is a slot with the given key.
         insertionIndex = hash;
       }
 
       // We did not find an insertion slot. Look at the next one.
       hash = _nextProbe(hash, numberOfProbes++, _keys.length);
       // _ensureCapacity has guaranteed the following cannot happen.
       // assert(hash != initialHash);
     }
   }
 
   int _probeForLookup(K key) {
     if (key == null) throw const NullPointerException();
     int hash = _firstProbe(key.hashCode(), _keys.length);
     int numberOfProbes = 1;
     int initialHash = hash;
     while (true) {
       // [existingKey] can be either of type [K] or [_DeletedKeySentinel].
       Object existingKey = _keys[hash];
       // If the slot does not contain anything (in particular, it does not
       // contain a deleted key), we know the key is not in the map.
-      if (existingKey === null) return -1;
+      if (existingKey == null) return -1;
       // The key is in the map, return its index.
       if (existingKey == key) return hash;
       // Go to the next probe.
       hash = _nextProbe(hash, numberOfProbes++, _keys.length);
       // _ensureCapacity has guaranteed the following cannot happen.
       // assert(hash != initialHash);
     }
   }
 
   void _ensureCapacity() {
@@ skipping 25 matching lines @@
     int capacity = _keys.length;
     _loadLimit = _computeLoadLimit(newCapacity);
     List oldKeys = _keys;
     List<V> oldValues = _values;
     _keys = new List(newCapacity);
     _values = new List<V>(newCapacity);
     for (int i = 0; i < capacity; i++) {
       // [key] can be either of type [K] or [_DeletedKeySentinel].
       Object key = oldKeys[i];
       // If there is no key, we don't need to deal with the current slot.
-      if (key === null || key === _DELETED_KEY) {
+      if (key == null || identical(key, _DELETED_KEY)) {

[ahe, 2012/10/22 09:05:21]

DELETED_KEY == key

[floitsch, 2012/10/22 12:07:37]

ditto.

         continue;
       }
       V value = oldValues[i];
       // Insert the {key, value} pair in their new slot.
       int newIndex = _probeForAdding(key);
       _keys[newIndex] = key;
       _values[newIndex] = value;
     }
     _numberOfDeleted = 0;
   }
 
   void clear() {
     _numberOfEntries = 0;
     _numberOfDeleted = 0;
     int length = _keys.length;
     for (int i = 0; i < length; i++) {
       _keys[i] = null;
       _values[i] = null;
     }
   }
 
   void operator []=(K key, V value) {
     _ensureCapacity();
     int index = _probeForAdding(key);
-    if ((_keys[index] === null) || (_keys[index] === _DELETED_KEY)) {
+    if ((_keys[index] == null) || (identical(_keys[index], _DELETED_KEY))) {

[ahe, 2012/10/22 09:05:21]

_DELETED_KEY == _keys[index]

[floitsch, 2012/10/22 12:07:37]

ditto.

       _numberOfEntries++;
     }
     _keys[index] = key;
     _values[index] = value;
   }
 
   V operator [](K key) {
     int index = _probeForLookup(key);
     if (index < 0) return null;
     return _values[index];
@@ skipping 27 matching lines @@
   }
 
   int get length {
     return _numberOfEntries;
   }
 
   void forEach(void f(K key, V value)) {
     int length = _keys.length;
     for (int i = 0; i < length; i++) {
       var key = _keys[i];
-      if ((key !== null) && (key !== _DELETED_KEY)) {
+      if ((key != null) && (!identical(key, _DELETED_KEY))) {

[ahe, 2012/10/22 09:05:21]

_DELETED_KEY == key

[floitsch, 2012/10/22 12:07:37]

ditto.

         f(key, _values[i]);
       }
     }
   }
 
 
   Collection<K> getKeys() {
     List<K> list = new List<K>(length);
     int i = 0;
     forEach(void _(K key, V value) {
@@ skipping 12 matching lines @@
   }
 
   bool containsKey(K key) {
     return (_probeForLookup(key) != -1);
   }
 
   bool containsValue(V value) {
     int length = _values.length;
     for (int i = 0; i < length; i++) {
       var key = _keys[i];
-      if ((key !== null) && (key !== _DELETED_KEY)) {
+      if ((key != null) && (!identical(key, _DELETED_KEY))) {

[ahe, 2012/10/22 09:05:21]

Ditto

[floitsch, 2012/10/22 12:07:37]

ditto.

         if (_values[i] == value) return true;
       }
     }
     return false;
   }
 
   String toString() {
     return Maps.mapToString(this);
   }
 }
@@ skipping 123 matching lines @@
 
   // TODO(4504458): Replace set_ with set.
   HashSetIterator(HashSetImplementation<E> set_)
     : _nextValidIndex = -1,
       _entries = set_._backingMap._keys {
     _advance();
   }
 
   bool hasNext() {
     if (_nextValidIndex >= _entries.length) return false;
-    if (_entries[_nextValidIndex] === HashMapImplementation._DELETED_KEY) {
+    if (identical(_entries[_nextValidIndex], HashMapImplementation._DELETED_KEY)) {

[ahe, 2012/10/22 09:05:21]

HashMapImplementation._DELETED_KEY == identical(_entries[_nextValidIndex]

[floitsch, 2012/10/22 12:07:37]

ditto. Please make it fit on 80chars.

[danrubel, 2012/10/22 13:35:48]

Done.

       // This happens in case the set was modified in the meantime.
       // A modification on the set may make this iterator misbehave,
       // but we should never return the sentinel.
       _advance();
     }
     return _nextValidIndex < _entries.length;
   }
 
   E next() {
     if (!hasNext()) {
       throw const NoMoreElementsException();
     }
     E res = _entries[_nextValidIndex];
     _advance();
     return res;
   }
 
   void _advance() {
     int length = _entries.length;
     var entry;
     final deletedKey = HashMapImplementation._DELETED_KEY;
     do {
       if (++_nextValidIndex >= length) break;
       entry = _entries[_nextValidIndex];
-    } while ((entry === null) || (entry === deletedKey));
+    } while ((entry == null) || (identical(entry, deletedKey)));

[ahe, 2012/10/22 09:05:21]

deletedKey == entry

[floitsch, 2012/10/22 12:07:37]

ditto.

   }
 
   // The entries in the set. May contain null or the sentinel value.
   List<E> _entries;
 
   // The next valid index in [_entries] or the length of [entries_].
   // If it is the length of [_entries], calling [hasNext] on the
   // iterator will return false.
   int _nextValidIndex;
 }
 
 /**
  * A singleton sentinel used to represent when a key is deleted from the map.
  * We can't use [: const Object() :] as a sentinel because it would end up
  * canonicalized and then we cannot distinguish the deleted key from the
  * canonicalized [: Object() :].
  */
 class _DeletedKeySentinel {
   const _DeletedKeySentinel();
 }