summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-08-01 14:06:38 +0200
committerBram Moolenaar <Bram@vim.org>2020-08-01 14:06:38 +0200
commit586268721dd5d6e50903a8a457f02e0dda901856 (patch)
treebc6334d9899191937f12bedaaf0e140f5e7c7e93
parentaf50e899e70ee34d5356846afbea7d75701cb22b (diff)
downloadvim-git-586268721dd5d6e50903a8a457f02e0dda901856.tar.gz
patch 8.2.1337: Vim9: cannot use empty key in dict assignmentv8.2.1337
Problem: Vim9: cannot use empty key in dict assignment. Solution: Allow empty key. (closes #6591)
-rw-r--r--src/testdir/test_vim9_script.vim12
-rw-r--r--src/version.c2
-rw-r--r--src/vim9execute.c7
3 files changed, 8 insertions, 13 deletions
diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim
index 405d4877a..ec63c6f11 100644
--- a/src/testdir/test_vim9_script.vim
+++ b/src/testdir/test_vim9_script.vim
@@ -244,7 +244,10 @@ def Test_assignment_dict()
# overwrite
dict3['key'] = 'another'
- call CheckDefExecFailure(['let dd = {}', 'dd[""] = 6'], 'E713:')
+ # empty key can be used
+ let dd = {}
+ dd[""] = 6
+ assert_equal({'': 6}, dd)
# type becomes dict<any>
let somedict = rand() > 0 ? #{a: 1, b: 2} : #{a: 'a', b: 'b'}
@@ -784,13 +787,6 @@ def Test_try_catch()
assert_equal(300, n)
try
- d[''] = 3
- catch /E713:/
- n = 311
- endtry
- assert_equal(311, n)
-
- try
unlet g:does_not_exist
catch /E108:/
n = 322
diff --git a/src/version.c b/src/version.c
index bf22a76d9..661875a27 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1337,
+/**/
1336,
/**/
1335,
diff --git a/src/vim9execute.c b/src/vim9execute.c
index 9bfec3af1..de29988be 100644
--- a/src/vim9execute.c
+++ b/src/vim9execute.c
@@ -1422,11 +1422,8 @@ call_def_function(
dict_T *dict = tv_dict->vval.v_dict;
dictitem_T *di;
- if (key == NULL || *key == NUL)
- {
- emsg(_(e_emptykey));
- goto on_error;
- }
+ if (key == NULL)
+ key = (char_u *)"";
tv = STACK_TV_BOT(-3);
di = dict_find(dict, key, -1);
if (di != NULL)