Mercurial > octave

comparison libinterp/operators/op-cs-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
44 DEFBINOP_OP (sub, complex, sparse_complex_matrix, -) 44 DEFBINOP_OP (sub, complex, sparse_complex_matrix, -)
45 DEFBINOP_OP (mul, complex, sparse_complex_matrix, *) 45 DEFBINOP_OP (mul, complex, sparse_complex_matrix, *)
46 46
47 DEFBINOP (div, complex, sparse_complex_matrix) 47 DEFBINOP (div, complex, sparse_complex_matrix)
48 { 48 {
49 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_complex_matrix&); 49 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
50 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
50 51
51 if (v2.rows () == 1 && v2.columns () == 1) 52 if (v2.rows () == 1 && v2.columns () == 1)
52 { 53 {
53 Complex d = v2.complex_value (); 54 Complex d = v2.complex_value ();
54 55
68 } 69 }
69 } 70 }
70 71
71 DEFBINOP (pow, complex, sparse_complex_matrix) 72 DEFBINOP (pow, complex, sparse_complex_matrix)
72 { 73 {
73 CAST_BINOP_ARGS (const octave_complex&, 74 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
74 const octave_sparse_complex_matrix&); 75 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
75 return xpow (v1.complex_value (), v2.complex_matrix_value ()); 76 return xpow (v1.complex_value (), v2.complex_matrix_value ());
76 } 77 }
77 78
78 DEFBINOP (ldiv, complex, sparse_complex_matrix) 79 DEFBINOP (ldiv, complex, sparse_complex_matrix)
79 { 80 {
80 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_complex_matrix&); 81 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
82 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
81 83
82 Complex d = v1.complex_value (); 84 Complex d = v1.complex_value ();
83 85
84 if (d == 0.0) 86 if (d == 0.0)
85 warn_divide_by_zero (); 87 warn_divide_by_zero ();
99 101
100 DEFBINOP_FN (el_pow, complex, sparse_complex_matrix, elem_xpow) 102 DEFBINOP_FN (el_pow, complex, sparse_complex_matrix, elem_xpow)
101 103
102 DEFBINOP (el_ldiv, complex, sparse_complex_matrix) 104 DEFBINOP (el_ldiv, complex, sparse_complex_matrix)
103 { 105 {
104 CAST_BINOP_ARGS (const octave_complex&, const octave_sparse_complex_matrix&); 106 const octave_complex& v1 = dynamic_cast<const octave_complex&> (a1);
107 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
105 108
106 Complex d = v1.complex_value (); 109 Complex d = v1.complex_value ();
107 octave_value retval; 110 octave_value retval;
108 111
109 if (d == 0.0) 112 if (d == 0.0)
117 DEFBINOP_FN (el_and, complex, sparse_complex_matrix, mx_el_and) 120 DEFBINOP_FN (el_and, complex, sparse_complex_matrix, mx_el_and)
118 DEFBINOP_FN (el_or, complex, sparse_complex_matrix, mx_el_or) 121 DEFBINOP_FN (el_or, complex, sparse_complex_matrix, mx_el_or)
119 122
120 DEFCATOP (cs_scm, complex, sparse_complex_matrix) 123 DEFCATOP (cs_scm, complex, sparse_complex_matrix)
121 { 124 {
122 CAST_BINOP_ARGS (octave_complex&, const octave_sparse_complex_matrix&); 125 octave_complex& v1 = dynamic_cast<octave_complex&> (a1);
126 const octave_sparse_complex_matrix& v2 = dynamic_cast<const octave_sparse_complex_matrix&> (a2);
123 SparseComplexMatrix tmp (1, 1, v1.complex_value ()); 127 SparseComplexMatrix tmp (1, 1, v1.complex_value ());
124 return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), 128 return octave_value (tmp. concat (v2.sparse_complex_matrix_value (),
125 ra_idx)); 129 ra_idx));
126 } 130 }
127 131
128 DEFCONV (sparse_complex_matrix_conv, complex, sparse_complex_matrix) 132 DEFCONV (sparse_complex_matrix_conv, complex, sparse_complex_matrix)
129 { 133 {
130 CAST_CONV_ARG (const octave_complex&); 134 const octave_complex& v = dynamic_cast<const octave_complex&> (a);
131 135
132 return new octave_sparse_complex_matrix 136 return new octave_sparse_complex_matrix
133 (SparseComplexMatrix (v.complex_matrix_value ())); 137 (SparseComplexMatrix (v.complex_matrix_value ()));
134 } 138 }
135 139