github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fdr_confirm_compile: clean up for loops, iterators

Browse Source
This commit is contained in:
Justin Viiret 2016-03-01 15:56:18 +11:00 committed by Matthew Barr
parent 139a472af0
commit 81880d5a8d
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/fdr/fdr_confirm_compile.cpp
View File

@ -308,14 +308,12 @@ getFDRConfirm(const vector<hwlmLiteral> &lits, bool applyOneCharOpt,
// Walk the map by hash value assigning indexes and laying out the // Walk the map by hash value assigning indexes and laying out the
// elements (and their associated string confirm material) in memory. // elements (and their associated string confirm material) in memory.
for (std::map<u32, vector<LiteralIndex> >::const_iterator for (const auto &m : res2lits) {
i = res2lits.begin(), e = res2lits.end(); i != e; ++i) { const u32 hash = m.first;
const u32 hash = i->first; const vector<LiteralIndex> &vlidx = m.second;
const vector<LiteralIndex> &vlidx = i->second;
bitsToLitIndex[hash] = verify_u32(ptr - fdrc_base); bitsToLitIndex[hash] = verify_u32(ptr - fdrc_base);
for (vector<LiteralIndex>::const_iterator i2 = vlidx.begin(), for (auto i = vlidx.begin(), e = vlidx.end(); i != e; ++i) {
e2 = vlidx.end(); i2 != e2; ++i2) { LiteralIndex litIdx = *i;
LiteralIndex litIdx = *i2;
// Write LitInfo header. // Write LitInfo header.
u8 *oldPtr = ptr; u8 *oldPtr = ptr;
@ -334,7 +332,7 @@ getFDRConfirm(const vector<hwlmLiteral> &lits, bool applyOneCharOpt,
} }
ptr = ROUNDUP_PTR(ptr, alignof(LitInfo)); ptr = ROUNDUP_PTR(ptr, alignof(LitInfo));
if (i2 + 1 == e2) { if (next(i) == e) {
finalLI.next = 0x0; finalLI.next = 0x0;
} else { } else {
// our next field represents an adjustment on top of // our next field represents an adjustment on top of
@ -377,12 +375,9 @@ u32 setupMultiConfirms(const vector<hwlmLiteral> &lits,
u32 totalConfirmSize = 0; u32 totalConfirmSize = 0;
for (BucketIndex b = 0; b < eng.getNumBuckets(); b++) { for (BucketIndex b = 0; b < eng.getNumBuckets(); b++) {
if (!bucketToLits[b].empty()) { if (!bucketToLits[b].empty()) {
vector<vector<hwlmLiteral> > vl(eng.getConfirmTopLevelSplit()); vector<vector<hwlmLiteral>> vl(eng.getConfirmTopLevelSplit());
for (vector<LiteralIndex>::const_iterator for (const LiteralIndex &lit_idx : bucketToLits[b]) {
i = bucketToLits[b].begin(), hwlmLiteral lit = lits[lit_idx]; // copy
e = bucketToLits[b].end();
i != e; ++i) {
hwlmLiteral lit = lits[*i]; // copy
// c is last char of this literal // c is last char of this literal
u8 c = *(lit.s.rbegin()); u8 c = *(lit.s.rbegin());