patch 8.2.4301: Vim9: type error for copy of dict

Problem:    Vim9: type error for copy of dict.
Solution:   Do not use dict<any> but no type. (closes #9696)
This commit is contained in:
Bram Moolenaar
2022-02-05 14:05:51 +00:00
parent 4fa1346bf4
commit e0c2b2ceaa
3 changed files with 9 additions and 1 deletions

View File

@ -306,7 +306,10 @@ dict_copy(dict_T *orig, int deep, int top, int copyID)
orig->dv_copyID = copyID;
orig->dv_copydict = copy;
}
copy->dv_type = alloc_type(top || deep ? &t_dict_any : orig->dv_type);
if (orig->dv_type == NULL || top || deep)
copy->dv_type = NULL;
else
copy->dv_type = alloc_type(orig->dv_type);
todo = (int)orig->dv_hashtab.ht_used;
for (hi = orig->dv_hashtab.ht_array; todo > 0 && !got_int; ++hi)

View File

@ -745,6 +745,9 @@ def Test_copy_return_type()
var ndd: dict<dict<number>> = {a: {x: 1, y: 2}}
assert_equal({x: 1, y: 2, z: 'x'}, ndd->deepcopy()['a']->extend({z: 'x'}))
var ldn: list<dict<number>> = [{a: 0}]->deepcopy()
assert_equal([{a: 0}], ldn)
enddef
def Test_count()

View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
4301,
/**/
4300,
/**/