Mercurial > octave
comparison libinterp/operators/op-sbm-b.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 |
---|---|
52 DEFBINOP_FN (el_and, sparse_bool_matrix, bool, mx_el_and) | 52 DEFBINOP_FN (el_and, sparse_bool_matrix, bool, mx_el_and) |
53 DEFBINOP_FN (el_or, sparse_bool_matrix, bool, mx_el_or) | 53 DEFBINOP_FN (el_or, sparse_bool_matrix, bool, mx_el_or) |
54 | 54 |
55 DEFCATOP (sbm_b, sparse_bool_matrix, bool) | 55 DEFCATOP (sbm_b, sparse_bool_matrix, bool) |
56 { | 56 { |
57 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool&); | 57 octave_sparse_bool_matrix& v1 = dynamic_cast<octave_sparse_bool_matrix&> (a1); |
58 const octave_bool& v2 = dynamic_cast<const octave_bool&> (a2); | |
58 | 59 |
59 SparseBoolMatrix tmp (1, 1, v2.bool_value ()); | 60 SparseBoolMatrix tmp (1, 1, v2.bool_value ()); |
60 return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx)); | 61 return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx)); |
61 } | 62 } |
62 | 63 |
63 DEFCATOP (sm_b, sparse_matrix, bool) | 64 DEFCATOP (sm_b, sparse_matrix, bool) |
64 { | 65 { |
65 CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_bool&); | 66 octave_sparse_matrix& v1 = dynamic_cast<octave_sparse_matrix&> (a1); |
67 const octave_bool& v2 = dynamic_cast<const octave_bool&> (a2); | |
66 | 68 |
67 SparseMatrix tmp (1, 1, v2.scalar_value ()); | 69 SparseMatrix tmp (1, 1, v2.scalar_value ()); |
68 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | 70 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); |
69 } | 71 } |
70 | 72 |
71 DEFCATOP (sbm_s, sparse_bool_matrix, scalar) | 73 DEFCATOP (sbm_s, sparse_bool_matrix, scalar) |
72 { | 74 { |
73 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_scalar&); | 75 octave_sparse_bool_matrix& v1 = dynamic_cast<octave_sparse_bool_matrix&> (a1); |
76 const octave_scalar& v2 = dynamic_cast<const octave_scalar&> (a2); | |
74 | 77 |
75 SparseMatrix tmp (1, 1, v2.scalar_value ()); | 78 SparseMatrix tmp (1, 1, v2.scalar_value ()); |
76 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); | 79 return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); |
77 } | 80 } |
78 | 81 |
79 DEFASSIGNOP (assign, sparse_bool_matrix, bool) | 82 DEFASSIGNOP (assign, sparse_bool_matrix, bool) |
80 { | 83 { |
81 CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool&); | 84 octave_sparse_bool_matrix& v1 = dynamic_cast<octave_sparse_bool_matrix&> (a1); |
85 const octave_bool& v2 = dynamic_cast<const octave_bool&> (a2); | |
82 | 86 |
83 SparseBoolMatrix tmp (1, 1, v2.bool_value ()); | 87 SparseBoolMatrix tmp (1, 1, v2.bool_value ()); |
84 v1.assign (idx, tmp); | 88 v1.assign (idx, tmp); |
85 return octave_value (); | 89 return octave_value (); |
86 } | 90 } |