adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki 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

12
src/dict.c
View File

@ -284,11 +284,11 @@ dictitem_free(dictitem_T *item)
/*
* Make a copy of dict "d". Shallow if "deep" is FALSE.
* The refcount of the new dict is set to 1.
* See item_copy() for "copyID".
* See item_copy() for "top" and "copyID".
* Returns NULL when out of memory.
*/
dict_T *
dict_copy(dict_T *orig, int deep, int copyID)
dict_copy(dict_T *orig, int deep, int top, int copyID)
{
dict_T *copy;
dictitem_T *di;
@ -306,6 +306,8 @@ dict_copy(dict_T *orig, int deep, int copyID)
orig->dv_copyID = copyID;
orig->dv_copydict = copy;
}
copy->dv_type = alloc_type(top || deep ? &t_dict_any : orig->dv_type);
todo = (int)orig->dv_hashtab.ht_used;
for (hi = orig->dv_hashtab.ht_array; todo > 0 && !got_int; ++hi)
{
@ -318,8 +320,8 @@ dict_copy(dict_T *orig, int deep, int copyID)
break;
if (deep)
{
if (item_copy(&HI2DI(hi)->di_tv, &di->di_tv, deep,
copyID) == FAIL)
if (item_copy(&HI2DI(hi)->di_tv, &di->di_tv,
deep, FALSE, copyID) == FAIL)
{
vim_free(di);
break;
@ -1239,7 +1241,7 @@ dict_extend_func(
{
if (is_new)
{
d1 = dict_copy(d1, FALSE, get_copyID());
d1 = dict_copy(d1, FALSE, TRUE, get_copyID());
if (d1 == NULL)
return;
}