mirror of
https://github.com/vim/vim.git
synced 2025-09-23 03:43:49 -04:00
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 "_".
This commit is contained in:
10
src/eval.c
10
src/eval.c
@@ -1784,6 +1784,8 @@ next_for_item(void *fi_void, char_u *arg)
|
||||
| ASSIGN_NO_MEMBER_TYPE)
|
||||
: 0);
|
||||
listitem_T *item;
|
||||
int skip_assign = in_vim9script() && arg[0] == '_'
|
||||
&& !eval_isnamec(arg[1]);
|
||||
|
||||
if (fi->fi_blob != NULL)
|
||||
{
|
||||
@@ -1795,6 +1797,8 @@ next_for_item(void *fi_void, char_u *arg)
|
||||
tv.v_lock = VAR_FIXED;
|
||||
tv.vval.v_number = blob_get(fi->fi_blob, fi->fi_bi);
|
||||
++fi->fi_bi;
|
||||
if (skip_assign)
|
||||
return TRUE;
|
||||
return ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
|
||||
fi->fi_varcount, flag, NULL) == OK;
|
||||
}
|
||||
@@ -1812,6 +1816,9 @@ next_for_item(void *fi_void, char_u *arg)
|
||||
tv.vval.v_string = vim_strnsave(fi->fi_string + fi->fi_byte_idx, len);
|
||||
fi->fi_byte_idx += len;
|
||||
++fi->fi_bi;
|
||||
if (skip_assign)
|
||||
result = TRUE;
|
||||
else
|
||||
result = ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
|
||||
fi->fi_varcount, flag, NULL) == OK;
|
||||
vim_free(tv.vval.v_string);
|
||||
@@ -1825,6 +1832,9 @@ next_for_item(void *fi_void, char_u *arg)
|
||||
{
|
||||
fi->fi_lw.lw_item = item->li_next;
|
||||
++fi->fi_bi;
|
||||
if (skip_assign)
|
||||
result = TRUE;
|
||||
else
|
||||
result = (ex_let_vars(arg, &item->li_tv, TRUE, fi->fi_semicolon,
|
||||
fi->fi_varcount, flag, NULL) == OK);
|
||||
}
|
||||
|
@@ -2557,6 +2557,12 @@ def Test_for_loop()
|
||||
dd.counter = 12
|
||||
endfor
|
||||
assert_equal([{a: 'Cat', counter: 12}], foo)
|
||||
|
||||
reslist = []
|
||||
for _ in range(3)
|
||||
reslist->add('x')
|
||||
endfor
|
||||
assert_equal(['x', 'x', 'x'], reslist)
|
||||
END
|
||||
CheckDefAndScriptSuccess(lines)
|
||||
enddef
|
||||
|
@@ -755,6 +755,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
3177,
|
||||
/**/
|
||||
3176,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user