Mercurial > vim
diff src/evalfunc.c @ 20903:54ffae914876 v8.2.1003
patch 8.2.1003: Vim9: return type of sort() is too generic
Commit: https://github.com/vim/vim/commit/865af6b990f058fab10c9ff10c77eb0e3bd48ad5
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jun 18 18:45:49 2020 +0200
patch 8.2.1003: Vim9: return type of sort() is too generic
Problem: Vim9: return type of sort() is too generic.
Solution: Get type from the first argument. (closes https://github.com/vim/vim/issues/6292)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 18 Jun 2020 19:00:05 +0200 |
| parents | 69055d27e85e |
| children | 1c36b96522ae |
line wrap: on
line diff
--- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -339,6 +339,14 @@ ret_job(int argcount UNUSED, type_T **ar return &t_job; } + static type_T * +ret_first_arg(int argcount, type_T **argtypes) +{ + if (argcount > 0) + return argtypes[0]; + return &t_void; +} + static type_T *ret_f_function(int argcount, type_T **argtypes); /* @@ -849,7 +857,7 @@ static funcentry_T global_functions[] = {"simplify", 1, 1, FEARG_1, ret_string, f_simplify}, {"sin", 1, 1, FEARG_1, ret_float, FLOAT_FUNC(f_sin)}, {"sinh", 1, 1, FEARG_1, ret_float, FLOAT_FUNC(f_sinh)}, - {"sort", 1, 3, FEARG_1, ret_list_any, f_sort}, + {"sort", 1, 3, FEARG_1, ret_first_arg, f_sort}, {"sound_clear", 0, 0, 0, ret_void, SOUND_FUNC(f_sound_clear)}, {"sound_playevent", 1, 2, FEARG_1, ret_number, SOUND_FUNC(f_sound_playevent)}, {"sound_playfile", 1, 2, FEARG_1, ret_number, SOUND_FUNC(f_sound_playfile)},