patch 8.2.1512: failure after trinary expression fails
Problem: Failure after trinary expression fails.
Solution: Restore eval_flags. (Yasuhiro Matsumoto, closes #6776)
diff --git a/src/eval.c b/src/eval.c
index 4b1e0f1..056ac76 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2167,7 +2167,10 @@
evalarg_used->eval_flags = result ? orig_flags
: orig_flags & ~EVAL_EVALUATE;
if (eval1(arg, rettv, evalarg_used) == FAIL)
+ {
+ evalarg_used->eval_flags = orig_flags;
return FAIL;
+ }
/*
* Check for the ":".
@@ -2178,6 +2181,7 @@
emsg(_(e_missing_colon));
if (evaluate && result)
clear_tv(rettv);
+ evalarg_used->eval_flags = orig_flags;
return FAIL;
}
if (getnext)
@@ -2188,6 +2192,7 @@
{
error_white_both(p, 1);
clear_tv(rettv);
+ evalarg_used->eval_flags = orig_flags;
return FAIL;
}
*arg = p;
@@ -2200,6 +2205,7 @@
{
error_white_both(p, 1);
clear_tv(rettv);
+ evalarg_used->eval_flags = orig_flags;
return FAIL;
}
*arg = skipwhite_and_linebreak(*arg + 1, evalarg_used);
@@ -2209,6 +2215,7 @@
{
if (evaluate && result)
clear_tv(rettv);
+ evalarg_used->eval_flags = orig_flags;
return FAIL;
}
if (evaluate && !result)