Mercurial > vim
changeset 25955:4003fc2340dc v8.2.3511
patch 8.2.3511: Vim9: entry for loop variable is created every round
Commit: https://github.com/vim/vim/commit/a06758dd38851f022d270dd5102efbe1049d4712
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Oct 15 00:18:37 2021 +0100
patch 8.2.3511: Vim9: entry for loop variable is created every round
Problem: Vim9: entry for loop variable is created every round.
Solution: Only create the entry once. (closes https://github.com/vim/vim/issues/8996)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Fri, 15 Oct 2021 01:30:03 +0200 |
| parents | 336f67070095 |
| children | 5a9e1b8fc4bf |
| files | src/evalvars.c src/version.c src/vim9script.c |
| diffstat | 3 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalvars.c +++ b/src/evalvars.c @@ -3319,7 +3319,7 @@ set_var_const( goto failed; } - if (var_in_vim9script) + if (var_in_vim9script && (flags & ASSIGN_FOR_LOOP) == 0) { where_T where = WHERE_INIT; @@ -3331,7 +3331,8 @@ set_var_const( goto failed; } - if (var_check_permission(di, name) == FAIL) + if ((flags & ASSIGN_FOR_LOOP) == 0 + && var_check_permission(di, name) == FAIL) goto failed; } else
--- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3511, +/**/ 3510, /**/ 3509,
--- a/src/vim9script.c +++ b/src/vim9script.c @@ -978,8 +978,9 @@ find_typval_in_script(typval_T *dest) // legacy script doesn't store variable types return NULL; - // Find the svar_T in sn_var_vals. - for (idx = 0; idx < si->sn_var_vals.ga_len; ++idx) + // Find the svar_T in sn_var_vals. Start at the end, in a for loop the + // variable was added at the end. + for (idx = si->sn_var_vals.ga_len - 1; idx >= 0; --idx) { svar_T *sv = ((svar_T *)si->sn_var_vals.ga_data) + idx;