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

limex: remove constant do_br arg from TESTEOD_FN

Browse Source
This commit is contained in:
Justin Viiret 2016-09-01 16:30:08 +10:00 committed by Matthew Barr
parent 9139123642
commit 9c99a923a1
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nfa/limex_common_impl.h
View File

@ -162,7 +162,7 @@ char PROCESS_ACCEPTS_NOSQUASH_FN(const STATE_T *s,
static really_inline static really_inline
char TESTEOD_FN(const IMPL_NFA_T *limex, const STATE_T *s, char TESTEOD_FN(const IMPL_NFA_T *limex, const STATE_T *s,
const union RepeatControl *repeat_ctrl, const union RepeatControl *repeat_ctrl,
const char *repeat_state, u64a offset, char do_br, const char *repeat_state, u64a offset,
NfaCallback callback, void *context) { NfaCallback callback, void *context) {
assert(limex && s); assert(limex && s);
@ -174,12 +174,8 @@ char TESTEOD_FN(const IMPL_NFA_T *limex, const STATE_T *s,
const STATE_T acceptEodMask = LOAD_FROM_ENG(&limex->acceptAtEOD); const STATE_T acceptEodMask = LOAD_FROM_ENG(&limex->acceptAtEOD);
STATE_T foundAccepts = AND_STATE(*s, acceptEodMask); STATE_T foundAccepts = AND_STATE(*s, acceptEodMask);
if (do_br) {
SQUASH_UNTUG_BR_FN(limex, repeat_ctrl, repeat_state, SQUASH_UNTUG_BR_FN(limex, repeat_ctrl, repeat_state,
offset + 1 /* EOD 'symbol' */, &foundAccepts); offset + 1 /* EOD 'symbol' */, &foundAccepts);
} else {
assert(!limex->repeatCount);
}
if (unlikely(ISNONZERO_STATE(foundAccepts))) { if (unlikely(ISNONZERO_STATE(foundAccepts))) {
const struct NFAAccept *acceptEodTable = getAcceptEodTable(limex); const struct NFAAccept *acceptEodTable = getAcceptEodTable(limex);

4
src/nfa/limex_runtime_impl.h
View File

@ -883,8 +883,8 @@ char JOIN(LIMEX_API_ROOT, _testEOD)(const struct NFA *n, const char *state,
const union RepeatControl *repeat_ctrl = const union RepeatControl *repeat_ctrl =
getRepeatControlBaseConst(state, sizeof(STATE_T)); getRepeatControlBaseConst(state, sizeof(STATE_T));
const char *repeat_state = streamState + limex->stateSize; const char *repeat_state = streamState + limex->stateSize;
return TESTEOD_FN(limex, sptr, repeat_ctrl, repeat_state, offset, 1, return TESTEOD_FN(limex, sptr, repeat_ctrl, repeat_state, offset, callback,
callback, context); context);
} }
char JOIN(LIMEX_API_ROOT, _reportCurrent)(const struct NFA *n, struct mq *q) { char JOIN(LIMEX_API_ROOT, _reportCurrent)(const struct NFA *n, struct mq *q) {