Mercurial > octave
comparison libinterp/operators/op-dms-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 | aba2e6293dd8 |
comparison
equal
deleted
inserted
replaced
| 21646:3cddf1e65ccf | 21647:66cae7a6dc47 |
|---|---|
| 58 return x; | 58 return x; |
| 59 } | 59 } |
| 60 | 60 |
| 61 DEFBINOP (dmsdiv, MATRIX, SCALAR) | 61 DEFBINOP (dmsdiv, MATRIX, SCALAR) |
| 62 { | 62 { |
| 63 CAST_BINOP_ARGS (const OCTAVE_MATRIX&, const OCTAVE_SCALAR&); | 63 const OCTAVE_MATRIX& v1 = dynamic_cast<const OCTAVE_MATRIX&> (a1); |
| 64 const OCTAVE_SCALAR& v2 = dynamic_cast<const OCTAVE_SCALAR&> (a2); | |
| 64 | 65 |
| 65 return v1.MATRIX_VALUE () / gripe_if_zero (v2.SCALAR_VALUE ()); | 66 return v1.MATRIX_VALUE () / gripe_if_zero (v2.SCALAR_VALUE ()); |
| 66 } | 67 } |
| 67 | 68 |
| 68 DEFBINOP (sdmldiv, SCALAR, MATRIX) | 69 DEFBINOP (sdmldiv, SCALAR, MATRIX) |
| 69 { | 70 { |
| 70 CAST_BINOP_ARGS (const OCTAVE_SCALAR&, const OCTAVE_MATRIX&); | 71 const OCTAVE_SCALAR& v1 = dynamic_cast<const OCTAVE_SCALAR&> (a1); |
| 72 const OCTAVE_MATRIX& v2 = dynamic_cast<const OCTAVE_MATRIX&> (a2); | |
| 71 | 73 |
| 72 return v2.MATRIX_VALUE () / gripe_if_zero (v1.SCALAR_VALUE ()); | 74 return v2.MATRIX_VALUE () / gripe_if_zero (v1.SCALAR_VALUE ()); |
| 73 } | 75 } |
| 74 | 76 |
| 75 DEFBINOP (dmspow, MATRIX, SCALAR) | 77 DEFBINOP (dmspow, MATRIX, SCALAR) |
| 76 { | 78 { |
| 77 CAST_BINOP_ARGS (const OCTAVE_MATRIX&, const OCTAVE_SCALAR&); | 79 const OCTAVE_MATRIX& v1 = dynamic_cast<const OCTAVE_MATRIX&> (a1); |
| 80 const OCTAVE_SCALAR& v2 = dynamic_cast<const OCTAVE_SCALAR&> (a2); | |
| 78 | 81 |
| 79 return xpow (v1.MATRIX_VALUE (), v2.SCALAR_VALUE ()); | 82 return xpow (v1.MATRIX_VALUE (), v2.SCALAR_VALUE ()); |
| 80 } | 83 } |
| 81 | 84 |
| 82 #define SHORT_NAME CONCAT3(MSHORT, _, SSHORT) | 85 #define SHORT_NAME CONCAT3(MSHORT, _, SSHORT) |