To: vim_dev@googlegroups.com Subject: Patch 8.2.1140 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1140 Problem: Vim9: return type of extend() is any. Solution: Use type of the argument. Files: src/evalfunc.c, src/testdir/test_vim9_func.vim *** ../vim-8.2.1139/src/evalfunc.c 2020-07-05 18:41:05.171877168 +0200 --- src/evalfunc.c 2020-07-05 20:05:09.328499802 +0200 *************** *** 576,582 **** {"exp", 1, 1, FEARG_1, ret_float, FLOAT_FUNC(f_exp)}, {"expand", 1, 3, FEARG_1, ret_any, f_expand}, {"expandcmd", 1, 1, FEARG_1, ret_string, f_expandcmd}, ! {"extend", 2, 3, FEARG_1, ret_any, f_extend}, {"feedkeys", 1, 2, FEARG_1, ret_void, f_feedkeys}, {"file_readable", 1, 1, FEARG_1, ret_number, f_filereadable}, // obsolete {"filereadable", 1, 1, FEARG_1, ret_number, f_filereadable}, --- 576,582 ---- {"exp", 1, 1, FEARG_1, ret_float, FLOAT_FUNC(f_exp)}, {"expand", 1, 3, FEARG_1, ret_any, f_expand}, {"expandcmd", 1, 1, FEARG_1, ret_string, f_expandcmd}, ! {"extend", 2, 3, FEARG_1, ret_first_arg, f_extend}, {"feedkeys", 1, 2, FEARG_1, ret_void, f_feedkeys}, {"file_readable", 1, 1, FEARG_1, ret_number, f_filereadable}, // obsolete {"filereadable", 1, 1, FEARG_1, ret_number, f_filereadable}, *** ../vim-8.2.1139/src/testdir/test_vim9_func.vim 2020-07-05 18:48:19.973854268 +0200 --- src/testdir/test_vim9_func.vim 2020-07-05 20:06:33.656265838 +0200 *************** *** 909,914 **** --- 909,923 ---- assert_equal(6, res) enddef + def Test_extend_return_type() + let l = extend([1, 2], [3]) + let res = 0 + for n in l + res += n + endfor + assert_equal(6, res) + enddef + def Line_continuation_in_def(dir: string = ''): string let path: string = empty(dir) \ ? 'empty' *** ../vim-8.2.1139/src/version.c 2020-07-05 18:48:19.973854268 +0200 --- src/version.c 2020-07-05 20:05:47.272395422 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1140, /**/ -- Lower life forms have more fun! /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///