Mercurial > octave-nkf
view libinterp/corefcn/workspace-element.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) 2013-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_workspace_element_h) #define octave_workspace_element_h 1 #include <string> class workspace_element { public: workspace_element (char scope_arg = 'l', const std::string& symbol_arg = "<name>", const std::string& class_name_arg = "<class>", const std::string& value_arg = "<value>", const std::string& dimension_arg = "<dimension>", bool complex_flag_arg = false) : xscope (scope_arg), xsymbol (symbol_arg), xclass_name (class_name_arg), xvalue (value_arg), xdimension (dimension_arg), xcomplex_flag (complex_flag_arg) { } workspace_element (const workspace_element& ws_elt) : xscope (ws_elt.xscope), xsymbol (ws_elt.xsymbol), xclass_name (ws_elt.xclass_name), xvalue (ws_elt.xvalue), xdimension (ws_elt.xdimension), xcomplex_flag (ws_elt.xcomplex_flag) { } workspace_element operator = (const workspace_element& ws_elt) { if (this != &ws_elt) { xscope = ws_elt.xscope; xsymbol = ws_elt.xsymbol; xclass_name = ws_elt.xclass_name; xvalue = ws_elt.xvalue; xdimension = ws_elt.xdimension; xcomplex_flag = ws_elt.xcomplex_flag; } return *this; } ~workspace_element (void) { } char scope (void) const { return xscope; } std::string symbol (void) const { return xsymbol; } std::string class_name (void) const { return xclass_name; } std::string value (void) const { return xvalue; } std::string dimension (void) const { return xdimension; } bool complex_flag (void) const { return xcomplex_flag; } private: // [g]lobal, [p]ersistent, [l]ocal char xscope; std::string xsymbol; std::string xclass_name; std::string xvalue; std::string xdimension; bool xcomplex_flag; }; #endif