Mercurial > vim

diff src/vim9compile.c @ 21959:67d4be2757b0 v8.2.1529

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1529: Vim9: :elseif may be compiled when not needed Commit: https://github.com/vim/vim/commit/749639ec7248740cd271f34ec5f7bb70891b459c Author: Bram Moolenaar <Bram@vim.org> Date: Thu Aug 27 23:08:47 2020 +0200 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.
author Bram Moolenaar <Bram@vim.org>
date Thu, 27 Aug 2020 23:15:04 +0200
parents 4343657b49fa
children 0ce86b015058
line wrap: on
line diff
--- 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)