mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-02 16:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1447: condition is always true

Browse Source 
Problem:    Condition is always true.
Solution:   Remove the useless condition. (closes vim/vim#12253)

474891bc89
This commit is contained in:
zeertzjq
2023-04-14 09:50:51 +08:00
parent 8e2903d2fe
commit e8c25aac8d
1 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/nvim/eval/vars.c
View File

@@ -185,7 +185,6 @@ void ex_let(exarg_T *eap)
char *arg = eap->arg; char *arg = eap->arg;
char *expr = NULL; char *expr = NULL;
typval_T rettv; typval_T rettv;
int i;
int var_count = 0; int var_count = 0;
int semicolon = 0; int semicolon = 0;
char op[2]; char op[2];
@@ -221,7 +220,10 @@ void ex_let(exarg_T *eap)
list_vim_vars(&first); list_vim_vars(&first);
} }
eap->nextcmd = check_nextcmd(arg); eap->nextcmd = check_nextcmd(arg);
} else if (expr[0] == '=' && expr[1] == '<' && expr[2] == '<') { return;
}
if (expr[0] == '=' && expr[1] == '<' && expr[2] == '<') {
// HERE document // HERE document
list_T *l = heredoc_get(eap, expr + 3); list_T *l = heredoc_get(eap, expr + 3);
if (l != NULL) { if (l != NULL) {
@@ -233,44 +235,44 @@ void ex_let(exarg_T *eap)
} }
tv_clear(&rettv); tv_clear(&rettv);
} }
return;
}
rettv.v_type = VAR_UNKNOWN;
op[0] = '=';
op[1] = NUL;
if (*expr != '=') {
if (vim_strchr("+-*/%.", (uint8_t)(*expr)) != NULL) {
op[0] = *expr; // +=, -=, *=, /=, %= or .=
if (expr[0] == '.' && expr[1] == '.') { // ..=
expr++;
}
}
expr += 2;
} else { } else {
rettv.v_type = VAR_UNKNOWN; expr += 1;
}
op[0] = '='; expr = skipwhite(expr);
op[1] = NUL;
if (*expr != '=') {
if (vim_strchr("+-*/%.", (uint8_t)(*expr)) != NULL) {
op[0] = *expr; // +=, -=, *=, /=, %= or .=
if (expr[0] == '.' && expr[1] == '.') { // ..=
expr++;
}
}
expr += 2;
} else {
expr += 1;
}
expr = skipwhite(expr); if (eap->skip) {
emsg_skip++;
}
evalarg_T evalarg = {
.eval_flags = eap->skip ? 0 : EVAL_EVALUATE,
.eval_cookie = eap->getline == getsourceline ? eap->cookie : NULL,
};
int eval_res = eval0(expr, &rettv, eap, &evalarg);
if (eap->skip) {
emsg_skip--;
}
if (eap->skip) { if (!eap->skip && eval_res != FAIL) {
emsg_skip++; (void)ex_let_vars(eap->arg, &rettv, false, semicolon, var_count, is_const, op);
} }
evalarg_T evalarg = { if (eval_res != FAIL) {
.eval_flags = eap->skip ? 0 : EVAL_EVALUATE, tv_clear(&rettv);
.eval_cookie = eap->getline == getsourceline ? eap->cookie : NULL,
};
i = eval0(expr, &rettv, eap, &evalarg);
if (eap->skip) {
emsg_skip--;
}
if (eap->skip) {
if (i != FAIL) {
tv_clear(&rettv);
}
} else if (i != FAIL) {
(void)ex_let_vars(eap->arg, &rettv, false, semicolon, var_count, is_const, op);
tv_clear(&rettv);
}
} }
} }