Mercurial > octave
view libinterp/operators/op-range.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-range.h" #include "ov-ch-mat.h" #include "ov-scalar.h" #include "ov-re-mat.h" #include "ov-flt-re-mat.h" #include "ov-complex.h" #include "ov-cx-mat.h" #include "ov-bool.h" #include "ov-bool-mat.h" #include "ov-typeinfo.h" #include "ov-null-mat.h" #include "ops.h" #include "xpow.h" // range unary ops. DEFUNOP (not, range) { const octave_range& v = dynamic_cast<const octave_range&> (a); return octave_value (! v.matrix_value ()); } DEFUNOP_OP (uplus, range, /* no-op */) DEFUNOP_OP (uminus, range, -) DEFUNOP (transpose, range) { const octave_range& v = dynamic_cast<const octave_range&> (a); return octave_value (v.matrix_value ().transpose ()); } DEFBINOP_OP (addrs, range, scalar, +) DEFBINOP_OP (addsr, scalar, range, +) DEFBINOP_OP (subrs, range, scalar, -) DEFBINOP_OP (subsr, scalar, range, -) DEFBINOP_OP (mulrs, range, scalar, *) DEFBINOP_OP (mulsr, scalar, range, *) DEFBINOP_FN (el_powsr, scalar, range, elem_xpow) DEFBINOP_FN (el_powcsr, complex, range, elem_xpow) DEFNDCATOP_FN (r_r, range, range, array, array, concat) DEFNDCATOP_FN (r_s, range, scalar, array, array, concat) DEFNDCATOP_FN (r_m, range, matrix, array, array, concat) DEFNDCATOP_FN (r_cs, range, complex, array, complex_array, concat) DEFNDCATOP_FN (r_cm, range, complex_matrix, array, complex_array, concat) DEFNDCATOP_FN (r_b, range, bool, array, array, concat) DEFNDCATOP_FN (r_bm, range, bool_matrix, array, array, concat) DEFNDCATOP_FN (r_chm, range, char_matrix, array, char_array, concat) DEFNDCATOP_FN (s_r, scalar, range, array, array, concat) DEFNDCATOP_FN (m_r, matrix, range, array, array, concat) DEFNDCATOP_FN (cs_r, complex, range, complex_array, array, concat) DEFNDCATOP_FN (cm_r, complex_matrix, range, complex_array, array, concat) DEFNDCATOP_FN (b_r, bool, range, array, array, concat) DEFNDCATOP_FN (bm_r, bool_matrix, range, array, array, concat) DEFNDCATOP_FN (chm_r, char_matrix, range, char_array, array, concat) CONVDECL (range_to_matrix) { const octave_range& v = dynamic_cast<const octave_range&> (a); return new octave_matrix (v.array_value ()); } void install_range_ops (void) { INSTALL_UNOP (op_not, octave_range, not); INSTALL_UNOP (op_uplus, octave_range, uplus); INSTALL_UNOP (op_uminus, octave_range, uminus); INSTALL_UNOP (op_transpose, octave_range, transpose); INSTALL_UNOP (op_hermitian, octave_range, transpose); INSTALL_BINOP (op_add, octave_range, octave_scalar, addrs); INSTALL_BINOP (op_add, octave_scalar, octave_range, addsr); INSTALL_BINOP (op_sub, octave_range, octave_scalar, subrs); INSTALL_BINOP (op_sub, octave_scalar, octave_range, subsr); INSTALL_BINOP (op_mul, octave_range, octave_scalar, mulrs); INSTALL_BINOP (op_mul, octave_scalar, octave_range, mulsr); INSTALL_BINOP (op_el_pow, octave_scalar, octave_range, el_powsr); INSTALL_BINOP (op_el_pow, octave_complex, octave_range, el_powcsr); INSTALL_CATOP (octave_range, octave_range, r_r); INSTALL_CATOP (octave_range, octave_scalar, r_s); INSTALL_CATOP (octave_range, octave_matrix, r_m); INSTALL_CATOP (octave_range, octave_complex, r_cs); INSTALL_CATOP (octave_range, octave_complex_matrix, r_cm); INSTALL_CATOP (octave_range, octave_bool, r_b); INSTALL_CATOP (octave_range, octave_bool_matrix, r_bm); INSTALL_CATOP (octave_range, octave_char_matrix, r_chm); INSTALL_CATOP (octave_scalar, octave_range, s_r); INSTALL_CATOP (octave_matrix, octave_range, m_r); INSTALL_CATOP (octave_complex, octave_range, cs_r); INSTALL_CATOP (octave_complex_matrix, octave_range, cm_r); INSTALL_CATOP (octave_bool, octave_range, b_r); INSTALL_CATOP (octave_bool_matrix, octave_range, bm_r); INSTALL_CATOP (octave_char_matrix, octave_range, chm_r); // FIXME: this would be unneccessary if // octave_base_value::numeric_assign always tried converting lhs // before rhs. INSTALL_ASSIGNCONV (octave_range, octave_null_matrix, octave_matrix); INSTALL_ASSIGNCONV (octave_range, octave_null_str, octave_matrix); INSTALL_ASSIGNCONV (octave_range, octave_null_sq_str, octave_matrix); // However, this should probably be here just in case we need it. INSTALL_WIDENOP (octave_range, octave_matrix, range_to_matrix); }