Rose: use program for all literal matches

Unifies all literal match paths so that the Rose program is used for all
of them. This removes the previous specialised "direct report" and
"multi direct report" paths. Some additional REPORT instruction work was
necessary for this.

Reworked literal construction path at compile time in prep for using
program offsets as literal IDs.

Completely removed the anchored log runtime, which is no longer worth
the extra complexity.
This commit is contained in:
Justin Viiret
2016-02-18 09:45:37 +11:00
committed by Matthew Barr
parent b58d05dfec
commit 67b9784dae
26 changed files with 681 additions and 1176 deletions

View File

@@ -46,17 +46,22 @@ namespace ue2 {
class NGHolder;
class RoseBuildImpl;
struct Grey;
aligned_unique_ptr<anchored_matcher_info>
buildAnchoredAutomataMatcher(RoseBuildImpl &build, size_t *asize);
u32 anchoredStateSize(const anchored_matcher_info &atable);
struct raw_dfa;
/**
* \brief True if there is an anchored matcher and it consists of multiple
* DFAs.
* \brief Construct a set of anchored DFAs from our anchored literals/engines.
*/
bool anchoredIsMulti(const anchored_matcher_info &atable);
std::vector<raw_dfa> buildAnchoredDfas(RoseBuildImpl &build);
/**
* \brief Construct an anchored_matcher_info runtime structure from the given
* set of DFAs.
*/
aligned_unique_ptr<anchored_matcher_info>
buildAnchoredMatcher(RoseBuildImpl &build, std::vector<raw_dfa> &dfas,
size_t *asize);
u32 anchoredStateSize(const anchored_matcher_info &atable);
#define ANCHORED_FAIL 0
#define ANCHORED_SUCCESS 1