limex: remove constant do_br arg from TESTEOD_FN

diff --git a/src/nfa/limex_common_impl.h b/src/nfa/limex_common_impl.h
index 187a661b5c47ed8feb212a76f59409d4ecaac505..86dd31037ac2dad0d836acf2acbe5f337a917351 100644 (file)
--- a/src/nfa/limex_common_impl.h
+++ b/src/nfa/limex_common_impl.h
@@ -162,7 +162,7 @@ char PROCESS_ACCEPTS_NOSQUASH_FN(const STATE_T *s,
 static really_inline
 char TESTEOD_FN(const IMPL_NFA_T *limex, const STATE_T *s,
                 const union RepeatControl *repeat_ctrl,
-                const char *repeat_state, u64a offset, char do_br,
+                const char *repeat_state, u64a offset,
                 NfaCallback callback, void *context) {
     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);
     STATE_T foundAccepts = AND_STATE(*s, acceptEodMask);
 
-    if (do_br) {
-        SQUASH_UNTUG_BR_FN(limex, repeat_ctrl, repeat_state,
-                           offset + 1 /* EOD 'symbol' */, &foundAccepts);
-    } else {
-        assert(!limex->repeatCount);
-    }
+    SQUASH_UNTUG_BR_FN(limex, repeat_ctrl, repeat_state,
+                       offset + 1 /* EOD 'symbol' */, &foundAccepts);
 
     if (unlikely(ISNONZERO_STATE(foundAccepts))) {
         const struct NFAAccept *acceptEodTable = getAcceptEodTable(limex);

diff --git a/src/nfa/limex_runtime_impl.h b/src/nfa/limex_runtime_impl.h
index 644ddd6a0c84483ce8dfb4304364a109e28f1e61..4f4563889ee0c472e09afa7eda0f6237374a08ef 100644 (file)
--- a/src/nfa/limex_runtime_impl.h
+++ b/src/nfa/limex_runtime_impl.h
@@ -883,8 +883,8 @@ char JOIN(LIMEX_API_ROOT, _testEOD)(const struct NFA *n, const char *state,
     const union RepeatControl *repeat_ctrl =
         getRepeatControlBaseConst(state, sizeof(STATE_T));
     const char *repeat_state = streamState + limex->stateSize;
-    return TESTEOD_FN(limex, sptr, repeat_ctrl, repeat_state, offset, 1,
-                      callback, context);
+    return TESTEOD_FN(limex, sptr, repeat_ctrl, repeat_state, offset, callback,
+                      context);
 }
 
 char JOIN(LIMEX_API_ROOT, _reportCurrent)(const struct NFA *n, struct mq *q) {