diff options
author | Bram Moolenaar <Bram@vim.org> | 2021-07-15 15:40:58 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2021-07-15 15:40:58 +0200 |
commit | 9e60e899ee546a8a35c4cbe0319971719c1839e9 (patch) | |
tree | 4126ed67ce70ed34c5f857acea53ab21ce4374e7 /src/vim9compile.c | |
parent | 0894e0d8087aad4d467fd7b3d87b1930fe661916 (diff) |
patch 8.2.3165: Vim9: in a || expression the error line number may be wrongv8.2.3165
Problem: Vim9: in a || expression the error line number may be wrong.
Solution: Save and restore the line number when checking the type.
(closes #8569)
Diffstat (limited to 'src/vim9compile.c')
-rw-r--r-- | src/vim9compile.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/vim9compile.c b/src/vim9compile.c index d25183f19e..4763e9550b 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -5095,6 +5095,7 @@ compile_and_or( while (p[0] == opchar && p[1] == opchar) { long start_lnum = SOURCING_LNUM; + long save_sourcing_lnum; int start_ctx_lnum = cctx->ctx_lnum; int save_lnum; @@ -5116,6 +5117,7 @@ compile_and_or( generate_ppconst(cctx, ppconst); // Every part must evaluate to a bool. + save_sourcing_lnum = SOURCING_LNUM; SOURCING_LNUM = start_lnum; save_lnum = cctx->ctx_lnum; cctx->ctx_lnum = start_ctx_lnum; @@ -5138,6 +5140,7 @@ compile_and_or( ? JUMP_IF_COND_TRUE : JUMP_IF_COND_FALSE, 0); // eval the next expression + SOURCING_LNUM = save_sourcing_lnum; if (may_get_next_line_error(p + 2, arg, cctx) == FAIL) { ga_clear(&end_ga); |