aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/eval.c
diff options
context:
space:
mode:
authorMichael Ennen <mike.ennen@gmail.com>2016-11-24 23:45:05 -0700
committerMichael Ennen <mike.ennen@gmail.com>2016-11-25 18:23:11 -0700
commit8f84c1da83a2ef0912325f48b23637c706f3f2f0 (patch)
treec6b1eda7b44aed43e466596795f90fa7b8fa8d22 /src/nvim/eval.c
parent5f0260808cf3712718555ee177476b8aefd78280 (diff)
downloadrneovim-8f84c1da83a2ef0912325f48b23637c706f3f2f0.tar.gz
rneovim-8f84c1da83a2ef0912325f48b23637c706f3f2f0.tar.bz2
rneovim-8f84c1da83a2ef0912325f48b23637c706f3f2f0.zip
vim-patch:7.4.1707
Problem: Cannot use empty dictionary key, even though it can be useful. Solution: Allow using an empty dictionary key. https://github.com/vim/vim/commit/0921ecff1c5a74541bad6c073e8ade32247403d8
Diffstat (limited to 'src/nvim/eval.c')
-rw-r--r--src/nvim/eval.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 750ef4f94f..d7188290f2 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2145,11 +2145,9 @@ get_lval (
if (lp->ll_tv->v_type == VAR_DICT) {
if (len == -1) {
- /* "[key]": get key from "var1" */
- key = get_tv_string(&var1); /* is number or string */
- if (*key == NUL) {
- if (!quiet)
- EMSG(_(e_emptykey));
+ // "[key]": get key from "var1"
+ key = get_tv_string_chk(&var1); // is number or string
+ if (key == NULL) {
clear_tv(&var1);
return NULL;
}
@@ -4600,10 +4598,8 @@ eval_index (
dictitem_T *item;
if (len == -1) {
- key = get_tv_string(&var1);
- if (*key == NUL) {
- if (verbose)
- EMSG(_(e_emptykey));
+ key = get_tv_string_chk(&var1);
+ if (key == NULL) {
clear_tv(&var1);
return FAIL;
}
@@ -6587,10 +6583,8 @@ static int 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) {
- /* "key" is NULL when get_tv_string_buf_chk() gave an errmsg */
- if (key != NULL)
- EMSG(_(e_emptykey));
+ if (key == NULL) {
+ // "key" is NULL when get_tv_string_buf_chk() gave an errmsg
clear_tv(&tvkey);
goto failret;
}