Mercurial > octave-nkf

comparison libinterp/octave-value/ov-re-diag.cc @ 20574:dd6345fd8a97

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 4197fc428c7d
children f90c8372b7ba
comparison
equal deleted inserted replaced
20573:e3c0fee87493 20574:dd6345fd8a97
90 // This hack is to allow constructing permutation matrices using 90 // This hack is to allow constructing permutation matrices using
91 // eye(n)(p,:), eye(n)(:,q) && eye(n)(p,q) where p & q are permutation 91 // eye(n)(p,:), eye(n)(:,q) && eye(n)(p,q) where p & q are permutation
92 // vectors. 92 // vectors.
93 if (! resize_ok && idx.length () == 2 && matrix.is_multiple_of_identity (1)) 93 if (! resize_ok && idx.length () == 2 && matrix.is_multiple_of_identity (1))
94 { 94 {
95 idx_vector idx0 = idx(0).index_vector (); 95 int k = 0; // index we're accesing when index_vector throws
96 idx_vector idx1 = idx(1).index_vector (); 96 try
97
98 if (! error_state)
99 { 97 {
100 bool left = idx0.is_permutation (matrix.rows ()); 98 idx_vector idx0 = idx(0).index_vector ();
101 bool right = idx1.is_permutation (matrix.cols ()); 99 k = 1;
102 100 idx_vector idx1 = idx(1).index_vector ();
103 if (left && right) 101
102 if (! error_state)
104 { 103 {
105 if (idx0.is_colon ()) left = false; 104 bool left = idx0.is_permutation (matrix.rows ());
106 if (idx1.is_colon ()) right = false; 105 bool right = idx1.is_permutation (matrix.cols ());
106
107 if (left && right) 107 if (left && right)
108 retval = PermMatrix (idx0, false) * PermMatrix (idx1, true);
109 else if (left)
110 retval = PermMatrix (idx0, false);
111 else if (right)
112 retval = PermMatrix (idx1, true);
113 else
114 { 108 {
115 retval = this; 109 if (idx0.is_colon ()) left = false;
116 this->count++; 110 if (idx1.is_colon ()) right = false;
111 if (left && right)
112 retval = PermMatrix (idx0, false) * PermMatrix (idx1, true);
113 else if (left)
114 retval = PermMatrix (idx0, false);
115 else if (right)
116 retval = PermMatrix (idx1, true);
117 else
118 {
119 retval = this;
120 this->count++;
121 }
117 } 122 }
118 } 123 }
124 }
125 catch (index_exception& e)
126 {
127 // Rethrow to allow more info to be reported later.
128 e.set_pos_if_unset (2, k+1);
129 throw;
119 } 130 }
120 } 131 }
121 132
122 // if error_state is set, we've already griped. 133 // if error_state is set, we've already griped.
123 if (! error_state && retval.is_undefined ()) 134 if (! error_state && retval.is_undefined ())