Mercurial > octave-nkf
annotate libinterp/octave-value/ov-dld-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 | 4197fc428c7d |
| children |
| rev | line source |
|---|---|
| 3329 | 1 /* |
| 2 | |
|
19731
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
19632
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
| 3329 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 3329 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 3329 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "oct-shlib.h" | |
| 28 | |
| 29 #include <defaults.h> | |
| 30 #include "dynamic-ld.h" | |
| 31 #include "error.h" | |
| 32 #include "oct-obj.h" | |
| 33 #include "ov-dld-fcn.h" | |
| 34 #include "ov.h" | |
| 35 | |
| 36 | |
| 37 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA (octave_dld_function, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10184
diff
changeset
|
38 "dynamically-linked function", |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10184
diff
changeset
|
39 "dynamically-linked function"); |
| 3329 | 40 |
| 41 | |
| 42 octave_dld_function::octave_dld_function | |
| 43 (octave_builtin::fcn ff, const octave_shlib& shl, | |
| 3523 | 44 const std::string& nm, const std::string& ds) |
| 3329 | 45 : octave_builtin (ff, nm, ds), sh_lib (shl) |
| 46 { | |
| 47 mark_fcn_file_up_to_date (time_parsed ()); | |
| 48 | |
| 3523 | 49 std::string file_name = fcn_file_name (); |
| 3329 | 50 |
| 51 system_fcn_file | |
| 52 = (! file_name.empty () | |
| 5397 | 53 && Voct_file_dir == file_name.substr (0, Voct_file_dir.length ())); |
| 3329 | 54 } |
| 55 | |
| 56 octave_dld_function::~octave_dld_function (void) | |
| 57 { | |
| 7872 | 58 octave_dynamic_loader::remove_oct (my_name, sh_lib); |
| 3329 | 59 } |
| 60 | |
| 3536 | 61 std::string |
| 3329 | 62 octave_dld_function::fcn_file_name (void) const |
| 63 { | |
| 64 return sh_lib.file_name (); | |
| 65 } | |
| 66 | |
| 67 octave_time | |
| 68 octave_dld_function::time_parsed (void) const | |
| 69 { | |
| 70 return sh_lib.time_loaded (); | |
| 71 } | |
| 72 | |
| 7349 | 73 // Note: this wrapper around the octave_dld_function constructor is |
| 74 // necessary to work around a MSVC limitation handling in | |
| 75 // virtual destructors that prevents unloading a dynamic module | |
| 76 // before *all* objects (of class using a virtual dtor) have | |
| 77 // been fully deleted; indeed, MSVC attaches auto-generated code | |
| 78 // (scalar deleting destructor) to objects created in a dynamic | |
| 79 // module, and this code will be executed in the dynamic module | |
| 80 // context at object deletion; unloading the dynamic module | |
| 81 // before objects have been deleted will make the "delete" code | |
| 82 // of objects to point to an invalid code segment. | |
| 83 | |
| 84 octave_dld_function* | |
| 85 octave_dld_function::create (octave_builtin::fcn ff, const octave_shlib& shl, | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10184
diff
changeset
|
86 const std::string& nm, const std::string& ds) |
| 7349 | 87 { |
| 88 return new octave_dld_function (ff, shl, nm, ds); | |
| 89 } |