patch 8.2.2094: when an expression fails getting next command may be wrong
Problem: When an expression fails getting the next command may be wrong.
Solution: Do not check for a next command after :eval fails. (closes #7415)
diff --git a/src/eval.c b/src/eval.c
index 2232510..47aaaad 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2156,7 +2156,10 @@
&& called_emsg == called_emsg_before
&& (flags & EVAL_CONSTANT) == 0)
semsg(_(e_invexpr2), arg);
- ret = FAIL;
+
+ // Some of the expression may not have been consumed. Do not check for
+ // a next command to avoid more errors.
+ return FAIL;
}
if (eap != NULL)
diff --git a/src/testdir/test_vim9_cmd.vim b/src/testdir/test_vim9_cmd.vim
index 162d795..37fc559 100644
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -558,6 +558,19 @@
->Increment()
assert_equal(111 + 3 + 4 + 5, g:val)
unlet g:val
+
+ var lines =<< trim END
+ vim9script
+ g:caught = 'no'
+ try
+ eval 123 || 0
+ catch
+ g:caught = 'yes'
+ endtry
+ assert_equal('yes', g:caught)
+ unlet g:caught
+ END
+ CheckScriptSuccess(lines)
enddef
def Test_map_command()
diff --git a/src/version.c b/src/version.c
index b28638b..a0bf936 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2094,
+/**/
2093,
/**/
2092,