Rose: make HWLM callbacks take scratch as ctx

This commit is contained in:
Justin Viiret
2016-03-03 14:14:30 +11:00
committed by Matthew Barr
parent f7a40b200d
commit 6af1ead0aa
4 changed files with 14 additions and 13 deletions

View File

@@ -83,11 +83,11 @@ void runAnchoredTableStream(const struct RoseEngine *t, const void *atable,
if (nfa->type == MCCLELLAN_NFA_8) {
nfaExecMcClellan8_SimpStream(nfa, state, scratch->core_info.buf,
start, adj, alen, roseAnchoredCallback,
&scratch->tctxt);
scratch);
} else {
nfaExecMcClellan16_SimpStream(nfa, state, scratch->core_info.buf,
start, adj, alen, roseAnchoredCallback,
&scratch->tctxt);
start, adj, alen,
roseAnchoredCallback, scratch);
}
next_nfa:
@@ -542,7 +542,7 @@ void roseStreamExec(const struct RoseEngine *t, struct hs_scratch *scratch,
}
DEBUG_PRINTF("BEGIN FLOATING (over %zu/%zu)\n", flen, length);
hwlmExecStreaming(ftable, scratch, flen, start, roseCallback, tctxt,
hwlmExecStreaming(ftable, scratch, flen, start, roseCallback, scratch,
tctxt->groups, stream_state);
}