diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-08 19:22:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-08 19:22:12 +0200 |
| commit | d4ab807d62c1a8262e78deb674c6750183bc030a (patch) | |
| tree | 58694a5b8bdcdafb16a3da8716eacb8e1d6ea5c8 | |
| parent | 09f688c33aad9692276dfb68842cf0621a0e2002 (diff) | |
patch 8.2.3126: Vim9: for loop error reports wrong line numberv8.2.3126
Problem: Vim9: for loop error reports wrong line number.
Solution: Save and restore the line number when evaluating the expression.
(closes #8514)
| -rw-r--r-- | src/ex_eval.c | 5 | ||||
| -rw-r--r-- | src/testdir/test_vim9_script.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/ex_eval.c b/src/ex_eval.c index dac70ab3ac..b504763dfc 100644 --- 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 diff --git a/src/testdir/test_vim9_script.vim b/src/testdir/test_vim9_script.vim index a7e141e254..cde3e7c636 100644 --- 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:') diff --git a/src/version.c b/src/version.c index 117051ffbb..ff1bb43494 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3126, +/**/ 3125, /**/ 3124, |