From 65449bd1ee5cebde288a8f0150fe7d54c6c6ef31 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 19 Sep 2022 16:02:43 +0100 Subject: [PATCH] patch 9.0.0503: build failure Problem: Build failure. Solution: Add missing changes. --- src/version.c | 2 ++ src/vim9compile.c | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/version.c b/src/version.c index 7e22f0113..6bd68dc36 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 503, /**/ 502, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index 4890de346..74ba88fda 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -54,7 +54,9 @@ lookup_local(char_u *name, size_t len, lvar_T *lvar, cctx_T *cctx) { *lvar = *lvp; lvar->lv_from_outer = 0; - lvar->lv_loop_idx = get_loop_var_idx(cctx); + // If the variable was declared inside a loop set + // lvar->lv_loop_idx and lvar->lv_loop_depth. + get_loop_var_idx(cctx, idx, lvar); } return OK; } @@ -955,8 +957,7 @@ compile_nested_function(exarg_T *eap, cctx_T *cctx, garray_T *lines_to_free) // recursive call. if (is_global) { - // TODO: loop variable index and count - r = generate_NEWFUNC(cctx, lambda_name, func_name, 0, 0); + r = generate_NEWFUNC(cctx, lambda_name, func_name); func_name = NULL; lambda_name = NULL; } @@ -1195,7 +1196,7 @@ generate_loadvar( { if (lvar->lv_from_outer > 0) generate_LOADOUTER(cctx, lvar->lv_idx, lvar->lv_from_outer, - lvar->lv_loop_idx, type); + lvar->lv_loop_depth, lvar->lv_loop_idx, type); else generate_LOAD(cctx, ISN_LOAD, lvar->lv_idx, NULL, type); } -- 2.40.0