Mercurial > octave-nkf
comparison libinterp/corefcn/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 | 4f45eaf83908 |
| children | f90c8372b7ba |
comparison
equal
deleted
inserted
replaced
| 20573:e3c0fee87493 | 20574:dd6345fd8a97 |
|---|---|
| 196 else if (nargin != 3) | 196 else if (nargin != 3) |
| 197 print_usage (); | 197 print_usage (); |
| 198 | 198 |
| 199 if (! error_state) | 199 if (! error_state) |
| 200 { | 200 { |
| 201 idx_vector i = args(0).index_vector (); | 201 int k = 0; // index we're checking when index_vector throws |
| 202 idx_vector j = args(1).index_vector (); | 202 try |
| 203 | 203 { |
| 204 if (args(2).is_bool_type ()) | 204 idx_vector i = args(0).index_vector (); |
| 205 retval = SparseBoolMatrix (args(2).bool_array_value (), i, j, | 205 k = 1; |
| 206 idx_vector j = args(1).index_vector (); | |
| 207 | |
| 208 if (args(2).is_bool_type ()) | |
| 209 retval = SparseBoolMatrix (args(2).bool_array_value (), i,j, | |
| 210 m, n, summation, nzmax); | |
| 211 else if (args(2).is_complex_type ()) | |
| 212 retval = SparseComplexMatrix (args(2).complex_array_value(), | |
| 213 i, j, m, n, summation, nzmax); | |
| 214 else if (args(2).is_numeric_type ()) | |
| 215 retval = SparseMatrix (args(2).array_value (), i, j, | |
| 206 m, n, summation, nzmax); | 216 m, n, summation, nzmax); |
| 207 else if (args(2).is_complex_type ()) | 217 else |
| 208 retval = SparseComplexMatrix (args(2).complex_array_value (), | 218 gripe_wrong_type_arg ("sparse", args(2)); |
| 209 i, j, m, n, summation, nzmax); | 219 } |
| 210 else if (args(2).is_numeric_type ()) | 220 catch (index_exception& e) |
| 211 retval = SparseMatrix (args(2).array_value (), i, j, | 221 { |
| 212 m, n, summation, nzmax); | 222 // Rethrow to allow more info to be reported later. |
| 213 else | 223 e.set_pos_if_unset (2, k+1); |
| 214 gripe_wrong_type_arg ("sparse", args(2)); | 224 throw; |
| 225 } | |
| 215 } | 226 } |
| 216 | 227 |
| 217 } | 228 } |
| 218 } | 229 } |
| 219 | 230 |