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

patch 8.2.1127: Vim9: getting a dict member may not work

Browse Source 
Problem:    Vim9: getting a dict member may not work.
Solution:   Clear the dict only after copying the item. (closes #6390)
This commit is contained in:
Bram Moolenaar
2020-07-04 19:19:43 +02:00
parent eeb27bfe28
commit fb9d5c51c8
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_vim9_expr.vim
View File

@@ -1133,6 +1133,9 @@ def Test_expr_member()
let d: dict<number> = g:dict_one let d: dict<number> = g:dict_one
assert_equal(1, d['one']) assert_equal(1, d['one'])
# getting the one member should clear the dict after getting the item
assert_equal('one', #{one: 'one'}.one)
call CheckDefFailure(["let x = g:dict_one.#$!"], 'E1002:') call CheckDefFailure(["let x = g:dict_one.#$!"], 'E1002:')
call CheckDefExecFailure(["let d: dict<any>", "echo d['a']"], 'E716:') call CheckDefExecFailure(["let d: dict<any>", "echo d['a']"], 'E716:')
call CheckDefExecFailure(["let d: dict<number>", "d = g:list_empty"], 'E1029: Expected dict but got list') call CheckDefExecFailure(["let d: dict<number>", "d = g:list_empty"], 'E1029: Expected dict but got list')

2
src/version.c
View File

@@ -754,6 +754,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 */
/**/
1127,
/**/ /**/
1126, 1126,
/**/ /**/

6
src/vim9execute.c
View File

@@ -2188,6 +2188,7 @@ call_def_function(
{ {
dict_T *dict; dict_T *dict;
dictitem_T *di; dictitem_T *di;
typval_T temp_tv;
tv = STACK_TV_BOT(-1); tv = STACK_TV_BOT(-1);
if (tv->v_type != VAR_DICT || tv->vval.v_dict == NULL) if (tv->v_type != VAR_DICT || tv->vval.v_dict == NULL)
@@ -2203,8 +2204,11 @@ call_def_function(
semsg(_(e_dictkey), iptr->isn_arg.string); semsg(_(e_dictkey), iptr->isn_arg.string);
goto failed; goto failed;
} }
clear_tv(tv); // Clear the dict after getting the item, to avoid that it
// make the item invalid.
temp_tv = *tv;
copy_tv(&di->di_tv, tv); copy_tv(&di->di_tv, tv);
clear_tv(&temp_tv);
} }
break; break;