Mercurial > octave-nkf
view liboctave/array/Array-util.h @ 20574:dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
* lo-array-gripes.h, lo-array-gripes.cc (index_exception):
New base class for indexing errors.
(invalid_index, out_of_range): New classes.
(gripe_index_out_of_range): New overloaded function.
(gripe_invalid_index): New overloaded functions.
Delete version with no arguments.
(gripe_invalid_assignment_size, gripe_assignment_dimension_mismatch):
Delete.
Change uses of gripe functions as needed.
* Cell.cc (Cell::index, Cell::assign, Cell::delete_elements): Use
exceptions to collect error info about and handle indexing errors.
* data.cc (Fnth_element, do_accumarray_sum, F__accumarray_sum__,
do_accumarray_minmax, do_accumarray_minmax_fun, F__accumdim_sum__):
Likewise.
* oct-map.cc (octave_map::index, octave_map::assign,
octave_map::delete_elements): Likewise.
* sparse.cc (Fsparse): Likewise.
* sub2ind.cc (Fsub2ind, Find2sub): Likewise. New tests.
* utils.cc (dims_to_numel): Likewise.
* ov-base-diag.cc (octave_base_diag<DMT, MT>::do_index_op,
octave_base_diag<DMT, MT>::subsasgn): Likewise.
* ov-base-mat.cc (octave_base_matrix<MT>::subsref,
octave_base_matrix<MT>::assign): Likewise.
* ov-base-sparse.cc (octave_base_sparse<T>::do_index_op,
octave_base_sparse<T>::assign,
octave_base_sparse<MT>::delete_elements): Likewise.
* ov-classdef.cc (cdef_object_array::subsref,
cdef_object_array::subsasgn): Likewise.
* ov-java.cc (make_java_index): Likewise.
* ov-perm.cc (octave_perm_matrix::do_index_op): Likewise.
* ov-range.cc (octave_range::do_index_op): Likewise.
* ov-re-diag.cc (octave_diag_matrix::do_index_op): Likewise.
* ov-str-mat.cc (octave_char_matrix_str::do_index_op_internal): Likewise.
* pt-assign.cc (tree_simple_assignment::rvalue1): Likewise.
* pt-idx.cc (tree_index_expression::rvalue,
tree_index_expression::lvalue): Likewise.
* Array-util.cc (sub2ind): Likewise.
* toplev.cc (main_loop): Also catch unhandled index_exception
exceptions.
* ov-base.cc (octave_base_value::index_vector): Improve error message.
* ov-re-sparse.cc (octave_sparse_matrix::index_vector): Likewise.
* ov-complex.cc (complex_index): New class.
(gripe_complex_index): New function.
(octave_complex::index_vector): Use it.
* pt-id.h, pt-id.cc (tree_identifier::is_variable,
tree_black_hole::is_variable): Now const.
* pt-idx.cc (final_index_error): New static function.
(tree_index_expression::rvalue, tree_index_expression::lvalue):
Use it.
* index.tst: New tests.
author | Lachlan Andrew <lachlanbis@gmail.com> |
---|---|
date | Fri, 02 Oct 2015 15:07:37 -0400 |
parents | 4197fc428c7d |
children |
line wrap: on
line source
/* Copyright (C) 2000-2015 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_Array_util_h) #define octave_Array_util_h 1 #include "Array.h" #include "dim-vector.h" #include "idx-vector.h" #include "lo-array-gripes.h" extern OCTAVE_API bool index_in_bounds (const Array<octave_idx_type>& ra_idx, const dim_vector& dimensions); extern OCTAVE_API void increment_index (Array<octave_idx_type>& ra_idx, const dim_vector& dimensions, int start_dimension = 0); extern OCTAVE_API octave_idx_type get_scalar_idx (Array<octave_idx_type>& idx, dim_vector& dims); extern OCTAVE_API octave_idx_type num_ones (const Array<octave_idx_type>& ra_idx); extern OCTAVE_API bool is_scalar (const dim_vector& dim); extern OCTAVE_API bool is_vector (const dim_vector& dim); extern OCTAVE_API bool any_ones (const Array<octave_idx_type>& arr); // These four compute a linear index for given dimensions, throwing // exceptions on invalid indices. extern OCTAVE_API octave_idx_type compute_index (octave_idx_type n, const dim_vector& dims); extern OCTAVE_API octave_idx_type compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims); extern OCTAVE_API octave_idx_type compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k, const dim_vector& dims); extern OCTAVE_API octave_idx_type compute_index (const Array<octave_idx_type>& ra_idx, const dim_vector& dims); extern OCTAVE_API Array<octave_idx_type> conv_to_int_array (const Array<idx_vector>& a); extern OCTAVE_API Array<idx_vector> conv_to_array (const idx_vector *tmp, const octave_idx_type len); extern OCTAVE_API dim_vector freeze (Array<idx_vector>& ra_idx, const dim_vector& dimensions, int resize_ok); extern OCTAVE_API bool vector_equivalent (const dim_vector& dv); extern OCTAVE_API bool all_ok (const Array<idx_vector>& ra_idx); extern OCTAVE_API bool any_orig_empty (const Array<idx_vector>& ra_idx); extern OCTAVE_API bool all_colon_equiv (const Array<idx_vector>& ra_idx, const dim_vector& frozen_lengths); extern OCTAVE_API bool all_ones (const Array<octave_idx_type>& arr); extern OCTAVE_API Array<octave_idx_type> get_elt_idx (const Array<idx_vector>& ra_idx, const Array<octave_idx_type>& result_idx); extern OCTAVE_API Array<octave_idx_type> get_ra_idx (octave_idx_type idx, const dim_vector& dims); extern OCTAVE_API dim_vector zero_dims_inquire (const Array<idx_vector>& ia, const dim_vector& rhdv); extern OCTAVE_API dim_vector zero_dims_inquire (const idx_vector& i, const idx_vector& j, const dim_vector& rhdv); extern OCTAVE_API idx_vector sub2ind (const dim_vector& dv, const Array<idx_vector>& idxa); extern OCTAVE_API Array<idx_vector> ind2sub (const dim_vector& dv, const idx_vector& idx); struct permute_vector { octave_idx_type pidx; octave_idx_type iidx; }; extern int OCTAVE_API permute_vector_compare (const void *a, const void *b); #endif