github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-10-09 07:42:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

CastleProto: track next top explicitly

Browse Source 
Repeats may be removed (e.g. by pruning in role aliasing passes)
leaving "holes" in the top map. Track the next top to use explicitly,
rather than using repeats.size().
This commit is contained in:
Justin Viiret
2015-12-03 09:27:57 +11:00
committed by Matthew Barr
parent 8427d83780
commit 748d46c124
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/nfa/castlecompile.cpp
View File

@@ -740,19 +740,13 @@ const CharReach &CastleProto::reach() const {
return repeats.begin()->second.reach;
}
static
u32 find_next_top(const map<u32, PureRepeat> &repeats) {
u32 top = verify_u32(repeats.size());
assert(!contains(repeats, top));
return top;
}
u32 CastleProto::add(const PureRepeat &pr) {
assert(repeats.size() < max_occupancy);
assert(pr.reach == reach());
assert(pr.reports.size() == 1);
u32 top = find_next_top(repeats);
u32 top = next_top++;
DEBUG_PRINTF("selected unused top %u\n", top);
assert(!contains(repeats, top));
repeats.emplace(top, pr);
for (const auto &report : pr.reports) {
report_map[report].insert(top);
@@ -760,6 +754,15 @@ u32 CastleProto::add(const PureRepeat &pr) {
return top;
}
void CastleProto::erase(u32 top) {
DEBUG_PRINTF("erase top %u\n", top);
assert(contains(repeats, top));
repeats.erase(top);
for (auto &m : report_map) {
m.second.erase(top);
}
}
u32 CastleProto::merge(const PureRepeat &pr) {
assert(repeats.size() <= max_occupancy);
assert(pr.reach == reach());
@@ -820,7 +823,7 @@ void remapCastleTops(CastleProto &proto, map<u32, u32> &top_map) {
for (const auto &m : proto.repeats) {
const u32 top = m.first;
const PureRepeat &pr = m.second;
u32 new_top = find_next_top(out);
u32 new_top = out.size();
out.emplace(new_top, pr);
top_map[top] = new_top;
}