From af38e153c3de3710b7e828f52869b446c73c808d Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Mon, 6 Jun 2016 18:44:26 +0300 Subject: Sync dfa.c with GNU grep. --- dfa.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'dfa.c') diff --git a/dfa.c b/dfa.c index 3156e5e7..a41914e0 100644 --- a/dfa.c +++ b/dfa.c @@ -3411,8 +3411,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl, s = allow_nl ? d->newlines[s1] : 0; } - - if (d->fails[s]) + else if (d->fails[s]) { if (d->success[s] & sbit[*p]) goto done; @@ -3425,8 +3424,7 @@ dfaexec_main (struct dfa *d, char const *begin, char *end, bool allow_nl, } else { - if (!d->trans[s]) - build_state (s, d); + build_state (s, d); trans = d->trans; } } -- cgit v1.2.3 From ac268ec2058b1615f41c750ccc55cf038ab1bca6 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 9 Jun 2016 21:48:36 +0300 Subject: Sync with grep. --- dfa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dfa.c') diff --git a/dfa.c b/dfa.c index a41914e0..97d4497b 100644 --- a/dfa.c +++ b/dfa.c @@ -1222,7 +1222,7 @@ parse_bracket_exp (void) if (dfa->multibyte) { - static charclass zeroclass; + static charclass const zeroclass; work_mbc->invert = invert; work_mbc->cset = equal (ccl, zeroclass) ? -1 : charclass_index (ccl); return MBCSET; -- cgit v1.2.3