aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.1143: Vim9: return type of remove() is any

Browse Source 
Problem:    Vim9: return type of remove() is any.
Solution:   Use the member type of the first argument, if known.
This commit is contained in:
Bram Moolenaar 2020-07-05 20:55:29 +02:00
parent 252e88a785
commit ad7c249327
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/evalfunc.c
View File

@ -382,6 +382,17 @@ ret_argv(int argcount, type_T **argtypes UNUSED)
return &t_any;
}
static type_T *
ret_remove(int argcount UNUSED, type_T **argtypes)
{
if (argtypes[0]->tt_type == VAR_LIST
|| argtypes[0]->tt_type == VAR_DICT)
return argtypes[0]->tt_member;
if (argtypes[0]->tt_type == VAR_BLOB)
return &t_number;
return &t_any;
}
static type_T *ret_f_function(int argcount, type_T **argtypes);
/*
@ -827,7 +838,7 @@ static funcentry_T global_functions[] =
{"remote_read", 1, 2, FEARG_1, ret_string, f_remote_read},
{"remote_send", 2, 3, FEARG_1, ret_string, f_remote_send},
{"remote_startserver", 1, 1, FEARG_1, ret_void, f_remote_startserver},
{"remove", 2, 3, FEARG_1, ret_any, f_remove},
{"remove", 2, 3, FEARG_1, ret_remove, f_remove},
{"rename", 2, 2, FEARG_1, ret_number, f_rename},
{"repeat", 2, 2, FEARG_1, ret_first_arg, f_repeat},
{"resolve", 1, 1, FEARG_1, ret_string, f_resolve},

9
src/testdir/test_vim9_func.vim
View File

@ -927,6 +927,15 @@ def Test_insert_return_type()
assert_equal(6, res)
enddef
def Test_remove_return_type()
let l = remove(#{one: [1, 2], two: [3, 4]}, 'one')
let res = 0
for n in l
res += n
endfor
assert_equal(3, res)
enddef
def Test_filter_return_type()
let l = filter([1, 2, 3], {-> 1})
let res = 0

2
src/version.c
View File

@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1143,
/**/
1142,
/**/