diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-08-01 15:40:31 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-08-01 15:40:31 +0200 |
commit | f78da4f9d6daf1907e4ce4be74146375dbd9a546 (patch) | |
tree | c0ae83ae9823ae2d5f61a0580664ee0fd666b17d | |
parent | 73b8b0ae3acac220e823076f8ca1c14524ed96dd (diff) | |
download | vim-git-f78da4f9d6daf1907e4ce4be74146375dbd9a546.tar.gz |
patch 8.2.3269: Vim9: wrong argument check for partialv8.2.3269
Problem: Vim9: wrong argument check for partial. (Naohiro Ono)
Solution: Handle getting return type without arguments. Correct the minimal
number of arguments for what is included in the partial.
(closes #8667)
-rw-r--r-- | src/evalfunc.c | 26 | ||||
-rw-r--r-- | src/testdir/test_vim9_func.vim | 35 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9type.c | 5 |
4 files changed, 44 insertions, 24 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c index 23a39aa4f..ff0d33a4c 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -932,22 +932,27 @@ ret_first_arg(int argcount, type_T **argtypes) return &t_void; } static type_T * -ret_repeat(int argcount UNUSED, type_T **argtypes) +ret_repeat(int argcount, type_T **argtypes) { + if (argcount == 0) + return &t_any; if (argtypes[0] == &t_number) return &t_string; return argtypes[0]; } // for map(): returns first argument but item type may differ static type_T * -ret_first_cont(int argcount UNUSED, type_T **argtypes) +ret_first_cont(int argcount, type_T **argtypes) { - if (argtypes[0]->tt_type == VAR_LIST) - return &t_list_any; - if (argtypes[0]->tt_type == VAR_DICT) - return &t_dict_any; - if (argtypes[0]->tt_type == VAR_BLOB) - return argtypes[0]; + if (argcount > 0) + { + if (argtypes[0]->tt_type == VAR_LIST) + return &t_list_any; + if (argtypes[0]->tt_type == VAR_DICT) + return &t_dict_any; + if (argtypes[0]->tt_type == VAR_BLOB) + return argtypes[0]; + } return &t_any; } @@ -987,9 +992,9 @@ ret_argv(int argcount, type_T **argtypes UNUSED) } static type_T * -ret_remove(int argcount UNUSED, type_T **argtypes) +ret_remove(int argcount, type_T **argtypes) { - if (argtypes != NULL) + if (argcount > 0) { if (argtypes[0]->tt_type == VAR_LIST || argtypes[0]->tt_type == VAR_DICT) @@ -2446,6 +2451,7 @@ internal_func_get_argcount(int idx, int *argcount, int *min_argcount) * Call the "f_retfunc" function to obtain the return type of function "idx". * "argtypes" is the list of argument types or NULL when there are no * arguments. + * "argcount" may be less than the actual count when only getting the type. */ type_T * internal_func_ret_type(int idx, int argcount, type_T **argtypes) diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 144797edb..7e7ce3532 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -2582,24 +2582,31 @@ def Test_invalid_function_name() enddef def Test_partial_call() - var Xsetlist = function('setloclist', [0]) - Xsetlist([], ' ', {title: 'test'}) - getloclist(0, {title: 1})->assert_equal({title: 'test'}) + var lines =<< trim END + var Xsetlist: func + Xsetlist = function('setloclist', [0]) + Xsetlist([], ' ', {title: 'test'}) + getloclist(0, {title: 1})->assert_equal({title: 'test'}) + + Xsetlist = function('setloclist', [0, [], ' ']) + Xsetlist({title: 'test'}) + getloclist(0, {title: 1})->assert_equal({title: 'test'}) - Xsetlist = function('setloclist', [0, [], ' ']) - Xsetlist({title: 'test'}) - getloclist(0, {title: 1})->assert_equal({title: 'test'}) + Xsetlist = function('setqflist') + Xsetlist([], ' ', {title: 'test'}) + getqflist({title: 1})->assert_equal({title: 'test'}) - Xsetlist = function('setqflist') - Xsetlist([], ' ', {title: 'test'}) - getqflist({title: 1})->assert_equal({title: 'test'}) + Xsetlist = function('setqflist', [[], ' ']) + Xsetlist({title: 'test'}) + getqflist({title: 1})->assert_equal({title: 'test'}) - Xsetlist = function('setqflist', [[], ' ']) - Xsetlist({title: 'test'}) - getqflist({title: 1})->assert_equal({title: 'test'}) + var Len: func: number = function('len', ['word']) + assert_equal(4, Len()) - var Len: func: number = function('len', ['word']) - assert_equal(4, Len()) + var RepeatFunc = function('repeat', ['o']) + assert_equal('ooooo', RepeatFunc(5)) + END + CheckDefAndScriptSuccess(lines) enddef def Test_cmd_modifier() diff --git a/src/version.c b/src/version.c index b5173e6d0..e1e1f8310 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 */ /**/ + 3269, +/**/ 3268, /**/ 3267, diff --git a/src/vim9type.c b/src/vim9type.c index f64089ad1..cb366f99e 100644 --- a/src/vim9type.c +++ b/src/vim9type.c @@ -378,6 +378,11 @@ typval2type_int(typval_T *tv, int copyID, garray_T *type_gap, int do_member) type->tt_type = tv->v_type; type->tt_argcount = argcount; type->tt_min_argcount = min_argcount; + if (tv->v_type == VAR_PARTIAL && tv->vval.v_partial->pt_argc > 0) + { + type->tt_argcount -= tv->vval.v_partial->pt_argc; + type->tt_min_argcount -= tv->vval.v_partial->pt_argc; + } type->tt_member = member_type; return type; |