0
0
mirror of https://github.com/vim/vim.git synced 2025-07-04 23:07:33 -04:00

patch 8.2.3237: when a builtin function gives an error processing continues

Problem:    When a builtin function gives an error processing continues.
Solution:   In Vim9 script return FAIL in get_func_tv().
This commit is contained in:
Bram Moolenaar 2021-07-28 19:34:14 +02:00
parent eaf3f36168
commit 327d3ee455
3 changed files with 23 additions and 1 deletions

View File

@ -2002,5 +2002,20 @@ def Test_inc_dec()
CheckDefAndScriptFailure(lines, "E1202: No white space allowed after '++': ++ nr") CheckDefAndScriptFailure(lines, "E1202: No white space allowed after '++': ++ nr")
enddef enddef
def Test_abort_after_error()
# should abort after strpart() fails, not give another type error
var lines =<< trim END
vim9script
var x: string
x = strpart(1, 2)
END
writefile(lines, 'Xtestscript')
var expected = 'E1174: String required for argument 1'
assert_fails('so Xtestscript', [expected, expected], 3)
delete('Xtestscript')
enddef
" vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker

View File

@ -1674,7 +1674,8 @@ get_func_tv(
if (ret == OK) if (ret == OK)
{ {
int i = 0; int i = 0;
int did_emsg_before = did_emsg;
if (get_vim_var_nr(VV_TESTING)) if (get_vim_var_nr(VV_TESTING))
{ {
@ -1689,6 +1690,10 @@ get_func_tv(
} }
ret = call_func(name, len, rettv, argcount, argvars, funcexe); ret = call_func(name, len, rettv, argcount, argvars, funcexe);
if (in_vim9script() && did_emsg > did_emsg_before)
// An error in a builtin function does not return FAIL, but we do
// want to abort further processing if an error was given.
ret = FAIL;
funcargs.ga_len -= i; funcargs.ga_len -= i;
} }

View File

@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3237,
/**/ /**/
3236, 3236,
/**/ /**/