Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-id.cc @ 20749: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 | 7ac907da9fba |
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 "pager.h" #include "pt-bp.h" #include "pt-const.h" #include "pt-eval.h" #include "pt-id.h" #include "pt-walk.h" #include "symtab.h" #include "utils.h" #include "variables.h" // Symbols from the symbol table. void tree_identifier::eval_undefined_error (void) { int l = line (); int c = column (); maybe_missing_function_hook (name ()); if (error_state) return; if (l == -1 && c == -1) error_with_id ("Octave:undefined-function", "'%s' undefined", name ().c_str ()); else error_with_id ("Octave:undefined-function", "'%s' undefined near line %d column %d", name ().c_str (), l, c); } octave_value_list tree_identifier::rvalue (int nargout, const std::list<octave_lvalue> *lvalue_list) { octave_value_list retval; if (error_state) return retval; octave_value val = sym->find (); if (val.is_defined ()) { // GAGME -- this would be cleaner if we required // parens to indicate function calls. // // If this identifier refers to a function, we need to know // whether it is indexed so that we can do the same thing // for 'f' and 'f()'. If the index is present and the function // object declares it can handle it, return the function object // and let tree_index_expression::rvalue handle indexing. // Otherwise, arrange to call the function here, so that we don't // return the function definition as a value. octave_function *fcn = 0; if (val.is_function ()) fcn = val.function_value (true); if (fcn && ! (is_postfix_indexed () && fcn->is_postfix_index_handled (postfix_index ()))) { octave_value_list tmp_args; retval = (lvalue_list ? val.do_multi_index_op (nargout, tmp_args, lvalue_list) : val.do_multi_index_op (nargout, tmp_args)); } else { if (print_result () && nargout == 0 && tree_evaluator::statement_printing_enabled ()) val.print_with_name (octave_stdout, name ()); retval = val; } } else if (sym->is_added_static ()) static_workspace_error (); else eval_undefined_error (); return retval; } octave_value tree_identifier::rvalue1 (int nargout) { octave_value retval; octave_value_list tmp = rvalue (nargout); if (! tmp.empty ()) retval = tmp(0); return retval; } octave_lvalue tree_identifier::lvalue (void) { if (sym->is_added_static ()) static_workspace_error (); return octave_lvalue (sym); } tree_identifier * tree_identifier::dup (symbol_table::scope_id sc, symbol_table::context_id) const { // The new tree_identifier object contains a symbol_record // entry from the duplicated scope. // FIXME: is this the best way? symbol_table::symbol_record new_sym = symbol_table::find_symbol (name (), sc); tree_identifier *new_id = new tree_identifier (new_sym, line (), column ()); new_id->copy_base (*this); return new_id; } void tree_identifier::accept (tree_walker& tw) { tw.visit_identifier (*this); }