From: Bram Moolenaar Date: Sat, 22 May 2021 19:40:39 +0000 (+0200) Subject: patch 8.2.2878: Vim9: for loop list unpack only allows for one "_" X-Git-Tag: v8.2.2878 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b777da9be8eb421982e567702db3195475383dec;p=vim patch 8.2.2878: Vim9: for loop list unpack only allows for one "_" Problem: Vim9: for loop list unpack only allows for one "_". Solution: Drop the value when the variable is "_". (closes #8232) --- diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index 0e77b58b6..7114ae41e 100644 --- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2500,6 +2500,12 @@ def Test_for_loop_unpack() endfor assert_equal(['global', 'buf', 'win', 'tab', '1', '2', '3', '4'], slist) unlet! g:globalvar b:bufvar w:winvar t:tabvar + + var res = [] + for [_, n, _] in [[1, 2, 3], [4, 5, 6]] + res->add(n) + endfor + assert_equal([2, 5], res) END CheckDefAndScriptSuccess(lines) diff --git a/src/version.c b/src/version.c index 82ecd0a93..0223ae2a4 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2878, /**/ 2877, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 5e912dd88..cb91c3ccb 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -7776,6 +7776,12 @@ compile_for(char_u *arg_start, cctx_T *cctx) 0, 0, type, name) == FAIL) goto failed; } + else if (varlen == 1 && *arg == '_') + { + // Assigning to "_": drop the value. + if (generate_instr_drop(cctx, ISN_DROP, 1) == NULL) + goto failed; + } else { if (lookup_local(arg, varlen, NULL, cctx) == OK)