Mercurial > vim
changeset 25180:6523cd41fa54 v8.2.3126
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 | b262af8a4248 |
| children | 123653459cee |
| files | src/ex_eval.c src/testdir/test_vim9_script.vim src/version.c |
| diffstat | 3 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_eval.c +++ b/src/ex_eval.c @@ -1225,9 +1225,14 @@ ex_while(exarg_T *eap) } else { + long save_lnum = SOURCING_LNUM; + // Evaluate the argument and get the info in a structure. fi = eval_for_line(eap->arg, &error, eap, &evalarg); cstack->cs_forinfo[cstack->cs_idx] = fi; + + // Errors should use the first line number. + SOURCING_LNUM = save_lnum; } // use the element at the start of the list and advance
--- a/src/testdir/test_vim9_script.vim +++ b/src/testdir/test_vim9_script.vim @@ -2545,6 +2545,7 @@ def Test_for_loop_fails() CheckDefAndScriptFailure(['for # in range(5)'], 'E690:') CheckDefAndScriptFailure(['for i In range(5)'], 'E690:') CheckDefAndScriptFailure2(['var x = 5', 'for x in range(5)', 'endfor'], 'E1017:', 'E1041:') + CheckScriptFailure(['vim9script', 'var x = 5', 'for x in range(5)', '# comment', 'endfor'], 'E1041:', 3) CheckScriptFailure(['def Func(arg: any)', 'for arg in range(5)', 'enddef', 'defcompile'], 'E1006:') delfunc! g:Func CheckDefFailure(['for i in xxx'], 'E1001:')