diff options
author | Bram Moolenaar <Bram@vim.org> | 2022-09-19 15:54:34 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2022-09-19 15:54:34 +0100 |
commit | cc34181f9994d64f8c8fa2f5845eaf0cc963067f (patch) | |
tree | 2909cd6f0d4d5f7e20b7daa76855c25fdef5dcb9 /src/eval.c | |
parent | 18ee0feb5dfbe51993dc715d24cf419ac92ebf92 (diff) |
patch 9.0.0502: a closure in a nested loop in a :def function does not workv9.0.0502
Problem: A closure in a nested loop in a :def function does not work.
Solution: Use an array of loopvars, one per loop level.
Diffstat (limited to 'src/eval.c')
-rw-r--r-- | src/eval.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/src/eval.c b/src/eval.c index 948faa2ee5..1f439701ed 100644 --- a/src/eval.c +++ b/src/eval.c @@ -4807,11 +4807,12 @@ partial_free(partial_T *pt) funcstack_check_refcount(pt->pt_funcstack); } // Similarly for loop variables. - if (pt->pt_loopvars != NULL) - { - --pt->pt_loopvars->lvs_refcount; - loopvars_check_refcount(pt->pt_loopvars); - } + for (i = 0; i < MAX_LOOP_DEPTH; ++i) + if (pt->pt_loopvars[i] != NULL) + { + --pt->pt_loopvars[i]->lvs_refcount; + loopvars_check_refcount(pt->pt_loopvars[i]); + } vim_free(pt); } @@ -4839,8 +4840,15 @@ partial_unref(partial_T *pt) if (pt->pt_funcstack != NULL) done = funcstack_check_refcount(pt->pt_funcstack); - if (!done && pt->pt_loopvars != NULL) - loopvars_check_refcount(pt->pt_loopvars); + if (!done) + { + int depth; + + for (depth = 0; depth < MAX_LOOP_DEPTH; ++depth) + if (pt->pt_loopvars[depth] != NULL + && loopvars_check_refcount(pt->pt_loopvars[depth])) + break; + } } } } |