Mercurial > octave-nkf
view libinterp/corefcn/gripes.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 | b70cc4bd8109 |
children | b65888ec820e |
line wrap: on
line source
/* Copyright (C) 1993-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_gripes_h) #define octave_gripes_h 1 #include <string> #include "lo-array-gripes.h" class octave_value; extern OCTINTERP_API void gripe_not_supported (const char *); extern OCTINTERP_API void gripe_not_implemented (const char *); extern OCTINTERP_API void gripe_string_invalid (void); extern OCTINTERP_API void gripe_range_invalid (void); extern OCTINTERP_API void gripe_nonconformant (void); extern OCTINTERP_API void gripe_nonconformant (octave_idx_type r1, octave_idx_type c1, octave_idx_type r2, octave_idx_type c2); extern OCTINTERP_API void gripe_empty_arg (const char *name, bool is_error); extern OCTINTERP_API void gripe_square_matrix_required (const char *name); extern OCTINTERP_API void gripe_user_supplied_eval (const char *name); extern OCTINTERP_API void gripe_user_returned_invalid (const char *name); extern OCTINTERP_API void gripe_invalid_conversion (const std::string& from, const std::string& to); extern OCTINTERP_API void gripe_invalid_value_specified (const char *name); extern OCTINTERP_API void gripe_2_or_3_dim_plot (void); extern OCTINTERP_API void gripe_unrecognized_float_fmt (void); extern OCTINTERP_API void gripe_unrecognized_data_fmt (const char *warn_for); extern OCTINTERP_API void gripe_data_conversion (const char *from, const char *to); extern OCTINTERP_API void gripe_wrong_type_arg (const char *name, const char *s, bool is_error = true); extern OCTINTERP_API void gripe_wrong_type_arg (const char *name, const std::string& s, bool is_error = true); extern OCTINTERP_API void gripe_wrong_type_arg (const char *name, const octave_value& tc, bool is_error = true); extern OCTINTERP_API void gripe_wrong_type_arg (const std::string& name, const octave_value& tc, bool is_error = true); extern OCTINTERP_API void gripe_wrong_type_arg_for_unary_op (const octave_value& op); extern OCTINTERP_API void gripe_wrong_type_arg_for_binary_op (const octave_value& op); extern OCTINTERP_API void gripe_implicit_conversion (const char *id, const char *from, const char *to); extern OCTINTERP_API void gripe_implicit_conversion (const std::string& id, const std::string& from, const std::string& to); extern OCTINTERP_API void gripe_divide_by_zero (void); extern OCTINTERP_API void gripe_logical_conversion (void); extern OCTINTERP_API void gripe_invalid_inquiry_subscript (void); extern OCTINTERP_API void gripe_indexed_cs_list (void); extern OCTINTERP_API void gripe_nonbraced_cs_list_assignment (void); extern OCTINTERP_API void gripe_warn_complex_cmp (void); extern OCTINTERP_API void gripe_disabled_feature (const std::string& func, const std::string& feature, const std::string& pkg="Octave"); extern OCTINTERP_API void gripe_data_file_in_path (const std::string& fcn, const std::string& file); #endif