Mercurial > octave-nkf
diff libinterp/corefcn/sub2ind.cc @ 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 | a9574e3c6e9e |
| children | f90c8372b7ba |
line wrap: on
line diff
--- a/libinterp/corefcn/sub2ind.cc Fri Oct 02 12:25:39 2015 -0400 +++ b/libinterp/corefcn/sub2ind.cc Fri Oct 02 15:07:37 2015 -0400 @@ -99,11 +99,21 @@ { if (args(j+1).is_numeric_type ()) { - idxa(j) = args(j+1).index_vector (); - if (error_state) - break; - else if (j > 0 && args(j+1).dims () != args(1).dims ()) - error ("sub2ind: all subscripts must be of the same size"); + try + { + idxa(j) = args(j+1).index_vector (); + if (error_state) + break; + else if (j > 0 && args(j+1).dims () != args(1).dims ()) + error ("sub2ind: all subscripts must be of the same size"); + } + catch (index_exception& e) + { + e.set_pos_if_unset (nargin-1, j+1); + e.set_var (""); // no particular variable + (*current_liboctave_error_with_id_handler) + (e.id(), e.err()); + } } else error ("sub2ind: subscripts must be numeric"); @@ -134,23 +144,23 @@ # Test low index %!assert (sub2ind ([10 10 10], 1, 1, 1), 1) -%!error <subscript indices> sub2ind ([10 10 10], 0, 1, 1) -%!error <subscript indices> sub2ind ([10 10 10], 1, 0, 1) -%!error <subscript indices> sub2ind ([10 10 10], 1, 1, 0) +%!error <index \(0,_,_\)> sub2ind ([10 10 10], 0, 1, 1) +%!error <index \(_,0,_\)> sub2ind ([10 10 10], 1, 0, 1) +%!error <index \(_,_,0\)> sub2ind ([10 10 10], 1, 1, 0) # Test high index %!assert (sub2ind ([10 10 10], 10, 10, 10), 1000) -%!error <index out of range> sub2ind ([10 10 10], 11, 10, 10) -%!error <index out of range> sub2ind ([10 10 10], 10, 11, 10) -%!error <index out of range> sub2ind ([10 10 10], 10, 10, 11) +%!error <index \(11,_,_\); out of bound 10> sub2ind ([10 10 10], 11, 10, 10) +%!error <index \(_,11,_\); out of bound 10> sub2ind ([10 10 10], 10, 11, 10) +%!error <index \(_,_,11\); out of bound 10> sub2ind ([10 10 10], 10, 10, 11) # Test high index in the trailing dimensions %!assert (sub2ind ([10, 1], 2, 1, 1), 2) -%!error <index out of range> sub2ind ([10, 1], 1, 2, 1) -%!error <index out of range> sub2ind ([10, 1], 1, 1, 2) +%!error <index \(_,2,_\); out of bound 1> sub2ind ([10, 1], 1, 2, 1) +%!error <index \(_,_,2\); out of bound 1> sub2ind ([10, 1], 1, 1, 2) %!assert (sub2ind ([10 10], 2, 2, 1), 12) -%!error <index out of range> sub2ind ([10 10], 2, 1, 2) -%!error <index out of range> sub2ind ([10 10], 1, 2, 2) +%!error <index \(_,_,2\); out of bound 1> sub2ind ([10 10], 2, 1, 2) +%!error <index \(_,_,2\); out of bound 1> sub2ind ([10 10], 1, 2, 2) # Test handling of empty arguments %!assert (sub2ind ([10 10], zeros (0,0), zeros (0,0)), zeros (0,0)) @@ -164,8 +174,8 @@ ## Test input validation %!error <dimension vector> sub2ind ([10 10.5], 1, 1) -%!error <subscript indices> sub2ind ([10 10], 1.5, 1) -%!error <subscript indices> sub2ind ([10 10], 1, 1.5) +%!error <index \(1.5,_\)> sub2ind ([10 10], 1.5, 1) +%!error <index \(_,1.5\)> sub2ind ([10 10], 1, 1.5) */ DEFUN (ind2sub, args, nargout, @@ -195,14 +205,21 @@ else { dim_vector dv = get_dim_vector (args(0), "ind2sub"); - idx_vector idx = args(1).index_vector (); - if (! error_state) + try { - if (nargout > dv.length ()) - dv = dv.redim (nargout); + idx_vector idx = args(1).index_vector (); + if (! error_state) + { + if (nargout > dv.length ()) + dv = dv.redim (nargout); - Array<idx_vector> idxa = ind2sub (dv, idx); - retval = Array<octave_value> (idxa); + Array<idx_vector> idxa = ind2sub (dv, idx); + retval = Array<octave_value> (idxa); + } + } + catch (index_exception& e) + { + error ("ind2sub: Invalid index %s. %s", e.idx (), e.explain ()); } }