diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-02-22 17:29:43 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-02-22 17:29:43 +0100 |
| commit | cd62512c5595fa1f7a7f2c6ec1a90ea6bde3ad50 (patch) | |
| tree | 75b5518db2533b2735474d126cdae88ec25e50b0 | |
| parent | 72e83c1ae535e2ebc35b114d34d0a811eb62b068 (diff) | |
patch 8.1.0973: pattern with syntax error gives threee error messagesv8.1.0973
Problem: Pattern with syntax error gives threee error messages. (Kuang-che
Wu)
Solution: Remove outdated internal error. Don't fall back to other engine
after an error.
| -rw-r--r-- | src/regexp.c | 7 | ||||
| -rw-r--r-- | src/regexp_nfa.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_search.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/src/regexp.c b/src/regexp.c index e37c065079..5c06ada1b7 100644 --- a/src/regexp.c +++ b/src/regexp.c @@ -7969,6 +7969,7 @@ vim_regcomp(char_u *expr_arg, int re_flags) { regprog_T *prog = NULL; char_u *expr = expr_arg; + int save_called_emsg; regexp_engine = p_re; @@ -8004,6 +8005,8 @@ vim_regcomp(char_u *expr_arg, int re_flags) /* * First try the NFA engine, unless backtracking was requested. */ + save_called_emsg = called_emsg; + called_emsg = FALSE; if (regexp_engine != BACKTRACKING_ENGINE) prog = nfa_regengine.regcomp(expr, re_flags + (regexp_engine == AUTOMATIC_ENGINE ? RE_AUTO : 0)); @@ -8032,13 +8035,15 @@ vim_regcomp(char_u *expr_arg, int re_flags) * If the NFA engine failed, try the backtracking engine. * The NFA engine also fails for patterns that it can't handle well * but are still valid patterns, thus a retry should work. + * But don't try if an error message was given. */ - if (regexp_engine == AUTOMATIC_ENGINE) + if (regexp_engine == AUTOMATIC_ENGINE && !called_emsg) { regexp_engine = BACKTRACKING_ENGINE; prog = bt_regengine.regcomp(expr, re_flags); } } + called_emsg |= save_called_emsg; if (prog != NULL) { diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c index ba75834fc5..1e10635980 100644 --- a/src/regexp_nfa.c +++ b/src/regexp_nfa.c @@ -7252,12 +7252,7 @@ nfa_regcomp(char_u *expr, int re_flags) * (and count its size). */ postfix = re2post(); if (postfix == NULL) - { - /* TODO: only give this error for debugging? */ - if (post_ptr >= post_end) - siemsg("Internal error: estimated max number of states insufficient: %ld", post_end - post_start); goto fail; /* Cascaded (syntax?) error */ - } /* * In order to build the NFA, we parse the input regexp twice: diff --git a/src/testdir/test_search.vim b/src/testdir/test_search.vim index 4ff2aca5ac..5cf70d4d89 100644 --- a/src/testdir/test_search.vim +++ b/src/testdir/test_search.vim @@ -1220,3 +1220,8 @@ func Test_large_hex_chars() call assert_match('E678:', v:exception) endtry endfunc + +func Test_one_error_msg() + " This was also giving an internal error + call assert_fails('call search(" \\((\\v[[=P=]]){185}+ ")', 'E871:') +endfunc diff --git a/src/version.c b/src/version.c index bd49a512ce..cca92c8ee5 100644 --- a/src/version.c +++ b/src/version.c @@ -780,6 +780,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 973, +/**/ 972, /**/ 971, |