Mercurial > hg > octave-nkf
view libinterp/parse-tree/pt-idx.h @ 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 | 4197fc428c7d |
children |
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/>. */ #if !defined (octave_pt_idx_h) #define octave_pt_idx_h 1 #include <list> class tree_argument_list; class tree_walker; class octave_map; class octave_value; class octave_value_list; class octave_lvalue; #include "str-vec.h" #include "pt-exp.h" #include "symtab.h" // Index expressions. class tree_index_expression : public tree_expression { public: tree_index_expression (tree_expression *e = 0, tree_argument_list *lst = 0, int l = -1, int c = -1, char t = '('); tree_index_expression (tree_expression *e, const std::string& n, int l = -1, int c = -1); tree_index_expression (tree_expression *e, tree_expression* df, int l = -1, int c = -1); ~tree_index_expression (void); bool has_magic_end (void) const; void append (tree_argument_list *lst = 0, char t = '('); void append (const std::string& n); void append (tree_expression *df); bool is_index_expression (void) const { return true; } std::string name (void) const; tree_expression *expression (void) { return expr; } std::list<tree_argument_list *> arg_lists (void) { return args; } std::string type_tags (void) { return type; } std::list<string_vector> arg_names (void) { return arg_nm; } bool lvalue_ok (void) const { return expr->lvalue_ok (); } bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int nargout = 1); octave_value_list rvalue (int nargout); octave_value_list rvalue (int nargout, const std::list<octave_lvalue> *lvalue_list); octave_lvalue lvalue (void); tree_index_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); private: // The LHS of this index expression. tree_expression *expr; // The indices (only valid if type == paren || type == brace). std::list<tree_argument_list *> args; // The type of this index expression. std::string type; // The names of the arguments. Used for constant struct element // references. std::list<string_vector> arg_nm; // The list of dynamic field names, if any. std::list<tree_expression *> dyn_field; tree_index_expression (int l, int c); octave_map make_arg_struct (void) const; std::string get_struct_index (std::list<string_vector>::const_iterator p_arg_nm, std::list<tree_expression *>::const_iterator p_dyn_field) const; // No copying! tree_index_expression (const tree_index_expression&); tree_index_expression& operator = (const tree_index_expression&); }; #endif