# HG changeset patch # User Bram Moolenaar # Date 1612126803 -3600 # Node ID c0f2c6c561477cdf83994be06465f51579868136 # Parent c17b61789da3b09251e32396a212517325b52670 patch 8.2.2444: Vim9: compile error with combination of operator and list Commit: https://github.com/vim/vim/commit/e507ff15d52653dad3054ddc0073708977621c0c Author: Bram Moolenaar Date: Sun Jan 31 21:47:42 2021 +0100 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 https://github.com/vim/vim/issues/7757) diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -1083,6 +1083,9 @@ def Test_expr5() 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 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2444, +/**/ 2443, /**/ 2442, diff --git a/src/vim9compile.c b/src/vim9compile.c --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4121,13 +4121,17 @@ compile_expr7( /* * 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; /*