Mercurial > vim
changeset 26236:9e6ddd7b91cd v8.2.3649
patch 8.2.3649: Vim9: error for variable declared in while loop
Commit: https://github.com/vim/vim/commit/7a53f29c031f54ab67a803e5e3f8cb44e4edc4bc
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Nov 22 18:31:02 2021 +0000
patch 8.2.3649: Vim9: error for variable declared in while loop
Problem: Vim9: error for variable declared in while loop.
Solution: Do not keep the first variable. (closes https://github.com/vim/vim/issues/9191)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 22 Nov 2021 19:45:03 +0100 |
| parents | f06e596b22f6 |
| children | 83c695dd5355 |
| files | src/ex_eval.c src/testdir/test_vim9_script.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1201,9 +1201,10 @@ ex_while(exarg_T *eap) & CSF_FUNC_DEF; // Any variables defined in the previous round are no longer - // visible. Keep the first one, it is the loop variable that - // we reuse every time around. - for (i = cstack->cs_script_var_len[cstack->cs_idx] + 1; + // visible. Keep the first one for ":for", it is the loop + // variable that we reuse every time around. + for (i = cstack->cs_script_var_len[cstack->cs_idx] + + (eap->cmdidx == CMD_while ? 0 : 1); i < si->sn_var_vals.ga_len; ++i) { svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data) + i;
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -3083,6 +3083,21 @@ def Test_while_loop() endwhile enddef +def Test_while_loop_in_script() + var lines =<< trim END + vim9script + var result = '' + var cnt = 0 + while cnt < 3 + var s = 'v' .. cnt + result ..= s + cnt += 1 + endwhile + assert_equal('v0v1v2', result) + END + CheckScriptSuccess(lines) +enddef + def Test_while_loop_fails() CheckDefFailure(['while xxx'], 'E1001:') CheckDefFailure(['endwhile'], 'E588:')