aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.4286: Vim9: strict type checking after copy() and deepcopy()

Browse Source 
Problem:    Vim9: strict type checking after copy() and deepcopy().
Solution:   Allow type to change after making a copy. (closes #9644)
This commit is contained in:
Bram Moolenaar
2022-02-02 20:01:27 +00:00
parent a1c5195180
commit 381692b6f1
14 changed files with 154 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/vim9execute.c
View File

@@ -4412,7 +4412,8 @@ exec_instructions(ectx_T *ectx)
== NULL)
{
SOURCING_LNUM = iptr->isn_lnum;
semsg(_(e_key_not_present_in_dictionary), iptr->isn_arg.string);
semsg(_(e_key_not_present_in_dictionary),
iptr->isn_arg.string);
goto on_error;
}
// Put the dict used on the dict stack, it might be used by
@@ -4531,21 +4532,7 @@ exec_instructions(ectx_T *ectx)
break;
case ISN_SETTYPE:
{
checktype_T *ct = &iptr->isn_arg.type;
tv = STACK_TV_BOT(-1);
if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
{
free_type(tv->vval.v_dict->dv_type);
tv->vval.v_dict->dv_type = alloc_type(ct->ct_type);
}
else if (tv->v_type == VAR_LIST && tv->vval.v_list != NULL)
{
free_type(tv->vval.v_list->lv_type);
tv->vval.v_list->lv_type = alloc_type(ct->ct_type);
}
}
set_tv_type(STACK_TV_BOT(-1), iptr->isn_arg.type.ct_type);
break;
case ISN_2BOOL: