aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-23 08:44:20 -04:00
Code Activity

patch 8.1.1683: dictionary with string keys is longer than needed

Browse Source 
Problem:    Dictionary with string keys is longer than needed.
Solution:   Use *{key: val} for literaly keys.
This commit is contained in:
Bram Moolenaar
2019-07-13 22:46:10 +02:00
parent 809ce4d317
commit d5abb4c877
15 changed files with 396 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/dict.c
View File

@@ -708,12 +708,34 @@ dict2string(typval_T *tv, int copyID, int restore_copyID)
return (char_u *)ga.ga_data;
}
/*
* Get the key for *{key: val} into "tv" and advance "arg".
* Return FAIL when there is no valid key.
*/
static int
get_literal_key(char_u **arg, typval_T *tv)
{
char_u *p;
if (!ASCII_ISALNUM(**arg) && **arg != '_' && **arg != '-')
return FAIL;
for (p = *arg; ASCII_ISALNUM(*p) || *p == '_' || *p == '-'; ++p)
;
tv->v_type = VAR_STRING;
tv->vval.v_string = vim_strnsave(*arg, (int)(p - *arg));
*arg = skipwhite(p);
return OK;
}
/*
* Allocate a variable for a Dictionary and fill it from "*arg".
* "literal" is TRUE for *{key: val}
* Return OK or FAIL. Returns NOTDONE for {expr}.
*/
int
dict_get_tv(char_u **arg, typval_T *rettv, int evaluate)
dict_get_tv(char_u **arg, typval_T *rettv, int evaluate, int literal)
{
dict_T *d = NULL;
typval_T tvkey;
@@ -750,8 +772,11 @@ dict_get_tv(char_u **arg, typval_T *rettv, int evaluate)
*arg = skipwhite(*arg + 1);
while (**arg != '}' && **arg != NUL)
{
if (eval1(arg, &tvkey, evaluate) == FAIL) /* recursive! */
if ((literal
? get_literal_key(arg, &tvkey)
: eval1(arg, &tvkey, evaluate)) == FAIL) // recursive!
goto failret;
if (**arg != ':')
{
semsg(_("E720: Missing colon in Dictionary: %s"), *arg);