Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-18 07:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1478879 - Remove Range/Enum use in testHashTable.cpp. r=luke

Browse Source 
--HG--
extra : rebase_source : 0c1b07d4bbac889c686d95ce0d1182835cb119a6
This commit is contained in:
Nicholas Nethercote 2018-07-27 12:18:50 +10:00
parent 95ed5dcb6d
commit 66663fc5fa
1 changed files with 59 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
js/src/jsapi-tests/testHashTable.cpp
View File

@ -64,16 +64,16 @@ MapsAreEqual(IntMap& am, IntMap& bm)
equal = false;
fprintf(stderr, "A.count() == %u and B.count() == %u\n", am.count(), bm.count());
}
for (IntMap::Range r = am.all(); !r.empty(); r.popFront()) {
if (!bm.has(r.front().key())) {
for (auto iter = am.iter(); !iter.done(); iter.next()) {
if (!bm.has(iter.get().key())) {
equal = false;
fprintf(stderr, "B does not have %x which is in A\n", r.front().key());
fprintf(stderr, "B does not have %x which is in A\n", iter.get().key());
}
}
for (IntMap::Range r = bm.all(); !r.empty(); r.popFront()) {
if (!am.has(r.front().key())) {
for (auto iter = bm.iter(); !iter.done(); iter.next()) {
if (!am.has(iter.get().key())) {
equal = false;
fprintf(stderr, "A does not have %x which is in B\n", r.front().key());
fprintf(stderr, "A does not have %x which is in B\n", iter.get().key());
}
}
return equal;
@ -87,16 +87,16 @@ SetsAreEqual(IntSet& am, IntSet& bm)
equal = false;
fprintf(stderr, "A.count() == %u and B.count() == %u\n", am.count(), bm.count());
}
for (IntSet::Range r = am.all(); !r.empty(); r.popFront()) {
if (!bm.has(r.front())) {
for (auto iter = am.iter(); !iter.done(); iter.next()) {
if (!bm.has(iter.get())) {
equal = false;
fprintf(stderr, "B does not have %x which is in A\n", r.front());
fprintf(stderr, "B does not have %x which is in A\n", iter.get());
}
}
for (IntSet::Range r = bm.all(); !r.empty(); r.popFront()) {
if (!am.has(r.front())) {
for (auto iter = bm.iter(); !iter.done(); iter.next()) {
if (!am.has(iter.get())) {
equal = false;
fprintf(stderr, "A does not have %x which is in B\n", r.front());
fprintf(stderr, "A does not have %x which is in B\n", iter.get());
}
}
return equal;
@ -146,19 +146,19 @@ SlowRekey(IntMap* m) {
if (!tmp.init())
return false;
for (IntMap::Range r = m->all(); !r.empty(); r.popFront()) {
if (NewKeyFunction::shouldBeRemoved(r.front().key()))
for (auto iter = m->iter(); !iter.done(); iter.next()) {
if (NewKeyFunction::shouldBeRemoved(iter.get().key()))
continue;
uint32_t hi = NewKeyFunction::rekey(r.front().key());
uint32_t hi = NewKeyFunction::rekey(iter.get().key());
if (tmp.has(hi))
return false;
if (!tmp.putNew(hi, r.front().value()))
if (!tmp.putNew(hi, iter.get().value()))
return false;
}
m->clear();
for (IntMap::Range r = tmp.all(); !r.empty(); r.popFront()) {
if (!m->putNew(r.front().key(), r.front().value()))
for (auto iter = tmp.iter(); !iter.done(); iter.next()) {
if (!m->putNew(iter.get().key(), iter.get().value()))
return false;
}
@ -172,10 +172,10 @@ SlowRekey(IntSet* s) {
if (!tmp.init())
return false;
for (IntSet::Range r = s->all(); !r.empty(); r.popFront()) {
if (NewKeyFunction::shouldBeRemoved(r.front()))
for (auto iter = s->iter(); !iter.done(); iter.next()) {
if (NewKeyFunction::shouldBeRemoved(iter.get()))
continue;
uint32_t hi = NewKeyFunction::rekey(r.front());
uint32_t hi = NewKeyFunction::rekey(iter.get());
if (tmp.has(hi))
return false;
if (!tmp.putNew(hi))
@ -183,8 +183,8 @@ SlowRekey(IntSet* s) {
}
s->clear();
for (IntSet::Range r = tmp.all(); !r.empty(); r.popFront()) {
if (!s->putNew(r.front()))
for (auto iter = tmp.iter(); !iter.done(); iter.next()) {
if (!s->putNew(iter.get()))
return false;
}
@ -203,10 +203,10 @@ BEGIN_TEST(testHashRekeyManual)
CHECK(AddLowKeys(&am, &bm, i));
CHECK(MapsAreEqual(am, bm));
for (IntMap::Enum e(am); !e.empty(); e.popFront()) {
uint32_t tmp = LowToHigh::rekey(e.front().key());
if (tmp != e.front().key())
e.rekeyFront(tmp);
for (auto iter = am.modIter(); !iter.done(); iter.next()) {
uint32_t tmp = LowToHigh::rekey(iter.get().key());
if (tmp != iter.get().key())
iter.rekey(tmp);
}
CHECK(SlowRekey<LowToHigh>(&bm));
@ -225,10 +225,10 @@ BEGIN_TEST(testHashRekeyManual)
CHECK(AddLowKeys(&as, &bs, i));
CHECK(SetsAreEqual(as, bs));
for (IntSet::Enum e(as); !e.empty(); e.popFront()) {
uint32_t tmp = LowToHigh::rekey(e.front());
if (tmp != e.front())
e.rekeyFront(tmp);
for (auto iter = as.modIter(); !iter.done(); iter.next()) {
uint32_t tmp = LowToHigh::rekey(iter.get());
if (tmp != iter.get())
iter.rekey(tmp);
}
CHECK(SlowRekey<LowToHigh>(&bs));
@ -253,13 +253,13 @@ BEGIN_TEST(testHashRekeyManualRemoval)
CHECK(AddLowKeys(&am, &bm, i));
CHECK(MapsAreEqual(am, bm));
for (IntMap::Enum e(am); !e.empty(); e.popFront()) {
if (LowToHighWithRemoval::shouldBeRemoved(e.front().key())) {
e.removeFront();
for (auto iter = am.modIter(); !iter.done(); iter.next()) {
if (LowToHighWithRemoval::shouldBeRemoved(iter.get().key())) {
iter.remove();
} else {
uint32_t tmp = LowToHighWithRemoval::rekey(e.front().key());
if (tmp != e.front().key())
e.rekeyFront(tmp);
uint32_t tmp = LowToHighWithRemoval::rekey(iter.get().key());
if (tmp != iter.get().key())
iter.rekey(tmp);
}
}
CHECK(SlowRekey<LowToHighWithRemoval>(&bm));
@ -279,13 +279,13 @@ BEGIN_TEST(testHashRekeyManualRemoval)
CHECK(AddLowKeys(&as, &bs, i));
CHECK(SetsAreEqual(as, bs));
for (IntSet::Enum e(as); !e.empty(); e.popFront()) {
if (LowToHighWithRemoval::shouldBeRemoved(e.front())) {
e.removeFront();
for (auto iter = as.modIter(); !iter.done(); iter.next()) {
if (LowToHighWithRemoval::shouldBeRemoved(iter.get())) {
iter.remove();
} else {
uint32_t tmp = LowToHighWithRemoval::rekey(e.front());
if (tmp != e.front())
e.rekeyFront(tmp);
uint32_t tmp = LowToHighWithRemoval::rekey(iter.get());
if (tmp != iter.get())
iter.rekey(tmp);
}
}
CHECK(SlowRekey<LowToHighWithRemoval>(&bs));
@ -392,43 +392,43 @@ BEGIN_TEST(testHashMapLookupWithDefaultOOM)
END_TEST(testHashMapLookupWithDefaultOOM)
#endif // defined(DEBUG)
BEGIN_TEST(testHashTableMovableEnum)
BEGIN_TEST(testHashTableMovableModIterator)
{
IntSet set;
CHECK(set.init());
// Exercise returning a hash table Enum object from a function.
// Exercise returning a hash table ModIterator object from a function.
CHECK(set.put(1));
for (auto e = enumerateSet(set); !e.empty(); e.popFront())
e.removeFront();
for (auto iter = setModIter(set); !iter.done(); iter.next())
iter.remove();
CHECK(set.count() == 0);
// Test moving an Enum object explicitly.
// Test moving an ModIterator object explicitly.
CHECK(set.put(1));
CHECK(set.put(2));
CHECK(set.put(3));
CHECK(set.count() == 3);
{
auto e1 = IntSet::Enum(set);
CHECK(!e1.empty());
e1.removeFront();
e1.popFront();
auto i1 = set.modIter();
CHECK(!i1.done());
i1.remove();
i1.next();
auto e2 = std::move(e1);
CHECK(!e2.empty());
e2.removeFront();
e2.popFront();
auto i2 = std::move(i1);
CHECK(!i2.done());
i2.remove();
i2.next();
}
CHECK(set.count() == 1);
return true;
}
IntSet::Enum enumerateSet(IntSet& set)
IntSet::ModIterator setModIter(IntSet& set)
{
return IntSet::Enum(set);
return set.modIter();
}
END_TEST(testHashTableMovableEnum)
END_TEST(testHashTableMovableModIterator)