diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-11 18:23:19 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-11 18:23:19 +0200 |
| commit | 5231224e11bf468f5366a7400414368908c40795 (patch) | |
| tree | c0b97d2bf8e306ff58c9eb103fa91f67c16cf916 | |
| parent | 648594eaf703fe9a862cb12a35702a10aff6e5a9 (diff) | |
patch 8.2.3148: Vim9: function arg type check does not handle base offsetv8.2.3148
Problem: Vim9: function arg type check does not handle base offset.
Solution: Take the base offset into account when checking builtin function
argument types.
| -rw-r--r-- | src/evalfunc.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_vim9_builtin.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/vim9compile.c | 11 |
4 files changed, 17 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 73012d45d6..3041a6c380 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -450,6 +450,7 @@ argcheck_T arg2_dict_string_or_nr[] = {arg_dict_any, arg_string_or_nr}; 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 @@ static funcentry_T global_functions[] = 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 e26c2c0dd1..a17d92a19a 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -2305,6 +2305,8 @@ enddef 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 993d163185..10e01ac86b 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = 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 b04e750ef5..15c8ef6a8c 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -1781,6 +1781,7 @@ generate_BCALL(cctx_T *cctx, int func_idx, int argcount, int method_call) 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 @@ generate_BCALL(cctx_T *cctx, int func_idx, int argcount, int method_call) { // 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; |