Mercurial > hg > octave-nkf
annotate libinterp/parse-tree/pt-jump.cc @ 20749: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 |
|---|---|
| 2982 | 1 /* |
| 2 | |
|
19898
4197fc428c7d
maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents:
17744
diff
changeset
|
3 Copyright (C) 1996-2015 John W. Eaton |
| 2982 | 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. | |
| 2982 | 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/>. | |
| 2982 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "error.h" | |
| 3770 | 28 #include "oct-obj.h" |
| 29 #include "pt-bp.h" | |
| 2982 | 30 #include "pt-jump.h" |
| 31 #include "pt-walk.h" | |
| 32 | |
| 3770 | 33 class octave_value_list; |
| 34 | |
| 2982 | 35 // Break. |
| 36 | |
| 2985 | 37 // Nonzero means we're breaking out of a loop or function body. |
| 4207 | 38 int tree_break_command::breaking = 0; |
| 2985 | 39 |
| 5861 | 40 tree_command * |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
41 tree_break_command::dup (symbol_table::scope_id, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
42 symbol_table::context_id) const |
| 5861 | 43 { |
| 44 return new tree_break_command (line (), column ()); | |
| 45 } | |
| 46 | |
| 2982 | 47 void |
| 4207 | 48 tree_break_command::accept (tree_walker& tw) |
| 2982 | 49 { |
| 4207 | 50 tw.visit_break_command (*this); |
| 2982 | 51 } |
| 52 | |
| 53 // Continue. | |
| 54 | |
| 2985 | 55 // Nonzero means we're jumping to the end of a loop. |
| 4207 | 56 int tree_continue_command::continuing = 0; |
| 2985 | 57 |
| 5861 | 58 tree_command * |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
59 tree_continue_command::dup (symbol_table::scope_id, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
60 symbol_table::context_id) const |
| 5861 | 61 { |
| 62 return new tree_continue_command (line (), column ()); | |
| 63 } | |
| 64 | |
| 2982 | 65 void |
| 4207 | 66 tree_continue_command::accept (tree_walker& tw) |
| 2982 | 67 { |
| 4207 | 68 tw.visit_continue_command (*this); |
| 2982 | 69 } |
| 70 | |
| 71 // Return. | |
| 72 | |
| 5501 | 73 // Nonzero means we're returning from a function. |
| 4207 | 74 int tree_return_command::returning = 0; |
| 2985 | 75 |
| 5861 | 76 tree_command * |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
77 tree_return_command::dup (symbol_table::scope_id, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
78 symbol_table::context_id) const |
| 5861 | 79 { |
| 80 return new tree_return_command (line (), column ()); | |
| 81 } | |
| 82 | |
| 2982 | 83 void |
| 4207 | 84 tree_return_command::accept (tree_walker& tw) |
| 2982 | 85 { |
| 4207 | 86 tw.visit_return_command (*this); |
| 2982 | 87 } |