patch 8.1.0973: pattern with syntax error gives threee error messages
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.
diff --git a/src/regexp.c b/src/regexp.c
index e37c065..5c06ada 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -7969,6 +7969,7 @@
{
regprog_T *prog = NULL;
char_u *expr = expr_arg;
+ int save_called_emsg;
regexp_engine = p_re;
@@ -8004,6 +8005,8 @@
/*
* 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 @@
* 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 ba75834..1e10635 100644
--- a/src/regexp_nfa.c
+++ b/src/regexp_nfa.c
@@ -7252,12 +7252,7 @@
* (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 4ff2aca..5cf70d4 100644
--- a/src/testdir/test_search.vim
+++ b/src/testdir/test_search.vim
@@ -1220,3 +1220,8 @@
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 bd49a51..cca92c8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 973,
+/**/
972,
/**/
971,