vim: src/dict.c annotate

annotate src/dict.c @ 20128:0b35a7ffceb2 v8.2.0619

patch 8.2.0619: null dict is not handled like an empty dict Commit: https://github.com/vim/vim/commit/ea04a6e8baff2f27da7cdd54bf70a5525994f76d Author: Bram Moolenaar <Bram@vim.org> Date: Thu Apr 23 13:38:02 2020 +0200 patch 8.2.0619: null dict is not handled like an empty dict Problem: Null dict is not handled like an empty dict. Solution: Fix the code and add tests. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/5968)

author	Bram Moolenaar <Bram@vim.org>
date	Thu, 23 Apr 2020 13:45:04 +0200
parents	fc3cdc819d80
children	0e1dfff4f294

rev	line source
10042 4aead6a9b7a9 commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47 Christian Brabandt <cb@256bit.org> parents: 9858 diff changeset	1 /* vi:set ts=8 sts=4 sw=4 noet:
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	2 *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	3 * VIM - Vi IMproved by Bram Moolenaar
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	4 *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	5 * Do ":help uganda" in Vim to read copying and usage conditions.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	6 * Do ":help credits" in Vim to see a list of people who contributed.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	7 * See README.txt for an overview of the Vim source code.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	8 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	9
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	10 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	11 * dict.c: Dictionary support
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	12 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	13
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	14 #include "vim.h"
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	15
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	16 #if defined(FEAT_EVAL) \|\| defined(PROTO)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	17
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	18 // List head for garbage collection. Although there can be a reference loop
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	19 // from partial to dict to partial, we don't need to keep track of the partial,
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	20 // since it will get freed when the dict is unused and gets freed.
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	21 static dict_T *first_dict = NULL;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	22
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	23 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	24 * Allocate an empty header for a dictionary.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	25 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	26 dict_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	27 dict_alloc(void)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	28 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	29 dict_T *d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	30
17159 3fd0765f454f patch 8.1.1579: dict and list could be GC'ed while displaying error Bram Moolenaar <Bram@vim.org> parents: 17123 diff changeset	31 d = ALLOC_CLEAR_ONE(dict_T);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	32 if (d != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	33 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	34 // Add the dict to the list of dicts for garbage collection.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	35 if (first_dict != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	36 first_dict->dv_used_prev = d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	37 d->dv_used_next = first_dict;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	38 d->dv_used_prev = NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	39 first_dict = d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	40
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	41 hash_init(&d->dv_hashtab);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	42 d->dv_lock = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	43 d->dv_scope = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	44 d->dv_refcount = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	45 d->dv_copyID = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	46 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	47 return d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	48 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	49
15016 c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	50 /*
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	51 * dict_alloc() with an ID for alloc_fail().
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	52 */
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	53 dict_T *
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	54 dict_alloc_id(alloc_id_T id UNUSED)
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	55 {
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	56 #ifdef FEAT_EVAL
16782 fc58fee685e2 patch 8.1.1393: unnecessary type casts Bram Moolenaar <Bram@vim.org> parents: 16764 diff changeset	57 if (alloc_fail_id == id && alloc_does_fail(sizeof(list_T)))
15016 c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	58 return NULL;
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	59 #endif
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	60 return (dict_alloc());
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	61 }
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	62
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	63 dict_T *
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	64 dict_alloc_lock(int lock)
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	65 {
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	66 dict_T *d = dict_alloc();
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	67
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	68 if (d != NULL)
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	69 d->dv_lock = lock;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	70 return d;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	71 }
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	72
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	73 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	74 * Allocate an empty dict for a return value.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	75 * Returns OK or FAIL.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	76 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	77 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	78 rettv_dict_alloc(typval_T *rettv)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	79 {
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	80 dict_T *d = dict_alloc_lock(0);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	81
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	82 if (d == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	83 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	84
11418 162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	85 rettv_dict_set(rettv, d);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	86 return OK;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	87 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	88
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	89 /*
11418 162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	90 * Set a dictionary as the return value
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	91 */
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	92 void
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	93 rettv_dict_set(typval_T rettv, dict_T d)
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	94 {
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	95 rettv->v_type = VAR_DICT;
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	96 rettv->vval.v_dict = d;
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	97 if (d != NULL)
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	98 ++d->dv_refcount;
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	99 }
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	100
162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	101 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	102 * Free a Dictionary, including all non-container items it contains.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	103 * Ignores the reference count.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	104 */
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	105 void
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	106 dict_free_contents(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	107 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	108 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	109 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	110 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	111
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	112 // Lock the hashtab, we don't want it to resize while freeing items.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	113 hash_lock(&d->dv_hashtab);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	114 todo = (int)d->dv_hashtab.ht_used;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	115 for (hi = d->dv_hashtab.ht_array; todo > 0; ++hi)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	116 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	117 if (!HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	118 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	119 // Remove the item before deleting it, just in case there is
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	120 // something recursive causing trouble.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	121 di = HI2DI(hi);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	122 hash_remove(&d->dv_hashtab, hi);
10952 835604f3c37a patch 8.0.0365: might free a dict item that wasn't allocated Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	123 dictitem_free(di);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	124 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	125 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	126 }
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	127
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	128 // The hashtab is still locked, it has to be re-initialized anyway
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	129 hash_clear(&d->dv_hashtab);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	130 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	131
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	132 static void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	133 dict_free_dict(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	134 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	135 // Remove the dict from the list of dicts for garbage collection.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	136 if (d->dv_used_prev == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	137 first_dict = d->dv_used_next;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	138 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	139 d->dv_used_prev->dv_used_next = d->dv_used_next;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	140 if (d->dv_used_next != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	141 d->dv_used_next->dv_used_prev = d->dv_used_prev;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	142 vim_free(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	143 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	144
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	145 static void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	146 dict_free(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	147 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	148 if (!in_free_unref_items)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	149 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	150 dict_free_contents(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	151 dict_free_dict(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	152 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	153 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	154
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	155 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	156 * Unreference a Dictionary: decrement the reference count and free it when it
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	157 * becomes zero.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	158 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	159 void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	160 dict_unref(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	161 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	162 if (d != NULL && --d->dv_refcount <= 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	163 dict_free(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	164 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	165
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	166 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	167 * Go through the list of dicts and free items without the copyID.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	168 * Returns TRUE if something was freed.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	169 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	170 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	171 dict_free_nonref(int copyID)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	172 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	173 dict_T *dd;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	174 int did_free = FALSE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	175
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	176 for (dd = first_dict; dd != NULL; dd = dd->dv_used_next)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	177 if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	178 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	179 // Free the Dictionary and ordinary items it contains, but don't
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	180 // recurse into Lists and Dictionaries, they will be in the list
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	181 // of dicts or list of lists.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	182 dict_free_contents(dd);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	183 did_free = TRUE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	184 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	185 return did_free;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	186 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	187
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	188 void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	189 dict_free_items(int copyID)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	190 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	191 dict_T dd, dd_next;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	192
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	193 for (dd = first_dict; dd != NULL; dd = dd_next)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	194 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	195 dd_next = dd->dv_used_next;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	196 if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	197 dict_free_dict(dd);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	198 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	199 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	200
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	201 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	202 * Allocate a Dictionary item.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	203 * The "key" is copied to the new item.
14303 f761a55a8aed patch 8.1.0167: lock flag in new dictitem is reset in many places Christian Brabandt <cb@256bit.org> parents: 14301 diff changeset	204 * Note that the type and value of the item "di_tv" still needs to be
f761a55a8aed patch 8.1.0167: lock flag in new dictitem is reset in many places Christian Brabandt <cb@256bit.org> parents: 14301 diff changeset	205 * initialized!
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	206 * Returns NULL when out of memory.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	207 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	208 dictitem_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	209 dictitem_alloc(char_u *key)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	210 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	211 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	212
17655 8f82b1ec99b7 patch 8.1.1825: allocating more memory than needed for extended structs Bram Moolenaar <Bram@vim.org> parents: 17530 diff changeset	213 di = alloc(offsetof(dictitem_T, di_key) + STRLEN(key) + 1);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	214 if (di != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	215 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	216 STRCPY(di->di_key, key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	217 di->di_flags = DI_FLAGS_ALLOC;
14303 f761a55a8aed patch 8.1.0167: lock flag in new dictitem is reset in many places Christian Brabandt <cb@256bit.org> parents: 14301 diff changeset	218 di->di_tv.v_lock = 0;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	219 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	220 return di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	221 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	222
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	223 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	224 * Make a copy of a Dictionary item.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	225 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	226 static dictitem_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	227 dictitem_copy(dictitem_T *org)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	228 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	229 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	230
17655 8f82b1ec99b7 patch 8.1.1825: allocating more memory than needed for extended structs Bram Moolenaar <Bram@vim.org> parents: 17530 diff changeset	231 di = alloc(offsetof(dictitem_T, di_key) + STRLEN(org->di_key) + 1);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	232 if (di != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	233 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	234 STRCPY(di->di_key, org->di_key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	235 di->di_flags = DI_FLAGS_ALLOC;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	236 copy_tv(&org->di_tv, &di->di_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	237 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	238 return di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	239 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	240
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	241 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	242 * Remove item "item" from Dictionary "dict" and free it.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	243 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	244 void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	245 dictitem_remove(dict_T dict, dictitem_T item)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	246 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	247 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	248
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	249 hi = hash_find(&dict->dv_hashtab, item->di_key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	250 if (HASHITEM_EMPTY(hi))
10359 66f1b5bf3fa6 commit https://github.com/vim/vim/commit/95f096030ed1a8afea028f2ea295d6f6a70f466f Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	251 internal_error("dictitem_remove()");
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	252 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	253 hash_remove(&dict->dv_hashtab, hi);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	254 dictitem_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	255 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	256
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	257 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	258 * Free a dict item. Also clears the value.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	259 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	260 void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	261 dictitem_free(dictitem_T *item)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	262 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	263 clear_tv(&item->di_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	264 if (item->di_flags & DI_FLAGS_ALLOC)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	265 vim_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	266 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	267
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	268 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	269 * Make a copy of dict "d". Shallow if "deep" is FALSE.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	270 * The refcount of the new dict is set to 1.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	271 * See item_copy() for "copyID".
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	272 * Returns NULL when out of memory.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	273 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	274 dict_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	275 dict_copy(dict_T *orig, int deep, int copyID)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	276 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	277 dict_T *copy;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	278 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	279 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	280 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	281
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	282 if (orig == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	283 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	284
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	285 copy = dict_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	286 if (copy != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	287 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	288 if (copyID != 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	289 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	290 orig->dv_copyID = copyID;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	291 orig->dv_copydict = copy;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	292 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	293 todo = (int)orig->dv_hashtab.ht_used;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	294 for (hi = orig->dv_hashtab.ht_array; todo > 0 && !got_int; ++hi)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	295 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	296 if (!HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	297 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	298 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	299
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	300 di = dictitem_alloc(hi->hi_key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	301 if (di == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	302 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	303 if (deep)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	304 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	305 if (item_copy(&HI2DI(hi)->di_tv, &di->di_tv, deep,
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	306 copyID) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	307 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	308 vim_free(di);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	309 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	310 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	311 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	312 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	313 copy_tv(&HI2DI(hi)->di_tv, &di->di_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	314 if (dict_add(copy, di) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	315 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	316 dictitem_free(di);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	317 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	318 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	319 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	320 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	321
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	322 ++copy->dv_refcount;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	323 if (todo > 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	324 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	325 dict_unref(copy);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	326 copy = NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	327 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	328 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	329
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	330 return copy;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	331 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	332
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	333 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	334 * Add item "item" to Dictionary "d".
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	335 * Returns FAIL when out of memory and when key already exists.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	336 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	337 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	338 dict_add(dict_T d, dictitem_T item)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	339 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	340 return hash_add(&d->dv_hashtab, item->di_key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	341 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	342
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	343 /*
16268 0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	344 * Add a number or special entry to dictionary "d".
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	345 * Returns FAIL when out of memory and when key already exists.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	346 */
16268 0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	347 static int
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	348 dict_add_number_special(dict_T d, char key, varnumber_T nr, vartype_T vartype)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	349 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	350 dictitem_T *item;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	351
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	352 item = dictitem_alloc((char_u *)key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	353 if (item == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	354 return FAIL;
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	355 item->di_tv.v_type = vartype;
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	356 item->di_tv.vval.v_number = nr;
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	357 if (dict_add(d, item) == FAIL)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	358 {
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	359 dictitem_free(item);
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	360 return FAIL;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	361 }
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	362 return OK;
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	363 }
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	364
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	365 /*
16268 0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	366 * Add a number entry to dictionary "d".
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	367 * Returns FAIL when out of memory and when key already exists.
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	368 */
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	369 int
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	370 dict_add_number(dict_T d, char key, varnumber_T nr)
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	371 {
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	372 return dict_add_number_special(d, key, nr, VAR_NUMBER);
16268 0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	373 }
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	374
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	375 /*
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	376 * Add a special entry to dictionary "d".
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	377 * Returns FAIL when out of memory and when key already exists.
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	378 */
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	379 int
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	380 dict_add_bool(dict_T d, char key, varnumber_T nr)
16268 0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	381 {
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	382 return dict_add_number_special(d, key, nr, VAR_BOOL);
16268 0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	383 }
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	384
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	385 /*
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	386 * Add a string entry to dictionary "d".
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	387 * Returns FAIL when out of memory and when key already exists.
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	388 */
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	389 int
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	390 dict_add_string(dict_T d, char key, char_u *str)
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	391 {
15267 762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	392 return dict_add_string_len(d, key, str, -1);
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	393 }
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	394
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	395 /*
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	396 * Add a string entry to dictionary "d".
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	397 * "str" will be copied to allocated memory.
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	398 * When "len" is -1 use the whole string, otherwise only this many bytes.
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	399 * Returns FAIL when out of memory and when key already exists.
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	400 */
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	401 int
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	402 dict_add_string_len(dict_T d, char key, char_u *str, int len)
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	403 {
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	404 dictitem_T *item;
15267 762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	405 char_u *val = NULL;
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	406
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	407 item = dictitem_alloc((char_u *)key);
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	408 if (item == NULL)
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	409 return FAIL;
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	410 item->di_tv.v_type = VAR_STRING;
15267 762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	411 if (str != NULL)
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	412 {
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	413 if (len == -1)
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	414 val = vim_strsave(str);
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	415 else
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	416 val = vim_strnsave(str, len);
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	417 }
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	418 item->di_tv.vval.v_string = val;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	419 if (dict_add(d, item) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	420 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	421 dictitem_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	422 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	423 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	424 return OK;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	425 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	426
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	427 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	428 * Add a list entry to dictionary "d".
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	429 * Returns FAIL when out of memory and when key already exists.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	430 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	431 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	432 dict_add_list(dict_T d, char key, list_T *list)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	433 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	434 dictitem_T *item;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	435
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	436 item = dictitem_alloc((char_u *)key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	437 if (item == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	438 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	439 item->di_tv.v_type = VAR_LIST;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	440 item->di_tv.vval.v_list = list;
11142 a54985a73ab2 patch 8.0.0458: potential crash if adding list or dict to dict fails Christian Brabandt <cb@256bit.org> parents: 10952 diff changeset	441 ++list->lv_refcount;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	442 if (dict_add(d, item) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	443 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	444 dictitem_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	445 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	446 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	447 return OK;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	448 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	449
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	450 /*
19047 a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	451 * Add a typval_T entry to dictionary "d".
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	452 * Returns FAIL when out of memory and when key already exists.
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	453 */
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	454 int
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	455 dict_add_tv(dict_T d, char key, typval_T *tv)
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	456 {
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	457 dictitem_T *item;
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	458
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	459 item = dictitem_alloc((char_u *)key);
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	460 if (item == NULL)
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	461 return FAIL;
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	462 copy_tv(tv, &item->di_tv);
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	463 if (dict_add(d, item) == FAIL)
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	464 {
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	465 dictitem_free(item);
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	466 return FAIL;
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	467 }
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	468 return OK;
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	469 }
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	470
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	471 /*
17123 efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	472 * Add a callback to dictionary "d".
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	473 * Returns FAIL when out of memory and when key already exists.
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	474 */
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	475 int
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	476 dict_add_callback(dict_T d, char key, callback_T *cb)
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	477 {
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	478 dictitem_T *item;
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	479
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	480 item = dictitem_alloc((char_u *)key);
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	481 if (item == NULL)
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	482 return FAIL;
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	483 put_callback(cb, &item->di_tv);
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	484 if (dict_add(d, item) == FAIL)
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	485 {
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	486 dictitem_free(item);
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	487 return FAIL;
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	488 }
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	489 return OK;
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	490 }
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	491
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	492 /*
16447 54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	493 * Initializes "iter" for iterating over dictionary items with
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	494 * dict_iterate_next().
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	495 * If "var" is not a Dict or an empty Dict then there will be nothing to
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	496 * iterate over, no error is given.
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	497 * NOTE: The dictionary must not change until iterating is finished!
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	498 */
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	499 void
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	500 dict_iterate_start(typval_T var, dict_iterator_T iter)
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	501 {
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	502 if (var->v_type != VAR_DICT \|\| var->vval.v_dict == NULL)
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	503 iter->dit_todo = 0;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	504 else
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	505 {
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	506 dict_T *d = var->vval.v_dict;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	507
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	508 iter->dit_todo = d->dv_hashtab.ht_used;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	509 iter->dit_hi = d->dv_hashtab.ht_array;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	510 }
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	511 }
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	512
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	513 /*
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	514 * Iterate over the items referred to by "iter". It should be initialized with
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	515 * dict_iterate_start().
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	516 * Returns a pointer to the key.
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	517 * "*tv_result" is set to point to the value for that key.
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	518 * If there are no more items, NULL is returned.
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	519 */
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	520 char_u *
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	521 dict_iterate_next(dict_iterator_T iter, typval_T *tv_result)
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	522 {
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	523 dictitem_T *di;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	524 char_u *result;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	525
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	526 if (iter->dit_todo == 0)
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	527 return NULL;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	528
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	529 while (HASHITEM_EMPTY(iter->dit_hi))
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	530 ++iter->dit_hi;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	531
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	532 di = HI2DI(iter->dit_hi);
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	533 result = di->di_key;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	534 *tv_result = &di->di_tv;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	535
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	536 --iter->dit_todo;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	537 ++iter->dit_hi;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	538 return result;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	539 }
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	540
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	541 /*
9858 3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	542 * Add a dict entry to dictionary "d".
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	543 * Returns FAIL when out of memory and when key already exists.
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	544 */
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	545 int
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	546 dict_add_dict(dict_T d, char key, dict_T *dict)
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	547 {
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	548 dictitem_T *item;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	549
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	550 item = dictitem_alloc((char_u *)key);
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	551 if (item == NULL)
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	552 return FAIL;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	553 item->di_tv.v_type = VAR_DICT;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	554 item->di_tv.vval.v_dict = dict;
11142 a54985a73ab2 patch 8.0.0458: potential crash if adding list or dict to dict fails Christian Brabandt <cb@256bit.org> parents: 10952 diff changeset	555 ++dict->dv_refcount;
9858 3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	556 if (dict_add(d, item) == FAIL)
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	557 {
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	558 dictitem_free(item);
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	559 return FAIL;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	560 }
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	561 return OK;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	562 }
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	563
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	564 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	565 * Get the number of items in a Dictionary.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	566 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	567 long
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	568 dict_len(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	569 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	570 if (d == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	571 return 0L;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	572 return (long)d->dv_hashtab.ht_used;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	573 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	574
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	575 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	576 * Find item "key[len]" in Dictionary "d".
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	577 * If "len" is negative use strlen(key).
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	578 * Returns NULL when not found.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	579 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	580 dictitem_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	581 dict_find(dict_T d, char_u key, int len)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	582 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	583 #define AKEYLEN 200
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	584 char_u buf[AKEYLEN];
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	585 char_u *akey;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	586 char_u *tofree = NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	587 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	588
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	589 if (d == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	590 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	591 if (len < 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	592 akey = key;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	593 else if (len >= AKEYLEN)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	594 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	595 tofree = akey = vim_strnsave(key, len);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	596 if (akey == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	597 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	598 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	599 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	600 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	601 // Avoid a malloc/free by using buf[].
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	602 vim_strncpy(buf, key, len);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	603 akey = buf;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	604 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	605
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	606 hi = hash_find(&d->dv_hashtab, akey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	607 vim_free(tofree);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	608 if (HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	609 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	610 return HI2DI(hi);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	611 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	612
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	613 /*
19047 a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	614 * Get a typval_T item from a dictionary and copy it into "rettv".
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	615 * Returns FAIL if the entry doesn't exist or out of memory.
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	616 */
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	617 int
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	618 dict_get_tv(dict_T d, char_u key, typval_T *rettv)
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	619 {
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	620 dictitem_T *di;
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	621
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	622 di = dict_find(d, key, -1);
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	623 if (di == NULL)
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	624 return FAIL;
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	625 copy_tv(&di->di_tv, rettv);
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	626 return OK;
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	627 }
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	628
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	629 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	630 * Get a string item from a dictionary.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	631 * When "save" is TRUE allocate memory for it.
9770 ba98d7ce0d74 commit https://github.com/vim/vim/commit/7dc5e2e486fe0287601968e535902a41a39f65bb Christian Brabandt <cb@256bit.org> parents: 9560 diff changeset	632 * When FALSE a shared buffer is used, can only be used once!
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	633 * Returns NULL if the entry doesn't exist or out of memory.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	634 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	635 char_u *
15146 7903dce131d4 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Bram Moolenaar <Bram@vim.org> parents: 15016 diff changeset	636 dict_get_string(dict_T d, char_u key, int save)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	637 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	638 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	639 char_u *s;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	640
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	641 di = dict_find(d, key, -1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	642 if (di == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	643 return NULL;
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	644 s = tv_get_string(&di->di_tv);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	645 if (save && s != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	646 s = vim_strsave(s);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	647 return s;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	648 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	649
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	650 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	651 * Get a number item from a dictionary.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	652 * Returns 0 if the entry doesn't exist.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	653 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	654 varnumber_T
15146 7903dce131d4 patch 8.1.0583: using illogical name for get_dict_number()/get_dict_string() Bram Moolenaar <Bram@vim.org> parents: 15016 diff changeset	655 dict_get_number(dict_T d, char_u key)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	656 {
17905 fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	657 return dict_get_number_def(d, key, 0);
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	658 }
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	659
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	660 /*
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	661 * Get a number item from a dictionary.
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	662 * Returns "def" if the entry doesn't exist.
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	663 */
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	664 varnumber_T
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	665 dict_get_number_def(dict_T d, char_u key, int def)
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	666 {
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	667 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	668
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	669 di = dict_find(d, key, -1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	670 if (di == NULL)
17905 fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	671 return def;
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	672 return tv_get_number(&di->di_tv);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	673 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	674
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	675 /*
16902 23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	676 * Get a number item from a dictionary.
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	677 * Returns 0 if the entry doesn't exist.
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	678 * Give an error if the entry is not a number.
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	679 */
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	680 varnumber_T
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	681 dict_get_number_check(dict_T d, char_u key)
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	682 {
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	683 dictitem_T *di;
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	684
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	685 di = dict_find(d, key, -1);
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	686 if (di == NULL)
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	687 return 0;
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	688 if (di->di_tv.v_type != VAR_NUMBER)
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	689 {
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	690 semsg(_(e_invarg2), tv_get_string(&di->di_tv));
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	691 return 0;
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	692 }
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	693 return tv_get_number(&di->di_tv);
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	694 }
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	695
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	696 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	697 * Return an allocated string with the string representation of a Dictionary.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	698 * May return NULL.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	699 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	700 char_u *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	701 dict2string(typval_T *tv, int copyID, int restore_copyID)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	702 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	703 garray_T ga;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	704 int first = TRUE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	705 char_u *tofree;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	706 char_u numbuf[NUMBUFLEN];
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	707 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	708 char_u *s;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	709 dict_T *d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	710 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	711
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	712 if ((d = tv->vval.v_dict) == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	713 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	714 ga_init2(&ga, (int)sizeof(char), 80);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	715 ga_append(&ga, '{');
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	716
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	717 todo = (int)d->dv_hashtab.ht_used;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	718 for (hi = d->dv_hashtab.ht_array; todo > 0 && !got_int; ++hi)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	719 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	720 if (!HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	721 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	722 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	723
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	724 if (first)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	725 first = FALSE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	726 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	727 ga_concat(&ga, (char_u *)", ");
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	728
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	729 tofree = string_quote(hi->hi_key, FALSE);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	730 if (tofree != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	731 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	732 ga_concat(&ga, tofree);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	733 vim_free(tofree);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	734 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	735 ga_concat(&ga, (char_u *)": ");
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	736 s = echo_string_core(&HI2DI(hi)->di_tv, &tofree, numbuf, copyID,
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	737 FALSE, restore_copyID, TRUE);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	738 if (s != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	739 ga_concat(&ga, s);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	740 vim_free(tofree);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	741 if (s == NULL \|\| did_echo_string_emsg)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	742 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	743 line_breakcheck();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	744
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	745 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	746 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	747 if (todo > 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	748 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	749 vim_free(ga.ga_data);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	750 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	751 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	752
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	753 ga_append(&ga, '}');
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	754 ga_append(&ga, NUL);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	755 return (char_u *)ga.ga_data;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	756 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	757
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	758 /*
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	759 * Get the key for #{key: val} into "tv" and advance "arg".
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	760 * Return FAIL when there is no valid key.
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	761 */
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	762 static int
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	763 get_literal_key(char_u *arg, typval_T tv)
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	764 {
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	765 char_u *p;
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	766
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	767 if (!ASCII_ISALNUM(arg) && arg != '_' && **arg != '-')
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	768 return FAIL;
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	769
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	770 for (p = arg; ASCII_ISALNUM(p) \|\| p == '_' \|\| p == '-'; ++p)
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	771 ;
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	772 tv->v_type = VAR_STRING;
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	773 tv->vval.v_string = vim_strnsave(arg, (int)(p - arg));
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	774
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	775 *arg = skipwhite(p);
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	776 return OK;
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	777 }
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	778
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	779 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	780 * Allocate a variable for a Dictionary and fill it from "*arg".
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	781 * "literal" is TRUE for #{key: val}
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	782 * Return OK or FAIL. Returns NOTDONE for {expr}.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	783 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	784 int
19047 a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	785 eval_dict(char_u *arg, typval_T rettv, int evaluate, int literal)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	786 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	787 dict_T *d = NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	788 typval_T tvkey;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	789 typval_T tv;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	790 char_u *key = NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	791 dictitem_T *item;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	792 char_u start = skipwhite(arg + 1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	793 char_u buf[NUMBUFLEN];
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	794
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	795 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	796 * First check if it's not a curly-braces thing: {expr}.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	797 * Must do this without evaluating, otherwise a function may be called
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	798 * twice. Unfortunately this means we need to call eval1() twice for the
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	799 * first item.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	800 * But {} is an empty Dictionary.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	801 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	802 if (*start != '}')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	803 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	804 if (eval1(&start, &tv, FALSE) == FAIL) // recursive!
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	805 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	806 if (*start == '}')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	807 return NOTDONE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	808 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	809
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	810 if (evaluate)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	811 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	812 d = dict_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	813 if (d == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	814 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	815 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	816 tvkey.v_type = VAR_UNKNOWN;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	817 tv.v_type = VAR_UNKNOWN;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	818
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	819 arg = skipwhite(arg + 1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	820 while (arg != '}' && arg != NUL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	821 {
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	822 if ((literal
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	823 ? get_literal_key(arg, &tvkey)
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	824 : eval1(arg, &tvkey, evaluate)) == FAIL) // recursive!
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	825 goto failret;
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	826
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	827 if (**arg != ':')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	828 {
19822 fc3cdc819d80 patch 8.2.0467: Vim9: some errors are not tested Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	829 if (evaluate)
fc3cdc819d80 patch 8.2.0467: Vim9: some errors are not tested Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	830 semsg(_(e_missing_dict_colon), *arg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	831 clear_tv(&tvkey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	832 goto failret;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	833 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	834 if (evaluate)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	835 {
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	836 key = tv_get_string_buf_chk(&tvkey, buf);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	837 if (key == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	838 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	839 // "key" is NULL when tv_get_string_buf_chk() gave an errmsg
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	840 clear_tv(&tvkey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	841 goto failret;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	842 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	843 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	844
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	845 arg = skipwhite(arg + 1);
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	846 if (eval1(arg, &tv, evaluate) == FAIL) // recursive!
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	847 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	848 if (evaluate)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	849 clear_tv(&tvkey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	850 goto failret;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	851 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	852 if (evaluate)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	853 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	854 item = dict_find(d, key, -1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	855 if (item != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	856 {
19822 fc3cdc819d80 patch 8.2.0467: Vim9: some errors are not tested Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	857 if (evaluate)
fc3cdc819d80 patch 8.2.0467: Vim9: some errors are not tested Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	858 semsg(_(e_duplicate_key), key);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	859 clear_tv(&tvkey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	860 clear_tv(&tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	861 goto failret;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	862 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	863 item = dictitem_alloc(key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	864 if (item != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	865 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	866 item->di_tv = tv;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	867 item->di_tv.v_lock = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	868 if (dict_add(d, item) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	869 dictitem_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	870 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	871 }
18201 2ec4ed3f5e12 patch 8.1.2095: leaking memory when getting item from dict Bram Moolenaar <Bram@vim.org> parents: 17905 diff changeset	872 clear_tv(&tvkey);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	873
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	874 if (**arg == '}')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	875 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	876 if (**arg != ',')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	877 {
19822 fc3cdc819d80 patch 8.2.0467: Vim9: some errors are not tested Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	878 if (evaluate)
fc3cdc819d80 patch 8.2.0467: Vim9: some errors are not tested Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	879 semsg(_(e_missing_dict_comma), *arg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	880 goto failret;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	881 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	882 arg = skipwhite(arg + 1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	883 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	884
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	885 if (**arg != '}')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	886 {
19822 fc3cdc819d80 patch 8.2.0467: Vim9: some errors are not tested Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	887 if (evaluate)
fc3cdc819d80 patch 8.2.0467: Vim9: some errors are not tested Bram Moolenaar <Bram@vim.org> parents: 19181 diff changeset	888 semsg(_(e_missing_dict_end), *arg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	889 failret:
17159 3fd0765f454f patch 8.1.1579: dict and list could be GC'ed while displaying error Bram Moolenaar <Bram@vim.org> parents: 17123 diff changeset	890 if (d != NULL)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	891 dict_free(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	892 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	893 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	894
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	895 arg = skipwhite(arg + 1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	896 if (evaluate)
11418 162bcd0debd7 patch 8.0.0593: duplication of code for adding a list or dict return value Christian Brabandt <cb@256bit.org> parents: 11142 diff changeset	897 rettv_dict_set(rettv, d);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	898
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	899 return OK;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	900 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	901
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	902 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	903 * Go over all entries in "d2" and add them to "d1".
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	904 * When "action" is "error" then a duplicate key is an error.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	905 * When "action" is "force" then a duplicate key is overwritten.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	906 * Otherwise duplicate keys are ignored ("action" is "keep").
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	907 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	908 void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	909 dict_extend(dict_T d1, dict_T d2, char_u *action)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	910 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	911 dictitem_T *di1;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	912 hashitem_T *hi2;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	913 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	914 char_u arg_errmsg = (char_u )N_("extend() argument");
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	915
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	916 todo = (int)d2->dv_hashtab.ht_used;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	917 for (hi2 = d2->dv_hashtab.ht_array; todo > 0; ++hi2)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	918 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	919 if (!HASHITEM_EMPTY(hi2))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	920 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	921 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	922 di1 = dict_find(d1, hi2->hi_key, -1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	923 if (d1->dv_scope != 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	924 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	925 // Disallow replacing a builtin function in l: and g:.
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	926 // Check the key to be valid when adding to any scope.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	927 if (d1->dv_scope == VAR_DEF_SCOPE
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	928 && HI2DI(hi2)->di_tv.v_type == VAR_FUNC
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	929 && var_check_func_name(hi2->hi_key, di1 == NULL))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	930 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	931 if (!valid_varname(hi2->hi_key))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	932 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	933 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	934 if (di1 == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	935 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	936 di1 = dictitem_copy(HI2DI(hi2));
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	937 if (di1 != NULL && dict_add(d1, di1) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	938 dictitem_free(di1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	939 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	940 else if (*action == 'e')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	941 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15267 diff changeset	942 semsg(_("E737: Key already exists: %s"), hi2->hi_key);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	943 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	944 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	945 else if (*action == 'f' && HI2DI(hi2) != di1)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	946 {
15780 5b6c3c7feba8 patch 8.1.0897: can modify a:000 when using a reference Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	947 if (var_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE)
5b6c3c7feba8 patch 8.1.0897: can modify a:000 when using a reference Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	948 \|\| var_check_ro(di1->di_flags, arg_errmsg, TRUE))
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	949 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	950 clear_tv(&di1->di_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	951 copy_tv(&HI2DI(hi2)->di_tv, &di1->di_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	952 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	953 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	954 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	955 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	956
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	957 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	958 * Return the dictitem that an entry in a hashtable points to.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	959 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	960 dictitem_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	961 dict_lookup(hashitem_T *hi)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	962 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	963 return HI2DI(hi);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	964 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	965
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	966 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	967 * Return TRUE when two dictionaries have exactly the same key/values.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	968 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	969 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	970 dict_equal(
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	971 dict_T *d1,
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	972 dict_T *d2,
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	973 int ic, // ignore case for strings
3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	974 int recursive) // TRUE when used recursively
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	975 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	976 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	977 dictitem_T *item2;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	978 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	979
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	980 if (d1 == d2)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	981 return TRUE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	982 if (dict_len(d1) != dict_len(d2))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	983 return FALSE;
20128 0b35a7ffceb2 patch 8.2.0619: null dict is not handled like an empty dict Bram Moolenaar <Bram@vim.org> parents: 19822 diff changeset	984 if (dict_len(d1) == 0)
0b35a7ffceb2 patch 8.2.0619: null dict is not handled like an empty dict Bram Moolenaar <Bram@vim.org> parents: 19822 diff changeset	985 // empty and NULL dicts are considered equal
0b35a7ffceb2 patch 8.2.0619: null dict is not handled like an empty dict Bram Moolenaar <Bram@vim.org> parents: 19822 diff changeset	986 return TRUE;
0b35a7ffceb2 patch 8.2.0619: null dict is not handled like an empty dict Bram Moolenaar <Bram@vim.org> parents: 19822 diff changeset	987 if (d1 == NULL \|\| d2 == NULL)
0b35a7ffceb2 patch 8.2.0619: null dict is not handled like an empty dict Bram Moolenaar <Bram@vim.org> parents: 19822 diff changeset	988 return FALSE;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	989
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	990 todo = (int)d1->dv_hashtab.ht_used;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	991 for (hi = d1->dv_hashtab.ht_array; todo > 0; ++hi)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	992 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	993 if (!HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	994 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	995 item2 = dict_find(d2, hi->hi_key, -1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	996 if (item2 == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	997 return FALSE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	998 if (!tv_equal(&HI2DI(hi)->di_tv, &item2->di_tv, ic, recursive))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	999 return FALSE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1000 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1001 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1002 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1003 return TRUE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1004 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1005
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1006 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1007 * Turn a dict into a list:
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1008 * "what" == 0: list of keys
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1009 * "what" == 1: list of values
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1010 * "what" == 2: list of items
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1011 */
17789 0f7ae8010787 patch 8.1.1891: functions used in one file are global Bram Moolenaar <Bram@vim.org> parents: 17655 diff changeset	1012 static void
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1013 dict_list(typval_T argvars, typval_T rettv, int what)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1014 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1015 list_T *l2;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1016 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1017 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1018 listitem_T *li;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1019 listitem_T *li2;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1020 dict_T *d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1021 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1022
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1023 if (argvars[0].v_type != VAR_DICT)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1024 {
15470 55ccc2d353bd patch 8.1.0743: giving error messages is not flexible Bram Moolenaar <Bram@vim.org> parents: 15267 diff changeset	1025 emsg(_(e_dictreq));
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1026 return;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1027 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1028 if ((d = argvars[0].vval.v_dict) == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1029 return;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1030
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1031 if (rettv_list_alloc(rettv) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1032 return;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1033
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1034 todo = (int)d->dv_hashtab.ht_used;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1035 for (hi = d->dv_hashtab.ht_array; todo > 0; ++hi)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1036 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1037 if (!HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1038 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1039 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1040 di = HI2DI(hi);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1041
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1042 li = listitem_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1043 if (li == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1044 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1045 list_append(rettv->vval.v_list, li);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1046
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1047 if (what == 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1048 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1049 // keys()
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1050 li->li_tv.v_type = VAR_STRING;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1051 li->li_tv.v_lock = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1052 li->li_tv.vval.v_string = vim_strsave(di->di_key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1053 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1054 else if (what == 1)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1055 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1056 // values()
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1057 copy_tv(&di->di_tv, &li->li_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1058 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1059 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1060 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1061 // items()
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1062 l2 = list_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1063 li->li_tv.v_type = VAR_LIST;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1064 li->li_tv.v_lock = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1065 li->li_tv.vval.v_list = l2;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1066 if (l2 == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1067 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1068 ++l2->lv_refcount;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1069
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1070 li2 = listitem_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1071 if (li2 == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1072 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1073 list_append(l2, li2);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1074 li2->li_tv.v_type = VAR_STRING;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1075 li2->li_tv.v_lock = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1076 li2->li_tv.vval.v_string = vim_strsave(di->di_key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1077
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1078 li2 = listitem_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1079 if (li2 == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1080 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1081 list_append(l2, li2);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1082 copy_tv(&di->di_tv, &li2->li_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1083 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1084 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1085 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1086 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1087
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1088 /*
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1089 * "items(dict)" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1090 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1091 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1092 f_items(typval_T argvars, typval_T rettv)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1093 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1094 dict_list(argvars, rettv, 2);
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1095 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1096
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1097 /*
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1098 * "keys()" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1099 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1100 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1101 f_keys(typval_T argvars, typval_T rettv)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1102 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1103 dict_list(argvars, rettv, 0);
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1104 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1105
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1106 /*
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1107 * "values(dict)" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1108 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1109 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1110 f_values(typval_T argvars, typval_T rettv)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1111 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1112 dict_list(argvars, rettv, 1);
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1113 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1114
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1115 /*
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1116 * Make each item in the dict readonly (not the value of the item).
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1117 */
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1118 void
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1119 dict_set_items_ro(dict_T *di)
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1120 {
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1121 int todo = (int)di->dv_hashtab.ht_used;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1122 hashitem_T *hi;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1123
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1124 // Set readonly
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1125 for (hi = di->dv_hashtab.ht_array; todo > 0 ; ++hi)
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1126 {
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1127 if (HASHITEM_EMPTY(hi))
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1128 continue;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1129 --todo;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1130 HI2DI(hi)->di_flags \|= DI_FLAGS_RO \| DI_FLAGS_FIX;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1131 }
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1132 }
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1133
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1134 /*
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1135 * "has_key()" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1136 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1137 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1138 f_has_key(typval_T argvars, typval_T rettv)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1139 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1140 if (argvars[0].v_type != VAR_DICT)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1141 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1142 emsg(_(e_dictreq));
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1143 return;
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1144 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1145 if (argvars[0].vval.v_dict == NULL)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1146 return;
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1147
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1148 rettv->vval.v_number = dict_find(argvars[0].vval.v_dict,
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1149 tv_get_string(&argvars[1]), -1) != NULL;
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1150 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1151
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1152 /*
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1153 * "remove({dict})" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1154 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1155 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1156 dict_remove(typval_T argvars, typval_T rettv, char_u *arg_errmsg)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1157 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1158 dict_T *d;
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1159 char_u *key;
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1160 dictitem_T *di;
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1161
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1162 if (argvars[2].v_type != VAR_UNKNOWN)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1163 semsg(_(e_toomanyarg), "remove()");
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1164 else if ((d = argvars[0].vval.v_dict) != NULL
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1165 && !var_check_lock(d->dv_lock, arg_errmsg, TRUE))
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1166 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1167 key = tv_get_string_chk(&argvars[1]);
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1168 if (key != NULL)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1169 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1170 di = dict_find(d, key, -1);
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1171 if (di == NULL)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1172 semsg(_(e_dictkey), key);
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1173 else if (!var_check_fixed(di->di_flags, arg_errmsg, TRUE)
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1174 && !var_check_ro(di->di_flags, arg_errmsg, TRUE))
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1175 {
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1176 *rettv = di->di_tv;
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1177 init_tv(&di->di_tv);
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1178 dictitem_remove(d, di);
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1179 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1180 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1181 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1182 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1183
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1184 #endif // defined(FEAT_EVAL)

Mercurial > vim

annotate src/dict.c @ 20128:0b35a7ffceb2 v8.2.0619