thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.1018: typo in enum value

Browse Source 
Problem:    Typo in enum value. (James McCoy)
Solution:   Fix the typo.
This commit is contained in:
Bram Moolenaar
2020-06-20 13:29:03 +02:00
parent 1089374130
commit 280b0dc815
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/version.c
View File

@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1018,
/**/ /**/
1017, 1017,
/**/ /**/

16
src/vim9compile.c
View File

@@ -27,7 +27,7 @@
typedef enum { typedef enum {
SKIP_NOT, // condition is a constant, produce code SKIP_NOT, // condition is a constant, produce code
SKIP_YES, // condition is a constant, do NOT produce code SKIP_YES, // condition is a constant, do NOT produce code
SKIP_UNKNONW // condition is not a constant, produce code SKIP_UNKNOWN // condition is not a constant, produce code
} skip_T; } skip_T;
/* /*
@@ -5688,7 +5688,7 @@ compile_if(char_u *arg, cctx_T *cctx)
else else
{ {
// Not a constant, generate instructions for the expression. // Not a constant, generate instructions for the expression.
cctx->ctx_skip = SKIP_UNKNONW; cctx->ctx_skip = SKIP_UNKNOWN;
if (generate_ppconst(cctx, &ppconst) == FAIL) if (generate_ppconst(cctx, &ppconst) == FAIL)
return NULL; return NULL;
} }
@@ -5700,7 +5700,7 @@ compile_if(char_u *arg, cctx_T *cctx)
// "is_had_return" will be reset if any block does not end in :return // "is_had_return" will be reset if any block does not end in :return
scope->se_u.se_if.is_had_return = TRUE; scope->se_u.se_if.is_had_return = TRUE;
if (cctx->ctx_skip == SKIP_UNKNONW) if (cctx->ctx_skip == SKIP_UNKNOWN)
{ {
// "where" is set when ":elseif", "else" or ":endif" is found // "where" is set when ":elseif", "else" or ":endif" is found
scope->se_u.se_if.is_if_label = instr->ga_len; scope->se_u.se_if.is_if_label = instr->ga_len;
@@ -5731,7 +5731,7 @@ compile_elseif(char_u *arg, cctx_T *cctx)
if (!cctx->ctx_had_return) if (!cctx->ctx_had_return)
scope->se_u.se_if.is_had_return = FALSE; scope->se_u.se_if.is_had_return = FALSE;
if (cctx->ctx_skip == SKIP_UNKNONW) if (cctx->ctx_skip == SKIP_UNKNOWN)
{ {
if (compile_jump_to_end(&scope->se_u.se_if.is_end_label, if (compile_jump_to_end(&scope->se_u.se_if.is_end_label,
JUMP_ALWAYS, cctx) == FAIL) JUMP_ALWAYS, cctx) == FAIL)
@@ -5761,7 +5761,7 @@ compile_elseif(char_u *arg, cctx_T *cctx)
else else
{ {
// Not a constant, generate instructions for the expression. // Not a constant, generate instructions for the expression.
cctx->ctx_skip = SKIP_UNKNONW; cctx->ctx_skip = SKIP_UNKNOWN;
if (generate_ppconst(cctx, &ppconst) == FAIL) if (generate_ppconst(cctx, &ppconst) == FAIL)
return NULL; return NULL;
@@ -5794,7 +5794,7 @@ compile_else(char_u *arg, cctx_T *cctx)
if (scope->se_skip_save != SKIP_YES) if (scope->se_skip_save != SKIP_YES)
{ {
// jump from previous block to the end, unless the else block is empty // jump from previous block to the end, unless the else block is empty
if (cctx->ctx_skip == SKIP_UNKNONW) if (cctx->ctx_skip == SKIP_UNKNOWN)
{ {
if (!cctx->ctx_had_return if (!cctx->ctx_had_return
&& compile_jump_to_end(&scope->se_u.se_if.is_end_label, && compile_jump_to_end(&scope->se_u.se_if.is_end_label,
@@ -5802,7 +5802,7 @@ compile_else(char_u *arg, cctx_T *cctx)
return NULL; return NULL;
} }
if (cctx->ctx_skip == SKIP_UNKNONW) if (cctx->ctx_skip == SKIP_UNKNOWN)
{ {
if (scope->se_u.se_if.is_if_label >= 0) if (scope->se_u.se_if.is_if_label >= 0)
{ {
@@ -5813,7 +5813,7 @@ compile_else(char_u *arg, cctx_T *cctx)
} }
} }
if (cctx->ctx_skip != SKIP_UNKNONW) if (cctx->ctx_skip != SKIP_UNKNOWN)
cctx->ctx_skip = cctx->ctx_skip == SKIP_YES ? SKIP_NOT : SKIP_YES; cctx->ctx_skip = cctx->ctx_skip == SKIP_YES ? SKIP_NOT : SKIP_YES;
} }