Mercurial > hg > octave-nkf
diff liboctave/array/Array.cc @ 20749: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 | 41d19a6ef55a |
| children |
line wrap: on
line diff
--- a/liboctave/array/Array.cc +++ b/liboctave/array/Array.cc @@ -190,9 +190,9 @@ { // Do checks directly to avoid recomputing slice_len. if (n < 0) - gripe_invalid_index (); + gripe_invalid_index (n); if (n >= slice_len) - gripe_index_out_of_range (1, 1, n+1, slice_len); + gripe_index_out_of_range (1, 1, n+1, slice_len, dimensions); return elem (n); } @@ -224,9 +224,9 @@ { // Do checks directly to avoid recomputing slice_len. if (n < 0) - gripe_invalid_index (); + gripe_invalid_index (n); if (n >= slice_len) - gripe_index_out_of_range (1, 1, n+1, slice_len); + gripe_index_out_of_range (1, 1, n+1, slice_len, dimensions); return elem (n); } @@ -260,7 +260,7 @@ octave_idx_type r = dimensions(0); #ifdef BOUNDS_CHECKING if (k < 0 || k > dimensions.numel (1)) - gripe_index_out_of_range (2, 2, k+1, dimensions.numel (1)); + gripe_index_out_of_range (2, 2, k+1, dimensions.numel (1), dimensions); #endif return Array<T> (*this, dim_vector (r, 1), k*r, k*r + r); @@ -275,7 +275,7 @@ octave_idx_type p = r*c; #ifdef BOUNDS_CHECKING if (k < 0 || k > dimensions.numel (2)) - gripe_index_out_of_range (3, 3, k+1, dimensions.numel (2)); + gripe_index_out_of_range (3, 3, k+1, dimensions.numel (2), dimensions); #endif return Array<T> (*this, dim_vector (r, c), k*p, k*p + p); @@ -287,9 +287,9 @@ { #ifdef BOUNDS_CHECKING if (lo < 0) - gripe_index_out_of_range (1, 1, lo+1, numel ()); + gripe_index_out_of_range (1, 1, lo+1, numel (), dimensions); if (up > numel ()) - gripe_index_out_of_range (1, 1, up, numel ()); + gripe_index_out_of_range (1, 1, up, numel (), dimensions); #endif if (up < lo) up = lo; return Array<T> (*this, dim_vector (up - lo, 1), lo, up); @@ -726,7 +726,7 @@ else { if (i.extent (n) != n) - gripe_index_out_of_range (1, 1, i.extent (n), n); // throws + gripe_index_out_of_range (1, 1, i.extent (n), n, dimensions); // throws // FIXME: this is the only place where orig_dimensions are used. dim_vector rd = i.orig_dimensions (); @@ -793,9 +793,9 @@ else { if (i.extent (r) != r) - gripe_index_out_of_range (2, 1, i.extent (r), r); // throws + gripe_index_out_of_range (2, 1, i.extent (r), r, dimensions); // throws if (j.extent (c) != c) - gripe_index_out_of_range (2, 2, j.extent (c), c); // throws + gripe_index_out_of_range (2, 2, j.extent (c), c, dimensions); // throws octave_idx_type n = numel (); octave_idx_type il = i.length (r); @@ -855,7 +855,7 @@ for (int i = 0; i < ial; i++) { if (ia(i).extent (dv(i)) != dv(i)) - gripe_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i)); // throws + gripe_index_out_of_range (ial, i+1, ia(i).extent (dv(i)), dv(i), dimensions); // throws all_colons = all_colons && ia(i).is_colon (); } @@ -1180,7 +1180,7 @@ } } else - gripe_invalid_assignment_size (); + gripe_nonconformant ("=", dim_vector(i.length(n),1), rhs.dims()); } // Assignment to a 2-dimensional array @@ -1284,7 +1284,7 @@ } // any empty RHS can be assigned to an empty LHS else if ((il != 0 && jl != 0) || (rhdv(0) != 0 && rhdv(1) != 0)) - gripe_assignment_dimension_mismatch (); + gripe_nonconformant ("=", il, jl, rhs.dim1 (), rhs.dim2 ()); } // Assignment to a multi-dimensional array @@ -1398,11 +1398,19 @@ rhsempty = rhsempty || (rhdv(j++) == 0); } if (! lhsempty || ! rhsempty) - gripe_assignment_dimension_mismatch (); + gripe_nonconformant ("=", dv, rhdv); } } } +/* +%!shared a +%! a = [1 2; 3 4]; +%!error <op1 is 1x2, op2 is 1x3> a(1,:) = [1 2 3] +%!error <op1 is 2x1, op2 is 1x3> a(:,1) = [1 2 3] +%!error <op1 is 2x2, op2 is 2x1> a(1:2,2:3) = [1;2] +*/ + template <class T> void Array<T>::delete_elements (const idx_vector& i)