Mercurial > octave-nkf
view libinterp/parse-tree/pt-exp.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) 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_exp_h) #define octave_pt_exp_h 1 #include <string> #include <list> class octave_value; class octave_lvalue; #include "pt.h" #include "symtab.h" // A base class for expressions. class tree_expression : public tree { public: tree_expression (int l = -1, int c = -1) : tree (l, c), num_parens (0), postfix_index_type ('\0'), for_cmd_expr (false), print_flag (false) { } virtual ~tree_expression (void) { } virtual bool has_magic_end (void) const = 0; virtual tree_expression *dup (symbol_table::scope_id, symbol_table::context_id context) const = 0; virtual bool is_constant (void) const { return false; } virtual bool is_matrix (void) const { return false; } virtual bool is_cell (void) const { return false; } virtual bool is_identifier (void) const { return false; } virtual bool is_index_expression (void) const { return false; } virtual bool is_assignment_expression (void) const { return false; } virtual bool is_prefix_expression (void) const { return false; } virtual bool is_unary_expression (void) const { return false; } virtual bool is_binary_expression (void) const { return false; } virtual bool is_boolean_expression (void) const { return false; } virtual bool is_logically_true (const char *); virtual bool lvalue_ok (void) const { return false; } virtual bool rvalue_ok (void) const { return false; } virtual octave_value rvalue1 (int nargout = 1); virtual octave_value_list rvalue (int nargout); virtual octave_value_list rvalue (int nargout, const std::list<octave_lvalue> *lvalue_list); virtual octave_lvalue lvalue (void); int paren_count (void) const { return num_parens; } bool is_postfix_indexed (void) const { return (postfix_index_type != '\0'); } char postfix_index (void) const { return postfix_index_type; } // Check if the result of the expression should be printed. // Should normally be used in conjunction with // tree_evaluator::statement_printing_enabled. bool print_result (void) const { return print_flag; } virtual std::string oper (void) const { return "<unknown>"; } virtual std::string name (void) const { return "<unknown>"; } virtual std::string original_text (void) const; virtual void mark_braindead_shortcircuit (void) { } void mark_as_for_cmd_expr (void) { for_cmd_expr = true; } bool is_for_cmd_expr (void) const { return for_cmd_expr; } tree_expression *mark_in_parens (void) { num_parens++; return this; } tree_expression *set_postfix_index (char type) { postfix_index_type = type; return this; } tree_expression *set_print_flag (bool print) { print_flag = print; return this; } virtual void copy_base (const tree_expression& e) { num_parens = e.num_parens; postfix_index_type = e.postfix_index_type; print_flag = e.print_flag; } protected: // A count of the number of times this expression appears directly // inside a set of parentheses. // // (((e1)) + e2) ==> 2 for expression e1 // ==> 1 for expression ((e1)) + e2 // ==> 0 for expression e2 int num_parens; // The first index type associated with this expression. This field // is 0 (character '\0') if the expression has no associated index. // See the code in tree_identifier::rvalue for the rationale. char postfix_index_type; // TRUE if this expression is the EXPR in for loop: // FOR i = EXPR ... END bool for_cmd_expr; // Print result of rvalue for this expression? bool print_flag; private: // No copying! tree_expression (const tree_expression&); tree_expression& operator = (const tree_expression&); }; #endif