vim: src/dict.c annotate

annotate src/dict.c @ 34686:83875247fbc0 v9.1.0224

patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15 Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Date: Thu Mar 28 12:01:14 2024 +0100 patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text Problem: If a line has "right" & "below" virtual text properties, where the "below" property may be stored first due to lack of ordering between them, then the line height is calculated to be 1 more and causes the cursor to far over the line. Solution: Remove some unnecessary setting of a `next_right_goes_below = TRUE` flag for "below" and "above" text properties. (Dylan Thacker-Smith) I modified a regression test I recently added to cover this case, leveraging the fact that "after", "right" & "below" text properties are being stored in the reverse of the order they are added in. The previous version of this regression test was crafted to workaround this issue so it can be addressed by this separate patch. closes: #14317 Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com> Signed-off-by: Christian Brabandt <cb@256bit.org>

author	Christian Brabandt <cb@256bit.org>
date	Thu, 28 Mar 2024 12:15:03 +0100
parents	da670b1549b3
children	0cc43bca5bd9

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.
22827 20ccf5f7dc6d patch 8.2.1961: various comments can be improved Bram Moolenaar <Bram@vim.org> parents: 22681 diff changeset	25 * Caller should take care of the reference count.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	26 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	27 dict_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	28 dict_alloc(void)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	29 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	30 dict_T *d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	31
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	32 d = ALLOC_CLEAR_ONE(dict_T);
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	33 if (d == NULL)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	34 return NULL;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	35
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	36 // Add the dict to the list of dicts for garbage collection.
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	37 if (first_dict != NULL)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	38 first_dict->dv_used_prev = d;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	39 d->dv_used_next = first_dict;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	40 d->dv_used_prev = NULL;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	41 first_dict = d;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	42
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	43 hash_init(&d->dv_hashtab);
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	44 d->dv_lock = 0;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	45 d->dv_scope = 0;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	46 d->dv_refcount = 0;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	47 d->dv_copyID = 0;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	48 return d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	49 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	50
15016 c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	51 /*
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	52 * 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	53 */
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	54 dict_T *
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	55 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	56 {
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	57 #ifdef FEAT_EVAL
16782 fc58fee685e2 patch 8.1.1393: unnecessary type casts Bram Moolenaar <Bram@vim.org> parents: 16764 diff changeset	58 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	59 return NULL;
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	60 #endif
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	61 return (dict_alloc());
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	62 }
c338c91086b9 patch 8.1.0519: cannot save and restore the tag stack Bram Moolenaar <Bram@vim.org> parents: 14303 diff changeset	63
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	64 dict_T *
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	65 dict_alloc_lock(int lock)
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	66 {
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	67 dict_T *d = dict_alloc();
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	68
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	69 if (d != NULL)
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	70 d->dv_lock = lock;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	71 return d;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	72 }
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	73
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	74 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	75 * 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	76 * Returns OK or FAIL.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	77 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	78 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	79 rettv_dict_alloc(typval_T *rettv)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	80 {
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	81 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	82
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	83 if (d == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	84 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	85
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	86 rettv_dict_set(rettv, d);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	87 return OK;
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
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	90 /*
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	91 * 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	92 */
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 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	94 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	95 {
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->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	97 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	98 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	99 ++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	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
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	102 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	103 * 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	104 * Ignores the reference count.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	105 */
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	106 void
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	107 dict_free_contents(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	108 {
20347 0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	109 hashtab_free_contents(&d->dv_hashtab);
23458 d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	110 free_type(d->dv_type);
d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	111 d->dv_type = NULL;
20347 0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	112 }
0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	113
0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	114 /*
0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	115 * Clear hashtab "ht" and dict items it contains.
22940 5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	116 * If "ht" is not freed then you should call hash_init() next!
20347 0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	117 */
0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	118 void
0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	119 hashtab_free_contents(hashtab_T *ht)
0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	120 {
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	121 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	122 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	123 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	124
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	125 if (check_hashtab_frozen(ht, "clear dict"))
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	126 return;
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	127
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	128 // Lock the hashtab, we don't want it to resize while freeing items.
20347 0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	129 hash_lock(ht);
0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	130 todo = (int)ht->ht_used;
32118 04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	131 FOR_ALL_HASHTAB_ITEMS(ht, hi, todo)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	132 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	133 if (!HASHITEM_EMPTY(hi))
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 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	136 // something recursive causing trouble.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	137 di = HI2DI(hi);
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	138 hash_remove(ht, hi, "clear dict");
10952 835604f3c37a patch 8.0.0365: might free a dict item that wasn't allocated Christian Brabandt <cb@256bit.org> parents: 10359 diff changeset	139 dictitem_free(di);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	140 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	141 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	142 }
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	143
20347 0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	144 // The hashtab is still locked, it has to be re-initialized anyway.
0e1dfff4f294 patch 8.2.0729: Vim9: When reloading a script variables are not cleared Bram Moolenaar <Bram@vim.org> parents: 20128 diff changeset	145 hash_clear(ht);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	146 }
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 static void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	149 dict_free_dict(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	150 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	151 // 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	152 if (d->dv_used_prev == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	153 first_dict = d->dv_used_next;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	154 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	155 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	156 if (d->dv_used_next != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	157 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	158 vim_free(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	159 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	160
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	161 static void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	162 dict_free(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	163 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	164 if (!in_free_unref_items)
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 dict_free_contents(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	167 dict_free_dict(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	168 }
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
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	171 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	172 * 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	173 * becomes zero.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	174 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	175 void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	176 dict_unref(dict_T *d)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	177 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	178 if (d != NULL && --d->dv_refcount <= 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	179 dict_free(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	180 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	181
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	182 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	183 * 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	184 * Returns TRUE if something was freed.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	185 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	186 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	187 dict_free_nonref(int copyID)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	188 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	189 dict_T *dd;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	190 int did_free = FALSE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	191
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	192 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	193 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	194 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	195 // 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	196 // 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	197 // of dicts or list of lists.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	198 dict_free_contents(dd);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	199 did_free = TRUE;
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 return did_free;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	202 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	203
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	204 void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	205 dict_free_items(int copyID)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	206 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	207 dict_T dd, dd_next;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	208
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	209 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	210 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	211 dd_next = dd->dv_used_next;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	212 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	213 dict_free_dict(dd);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	214 }
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
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	217 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	218 * Allocate a Dictionary item.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	219 * 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	220 * 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	221 * initialized!
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	222 * Returns NULL when out of memory.
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 dictitem_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	225 dictitem_alloc(char_u *key)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	226 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	227 dictitem_T *di;
26692 de714c98c9b8 patch 8.2.3875: gcc complains about buffer overrun Bram Moolenaar <Bram@vim.org> parents: 26684 diff changeset	228 size_t len = STRLEN(key);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	229
26692 de714c98c9b8 patch 8.2.3875: gcc complains about buffer overrun Bram Moolenaar <Bram@vim.org> parents: 26684 diff changeset	230 di = alloc(offsetof(dictitem_T, di_key) + len + 1);
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	231 if (di == NULL)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	232 return NULL;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	233
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	234 mch_memmove(di->di_key, key, len + 1);
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	235 di->di_flags = DI_FLAGS_ALLOC;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	236 di->di_tv.v_lock = 0;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	237 di->di_tv.v_type = VAR_UNKNOWN;
9556 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 * Make a copy of a Dictionary item.
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 static dictitem_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	245 dictitem_copy(dictitem_T *org)
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 dictitem_T *di;
22474 542682b758dc patch 8.2.1785: compiler warning for strcp() out of bounds Bram Moolenaar <Bram@vim.org> parents: 22298 diff changeset	248 size_t len = STRLEN(org->di_key);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	249
22474 542682b758dc patch 8.2.1785: compiler warning for strcp() out of bounds Bram Moolenaar <Bram@vim.org> parents: 22298 diff changeset	250 di = alloc(offsetof(dictitem_T, di_key) + len + 1);
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	251 if (di == NULL)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	252 return NULL;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	253
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	254 mch_memmove(di->di_key, org->di_key, len + 1);
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	255 di->di_flags = DI_FLAGS_ALLOC;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	256 copy_tv(&org->di_tv, &di->di_tv);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	257 return di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	258 }
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 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	261 * Remove item "item" from Dictionary "dict" and free it.
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	262 * "command" is used for the error message when the hashtab if frozen.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	263 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	264 void
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	265 dictitem_remove(dict_T dict, dictitem_T item, char *command)
9556 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 hashitem_T *hi;
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 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	270 if (HASHITEM_EMPTY(hi))
10359 66f1b5bf3fa6 commit https://github.com/vim/vim/commit/95f096030ed1a8afea028f2ea295d6f6a70f466f Christian Brabandt <cb@256bit.org> parents: 10042 diff changeset	271 internal_error("dictitem_remove()");
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	272 else
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	273 hash_remove(&dict->dv_hashtab, hi, command);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	274 dictitem_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	275 }
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 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	278 * 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	279 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	280 void
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	281 dictitem_free(dictitem_T *item)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	282 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	283 clear_tv(&item->di_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	284 if (item->di_flags & DI_FLAGS_ALLOC)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	285 vim_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	286 }
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 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	289 * 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	290 * The refcount of the new dict is set to 1.
27517 f00a7a2bee21 patch 8.2.4286: Vim9: strict type checking after copy() and deepcopy() Bram Moolenaar <Bram@vim.org> parents: 27028 diff changeset	291 * See item_copy() for "top" and "copyID".
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	292 * Returns NULL when out of memory.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	293 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	294 dict_T *
27517 f00a7a2bee21 patch 8.2.4286: Vim9: strict type checking after copy() and deepcopy() Bram Moolenaar <Bram@vim.org> parents: 27028 diff changeset	295 dict_copy(dict_T *orig, int deep, int top, int copyID)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	296 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	297 dict_T *copy;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	298 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	299 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	300 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	301
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	302 if (orig == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	303 return NULL;
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 copy = dict_alloc();
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	306 if (copy == NULL)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	307 return NULL;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	308
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	309 if (copyID != 0)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	310 {
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	311 orig->dv_copyID = copyID;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	312 orig->dv_copydict = copy;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	313 }
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	314 if (orig->dv_type == NULL \|\| top \|\| deep)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	315 copy->dv_type = NULL;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	316 else
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	317 copy->dv_type = alloc_type(orig->dv_type);
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	318
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	319 todo = (int)orig->dv_hashtab.ht_used;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	320 for (hi = orig->dv_hashtab.ht_array; todo > 0 && !got_int; ++hi)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	321 {
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	322 if (!HASHITEM_EMPTY(hi))
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	323 {
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	324 --todo;
27517 f00a7a2bee21 patch 8.2.4286: Vim9: strict type checking after copy() and deepcopy() Bram Moolenaar <Bram@vim.org> parents: 27028 diff changeset	325
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	326 di = dictitem_alloc(hi->hi_key);
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	327 if (di == NULL)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	328 break;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	329 if (deep)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	330 {
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	331 if (item_copy(&HI2DI(hi)->di_tv, &di->di_tv,
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	332 deep, FALSE, copyID) == FAIL)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	333 {
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	334 vim_free(di);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	335 break;
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 }
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	338 else
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	339 copy_tv(&HI2DI(hi)->di_tv, &di->di_tv);
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	340 if (dict_add(copy, di) == FAIL)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	341 {
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	342 dictitem_free(di);
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	343 break;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	344 }
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	345 }
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	346 }
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	347
31667 b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	348 ++copy->dv_refcount;
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	349 if (todo > 0)
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	350 {
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	351 dict_unref(copy);
b89cfd86e18e patch 9.0.1166: code is indented more than necessary Bram Moolenaar <Bram@vim.org> parents: 31602 diff changeset	352 copy = NULL;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	353 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	354
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	355 return copy;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	356 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	357
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	358 /*
31002 a09404dad917 patch 9.0.0836: wrong error when using extend() with funcref Bram Moolenaar <Bram@vim.org> parents: 30986 diff changeset	359 * Check for adding a function to g: or s: (in Vim9 script) or l:.
24764 3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	360 * If the name is wrong give an error message and return TRUE.
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	361 */
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	362 int
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	363 dict_wrong_func_name(dict_T d, typval_T tv, char_u *name)
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	364 {
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	365 return (d == get_globvar_dict()
24766 29ed95687f74 patch 8.2.2921: E704 for script local variable is not backwards compatible Bram Moolenaar <Bram@vim.org> parents: 24764 diff changeset	366 \|\| (in_vim9script() && SCRIPT_ID_VALID(current_sctx.sc_sid)
29ed95687f74 patch 8.2.2921: E704 for script local variable is not backwards compatible Bram Moolenaar <Bram@vim.org> parents: 24764 diff changeset	367 && d == &SCRIPT_ITEM(current_sctx.sc_sid)->sn_vars->sv_dict)
29ed95687f74 patch 8.2.2921: E704 for script local variable is not backwards compatible Bram Moolenaar <Bram@vim.org> parents: 24764 diff changeset	368 \|\| &d->dv_hashtab == get_funccal_local_ht())
24764 3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	369 && (tv->v_type == VAR_FUNC \|\| tv->v_type == VAR_PARTIAL)
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	370 && var_wrong_func_name(name, TRUE);
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	371 }
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	372
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	373 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	374 * Add item "item" to Dictionary "d".
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	375 * 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	376 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	377 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	378 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	379 {
24764 3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	380 if (dict_wrong_func_name(d, &item->di_tv, item->di_key))
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	381 return FAIL;
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	382 return hash_add(&d->dv_hashtab, item->di_key, "add to dictionary");
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	383 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	384
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	385 /*
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	386 * 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	387 * 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	388 */
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	389 static int
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	390 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	391 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	392 dictitem_T *item;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	393
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	394 item = dictitem_alloc((char_u *)key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	395 if (item == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	396 return FAIL;
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	397 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	398 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	399 if (dict_add(d, item) == FAIL)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	400 {
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	401 dictitem_free(item);
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	402 return FAIL;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: 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 return OK;
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	405 }
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 /*
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	408 * 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	409 * 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	410 */
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	411 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	412 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	413 {
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	414 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	415 }
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	416
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	417 /*
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	418 * 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	419 * 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	420 */
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	421 int
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	422 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	423 {
19102 ba9f50bfda83 patch 8.2.0111: VAR_SPECIAL is also used for booleans Bram Moolenaar <Bram@vim.org> parents: 19051 diff changeset	424 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	425 }
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	426
0f65f2808470 patch 8.1.1138: plugins don't get notified when the popup menu changes Bram Moolenaar <Bram@vim.org> parents: 15780 diff changeset	427 /*
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	428 * 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	429 * 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	430 */
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	431 int
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	432 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	433 {
15267 762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	434 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	435 }
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	436
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	437 /*
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	438 * Add a string entry to dictionary "d".
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	439 * "str" will be copied to allocated memory.
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	440 * 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	441 * 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	442 */
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	443 int
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	444 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	445 {
14301 3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	446 dictitem_T *item;
15267 762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	447 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	448
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	449 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	450 if (item == NULL)
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	451 return FAIL;
3c80092eb211 patch 8.1.0166: using dict_add_nr_str() is clumsy Christian Brabandt <cb@256bit.org> parents: 13037 diff changeset	452 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	453 if (str != NULL)
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	454 {
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	455 if (len == -1)
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	456 val = vim_strsave(str);
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	457 else
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	458 val = vim_strnsave(str, len);
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	459 }
762fccd84b7c patch 8.1.0642: swapinfo() leaks memory Bram Moolenaar <Bram@vim.org> parents: 15211 diff changeset	460 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	461 if (dict_add(d, item) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	462 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	463 dictitem_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	464 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	465 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	466 return OK;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	467 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	468
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	469 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	470 * Add a list entry to dictionary "d".
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	471 * 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	472 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	473 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	474 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	475 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	476 dictitem_T *item;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	477
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	478 item = dictitem_alloc((char_u *)key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	479 if (item == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	480 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	481 item->di_tv.v_type = VAR_LIST;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	482 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	483 ++list->lv_refcount;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	484 if (dict_add(d, item) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	485 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	486 dictitem_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	487 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	488 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	489 return OK;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	490 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	491
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	492 /*
19047 a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	493 * 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	494 * 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	495 */
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	496 int
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	497 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	498 {
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	499 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	500
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	501 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	502 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	503 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	504 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	505 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	506 {
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	507 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	508 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	509 }
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	510 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	511 }
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	512
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	513 /*
17123 efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	514 * 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	515 * 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	516 */
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	517 int
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	518 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	519 {
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	520 dictitem_T *item;
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	521
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	522 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	523 if (item == NULL)
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	524 return FAIL;
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	525 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	526 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	527 {
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	528 dictitem_free(item);
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	529 return FAIL;
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	530 }
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	531 return OK;
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	532 }
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	533
efc6f5e3b543 patch 8.1.1561: popup_setoptions() is not implemented yet Bram Moolenaar <Bram@vim.org> parents: 16902 diff changeset	534 /*
16447 54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	535 * 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	536 * 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	537 * 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	538 * 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	539 * 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	540 */
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	541 void
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	542 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	543 {
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	544 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	545 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	546 else
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	547 {
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	548 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	549
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	550 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	551 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	552 }
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	553 }
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	554
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	555 /*
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	556 * 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	557 * 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	558 * 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	559 * "*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	560 * 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	561 */
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	562 char_u *
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	563 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	564 {
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	565 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	566 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	567
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	568 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	569 return NULL;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	570
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	571 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	572 ++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	573
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	574 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	575 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	576 *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	577
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	578 --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	579 ++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	580 return result;
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	581 }
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	582
54ffc82f38a8 patch 8.1.1228: not possible to process tags with a function Bram Moolenaar <Bram@vim.org> parents: 16268 diff changeset	583 /*
9858 3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	584 * 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	585 * 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	586 */
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	587 int
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	588 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	589 {
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	590 dictitem_T *item;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	591
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	592 item = dictitem_alloc((char_u *)key);
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	593 if (item == NULL)
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	594 return FAIL;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	595 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	596 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	597 ++dict->dv_refcount;
9858 3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	598 if (dict_add(d, item) == FAIL)
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	599 {
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	600 dictitem_free(item);
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	601 return FAIL;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	602 }
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	603 return OK;
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	604 }
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	605
3e96d9ed2ca1 commit https://github.com/vim/vim/commit/b5ae48e9ffd3b8eb6ca4057de11f1bddcde8ce6f Christian Brabandt <cb@256bit.org> parents: 9770 diff changeset	606 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	607 * 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	608 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	609 long
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	610 dict_len(dict_T *d)
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 if (d == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	613 return 0L;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	614 return (long)d->dv_hashtab.ht_used;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	615 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	616
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	617 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	618 * Find item "key[len]" in Dictionary "d".
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	619 * If "len" is negative use strlen(key).
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	620 * Returns NULL when not found.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	621 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	622 dictitem_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	623 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	624 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	625 #define AKEYLEN 200
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	626 char_u buf[AKEYLEN];
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	627 char_u *akey;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	628 char_u *tofree = NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	629 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	630
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	631 if (d == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	632 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	633 if (len < 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	634 akey = key;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	635 else if (len >= AKEYLEN)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	636 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	637 tofree = akey = vim_strnsave(key, len);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	638 if (akey == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	639 return NULL;
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 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	642 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	643 // 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	644 vim_strncpy(buf, key, len);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	645 akey = buf;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	646 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	647
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	648 hi = hash_find(&d->dv_hashtab, akey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	649 vim_free(tofree);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	650 if (HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	651 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	652 return HI2DI(hi);
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
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	655 /*
28315 62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	656 * Returns TRUE if "key" is present in Dictionary "d".
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	657 */
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	658 int
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	659 dict_has_key(dict_T d, char key)
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	660 {
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	661 return dict_find(d, (char_u *)key, -1) != NULL;
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	662 }
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	663
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	664 /*
19047 a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	665 * 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	666 * 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	667 */
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	668 int
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	669 dict_get_tv(dict_T d, char key, typval_T *rettv)
19047 a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	670 {
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	671 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	672
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	673 di = dict_find(d, (char_u *)key, -1);
19047 a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	674 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	675 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	676 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	677 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	678 }
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	679
a3fce2763e83 patch 8.2.0084: complete item "user_data" can only be a string Bram Moolenaar <Bram@vim.org> parents: 18777 diff changeset	680 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	681 * Get a string item from a dictionary.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	682 * 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	683 * 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	684 * 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	685 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	686 char_u *
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	687 dict_get_string(dict_T d, char key, int save)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	688 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	689 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	690 char_u *s;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	691
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	692 di = dict_find(d, (char_u *)key, -1);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	693 if (di == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	694 return NULL;
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	695 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	696 if (save && s != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	697 s = vim_strsave(s);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	698 return s;
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
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	701 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	702 * Get a number item from a dictionary.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	703 * 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	704 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	705 varnumber_T
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	706 dict_get_number(dict_T d, char key)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	707 {
17905 fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	708 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	709 }
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	710
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	711 /*
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	712 * 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	713 * 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	714 */
fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	715 varnumber_T
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	716 dict_get_number_def(dict_T d, char key, int def)
17905 fb773f73a4be patch 8.1.1949: cannot scroll a popup window to the very bottom Bram Moolenaar <Bram@vim.org> parents: 17789 diff changeset	717 {
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	718 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	719
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	720 di = dict_find(d, (char_u *)key, -1);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	721 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	722 return def;
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	723 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	724 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	725
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	726 /*
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	727 * 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	728 * 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	729 * 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	730 */
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	731 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	732 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	733 {
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	734 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	735
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	736 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	737 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	738 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	739 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	740 {
26865 bce848ec8b1b patch 8.2.3961: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26692 diff changeset	741 semsg(_(e_invalid_argument_str), tv_get_string(&di->di_tv));
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	742 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	743 }
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	744 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	745 }
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	746
23645f9a5ce2 patch 8.1.1452: line and col property of popup windows not properly checked Bram Moolenaar <Bram@vim.org> parents: 16825 diff changeset	747 /*
21857 1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	748 * Get a bool item (number or true/false) from a dictionary.
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	749 * Returns "def" if the entry doesn't exist.
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	750 */
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	751 varnumber_T
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	752 dict_get_bool(dict_T d, char key, int def)
21857 1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	753 {
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	754 dictitem_T *di;
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	755
29442 827d9f2b7a71 patch 9.0.0063: too many type casts for dict_get functions Bram Moolenaar <Bram@vim.org> parents: 29138 diff changeset	756 di = dict_find(d, (char_u *)key, -1);
21857 1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	757 if (di == NULL)
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	758 return def;
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	759 return tv_get_bool(&di->di_tv);
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	760 }
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	761
1f6dc5b953c4 patch 8.2.1478: Vim9: cannot use "true" for some popup options Bram Moolenaar <Bram@vim.org> parents: 21789 diff changeset	762 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	763 * 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	764 * May return NULL.
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	765 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	766 char_u *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	767 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	768 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	769 garray_T ga;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	770 int first = TRUE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	771 char_u *tofree;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	772 char_u numbuf[NUMBUFLEN];
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	773 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	774 char_u *s;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	775 dict_T *d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	776 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	777
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	778 if ((d = tv->vval.v_dict) == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	779 return NULL;
27028 c9474ae175f4 patch 8.2.4043: using int for second argument of ga_init2() Bram Moolenaar <Bram@vim.org> parents: 26952 diff changeset	780 ga_init2(&ga, sizeof(char), 80);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	781 ga_append(&ga, '{');
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	782
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	783 todo = (int)d->dv_hashtab.ht_used;
32118 04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	784 FOR_ALL_HASHTAB_ITEMS(&d->dv_hashtab, hi, todo)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	785 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	786 if (!HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	787 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	788 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	789
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	790 if (first)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	791 first = FALSE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	792 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	793 ga_concat(&ga, (char_u *)", ");
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 tofree = string_quote(hi->hi_key, FALSE);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	796 if (tofree != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	797 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	798 ga_concat(&ga, tofree);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	799 vim_free(tofree);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	800 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	801 ga_concat(&ga, (char_u *)": ");
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	802 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	803 FALSE, restore_copyID, TRUE);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	804 if (s != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	805 ga_concat(&ga, s);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	806 vim_free(tofree);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	807 if (s == NULL \|\| did_echo_string_emsg)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	808 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	809 line_breakcheck();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	810
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 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	813 if (todo > 0)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	814 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	815 vim_free(ga.ga_data);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	816 return NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	817 }
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 ga_append(&ga, '}');
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	820 ga_append(&ga, NUL);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	821 return (char_u *)ga.ga_data;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	822 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	823
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	824 /*
23072 4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	825 * Advance over a literal key, including "-". If the first character is not a
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	826 * literal key character then "key" is returned.
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	827 */
25567 0082503ff2ff patch 8.2.3320: some local functions are not static Bram Moolenaar <Bram@vim.org> parents: 25384 diff changeset	828 static char_u *
23072 4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	829 skip_literal_key(char_u *key)
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	830 {
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	831 char_u *p;
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	832
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	833 for (p = key; ASCII_ISALNUM(p) \|\| p == '_' \|\| *p == '-'; ++p)
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	834 ;
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	835 return p;
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	836 }
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	837
4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	838 /*
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	839 * 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	840 * 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	841 */
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	842 static int
23088 285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	843 get_literal_key_tv(char_u *arg, typval_T tv)
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	844 {
23072 4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	845 char_u p = skip_literal_key(arg);
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	846
23072 4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	847 if (p == *arg)
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	848 return FAIL;
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	849 tv->v_type = VAR_STRING;
20751 d9a2e5dcfd9f patch 8.2.0928: many type casts are used for vim_strnsave() Bram Moolenaar <Bram@vim.org> parents: 20397 diff changeset	850 tv->vval.v_string = vim_strnsave(arg, p - arg);
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	851
21761 5a2373c25a86 patch 8.2.1430: Vim9: error for missing comma instead of extra white space Bram Moolenaar <Bram@vim.org> parents: 21691 diff changeset	852 *arg = p;
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	853 return OK;
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	854 }
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	855
6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	856 /*
23088 285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	857 * Get a literal key for a Vim9 dict:
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	858 * {"name": value},
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	859 * {'name': value},
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	860 * {name: value} use "name" as a literal key
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	861 * Return the key in allocated memory or NULL in the case of an error.
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	862 * "arg" is advanced to just after the key.
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	863 */
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	864 char_u *
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	865 get_literal_key(char_u **arg)
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	866 {
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	867 char_u *key;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	868 char_u *end;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	869 typval_T rettv;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	870
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	871 if (**arg == '\'')
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	872 {
28813 3626ca6a20ea patch 8.2.4930: interpolated string expression requires escaping Bram Moolenaar <Bram@vim.org> parents: 28315 diff changeset	873 if (eval_lit_string(arg, &rettv, TRUE, FALSE) == FAIL)
23088 285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	874 return NULL;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	875 key = rettv.vval.v_string;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	876 }
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	877 else if (**arg == '"')
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	878 {
28813 3626ca6a20ea patch 8.2.4930: interpolated string expression requires escaping Bram Moolenaar <Bram@vim.org> parents: 28315 diff changeset	879 if (eval_string(arg, &rettv, TRUE, FALSE) == FAIL)
23088 285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	880 return NULL;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	881 key = rettv.vval.v_string;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	882 }
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	883 else
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	884 {
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	885 end = skip_literal_key(*arg);
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	886 if (end == *arg)
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	887 {
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	888 semsg(_(e_invalid_key_str), *arg);
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	889 return NULL;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	890 }
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	891 key = vim_strnsave(arg, end - arg);
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	892 *arg = end;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	893 }
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	894 return key;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	895 }
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	896
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	897 /*
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	898 * Allocate a variable for a Dictionary and fill it from "*arg".
21148 667192c5938b patch 8.2.1125: Vim9: double quote can be a string or a comment Bram Moolenaar <Bram@vim.org> parents: 21118 diff changeset	899 * "*arg" points to the "{".
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	900 * "literal" is TRUE for #{key: val}
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	901 * 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	902 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	903 int
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	904 eval_dict(char_u *arg, typval_T rettv, evalarg_T *evalarg, int literal)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	905 {
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	906 int evaluate = evalarg == NULL ? FALSE
32256 252b06c87796 patch 9.0.1459: typo in name of type Bram Moolenaar <Bram@vim.org> parents: 32170 diff changeset	907 : (evalarg->eval_flags & EVAL_EVALUATE);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	908 dict_T *d = NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	909 typval_T tvkey;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	910 typval_T tv;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	911 char_u *key = NULL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	912 dictitem_T *item;
26342 936f77929f16 patch 8.2.3702: first key in dict is seen as curly expression and fails Bram Moolenaar <Bram@vim.org> parents: 26238 diff changeset	913 char_u curly_expr = skipwhite(arg + 1);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	914 char_u buf[NUMBUFLEN];
21279 8d1d11afd8c8 patch 8.2.1190: Vim9: checking for Vim9 syntax is spread out Bram Moolenaar <Bram@vim.org> parents: 21148 diff changeset	915 int vim9script = in_vim9script();
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	916 int had_comma;
20992 7ee565134d4a patch 8.2.1047: Vim9: script cannot use line continuation like :def function Bram Moolenaar <Bram@vim.org> parents: 20751 diff changeset	917
30146 d58afefecd6c patch 9.0.0409: #{g:x} was seen as a curly-braces expression Bram Moolenaar <Bram@vim.org> parents: 29994 diff changeset	918 // First check if it's not a curly-braces expression: {expr}.
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	919 // Must do this without evaluating, otherwise a function may be called
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	920 // twice. Unfortunately this means we need to call eval1() twice for the
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	921 // first item.
30146 d58afefecd6c patch 9.0.0409: #{g:x} was seen as a curly-braces expression Bram Moolenaar <Bram@vim.org> parents: 29994 diff changeset	922 // "{}" is an empty Dictionary.
d58afefecd6c patch 9.0.0409: #{g:x} was seen as a curly-braces expression Bram Moolenaar <Bram@vim.org> parents: 29994 diff changeset	923 // "#{abc}" is never a curly-braces expression.
26342 936f77929f16 patch 8.2.3702: first key in dict is seen as curly expression and fails Bram Moolenaar <Bram@vim.org> parents: 26238 diff changeset	924 if (!vim9script
936f77929f16 patch 8.2.3702: first key in dict is seen as curly expression and fails Bram Moolenaar <Bram@vim.org> parents: 26238 diff changeset	925 && *curly_expr != '}'
30146 d58afefecd6c patch 9.0.0409: #{g:x} was seen as a curly-braces expression Bram Moolenaar <Bram@vim.org> parents: 29994 diff changeset	926 && !literal
26342 936f77929f16 patch 8.2.3702: first key in dict is seen as curly expression and fails Bram Moolenaar <Bram@vim.org> parents: 26238 diff changeset	927 && eval1(&curly_expr, &tv, NULL) == OK
936f77929f16 patch 8.2.3702: first key in dict is seen as curly expression and fails Bram Moolenaar <Bram@vim.org> parents: 26238 diff changeset	928 && *skipwhite(curly_expr) == '}')
936f77929f16 patch 8.2.3702: first key in dict is seen as curly expression and fails Bram Moolenaar <Bram@vim.org> parents: 26238 diff changeset	929 return NOTDONE;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	930
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	931 if (evaluate)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	932 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	933 d = dict_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	934 if (d == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	935 return FAIL;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	936 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	937 tvkey.v_type = VAR_UNKNOWN;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	938 tv.v_type = VAR_UNKNOWN;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	939
21148 667192c5938b patch 8.2.1125: Vim9: double quote can be a string or a comment Bram Moolenaar <Bram@vim.org> parents: 21118 diff changeset	940 arg = skipwhite_and_linebreak(arg + 1, evalarg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	941 while (arg != '}' && arg != NUL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	942 {
23072 4b398a229b0b patch 8.2.2082: Vim9: can still use the depricated #{} dict syntax Bram Moolenaar <Bram@vim.org> parents: 22940 diff changeset	943 int has_bracket = vim9script && **arg == '[';
22940 5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	944
23088 285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	945 if (literal)
22940 5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	946 {
23088 285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	947 if (get_literal_key_tv(arg, &tvkey) == FAIL)
22940 5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	948 goto failret;
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	949 }
23088 285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	950 else if (vim9script && !has_bracket)
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	951 {
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	952 tvkey.vval.v_string = get_literal_key(arg);
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	953 if (tvkey.vval.v_string == NULL)
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	954 goto failret;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	955 tvkey.v_type = VAR_STRING;
285cde4b8d0e patch 8.2.2090: Vim9: dict does not accept a key in quotes Bram Moolenaar <Bram@vim.org> parents: 23072 diff changeset	956 }
22940 5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	957 else
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	958 {
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	959 if (has_bracket)
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	960 arg = skipwhite(arg + 1);
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	961 if (eval1(arg, &tvkey, evalarg) == FAIL) // recursive!
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	962 goto failret;
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	963 if (has_bracket)
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	964 {
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	965 arg = skipwhite(arg);
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	966 if (**arg != ']')
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	967 {
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	968 emsg(_(e_missing_matching_bracket_after_dict_key));
23110 545ff3b4543c patch 8.2.2101: Vim9: memory leak when literal dict has an error Bram Moolenaar <Bram@vim.org> parents: 23088 diff changeset	969 clear_tv(&tvkey);
22940 5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	970 return FAIL;
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	971 }
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	972 ++*arg;
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	973 }
5b2f97d10a8c patch 8.2.2017: missing part of the dict change Bram Moolenaar <Bram@vim.org> parents: 22827 diff changeset	974 }
17368 6604ecb7a615 patch 8.1.1683: dictionary with string keys is longer than needed Bram Moolenaar <Bram@vim.org> parents: 17159 diff changeset	975
21556 963913d80284 patch 8.2.1328: no space allowed before comma in list Bram Moolenaar <Bram@vim.org> parents: 21552 diff changeset	976 // the colon should come right after the key, but this wasn't checked
21552 cbc570e66d11 patch 8.2.1326: Vim9: skipping over white space after list Bram Moolenaar <Bram@vim.org> parents: 21279 diff changeset	977 // previously, so only require it in Vim9 script.
cbc570e66d11 patch 8.2.1326: Vim9: skipping over white space after list Bram Moolenaar <Bram@vim.org> parents: 21279 diff changeset	978 if (!vim9script)
cbc570e66d11 patch 8.2.1326: Vim9: skipping over white space after list Bram Moolenaar <Bram@vim.org> parents: 21279 diff changeset	979 arg = skipwhite(arg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	980 if (**arg != ':')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	981 {
22625 0afa30d6dc72 patch 8.2.1861: Vim9: no specific error when parsing lambda fails Bram Moolenaar <Bram@vim.org> parents: 22474 diff changeset	982 if (skipwhite(arg) == ':')
23888 d95403445b6b patch 8.2.2486: Vim9: some errors for white space do not show context Bram Moolenaar <Bram@vim.org> parents: 23877 diff changeset	983 semsg(_(e_no_white_space_allowed_before_str_str), ":", *arg);
22625 0afa30d6dc72 patch 8.2.1861: Vim9: no specific error when parsing lambda fails Bram Moolenaar <Bram@vim.org> parents: 22474 diff changeset	984 else
31602 53c3df37a2b0 patch 9.0.1133: error message names do not match the items Bram Moolenaar <Bram@vim.org> parents: 31545 diff changeset	985 semsg(_(e_missing_colon_in_dictionary_str), *arg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	986 clear_tv(&tvkey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	987 goto failret;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	988 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	989 if (evaluate)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	990 {
23827 7e0d8f1cae7d patch 8.2.2455: Vim9: key type for literal dict and indexing is inconsistent Bram Moolenaar <Bram@vim.org> parents: 23703 diff changeset	991 if (tvkey.v_type == VAR_FLOAT)
23201 94608d7c3b55 patch 8.2.2146: Vim9: automatic conversion of number to string for dict key Bram Moolenaar <Bram@vim.org> parents: 23110 diff changeset	992 {
23827 7e0d8f1cae7d patch 8.2.2455: Vim9: key type for literal dict and indexing is inconsistent Bram Moolenaar <Bram@vim.org> parents: 23703 diff changeset	993 tvkey.vval.v_string = typval_tostring(&tvkey, TRUE);
7e0d8f1cae7d patch 8.2.2455: Vim9: key type for literal dict and indexing is inconsistent Bram Moolenaar <Bram@vim.org> parents: 23703 diff changeset	994 tvkey.v_type = VAR_STRING;
23201 94608d7c3b55 patch 8.2.2146: Vim9: automatic conversion of number to string for dict key Bram Moolenaar <Bram@vim.org> parents: 23110 diff changeset	995 }
15211 de63593896b3 patch 8.1.0615: get_tv function names are not consistent Bram Moolenaar <Bram@vim.org> parents: 15146 diff changeset	996 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	997 if (key == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	998 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	999 // "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	1000 clear_tv(&tvkey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1001 goto failret;
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 }
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1004 if (vim9script && (arg)[1] != NUL && !VIM_ISWHITE((arg)[1]))
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1005 {
23877 85cf06ddb2a8 patch 8.2.2480: Vim9: some errors for white space do not show context Bram Moolenaar <Bram@vim.org> parents: 23827 diff changeset	1006 semsg(_(e_white_space_required_after_str_str), ":", *arg);
21038 6ad5f0c99ee9 patch 8.2.1070: Vim9: leaking memory when lacking white space in dict Bram Moolenaar <Bram@vim.org> parents: 21034 diff changeset	1007 clear_tv(&tvkey);
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1008 goto failret;
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1009 }
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1010
21148 667192c5938b patch 8.2.1125: Vim9: double quote can be a string or a comment Bram Moolenaar <Bram@vim.org> parents: 21118 diff changeset	1011 arg = skipwhite_and_linebreak(arg + 1, evalarg);
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1012 if (eval1(arg, &tv, evalarg) == FAIL) // recursive!
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1013 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1014 if (evaluate)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1015 clear_tv(&tvkey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1016 goto failret;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1017 }
33933 aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1018 if (check_typval_is_value(&tv) == FAIL)
aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1019 {
aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1020 if (evaluate)
aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1021 {
aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1022 clear_tv(&tvkey);
aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1023 clear_tv(&tv);
aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1024 }
aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1025 goto failret;
aceaf677dd92 patch 9.0.2163: Vim9: type can be assigned to list/dict Christian Brabandt <cb@256bit.org> parents: 32872 diff changeset	1026 }
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1027 if (evaluate)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1028 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1029 item = dict_find(d, key, -1);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1030 if (item != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1031 {
31602 53c3df37a2b0 patch 9.0.1133: error message names do not match the items Bram Moolenaar <Bram@vim.org> parents: 31545 diff changeset	1032 semsg(_(e_duplicate_key_in_dictionary_str), key);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1033 clear_tv(&tvkey);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1034 clear_tv(&tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1035 goto failret;
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 item = dictitem_alloc(key);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1038 if (item != NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1039 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1040 item->di_tv = tv;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1041 item->di_tv.v_lock = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1042 if (dict_add(d, item) == FAIL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1043 dictitem_free(item);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1044 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1045 }
18201 2ec4ed3f5e12 patch 8.1.2095: leaking memory when getting item from dict Bram Moolenaar <Bram@vim.org> parents: 17905 diff changeset	1046 clear_tv(&tvkey);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1047
21556 963913d80284 patch 8.2.1328: no space allowed before comma in list Bram Moolenaar <Bram@vim.org> parents: 21552 diff changeset	1048 // the comma should come right after the value, but this wasn't checked
963913d80284 patch 8.2.1328: no space allowed before comma in list Bram Moolenaar <Bram@vim.org> parents: 21552 diff changeset	1049 // previously, so only require it in Vim9 script.
963913d80284 patch 8.2.1328: no space allowed before comma in list Bram Moolenaar <Bram@vim.org> parents: 21552 diff changeset	1050 if (!vim9script)
963913d80284 patch 8.2.1328: no space allowed before comma in list Bram Moolenaar <Bram@vim.org> parents: 21552 diff changeset	1051 arg = skipwhite(arg);
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1052 had_comma = **arg == ',';
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1053 if (had_comma)
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1054 {
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1055 if (vim9script && (arg)[1] != NUL && !VIM_ISWHITE((arg)[1]))
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1056 {
23877 85cf06ddb2a8 patch 8.2.2480: Vim9: some errors for white space do not show context Bram Moolenaar <Bram@vim.org> parents: 23827 diff changeset	1057 semsg(_(e_white_space_required_after_str_str), ",", *arg);
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1058 goto failret;
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1059 }
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1060 arg = skipwhite(arg + 1);
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1061 }
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1062
2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1063 // the "}" can be on the next line
21148 667192c5938b patch 8.2.1125: Vim9: double quote can be a string or a comment Bram Moolenaar <Bram@vim.org> parents: 21118 diff changeset	1064 arg = skipwhite_and_linebreak(arg, evalarg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1065 if (**arg == '}')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1066 break;
21034 2f8b0812819f patch 8.2.1068: Vim9: no line break allowed inside a dict Bram Moolenaar <Bram@vim.org> parents: 20992 diff changeset	1067 if (!had_comma)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1068 {
22625 0afa30d6dc72 patch 8.2.1861: Vim9: no specific error when parsing lambda fails Bram Moolenaar <Bram@vim.org> parents: 22474 diff changeset	1069 if (**arg == ',')
23888 d95403445b6b patch 8.2.2486: Vim9: some errors for white space do not show context Bram Moolenaar <Bram@vim.org> parents: 23877 diff changeset	1070 semsg(_(e_no_white_space_allowed_before_str_str), ",", *arg);
22625 0afa30d6dc72 patch 8.2.1861: Vim9: no specific error when parsing lambda fails Bram Moolenaar <Bram@vim.org> parents: 22474 diff changeset	1071 else
31602 53c3df37a2b0 patch 9.0.1133: error message names do not match the items Bram Moolenaar <Bram@vim.org> parents: 31545 diff changeset	1072 semsg(_(e_missing_comma_in_dictionary_str), *arg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1073 goto failret;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1074 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1075 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1076
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1077 if (**arg != '}')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1078 {
23703 6bfb302d8392 patch 8.2.2393: Vim9: error message when script line starts with "[{" Bram Moolenaar <Bram@vim.org> parents: 23458 diff changeset	1079 if (evalarg != NULL)
31602 53c3df37a2b0 patch 9.0.1133: error message names do not match the items Bram Moolenaar <Bram@vim.org> parents: 31545 diff changeset	1080 semsg(_(e_missing_dict_end_str), *arg);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1081 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	1082 if (d != NULL)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1083 dict_free(d);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1084 return FAIL;
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
22681 674ba3200e1f patch 8.2.1889: Vim9: errornous error for missing white space after {} Bram Moolenaar <Bram@vim.org> parents: 22625 diff changeset	1087 arg = arg + 1;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1088 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	1089 rettv_dict_set(rettv, d);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1090
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1091 return OK;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1092 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1093
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1094 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1095 * 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	1096 * 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	1097 * When "action" is "force" then a duplicate key is overwritten.
31166 a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1098 * When "action" is "move" then move items instead of copying.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1099 * Otherwise duplicate keys are ignored ("action" is "keep").
31166 a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1100 * "func_name" is used for reporting where an error occurred.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1101 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1102 void
25326 cfbf40f749b0 patch 8.2.3200: Vim9: hard to guess where a type error is given Bram Moolenaar <Bram@vim.org> parents: 25302 diff changeset	1103 dict_extend(dict_T d1, dict_T d2, char_u action, char func_name)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1104 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1105 dictitem_T *di1;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1106 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1107 char_u arg_errmsg = (char_u )N_("extend() argument");
23458 d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1108 type_T *type;
d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1109
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1110 if (check_hashtab_frozen(&d1->dv_hashtab, "extend"))
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1111 return;
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1112
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1113 if (*action == 'm')
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1114 {
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1115 if (check_hashtab_frozen(&d2->dv_hashtab, "extend"))
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1116 return;
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1117 hash_lock(&d2->dv_hashtab); // don't rehash on hash_remove()
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1118 }
684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1119
23458 d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1120 if (d1->dv_type != NULL && d1->dv_type->tt_member != NULL)
d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1121 type = d1->dv_type->tt_member;
d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1122 else
d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1123 type = NULL;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1124
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1125 todo = (int)d2->dv_hashtab.ht_used;
32118 04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	1126 hashitem_T *hi2;
04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	1127 FOR_ALL_HASHTAB_ITEMS(&d2->dv_hashtab, hi2, todo)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1128 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1129 if (!HASHITEM_EMPTY(hi2))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1130 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1131 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1132 di1 = dict_find(d1, hi2->hi_key, -1);
31002 a09404dad917 patch 9.0.0836: wrong error when using extend() with funcref Bram Moolenaar <Bram@vim.org> parents: 30986 diff changeset	1133 // Check the key to be valid when adding to any scope.
a09404dad917 patch 9.0.0836: wrong error when using extend() with funcref Bram Moolenaar <Bram@vim.org> parents: 30986 diff changeset	1134 if (d1->dv_scope != 0 && !valid_varname(hi2->hi_key, -1, TRUE))
a09404dad917 patch 9.0.0836: wrong error when using extend() with funcref Bram Moolenaar <Bram@vim.org> parents: 30986 diff changeset	1135 break;
23458 d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1136
d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1137 if (type != NULL
25326 cfbf40f749b0 patch 8.2.3200: Vim9: hard to guess where a type error is given Bram Moolenaar <Bram@vim.org> parents: 25302 diff changeset	1138 && check_typval_arg_type(type, &HI2DI(hi2)->di_tv,
cfbf40f749b0 patch 8.2.3200: Vim9: hard to guess where a type error is given Bram Moolenaar <Bram@vim.org> parents: 25302 diff changeset	1139 func_name, 0) == FAIL)
23458 d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1140 break;
d2b1269c2c68 patch 8.2.2272: Vim9: extend() can violate the type of a variable Bram Moolenaar <Bram@vim.org> parents: 23233 diff changeset	1141
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1142 if (di1 == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1143 {
31166 a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1144 if (*action == 'm')
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1145 {
31184 6b218e595d9f patch 9.0.0926: Coverity warns for not using return value of dict_add() Bram Moolenaar <Bram@vim.org> parents: 31166 diff changeset	1146 // Cheap way to move a dict item from "d2" to "d1".
6b218e595d9f patch 9.0.0926: Coverity warns for not using return value of dict_add() Bram Moolenaar <Bram@vim.org> parents: 31166 diff changeset	1147 // If dict_add() fails then "d2" won't be empty.
31166 a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1148 di1 = HI2DI(hi2);
31184 6b218e595d9f patch 9.0.0926: Coverity warns for not using return value of dict_add() Bram Moolenaar <Bram@vim.org> parents: 31166 diff changeset	1149 if (dict_add(d1, di1) == OK)
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1150 hash_remove(&d2->dv_hashtab, hi2, "extend");
31166 a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1151 }
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1152 else
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1153 {
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1154 di1 = dictitem_copy(HI2DI(hi2));
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1155 if (di1 != NULL && dict_add(d1, di1) == FAIL)
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1156 dictitem_free(di1);
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1157 }
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1158 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1159 else if (*action == 'e')
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1160 {
26952 b34ddbca305c patch 8.2.4005: error messages are spread out Bram Moolenaar <Bram@vim.org> parents: 26937 diff changeset	1161 semsg(_(e_key_already_exists_str), hi2->hi_key);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1162 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1163 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1164 else if (*action == 'f' && HI2DI(hi2) != di1)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1165 {
22298 07e48ee8c3bb patch 8.2.1698: cannot lock a variable in legacy Vim script like in Vim9 Bram Moolenaar <Bram@vim.org> parents: 21909 diff changeset	1166 if (value_check_lock(di1->di_tv.v_lock, arg_errmsg, TRUE)
15780 5b6c3c7feba8 patch 8.1.0897: can modify a:000 when using a reference Bram Moolenaar <Bram@vim.org> parents: 15470 diff changeset	1167 \|\| 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	1168 break;
31002 a09404dad917 patch 9.0.0836: wrong error when using extend() with funcref Bram Moolenaar <Bram@vim.org> parents: 30986 diff changeset	1169 // Disallow replacing a builtin function.
24764 3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	1170 if (dict_wrong_func_name(d1, &HI2DI(hi2)->di_tv, hi2->hi_key))
3907cf9be745 patch 8.2.2920: still a way to shadow a builtin function Bram Moolenaar <Bram@vim.org> parents: 23917 diff changeset	1171 break;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1172 clear_tv(&di1->di_tv);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1173 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	1174 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1175 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1176 }
31166 a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1177
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1178 if (*action == 'm')
a86ee6c0309e patch 9.0.0917: the WinScrolled autocommand event is not enough Bram Moolenaar <Bram@vim.org> parents: 31002 diff changeset	1179 hash_unlock(&d2->dv_hashtab);
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1180 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1181
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1182 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1183 * 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	1184 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1185 dictitem_T *
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1186 dict_lookup(hashitem_T *hi)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1187 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1188 return HI2DI(hi);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1189 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1190
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1191 /*
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1192 * 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	1193 */
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1194 int
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1195 dict_equal(
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1196 dict_T *d1,
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1197 dict_T *d2,
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1198 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	1199 int recursive) // TRUE when used recursively
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1200 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1201 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1202 dictitem_T *item2;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1203 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1204
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1205 if (d1 == d2)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1206 return TRUE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1207 if (dict_len(d1) != dict_len(d2))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1208 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	1209 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	1210 // 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	1211 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	1212 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	1213 return FALSE;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1214
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1215 todo = (int)d1->dv_hashtab.ht_used;
32118 04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	1216 FOR_ALL_HASHTAB_ITEMS(&d1->dv_hashtab, hi, todo)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1217 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1218 if (!HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1219 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1220 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	1221 if (item2 == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1222 return FALSE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1223 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	1224 return FALSE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1225 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1226 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1227 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1228 return TRUE;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1229 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1230
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1231 /*
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1232 * Count the number of times item "needle" occurs in Dict "d". Case is ignored
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1233 * if "ic" is TRUE.
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1234 */
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1235 long
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1236 dict_count(dict_T d, typval_T needle, int ic)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1237 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1238 int todo;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1239 hashitem_T *hi;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1240 long n = 0;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1241
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1242 if (d == NULL)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1243 return 0;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1244
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1245 todo = (int)d->dv_hashtab.ht_used;
32118 04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	1246 FOR_ALL_HASHTAB_ITEMS(&d->dv_hashtab, hi, todo)
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1247 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1248 if (!HASHITEM_EMPTY(hi))
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1249 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1250 --todo;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1251 if (tv_equal(&HI2DI(hi)->di_tv, needle, ic, FALSE))
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1252 ++n;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1253 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1254 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1255
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1256 return n;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1257 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1258
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1259 /*
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1260 * extend() a Dict. Append Dict argvars[1] to Dict argvars[0] and return the
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1261 * resulting Dict in "rettv". "is_new" is TRUE for extendnew().
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1262 */
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1263 void
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1264 dict_extend_func(
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1265 typval_T *argvars,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1266 type_T *type,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1267 char *func_name,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1268 char_u *arg_errmsg,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1269 int is_new,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1270 typval_T *rettv)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1271 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1272 dict_T d1, d2;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1273 char_u *action;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1274 int i;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1275
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1276 d1 = argvars[0].vval.v_dict;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1277 if (d1 == NULL)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1278 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1279 emsg(_(e_cannot_extend_null_dict));
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1280 return;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1281 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1282 d2 = argvars[1].vval.v_dict;
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1283 if (d2 == NULL)
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1284 return;
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1285
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1286 if (!is_new && value_check_lock(d1->dv_lock, arg_errmsg, TRUE))
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1287 return;
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1288
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1289 if (is_new)
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1290 {
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1291 d1 = dict_copy(d1, FALSE, TRUE, get_copyID());
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1292 if (d1 == NULL)
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1293 return;
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1294 }
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1295
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1296 // Check the third argument.
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1297 if (argvars[2].v_type != VAR_UNKNOWN)
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1298 {
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1299 static char *(av[]) = {"keep", "force", "error"};
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1300
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1301 action = tv_get_string_chk(&argvars[2]);
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1302 if (action == NULL)
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1303 return;
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1304 for (i = 0; i < 3; ++i)
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1305 if (STRCMP(action, av[i]) == 0)
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1306 break;
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1307 if (i == 3)
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1308 {
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1309 semsg(_(e_invalid_argument_str), action);
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1310 return;
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1311 }
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1312 }
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1313 else
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1314 action = (char_u *)"force";
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1315
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1316 if (type != NULL && check_typval_arg_type(type, &argvars[1],
32170 5848a0867b26 patch 9.0.1416: crash when collection is modified when using filter() Bram Moolenaar <Bram@vim.org> parents: 32118 diff changeset	1317 func_name, 2) == FAIL)
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1318 return;
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1319 dict_extend(d1, d2, action, func_name);
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1320
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1321 if (is_new)
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1322 {
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1323 rettv->v_type = VAR_DICT;
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1324 rettv->vval.v_dict = d1;
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1325 rettv->v_lock = FALSE;
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1326 }
31545 c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1327 else
c8d4fced1f94 patch 9.0.1105: code is indented too much Bram Moolenaar <Bram@vim.org> parents: 31231 diff changeset	1328 copy_tv(&argvars[0], rettv);
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1329 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1330
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1331 /*
34126 da670b1549b3 patch 9.1.0027: Vim is missing a foreach() func Christian Brabandt <cb@256bit.org> parents: 33933 diff changeset	1332 * Implementation of map(), filter(), foreach() for a Dict. Apply "expr" to
da670b1549b3 patch 9.1.0027: Vim is missing a foreach() func Christian Brabandt <cb@256bit.org> parents: 33933 diff changeset	1333 * every item in Dict "d" and return the result in "rettv".
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1334 */
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1335 void
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1336 dict_filter_map(
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1337 dict_T *d,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1338 filtermap_T filtermap,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1339 type_T *argtype,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1340 char *func_name,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1341 char_u *arg_errmsg,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1342 typval_T *expr,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1343 typval_T *rettv)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1344 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1345 dict_T *d_ret = NULL;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1346 hashtab_T *ht;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1347 hashitem_T *hi;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1348 dictitem_T *di;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1349 int todo;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1350 int rem;
30566 b3de17181c19 patch 9.0.0618: calling function for reduce() has too much overhead Bram Moolenaar <Bram@vim.org> parents: 30310 diff changeset	1351 typval_T newtv;
b3de17181c19 patch 9.0.0618: calling function for reduce() has too much overhead Bram Moolenaar <Bram@vim.org> parents: 30310 diff changeset	1352 funccall_T *fc;
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1353
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1354 if (filtermap == FILTERMAP_MAPNEW)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1355 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1356 rettv->v_type = VAR_DICT;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1357 rettv->vval.v_dict = NULL;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1358 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1359 if (d == NULL
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1360 \|\| (filtermap == FILTERMAP_FILTER
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1361 && value_check_lock(d->dv_lock, arg_errmsg, TRUE)))
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1362 return;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1363
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1364 if (filtermap == FILTERMAP_MAPNEW)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1365 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1366 if (rettv_dict_alloc(rettv) == FAIL)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1367 return;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1368 d_ret = rettv->vval.v_dict;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1369 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1370
32256 252b06c87796 patch 9.0.1459: typo in name of type Bram Moolenaar <Bram@vim.org> parents: 32170 diff changeset	1371 // Create one funccall_T for all eval_expr_typval() calls.
30566 b3de17181c19 patch 9.0.0618: calling function for reduce() has too much overhead Bram Moolenaar <Bram@vim.org> parents: 30310 diff changeset	1372 fc = eval_expr_get_funccal(expr, &newtv);
b3de17181c19 patch 9.0.0618: calling function for reduce() has too much overhead Bram Moolenaar <Bram@vim.org> parents: 30310 diff changeset	1373
32170 5848a0867b26 patch 9.0.1416: crash when collection is modified when using filter() Bram Moolenaar <Bram@vim.org> parents: 32118 diff changeset	1374 int prev_lock = d->dv_lock;
5848a0867b26 patch 9.0.1416: crash when collection is modified when using filter() Bram Moolenaar <Bram@vim.org> parents: 32118 diff changeset	1375 if (d->dv_lock == 0)
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1376 d->dv_lock = VAR_LOCKED;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1377 ht = &d->dv_hashtab;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1378 hash_lock(ht);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1379 todo = (int)ht->ht_used;
32118 04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	1380 FOR_ALL_HASHTAB_ITEMS(ht, hi, todo)
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1381 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1382 if (!HASHITEM_EMPTY(hi))
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1383 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1384 int r;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1385
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1386 --todo;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1387 di = HI2DI(hi);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1388 if (filtermap == FILTERMAP_MAP
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1389 && (value_check_lock(di->di_tv.v_lock,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1390 arg_errmsg, TRUE)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1391 \|\| var_check_ro(di->di_flags,
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1392 arg_errmsg, TRUE)))
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1393 break;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1394 set_vim_var_string(VV_KEY, di->di_key, -1);
30566 b3de17181c19 patch 9.0.0618: calling function for reduce() has too much overhead Bram Moolenaar <Bram@vim.org> parents: 30310 diff changeset	1395 r = filter_map_one(&di->di_tv, expr, filtermap, fc, &newtv, &rem);
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1396 clear_tv(get_vim_var_tv(VV_KEY));
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1397 if (r == FAIL \|\| did_emsg)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1398 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1399 clear_tv(&newtv);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1400 break;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1401 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1402 if (filtermap == FILTERMAP_MAP)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1403 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1404 if (argtype != NULL && check_typval_arg_type(
26935 ccb9be1cdd71 patch 8.2.3996: Vim9: type checking lacks information about declared type Bram Moolenaar <Bram@vim.org> parents: 26883 diff changeset	1405 argtype->tt_member, &newtv, func_name, 0) == FAIL)
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1406 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1407 clear_tv(&newtv);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1408 break;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1409 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1410 // map(): replace the dict item value
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1411 clear_tv(&di->di_tv);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1412 newtv.v_lock = 0;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1413 di->di_tv = newtv;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1414 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1415 else if (filtermap == FILTERMAP_MAPNEW)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1416 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1417 // mapnew(): add the item value to the new dict
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1418 r = dict_add_tv(d_ret, (char *)di->di_key, &newtv);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1419 clear_tv(&newtv);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1420 if (r == FAIL)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1421 break;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1422 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1423 else if (filtermap == FILTERMAP_FILTER && rem)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1424 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1425 // filter(false): remove the item from the dict
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1426 if (var_check_fixed(di->di_flags, arg_errmsg, TRUE)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1427 \|\| var_check_ro(di->di_flags, arg_errmsg, TRUE))
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1428 break;
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1429 dictitem_remove(d, di, "filter");
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1430 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1431 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1432 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1433 hash_unlock(ht);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1434 d->dv_lock = prev_lock;
30566 b3de17181c19 patch 9.0.0618: calling function for reduce() has too much overhead Bram Moolenaar <Bram@vim.org> parents: 30310 diff changeset	1435 if (fc != NULL)
b3de17181c19 patch 9.0.0618: calling function for reduce() has too much overhead Bram Moolenaar <Bram@vim.org> parents: 30310 diff changeset	1436 remove_funccal();
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1437 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1438
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1439 /*
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1440 * "remove({dict})" function
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1441 */
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1442 void
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1443 dict_remove(typval_T argvars, typval_T rettv, char_u *arg_errmsg)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1444 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1445 dict_T *d;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1446 char_u *key;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1447 dictitem_T *di;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1448
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1449 if (argvars[2].v_type != VAR_UNKNOWN)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1450 {
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1451 semsg(_(e_too_many_arguments_for_function_str), "remove()");
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1452 return;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1453 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1454
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1455 d = argvars[0].vval.v_dict;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1456 if (d == NULL \|\| value_check_lock(d->dv_lock, arg_errmsg, TRUE))
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1457 return;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1458
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1459 key = tv_get_string_chk(&argvars[1]);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1460 if (key == NULL)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1461 return;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1462
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1463 di = dict_find(d, key, -1);
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1464 if (di == NULL)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1465 {
31602 53c3df37a2b0 patch 9.0.1133: error message names do not match the items Bram Moolenaar <Bram@vim.org> parents: 31545 diff changeset	1466 semsg(_(e_key_not_present_in_dictionary_str), key);
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1467 return;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1468 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1469
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1470 if (var_check_fixed(di->di_flags, arg_errmsg, TRUE)
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1471 \|\| var_check_ro(di->di_flags, arg_errmsg, TRUE))
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1472 return;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1473
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1474 *rettv = di->di_tv;
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1475 init_tv(&di->di_tv);
31231 684e6dfa2fba patch 9.0.0949: crash when unletting a variable while listing variables Bram Moolenaar <Bram@vim.org> parents: 31184 diff changeset	1476 dictitem_remove(d, di, "remove()");
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1477 }
2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1478
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1479 typedef enum {
34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1480 DICT2LIST_KEYS,
34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1481 DICT2LIST_VALUES,
34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1482 DICT2LIST_ITEMS,
34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1483 } dict2list_T;
34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1484
26684 2126feddeda6 patch 8.2.3871: list.c contains code for dict and blob Bram Moolenaar <Bram@vim.org> parents: 26602 diff changeset	1485 /*
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1486 * Turn a dict into a list.
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1487 */
17789 0f7ae8010787 patch 8.1.1891: functions used in one file are global Bram Moolenaar <Bram@vim.org> parents: 17655 diff changeset	1488 static void
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1489 dict2list(typval_T argvars, typval_T rettv, dict2list_T what)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1490 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1491 list_T *l2;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1492 dictitem_T *di;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1493 hashitem_T *hi;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1494 listitem_T *li;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1495 dict_T *d;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1496 int todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1497
29138 175eacde28b8 patch 8.2.5089: some functions return a different value on failure Bram Moolenaar <Bram@vim.org> parents: 28813 diff changeset	1498 if (rettv_list_alloc(rettv) == FAIL)
175eacde28b8 patch 8.2.5089: some functions return a different value on failure Bram Moolenaar <Bram@vim.org> parents: 28813 diff changeset	1499 return;
175eacde28b8 patch 8.2.5089: some functions return a different value on failure Bram Moolenaar <Bram@vim.org> parents: 28813 diff changeset	1500
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1501 if ((what == DICT2LIST_ITEMS
29986 0ad8b72af148 patch 9.0.0331: cannot use items() on a string Bram Moolenaar <Bram@vim.org> parents: 29978 diff changeset	1502 ? check_for_string_or_list_or_dict_arg(argvars, 0)
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1503 : check_for_dict_arg(argvars, 0)) == FAIL)
25384 e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25338 diff changeset	1504 return;
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25338 diff changeset	1505
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1506 d = argvars[0].vval.v_dict;
34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1507 if (d == NULL)
32872 7a1a9ce831c3 patch 9.0.1745: Missing test coverage for blockwise Visual highlight Christian Brabandt <cb@256bit.org> parents: 32256 diff changeset	1508 // NULL dict behaves like an empty dict
25597 0fdacd8f0cf3 patch 8.2.3335: Vim9: not enough tests run with Vim9 Bram Moolenaar <Bram@vim.org> parents: 25567 diff changeset	1509 return;
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1510
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1511 todo = (int)d->dv_hashtab.ht_used;
32118 04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	1512 FOR_ALL_HASHTAB_ITEMS(&d->dv_hashtab, hi, todo)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1513 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1514 if (!HASHITEM_EMPTY(hi))
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1515 {
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1516 --todo;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1517 di = HI2DI(hi);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1518
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1519 li = listitem_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1520 if (li == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1521 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1522 list_append(rettv->vval.v_list, li);
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1523
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1524 if (what == DICT2LIST_KEYS)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1525 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1526 // keys()
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1527 li->li_tv.v_type = VAR_STRING;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1528 li->li_tv.v_lock = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1529 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	1530 }
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1531 else if (what == DICT2LIST_VALUES)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1532 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1533 // values()
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1534 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	1535 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1536 else
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1537 {
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1538 // items()
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1539 l2 = list_alloc();
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1540 li->li_tv.v_type = VAR_LIST;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1541 li->li_tv.v_lock = 0;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1542 li->li_tv.vval.v_list = l2;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1543 if (l2 == NULL)
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1544 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1545 ++l2->lv_refcount;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1546
29986 0ad8b72af148 patch 9.0.0331: cannot use items() on a string Bram Moolenaar <Bram@vim.org> parents: 29978 diff changeset	1547 if (list_append_string(l2, di->di_key, -1) == FAIL
0ad8b72af148 patch 9.0.0331: cannot use items() on a string Bram Moolenaar <Bram@vim.org> parents: 29978 diff changeset	1548 \|\| list_append_tv(l2, &di->di_tv) == FAIL)
9556 afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1549 break;
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1550 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1551 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1552 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1553 }
afaff1d283d3 commit https://github.com/vim/vim/commit/cd52459c387785796713826c63174cdeed295dd4 Christian Brabandt <cb@256bit.org> parents: diff changeset	1554
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1555 /*
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1556 * "items(dict)" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1557 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1558 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1559 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	1560 {
29986 0ad8b72af148 patch 9.0.0331: cannot use items() on a string Bram Moolenaar <Bram@vim.org> parents: 29978 diff changeset	1561 if (argvars[0].v_type == VAR_STRING)
0ad8b72af148 patch 9.0.0331: cannot use items() on a string Bram Moolenaar <Bram@vim.org> parents: 29978 diff changeset	1562 string2items(argvars, rettv);
0ad8b72af148 patch 9.0.0331: cannot use items() on a string Bram Moolenaar <Bram@vim.org> parents: 29978 diff changeset	1563 else if (argvars[0].v_type == VAR_LIST)
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1564 list2items(argvars, rettv);
34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1565 else
34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1566 dict2list(argvars, rettv, DICT2LIST_ITEMS);
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1567 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1568
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1569 /*
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1570 * "keys()" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1571 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1572 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1573 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	1574 {
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1575 dict2list(argvars, rettv, DICT2LIST_KEYS);
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1576 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1577
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1578 /*
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1579 * "values(dict)" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1580 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1581 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1582 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	1583 {
29978 34151eb6ae25 patch 9.0.0327: items() does not work on a list Bram Moolenaar <Bram@vim.org> parents: 29442 diff changeset	1584 dict2list(argvars, rettv, DICT2LIST_VALUES);
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1585 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1586
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1587 /*
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1588 * 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	1589 */
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1590 void
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1591 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	1592 {
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1593 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	1594 hashitem_T *hi;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1595
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1596 // Set readonly
32118 04d9dff67d99 patch 9.0.1390: FOR_ALL_ macros are defined in an unexpected file Bram Moolenaar <Bram@vim.org> parents: 31667 diff changeset	1597 FOR_ALL_HASHTAB_ITEMS(&di->dv_hashtab, hi, todo)
13037 6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1598 {
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1599 if (HASHITEM_EMPTY(hi))
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1600 continue;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1601 --todo;
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1602 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	1603 }
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1604 }
6e81a68d63a1 patch 8.0.1394: cannot intercept a yank command Christian Brabandt <cb@256bit.org> parents: 11418 diff changeset	1605
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1606 /*
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1607 * "has_key()" function
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1608 */
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1609 void
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1610 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	1611 {
25384 e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25338 diff changeset	1612 if (in_vim9script()
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25338 diff changeset	1613 && (check_for_dict_arg(argvars, 0) == FAIL
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25338 diff changeset	1614 \|\| check_for_string_or_number_arg(argvars, 1) == FAIL))
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25338 diff changeset	1615 return;
e8e2c4d33b9b patch 8.2.3229: Vim9: runtime and compile time type checks are not the same Bram Moolenaar <Bram@vim.org> parents: 25338 diff changeset	1616
29994 86eb4aba16c3 patch 9.0.0335: checks for Dictionary argument often give a vague error Bram Moolenaar <Bram@vim.org> parents: 29986 diff changeset	1617 if (check_for_dict_arg(argvars, 0) == FAIL)
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1618 return;
29994 86eb4aba16c3 patch 9.0.0335: checks for Dictionary argument often give a vague error Bram Moolenaar <Bram@vim.org> parents: 29986 diff changeset	1619
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1620 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	1621 return;
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1622
28315 62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	1623 rettv->vval.v_number = dict_has_key(argvars[0].vval.v_dict,
62cc3b60493b patch 8.2.4683: verbose check with dict_find() to see if a key is present Bram Moolenaar <Bram@vim.org> parents: 27549 diff changeset	1624 (char *)tv_get_string(&argvars[1]));
17530 ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1625 }
ef23ec1eee54 patch 8.1.1763: evalfunc.c is still too big Bram Moolenaar <Bram@vim.org> parents: 17368 diff changeset	1626
18777 3a68dc2a1bc1 patch 8.1.2378: using old C style comments Bram Moolenaar <Bram@vim.org> parents: 18201 diff changeset	1627 #endif // defined(FEAT_EVAL)

Mercurial > vim

annotate src/dict.c @ 34686:83875247fbc0 v9.1.0224