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

ng_repeat: use small_color_map

Browse Source
This commit is contained in:
Justin Viiret 2017-06-29 11:08:54 +10:00 committed by Matthew Barr
parent 8982e7177c
commit 32270725c6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/nfagraph/ng_repeat.cpp
View File

@ -47,6 +47,7 @@
#include "util/container.h" #include "util/container.h"
#include "util/dump_charclass.h" #include "util/dump_charclass.h"
#include "util/graph_range.h" #include "util/graph_range.h"
#include "util/graph_small_color_map.h"
#include "util/report_manager.h" #include "util/report_manager.h"
#include <algorithm> #include <algorithm>
@ -2084,14 +2085,14 @@ public:
static static
void populateFixedTopInfo(const map<u32, u32> &fixed_depth_tops, void populateFixedTopInfo(const map<u32, u32> &fixed_depth_tops,
const NGHolder &g, const NGHolder &g,
ue2::unordered_set<NFAVertex> *reached_by_fixed_tops) { unordered_set<NFAVertex> *reached_by_fixed_tops) {
if (fixed_depth_tops.empty()) { if (fixed_depth_tops.empty()) {
return; /* we will never find anything */ return; /* we will never find anything */
} }
assert(!proper_out_degree(g.startDs, g)); assert(!proper_out_degree(g.startDs, g));
ue2::unordered_map<NFAVertex, depth> top_depths; ue2::unordered_map<NFAVertex, depth> top_depths;
vector<boost::default_color_type> colours(num_vertices(g)); auto colours = make_small_color_map(g);
for (const auto &e : out_edges_range(g.start, g)) { for (const auto &e : out_edges_range(g.start, g)) {
NFAVertex v = target(e, g); NFAVertex v = target(e, g);
@ -2121,9 +2122,7 @@ void populateFixedTopInfo(const map<u32, u32> &fixed_depth_tops,
/* for each vertex reachable from v update its map to reflect that it is /* for each vertex reachable from v update its map to reflect that it is
* reachable from a top of depth td. */ * reachable from a top of depth td. */
depth_first_visit(g, v, pfti_visitor(top_depths, td), depth_first_visit(g, v, pfti_visitor(top_depths, td), colours);
make_iterator_property_map(colours.begin(),
get(vertex_index, g)));
} }
for (const auto &v_depth : top_depths) { for (const auto &v_depth : top_depths) {