Mercurial > octave

changeset 31909:c6827549b7d5 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix evaluation of & and | expressions in conditional contexts (bug #63935) * pt-binop.cc (tree_braindead_shortcircuit_binary_expression::evaluate): Call parent class evaluate method if expression doesn't match requirements for shortcut evaluation. This step was accidentally and incorrectly omitted in changeset 7781b1e77406.
author John W. Eaton <jwe@octave.org>
date Mon, 20 Mar 2023 12:46:05 -0400
parents d4d3098a15dc
children 31f9e97759b4
files libinterp/parse-tree/pt-binop.cc
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-binop.cc	Sat Mar 18 15:36:23 2023 -0400
+++ b/libinterp/parse-tree/pt-binop.cc	Mon Mar 20 12:46:05 2023 -0400
@@ -156,6 +156,8 @@
 
           return octave_value (result);
         }
+      else
+        return tree_binary_expression::evaluate (tw);
     }
 
   return octave_value ();