commit 442b29c968eff1c8fec1a96418aa47be9cba62ea
author Bram Moolenaar <Bram@vim.org> Mon Jul 05 22:23:00 2021 +0200
committer Bram Moolenaar <Bram@vim.org> Mon Jul 05 22:23:00 2021 +0200
tree 0b2067136269b0d6d030fc7621048d90c11c244d
parent 5cb09620c1e0a0178c0dc986230997a8aac0e61a

patch 8.2.3113: no error when for loop variable shadows script variable

Problem:    No error when for loop variable shadows script variable.
Solution:   Check for the error. (closes #8512)

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 1a84d2c..e0f0816 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1777,7 +1777,10 @@
     forinfo_T	*fi = (forinfo_T *)fi_void;
     int		result;
     int		flag = ASSIGN_FOR_LOOP | (in_vim9script()
-			 ? (ASSIGN_FINAL | ASSIGN_DECL | ASSIGN_NO_MEMBER_TYPE)
+			 ? (ASSIGN_FINAL
+			     // first round: error if variable exists
+			     | (fi->fi_bi == 0 ? 0 : ASSIGN_DECL)
+			     | ASSIGN_NO_MEMBER_TYPE)
 			 : 0);
     listitem_T	*item;
 
@@ -1807,6 +1810,7 @@
 	tv.v_lock = VAR_FIXED;
 	tv.vval.v_string = vim_strnsave(fi->fi_string + fi->fi_byte_idx, len);
 	fi->fi_byte_idx += len;
+	++fi->fi_bi;
 	result = ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
 					    fi->fi_varcount, flag, NULL) == OK;
 	vim_free(tv.vval.v_string);
@@ -1819,6 +1823,7 @@
     else
     {
 	fi->fi_lw.lw_item = item->li_next;
+	++fi->fi_bi;
 	result = (ex_let_vars(arg, &item->li_tv, TRUE, fi->fi_semicolon,
 					   fi->fi_varcount, flag, NULL) == OK);
     }