aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-05 05:34:07 -04:00
Code Activity

patch 8.2.1852: map() returing zero for NULL list is unexpected

Browse Source 
Problem:    map() returing zero for NULL list is unexpected.
Solution:   Return the empty list. (closes #7133)
This commit is contained in:
Bram Moolenaar
2020-10-15 22:29:17 +02:00
parent 27491cd3ef
commit ffdf8adfa8
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/list.c
View File

@@ -1961,6 +1961,9 @@ filter_map(typval_T *argvars, typval_T *rettv, int map)
int save_did_emsg; int save_did_emsg;
int idx = 0; int idx = 0;
// Always return the first argument, also on failure.
copy_tv(&argvars[0], rettv);
if (argvars[0].v_type == VAR_BLOB) if (argvars[0].v_type == VAR_BLOB)
{ {
if ((b = argvars[0].vval.v_blob) == NULL) if ((b = argvars[0].vval.v_blob) == NULL)
@@ -2110,8 +2113,6 @@ filter_map(typval_T *argvars, typval_T *rettv, int map)
did_emsg |= save_did_emsg; did_emsg |= save_did_emsg;
} }
copy_tv(&argvars[0], rettv);
} }
/* /*

1
src/testdir/test_blob.vim
View File

@@ -271,6 +271,7 @@ endfunc
" filter() item in blob " filter() item in blob
func Test_blob_filter() func Test_blob_filter()
call assert_equal(test_null_blob(), filter(test_null_blob(), '0'))
call assert_equal(0z, filter(0zDEADBEEF, '0')) call assert_equal(0z, filter(0zDEADBEEF, '0'))
call assert_equal(0zADBEEF, filter(0zDEADBEEF, 'v:val != 0xDE')) call assert_equal(0zADBEEF, filter(0zDEADBEEF, 'v:val != 0xDE'))
call assert_equal(0zDEADEF, filter(0zDEADBEEF, 'v:val != 0xBE')) call assert_equal(0zDEADEF, filter(0zDEADBEEF, 'v:val != 0xBE'))

8
src/testdir/test_filter_map.vim
View File

@@ -98,10 +98,10 @@ func Test_map_filter_fails()
call assert_fails("let l = filter([1, 2, 3], '{}')", 'E728:') call assert_fails("let l = filter([1, 2, 3], '{}')", 'E728:')
call assert_fails("let l = filter({'k' : 10}, '{}')", 'E728:') call assert_fails("let l = filter({'k' : 10}, '{}')", 'E728:')
call assert_fails("let l = filter([1, 2], {})", 'E731:') call assert_fails("let l = filter([1, 2], {})", 'E731:')
call assert_equal(0, filter(test_null_list(), 0)) call assert_equal(test_null_list(), filter(test_null_list(), 0))
call assert_equal(0, filter(test_null_dict(), 0)) call assert_equal(test_null_dict(), filter(test_null_dict(), 0))
call assert_equal(0, map(test_null_list(), '"> " .. v:val')) call assert_equal(test_null_list(), map(test_null_list(), '"> " .. v:val'))
call assert_equal(0, map(test_null_dict(), '"> " .. v:val')) call assert_equal(test_null_dict(), map(test_null_dict(), '"> " .. v:val'))
call assert_equal([1, 2, 3], filter([1, 2, 3], test_null_function())) call assert_equal([1, 2, 3], filter([1, 2, 3], test_null_function()))
call assert_fails("let l = filter([1, 2], function('min'))", 'E118:') call assert_fails("let l = filter([1, 2], function('min'))", 'E118:')
call assert_equal([1, 2, 3], filter([1, 2, 3], test_null_partial())) call assert_equal([1, 2, 3], filter([1, 2, 3], test_null_partial()))

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1852,
/**/ /**/
1851, 1851,
/**/ /**/