Mercurial > octave
comparison libinterp/operators/op-fm-fs.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 |
|---|---|
| 41 DEFNDBINOP_OP (sub, float_matrix, float_scalar, float_array, float_scalar, -) | 41 DEFNDBINOP_OP (sub, float_matrix, float_scalar, float_array, float_scalar, -) |
| 42 DEFNDBINOP_OP (mul, float_matrix, float_scalar, float_array, float_scalar, *) | 42 DEFNDBINOP_OP (mul, float_matrix, float_scalar, float_array, float_scalar, *) |
| 43 | 43 |
| 44 DEFBINOP (div, float_matrix, float) | 44 DEFBINOP (div, float_matrix, float) |
| 45 { | 45 { |
| 46 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_scalar&); | 46 const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1); |
| 47 const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); | |
| 47 | 48 |
| 48 float d = v2.float_value (); | 49 float d = v2.float_value (); |
| 49 | 50 |
| 50 if (d == 0.0) | 51 if (d == 0.0) |
| 51 warn_divide_by_zero (); | 52 warn_divide_by_zero (); |
| 55 | 56 |
| 56 DEFBINOP_FN (pow, float_matrix, float_scalar, xpow) | 57 DEFBINOP_FN (pow, float_matrix, float_scalar, xpow) |
| 57 | 58 |
| 58 DEFBINOP (ldiv, float_matrix, float) | 59 DEFBINOP (ldiv, float_matrix, float) |
| 59 { | 60 { |
| 60 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_scalar&); | 61 const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1); |
| 62 const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); | |
| 61 | 63 |
| 62 FloatMatrix m1 = v1.float_matrix_value (); | 64 FloatMatrix m1 = v1.float_matrix_value (); |
| 63 FloatMatrix m2 = v2.float_matrix_value (); | 65 FloatMatrix m2 = v2.float_matrix_value (); |
| 64 MatrixType typ = v1.matrix_type (); | 66 MatrixType typ = v1.matrix_type (); |
| 65 | 67 |
| 84 | 86 |
| 85 DEFNDBINOP_OP (el_mul, float_matrix, float_scalar, float_array, float_scalar, *) | 87 DEFNDBINOP_OP (el_mul, float_matrix, float_scalar, float_array, float_scalar, *) |
| 86 | 88 |
| 87 DEFBINOP (el_div, float_matrix, float) | 89 DEFBINOP (el_div, float_matrix, float) |
| 88 { | 90 { |
| 89 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_scalar&); | 91 const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1); |
| 92 const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); | |
| 90 | 93 |
| 91 float d = v2.float_value (); | 94 float d = v2.float_value (); |
| 92 | 95 |
| 93 if (d == 0.0) | 96 if (d == 0.0) |
| 94 warn_divide_by_zero (); | 97 warn_divide_by_zero (); |
| 99 DEFNDBINOP_FN (el_pow, float_matrix, float_scalar, float_array, | 102 DEFNDBINOP_FN (el_pow, float_matrix, float_scalar, float_array, |
| 100 float_scalar, elem_xpow) | 103 float_scalar, elem_xpow) |
| 101 | 104 |
| 102 DEFBINOP (el_ldiv, float_matrix, float) | 105 DEFBINOP (el_ldiv, float_matrix, float) |
| 103 { | 106 { |
| 104 CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_scalar&); | 107 const octave_float_matrix& v1 = dynamic_cast<const octave_float_matrix&> (a1); |
| 108 const octave_float_scalar& v2 = dynamic_cast<const octave_float_scalar&> (a2); | |
| 105 | 109 |
| 106 return x_el_div (v2.float_value (), v1.float_array_value ()); | 110 return x_el_div (v2.float_value (), v1.float_array_value ()); |
| 107 } | 111 } |
| 108 | 112 |
| 109 DEFNDBINOP_FN (el_and, float_matrix, float_scalar, float_array, | 113 DEFNDBINOP_FN (el_and, float_matrix, float_scalar, float_array, |