Mercurial > octave
comparison libinterp/operators/op-range.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 |
|---|---|
| 43 | 43 |
| 44 // range unary ops. | 44 // range unary ops. |
| 45 | 45 |
| 46 DEFUNOP (not, range) | 46 DEFUNOP (not, range) |
| 47 { | 47 { |
| 48 CAST_UNOP_ARG (const octave_range&); | 48 const octave_range& v = dynamic_cast<const octave_range&> (a); |
| 49 | 49 |
| 50 return octave_value (! v.matrix_value ()); | 50 return octave_value (! v.matrix_value ()); |
| 51 } | 51 } |
| 52 | 52 |
| 53 DEFUNOP_OP (uplus, range, /* no-op */) | 53 DEFUNOP_OP (uplus, range, /* no-op */) |
| 54 DEFUNOP_OP (uminus, range, -) | 54 DEFUNOP_OP (uminus, range, -) |
| 55 | 55 |
| 56 DEFUNOP (transpose, range) | 56 DEFUNOP (transpose, range) |
| 57 { | 57 { |
| 58 CAST_UNOP_ARG (const octave_range&); | 58 const octave_range& v = dynamic_cast<const octave_range&> (a); |
| 59 | 59 |
| 60 return octave_value (v.matrix_value ().transpose ()); | 60 return octave_value (v.matrix_value ().transpose ()); |
| 61 } | 61 } |
| 62 | 62 |
| 63 DEFBINOP_OP (addrs, range, scalar, +) | 63 DEFBINOP_OP (addrs, range, scalar, +) |
| 86 DEFNDCATOP_FN (bm_r, bool_matrix, range, array, array, concat) | 86 DEFNDCATOP_FN (bm_r, bool_matrix, range, array, array, concat) |
| 87 DEFNDCATOP_FN (chm_r, char_matrix, range, char_array, array, concat) | 87 DEFNDCATOP_FN (chm_r, char_matrix, range, char_array, array, concat) |
| 88 | 88 |
| 89 CONVDECL (range_to_matrix) | 89 CONVDECL (range_to_matrix) |
| 90 { | 90 { |
| 91 CAST_CONV_ARG (const octave_range&); | 91 const octave_range& v = dynamic_cast<const octave_range&> (a); |
| 92 | 92 |
| 93 return new octave_matrix (v.array_value ()); | 93 return new octave_matrix (v.array_value ()); |
| 94 } | 94 } |
| 95 | 95 |
| 96 void | 96 void |