aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 7.4.1707

Browse Source 
Problem:    Cannot use empty dictionary key, even though it can be useful.
Solution:   Allow using an empty dictionary key.
This commit is contained in:
Bram Moolenaar
2016-04-03 22:44:36 +02:00
parent e185c1efba
commit 0921ecff1c
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval.c
View File

@@ -2782,11 +2782,9 @@ get_lval(
if (len == -1)
{
/* "[key]": get key from "var1" */
key = get_tv_string(&var1); /* is number or string */
if (*key == NUL)
key = get_tv_string_chk(&var1); /* is number or string */
if (key == NULL)
{
if (!quiet)
EMSG(_(e_emptykey));
clear_tv(&var1);
return NULL;
}
@@ -5623,11 +5621,9 @@ eval_index(
if (len == -1)
{
key = get_tv_string(&var1);
if (*key == NUL)
key = get_tv_string_chk(&var1);
if (key == NULL)
{
if (verbose)
EMSG(_(e_emptykey));
clear_tv(&var1);
return FAIL;
}
@@ -7754,11 +7750,9 @@ get_dict_tv(char_u **arg, typval_T *rettv, int evaluate)
if (evaluate)
{
key = get_tv_string_buf_chk(&tvkey, buf);
if (key == NULL || *key == NUL)
if (key == NULL)
{
/* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
if (key != NULL)
EMSG(_(e_emptykey));
clear_tv(&tvkey);
goto failret;
}