Mercurial > octave-nkf
view libinterp/parse-tree/pt-cbinop.cc @ 19632:76478d2da117
unconditionally disable the octave_allocator class
* configure.ac: Delete the --enable-octave-allocator option.
* oct-alloc.h: Delete octave_allocator class. Warn if file is
included. Unconditionally define macros to be empty.
* NEWS: Make note of these changes.
* oct-alloc.cc: Delete.
* liboctave/util/module.mk (UTIL_SRC): Remove it from the list.
* make_int.cc, Cell.h, oct-obj.cc, oct-obj.h, audiodevinfo.cc,
ov-base-int.h, ov-base-scalar.h, ov-bool-mat.cc, ov-bool-mat.h,
ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h,
ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.h,
ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc,
ov-complex.h, ov-cs-list.cc, ov-cs-list.h, ov-cx-diag.cc,
ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc,
ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc,
ov-fcn-handle.h, ov-fcn-inline.cc, ov-fcn-inline.h, ov-fcn.cc,
ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc,
ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h,
ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc,
ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-java.cc,
ov-java.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-perm.cc, ov-perm.h,
ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc,
ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h,
ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc,
ov-usr-fcn.h, ov.cc, ov.h, pt-const.cc, pt-const.h, idx-vector.cc,
idx-vector.h: Delete uses of oct-alloc.h and OCTAVE_ALLOCATOR macros.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 20 Jan 2015 13:43:29 -0500 |
parents | 6a71e5030df5 |
children | bf88eab464b8 |
line wrap: on
line source
/* Copyright (C) 2008-2013 Jaroslav Hajek 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 <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "error.h" #include "oct-obj.h" #include "ov.h" #include "pt-cbinop.h" #include "pt-bp.h" #include "pt-unop.h" #include "pt-walk.h" // If a tree expression is a transpose or hermitian transpose, return // the argument and corresponding operator. static octave_value::unary_op strip_trans_herm (tree_expression *&exp) { if (exp->is_unary_expression ()) { tree_unary_expression *uexp = dynamic_cast<tree_unary_expression *> (exp); octave_value::unary_op op = uexp->op_type (); if (op == octave_value::op_transpose || op == octave_value::op_hermitian) exp = uexp->operand (); else op = octave_value::unknown_unary_op; return op; } else return octave_value::unknown_unary_op; } static octave_value::unary_op strip_not (tree_expression *&exp) { if (exp->is_unary_expression ()) { tree_unary_expression *uexp = dynamic_cast<tree_unary_expression *> (exp); octave_value::unary_op op = uexp->op_type (); if (op == octave_value::op_not) exp = uexp->operand (); else op = octave_value::unknown_unary_op; return op; } else return octave_value::unknown_unary_op; } // Possibly convert multiplication to trans_mul, mul_trans, herm_mul, // or mul_herm. static octave_value::compound_binary_op simplify_mul_op (tree_expression *&a, tree_expression *&b) { octave_value::compound_binary_op retop = octave_value::unknown_compound_binary_op; octave_value::unary_op opa = strip_trans_herm (a); if (opa == octave_value::op_hermitian) retop = octave_value::op_herm_mul; else if (opa == octave_value::op_transpose) retop = octave_value::op_trans_mul; else { octave_value::unary_op opb = strip_trans_herm (b); if (opb == octave_value::op_hermitian) retop = octave_value::op_mul_herm; else if (opb == octave_value::op_transpose) retop = octave_value::op_mul_trans; } return retop; } // Possibly convert left division to trans_ldiv or herm_ldiv. static octave_value::compound_binary_op simplify_ldiv_op (tree_expression *&a, tree_expression *&) { octave_value::compound_binary_op retop = octave_value::unknown_compound_binary_op; octave_value::unary_op opa = strip_trans_herm (a); if (opa == octave_value::op_hermitian) retop = octave_value::op_herm_ldiv; else if (opa == octave_value::op_transpose) retop = octave_value::op_trans_ldiv; return retop; } // Possibly contract and/or with negation. static octave_value::compound_binary_op simplify_and_or_op (tree_expression *&a, tree_expression *&b, octave_value::binary_op op) { octave_value::compound_binary_op retop = octave_value::unknown_compound_binary_op; octave_value::unary_op opa = strip_not (a); if (opa == octave_value::op_not) { if (op == octave_value::op_el_and) retop = octave_value::op_el_not_and; else if (op == octave_value::op_el_or) retop = octave_value::op_el_not_or; } else { octave_value::unary_op opb = strip_not (b); if (opb == octave_value::op_not) { if (op == octave_value::op_el_and) retop = octave_value::op_el_and_not; else if (op == octave_value::op_el_or) retop = octave_value::op_el_or_not; } } return retop; } tree_binary_expression * maybe_compound_binary_expression (tree_expression *a, tree_expression *b, int l, int c, octave_value::binary_op t) { tree_expression *ca = a; tree_expression *cb = b; octave_value::compound_binary_op ct; switch (t) { case octave_value::op_mul: ct = simplify_mul_op (ca, cb); break; case octave_value::op_ldiv: ct = simplify_ldiv_op (ca, cb); break; case octave_value::op_el_and: case octave_value::op_el_or: ct = simplify_and_or_op (ca, cb, t); break; default: ct = octave_value::unknown_compound_binary_op; break; } tree_binary_expression *ret = (ct == octave_value::unknown_compound_binary_op) ? new tree_binary_expression (a, b, l, c, t) : new tree_compound_binary_expression (a, b, l, c, t, ca, cb, ct); return ret; }