diff options
| -rw-r--r-- | src/nvim/eval.c | 5 | ||||
| -rw-r--r-- | test/old/testdir/test_vimscript.vim | 24 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c index 7da9502fd6..dab3afb212 100644 --- a/src/nvim/eval.c +++ b/src/nvim/eval.c @@ -2378,6 +2378,7 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg) *arg = skipwhite(*arg + 1); evalarg_used->eval_flags = result ? orig_flags : orig_flags & ~EVAL_EVALUATE; if (eval1(arg, rettv, evalarg_used) == FAIL) { + evalarg_used->eval_flags = orig_flags; return FAIL; } @@ -2388,17 +2389,19 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg) if (evaluate && result) { tv_clear(rettv); } + evalarg_used->eval_flags = orig_flags; return FAIL; } // Get the third variable. Recursive! *arg = skipwhite(*arg + 1); - typval_T var2; evalarg_used->eval_flags = !result ? orig_flags : orig_flags & ~EVAL_EVALUATE; + typval_T var2; if (eval1(arg, &var2, evalarg_used) == FAIL) { if (evaluate && result) { tv_clear(rettv); } + evalarg_used->eval_flags = orig_flags; return FAIL; } if (evaluate && !result) { diff --git a/test/old/testdir/test_vimscript.vim b/test/old/testdir/test_vimscript.vim index b0c4baf7c2..6ac19a357f 100644 --- a/test/old/testdir/test_vimscript.vim +++ b/test/old/testdir/test_vimscript.vim @@ -7258,6 +7258,30 @@ func Test_typed_script_var() call StopVimInTerminal(buf) endfunc +" Test for issue6776 {{{1 +func Test_trinary_expression() + try + call eval('0 ? 0') + catch + endtry + " previous failure should not cause next expression to fail + call assert_equal(v:false, eval(string(v:false))) + + try + call eval('0 ? "burp') + catch + endtry + " previous failure should not cause next expression to fail + call assert_equal(v:false, eval(string(v:false))) + + try + call eval('1 ? 0 : "burp') + catch + endtry + " previous failure should not cause next expression to fail + call assert_equal(v:false, eval(string(v:false))) +endfunction + func Test_for_over_string() let res = '' for c in 'aéc̀d' |