github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-09-29 19:24:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

castle: add nfa kind to CastleProto

Browse Source
This commit is contained in:
Justin Viiret
2016-04-19 13:51:41 +10:00
committed by Matthew Barr
parent 1f41a921f2
commit ec985a62f8
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rose/rose_build_castle.cpp
View File

@@ -77,7 +77,7 @@ void makeCastle(LeftEngInfo &left,
if (isPureRepeat(h, pr) && pr.reports.size() == 1) {
DEBUG_PRINTF("vertex preceded by infix repeat %s\n",
pr.bounds.str().c_str());
left.castle = make_shared<CastleProto>(pr);
left.castle = make_shared<CastleProto>(h.kind, pr);
cache[&h] = left.castle;
left.graph.reset();
}
@@ -119,7 +119,7 @@ void makeCastleSuffix(RoseBuildImpl &tbi, RoseVertex v,
return;
}
suffix.castle = make_shared<CastleProto>(pr);
suffix.castle = make_shared<CastleProto>(h.kind, pr);
cache[&h] = suffix.castle;
suffix.graph.reset();
}
@@ -264,8 +264,7 @@ bool unmakeCastles(RoseBuildImpl &tbi) {
for (const auto &e : left_castles) {
assert(e.first.castle());
shared_ptr<NGHolder> h = makeHolder(*e.first.castle(), NFA_INFIX,
tbi.cc);
shared_ptr<NGHolder> h = makeHolder(*e.first.castle(), tbi.cc);
if (!h || num_vertices(*h) > MAX_UNMAKE_VERTICES) {
continue;
}
@@ -281,8 +280,7 @@ bool unmakeCastles(RoseBuildImpl &tbi) {
for (const auto &e : suffix_castles) {
assert(e.first.castle());
shared_ptr<NGHolder> h = makeHolder(*e.first.castle(), NFA_SUFFIX,
tbi.cc);
shared_ptr<NGHolder> h = makeHolder(*e.first.castle(), tbi.cc);
if (!h || num_vertices(*h) > MAX_UNMAKE_VERTICES) {
continue;
}