Mercurial > vim
changeset 25465:b8a6a0007dc3 v8.2.3269
patch 8.2.3269: Vim9: wrong argument check for partial
Commit: https://github.com/vim/vim/commit/f78da4f9d6daf1907e4ce4be74146375dbd9a546
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Aug 1 15:40:31 2021 +0200
patch 8.2.3269: Vim9: wrong argument check for partial
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)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 01 Aug 2021 15:45:04 +0200 |
| parents | f0546dfb74e2 |
| children | 7a397815f9e5 |
| files | src/evalfunc.c src/testdir/test_vim9_func.vim src/version.c src/vim9type.c |
| diffstat | 4 files changed, 51 insertions(+), 31 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -932,22 +932,27 @@ ret_first_arg(int argcount, type_T **arg 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) -{ - 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]; +ret_first_cont(int argcount, type_T **argtypes) +{ + 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 } static type_T * -ret_remove(int argcount UNUSED, type_T **argtypes) -{ - if (argtypes != NULL) +ret_remove(int argcount, type_T **argtypes) +{ + 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 * 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)
--- 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'}) - - 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'}) - - var Len: func: number = function('len', ['word']) - assert_equal(4, Len()) + 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('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 RepeatFunc = function('repeat', ['o']) + assert_equal('ooooo', RepeatFunc(5)) + END + CheckDefAndScriptSuccess(lines) enddef def Test_cmd_modifier()
--- 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,
--- a/src/vim9type.c +++ b/src/vim9type.c @@ -378,6 +378,11 @@ typval2type_int(typval_T *tv, int copyID 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;