Mercurial > vim

diff src/vim9compile.c @ 25258:205a0126ac2d v8.2.3165

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3165: Vim9: in a || expression the error line number may be wrong Commit: https://github.com/vim/vim/commit/9e60e899ee546a8a35c4cbe0319971719c1839e9 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jul 15 15:40:58 2021 +0200 patch 8.2.3165: Vim9: in a || expression the error line number may be wrong 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)
author Bram Moolenaar <Bram@vim.org>
date Thu, 15 Jul 2021 15:45:03 +0200
parents 658dfd6be868
children 5861cc1f5704
line wrap: on
line diff
--- 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);