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

Use a visitor for outfix engine construction

Browse Source
This commit is contained in:
Justin Viiret 2016-04-18 09:49:13 +10:00 committed by Matthew Barr
parent 32c866a8f9
commit 16985ab6e5
1 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/rose/rose_build_bytecode.cpp
View File

@ -1256,36 +1256,42 @@ bool hasNonSmallBlockOutfix(const vector<OutfixInfo> &outfixes) {
return false; return false;
} }
static namespace {
aligned_unique_ptr<NFA> buildOutfix(RoseBuildImpl &tbi, OutfixInfo &outfix) { class OutfixBuilder : public boost::static_visitor<aligned_unique_ptr<NFA>> {
assert(!outfix.is_dead()); // should not be marked dead. public:
explicit OutfixBuilder(const RoseBuildImpl &build_in) : build(build_in) {}
const CompileContext &cc = tbi.cc; aligned_unique_ptr<NFA> operator()(boost::blank&) const {
const ReportManager &rm = tbi.rm; return nullptr;
};
aligned_unique_ptr<NFA> n; aligned_unique_ptr<NFA> operator()(unique_ptr<raw_dfa> &rdfa) const {
if (auto *rdfa = outfix.rdfa()) {
// Unleash the McClellan! // Unleash the McClellan!
n = mcclellanCompile(*rdfa, cc); return mcclellanCompile(*rdfa, build.cc);
} else if (auto *haig = outfix.haig()) { }
aligned_unique_ptr<NFA> operator()(unique_ptr<raw_som_dfa> &haig) const {
// Unleash the Goughfish! // Unleash the Goughfish!
n = goughCompile(*haig, tbi.ssm.somPrecision(), cc); return goughCompile(*haig, build.ssm.somPrecision(), build.cc);
} else if (auto *holder = outfix.holder()) { }
aligned_unique_ptr<NFA> operator()(unique_ptr<NGHolder> &holder) const {
const CompileContext &cc = build.cc;
const ReportManager &rm = build.rm;
NGHolder &h = *holder; NGHolder &h = *holder;
assert(h.kind == NFA_OUTFIX); assert(h.kind == NFA_OUTFIX);
// Build NFA. // Build NFA.
if (!n) {
const map<u32, u32> fixed_depth_tops; /* no tops */ const map<u32, u32> fixed_depth_tops; /* no tops */
const map<u32, vector<vector<CharReach>>> triggers; /* no tops */ const map<u32, vector<vector<CharReach>>> triggers; /* no tops */
bool compress_state = cc.streaming; bool compress_state = cc.streaming;
n = constructNFA(h, &rm, fixed_depth_tops, triggers, compress_state, auto n = constructNFA(h, &rm, fixed_depth_tops, triggers,
cc); compress_state, cc);
}
// Try for a DFA upgrade. // Try for a DFA upgrade.
if (n && cc.grey.roseMcClellanOutfix if (n && cc.grey.roseMcClellanOutfix &&
&& !has_bounded_repeats_other_than_firsts(*n)) { !has_bounded_repeats_other_than_firsts(*n)) {
auto rdfa = buildMcClellan(h, &rm, cc.grey); auto rdfa = buildMcClellan(h, &rm, cc.grey);
if (rdfa) { if (rdfa) {
auto d = mcclellanCompile(*rdfa, cc); auto d = mcclellanCompile(*rdfa, cc);
@ -1294,11 +1300,27 @@ aligned_unique_ptr<NFA> buildOutfix(RoseBuildImpl &tbi, OutfixInfo &outfix) {
} }
} }
} }
} else if (auto *mpv = outfix.mpv()) {
assert(mpv->puffettes.empty()); return n;
} }
if (n && tbi.cc.grey.reverseAccelerate) { aligned_unique_ptr<NFA> operator()(UNUSED MpvProto &mpv) const {
// MPV construction handled separately.
assert(mpv.puffettes.empty());
return nullptr;
}
private:
const RoseBuildImpl &build;
};
}
static
aligned_unique_ptr<NFA> buildOutfix(RoseBuildImpl &build, OutfixInfo &outfix) {
assert(!outfix.is_dead()); // should not be marked dead.
auto n = boost::apply_visitor(OutfixBuilder(build), outfix.proto);
if (n && build.cc.grey.reverseAccelerate) {
buildReverseAcceleration(n.get(), outfix.rev_info, outfix.minWidth); buildReverseAcceleration(n.get(), outfix.rev_info, outfix.minWidth);
} }