Mercurial > octave

comparison libinterp/operators/op-scm-cs.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 3d60ed163b70
children aba2e6293dd8
comparison
equal deleted inserted replaced
21646:3cddf1e65ccf 21647:66cae7a6dc47
44 DEFBINOP_OP (sub, sparse_complex_matrix, complex, -) 44 DEFBINOP_OP (sub, sparse_complex_matrix, complex, -)
45 DEFBINOP_OP (mul, sparse_complex_matrix, complex, *) 45 DEFBINOP_OP (mul, sparse_complex_matrix, complex, *)
46 46
47 DEFBINOP (div, sparse_complex_matrix, complex) 47 DEFBINOP (div, sparse_complex_matrix, complex)
48 { 48 {
49 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, 49 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
50 const octave_complex&); 50 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
51 51
52 Complex d = v2.complex_value (); 52 Complex d = v2.complex_value ();
53 octave_value retval; 53 octave_value retval;
54 54
55 if (d == 0.0) 55 if (d == 0.0)
60 return retval; 60 return retval;
61 } 61 }
62 62
63 DEFBINOP (pow, sparse_complex_matrix, complex) 63 DEFBINOP (pow, sparse_complex_matrix, complex)
64 { 64 {
65 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, 65 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
66 const octave_complex&); 66 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
67 return xpow (v1.complex_matrix_value (), v2.complex_value ()); 67 return xpow (v1.complex_matrix_value (), v2.complex_value ());
68 } 68 }
69 69
70 DEFBINOP (ldiv, sparse_complex_matrix, complex) 70 DEFBINOP (ldiv, sparse_complex_matrix, complex)
71 { 71 {
72 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, const octave_complex&); 72 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
73 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
73 74
74 if (v1.rows () == 1 && v1.columns () == 1) 75 if (v1.rows () == 1 && v1.columns () == 1)
75 { 76 {
76 Complex d = v1.complex_value (); 77 Complex d = v1.complex_value ();
77 78
100 101
101 DEFBINOP_OP (el_mul, sparse_complex_matrix, complex, *) 102 DEFBINOP_OP (el_mul, sparse_complex_matrix, complex, *)
102 103
103 DEFBINOP (el_div, sparse_complex_matrix, complex) 104 DEFBINOP (el_div, sparse_complex_matrix, complex)
104 { 105 {
105 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, 106 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
106 const octave_complex&); 107 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
107 108
108 octave_value retval; 109 octave_value retval;
109 110
110 Complex d = v2.complex_value (); 111 Complex d = v2.complex_value ();
111 112
119 120
120 DEFBINOP_FN (el_pow, sparse_complex_matrix, complex, elem_xpow) 121 DEFBINOP_FN (el_pow, sparse_complex_matrix, complex, elem_xpow)
121 122
122 DEFBINOP (el_ldiv, sparse_complex_matrix, complex) 123 DEFBINOP (el_ldiv, sparse_complex_matrix, complex)
123 { 124 {
124 CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, 125 const octave_sparse_complex_matrix& v1 = dynamic_cast<const octave_sparse_complex_matrix&> (a1);
125 const octave_complex&); 126 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
126 127
127 return octave_value 128 return octave_value
128 (x_el_div (v2.complex_value (), v1.sparse_complex_matrix_value ())); 129 (x_el_div (v2.complex_value (), v1.sparse_complex_matrix_value ()));
129 } 130 }
130 131
131 DEFBINOP_FN (el_and, sparse_complex_matrix, complex, mx_el_and) 132 DEFBINOP_FN (el_and, sparse_complex_matrix, complex, mx_el_and)
132 DEFBINOP_FN (el_or, sparse_complex_matrix, complex, mx_el_or) 133 DEFBINOP_FN (el_or, sparse_complex_matrix, complex, mx_el_or)
133 134
134 DEFCATOP (scm_cs, sparse_complex_matrix, complex) 135 DEFCATOP (scm_cs, sparse_complex_matrix, complex)
135 { 136 {
136 CAST_BINOP_ARGS (octave_sparse_complex_matrix&, const octave_complex&); 137 octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
138 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
137 SparseComplexMatrix tmp (1, 1, v2.complex_value ()); 139 SparseComplexMatrix tmp (1, 1, v2.complex_value ());
138 return octave_value 140 return octave_value
139 (v1.sparse_complex_matrix_value (). concat (tmp, ra_idx)); 141 (v1.sparse_complex_matrix_value (). concat (tmp, ra_idx));
140 } 142 }
141 143
142 DEFASSIGNOP (assign, sparse_complex_matrix, complex) 144 DEFASSIGNOP (assign, sparse_complex_matrix, complex)
143 { 145 {
144 CAST_BINOP_ARGS (octave_sparse_complex_matrix&, const octave_complex&); 146 octave_sparse_complex_matrix& v1 = dynamic_cast<octave_sparse_complex_matrix&> (a1);
147 const octave_complex& v2 = dynamic_cast<const octave_complex&> (a2);
145 148
146 SparseComplexMatrix tmp (1, 1, v2.complex_value ()); 149 SparseComplexMatrix tmp (1, 1, v2.complex_value ());
147 v1.assign (idx, tmp); 150 v1.assign (idx, tmp);
148 return octave_value (); 151 return octave_value ();
149 } 152 }