patch 8.2.3702: first key in dict is seen as curly expression and fails
Problem: First key in dict is seen as curly expression and fails.
Solution: Ignore failure of curly expression. (closes #9247)
diff --git a/src/dict.c b/src/dict.c
index 032c1b5..98be263 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -891,7 +891,7 @@
typval_T tv;
char_u *key = NULL;
dictitem_T *item;
- char_u *start = skipwhite(*arg + 1);
+ char_u *curly_expr = skipwhite(*arg + 1);
char_u buf[NUMBUFLEN];
int vim9script = in_vim9script();
int had_comma;
@@ -903,13 +903,11 @@
* first item.
* But {} is an empty Dictionary.
*/
- if (!vim9script && *start != '}')
- {
- if (eval1(&start, &tv, NULL) == FAIL) // recursive!
- return FAIL;
- if (*skipwhite(start) == '}')
- return NOTDONE;
- }
+ if (!vim9script
+ && *curly_expr != '}'
+ && eval1(&curly_expr, &tv, NULL) == OK
+ && *skipwhite(curly_expr) == '}')
+ return NOTDONE;
if (evaluate)
{
diff --git a/src/testdir/test_listdict.vim b/src/testdir/test_listdict.vim
index 0b024a0..10cb786 100644
--- a/src/testdir/test_listdict.vim
+++ b/src/testdir/test_listdict.vim
@@ -297,6 +297,9 @@
call assert_fails('let d={[] : 10}', 'E730:')
" undefined variable as value
call assert_fails("let d={'k' : i}", 'E121:')
+
+ " allow key starting with number at the start, not a curly expression
+ call assert_equal({'1foo': 77}, #{1foo: 77})
endfunc
" This was allowed in legacy Vim script
diff --git a/src/typval.c b/src/typval.c
index c859122..fb945cb 100644
--- a/src/typval.c
+++ b/src/typval.c
@@ -1822,7 +1822,8 @@
: STR2NR_ALL, &n, NULL, 0, TRUE);
if (len == 0)
{
- semsg(_(e_invalid_expression_str), *arg);
+ if (evaluate)
+ semsg(_(e_invalid_expression_str), *arg);
return FAIL;
}
*arg += len;
diff --git a/src/version.c b/src/version.c
index b8dbf37..302db8e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3702,
+/**/
3701,
/**/
3700,