aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.2075: error for const argument to mapnew()

Browse Source 
Problem:    Error for const argument to mapnew().
Solution:   Don't give an error. (closes #7400)
This commit is contained in:
Bram Moolenaar 2020-12-01 21:08:05 +01:00
parent 4324d87a44
commit 57cf4973a2
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/list.c
View File

@ -2065,7 +2065,7 @@ filter_map(typval_T *argvars, typval_T *rettv, filtermap_T filtermap)
--todo; --todo;
di = HI2DI(hi); di = HI2DI(hi);
if (filtermap != FILTERMAP_FILTER if (filtermap == FILTERMAP_MAP
&& (value_check_lock(di->di_tv.v_lock, && (value_check_lock(di->di_tv.v_lock,
arg_errmsg, TRUE) arg_errmsg, TRUE)
|| var_check_ro(di->di_flags, || var_check_ro(di->di_flags,
@ -2225,12 +2225,12 @@ filter_map(typval_T *argvars, typval_T *rettv, filtermap_T filtermap)
} }
else else
{ {
// Materialized list from range(): loop over the items // Materialized list: loop over the items
for (li = l->lv_first; li != NULL; li = nli) for (li = l->lv_first; li != NULL; li = nli)
{ {
typval_T newtv; typval_T newtv;
if (filtermap != FILTERMAP_FILTER && value_check_lock( if (filtermap == FILTERMAP_MAP && value_check_lock(
li->li_tv.v_lock, arg_errmsg, TRUE)) li->li_tv.v_lock, arg_errmsg, TRUE))
break; break;
nli = li->li_next; nli = li->li_next;

6
src/testdir/test_filter_map.vim
View File

@ -123,6 +123,9 @@ func Test_mapnew_dict()
let dout = mapnew(din, {k, v -> string(v)}) let dout = mapnew(din, {k, v -> string(v)})
call assert_equal(#{one: 1, two: 2}, din) call assert_equal(#{one: 1, two: 2}, din)
call assert_equal(#{one: '1', two: '2'}, dout) call assert_equal(#{one: '1', two: '2'}, dout)
const dconst = #{one: 1, two: 2, three: 3}
call assert_equal(#{one: 2, two: 3, three: 4}, mapnew(dconst, {_, v -> v + 1}))
endfunc endfunc
func Test_mapnew_list() func Test_mapnew_list()
@ -130,6 +133,9 @@ func Test_mapnew_list()
let lout = mapnew(lin, {k, v -> string(v)}) let lout = mapnew(lin, {k, v -> string(v)})
call assert_equal([1, 2, 3], lin) call assert_equal([1, 2, 3], lin)
call assert_equal(['1', '2', '3'], lout) call assert_equal(['1', '2', '3'], lout)
const lconst = [1, 2, 3]
call assert_equal([2, 3, 4], mapnew(lconst, {_, v -> v + 1}))
endfunc endfunc
func Test_mapnew_blob() func Test_mapnew_blob()

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 */
/**/
2075,
/**/ /**/
2074, 2074,
/**/ /**/