aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

patch 8.2.3051: Vim9: for loop with one list variable does not work

Browse Source 
Problem:    Vim9: for loop with one list variable does not work.
Solution:   Use a separate flag for unpacking a list. (closes #8452)
This commit is contained in:
Bram Moolenaar
2021-06-26 12:40:56 +02:00
parent f3caeb63d6
commit 444d878324
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/testdir/test_vim9_script.vim
View File

@@ -2385,6 +2385,13 @@ def Test_for_loop()
endfor endfor
assert_equal('1a2b', res) assert_equal('1a2b', res)
# unpack with one var
var reslist = []
for [x] in [['aaa'], ['bbb']]
reslist->add(x)
endfor
assert_equal(['aaa', 'bbb'], reslist)
# loop over string # loop over string
res = '' res = ''
for c in 'aéc̀d' for c in 'aéc̀d'

2
src/version.c
View File

@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
3051,
/**/ /**/
3050, 3050,
/**/ /**/

11
src/vim9compile.c
View File

@@ -7731,6 +7731,7 @@ compile_for(char_u *arg_start, cctx_T *cctx)
char_u *p; char_u *p;
char_u *wp; char_u *wp;
int var_count = 0; int var_count = 0;
int var_list = FALSE;
int semicolon = FALSE; int semicolon = FALSE;
size_t varlen; size_t varlen;
garray_T *stack = &cctx->ctx_type_stack; garray_T *stack = &cctx->ctx_type_stack;
@@ -7747,6 +7748,8 @@ compile_for(char_u *arg_start, cctx_T *cctx)
return NULL; return NULL;
if (var_count == 0) if (var_count == 0)
var_count = 1; var_count = 1;
else
var_list = TRUE; // can also be a list of one variable
// consume "in" // consume "in"
wp = p; wp = p;
@@ -7811,7 +7814,7 @@ compile_for(char_u *arg_start, cctx_T *cctx)
else if (vartype->tt_type == VAR_LIST else if (vartype->tt_type == VAR_LIST
&& vartype->tt_member->tt_type != VAR_ANY) && vartype->tt_member->tt_type != VAR_ANY)
{ {
if (var_count == 1) if (!var_list)
item_type = vartype->tt_member; item_type = vartype->tt_member;
else if (vartype->tt_member->tt_type == VAR_LIST else if (vartype->tt_member->tt_type == VAR_LIST
&& vartype->tt_member->tt_member->tt_type != VAR_ANY) && vartype->tt_member->tt_member->tt_type != VAR_ANY)
@@ -7828,7 +7831,7 @@ compile_for(char_u *arg_start, cctx_T *cctx)
generate_FOR(cctx, loop_lvar->lv_idx); generate_FOR(cctx, loop_lvar->lv_idx);
arg = arg_start; arg = arg_start;
if (var_count > 1) if (var_list)
{ {
generate_UNPACK(cctx, var_count, semicolon); generate_UNPACK(cctx, var_count, semicolon);
arg = skipwhite(arg + 1); // skip white after '[' arg = skipwhite(arg + 1); // skip white after '['
@@ -7899,12 +7902,12 @@ compile_for(char_u *arg_start, cctx_T *cctx)
} }
// Reserve a variable to store "var". // Reserve a variable to store "var".
where.wt_index = var_count > 1 ? idx + 1 : 0; where.wt_index = var_list ? idx + 1 : 0;
where.wt_variable = TRUE; where.wt_variable = TRUE;
if (lhs_type == &t_any) if (lhs_type == &t_any)
lhs_type = item_type; lhs_type = item_type;
else if (item_type != &t_unknown else if (item_type != &t_unknown
&& !(var_count > 1 && item_type == &t_any) && !(var_list && item_type == &t_any)
&& check_type(lhs_type, item_type, TRUE, where) == FAIL) && check_type(lhs_type, item_type, TRUE, where) == FAIL)
goto failed; goto failed;
var_lvar = reserve_local(cctx, arg, varlen, TRUE, lhs_type); var_lvar = reserve_local(cctx, arg, varlen, TRUE, lhs_type);