diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-03-18 22:15:04 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-03-18 22:15:04 +0100 |
commit | 108cf0153c5770e343aec9e2390acdaa4a0b149a (patch) | |
tree | def8f451bc49e4e5d7b98e5cc7e33dd52aaffb29 /src | |
parent | 4b3e1964d85a25ac7b2202094d1abf27ab93cc23 (diff) |
patch 8.2.2621: typval2type() cannot handle recursive structuresv8.2.2621
Problem: typval2type() cannot handle recursive structures.
Solution: Use copyID. (closes #7979)
Diffstat (limited to 'src')
-rw-r--r-- | src/list.c | 4 | ||||
-rw-r--r-- | src/proto/vim9type.pro | 2 | ||||
-rw-r--r-- | src/testdir/test_vimscript.vim | 7 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/vim9script.c | 2 | ||||
-rw-r--r-- | src/vim9type.c | 32 |
6 files changed, 33 insertions, 16 deletions
diff --git a/src/list.c b/src/list.c index b1080dee0f..873f9e63de 100644 --- a/src/list.c +++ b/src/list.c @@ -2052,7 +2052,7 @@ filter_map(typval_T *argvars, typval_T *rettv, filtermap_T filtermap) { // Check that map() does not change the type of the dict. ga_init2(&type_list, sizeof(type_T *), 10); - type = typval2type(argvars, &type_list); + type = typval2type(argvars, get_copyID(), &type_list); } if (argvars[0].v_type == VAR_BLOB) @@ -2558,7 +2558,7 @@ extend(typval_T *argvars, typval_T *rettv, char_u *arg_errmsg, int is_new) { // Check that map() does not change the type of the dict. ga_init2(&type_list, sizeof(type_T *), 10); - type = typval2type(argvars, &type_list); + type = typval2type(argvars, get_copyID(), &type_list); } if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST) diff --git a/src/proto/vim9type.pro b/src/proto/vim9type.pro index 35da1fe72e..b5aa6ee921 100644 --- a/src/proto/vim9type.pro +++ b/src/proto/vim9type.pro @@ -9,7 +9,7 @@ type_T *alloc_func_type(type_T *ret_type, int argcount, garray_T *type_gap); type_T *get_func_type(type_T *ret_type, int argcount, garray_T *type_gap); int func_type_add_arg_types(type_T *functype, int argcount, garray_T *type_gap); int need_convert_to_bool(type_T *type, typval_T *tv); -type_T *typval2type(typval_T *tv, garray_T *type_gap); +type_T *typval2type(typval_T *tv, int copyID, garray_T *type_gap); type_T *typval2type_vimvar(typval_T *tv, garray_T *type_gap); int check_typval_arg_type(type_T *expected, typval_T *actual_tv, int arg_idx); int check_typval_type(type_T *expected, typval_T *actual_tv, where_T where); diff --git a/src/testdir/test_vimscript.vim b/src/testdir/test_vimscript.vim index 0ba933b7cb..b57d86d471 100644 --- a/src/testdir/test_vimscript.vim +++ b/src/testdir/test_vimscript.vim @@ -6606,6 +6606,13 @@ func Test_typename() call assert_equal('list<number>', typename([123])) call assert_equal('dict<number>', typename(#{key: 123})) call assert_equal('list<dict<number>>', typename([#{key: 123}])) + + let l = [] + let d = #{a: 0} + let l = [d] + let l[0].e = #{b: l} + call assert_equal('list<dict<any>>', typename(l)) + call assert_equal('dict<any>', typename(d)) endfunc "------------------------------------------------------------------------------- diff --git a/src/version.c b/src/version.c index dfc0f033ca..842d138f93 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2621, +/**/ 2620, /**/ 2619, diff --git a/src/vim9script.c b/src/vim9script.c index 309d4bdaf6..9366e7632a 100644 --- a/src/vim9script.c +++ b/src/vim9script.c @@ -750,7 +750,7 @@ update_vim9_script_var( if (sv != NULL) { if (*type == NULL) - *type = typval2type(tv, &si->sn_type_list); + *type = typval2type(tv, get_copyID(), &si->sn_type_list); sv->sv_type = *type; } diff --git a/src/vim9type.c b/src/vim9type.c index 9eda30d6e6..2485efb41e 100644 --- a/src/vim9type.c +++ b/src/vim9type.c @@ -254,7 +254,7 @@ func_type_add_arg_types( * "type_gap" is used to temporarily create types in. */ static type_T * -typval2type_int(typval_T *tv, garray_T *type_gap) +typval2type_int(typval_T *tv, int copyID, garray_T *type_gap) { type_T *type; type_T *member_type = &t_any; @@ -276,11 +276,15 @@ typval2type_int(typval_T *tv, garray_T *type_gap) return &t_list_empty; if (l->lv_first == &range_list_item) return &t_list_number; + if (l->lv_copyID == copyID) + // avoid recursion + return &t_list_any; + l->lv_copyID = copyID; // Use the common type of all members. - member_type = typval2type(&l->lv_first->li_tv, type_gap); + member_type = typval2type(&l->lv_first->li_tv, copyID, type_gap); for (li = l->lv_first->li_next; li != NULL; li = li->li_next) - common_type(typval2type(&li->li_tv, type_gap), + common_type(typval2type(&li->li_tv, copyID, type_gap), member_type, &member_type, type_gap); return get_list_type(member_type, type_gap); } @@ -289,17 +293,21 @@ typval2type_int(typval_T *tv, garray_T *type_gap) { dict_iterator_T iter; typval_T *value; + dict_T *d = tv->vval.v_dict; - if (tv->vval.v_dict == NULL - || tv->vval.v_dict->dv_hashtab.ht_used == 0) + if (d == NULL || d->dv_hashtab.ht_used == 0) return &t_dict_empty; + if (d->dv_copyID == copyID) + // avoid recursion + return &t_dict_any; + d->dv_copyID = copyID; // Use the common type of all values. dict_iterate_start(tv, &iter); dict_iterate_next(&iter, &value); - member_type = typval2type(value, type_gap); + member_type = typval2type(value, copyID, type_gap); while (dict_iterate_next(&iter, &value) != NULL) - common_type(typval2type(value, type_gap), + common_type(typval2type(value, copyID, type_gap), member_type, &member_type, type_gap); return get_dict_type(member_type, type_gap); } @@ -372,9 +380,9 @@ need_convert_to_bool(type_T *type, typval_T *tv) * "type_list" is used to temporarily create types in. */ type_T * -typval2type(typval_T *tv, garray_T *type_gap) +typval2type(typval_T *tv, int copyID, garray_T *type_gap) { - type_T *type = typval2type_int(tv, type_gap); + type_T *type = typval2type_int(tv, copyID, type_gap); if (type != NULL && type != &t_bool && (tv->v_type == VAR_NUMBER @@ -396,7 +404,7 @@ typval2type_vimvar(typval_T *tv, garray_T *type_gap) return &t_list_string; if (tv->v_type == VAR_DICT) // e.g. for v:completed_item return &t_dict_any; - return typval2type(tv, type_gap); + return typval2type(tv, get_copyID(), type_gap); } int @@ -421,7 +429,7 @@ check_typval_type(type_T *expected, typval_T *actual_tv, where_T where) int res = FAIL; ga_init2(&type_list, sizeof(type_T *), 10); - actual_type = typval2type(actual_tv, &type_list); + actual_type = typval2type(actual_tv, get_copyID(), &type_list); if (actual_type != NULL) res = check_type(expected, actual_type, TRUE, where); clear_type_list(&type_list); @@ -1202,7 +1210,7 @@ f_typename(typval_T *argvars, typval_T *rettv) rettv->v_type = VAR_STRING; ga_init2(&type_list, sizeof(type_T *), 10); - type = typval2type(argvars, &type_list); + type = typval2type(argvars, get_copyID(), &type_list); name = type_name(type, &tofree); if (tofree != NULL) rettv->vval.v_string = (char_u *)tofree; |