Mercurial > octave-nkf

comparison libinterp/octave-value/ov-classdef.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 a142b62527ef
children c1a6c31ac29a
comparison
equal deleted inserted replaced
20573:e3c0fee87493 20574:dd6345fd8a97
1645 bool is_scalar = true; 1645 bool is_scalar = true;
1646 Array<idx_vector> iv (dim_vector (1, ival.length ())); 1646 Array<idx_vector> iv (dim_vector (1, ival.length ()));
1647 1647
1648 for (int i = 0; ! error_state && i < ival.length (); i++) 1648 for (int i = 0; ! error_state && i < ival.length (); i++)
1649 { 1649 {
1650 iv(i) = ival(i).index_vector (); 1650 try
1651 {
1652 iv(i) = ival(i).index_vector ();
1653 }
1654 catch (index_exception& e)
1655 {
1656 // Rethrow to allow more info to be reported later.
1657 e.set_pos_if_unset (ival.length (), i+1);
1658 throw;
1659 }
1651 if (! error_state) 1660 if (! error_state)
1652 is_scalar = is_scalar && iv(i).is_scalar (); 1661 is_scalar = is_scalar && iv(i).is_scalar ();
1653 } 1662 }
1654 1663
1655 if (! error_state) 1664 if (! error_state)
1743 bool is_scalar = true; 1752 bool is_scalar = true;
1744 Array<idx_vector> iv (dim_vector (1, ival.length ())); 1753 Array<idx_vector> iv (dim_vector (1, ival.length ()));
1745 1754
1746 for (int i = 0; ! error_state && i < ival.length (); i++) 1755 for (int i = 0; ! error_state && i < ival.length (); i++)
1747 { 1756 {
1748 iv(i) = ival(i).index_vector (); 1757 try
1758 {
1759 iv(i) = ival(i).index_vector ();
1760 }
1761 catch (index_exception& e)
1762 {
1763 e.set_pos_if_unset (ival.length (), i+1);
1764 throw; // var name set in pt-idx.cc / pt-assign.cc
1765 }
1749 if (! error_state) 1766 if (! error_state)
1750 is_scalar = is_scalar && iv(i).is_scalar (); 1767 is_scalar = is_scalar && iv(i).is_scalar ();
1751 } 1768 }
1752 1769
1753 if (! error_state) 1770 if (! error_state)
1796 1813
1797 Array<idx_vector> iv (dim_vector (1, ival.length ())); 1814 Array<idx_vector> iv (dim_vector (1, ival.length ()));
1798 1815
1799 for (int i = 0; ! error_state && i < ival.length (); i++) 1816 for (int i = 0; ! error_state && i < ival.length (); i++)
1800 { 1817 {
1801 iv(i) = ival(i).index_vector (); 1818 try
1819 {
1820 iv(i) = ival(i).index_vector ();
1821 }
1822 catch (index_exception& e)
1823 {
1824 // Rethrow to allow more info to be reported later.
1825 e.set_pos_if_unset (ival.length (), i+1);
1826 throw;
1827 }
1802 1828
1803 if (! error_state) 1829 if (! error_state)
1804 { 1830 {
1805 is_scalar = is_scalar && iv(i).is_scalar (); 1831 is_scalar = is_scalar && iv(i).is_scalar ();
1806 1832