Mercurial > hg > octave-nkf
view libinterp/octave-value/ov-type-conv.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 | 175b392e91fe |
children | 4197fc428c7d |
line wrap: on
line source
/* Copyright (C) 2004-2013 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #if !defined (octave_ov_type_conv_h) #define octave_ov_type_conv_h 1 static octave_value octave_type_conv_body (const octave_value &arg, const std::string& name, int t_result) { int t_arg = arg.type_id (); octave_value retval; if (t_arg == t_result || arg.class_name () == name) { retval = arg; } else { octave_base_value::type_conv_fcn cf1 = octave_value_typeinfo::lookup_type_conv_op (t_arg, t_result); if (cf1) { octave_base_value *tmp (cf1 (*(arg.internal_rep ()))); if (tmp) { retval = octave_value (tmp); retval.maybe_mutate (); } } else { octave_base_value::type_conv_fcn cf2 = arg.numeric_conversion_function (); if (cf2) { octave_base_value *tmp (cf2 (*(arg.internal_rep ()))); if (tmp) { octave_value xarg (tmp); retval = octave_type_conv_body (xarg, name, t_result); } } } } return retval; } #define OCTAVE_TYPE_CONV_BODY3(NAME, MATRIX_RESULT_T, SCALAR_RESULT_T) \ \ octave_value retval; \ \ int nargin = args.length (); \ \ if (nargin == 1) \ { \ const octave_value arg = args(0); \ \ int t_result = MATRIX_RESULT_T::static_type_id (); \ \ retval = octave_type_conv_body (arg, #NAME, t_result); \ if (retval.is_undefined ()) \ { \ std::string arg_tname = arg.type_name (); \ \ std::string result_tname = arg.numel () == 1 \ ? SCALAR_RESULT_T::static_type_name () \ : MATRIX_RESULT_T::static_type_name (); \ \ gripe_invalid_conversion (arg_tname, result_tname); \ } \ } \ else \ print_usage (); \ \ return retval #define OCTAVE_TYPE_CONV_BODY(NAME) \ OCTAVE_TYPE_CONV_BODY3 (NAME, octave_ ## NAME ## _matrix, \ octave_ ## NAME ## _scalar) #endif