Skip to content

Commit ad2d496

Browse files
committed
patch 8.2.3177: Vim9: can not use "for _ in expr" at script level
Problem: Vim9: can not use "for _ in expr" at script level. Solution: Skip assignment if the loop variable is "_".
1 parent 0c35752 commit ad2d496

3 files changed

Lines changed: 20 additions & 2 deletions

File tree

src/eval.c

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1784,6 +1784,8 @@ next_for_item(void *fi_void, char_u *arg)
17841784
| ASSIGN_NO_MEMBER_TYPE)
17851785
: 0);
17861786
listitem_T *item;
1787+
int skip_assign = in_vim9script() && arg[0] == '_'
1788+
&& !eval_isnamec(arg[1]);
17871789

17881790
if (fi->fi_blob != NULL)
17891791
{
@@ -1795,6 +1797,8 @@ next_for_item(void *fi_void, char_u *arg)
17951797
tv.v_lock = VAR_FIXED;
17961798
tv.vval.v_number = blob_get(fi->fi_blob, fi->fi_bi);
17971799
++fi->fi_bi;
1800+
if (skip_assign)
1801+
return TRUE;
17981802
return ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
17991803
fi->fi_varcount, flag, NULL) == OK;
18001804
}
@@ -1812,7 +1816,10 @@ next_for_item(void *fi_void, char_u *arg)
18121816
tv.vval.v_string = vim_strnsave(fi->fi_string + fi->fi_byte_idx, len);
18131817
fi->fi_byte_idx += len;
18141818
++fi->fi_bi;
1815-
result = ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
1819+
if (skip_assign)
1820+
result = TRUE;
1821+
else
1822+
result = ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
18161823
fi->fi_varcount, flag, NULL) == OK;
18171824
vim_free(tv.vval.v_string);
18181825
return result;
@@ -1825,7 +1832,10 @@ next_for_item(void *fi_void, char_u *arg)
18251832
{
18261833
fi->fi_lw.lw_item = item->li_next;
18271834
++fi->fi_bi;
1828-
result = (ex_let_vars(arg, &item->li_tv, TRUE, fi->fi_semicolon,
1835+
if (skip_assign)
1836+
result = TRUE;
1837+
else
1838+
result = (ex_let_vars(arg, &item->li_tv, TRUE, fi->fi_semicolon,
18291839
fi->fi_varcount, flag, NULL) == OK);
18301840
}
18311841
return result;

src/testdir/test_vim9_script.vim

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2557,6 +2557,12 @@ def Test_for_loop()
25572557
dd.counter = 12
25582558
endfor
25592559
assert_equal([{a: 'Cat', counter: 12}], foo)
2560+
2561+
reslist = []
2562+
for _ in range(3)
2563+
reslist->add('x')
2564+
endfor
2565+
assert_equal(['x', 'x', 'x'], reslist)
25602566
END
25612567
CheckDefAndScriptSuccess(lines)
25622568
enddef

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,8 @@ static char *(features[]) =
755755

756756
static int included_patches[] =
757757
{ /* Add new patch number below this line */
758+
/**/
759+
3177,
758760
/**/
759761
3176,
760762
/**/

0 commit comments

Comments
 (0)