Mercurial > octave-nkf
view libinterp/parse-tree/pt-fcn-handle.h @ 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 |
line wrap: on
line source
/* Copyright (C) 2003-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_fcn_handle_h) #define octave_fcn_handle_h 1 #include <iosfwd> #include <string> #include "pt-bp.h" #include "pt-exp.h" #include "pt-misc.h" #include "pt-stmt.h" #include "symtab.h" class octave_value_list; class tree_walker; #include "ov.h" #include "ov-usr-fcn.h" #include "symtab.h" class tree_fcn_handle : public tree_expression { public: tree_fcn_handle (int l = -1, int c = -1) : tree_expression (l, c), nm () { } tree_fcn_handle (const std::string& n, int l = -1, int c = -1) : tree_expression (l, c), nm (n) { } ~tree_fcn_handle (void) { } bool has_magic_end (void) const { return false; } void print (std::ostream& os, bool pr_as_read_syntax = false, bool pr_orig_txt = true); void print_raw (std::ostream& os, bool pr_as_read_syntax = false, bool pr_orig_txt = true); std::string name (void) const { return nm; } bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int nargout = 1); octave_value_list rvalue (int nargout); tree_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); private: // The name of this function handle. std::string nm; // No copying! tree_fcn_handle (const tree_fcn_handle&); tree_fcn_handle& operator = (const tree_fcn_handle&); }; class tree_anon_fcn_handle : public tree_expression { public: tree_anon_fcn_handle (int l = -1, int c = -1) : tree_expression (l, c), fcn (0), file_name () { } tree_anon_fcn_handle (tree_parameter_list *pl, tree_parameter_list *rl, tree_statement_list *cl, symbol_table::scope_id sid, int l = -1, int c = -1) : tree_expression (l, c), fcn (new octave_user_function (sid, pl, rl, cl)), file_name () { } ~tree_anon_fcn_handle (void) { delete fcn; } bool has_magic_end (void) const { return false; } bool rvalue_ok (void) const { return true; } octave_value rvalue1 (int nargout = 1); octave_value_list rvalue (int nargout); tree_parameter_list *parameter_list (void) const { return fcn ? fcn->parameter_list () : 0; } tree_parameter_list *return_list (void) const { return fcn ? fcn->return_list () : 0; } tree_statement_list *body (void) const { return fcn ? fcn->body () : 0; } symbol_table::scope_id scope (void) const { return fcn ? fcn->scope () : -1; } tree_expression *dup (symbol_table::scope_id scope, symbol_table::context_id context) const; void accept (tree_walker& tw); void stash_file_name (const std::string& file) { file_name = file; } private: // The function. octave_user_function *fcn; // Filename where the handle was defined. std::string file_name; // No copying! tree_anon_fcn_handle (const tree_anon_fcn_handle&); tree_anon_fcn_handle& operator = (const tree_anon_fcn_handle&); }; #endif