Mercurial > octave
diff libinterp/operators/op-range.cc @ 28524:455fe4a6f22c
deprecate arithmetic operators for ranges; eliminate use in Octave
* Range.h, Range.cc: Deprecate unary -, binary +, -, *, and /
operators for Range objects.
(Range::m_cache): Delete mutable data member. Remove all uses.
(Range::clear_cache): Delete function and all uses.
* op-range.cc: Eliminate special arithmetic operators for ranges. All
computations will now be performed as arrays. Eliminate special
concatenation functions.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 01 Jul 2020 15:33:53 -0400 |
| parents | c20b7290c778 |
| children | 7854d5752dd2 |
line wrap: on
line diff
--- a/libinterp/operators/op-range.cc Wed Jul 01 15:27:22 2020 -0400 +++ b/libinterp/operators/op-range.cc Wed Jul 01 15:33:53 2020 -0400 @@ -31,63 +31,13 @@ #include "ovl.h" #include "ov.h" #include "ov-range.h" -#include "ov-ch-mat.h" -#include "ov-scalar.h" #include "ov-re-mat.h" -#include "ov-flt-re-mat.h" -#include "ov-complex.h" -#include "ov-cx-mat.h" -#include "ov-bool.h" -#include "ov-bool-mat.h" #include "ov-typeinfo.h" #include "ov-null-mat.h" #include "ops.h" -#include "xpow.h" -// range unary ops. - -DEFUNOP (not, range) -{ - const octave_range& v = dynamic_cast<const octave_range&> (a); - - return octave_value (! v.matrix_value ()); -} - +// Allow +RNG_VAL to avoid conversion to array. DEFUNOP_OP (uplus, range, /* no-op */) -DEFUNOP_OP (uminus, range, -) - -DEFUNOP (transpose, range) -{ - const octave_range& v = dynamic_cast<const octave_range&> (a); - - return octave_value (v.matrix_value ().transpose ()); -} - -DEFBINOP_OP (addrs, range, scalar, +) -DEFBINOP_OP (addsr, scalar, range, +) -DEFBINOP_OP (subrs, range, scalar, -) -DEFBINOP_OP (subsr, scalar, range, -) -DEFBINOP_OP (mulrs, range, scalar, *) -DEFBINOP_OP (mulsr, scalar, range, *) - -DEFBINOP_FN (el_powsr, scalar, range, elem_xpow) -DEFBINOP_FN (el_powcsr, complex, range, elem_xpow) - -DEFNDCATOP_FN (r_r, range, range, array, array, concat) -DEFNDCATOP_FN (r_s, range, scalar, array, array, concat) -DEFNDCATOP_FN (r_m, range, matrix, array, array, concat) -DEFNDCATOP_FN (r_cs, range, complex, array, complex_array, concat) -DEFNDCATOP_FN (r_cm, range, complex_matrix, array, complex_array, concat) -DEFNDCATOP_FN (r_b, range, bool, array, array, concat) -DEFNDCATOP_FN (r_bm, range, bool_matrix, array, array, concat) -DEFNDCATOP_FN (r_chm, range, char_matrix, array, char_array, concat) -DEFNDCATOP_FN (s_r, scalar, range, array, array, concat) -DEFNDCATOP_FN (m_r, matrix, range, array, array, concat) -DEFNDCATOP_FN (cs_r, complex, range, complex_array, array, concat) -DEFNDCATOP_FN (cm_r, complex_matrix, range, complex_array, array, concat) -DEFNDCATOP_FN (b_r, bool, range, array, array, concat) -DEFNDCATOP_FN (bm_r, bool_matrix, range, array, array, concat) -DEFNDCATOP_FN (chm_r, char_matrix, range, char_array, array, concat) CONVDECL (range_to_matrix) { @@ -99,39 +49,7 @@ void install_range_ops (octave::type_info& ti) { - INSTALL_UNOP_TI (ti, op_not, octave_range, not); INSTALL_UNOP_TI (ti, op_uplus, octave_range, uplus); - INSTALL_UNOP_TI (ti, op_uminus, octave_range, uminus); - INSTALL_UNOP_TI (ti, op_transpose, octave_range, transpose); - INSTALL_UNOP_TI (ti, op_hermitian, octave_range, transpose); - - INSTALL_BINOP_TI (ti, op_add, octave_range, octave_scalar, addrs); - INSTALL_BINOP_TI (ti, op_add, octave_scalar, octave_range, addsr); - INSTALL_BINOP_TI (ti, op_sub, octave_range, octave_scalar, subrs); - INSTALL_BINOP_TI (ti, op_sub, octave_scalar, octave_range, subsr); - INSTALL_BINOP_TI (ti, op_mul, octave_range, octave_scalar, mulrs); - INSTALL_BINOP_TI (ti, op_mul, octave_scalar, octave_range, mulsr); - - INSTALL_BINOP_TI (ti, op_el_mul, octave_range, octave_scalar, mulrs); - INSTALL_BINOP_TI (ti, op_el_mul, octave_scalar, octave_range, mulsr); - INSTALL_BINOP_TI (ti, op_el_pow, octave_scalar, octave_range, el_powsr); - INSTALL_BINOP_TI (ti, op_el_pow, octave_complex, octave_range, el_powcsr); - - INSTALL_CATOP_TI (ti, octave_range, octave_range, r_r); - INSTALL_CATOP_TI (ti, octave_range, octave_scalar, r_s); - INSTALL_CATOP_TI (ti, octave_range, octave_matrix, r_m); - INSTALL_CATOP_TI (ti, octave_range, octave_complex, r_cs); - INSTALL_CATOP_TI (ti, octave_range, octave_complex_matrix, r_cm); - INSTALL_CATOP_TI (ti, octave_range, octave_bool, r_b); - INSTALL_CATOP_TI (ti, octave_range, octave_bool_matrix, r_bm); - INSTALL_CATOP_TI (ti, octave_range, octave_char_matrix, r_chm); - INSTALL_CATOP_TI (ti, octave_scalar, octave_range, s_r); - INSTALL_CATOP_TI (ti, octave_matrix, octave_range, m_r); - INSTALL_CATOP_TI (ti, octave_complex, octave_range, cs_r); - INSTALL_CATOP_TI (ti, octave_complex_matrix, octave_range, cm_r); - INSTALL_CATOP_TI (ti, octave_bool, octave_range, b_r); - INSTALL_CATOP_TI (ti, octave_bool_matrix, octave_range, bm_r); - INSTALL_CATOP_TI (ti, octave_char_matrix, octave_range, chm_r); // FIXME: this would be unnecessary if // octave_base_value::numeric_assign always tried converting lhs @@ -141,7 +59,7 @@ INSTALL_ASSIGNCONV_TI (ti, octave_range, octave_null_str, octave_matrix); INSTALL_ASSIGNCONV_TI (ti, octave_range, octave_null_sq_str, octave_matrix); - // However, this should probably be here just in case we need it. + // Hmm, this one also seems to be needed. INSTALL_WIDENOP_TI (ti, octave_range, octave_matrix, range_to_matrix); }