patch 8.2.2090: Vim9: dict does not accept a key in quotes
Problem: Vim9: dict does not accept a key in quotes.
Solution: Recognize a key in single or double quotes.
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 4b8a8ad..2cd4b52 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -3024,26 +3024,11 @@
if (**arg == '}')
break;
- // {name: value} uses "name" as a literal key and
- // {[expr]: value} uses an evaluated key.
- if (**arg != '[')
- {
- char_u *end = skip_literal_key(*arg);
-
- if (end == *arg)
- {
- semsg(_(e_invalid_key_str), *arg);
- return FAIL;
- }
- key = vim_strnsave(*arg, end - *arg);
- if (generate_PUSHS(cctx, key) == FAIL)
- return FAIL;
- *arg = end;
- }
- else
+ if (**arg == '[')
{
isn_T *isn;
+ // {[expr]: value} uses an evaluated key.
*arg = skipwhite(*arg + 1);
if (compile_expr0(arg, cctx) == FAIL)
return FAIL;
@@ -3066,6 +3051,17 @@
}
++*arg;
}
+ else
+ {
+ // {"name": value},
+ // {'name': value},
+ // {name: value} use "name" as a literal key
+ key = get_literal_key(arg);
+ if (key == NULL)
+ return FAIL;
+ if (generate_PUSHS(cctx, key) == FAIL)
+ return FAIL;
+ }
// Check for duplicate keys, if using string keys.
if (key != NULL)