Mercurial > octave-nkf

comparison libinterp/parse-tree/pt-assign.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 011a364b4d78
children b10432a40432
comparison
equal deleted inserted replaced
20573:e3c0fee87493 20574:dd6345fd8a97
104 error ("invalid number of elements on RHS of assignment"); 104 error ("invalid number of elements on RHS of assignment");
105 return retval; 105 return retval;
106 } 106 }
107 } 107 }
108 108
109 octave_lvalue ult = lhs->lvalue (); 109 try
110 110 {
111 if (ult.numel () != 1) 111 octave_lvalue ult = lhs->lvalue ();
112 gripe_nonbraced_cs_list_assignment (); 112
113 113 if (ult.numel () != 1)
114 if (! error_state) 114 gripe_nonbraced_cs_list_assignment ();
115 {
116 ult.assign (etype, rhs_val);
117 115
118 if (! error_state) 116 if (! error_state)
119 { 117 {
120 if (etype == octave_value::op_asn_eq) 118 ult.assign (etype, rhs_val);
121 retval = rhs_val; 119
122 else 120 if (! error_state)
123 retval = ult.value ();
124
125 if (print_result ()
126 && tree_evaluator::statement_printing_enabled ())
127 { 121 {
128 // We clear any index here so that we can 122 if (etype == octave_value::op_asn_eq)
129 // get the new value of the referenced 123 retval = rhs_val;
130 // object below, instead of the indexed 124 else
131 // value (which should be the same as the 125 retval = ult.value ();
132 // right hand side value). 126
133 127 if (print_result ()
134 ult.clear_index (); 128 && tree_evaluator::statement_printing_enabled ())
135 129 {
136 octave_value lhs_val = ult.value (); 130 // We clear any index here so that we can
137 131 // get the new value of the referenced
138 if (! error_state) 132 // object below, instead of the indexed
139 lhs_val.print_with_name (octave_stdout, 133 // value (which should be the same as the
140 lhs->name ()); 134 // right hand side value).
135
136 ult.clear_index ();
137
138 octave_value lhs_val = ult.value ();
139
140 if (! error_state)
141 lhs_val.print_with_name (octave_stdout,
142 lhs->name ());
143 }
141 } 144 }
142 } 145 }
146 }
147 catch (index_exception& e)
148 { // problems with range, invalid index type etc.
149 e.set_var (lhs->name ());
150 (*current_liboctave_error_with_id_handler) (e.id(), e.err());
143 } 151 }
144 } 152 }
145 } 153 }
146 } 154 }
147 155