Mercurial > octave
view libinterp/operators/op-dm-template.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 | b6a686543080 |
line wrap: on
line source
/* Copyright (C) 2008-2015 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 // FIXME: it might be nice to only include the declarations of the // operators that are actually needed instead of including all of them. #include "mx-ops.h" #include "ops.h" #include "xdiv.h" #include LINCLUDE #include RINCLUDE #ifdef DEFINENULLASSIGNCONV # include "ov-null-mat.h" #endif // matrix by diag matrix ops. DEFBINOP_OP (add, LMATRIX, RMATRIX, +) DEFBINOP_OP (sub, LMATRIX, RMATRIX, -) DEFBINOP_OP (mul, LMATRIX, RMATRIX, *) #ifndef LDMATRIX # define LDMATRIX LMATRIX #endif #ifndef RDMATRIX # define RDMATRIX RMATRIX #endif #define OCTAVE_LMATRIX CONCAT2(octave_, LMATRIX) #define OCTAVE_LDMATRIX CONCAT2(octave_, LDMATRIX) #define OCTAVE_RMATRIX CONCAT2(octave_, RMATRIX) #define LMATRIX_VALUE CONCAT2(LMATRIX, _value) #define RMATRIX_VALUE CONCAT2(RMATRIX, _value) #define LDMATRIX_VALUE CONCAT2(LDMATRIX, _value) #define RDMATRIX_VALUE CONCAT2(RDMATRIX, _value) #ifdef DEFINEDIV DEFBINOP (div, LMATRIX, RMATRIX) { const OCTAVE_LMATRIX& v1 = dynamic_cast<const OCTAVE_LMATRIX&> (a1); const OCTAVE_RMATRIX& v2 = dynamic_cast<const OCTAVE_RMATRIX&> (a2); return xdiv (v1.LDMATRIX_VALUE (), v2.RMATRIX_VALUE ()); } #endif #ifdef DEFINELDIV DEFBINOP (ldiv, LMATRIX, RMATRIX) { const OCTAVE_LMATRIX& v1 = dynamic_cast<const OCTAVE_LMATRIX&> (a1); const OCTAVE_RMATRIX& v2 = dynamic_cast<const OCTAVE_RMATRIX&> (a2); return xleftdiv (v1.LMATRIX_VALUE (), v2.RDMATRIX_VALUE ()); } #endif #define SHORT_NAME CONCAT3(LSHORT, _, RSHORT) #define INST_NAME CONCAT3(install_, SHORT_NAME, _ops) void INST_NAME (void) { INSTALL_BINOP (op_add, OCTAVE_LMATRIX, OCTAVE_RMATRIX, add); INSTALL_BINOP (op_sub, OCTAVE_LMATRIX, OCTAVE_RMATRIX, sub); INSTALL_BINOP (op_mul, OCTAVE_LMATRIX, OCTAVE_RMATRIX, mul); #ifdef DEFINEDIV INSTALL_BINOP (op_div, OCTAVE_LMATRIX, OCTAVE_RMATRIX, div); #endif #ifdef DEFINELDIV INSTALL_BINOP (op_ldiv, OCTAVE_LMATRIX, OCTAVE_RMATRIX, ldiv); #endif #ifdef DEFINENULLASSIGNCONV INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_matrix, OCTAVE_LDMATRIX); INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_str, OCTAVE_LDMATRIX); INSTALL_ASSIGNCONV (OCTAVE_LMATRIX, octave_null_sq_str, OCTAVE_LDMATRIX); #endif }