Mercurial > vim
changeset 30247:327bca7b70ea v9.0.0459
patch 9.0.0459: Vim9: block in for loop doesn't behave like a code block
Commit: https://github.com/vim/vim/commit/353b68a99189875a8460124d44fc33eae6def74e
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Sep 13 21:10:45 2022 +0100
patch 9.0.0459: Vim9: block in for loop doesn't behave like a code block
Problem: Vim9: block in for loop doesn't behave like a code block.
Solution: Use a new block ID for each loop at the script level.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 13 Sep 2022 22:15:04 +0200 |
| parents | 23088f4486a5 |
| children | 025e37804c32 |
| files | src/ex_eval.c src/testdir/test_vim9_script.vim src/version.c |
| diffstat | 3 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1230,15 +1230,18 @@ ex_while(exarg_T *eap) { scriptitem_T *si = SCRIPT_ITEM(current_sctx.sc_sid); int i; + int first; int func_defined = cstack->cs_flags[cstack->cs_idx] & CSF_FUNC_DEF; // Any variables defined in the previous round are no longer // 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] + // Do this backwards, so that vars defined in a later round are + // found first. + first = cstack->cs_script_var_len[cstack->cs_idx] + (eap->cmdidx == CMD_while ? 0 : 1); - i < si->sn_var_vals.ga_len; ++i) + for (i = si->sn_var_vals.ga_len - 1; i >= first; --i) { svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data) + i; @@ -1250,6 +1253,12 @@ ex_while(exarg_T *eap) // still exists, from sn_vars. hide_script_var(si, i, func_defined); } + + // Start a new block ID, so that variables defined inside the + // loop are created new and not shared with the previous loop. + // Matters when used in a closure. + cstack->cs_block_id[cstack->cs_idx] = ++si->sn_last_block_id; + si->sn_current_block_id = si->sn_last_block_id; } } cstack->cs_flags[cstack->cs_idx] =
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2266,10 +2266,12 @@ def Test_for_loop_with_closure() flist[i] = () => inloop endfor for i in range(5) - assert_equal(4, flist[i]()) + assert_equal(i, flist[i]()) endfor END - v9.CheckDefAndScriptSuccess(lines) + # FIXME + # v9.CheckDefAndScriptSuccess(lines) + v9.CheckScriptSuccess(['vim9script'] + lines) lines =<< trim END var flist: list<func> @@ -2280,10 +2282,12 @@ def Test_for_loop_with_closure() } endfor for i in range(5) - assert_equal(4, flist[i]()) + assert_equal(i, flist[i]()) endfor END - v9.CheckDefAndScriptSuccess(lines) + # FIXME + # v9.CheckDefAndScriptSuccess(lines) + v9.CheckScriptSuccess(['vim9script'] + lines) enddef def Test_for_loop_fails()