From 865af6b990f058fab10c9ff10c77eb0e3bd48ad5 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 18 Jun 2020 18:45:49 +0200 Subject: [PATCH] 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 #6292) --- src/evalfunc.c | 10 +++++++++- src/testdir/test_vim9_func.vim | 5 +++++ src/version.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/evalfunc.c b/src/evalfunc.c index 230962e94..667888375 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -339,6 +339,14 @@ ret_job(int argcount UNUSED, type_T **argtypes UNUSED) 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)}, diff --git a/src/testdir/test_vim9_func.vim b/src/testdir/test_vim9_func.vim index 6c661111a..c0a4d9bd6 100644 --- a/src/testdir/test_vim9_func.vim +++ b/src/testdir/test_vim9_func.vim @@ -807,5 +807,10 @@ def Test_call_closure_not_compiled() assert_equal('sometext', GetResult(g:Ref)) enddef +def Test_sort_return_type() + let res: list + res = [1, 2, 3]->sort() +enddef + " vim: ts=8 sw=2 sts=2 expandtab tw=80 fdm=marker diff --git a/src/version.c b/src/version.c index 34bb99bb8..2cdb140cf 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1003, /**/ 1002, /**/ -- 2.50.1