Mercurial > octave
view libinterp/parse-tree/pt-binop.h @ 31394:7781b1e77406
use separate class for braindead shortcircuit evaluation
Change adapted from patch #10238 by Petter Tomner <tomner@kth.se>.
* parse.h, oct-parse.yy
(base_parser::maybe_convert_to_braindead_shortcircuit): New function.
(if_cmd_list1, elseif_clause, loop_command): Use it to convert
expressions that could be evaluated using Matlab-style short-circuit
rules to be tree_braindead_shortcircuit_binary_expression objects
instead of simple tree_binary_expression objects.
* pt-exp.h (tree_expression::mark_braindead_shortcircuit): Delete.
* pt-binop.h (tree_binary_expression::mark_braindead_shortcircuit):
Delete.
* pt-binop.h, pt-binop.cc
(tree_braindead_shortcircuit_binary_expression): New class to evaluate
Matlab-style short-circuit expressions.
* pt-binop.h, pt-binop.cc (tree_binary_expression::preserve_operands):
New function.
(tree_binary_expression::m_preserve_operands): New private data member.
(tree_binary_expression::m_eligible_for_braindead_shortcircuit):
Delete data member.
(tree_binary_expression::is_eligible_for_braindead_shortcircuit):
Delete function.
(tree_binary_expression::mark_braindead_shortcircuit): Delete function.
(tree_binary_expression::~tree_binary_expression): Don't delete m_lhs
or m_rhs if m_preserve_operands is true.
(tree_binary_expression::evaluate): Don't check for or process
Matlab-style short-circuit expressions here.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 03 Nov 2022 17:50:24 -0400 |
parents | c3ed2ad87aca |
children | e88a07dec498 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 1996-2022 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if ! defined (octave_pt_binop_h) #define octave_pt_binop_h 1 #include "octave-config.h" #include <string> class octave_value; class octave_value_list; #include "ov.h" #include "pt-exp.h" #include "pt-walk.h" namespace octave { class symbol_scope; // Binary expressions. class tree_binary_expression : public tree_expression { public: tree_binary_expression (int l = -1, int c = -1, octave_value::binary_op t = octave_value::unknown_binary_op) : tree_expression (l, c), m_lhs (nullptr), m_rhs (nullptr), m_etype (t), m_preserve_operands (false) { } tree_binary_expression (tree_expression *a, tree_expression *b, int l = -1, int c = -1, octave_value::binary_op t = octave_value::unknown_binary_op) : tree_expression (l, c), m_lhs (a), m_rhs (b), m_etype (t), m_preserve_operands (false) { } // No copying! tree_binary_expression (const tree_binary_expression&) = delete; tree_binary_expression& operator = (const tree_binary_expression&) = delete; ~tree_binary_expression (void) { if (! m_preserve_operands) { delete m_lhs; delete m_rhs; } } void preserve_operands (void) { m_preserve_operands = true; } bool is_binary_expression (void) const { return true; } bool rvalue_ok (void) const { return true; } std::string oper (void) const; octave_value::binary_op op_type (void) const { return m_etype; } tree_expression * lhs (void) { return m_lhs; } tree_expression * rhs (void) { return m_rhs; } tree_expression * dup (symbol_scope& scope) const; octave_value evaluate (tree_evaluator&, int nargout = 1); octave_value_list evaluate_n (tree_evaluator& tw, int nargout = 1) { return ovl (evaluate (tw, nargout)); } void accept (tree_walker& tw) { tw.visit_binary_expression (*this); } std::string profiler_name (void) const { return "binary " + oper (); } void matlab_style_short_circuit_warning (const char *op); protected: // The operands for the expression. tree_expression *m_lhs; tree_expression *m_rhs; private: // The type of the expression. octave_value::binary_op m_etype; // If TRUE, don't delete m_lhs and m_rhs in destructor; bool m_preserve_operands; }; class tree_braindead_shortcircuit_binary_expression : public tree_binary_expression { public: tree_braindead_shortcircuit_binary_expression (tree_expression *a, tree_expression *b, int l, int c, octave_value::binary_op t) : tree_binary_expression (a, b, l, c, t) { } // No copying! tree_braindead_shortcircuit_binary_expression (const tree_braindead_shortcircuit_binary_expression&) = delete; tree_braindead_shortcircuit_binary_expression& operator = (const tree_braindead_shortcircuit_binary_expression&) = delete; ~tree_braindead_shortcircuit_binary_expression (void) = default; tree_expression * dup (symbol_scope& scope) const; octave_value evaluate (tree_evaluator&, int nargout = 1); using tree_binary_expression::evaluate_n; }; // Boolean expressions. class tree_boolean_expression : public tree_binary_expression { public: enum type { unknown, bool_and, bool_or }; tree_boolean_expression (int l = -1, int c = -1, type t = unknown) : tree_binary_expression (l, c), m_etype (t) { } tree_boolean_expression (tree_expression *a, tree_expression *b, int l = -1, int c = -1, type t = unknown) : tree_binary_expression (a, b, l, c), m_etype (t) { } // No copying! tree_boolean_expression (const tree_boolean_expression&) = delete; tree_boolean_expression& operator = (const tree_boolean_expression&) = delete; ~tree_boolean_expression (void) = default; bool is_boolean_expression (void) const { return true; } bool rvalue_ok (void) const { return true; } std::string oper (void) const; type op_type (void) const { return m_etype; } tree_expression * dup (symbol_scope& scope) const; octave_value evaluate (tree_evaluator&, int nargout = 1); octave_value_list evaluate_n (tree_evaluator& tw, int nargout = 1) { return ovl (evaluate (tw, nargout)); } void accept (tree_walker& tw) { tw.visit_boolean_expression (*this); } private: // The type of the expression. type m_etype; }; } #endif