patch 8.2.2444: Vim9: compile error with combination of operator and list
Problem: Vim9: compile error with combination of operator and list.
Solution: Generate constants before parsing a list or dict. (closes #7757)
diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim
index 2239e76..aead431 100644
--- a/src/testdir/test_vim9_expr.vim
+++ b/src/testdir/test_vim9_expr.vim
@@ -1083,6 +1083,9 @@
assert_equal('a0.123', 'a' .. 0.123)
endif
+ assert_equal(3, 1 + [2, 3, 4][0])
+ assert_equal(5, 2 + {key: 3}['key'])
+
set digraph
assert_equal('val: true', 'val: ' .. &digraph)
set nodigraph
diff --git a/src/version.c b/src/version.c
index b3d4fef..b320943 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2444,
+/**/
2443,
/**/
2442,
diff --git a/src/vim9compile.c b/src/vim9compile.c
index 5b9f7f5..a9edc80 100644
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -4121,13 +4121,17 @@
/*
* List: [expr, expr]
*/
- case '[': ret = compile_list(arg, cctx, ppconst);
+ case '[': if (generate_ppconst(cctx, ppconst) == FAIL)
+ return FAIL;
+ ret = compile_list(arg, cctx, ppconst);
break;
/*
* Dictionary: {'key': val, 'key': val}
*/
- case '{': ret = compile_dict(arg, cctx, ppconst);
+ case '{': if (generate_ppconst(cctx, ppconst) == FAIL)
+ return FAIL;
+ ret = compile_dict(arg, cctx, ppconst);
break;
/*