Mercurial > vim
diff src/dict.c @ 29986:0ad8b72af148 v9.0.0331
patch 9.0.0331: cannot use items() on a string
Commit: https://github.com/vim/vim/commit/3e518a8ec74065aedd67d352c93d6ae6be550316
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Aug 30 17:45:33 2022 +0100
patch 9.0.0331: cannot use items() on a string
Problem: Cannot use items() on a string.
Solution: Make items() work on a string. (closes https://github.com/vim/vim/issues/11016)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 30 Aug 2022 19:00:03 +0200 |
| parents | 34151eb6ae25 |
| children | 86eb4aba16c3 |
line wrap: on
line diff
--- a/src/dict.c +++ b/src/dict.c @@ -1456,7 +1456,6 @@ dict2list(typval_T *argvars, typval_T *r dictitem_T *di; hashitem_T *hi; listitem_T *li; - listitem_T *li2; dict_T *d; int todo; @@ -1464,7 +1463,7 @@ dict2list(typval_T *argvars, typval_T *r return; if ((what == DICT2LIST_ITEMS - ? check_for_list_or_dict_arg(argvars, 0) + ? check_for_string_or_list_or_dict_arg(argvars, 0) : check_for_dict_arg(argvars, 0)) == FAIL) return; @@ -1509,19 +1508,9 @@ dict2list(typval_T *argvars, typval_T *r break; ++l2->lv_refcount; - li2 = listitem_alloc(); - if (li2 == NULL) + if (list_append_string(l2, di->di_key, -1) == FAIL + || list_append_tv(l2, &di->di_tv) == FAIL) break; - list_append(l2, li2); - li2->li_tv.v_type = VAR_STRING; - li2->li_tv.v_lock = 0; - li2->li_tv.vval.v_string = vim_strsave(di->di_key); - - li2 = listitem_alloc(); - if (li2 == NULL) - break; - list_append(l2, li2); - copy_tv(&di->di_tv, &li2->li_tv); } } } @@ -1533,7 +1522,9 @@ dict2list(typval_T *argvars, typval_T *r void f_items(typval_T *argvars, typval_T *rettv) { - if (argvars[0].v_type == VAR_LIST) + if (argvars[0].v_type == VAR_STRING) + string2items(argvars, rettv); + else if (argvars[0].v_type == VAR_LIST) list2items(argvars, rettv); else dict2list(argvars, rettv, DICT2LIST_ITEMS);