commit c1ec0422e43720d2e96627605532ee9806c0789f
author Bram Moolenaar <Bram@vim.org> Wed Sep 09 22:27:58 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Sep 09 22:27:58 2020 +0200
tree 567a177470c45e6b244f503ca4d89e88e7a977c3
parent 3e4cc9671c5551b73f0176cab40e676ed72a1716

patch 8.2.1650: Vim9: result of && and || expression is not bool in script

Problem:    Vim9: result of && and || expression cannot be assigned to a bool
            at the script level.
Solution:   Add the VAR_BOOL_OK flag.  Convert to bool when needed.

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 3eb4be4..6283fdf 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -2356,6 +2356,9 @@
 	    clear_evalarg(&local_evalarg, NULL);
 	else
 	    evalarg->eval_flags = orig_flags;
+
+	// Resulting value can be assigned to a bool.
+	rettv->v_lock |= VAR_BOOL_OK;
     }
 
     return OK;
@@ -2451,6 +2454,7 @@
 	    *arg = skipwhite_and_linebreak(*arg + 2, evalarg_used);
 	    evalarg_used->eval_flags = result ? orig_flags
 						 : orig_flags & ~EVAL_EVALUATE;
+	    CLEAR_FIELD(var2);
 	    if (eval4(arg, &var2, evalarg_used) == FAIL)
 		return FAIL;
 
@@ -2487,6 +2491,9 @@
 	    clear_evalarg(&local_evalarg, NULL);
 	else
 	    evalarg->eval_flags = orig_flags;
+
+	// Resulting value can be assigned to a bool.
+	rettv->v_lock |= VAR_BOOL_OK;
     }
 
     return OK;