Mercurial > vim
changeset 30318:1358585dde2b v9.0.0495
patch 9.0.0495: closure doesn't work properly in nested loop
Commit: https://github.com/vim/vim/commit/dbbb02bc770646776a04122ff58313d170873e67
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Sep 18 12:00:21 2022 +0100
patch 9.0.0495: closure doesn't work properly in nested loop
Problem: Closure doesn't work properly in nested loop.
Solution: Save variables up to the outer loop.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 18 Sep 2022 13:15:06 +0200 |
| parents | 96b5bf36b926 |
| children | 54c55ede50e5 |
| files | src/testdir/test_vim9_script.vim src/version.c src/vim9execute.c |
| diffstat | 3 files changed, 30 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2300,6 +2300,32 @@ def Test_for_loop_with_closure() endfor END v9.CheckDefAndScriptSuccess(lines) + + # Also works for a nested loop + lines =<< trim END + var flist: list<func> + var n = 0 + for i in range(3) + var ii = i + for a in ['a', 'b', 'c'] + var aa = a + flist[n] = () => ii .. aa + ++n + endfor + endfor + + n = 0 + for i in range(3) + for a in ['a', 'b', 'c'] + assert_equal(i .. a, flist[n]()) + ++n + endfor + endfor + END + v9.CheckScriptSuccess(['vim9script'] + lines) + # FIXME: not yet right for :def + lines[14] = 'assert_equal(2 .. a, flist[n]())' + v9.CheckDefSuccess(lines) enddef def Test_for_loop_fails()
--- a/src/version.c +++ b/src/version.c @@ -700,6 +700,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 495, +/**/ 494, /**/ 493,
--- a/src/vim9execute.c +++ b/src/vim9execute.c @@ -2671,7 +2671,7 @@ execute_endloop(isn_T *iptr, ectx_T *ect { partial_T *pt = ((partial_T **)gap->ga_data)[idx]; - if (pt->pt_refcount > 1) + if (pt->pt_refcount > 1 && pt->pt_loopvars == NULL) { int refcount = pt->pt_refcount; int i; @@ -2727,7 +2727,7 @@ execute_endloop(isn_T *iptr, ectx_T *ect { partial_T *pt = ((partial_T **)gap->ga_data)[idx]; - if (pt->pt_refcount > 1) + if (pt->pt_refcount > 1 && pt->pt_loopvars == NULL) { ++loopvars->lvs_refcount; pt->pt_loopvars = loopvars;