Changeset 26688 in webkit for trunk/JavaScriptCore/kjs/property_map.cpp

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/kjs/property_map.cpp (modified) (13 diffs)

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -27 +27 @@
 #include "PropertyNameArray.h"
 #include <algorithm>
+#include <wtf/Assertions.h>
 #include <wtf/FastMalloc.h>
 #include <wtf/Vector.h>
@@ -160 +161 @@
 JSValue *PropertyMap::get(const Identifier &name, unsigned &attributes) const
 {
-    assert(!name.isNull());
+    ASSERT(!name.isNull());
     
     UString::Rep *rep = name._ustring.rep();
@@ -201 +202 @@
 JSValue *PropertyMap::get(const Identifier &name) const
 {
-    assert(!name.isNull());
+    ASSERT(!name.isNull());
     
     UString::Rep *rep = name._ustring.rep();
@@ -238 +239 @@
 JSValue **PropertyMap::getLocation(const Identifier &name)
 {
-    assert(!name.isNull());
+    ASSERT(!name.isNull());
     
     UString::Rep *rep = name._ustring.rep();
@@ -295 +296 @@
 void PropertyMap::put(const Identifier &name, JSValue *value, int attributes, bool roCheck)
 {
-    assert(!name.isNull());
-    assert(value != 0);
+    ASSERT(!name.isNull());
+    ASSERT(value != 0);
     
     checkConsistency();
@@ -382 +383 @@
 void PropertyMap::insert(UString::Rep *key, JSValue *value, int attributes, int index)
 {
-    assert(m_u.table);
+    ASSERT(m_u.table);
 
     unsigned h = key->hash();
@@ -394 +395 @@
 #endif
     while (entries[i].key) {
-        assert(entries[i].key != deletedSentinel());
+        ASSERT(entries[i].key != deletedSentinel());
         if (k == 0)
             k = 1 | (h % sizeMask);
@@ -418 +419 @@
 void PropertyMap::rehash()
 {
-    assert(m_u.table);
-    assert(m_u.table->size);
+    ASSERT(m_u.table);
+    ASSERT(m_u.table->size);
     rehash(m_u.table->size);
 }
@@ -449 +450 @@
         // the table key count
         ++m_u.table->keyCount;
-        assert(m_u.table->keyCount == 1);
+        ASSERT(m_u.table->keyCount == 1);
     }
 #endif
@@ -472 +473 @@
 void PropertyMap::remove(const Identifier &name)
 {
-    assert(!name.isNull());
+    ASSERT(!name.isNull());
     
     checkConsistency();
@@ -523 +524 @@
     entries[i].value = 0;
     entries[i].attributes = DontEnum;
-    assert(m_u.table->keyCount >= 1);
+    ASSERT(m_u.table->keyCount >= 1);
     --m_u.table->keyCount;
     ++m_u.table->sentinelCount;
@@ -702 +703 @@
                 *p++ = e;
         }
-        assert(p - sortedEntries.data() == count);
+        ASSERT(p - sortedEntries.data() == count);
 
         // Sort the entries by index.
@@ -750 +751 @@
             i = (i + k) & m_u.table->sizeMask;
         }
-        assert(i == j);
+        ASSERT(i == j);
         ++count;
     }
-    assert(count == m_u.table->keyCount);
-    assert(sentinelCount == m_u.table->sentinelCount);
-    assert(m_u.table->size >= 16);
-    assert(m_u.table->sizeMask);
-    assert(m_u.table->size == m_u.table->sizeMask + 1);
+    ASSERT(count == m_u.table->keyCount);
+    ASSERT(sentinelCount == m_u.table->sentinelCount);
+    ASSERT(m_u.table->size >= 16);
+    ASSERT(m_u.table->sizeMask);
+    ASSERT(m_u.table->size == m_u.table->sizeMask + 1);
 }