Mercurial > octave-nkf
view libinterp/parse-tree/pt-unop.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) 1996-2015 John W. Eaton 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 "oct-lvalue.h" #include "ov.h" #include "profiler.h" #include "pt-bp.h" #include "pt-unop.h" #include "pt-walk.h" // Unary expressions. std::string tree_unary_expression::oper (void) const { return octave_value::unary_op_as_string (etype); } // Prefix expressions. octave_value_list tree_prefix_expression::rvalue (int nargout) { octave_value_list retval; if (nargout > 1) error ("prefix operator '%s': invalid number of output arguments", oper () . c_str ()); else retval = rvalue1 (nargout); return retval; } octave_value tree_prefix_expression::rvalue1 (int) { octave_value retval; if (error_state) return retval; if (op) { if (etype == octave_value::op_incr || etype == octave_value::op_decr) { octave_lvalue ref = op->lvalue (); if (! error_state) { BEGIN_PROFILER_BLOCK (tree_prefix_expression) ref.do_unary_op (etype); if (! error_state) retval = ref.value (); END_PROFILER_BLOCK } } else { octave_value val = op->rvalue1 (); if (! error_state && val.is_defined ()) { BEGIN_PROFILER_BLOCK (tree_prefix_expression) // Attempt to do the operation in-place if it is unshared // (a temporary expression). if (val.get_count () == 1) retval = val.do_non_const_unary_op (etype); else retval = ::do_unary_op (etype, val); if (error_state) retval = octave_value (); END_PROFILER_BLOCK } } } return retval; } tree_expression * tree_prefix_expression::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { tree_prefix_expression *new_pe = new tree_prefix_expression (op ? op->dup (scope, context) : 0, line (), column (), etype); new_pe->copy_base (*this); return new_pe; } void tree_prefix_expression::accept (tree_walker& tw) { tw.visit_prefix_expression (*this); } // Postfix expressions. octave_value_list tree_postfix_expression::rvalue (int nargout) { octave_value_list retval; if (nargout > 1) error ("postfix operator '%s': invalid number of output arguments", oper () . c_str ()); else retval = rvalue1 (nargout); return retval; } octave_value tree_postfix_expression::rvalue1 (int) { octave_value retval; if (error_state) return retval; if (op) { if (etype == octave_value::op_incr || etype == octave_value::op_decr) { octave_lvalue ref = op->lvalue (); if (! error_state) { retval = ref.value (); BEGIN_PROFILER_BLOCK (tree_postfix_expression) ref.do_unary_op (etype); END_PROFILER_BLOCK } } else { octave_value val = op->rvalue1 (); if (! error_state && val.is_defined ()) { BEGIN_PROFILER_BLOCK (tree_postfix_expression) retval = ::do_unary_op (etype, val); if (error_state) retval = octave_value (); END_PROFILER_BLOCK } } } return retval; } tree_expression * tree_postfix_expression::dup (symbol_table::scope_id scope, symbol_table::context_id context) const { tree_postfix_expression *new_pe = new tree_postfix_expression (op ? op->dup (scope, context) : 0, line (), column (), etype); new_pe->copy_base (*this); return new_pe; } void tree_postfix_expression::accept (tree_walker& tw) { tw.visit_postfix_expression (*this); }