Mercurial > octave
comparison libinterp/operators/op-cs-cm.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 |
|---|---|
| 40 DEFNDBINOP_OP (sub, complex, complex_matrix, complex, complex_array, -) | 40 DEFNDBINOP_OP (sub, complex, complex_matrix, complex, complex_array, -) |
| 41 DEFNDBINOP_OP (mul, complex, complex_matrix, complex, complex_array, *) | 41 DEFNDBINOP_OP (mul, complex, complex_matrix, complex, complex_array, *) |
| 42 | 42 |
| 43 DEFBINOP (div, complex, complex_matrix) | 43 DEFBINOP (div, complex, complex_matrix) |
| 44 { | 44 { |
| 45 CAST_BINOP_ARGS (const octave_complex&, const octave_complex_matrix&); | 45 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
| 46 const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); | |
| 46 | 47 |
| 47 ComplexMatrix m1 = v1.complex_matrix_value (); | 48 ComplexMatrix m1 = v1.complex_matrix_value (); |
| 48 ComplexMatrix m2 = v2.complex_matrix_value (); | 49 ComplexMatrix m2 = v2.complex_matrix_value (); |
| 49 MatrixType typ = v2.matrix_type (); | 50 MatrixType typ = v2.matrix_type (); |
| 50 | 51 |
| 56 | 57 |
| 57 DEFBINOP_FN (pow, complex, complex_matrix, xpow) | 58 DEFBINOP_FN (pow, complex, complex_matrix, xpow) |
| 58 | 59 |
| 59 DEFBINOP (ldiv, complex, complex_matrix) | 60 DEFBINOP (ldiv, complex, complex_matrix) |
| 60 { | 61 { |
| 61 CAST_BINOP_ARGS (const octave_complex&, const octave_complex_matrix&); | 62 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
| 63 const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); | |
| 62 | 64 |
| 63 Complex d = v1.complex_value (); | 65 Complex d = v1.complex_value (); |
| 64 | 66 |
| 65 if (d == 0.0) | 67 if (d == 0.0) |
| 66 warn_divide_by_zero (); | 68 warn_divide_by_zero (); |
| 87 DEFNDBINOP_FN (el_pow, complex, complex_matrix, complex, complex_array, | 89 DEFNDBINOP_FN (el_pow, complex, complex_matrix, complex, complex_array, |
| 88 elem_xpow) | 90 elem_xpow) |
| 89 | 91 |
| 90 DEFBINOP (el_ldiv, complex, complex_matrix) | 92 DEFBINOP (el_ldiv, complex, complex_matrix) |
| 91 { | 93 { |
| 92 CAST_BINOP_ARGS (const octave_complex&, const octave_complex_matrix&); | 94 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1); |
| 95 const octave_complex_matrix& v2 = dynamic_cast<const octave_complex_matrix&> (a2); | |
| 93 | 96 |
| 94 Complex d = v1.complex_value (); | 97 Complex d = v1.complex_value (); |
| 95 | 98 |
| 96 if (d == 0.0) | 99 if (d == 0.0) |
| 97 warn_divide_by_zero (); | 100 warn_divide_by_zero (); |
| 107 DEFNDCATOP_FN (cs_cm, complex, complex_matrix, complex_array, complex_array, | 110 DEFNDCATOP_FN (cs_cm, complex, complex_matrix, complex_array, complex_array, |
| 108 concat) | 111 concat) |
| 109 | 112 |
| 110 DEFCONV (complex_matrix_conv, complex, complex_matrix) | 113 DEFCONV (complex_matrix_conv, complex, complex_matrix) |
| 111 { | 114 { |
| 112 CAST_CONV_ARG (const octave_complex&); | 115 const octave_complex& v = dynamic_cast<const octave_complex&> (a); |
| 113 | 116 |
| 114 return new octave_complex_matrix (v.complex_matrix_value ()); | 117 return new octave_complex_matrix (v.complex_matrix_value ()); |
| 115 } | 118 } |
| 116 | 119 |
| 117 void | 120 void |