Mercurial > octave
changeset 25832:0631e6cc9a58
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 28 Aug 2018 16:41:41 -0700 |
| parents | 9b0e5a035cd0 (current diff) d0062829754a (diff) |
| children | df57deaa075d |
| files | libinterp/parse-tree/pt-cbinop.cc |
| diffstat | 1 files changed, 11 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/parse-tree/pt-cbinop.cc Tue Aug 28 14:02:30 2018 -0400 +++ b/libinterp/parse-tree/pt-cbinop.cc Tue Aug 28 16:41:41 2018 -0700 @@ -57,6 +57,10 @@ return octave_value::unknown_unary_op; } +#if 0 + // Restore this code if short-circuit behavior can be preserved when needed. + // See bug #54465. + static octave_value::unary_op strip_not (tree_expression_ptr_t& exp) { @@ -77,6 +81,7 @@ else return octave_value::unknown_unary_op; } +#endif // Possibly convert multiplication to trans_mul, mul_trans, herm_mul, // or mul_herm. @@ -126,6 +131,9 @@ // Possibly contract and/or with negation. +#if 0 + // Restore this code if short-circuit behavior can be preserved when needed. + // See bug #54465. static octave_value::compound_binary_op simplify_and_or_op (tree_expression_ptr_t& a, tree_expression_ptr_t& b, octave_value::binary_op op) @@ -157,6 +165,7 @@ return retop; } +#endif tree_binary_expression * maybe_compound_binary_expression (tree_expression *a, tree_expression *b, @@ -177,8 +186,8 @@ break; #if 0 - // Restore this case if short-circuit behavior can be preserved - // when needed. See bug #54465. + // Restore this case if short-circuit behavior can be preserved + // when needed. See bug #54465. case octave_value::op_el_and: case octave_value::op_el_or: ct = simplify_and_or_op (ca, cb, t);