To: vim_dev@googlegroups.com Subject: Patch 8.2.1141 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1141 Problem: Vim9: return type of filter() is any. Solution: Use type of the argument. Files: src/evalfunc.c, src/testdir/test_vim9_func.vim *** ../vim-8.2.1140/src/evalfunc.c 2020-07-05 20:08:35.619916006 +0200 --- src/evalfunc.c 2020-07-05 20:14:46.594793658 +0200 *************** *** 581,587 **** {"file_readable", 1, 1, FEARG_1, ret_number, f_filereadable}, // obsolete {"filereadable", 1, 1, FEARG_1, ret_number, f_filereadable}, {"filewritable", 1, 1, FEARG_1, ret_number, f_filewritable}, ! {"filter", 2, 2, FEARG_1, ret_any, f_filter}, {"finddir", 1, 3, FEARG_1, ret_string, f_finddir}, {"findfile", 1, 3, FEARG_1, ret_string, f_findfile}, {"flatten", 1, 2, FEARG_1, ret_list_any, f_flatten}, --- 581,587 ---- {"file_readable", 1, 1, FEARG_1, ret_number, f_filereadable}, // obsolete {"filereadable", 1, 1, FEARG_1, ret_number, f_filereadable}, {"filewritable", 1, 1, FEARG_1, ret_number, f_filewritable}, ! {"filter", 2, 2, FEARG_1, ret_first_arg, f_filter}, {"finddir", 1, 3, FEARG_1, ret_string, f_finddir}, {"findfile", 1, 3, FEARG_1, ret_string, f_findfile}, {"flatten", 1, 2, FEARG_1, ret_list_any, f_flatten}, *** ../vim-8.2.1140/src/testdir/test_vim9_func.vim 2020-07-05 20:08:35.619916006 +0200 --- src/testdir/test_vim9_func.vim 2020-07-05 20:15:38.338632156 +0200 *************** *** 918,923 **** --- 918,932 ---- assert_equal(6, res) enddef + def Test_filter_return_type() + let l = filter([1, 2, 3], {-> 1}) + 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.1140/src/version.c 2020-07-05 20:08:35.619916006 +0200 --- src/version.c 2020-07-05 20:16:26.042482499 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1141, /**/ -- I once paid $12 to peer at the box that held King Tutankhamen's little bandage-covered midget corpse at the De Young Museum in San Francisco. I remember thinking how pleased he'd be about the way things turned out in his afterlife. (Scott Adams - The Dilbert principle) /// 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 ///