Mercurial > octave-nkf
diff liboctave/array/Sparse.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 |
line wrap: on
line diff
--- a/liboctave/array/Sparse.cc Fri Oct 02 12:25:39 2015 -0400 +++ b/liboctave/array/Sparse.cc Fri Oct 02 15:07:37 2015 -0400 @@ -1431,7 +1431,7 @@ retval = tmp.index (idx); } else - gripe_index_out_of_range (1, 1, idx.extent (nel), nel); + gripe_index_out_of_range (1, 1, idx.extent (nel), nel, dims ()); } else if (nr == 1 && nc == 1) { @@ -1614,9 +1614,9 @@ retval = tmp.index (idx_i, idx_j); } else if (idx_i.extent (nr) > nr) - gripe_index_out_of_range (2, 1, idx_i.extent (nr), nr); + gripe_index_out_of_range (2, 1, idx_i.extent (nr), nr, dims ()); else - gripe_index_out_of_range (2, 2, idx_j.extent (nc), nc); + gripe_index_out_of_range (2, 2, idx_j.extent (nc), nc, dims ()); } else if (nr == 1 && nc == 1) { @@ -1978,7 +1978,7 @@ assign (idx, Sparse<T> (rhl, 1)); } else - gripe_invalid_assignment_size (); + gripe_nonconformant ("=", dim_vector(idx.length (n),1), rhs.dims()); } template <class T> @@ -2214,7 +2214,7 @@ assign (idx_i, idx_j, Sparse<T> (n, m)); } else - gripe_assignment_dimension_mismatch (); + gripe_nonconformant ("=", idx_i.length (nr), idx_j.length (nc), n, m); } // Can't use versions of these in Array.cc due to duplication of the