From 9e60e899ee546a8a35c4cbe0319971719c1839e9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 15 Jul 2021 15:40:58 +0200 Subject: [PATCH] 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) --- src/testdir/test_vim9_expr.vim | 7 +++++++ src/version.c | 2 ++ src/vim9compile.c | 3 +++ 3 files changed, 12 insertions(+) diff --git a/src/testdir/test_vim9_expr.vim b/src/testdir/test_vim9_expr.vim index 59ac95713..ae48a8960 100644 --- a/src/testdir/test_vim9_expr.vim +++ b/src/testdir/test_vim9_expr.vim @@ -401,6 +401,13 @@ def Test_expr2_fails() # comment END CheckScriptFailure(lines, 'E1004: White space required before and after ''||'' at "||true"', 3) + + lines =<< trim END + var x = false + || false + || a.b + END + CheckDefFailure(lines, 'E1001:', 3) enddef " test && diff --git a/src/version.c b/src/version.c index 9d355c8ed..ba8362bcc 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 3165, /**/ 3164, /**/ diff --git a/src/vim9compile.c b/src/vim9compile.c index d25183f19..4763e9550 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); -- 2.40.0