patch 9.0.0502: a closure in a nested loop in a :def function does not work
Problem: A closure in a nested loop in a :def function does not work.
Solution: Use an array of loopvars, one per loop level.
diff --git a/src/userfunc.c b/src/userfunc.c
index f0e9cd7..83221a8 100644
--- a/src/userfunc.c
+++ b/src/userfunc.c
@@ -2453,11 +2453,10 @@
*/
int
copy_lambda_to_global_func(
- char_u *lambda,
- char_u *global,
- short loop_var_idx,
- short loop_var_count,
- ectx_T *ectx)
+ char_u *lambda,
+ char_u *global,
+ loopvarinfo_T *loopvarinfo,
+ ectx_T *ectx)
{
ufunc_T *ufunc = find_func_even_dead(lambda, FFED_IS_GLOBAL);
ufunc_T *fp = NULL;
@@ -2524,14 +2523,12 @@
if (pt == NULL)
goto failed;
- if (fill_partial_and_closure(pt, ufunc, loop_var_idx, loop_var_count,
- ectx) == FAIL)
+ if (fill_partial_and_closure(pt, ufunc, loopvarinfo, ectx) == FAIL)
{
vim_free(pt);
goto failed;
}
ufunc->uf_partial = pt;
- --pt->pt_refcount; // not actually referenced here
}
return OK;