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.1135: 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.
This commit is contained in:
Bram Moolenaar 2020-07-05 16:51:26 +02:00
parent 435d89789e
commit 50788ef349
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/testdir/test_vim9_expr.vim
View File

@ -1128,6 +1128,8 @@ def Test_expr7_dict_vim9script()
CheckScriptFailure(lines, 'E1069:') CheckScriptFailure(lines, 'E1069:')
enddef enddef
let g:oneString = 'one'
def Test_expr_member() def Test_expr_member()
assert_equal(1, g:dict_one.one) assert_equal(1, g:dict_one.one)
let d: dict<number> = g:dict_one let d: dict<number> = g:dict_one
@ -1135,6 +1137,7 @@ def Test_expr_member()
# getting the one member should clear the dict after getting the item # getting the one member should clear the dict after getting the item
assert_equal('one', #{one: 'one'}.one) assert_equal('one', #{one: 'one'}.one)
assert_equal('one', #{one: 'one'}[g:oneString])
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:')

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 */
/**/
1135,
/**/ /**/
1134, 1134,
/**/ /**/

11
src/vim9execute.c
View File

@ -2166,6 +2166,7 @@ call_def_function(
dict_T *dict; dict_T *dict;
char_u *key; char_u *key;
dictitem_T *di; dictitem_T *di;
typval_T temp_tv;
// dict member: dict is at stack-2, key at stack-1 // dict member: dict is at stack-2, key at stack-1
tv = STACK_TV_BOT(-2); tv = STACK_TV_BOT(-2);
@ -2181,10 +2182,14 @@ call_def_function(
semsg(_(e_dictkey), key); semsg(_(e_dictkey), key);
goto failed; goto failed;
} }
--ectx.ec_stack.ga_len;
clear_tv(tv); clear_tv(tv);
clear_tv(STACK_TV_BOT(-1)); --ectx.ec_stack.ga_len;
copy_tv(&di->di_tv, STACK_TV_BOT(-1)); // Clear the dict after getting the item, to avoid that it
// make the item invalid.
tv = STACK_TV_BOT(-1);
temp_tv = *tv;
copy_tv(&di->di_tv, tv);
clear_tv(&temp_tv);
} }
break; break;