aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.2.2747: Vim9: not always an error for too many function arguments

Browse Source 
Problem:    Vim9: not always an error for too many function arguments.
Solution:   Check for getting too many arguments.
This commit is contained in:
Bram Moolenaar
2021-04-10 20:10:26 +02:00
parent 87795939d0
commit bb8a7ce0a1
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/test_vim9_builtin.vim
View File

@@ -506,7 +506,7 @@ def Test_filter_wrong_dict_key_type()
enddef enddef
def Test_filter_return_type() def Test_filter_return_type()
var l = filter([1, 2, 3], () => 1) var l = filter([1, 2, 3], (_, _) => 1)
var res = 0 var res = 0
for n in l for n in l
res += n res += n
@@ -516,7 +516,7 @@ enddef
def Test_filter_missing_argument() def Test_filter_missing_argument()
var dict = {aa: [1], ab: [2], ac: [3], de: [4]} var dict = {aa: [1], ab: [2], ac: [3], de: [4]}
var res = dict->filter((k) => k =~ 'a' && k !~ 'b') var res = dict->filter((k, _) => k =~ 'a' && k !~ 'b')
res->assert_equal({aa: [1], ac: [3]}) res->assert_equal({aa: [1], ac: [3]})
enddef enddef

15
src/testdir/test_vim9_func.vim
View File

@@ -2102,7 +2102,7 @@ def Test_script_var_in_lambda()
var lines =<< trim END var lines =<< trim END
vim9script vim9script
var script = 'test' var script = 'test'
assert_equal(['test'], map(['one'], () => script)) assert_equal(['test'], map(['one'], (_, _) => script))
END END
CheckScriptSuccess(lines) CheckScriptSuccess(lines)
enddef enddef
@@ -2355,7 +2355,7 @@ def Test_block_scoped_var()
var x = ['a', 'b', 'c'] var x = ['a', 'b', 'c']
if 1 if 1
var y = 'x' var y = 'x'
map(x, () => y) map(x, (_, _) => y)
endif endif
var z = x var z = x
assert_equal(['x', 'x', 'x'], z) assert_equal(['x', 'x', 'x'], z)
@@ -2654,6 +2654,17 @@ def Test_ignored_argument()
CheckDefAndScriptFailure(lines, 'E1181:', 1) CheckDefAndScriptFailure(lines, 'E1181:', 1)
enddef enddef
def Test_too_many_arguments()
var lines =<< trim END
echo [0, 1, 2]->map(() => 123)
END
CheckDefExecAndScriptFailure(lines, 'E1106: 2 arguments too many', 1)
lines =<< trim END
echo [0, 1, 2]->map((_) => 123)
END
CheckDefExecAndScriptFailure(lines, 'E1106: One argument too many', 1)
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

2
src/version.c
View File

@@ -750,6 +750,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 */
/**/
2747,
/**/ /**/
2746, 2746,
/**/ /**/

10
src/vim9execute.c
View File

@@ -1336,6 +1336,16 @@ call_def_function(
ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10); ga_init2(&ectx.ec_trystack, sizeof(trycmd_T), 10);
ga_init2(&ectx.ec_funcrefs, sizeof(partial_T *), 10); ga_init2(&ectx.ec_funcrefs, sizeof(partial_T *), 10);
idx = argc - ufunc->uf_args.ga_len;
if (idx > 0 && ufunc->uf_va_name == NULL)
{
if (idx == 1)
emsg(_(e_one_argument_too_many));
else
semsg(_(e_nr_arguments_too_many), idx);
return FAIL;
}
// Put arguments on the stack, but no more than what the function expects. // Put arguments on the stack, but no more than what the function expects.
// A lambda can be called with more arguments than it uses. // A lambda can be called with more arguments than it uses.
for (idx = 0; idx < argc for (idx = 0; idx < argc