diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-10-15 22:29:17 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-10-15 22:29:17 +0200 |
| commit | ffdf8adfa8108d4765fdc68abbd2fe49a4292b25 (patch) | |
| tree | b82cf803d463b30816a79eb8a2d3a401259cf04b /src | |
| parent | 27491cd3ef86c10a2b64bcb657f29e1d0fccb183 (diff) | |
patch 8.2.1852: map() returing zero for NULL list is unexpectedv8.2.1852
Problem: map() returing zero for NULL list is unexpected.
Solution: Return the empty list. (closes #7133)
Diffstat (limited to 'src')
| -rw-r--r-- | src/list.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_blob.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_filter_map.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/list.c b/src/list.c index 59c614ffbc..62c571c714 100644 --- a/src/list.c +++ b/src/list.c @@ -1961,6 +1961,9 @@ filter_map(typval_T *argvars, typval_T *rettv, int map) int save_did_emsg; int idx = 0; + // Always return the first argument, also on failure. + copy_tv(&argvars[0], rettv); + if (argvars[0].v_type == VAR_BLOB) { 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; } - - copy_tv(&argvars[0], rettv); } /* diff --git a/src/testdir/test_blob.vim b/src/testdir/test_blob.vim index 69b3504799..3eff715d05 100644 --- a/src/testdir/test_blob.vim +++ b/src/testdir/test_blob.vim @@ -271,6 +271,7 @@ endfunc " filter() item in blob 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(0zADBEEF, filter(0zDEADBEEF, 'v:val != 0xDE')) call assert_equal(0zDEADEF, filter(0zDEADBEEF, 'v:val != 0xBE')) diff --git a/src/testdir/test_filter_map.vim b/src/testdir/test_filter_map.vim index 249c32f126..e6587c23bd 100644 --- a/src/testdir/test_filter_map.vim +++ b/src/testdir/test_filter_map.vim @@ -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({'k' : 10}, '{}')", 'E728:') call assert_fails("let l = filter([1, 2], {})", 'E731:') - call assert_equal(0, filter(test_null_list(), 0)) - call assert_equal(0, filter(test_null_dict(), 0)) - call assert_equal(0, map(test_null_list(), '"> " .. v:val')) - call assert_equal(0, map(test_null_dict(), '"> " .. v:val')) + call assert_equal(test_null_list(), filter(test_null_list(), 0)) + call assert_equal(test_null_dict(), filter(test_null_dict(), 0)) + call assert_equal(test_null_list(), map(test_null_list(), '"> " .. 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_fails("let l = filter([1, 2], function('min'))", 'E118:') call assert_equal([1, 2, 3], filter([1, 2, 3], test_null_partial())) diff --git a/src/version.c b/src/version.c index 934b82215c..266c7c135b 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1852, +/**/ 1851, /**/ 1850, |