Mercurial > octave-nkf
diff libinterp/corefcn/oct-map.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 | 1a0a433c8263 |
line wrap: on
line diff
--- a/libinterp/corefcn/oct-map.cc Fri Oct 02 12:25:39 2015 -0400 +++ b/libinterp/corefcn/oct-map.cc Fri Oct 02 15:07:37 2015 -0400 @@ -900,46 +900,62 @@ octave_idx_type n_idx = idx.length (); octave_map retval; - switch (n_idx) + // If we catch an indexing error in index_vector, we flag an error in + // index k. Ensure it is the right value befor each idx_vector call. + // Same variable as used in the for loop in the default case. + + octave_idx_type k = 0; + + try { - case 1: - { - idx_vector i = idx(0).index_vector (); + switch (n_idx) + { + case 1: + { + idx_vector i = idx(0).index_vector (); - if (! error_state) - retval = index (i, resize_ok); - } - break; + if (! error_state) + retval = index (i, resize_ok); + } + break; - case 2: - { - idx_vector i = idx(0).index_vector (); + case 2: + { + idx_vector i = idx(0).index_vector (); - if (! error_state) - { - idx_vector j = idx(1).index_vector (); + if (! error_state) + { + k = 1; + idx_vector j = idx(1).index_vector (); - retval = index (i, j, resize_ok); + retval = index (i, j, resize_ok); + } } - } - break; + break; - default: - { - Array<idx_vector> ia (dim_vector (n_idx, 1)); - - for (octave_idx_type i = 0; i < n_idx; i++) + default: { - ia(i) = idx(i).index_vector (); + Array<idx_vector> ia (dim_vector (n_idx, 1)); + + for (k = 0; k < n_idx; k++) + { + ia(k) = idx(k).index_vector (); - if (error_state) - break; + if (error_state) + break; + } + + if (! error_state) + retval = index (ia, resize_ok); } - - if (! error_state) - retval = index (ia, resize_ok); - } - break; + break; + } + } + catch (index_exception& e) + { + // Rethrow to allow more info to be reported later. + e.set_pos_if_unset (n_idx, k+1); + throw; } return retval; @@ -1094,46 +1110,62 @@ { octave_idx_type n_idx = idx.length (); - switch (n_idx) + // If we catch an indexing error in index_vector, we flag an error in + // index k. Ensure it is the right value befor each idx_vector call. + // Same variable as used in the for loop in the default case. + + octave_idx_type k = 0; + + try { - case 1: - { - idx_vector i = idx(0).index_vector (); + switch (n_idx) + { + case 1: + { + idx_vector i = idx(0).index_vector (); - if (! error_state) - assign (i, rhs); - } - break; + if (! error_state) + assign (i, rhs); + } + break; - case 2: - { - idx_vector i = idx(0).index_vector (); + case 2: + { + idx_vector i = idx(0).index_vector (); - if (! error_state) - { - idx_vector j = idx(1).index_vector (); + if (! error_state) + { + k = 1; + idx_vector j = idx(1).index_vector (); - assign (i, j, rhs); + assign (i, j, rhs); + } } - } - break; + break; - default: - { - Array<idx_vector> ia (dim_vector (n_idx, 1)); - - for (octave_idx_type i = 0; i < n_idx; i++) + default: { - ia(i) = idx(i).index_vector (); + Array<idx_vector> ia (dim_vector (n_idx, 1)); + + for (k = 0; k < n_idx; k++) + { + ia(k) = idx(k).index_vector (); - if (error_state) - break; + if (error_state) + break; + } + + if (! error_state) + assign (ia, rhs); } - - if (! error_state) - assign (ia, rhs); - } - break; + break; + } + } + catch (index_exception& e) + { + // Rethrow to allow more info to be reported later. + e.set_pos_if_unset (n_idx, k+1); + throw; } } @@ -1244,7 +1276,16 @@ for (octave_idx_type i = 0; i < n_idx; i++) { - ia(i) = idx(i).index_vector (); + try + { + ia(i) = idx(i).index_vector (); + } + catch (index_exception& e) + { + // Rethrow to allow more info to be reported later. + e.set_pos_if_unset (n_idx, i+1); + throw; + } if (error_state) break;