Changeset 36083 in webkit for trunk/JavaScriptCore/kjs/PropertyMap.cpp
- Timestamp:
- Sep 4, 2008, 1:00:04 AM (17 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/JavaScriptCore/kjs/PropertyMap.cpp
r36032 r36083 129 129 #endif 130 130 131 unsigned entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];131 unsigned entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 132 132 if (entryIndex == emptyEntryIndex) 133 133 return 0; … … 151 151 #endif 152 152 153 entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];153 entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 154 154 if (entryIndex == emptyEntryIndex) 155 155 return 0; … … 182 182 #endif 183 183 184 unsigned entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];184 unsigned entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 185 185 if (entryIndex == emptyEntryIndex) 186 186 return 0; … … 202 202 #endif 203 203 204 entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];204 entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 205 205 if (entryIndex == emptyEntryIndex) 206 206 return 0; … … 231 231 #endif 232 232 233 unsigned entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];233 unsigned entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 234 234 if (entryIndex == emptyEntryIndex) 235 235 return 0; … … 251 251 #endif 252 252 253 entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];253 entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 254 254 if (entryIndex == emptyEntryIndex) 255 255 return 0; … … 282 282 #endif 283 283 284 unsigned entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];284 unsigned entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 285 285 if (entryIndex == emptyEntryIndex) 286 286 return 0; … … 304 304 #endif 305 305 306 entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];306 entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 307 307 if (entryIndex == emptyEntryIndex) 308 308 return 0; … … 357 357 358 358 while (1) { 359 unsigned entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];359 unsigned entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 360 360 if (entryIndex == emptyEntryIndex) 361 361 break; … … 405 405 406 406 // Create a new hash table entry. 407 m_u.table->entryIndic ies[i & m_u.table->sizeMask] = entryIndex;407 m_u.table->entryIndices[i & m_u.table->sizeMask] = entryIndex; 408 408 409 409 // Create a new hash table entry. … … 434 434 435 435 while (1) { 436 unsigned entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];436 unsigned entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 437 437 if (entryIndex == emptyEntryIndex) 438 438 break; … … 453 453 454 454 unsigned entryIndex = m_u.table->keyCount + 2; 455 m_u.table->entryIndic ies[i & m_u.table->sizeMask] = entryIndex;455 m_u.table->entryIndices[i & m_u.table->sizeMask] = entryIndex; 456 456 m_u.table->entries()[entryIndex - 1] = entry; 457 457 ++m_u.table->keyCount; … … 560 560 UString::Rep* key = 0; 561 561 while (1) { 562 entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];562 entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 563 563 if (entryIndex == emptyEntryIndex) 564 564 return; … … 584 584 // Replace this one element with the deleted sentinel. Also clear out 585 585 // the entry so we can iterate all the entries as needed. 586 m_u.table->entryIndic ies[i & m_u.table->sizeMask] = deletedSentinelIndex;586 m_u.table->entryIndices[i & m_u.table->sizeMask] = deletedSentinelIndex; 587 587 key->deref(); 588 588 m_u.table->entries()[entryIndex - 1].key = 0; … … 705 705 unsigned deletedIndexCount = 0; 706 706 for (unsigned a = 0; a != m_u.table->size; ++a) { 707 unsigned entryIndex = m_u.table->entryIndic ies[a];707 unsigned entryIndex = m_u.table->entryIndices[a]; 708 708 if (entryIndex == emptyEntryIndex) 709 709 continue; … … 717 717 718 718 for (unsigned b = a + 1; b != m_u.table->size; ++b) 719 ASSERT(m_u.table->entryIndic ies[b] != entryIndex);719 ASSERT(m_u.table->entryIndices[b] != entryIndex); 720 720 } 721 721 ASSERT(indexCount == m_u.table->keyCount); … … 736 736 unsigned entryIndex; 737 737 while (1) { 738 entryIndex = m_u.table->entryIndic ies[i & m_u.table->sizeMask];738 entryIndex = m_u.table->entryIndices[i & m_u.table->sizeMask]; 739 739 ASSERT(entryIndex != emptyEntryIndex); 740 740 if (rep == m_u.table->entries()[entryIndex - 1].key)
Note:
See TracChangeset
for help on using the changeset viewer.