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

violet: maintain a reference to all the known implementable graphs

Browse Source
This commit is contained in:
Alex Coyte 2017-08-08 10:13:46 +10:00 committed by Matthew Barr
parent c693c44646
commit 34ed4a6991
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nfagraph/ng_violet.cpp
View File

@ -2898,22 +2898,22 @@ bool ensureImplementable(RoseBuild &rose, RoseInGraph &vg, bool allow_changes,
bool changed = false; bool changed = false;
bool need_to_recalc = false; bool need_to_recalc = false;
u32 added_count = 0; u32 added_count = 0;
unordered_set<NGHolder *> good; /* known to be implementable */ unordered_set<shared_ptr<NGHolder>> good; /* known to be implementable */
do { do {
changed = false; changed = false;
DEBUG_PRINTF("added %u\n", added_count); DEBUG_PRINTF("added %u\n", added_count);
map<const NGHolder *, vector<RoseInEdge> > edges_by_graph; map<const NGHolder *, vector<RoseInEdge> > edges_by_graph;
vector<NGHolder *> graphs; vector<shared_ptr<NGHolder>> graphs;
for (const RoseInEdge &ve : edges_range(vg)) { for (const RoseInEdge &ve : edges_range(vg)) {
if (vg[ve].graph && !vg[ve].dfa) { if (vg[ve].graph && !vg[ve].dfa) {
NGHolder *h = vg[ve].graph.get(); auto &h = vg[ve].graph;
if (!contains(edges_by_graph, h)) { if (!contains(edges_by_graph, h.get())) {
graphs.push_back(h); graphs.push_back(h);
} }
edges_by_graph[h].push_back(ve); edges_by_graph[h.get()].push_back(ve);
} }
} }
for (NGHolder *h : graphs) { for (auto &h : graphs) {
if (contains(good, h)) { if (contains(good, h)) {
continue; continue;
} }
@ -2924,9 +2924,8 @@ bool ensureImplementable(RoseBuild &rose, RoseInGraph &vg, bool allow_changes,
} }
if (tryForEarlyDfa(*h, cc) if (tryForEarlyDfa(*h, cc)
&& doEarlyDfa(rose, vg, *h, edges_by_graph[h], final_chance, rm, && doEarlyDfa(rose, vg, *h, edges_by_graph[h.get()],
cc)) { final_chance, rm, cc)) {
good.insert(h);
continue; continue;
} }
@ -2935,7 +2934,7 @@ bool ensureImplementable(RoseBuild &rose, RoseInGraph &vg, bool allow_changes,
return false; return false;
} }
if (splitForImplementability(vg, *h, edges_by_graph[h], cc)) { if (splitForImplementability(vg, *h, edges_by_graph[h.get()], cc)) {
added_count++; added_count++;
if (added_count > MAX_IMPLEMENTABLE_SPLITS) { if (added_count > MAX_IMPLEMENTABLE_SPLITS) {
DEBUG_PRINTF("added_count hit limit\n"); DEBUG_PRINTF("added_count hit limit\n");