Mercurial > vim

comparison src/eval.c @ 25153:610e15e8778d v8.2.3113

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3113: no error when for loop variable shadows script variable Commit: https://github.com/vim/vim/commit/442b29c968eff1c8fec1a96418aa47be9cba62ea Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jul 5 22:23:00 2021 +0200 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 https://github.com/vim/vim/issues/8512)
author Bram Moolenaar <Bram@vim.org>
date Mon, 05 Jul 2021 22:30:03 +0200
parents 18b31f0a4bb5
children e495f40e4b07
comparison
equal deleted inserted replaced
25152:7da8d1cf23f3 25153:610e15e8778d
1775 next_for_item(void *fi_void, char_u *arg) 1775 next_for_item(void *fi_void, char_u *arg)
1776 { 1776 {
1777 forinfo_T *fi = (forinfo_T *)fi_void; 1777 forinfo_T *fi = (forinfo_T *)fi_void;
1778 int result; 1778 int result;
1779 int flag = ASSIGN_FOR_LOOP | (in_vim9script() 1779 int flag = ASSIGN_FOR_LOOP | (in_vim9script()
1780 ? (ASSIGN_FINAL | ASSIGN_DECL | ASSIGN_NO_MEMBER_TYPE) 1780 ? (ASSIGN_FINAL
1781 // first round: error if variable exists
1782 | (fi->fi_bi == 0 ? 0 : ASSIGN_DECL)
1783 | ASSIGN_NO_MEMBER_TYPE)
1781 : 0); 1784 : 0);
1782 listitem_T *item; 1785 listitem_T *item;
1783 1786
1784 if (fi->fi_blob != NULL) 1787 if (fi->fi_blob != NULL)
1785 { 1788 {
1805 return FALSE; 1808 return FALSE;
1806 tv.v_type = VAR_STRING; 1809 tv.v_type = VAR_STRING;
1807 tv.v_lock = VAR_FIXED; 1810 tv.v_lock = VAR_FIXED;
1808 tv.vval.v_string = vim_strnsave(fi->fi_string + fi->fi_byte_idx, len); 1811 tv.vval.v_string = vim_strnsave(fi->fi_string + fi->fi_byte_idx, len);
1809 fi->fi_byte_idx += len; 1812 fi->fi_byte_idx += len;
1813 ++fi->fi_bi;
1810 result = ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon, 1814 result = ex_let_vars(arg, &tv, TRUE, fi->fi_semicolon,
1811 fi->fi_varcount, flag, NULL) == OK; 1815 fi->fi_varcount, flag, NULL) == OK;
1812 vim_free(tv.vval.v_string); 1816 vim_free(tv.vval.v_string);
1813 return result; 1817 return result;
1814 } 1818 }
1817 if (item == NULL) 1821 if (item == NULL)
1818 result = FALSE; 1822 result = FALSE;
1819 else 1823 else
1820 { 1824 {
1821 fi->fi_lw.lw_item = item->li_next; 1825 fi->fi_lw.lw_item = item->li_next;
1826 ++fi->fi_bi;
1822 result = (ex_let_vars(arg, &item->li_tv, TRUE, fi->fi_semicolon, 1827 result = (ex_let_vars(arg, &item->li_tv, TRUE, fi->fi_semicolon,
1823 fi->fi_varcount, flag, NULL) == OK); 1828 fi->fi_varcount, flag, NULL) == OK);
1824 } 1829 }
1825 return result; 1830 return result;
1826 } 1831 }