Changeset 26688 in webkit for trunk/JavaScriptCore/wtf/HashTable.h

Timestamp:

Oct 16, 2007, 4:25:33 PM (18 years ago)

Author:

ggaren

Message:

Reviewed by Darin Adler.

Global replace of assert with ASSERT.

File:

• trunk/JavaScriptCore/wtf/HashTable.h (modified) (10 diffs)

trunk/JavaScriptCore/wtf/HashTable.h

@@ -26 +26 @@
 #include "FastMalloc.h"
 #include "HashTraits.h"
-#include <assert.h>
+#include <wtf/Assertions.h>
 
 namespace WTF {
@@ -147 +147 @@
         {
             checkValidity();
-            assert(m_position != m_endPosition);
+            ASSERT(m_position != m_endPosition);
             ++m_position;
             skipEmptyBuckets();
@@ -171 +171 @@
         {
 #if CHECK_HASHTABLE_ITERATORS
-            assert(m_table);
+            ASSERT(m_table);
 #endif
         }
@@ -179 +179 @@
         void checkValidity(const const_iterator& other) const
         {
-            assert(m_table);
-            assert(other.m_table);
-            assert(m_table == other.m_table);
+            ASSERT(m_table);
+            ASSERT(other.m_table);
+            ASSERT(m_table == other.m_table);
         }
 #else
@@ -385 +385 @@
     inline typename HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::FullLookupType HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::lookup(const T& key)
     {
-        assert(m_table);
+        ASSERT(m_table);
 
         unsigned h = HashTranslator::hash(key);
@@ -461 +461 @@
     inline void HashTable<Key, Value, Extractor, HashFunctions, Traits, KeyTraits>::reinsert(ValueType& entry)
     {
-        assert(m_table);
-        assert(!lookup(Extractor::extract(entry)).second);
-        assert(!isDeletedBucket(*(lookup(Extractor::extract(entry)).first)));
+        ASSERT(m_table);
+        ASSERT(!lookup(Extractor::extract(entry)).second);
+        ASSERT(!isDeletedBucket(*(lookup(Extractor::extract(entry)).first)));
 #if DUMP_HASHTABLE_STATS
         ++HashTableStats::numReinserts;
@@ -676 +676 @@
     {
         checkTableConsistencyExceptSize();
-        assert(!shouldExpand());
-        assert(!shouldShrink());
+        ASSERT(!shouldExpand());
+        ASSERT(!shouldShrink());
     }
 
@@ -699 +699 @@
 
             const_iterator it = find(Extractor::extract(*entry));
-            assert(entry == it.m_position);
+            ASSERT(entry == it.m_position);
             ++count;
         }
 
-        assert(count == m_keyCount);
-        assert(deletedCount == m_deletedCount);
-        assert(m_tableSize >= m_minTableSize);
-        assert(m_tableSizeMask);
-        assert(m_tableSize == m_tableSizeMask + 1);
+        ASSERT(count == m_keyCount);
+        ASSERT(deletedCount == m_deletedCount);
+        ASSERT(m_tableSize >= m_minTableSize);
+        ASSERT(m_tableSizeMask);
+        ASSERT(m_tableSize == m_tableSizeMask + 1);
     }
 
@@ -738 +738 @@
             it->m_next = 0;
         } else {
-            assert(table->m_iterators != it);
+            ASSERT(table->m_iterators != it);
             it->m_next = table->m_iterators;
             table->m_iterators = it;
             if (it->m_next) {
-                assert(!it->m_next->m_previous);
+                ASSERT(!it->m_next->m_previous);
                 it->m_next->m_previous = it;
             }
@@ -756 +756 @@
         // Delete iterator from doubly-linked list of iterators.
         if (!it->m_table) {
-            assert(!it->m_next);
-            assert(!it->m_previous);
+            ASSERT(!it->m_next);
+            ASSERT(!it->m_previous);
         } else {
             if (it->m_next) {
-                assert(it->m_next->m_previous == it);
+                ASSERT(it->m_next->m_previous == it);
                 it->m_next->m_previous = it->m_previous;
             }
             if (it->m_previous) {
-                assert(it->m_table->m_iterators != it);
-                assert(it->m_previous->m_next == it);
+                ASSERT(it->m_table->m_iterators != it);
+                ASSERT(it->m_previous->m_next == it);
                 it->m_previous->m_next = it->m_next;
             } else {
-                assert(it->m_table->m_iterators == it);
+                ASSERT(it->m_table->m_iterators == it);
                 it->m_table->m_iterators = it->m_next;
             }