Mercurial > vim
diff src/evalfunc.c @ 21184:2113e94dc726 v8.2.1143
patch 8.2.1143: Vim9: return type of remove() is any
Commit: https://github.com/vim/vim/commit/ad7c24932725b9ab37b65fe359a41f8ba3e3dfcf
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 5 20:55:29 2020 +0200
patch 8.2.1143: Vim9: return type of remove() is any
Problem: Vim9: return type of remove() is any.
Solution: Use the member type of the first argument, if known.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 05 Jul 2020 21:00:05 +0200 |
| parents | 7289c8b9a620 |
| children | 34667dc9207b |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -382,6 +382,17 @@ ret_argv(int argcount, type_T **argtypes 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},