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 223251090deddac005929c34fda3a2cba72e0457..47aaaad237b506c101df7e9d3b00002fdba98c0f 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -2156,7 +2156,10 @@ eval0(
                && 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 162d79508d07748af861037ae42ef7dfd7226534..37fc559bf07dbd4861565c746d920b7113411b9e 100644 (file)
--- a/src/testdir/test_vim9_cmd.vim
+++ b/src/testdir/test_vim9_cmd.vim
@@ -558,6 +558,19 @@ def Test_eval_command()
         ->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 b28638b44692e9626b2a9ae48cbf8296c3317109..a0bf9363c2df4bee198e4265bd350c869aebca56 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2094,
 /**/
     2093,
 /**/