patch 8.2.3148: Vim9: function arg type check does not handle base offset
Problem: Vim9: function arg type check does not handle base offset.
Solution: Take the base offset into account when checking builtin function
argument types.
diff --git a/src/evalfunc.c b/src/evalfunc.c
index 73012d4..3041a6c 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -450,6 +450,7 @@
argcheck_T arg2_string_dict[] = {arg_string, arg_dict_any};
argcheck_T arg2_listblob_item[] = {arg_list_or_blob, arg_item_of_prev};
argcheck_T arg2_execute[] = {arg_string_or_list, arg_string};
+argcheck_T arg23_win_execute[] = {arg_number, arg_string_or_list, arg_string};
argcheck_T arg23_extend[] = {arg_list_or_dict, arg_same_as_prev, arg_extend3};
argcheck_T arg23_extendnew[] = {arg_list_or_dict, arg_same_struct_as_prev, arg_extend3};
argcheck_T arg3_string[] = {arg_string, arg_string, arg_string};
@@ -1832,7 +1833,7 @@
ret_string, f_visualmode},
{"wildmenumode", 0, 0, 0, NULL,
ret_number, f_wildmenumode},
- {"win_execute", 2, 3, FEARG_2, NULL,
+ {"win_execute", 2, 3, FEARG_2, arg23_win_execute,
ret_string, f_win_execute},
{"win_findbuf", 1, 1, FEARG_1, arg1_number,
ret_list_number, f_win_findbuf},
diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim
index e26c2c0..a17d92a 100644
--- a/src/testdir/test_vim9_builtin.vim
+++ b/src/testdir/test_vim9_builtin.vim
@@ -2305,6 +2305,8 @@
def Test_win_execute()
assert_equal("\n" .. winnr(), win_execute(win_getid(), 'echo winnr()'))
+ assert_equal("\n" .. winnr(), 'echo winnr()'->win_execute(win_getid()))
+ assert_equal("\n" .. winnr(), win_execute(win_getid(), 'echo winnr()', 'silent'))
assert_equal('', win_execute(342343, 'echo winnr()'))
enddef
diff --git a/src/version.c b/src/version.c
index 993d163..10e01ac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3148,
+/**/
3147,
/**/
3146,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index b04e750..15c8ef6 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -1781,6 +1781,7 @@
garray_T *stack = &cctx->ctx_type_stack;
int argoff;
type_T **argtypes = NULL;
+ type_T *shuffled_argtypes[MAX_FUNC_ARGS];
type_T *maptype = NULL;
RETURN_OK_IF_SKIP(cctx);
@@ -1800,6 +1801,16 @@
{
// Check the types of the arguments.
argtypes = ((type_T **)stack->ga_data) + stack->ga_len - argcount;
+ if (method_call && argoff > 1)
+ {
+ int i;
+
+ for (i = 0; i < argcount; ++i)
+ shuffled_argtypes[i] = (i < argoff - 1)
+ ? argtypes[i + 1]
+ : (i == argoff - 1) ? argtypes[0] : argtypes[i];
+ argtypes = shuffled_argtypes;
+ }
if (internal_func_check_arg_types(argtypes, func_idx, argcount,
cctx) == FAIL)
return FAIL;