github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-07-12 13:34:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

find_better_daddy: use flat_set for hinted states

Browse Source
This commit is contained in:
Justin Viiret 2017-04-06 11:43:56 +10:00 committed by Matthew Barr
parent 698653766b
commit 40f03929be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nfa/mcclellancompile.cpp
View File

@ -762,7 +762,7 @@ bytecode_ptr<NFA> mcclellanCompile8(dfa_info &info, const CompileContext &cc,
#define MAX_SHERMAN_LIST_LEN 8 #define MAX_SHERMAN_LIST_LEN 8
static static
void addIfEarlier(set<dstate_id_t> &dest, dstate_id_t candidate, void addIfEarlier(flat_set<dstate_id_t> &dest, dstate_id_t candidate,
dstate_id_t max) { dstate_id_t max) {
if (candidate < max) { if (candidate < max) {
dest.insert(candidate); dest.insert(candidate);
@ -770,7 +770,7 @@ void addIfEarlier(set<dstate_id_t> &dest, dstate_id_t candidate,
} }
static static
void addSuccessors(set<dstate_id_t> &dest, const dstate &source, void addSuccessors(flat_set<dstate_id_t> &dest, const dstate &source,
u16 alphasize, dstate_id_t curr_id) { u16 alphasize, dstate_id_t curr_id) {
for (symbol_t s = 0; s < alphasize; s++) { for (symbol_t s = 0; s < alphasize; s++) {
addIfEarlier(dest, source.next[s], curr_id); addIfEarlier(dest, source.next[s], curr_id);
@ -817,7 +817,7 @@ void find_better_daddy(dfa_info &info, dstate_id_t curr_id,
dstate_id_t best_daddy = 0; dstate_id_t best_daddy = 0;
dstate &currState = info.states[curr_id]; dstate &currState = info.states[curr_id];
set<dstate_id_t> hinted; /* set of states to search for a better daddy */ flat_set<dstate_id_t> hinted; /* states to search for a better daddy */
addIfEarlier(hinted, 0, curr_id); addIfEarlier(hinted, 0, curr_id);
addIfEarlier(hinted, info.raw.start_anchored, curr_id); addIfEarlier(hinted, info.raw.start_anchored, curr_id);
addIfEarlier(hinted, info.raw.start_floating, curr_id); addIfEarlier(hinted, info.raw.start_floating, curr_id);