patch 8.2.2747: Vim9: not always an error for too many function arguments
Problem: Vim9: not always an error for too many function arguments.
Solution: Check for getting too many arguments.
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index f537eef..5c13d51 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -506,7 +506,7 @@
enddef
def Test_filter_return_type()
- var l = filter([1, 2, 3], () => 1)
+ var l = filter([1, 2, 3], (_, _) => 1)
var res = 0
for n in l
res += n
@@ -516,7 +516,7 @@
def Test_filter_missing_argument()
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]})
enddef
diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim
index c02a324..6b353dd 100644
--- a/src/testdir/test_vim9_func.vim
+++ b/src/testdir/test_vim9_func.vim
@@ -2102,7 +2102,7 @@
var lines =<< trim END
vim9script
var script = 'test'
- assert_equal(['test'], map(['one'], () => script))
+ assert_equal(['test'], map(['one'], (_, _) => script))
END
CheckScriptSuccess(lines)
enddef
@@ -2355,7 +2355,7 @@
var x = ['a', 'b', 'c']
if 1
var y = 'x'
- map(x, () => y)
+ map(x, (_, _) => y)
endif
var z = x
assert_equal(['x', 'x', 'x'], z)
@@ -2654,6 +2654,17 @@
CheckDefAndScriptFailure(lines, 'E1181:', 1)
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
diff --git a/src/version.c b/src/version.c
index bbbc92a..9fca01a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2747,
+/**/
2746,
/**/
2745,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index a49d305..e7885ad 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1336,6 +1336,16 @@
ga_init2(&ectx.ec_trystack, sizeof(trycmd_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.
// A lambda can be called with more arguments than it uses.
for (idx = 0; idx < argc