Mercurial > octave
diff libinterp/operators/op-scm-cm.cc @ 31867:a9c8b1f8fb32
use macro to simplify octave_base_value casts in operator functions
* ops.h (OCTAVE_DYNAMIC_CAST): Rename from DYNORSTAT_CAST.
(OCTAVE_CAST_BASE_VALUE): New macro.
* op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc,
op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.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.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-mi.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:
Replace lines like "T& v = DYNORSTAT_CAST<T&> (a)" with
"OCTAVE_CAST_BASE_VALUE (T&, v, a)".
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 28 Feb 2023 15:45:03 -0500 |
| parents | 3722c5b1a8c8 |
| children | 2e484f9f1f18 |
line wrap: on
line diff
--- a/libinterp/operators/op-scm-cm.cc Tue Feb 28 11:43:18 2023 -0500 +++ b/libinterp/operators/op-scm-cm.cc Tue Feb 28 15:45:03 2023 -0500 @@ -52,10 +52,8 @@ DEFBINOP (div, sparse_complex_matrix, complex_matrix) { - const octave_sparse_complex_matrix& v1 - = DYNORSTAT_CAST<const octave_sparse_complex_matrix&> (a1); - const octave_complex_matrix& v2 - = DYNORSTAT_CAST<const octave_complex_matrix&> (a2); + OCTAVE_CAST_BASE_VALUE (const octave_sparse_complex_matrix&, v1, a1); + OCTAVE_CAST_BASE_VALUE (const octave_complex_matrix&, v2, a2); MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.complex_matrix_value (), @@ -72,10 +70,8 @@ DEFBINOP (ldiv, sparse_complex_matrix, complex_matrix) { - const octave_sparse_complex_matrix& v1 - = DYNORSTAT_CAST<const octave_sparse_complex_matrix&> (a1); - const octave_complex_matrix& v2 - = DYNORSTAT_CAST<const octave_complex_matrix&> (a2); + OCTAVE_CAST_BASE_VALUE (const octave_sparse_complex_matrix&, v1, a1); + OCTAVE_CAST_BASE_VALUE (const octave_complex_matrix&, v2, a2); if (v1.rows () == 1 && v1.columns () == 1) return octave_value (v2.complex_array_value () / v1.complex_value ()); @@ -106,10 +102,8 @@ DEFBINOP (el_pow, sparse_complex_matrix, complex_matrix) { - const octave_sparse_complex_matrix& v1 - = DYNORSTAT_CAST<const octave_sparse_complex_matrix&> (a1); - const octave_complex_matrix& v2 - = DYNORSTAT_CAST<const octave_complex_matrix&> (a2); + OCTAVE_CAST_BASE_VALUE (const octave_sparse_complex_matrix&, v1, a1); + OCTAVE_CAST_BASE_VALUE (const octave_complex_matrix&, v2, a2); return octave_value (elem_xpow (v1.sparse_complex_matrix_value (), SparseComplexMatrix @@ -118,10 +112,8 @@ DEFBINOP (el_ldiv, sparse_complex_matrix, matrix) { - const octave_sparse_complex_matrix& v1 - = DYNORSTAT_CAST<const octave_sparse_complex_matrix&> (a1); - const octave_complex_matrix& v2 - = DYNORSTAT_CAST<const octave_complex_matrix&> (a2); + OCTAVE_CAST_BASE_VALUE (const octave_sparse_complex_matrix&, v1, a1); + OCTAVE_CAST_BASE_VALUE (const octave_complex_matrix&, v2, a2); return octave_value (quotient (v2.complex_matrix_value (), v1.sparse_complex_matrix_value ())); @@ -132,10 +124,8 @@ DEFCATOP (scm_cm, sparse_complex_matrix, complex_matrix) { - const octave_sparse_complex_matrix& v1 - = DYNORSTAT_CAST<const octave_sparse_complex_matrix&> (a1); - const octave_complex_matrix& v2 - = DYNORSTAT_CAST<const octave_complex_matrix&> (a2); + OCTAVE_CAST_BASE_VALUE (const octave_sparse_complex_matrix&, v1, a1); + OCTAVE_CAST_BASE_VALUE (const octave_complex_matrix&, v2, a2); SparseComplexMatrix tmp (v2.complex_matrix_value ()); return octave_value (v1.sparse_complex_matrix_value ().concat (tmp, ra_idx));