changeset 24679:80422f66978a v8.2.2878

patch 8.2.2878: Vim9: for loop list unpack only allows for one "_" Commit: https://github.com/vim/vim/commit/b777da9be8eb421982e567702db3195475383dec Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 22 21:40:39 2021 +0200 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 https://github.com/vim/vim/issues/8232)
author Bram Moolenaar <Bram@vim.org>
date Sat, 22 May 2021 21:45:02 +0200
parents da49e6130704
children 0072259ad95a
files src/testdir/test_vim9_script.vim src/version.c src/vim9compile.c
diffstat 3 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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)
 
--- 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 */
 /**/
+    2878,
+/**/
     2877,
 /**/
     2876,
--- a/src/vim9compile.c
+++ b/src/vim9compile.c
@@ -7776,6 +7776,12 @@ compile_for(char_u *arg_start, cctx_T *c
 						     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)