Mercurial > octave-nkf
view libinterp/octave-value/ov-mex-fcn.cc @ 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 | f90c8372b7ba |
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/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include "oct-shlib.h" #include <defaults.h> #include "dynamic-ld.h" #include "error.h" #include "gripes.h" #include "oct-obj.h" #include "ov-mex-fcn.h" #include "ov.h" #include "profiler.h" #include "toplev.h" #include "unwind-prot.h" DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_mex_function, "mex function", "mex function"); octave_mex_function::octave_mex_function (void *fptr, bool fmex, const octave_shlib& shl, const std::string& nm) : octave_function (nm), mex_fcn_ptr (fptr), exit_fcn_ptr (0), have_fmex (fmex), sh_lib (shl) { mark_fcn_file_up_to_date (time_parsed ()); std::string file_name = fcn_file_name (); system_fcn_file = (! file_name.empty () && Voct_file_dir == file_name.substr (0, Voct_file_dir.length ())); } octave_mex_function::~octave_mex_function (void) { if (exit_fcn_ptr) (*exit_fcn_ptr) (); octave_dynamic_loader::remove_mex (my_name, sh_lib); } std::string octave_mex_function::fcn_file_name (void) const { return sh_lib.file_name (); } octave_time octave_mex_function::time_parsed (void) const { return sh_lib.time_loaded (); } octave_value_list octave_mex_function::subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout) { octave_value_list retval; switch (type[0]) { case '(': { int tmp_nargout = (type.length () > 1 && nargout == 0) ? 1 : nargout; retval = do_multi_index_op (tmp_nargout, idx.front ()); } break; case '{': case '.': { std::string nm = type_name (); error ("%s cannot be indexed with %c", nm.c_str (), type[0]); } break; default: panic_impossible (); } // FIXME: perhaps there should be an // octave_value_list::next_subsref member function? See also // octave_user_function::subsref. // // FIXME: Note that if a function call returns multiple // values, and there is further indexing to perform, then we are // ignoring all but the first value. Is this really what we want to // do? If it is not, then what should happen for stat("file").size, // for exmaple? if (idx.size () > 1) retval = retval(0).next_subsref (nargout, type, idx); return retval; } // FIXME: shouldn't this declaration be a header file somewhere? extern octave_value_list call_mex (bool have_fmex, void *f, const octave_value_list& args, int nargout, octave_mex_function *curr_mex_fcn); octave_value_list octave_mex_function::do_multi_index_op (int nargout, const octave_value_list& args) { octave_value_list retval; if (error_state) return retval; if (args.has_magic_colon ()) error ("invalid use of colon in function argument list"); else { unwind_protect frame; octave_call_stack::push (this); frame.add_fcn (octave_call_stack::pop); BEGIN_PROFILER_BLOCK (octave_mex_function) retval = call_mex (have_fmex, mex_fcn_ptr, args, nargout, this); END_PROFILER_BLOCK } return retval; }