patch 8.2.1454: Vim9: failure invoking lambda with wrong arguments
Problem: Vim9: failure invoking lambda with wrong arguments.
Solution: Handle invalid arguments. Add a test.
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 48c1cf2..fb07586 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1584,6 +1584,14 @@
call CheckDefFailure(["filter([1, 2], {k,v -> 1})"], 'E1069:')
call CheckDefFailure(["let L = {a -> a + b}"], 'E1001:')
+
+ assert_equal('xxxyyy', 'xxx'->{a, b -> a .. b}('yyy'))
+
+ CheckDefExecFailure(["let s = 'asdf'->{a -> a}('x')"],
+ 'E1106: one argument too many')
+ CheckDefExecFailure(["let s = 'asdf'->{a -> a}('x', 'y')"],
+ 'E1106: 2 arguments too many')
+ CheckDefFailure(["echo 'asdf'->{a -> a}(x)"], 'E1001:')
enddef
def Test_expr7_lambda_vim9script()
diff --git a/src/version.c b/src/version.c
index cebea64..e6d929e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1454,
+/**/
1453,
/**/
1452,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index bdb0f06..5c4547d 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1361,6 +1361,9 @@
continue;
expected = ufunc->uf_arg_types[i];
}
+ else if (ufunc->uf_va_type == NULL)
+ // possibly a lambda
+ expected = &t_any;
else
expected = ufunc->uf_va_type->tt_member;
actual = ((type_T **)stack->ga_data)[stack->ga_len - argcount + i];
diff --git a/src/vim9execute.c b/src/vim9execute.c
index c87ac79..0f7f18c3 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -206,7 +206,10 @@
arg_to_add = ufunc->uf_args.ga_len - argcount;
if (arg_to_add < 0)
{
- iemsg("Argument count wrong?");
+ if (arg_to_add == -1)
+ emsg(_("E1106: one argument too many"));
+ else
+ semsg(_("E1106: %d arguments too many"), -arg_to_add);
return FAIL;
}
if (ga_grow(&ectx->ec_stack, arg_to_add + 3