comparison libinterp/octave-value/ov-complex.h @ 18129:e473c4853afc gui-release

enable non-integer ranges as indices by default and deprecate preference * octave.cc (maximum_braindamage): Don't call Fdo_brainded_shortcircuit_evaluation. * error.cc (initialize_default_warning_state): Don't set Octave:noninteger-range-as-index to "error". * octave.cc (maximum_braindamage): Don't call Fallow_noninteger_range_as_index. Don't set Octave:noninteger-range-as-index to "on". * ov-range.h, ov-range.cc (Vallow_noninteger_range_as_index): Now static. Set default value to true. * ov.h (octave_value::index_vector): New arg, require_integers. * ov-base.cc, ov-base.h (octave_value::index_vector): Likewise. * ov-base-diag.cc, ov-base-diag.h, ov-bool-mat.h, ov-bool-sparse.h, ov-bool.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-colon.h, ov-complex.h, ov-float.h, ov-flt-re-mat.h, ov-intx.h, ov-lazy-idx.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.h: Make corresponding changes in all derived methods. * ov-range.cc (octave_range::index_vector): If new require_integers argument is true, also require integer arguments regardless of the setting of Vallow_noninteger_range_as_index. * utils.cc (Fisindex): Don't temporarily set Vallow_noninteger_range_as_index. Call index_vector with argument of true. * NEWS: Mention change in default value, warning state and deprecated function.
author John W. Eaton <jwe@octave.org>
date Wed, 11 Dec 2013 23:35:34 -0500
parents ebb3ef964372
children 76478d2da117
comparison
equal deleted inserted replaced
18128:4a4897cd6da1 18129:e473c4853afc
78 78
79 octave_value do_index_op (const octave_value_list& idx, 79 octave_value do_index_op (const octave_value_list& idx,
80 bool resize_ok = false); 80 bool resize_ok = false);
81 81
82 // Use this to give a more specific error message 82 // Use this to give a more specific error message
83 idx_vector index_vector (void) const 83 idx_vector index_vector (bool /* require_integers */ = false) const
84 { 84 {
85 error ("attempted to use a complex scalar as an index\n" 85 error ("attempted to use a complex scalar as an index\n"
86 " (forgot to initialize i or j?)"); 86 " (forgot to initialize i or j?)");
87 return idx_vector (); 87 return idx_vector ();
88 } 88 }