Mercurial > octave
view libinterp/operators/op-m-s.cc @ 21647:66cae7a6dc47
eliminate some macros for operator definitions
* ops.h (CAST_UNOP_ARG, CAST_BINOP_ARGS, CAST_CONV_ARG, ASSIGNOPDECL,
NULLASSIGNOPDECL, ASSIGNANYOPDECL, DEFASSIGNOP, DEFASSIGNOP_FN,
UNOPDECL, BINOPDECL, CATOPDECL): Delete macros.
* make_int.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-flt-cx-diag.cc,
ov-flt-re-diag.cc, ov-lazy-idx.cc, ov-null-mat.cc, ov-perm.cc,
ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-scalar.cc, ov-str-mat.cc,
op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-bm.cc, op-bm-sbm.cc,
op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-cm-cm.cc, op-cm-cs.cc,
op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc,
op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc,
op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc,
op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc,
op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc,
op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc,
op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc,
op-fs-fs.cc, op-int-conv.cc, op-int.h, op-m-cm.cc, op-m-cs.cc,
op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc,
op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc,
op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc,
op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc,
op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc,
op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc,
op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, ops.h:
Expand eliminated macros in place.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 27 Apr 2016 16:13:40 -0400 |
parents | 40de9f8f23a6 |
children | aba2e6293dd8 |
line wrap: on
line source
/* Copyright (C) 1996-2015 John W. Eaton 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 "errwarn.h" #include "ovl.h" #include "ov.h" #include "ov-re-mat.h" #include "ov-flt-re-mat.h" #include "ov-flt-cx-mat.h" #include "ov-scalar.h" #include "ov-typeinfo.h" #include "ops.h" #include "xdiv.h" #include "xpow.h" // matrix by scalar ops. DEFNDBINOP_OP (add, matrix, scalar, array, scalar, +) DEFNDBINOP_OP (sub, matrix, scalar, array, scalar, -) DEFNDBINOP_OP (mul, matrix, scalar, array, scalar, *) DEFBINOP (div, matrix, scalar) { const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); double d = v2.double_value (); if (d == 0.0) warn_divide_by_zero (); return octave_value (v1.array_value () / d); } DEFBINOP_FN (pow, matrix, scalar, xpow) DEFBINOP (ldiv, matrix, scalar) { const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); Matrix m1 = v1.matrix_value (); Matrix m2 = v2.matrix_value (); MatrixType typ = v1.matrix_type (); Matrix ret = xleftdiv (m1, m2, typ); v1.matrix_type (typ); return ret; } DEFNDBINOP_FN (lt, matrix, scalar, array, scalar, mx_el_lt) DEFNDBINOP_FN (le, matrix, scalar, array, scalar, mx_el_le) DEFNDBINOP_FN (eq, matrix, scalar, array, scalar, mx_el_eq) DEFNDBINOP_FN (ge, matrix, scalar, array, scalar, mx_el_ge) DEFNDBINOP_FN (gt, matrix, scalar, array, scalar, mx_el_gt) DEFNDBINOP_FN (ne, matrix, scalar, array, scalar, mx_el_ne) DEFNDBINOP_OP (el_mul, matrix, scalar, array, scalar, *) DEFBINOP (el_div, matrix, scalar) { const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); double d = v2.double_value (); if (d == 0.0) warn_divide_by_zero (); return octave_value (v1.array_value () / d); } DEFNDBINOP_FN (el_pow, matrix, scalar, array, scalar, elem_xpow) DEFBINOP (el_ldiv, matrix, scalar) { const octave_matrix& v1 = dynamic_cast<const octave_matrix&> (a1); const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); return x_el_div (v2.double_value (), v1.array_value ()); } DEFNDBINOP_FN (el_and, matrix, scalar, array, scalar, mx_el_and) DEFNDBINOP_FN (el_or, matrix, scalar, array, scalar, mx_el_or) DEFNDCATOP_FN (m_s, matrix, scalar, array, array, concat) DEFNDASSIGNOP_FN (assign, matrix, scalar, scalar, assign) DEFNDASSIGNOP_FN (sgl_assign, float_matrix, scalar, float_scalar, assign) DEFNDASSIGNOP_FN (clx_sgl_assign, float_complex_matrix, scalar, float_complex, assign) DEFNDASSIGNOP_OP (assign_add, matrix, scalar, scalar, +=) DEFNDASSIGNOP_OP (assign_sub, matrix, scalar, scalar, -=) DEFNDASSIGNOP_OP (assign_mul, matrix, scalar, scalar, *=) DEFNDASSIGNOP_OP (assign_div, matrix, scalar, scalar, /=) void install_m_s_ops (void) { INSTALL_BINOP (op_add, octave_matrix, octave_scalar, add); INSTALL_BINOP (op_sub, octave_matrix, octave_scalar, sub); INSTALL_BINOP (op_mul, octave_matrix, octave_scalar, mul); INSTALL_BINOP (op_div, octave_matrix, octave_scalar, div); INSTALL_BINOP (op_pow, octave_matrix, octave_scalar, pow); INSTALL_BINOP (op_ldiv, octave_matrix, octave_scalar, ldiv); // INSTALL_BINOP (op_lt, octave_matrix, octave_scalar, lt); octave_value_typeinfo::register_binary_op (octave_value::op_lt, octave_matrix::static_type_id (), octave_scalar::static_type_id (), oct_binop_lt); INSTALL_BINOP (op_le, octave_matrix, octave_scalar, le); INSTALL_BINOP (op_eq, octave_matrix, octave_scalar, eq); INSTALL_BINOP (op_ge, octave_matrix, octave_scalar, ge); INSTALL_BINOP (op_gt, octave_matrix, octave_scalar, gt); INSTALL_BINOP (op_ne, octave_matrix, octave_scalar, ne); INSTALL_BINOP (op_el_mul, octave_matrix, octave_scalar, el_mul); INSTALL_BINOP (op_el_div, octave_matrix, octave_scalar, el_div); INSTALL_BINOP (op_el_pow, octave_matrix, octave_scalar, el_pow); INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_scalar, el_ldiv); INSTALL_BINOP (op_el_and, octave_matrix, octave_scalar, el_and); INSTALL_BINOP (op_el_or, octave_matrix, octave_scalar, el_or); INSTALL_CATOP (octave_matrix, octave_scalar, m_s); INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_scalar, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_scalar, sgl_assign); INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_scalar, clx_sgl_assign); INSTALL_ASSIGNOP (op_add_eq, octave_matrix, octave_scalar, assign_add); INSTALL_ASSIGNOP (op_sub_eq, octave_matrix, octave_scalar, assign_sub); INSTALL_ASSIGNOP (op_mul_eq, octave_matrix, octave_scalar, assign_mul); INSTALL_ASSIGNOP (op_div_eq, octave_matrix, octave_scalar, assign_div); }