Mercurial > octave-nkf
view libinterp/parse-tree/pt-cbinop.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 | 4197fc428c7d |
children | f90c8372b7ba |
line wrap: on
line source
/* Copyright (C) 2008-2015 Jaroslav Hajek This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "error.h" #include "oct-obj.h" #include "ov.h" #include "pt-cbinop.h" #include "pt-bp.h" #include "pt-unop.h" #include "pt-walk.h" octave_value_list tree_compound_binary_expression::rvalue (int nargout) { octave_value_list retval; if (nargout > 1) error ("binary operator '%s': invalid number of output arguments", oper () . c_str ()); else retval = rvalue1 (nargout); return retval; } octave_value tree_compound_binary_expression::rvalue1 (int) { octave_value retval; if (error_state) return retval; if (op_lhs) { octave_value a = op_lhs->rvalue1 (); if (! error_state && a.is_defined () && op_rhs) { octave_value b = op_rhs->rvalue1 (); if (! error_state && b.is_defined ()) { retval = ::do_binary_op (etype, a, b); if (error_state) retval = octave_value (); } } } return retval; } // If a tree expression is a transpose or hermitian transpose, return // the argument and corresponding operator. static octave_value::unary_op strip_trans_herm (tree_expression *&exp) { if (exp->is_unary_expression ()) { tree_unary_expression *uexp = dynamic_cast<tree_unary_expression *> (exp); octave_value::unary_op op = uexp->op_type (); if (op == octave_value::op_transpose || op == octave_value::op_hermitian) exp = uexp->operand (); else op = octave_value::unknown_unary_op; return op; } else return octave_value::unknown_unary_op; } static octave_value::unary_op strip_not (tree_expression *&exp) { if (exp->is_unary_expression ()) { tree_unary_expression *uexp = dynamic_cast<tree_unary_expression *> (exp); octave_value::unary_op op = uexp->op_type (); if (op == octave_value::op_not) exp = uexp->operand (); else op = octave_value::unknown_unary_op; return op; } else return octave_value::unknown_unary_op; } // Possibly convert multiplication to trans_mul, mul_trans, herm_mul, // or mul_herm. static octave_value::compound_binary_op simplify_mul_op (tree_expression *&a, tree_expression *&b) { octave_value::compound_binary_op retop = octave_value::unknown_compound_binary_op; octave_value::unary_op opa = strip_trans_herm (a); if (opa == octave_value::op_hermitian) retop = octave_value::op_herm_mul; else if (opa == octave_value::op_transpose) retop = octave_value::op_trans_mul; else { octave_value::unary_op opb = strip_trans_herm (b); if (opb == octave_value::op_hermitian) retop = octave_value::op_mul_herm; else if (opb == octave_value::op_transpose) retop = octave_value::op_mul_trans; } return retop; } // Possibly convert left division to trans_ldiv or herm_ldiv. static octave_value::compound_binary_op simplify_ldiv_op (tree_expression *&a, tree_expression *&) { octave_value::compound_binary_op retop = octave_value::unknown_compound_binary_op; octave_value::unary_op opa = strip_trans_herm (a); if (opa == octave_value::op_hermitian) retop = octave_value::op_herm_ldiv; else if (opa == octave_value::op_transpose) retop = octave_value::op_trans_ldiv; return retop; } // Possibly contract and/or with negation. static octave_value::compound_binary_op simplify_and_or_op (tree_expression *&a, tree_expression *&b, octave_value::binary_op op) { octave_value::compound_binary_op retop = octave_value::unknown_compound_binary_op; octave_value::unary_op opa = strip_not (a); if (opa == octave_value::op_not) { if (op == octave_value::op_el_and) retop = octave_value::op_el_not_and; else if (op == octave_value::op_el_or) retop = octave_value::op_el_not_or; } else { octave_value::unary_op opb = strip_not (b); if (opb == octave_value::op_not) { if (op == octave_value::op_el_and) retop = octave_value::op_el_and_not; else if (op == octave_value::op_el_or) retop = octave_value::op_el_or_not; } } return retop; } tree_binary_expression * maybe_compound_binary_expression (tree_expression *a, tree_expression *b, int l, int c, octave_value::binary_op t) { tree_expression *ca = a; tree_expression *cb = b; octave_value::compound_binary_op ct; switch (t) { case octave_value::op_mul: ct = simplify_mul_op (ca, cb); break; case octave_value::op_ldiv: ct = simplify_ldiv_op (ca, cb); break; case octave_value::op_el_and: case octave_value::op_el_or: ct = simplify_and_or_op (ca, cb, t); break; default: ct = octave_value::unknown_compound_binary_op; break; } tree_binary_expression *ret = (ct == octave_value::unknown_compound_binary_op) ? new tree_binary_expression (a, b, l, c, t) : new tree_compound_binary_expression (a, b, l, c, t, ca, cb, ct); return ret; }