+2018-09-19 Norihiro Tanaka <noritnk@kcn.ne.jp>
+
+ dfa: optimization for state merge
+ * lib/dfa.c (merge2): New function.
+ (merge_nfa_state): Use it.
+
2018-09-18 Jim Meyering <meyering@fb.com>
dfa: trivial comment fix: s/is/if/
merge_constrained (s1, s2, -1, m);
}
+static void
+merge2 (position_set *dst, position_set const *src, position_set *m)
+{
+ if (src->nelem < 4)
+ {
+ for (ptrdiff_t i = 0; i < src->nelem; ++i)
+ insert (src->elems[i], dst);
+ }
+ else
+ {
+ merge (src, dst, m);
+ copy (m, dst);
+ }
+}
+
/* Delete a position from a set. Return the nonzero constraint of the
deleted position, or zero if there was no such position. */
static unsigned int
if (flags[sindex] & OPT_REPEAT)
delete (sindex, &follows[sindex]);
- merge (&follows[dindex], &follows[sindex], merged);
- copy (merged, &follows[dindex]);
+ merge2 (&follows[dindex], &follows[sindex], merged);
/* Mark it as pruned in future. */
follows[tindex].elems[j].constraint = 0;