Mercurial > octave
comparison libinterp/operators/op-fcs-fcm.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 |
---|---|
45 DEFNDBINOP_OP (mul, float_complex, float_complex_matrix, float_complex, | 45 DEFNDBINOP_OP (mul, float_complex, float_complex_matrix, float_complex, |
46 float_complex_array, *) | 46 float_complex_array, *) |
47 | 47 |
48 DEFBINOP (div, float_complex, float_complex_matrix) | 48 DEFBINOP (div, float_complex, float_complex_matrix) |
49 { | 49 { |
50 CAST_BINOP_ARGS (const octave_float_complex&, | 50 const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); |
51 const octave_float_complex_matrix&); | 51 const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2); |
52 | 52 |
53 FloatComplexMatrix m1 = v1.float_complex_matrix_value (); | 53 FloatComplexMatrix m1 = v1.float_complex_matrix_value (); |
54 FloatComplexMatrix m2 = v2.float_complex_matrix_value (); | 54 FloatComplexMatrix m2 = v2.float_complex_matrix_value (); |
55 MatrixType typ = v2.matrix_type (); | 55 MatrixType typ = v2.matrix_type (); |
56 | 56 |
62 | 62 |
63 DEFBINOP_FN (pow, float_complex, float_complex_matrix, xpow) | 63 DEFBINOP_FN (pow, float_complex, float_complex_matrix, xpow) |
64 | 64 |
65 DEFBINOP (ldiv, float_complex, float_complex_matrix) | 65 DEFBINOP (ldiv, float_complex, float_complex_matrix) |
66 { | 66 { |
67 CAST_BINOP_ARGS (const octave_float_complex&, | 67 const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); |
68 const octave_float_complex_matrix&); | 68 const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2); |
69 | 69 |
70 FloatComplex d = v1.float_complex_value (); | 70 FloatComplex d = v1.float_complex_value (); |
71 | 71 |
72 if (d == 0.0f) | 72 if (d == 0.0f) |
73 warn_divide_by_zero (); | 73 warn_divide_by_zero (); |
95 DEFNDBINOP_FN (el_pow, float_complex, float_complex_matrix, float_complex, | 95 DEFNDBINOP_FN (el_pow, float_complex, float_complex_matrix, float_complex, |
96 float_complex_array, elem_xpow) | 96 float_complex_array, elem_xpow) |
97 | 97 |
98 DEFBINOP (el_ldiv, float_complex, float_complex_matrix) | 98 DEFBINOP (el_ldiv, float_complex, float_complex_matrix) |
99 { | 99 { |
100 CAST_BINOP_ARGS (const octave_float_complex&, | 100 const octave_float_complex& v1 = dynamic_cast<const octave_float_complex&> (a1); |
101 const octave_float_complex_matrix&); | 101 const octave_float_complex_matrix& v2 = dynamic_cast<const octave_float_complex_matrix&> (a2); |
102 | 102 |
103 FloatComplex d = v1.float_complex_value (); | 103 FloatComplex d = v1.float_complex_value (); |
104 | 104 |
105 if (d == 0.0f) | 105 if (d == 0.0f) |
106 warn_divide_by_zero (); | 106 warn_divide_by_zero (); |
122 DEFNDCATOP_FN (fcs_cm, float_complex, complex_matrix, float_complex_array, | 122 DEFNDCATOP_FN (fcs_cm, float_complex, complex_matrix, float_complex_array, |
123 float_complex_array, concat) | 123 float_complex_array, concat) |
124 | 124 |
125 DEFCONV (float_complex_matrix_conv, float_complex, float_complex_matrix) | 125 DEFCONV (float_complex_matrix_conv, float_complex, float_complex_matrix) |
126 { | 126 { |
127 CAST_CONV_ARG (const octave_float_complex&); | 127 const octave_float_complex& v = dynamic_cast<const octave_float_complex&> (a); |
128 | 128 |
129 return new octave_float_complex_matrix (v.float_complex_matrix_value ()); | 129 return new octave_float_complex_matrix (v.float_complex_matrix_value ()); |
130 } | 130 } |
131 | 131 |
132 void | 132 void |