Mercurial > octave

comparison libinterp/operators/op-s-scm.cc @ 21647:66cae7a6dc47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
47 DEFBINOP_OP (sub, scalar, sparse_complex_matrix, -) 47 DEFBINOP_OP (sub, scalar, sparse_complex_matrix, -)
48 DEFBINOP_OP (mul, scalar, sparse_complex_matrix, *) 48 DEFBINOP_OP (mul, scalar, sparse_complex_matrix, *)
49 49
50 DEFBINOP (div, scalar, sparse_complex_matrix) 50 DEFBINOP (div, scalar, sparse_complex_matrix)
51 { 51 {
52 CAST_BINOP_ARGS (const octave_scalar&, const octave_sparse_complex_matrix&); 52 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
53 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
53 54
54 if (v2.rows () == 1 && v2.columns () == 1) 55 if (v2.rows () == 1 && v2.columns () == 1)
55 { 56 {
56 Complex d = v2.complex_value (); 57 Complex d = v2.complex_value ();
57 58
71 } 72 }
72 } 73 }
73 74
74 DEFBINOP (pow, scalar, sparse_complex_matrix) 75 DEFBINOP (pow, scalar, sparse_complex_matrix)
75 { 76 {
76 CAST_BINOP_ARGS (const octave_scalar&, 77 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
77 const octave_sparse_complex_matrix&); 78 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
78 return xpow (v1.scalar_value (), v2.complex_matrix_value ()); 79 return xpow (v1.scalar_value (), v2.complex_matrix_value ());
79 } 80 }
80 81
81 DEFBINOP (ldiv, scalar, sparse_complex_matrix) 82 DEFBINOP (ldiv, scalar, sparse_complex_matrix)
82 { 83 {
83 CAST_BINOP_ARGS (const octave_scalar&, 84 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
84 const octave_sparse_complex_matrix&); 85 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
85 86
86 double d = v1.double_value (); 87 double d = v1.double_value ();
87 octave_value retval; 88 octave_value retval;
88 89
89 if (d == 0.0) 90 if (d == 0.0)
105 DEFBINOP_FN (el_div, scalar, sparse_complex_matrix, x_el_div) 106 DEFBINOP_FN (el_div, scalar, sparse_complex_matrix, x_el_div)
106 DEFBINOP_FN (el_pow, scalar, sparse_complex_matrix, elem_xpow) 107 DEFBINOP_FN (el_pow, scalar, sparse_complex_matrix, elem_xpow)
107 108
108 DEFBINOP (el_ldiv, scalar, sparse_complex_matrix) 109 DEFBINOP (el_ldiv, scalar, sparse_complex_matrix)
109 { 110 {
110 CAST_BINOP_ARGS (const octave_scalar&, 111 const octave_scalar& v1 = dynamic_cast<const octave_scalar&> (a1);
111 const octave_sparse_complex_matrix&); 112 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
112 113
113 double d = v1.double_value (); 114 double d = v1.double_value ();
114 octave_value retval; 115 octave_value retval;
115 116
116 if (d == 0.0) 117 if (d == 0.0)
124 DEFBINOP_FN (el_and, scalar, sparse_complex_matrix, mx_el_and) 125 DEFBINOP_FN (el_and, scalar, sparse_complex_matrix, mx_el_and)
125 DEFBINOP_FN (el_or, scalar, sparse_complex_matrix, mx_el_or) 126 DEFBINOP_FN (el_or, scalar, sparse_complex_matrix, mx_el_or)
126 127
127 DEFCATOP (s_scm, scalar, sparse_compelx_matrix) 128 DEFCATOP (s_scm, scalar, sparse_compelx_matrix)
128 { 129 {
129 CAST_BINOP_ARGS (octave_scalar&, const octave_sparse_complex_matrix&); 130 octave_scalar& v1 = dynamic_cast<octave_scalar&> (a1);
131 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
130 SparseMatrix tmp (1, 1, v1.scalar_value ()); 132 SparseMatrix tmp (1, 1, v1.scalar_value ());
131 return octave_value 133 return octave_value
132 (tmp.concat (v2.sparse_complex_matrix_value (), ra_idx)); 134 (tmp.concat (v2.sparse_complex_matrix_value (), ra_idx));
133 } 135 }
134 136
135 DEFCONV (sparse_complex_matrix_conv, scalar, sparse_complex_matrix) 137 DEFCONV (sparse_complex_matrix_conv, scalar, sparse_complex_matrix)
136 { 138 {
137 CAST_CONV_ARG (const octave_scalar&); 139 const octave_scalar& v = dynamic_cast<const octave_scalar&> (a);
138 140
139 return new octave_sparse_complex_matrix 141 return new octave_sparse_complex_matrix
140 (SparseComplexMatrix (v.complex_matrix_value ())); 142 (SparseComplexMatrix (v.complex_matrix_value ()));
141 } 143 }
142 144