From 749639ec7248740cd271f34ec5f7bb70891b459c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 27 Aug 2020 23:08:47 +0200 Subject: patch 8.2.1529: Vim9: :elseif may be compiled when not needed Problem: Vim9: :elseif may be compiled when not needed. Solution: Do evaluate the :elseif expression. --- src/vim9compile.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/vim9compile.c') diff --git a/src/vim9compile.c b/src/vim9compile.c index 3e9b42c85..11a75c12c 100644 --- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -5519,6 +5519,7 @@ compile_elseif(char_u *arg, cctx_T *cctx) isn_T *isn; scope_T *scope = cctx->ctx_scope; ppconst_T ppconst; + skip_T save_skip = cctx->ctx_skip; if (scope == NULL || scope->se_type != IF_SCOPE) { @@ -5541,11 +5542,14 @@ compile_elseif(char_u *arg, cctx_T *cctx) // compile "expr"; if we know it evaluates to FALSE skip the block CLEAR_FIELD(ppconst); + if (cctx->ctx_skip == SKIP_YES) + cctx->ctx_skip = SKIP_UNKNOWN; if (compile_expr1(&p, cctx, &ppconst) == FAIL) { clear_ppconst(&ppconst); return NULL; } + cctx->ctx_skip = save_skip; if (scope->se_skip_save == SKIP_YES) clear_ppconst(&ppconst); else if (instr->ga_len == instr_count && ppconst.pp_used == 1) -- cgit v1.2.1