To: vim_dev@googlegroups.com Subject: Patch 8.2.1018 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1018 Problem: Typo in enum value. (James McCoy) Solution: Fix the typo. Files: src/vim9compile.c *** ../vim-8.2.1017/src/vim9compile.c 2020-06-19 22:35:40.573992151 +0200 --- src/vim9compile.c 2020-06-20 13:27:18.553692025 +0200 *************** *** 27,33 **** typedef enum { SKIP_NOT, // condition is a constant, produce code SKIP_YES, // condition is a constant, do NOT produce code ! SKIP_UNKNONW // condition is not a constant, produce code } skip_T; /* --- 27,33 ---- typedef enum { SKIP_NOT, // condition is a constant, produce code SKIP_YES, // condition is a constant, do NOT produce code ! SKIP_UNKNOWN // condition is not a constant, produce code } skip_T; /* *************** *** 5688,5694 **** else { // Not a constant, generate instructions for the expression. ! cctx->ctx_skip = SKIP_UNKNONW; if (generate_ppconst(cctx, &ppconst) == FAIL) return NULL; } --- 5688,5694 ---- else { // Not a constant, generate instructions for the expression. ! cctx->ctx_skip = SKIP_UNKNOWN; if (generate_ppconst(cctx, &ppconst) == FAIL) return NULL; } *************** *** 5700,5706 **** // "is_had_return" will be reset if any block does not end in :return scope->se_u.se_if.is_had_return = TRUE; ! if (cctx->ctx_skip == SKIP_UNKNONW) { // "where" is set when ":elseif", "else" or ":endif" is found scope->se_u.se_if.is_if_label = instr->ga_len; --- 5700,5706 ---- // "is_had_return" will be reset if any block does not end in :return scope->se_u.se_if.is_had_return = TRUE; ! if (cctx->ctx_skip == SKIP_UNKNOWN) { // "where" is set when ":elseif", "else" or ":endif" is found scope->se_u.se_if.is_if_label = instr->ga_len; *************** *** 5731,5737 **** if (!cctx->ctx_had_return) scope->se_u.se_if.is_had_return = FALSE; ! if (cctx->ctx_skip == SKIP_UNKNONW) { if (compile_jump_to_end(&scope->se_u.se_if.is_end_label, JUMP_ALWAYS, cctx) == FAIL) --- 5731,5737 ---- if (!cctx->ctx_had_return) scope->se_u.se_if.is_had_return = FALSE; ! if (cctx->ctx_skip == SKIP_UNKNOWN) { if (compile_jump_to_end(&scope->se_u.se_if.is_end_label, JUMP_ALWAYS, cctx) == FAIL) *************** *** 5761,5767 **** else { // Not a constant, generate instructions for the expression. ! cctx->ctx_skip = SKIP_UNKNONW; if (generate_ppconst(cctx, &ppconst) == FAIL) return NULL; --- 5761,5767 ---- else { // Not a constant, generate instructions for the expression. ! cctx->ctx_skip = SKIP_UNKNOWN; if (generate_ppconst(cctx, &ppconst) == FAIL) return NULL; *************** *** 5794,5800 **** if (scope->se_skip_save != SKIP_YES) { // jump from previous block to the end, unless the else block is empty ! if (cctx->ctx_skip == SKIP_UNKNONW) { if (!cctx->ctx_had_return && compile_jump_to_end(&scope->se_u.se_if.is_end_label, --- 5794,5800 ---- if (scope->se_skip_save != SKIP_YES) { // jump from previous block to the end, unless the else block is empty ! if (cctx->ctx_skip == SKIP_UNKNOWN) { if (!cctx->ctx_had_return && compile_jump_to_end(&scope->se_u.se_if.is_end_label, *************** *** 5802,5808 **** return NULL; } ! if (cctx->ctx_skip == SKIP_UNKNONW) { if (scope->se_u.se_if.is_if_label >= 0) { --- 5802,5808 ---- return NULL; } ! if (cctx->ctx_skip == SKIP_UNKNOWN) { if (scope->se_u.se_if.is_if_label >= 0) { *************** *** 5813,5819 **** } } ! if (cctx->ctx_skip != SKIP_UNKNONW) cctx->ctx_skip = cctx->ctx_skip == SKIP_YES ? SKIP_NOT : SKIP_YES; } --- 5813,5819 ---- } } ! if (cctx->ctx_skip != SKIP_UNKNOWN) cctx->ctx_skip = cctx->ctx_skip == SKIP_YES ? SKIP_NOT : SKIP_YES; } *** ../vim-8.2.1017/src/version.c 2020-06-19 22:37:44.453627984 +0200 --- src/version.c 2020-06-20 13:27:53.949567851 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1018, /**/ -- If "R" is Reverse, how come "D" is FORWARD? /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///