Mercurial > vim

comparison src/ex_eval.c @ 25180:6523cd41fa54 v8.2.3126

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3126: Vim9: for loop error reports wrong line number Commit: https://github.com/vim/vim/commit/d4ab807d62c1a8262e78deb674c6750183bc030a Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 8 19:22:12 2021 +0200 patch 8.2.3126: Vim9: for loop error reports wrong line number Problem: Vim9: for loop error reports wrong line number. Solution: Save and restore the line number when evaluating the expression. (closes #8514)
author Bram Moolenaar <Bram@vim.org>
date Thu, 08 Jul 2021 19:30:04 +0200
parents 075790758d11
children e5d85e83a887
comparison
equal deleted inserted replaced
25179:b262af8a4248 25180:6523cd41fa54
1223 // the "in expr" is not used, skip over it 1223 // the "in expr" is not used, skip over it
1224 skip_for_lines(fi, &evalarg); 1224 skip_for_lines(fi, &evalarg);
1225 } 1225 }
1226 else 1226 else
1227 { 1227 {
1228 long save_lnum = SOURCING_LNUM;
1229
1228 // Evaluate the argument and get the info in a structure. 1230 // Evaluate the argument and get the info in a structure.
1229 fi = eval_for_line(eap->arg, &error, eap, &evalarg); 1231 fi = eval_for_line(eap->arg, &error, eap, &evalarg);
1230 cstack->cs_forinfo[cstack->cs_idx] = fi; 1232 cstack->cs_forinfo[cstack->cs_idx] = fi;
1233
1234 // Errors should use the first line number.
1235 SOURCING_LNUM = save_lnum;
1231 } 1236 }
1232 1237
1233 // use the element at the start of the list and advance 1238 // use the element at the start of the list and advance
1234 if (!error && fi != NULL && !skip) 1239 if (!error && fi != NULL && !skip)
1235 result = next_for_item(fi, eap->arg); 1240 result = next_for_item(fi, eap->arg);