kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 13:15:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.0.1452: code using EVAL_CONSTANT is dead, it is never set

Browse Source 
Problem:    Code using EVAL_CONSTANT is dead, it is never set.
Solution:   Remove EVAL_CONSTANT. (closes vim/vim#12252)

b7f6f93475
This commit is contained in:
zeertzjq 2023-04-14 17:54:48 +08:00
parent f12afd8e16
commit 3be966f725
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/eval.c
View File

@ -2386,7 +2386,7 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg)
} }
*arg = skipwhite(*arg + 1); *arg = skipwhite(*arg + 1);
evalarg_used->eval_flags = (op_falsy ? !result : result) evalarg_used->eval_flags = (op_falsy ? !result : result)
? orig_flags : orig_flags & ~EVAL_EVALUATE; ? orig_flags : (orig_flags & ~EVAL_EVALUATE);
typval_T var2; typval_T var2;
if (eval1(arg, &var2, evalarg_used) == FAIL) { if (eval1(arg, &var2, evalarg_used) == FAIL) {
evalarg_used->eval_flags = orig_flags; evalarg_used->eval_flags = orig_flags;
@ -2410,7 +2410,7 @@ int eval1(char **arg, typval_T *rettv, evalarg_T *const evalarg)
// Get the third variable. Recursive! // Get the third variable. Recursive!
*arg = skipwhite(*arg + 1); *arg = skipwhite(*arg + 1);
evalarg_used->eval_flags = !result ? orig_flags : orig_flags & ~EVAL_EVALUATE; evalarg_used->eval_flags = !result ? orig_flags : (orig_flags & ~EVAL_EVALUATE);
if (eval1(arg, &var2, evalarg_used) == FAIL) { if (eval1(arg, &var2, evalarg_used) == FAIL) {
if (evaluate && result) { if (evaluate && result) {
tv_clear(rettv); tv_clear(rettv);
@ -2476,7 +2476,7 @@ static int eval2(char **arg, typval_T *rettv, evalarg_T *const evalarg)
while (p[0] == '|' && p[1] == '|') { while (p[0] == '|' && p[1] == '|') {
// Get the second variable. // Get the second variable.
*arg = skipwhite(*arg + 2); *arg = skipwhite(*arg + 2);
evalarg_used->eval_flags = !result ? orig_flags : orig_flags & ~EVAL_EVALUATE; evalarg_used->eval_flags = !result ? orig_flags : (orig_flags & ~EVAL_EVALUATE);
typval_T var2; typval_T var2;
if (eval3(arg, &var2, evalarg_used) == FAIL) { if (eval3(arg, &var2, evalarg_used) == FAIL) {
return FAIL; return FAIL;
@ -2554,7 +2554,7 @@ static int eval3(char **arg, typval_T *rettv, evalarg_T *const evalarg)
while (p[0] == '&' && p[1] == '&') { while (p[0] == '&' && p[1] == '&') {
// Get the second variable. // Get the second variable.
*arg = skipwhite(*arg + 2); *arg = skipwhite(*arg + 2);
evalarg_used->eval_flags = result ? orig_flags : orig_flags & ~EVAL_EVALUATE; evalarg_used->eval_flags = result ? orig_flags : (orig_flags & ~EVAL_EVALUATE);
typval_T var2; typval_T var2;
if (eval4(arg, &var2, evalarg_used) == FAIL) { if (eval4(arg, &var2, evalarg_used) == FAIL) {
return FAIL; return FAIL;