Mercurial > octave
annotate liboctave/util/lo-array-errwarn.cc @ 28004:403df0b32204
update out_of_range error messages
* sub2ind.cc (Fsub2ind): Don't redimension dim_vector object so that
the sub2ind function may report original dimensions in error messages.
* Range.h (Range::dims): New function.
* lo-array-errwarn.h, lo-array-errwarn.cc
(out_of_range::set_size, out_of_range::set_extent): Delete.
(out_of_range::out_of_range): Accept size and extent arguments.
(out_of_range::details): Simplify. Always report extent and dimensions.
(err_index_out_of_range): Deprecate overload that does not accept
dim_vector argument. Change all uses to call the one that does.
Simplify by passing extent and dims to out_of_range_object constructor.
* test/index.tst: Update error messages in tests.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 25 Jan 2020 16:56:27 -0500 |
parents | 60d8d6e5594d |
children | 9a965fec21c1 |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
3 // Copyright (C) 2016-2020 The Octave Project Developers |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
25 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21660
diff
changeset
|
26 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21229
diff
changeset
|
27 # include "config.h" |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
28 #endif |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
29 |
26569
0e77df67b522
Add static compile-time checking of printf functions in liboctave.
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
30 #include <cinttypes> |
25806
0360ed7c39a8
Always print non-integer part of non-integer indices in invalid index message (bug #46859).
Lachlan Andrew <lachlanbis@gmail.com>
parents:
25054
diff
changeset
|
31 #include <cmath> |
0360ed7c39a8
Always print non-integer part of non-integer indices in invalid index message (bug #46859).
Lachlan Andrew <lachlanbis@gmail.com>
parents:
25054
diff
changeset
|
32 |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
33 #include <sstream> |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
34 |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
35 #include "lo-array-errwarn.h" |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
36 #include "lo-error.h" |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
37 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
38 namespace octave |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
39 { |
27101
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
40 // Text constants used to shorten code below. |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
41 |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
42 static const char *error_id_nonconformant_args |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
43 = "Octave:nonconformant-args"; |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
44 |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
45 static const char *error_id_index_out_of_bounds |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
46 = "Octave:index-out-of-bounds"; |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
47 |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
48 static const char *error_id_invalid_index = "Octave:invalid-index"; |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
49 |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
50 static const char *warning_id_nearly_singular_matrix |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
51 = "Octave:nearly-singular-matrix"; |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
52 |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
53 static const char *warning_id_singular_matrix = "Octave:singular-matrix"; |
097774bed4ed
move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
26569
diff
changeset
|
54 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
55 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
56 err_nan_to_logical_conversion (void) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
57 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
58 (*current_liboctave_error_handler) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
59 ("invalid conversion from NaN to logical"); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
60 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
61 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
62 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
63 err_nan_to_character_conversion (void) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
64 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
65 (*current_liboctave_error_handler) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
66 ("invalid conversion from NaN to character"); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
67 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
68 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
69 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
70 err_nonconformant (const char *op, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
71 octave_idx_type op1_len, octave_idx_type op2_len) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
72 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
73 const char *err_id = error_id_nonconformant_args; |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
74 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
75 (*current_liboctave_error_with_id_handler) |
26569
0e77df67b522
Add static compile-time checking of printf functions in liboctave.
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
76 (err_id, "%s: nonconformant arguments (op1 len: %" OCTAVE_IDX_TYPE_FORMAT |
0e77df67b522
Add static compile-time checking of printf functions in liboctave.
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
77 ", op2 len: % " OCTAVE_IDX_TYPE_FORMAT ")", |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
78 op, op1_len, op2_len); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
79 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
80 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
81 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
82 err_nonconformant (const char *op, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
83 octave_idx_type op1_nr, octave_idx_type op1_nc, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
84 octave_idx_type op2_nr, octave_idx_type op2_nc) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
85 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
86 const char *err_id = error_id_nonconformant_args; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
87 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
88 (*current_liboctave_error_with_id_handler) |
26569
0e77df67b522
Add static compile-time checking of printf functions in liboctave.
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
89 (err_id, "%s: nonconformant arguments " |
0e77df67b522
Add static compile-time checking of printf functions in liboctave.
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
90 "(op1 is %" OCTAVE_IDX_TYPE_FORMAT "x%" OCTAVE_IDX_TYPE_FORMAT ", " |
0e77df67b522
Add static compile-time checking of printf functions in liboctave.
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
91 "op2 is %" OCTAVE_IDX_TYPE_FORMAT"x%" OCTAVE_IDX_TYPE_FORMAT ")", |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
92 op, op1_nr, op1_nc, op2_nr, op2_nc); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
93 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
94 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
95 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
96 err_nonconformant (const char *op, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
97 const dim_vector& op1_dims, const dim_vector& op2_dims) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
98 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
99 const char *err_id = error_id_nonconformant_args; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
100 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
101 std::string op1_dims_str = op1_dims.str (); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
102 std::string op2_dims_str = op2_dims.str (); |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
103 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
104 (*current_liboctave_error_with_id_handler) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
105 (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)", |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
106 op, op1_dims_str.c_str (), op2_dims_str.c_str ()); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
107 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
108 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
109 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
110 err_del_index_out_of_range (bool is1d, octave_idx_type idx, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
111 octave_idx_type ext) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
112 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
113 const char *err_id = error_id_index_out_of_bounds; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
114 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
115 (*current_liboctave_error_with_id_handler) |
26569
0e77df67b522
Add static compile-time checking of printf functions in liboctave.
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
116 (err_id, "A(%s) = []: index out of bounds: value %" OCTAVE_IDX_TYPE_FORMAT |
0e77df67b522
Add static compile-time checking of printf functions in liboctave.
Markus Mützel <markus.muetzel@gmx.de>
parents:
26376
diff
changeset
|
117 " out of bound %" OCTAVE_IDX_TYPE_FORMAT, |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
118 is1d ? "I" : "..,I,..", idx, ext); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
119 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
120 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
121 // Common procedures of base class index_exception, thrown whenever an |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
122 // object is indexed incorrectly, such as by an index that is out of |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
123 // range, negative, fractional, complex, or of a non-numeric type. |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
124 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
125 std::string |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
126 index_exception::message (void) const |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
127 { |
27996
1998edbd4490
eliminate useless conversion of std::string.c_str back to std::string
John W. Eaton <jwe@octave.org>
parents:
27923
diff
changeset
|
128 return expression () + ": " + details (); |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
129 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
130 |
27997
e90e3155cd01
derive execution_exception from std::exception
John W. Eaton <jwe@octave.org>
parents:
27996
diff
changeset
|
131 const char * index_exception::what (void) const noexcept |
e90e3155cd01
derive execution_exception from std::exception
John W. Eaton <jwe@octave.org>
parents:
27996
diff
changeset
|
132 { |
e90e3155cd01
derive execution_exception from std::exception
John W. Eaton <jwe@octave.org>
parents:
27996
diff
changeset
|
133 std::string tmp = message (); |
e90e3155cd01
derive execution_exception from std::exception
John W. Eaton <jwe@octave.org>
parents:
27996
diff
changeset
|
134 |
e90e3155cd01
derive execution_exception from std::exception
John W. Eaton <jwe@octave.org>
parents:
27996
diff
changeset
|
135 return tmp.c_str (); |
e90e3155cd01
derive execution_exception from std::exception
John W. Eaton <jwe@octave.org>
parents:
27996
diff
changeset
|
136 } |
e90e3155cd01
derive execution_exception from std::exception
John W. Eaton <jwe@octave.org>
parents:
27996
diff
changeset
|
137 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
138 // Show the expression that caused the error, e.g., "A(-1,_)", |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
139 // "A(0+1i)", "A(_,3)". Show how many indices come before/after the |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
140 // offending one, e.g., (<error>), (<error>,_), or (_,<error>,...[x5]...) |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
141 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
142 std::string |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
143 index_exception::expression (void) const |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
144 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
145 std::ostringstream buf; |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
146 |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
147 if (m_var.empty () || m_var == "<unknown>") |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
148 buf << "index "; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
149 else |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
150 buf << m_var; |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
151 |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
152 bool show_parens = m_dim > 0; |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
153 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
154 if (show_parens) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
155 { |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
156 if (m_dim < 5) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
157 { |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23446
diff
changeset
|
158 buf << '('; |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
159 |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
160 for (octave_idx_type i = 1; i < m_dim; i++) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
161 buf << "_,"; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
162 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
163 else |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
164 buf << "(...[x" << m_dim - 1 << "]..."; |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
165 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
166 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
167 buf << idx (); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
168 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
169 if (show_parens) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
170 { |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
171 if (m_nd - m_dim < 5) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
172 { |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
173 for (octave_idx_type i = 0; i < m_nd - m_dim; i++) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
174 buf << ",_"; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
175 |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
176 if (m_nd >= m_dim) |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23446
diff
changeset
|
177 buf << ')'; |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
178 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
179 else |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
180 buf << "...[x" << m_nd - m_dim << "]...)"; |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
181 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
182 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
183 return buf.str (); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
184 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
185 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
186 class invalid_index : public index_exception |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
187 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
188 public: |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
189 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
190 invalid_index (const std::string& value, octave_idx_type ndim, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
191 octave_idx_type dimen) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
192 : index_exception (value, ndim, dimen) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
193 { } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
194 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
195 std::string details (void) const |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
196 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
197 #if defined (OCTAVE_ENABLE_64) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
198 return "subscripts must be either integers 1 to (2^63)-1 or logicals"; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
199 #else |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
200 return "subscripts must be either integers 1 to (2^31)-1 or logicals"; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
201 #endif |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
202 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
203 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
204 // ID of error to throw |
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
205 const char * err_id (void) const |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
206 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
207 return error_id_invalid_index; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
208 } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
209 }; |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
210 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
211 // Complain if an index is negative, fractional, or too big. |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
212 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
213 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
214 err_invalid_index (const std::string& idx, octave_idx_type nd, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
215 octave_idx_type dim, const std::string&) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
216 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
217 invalid_index e (idx, nd, dim); |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
218 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
219 throw e; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
220 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
221 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
222 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
223 err_invalid_index (octave_idx_type n, octave_idx_type nd, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
224 octave_idx_type dim, const std::string& var) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
225 { |
28003
60d8d6e5594d
use std::to_string instead of ostringstream buffer
John W. Eaton <jwe@octave.org>
parents:
27997
diff
changeset
|
226 err_invalid_index (std::to_string (n + 1), nd, dim, var); |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
227 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
228 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
229 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
230 err_invalid_index (double n, octave_idx_type nd, octave_idx_type dim, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
231 const std::string& var) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
232 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
233 std::ostringstream buf; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
234 buf << n + 1; |
25807
cb775c73866d
Don't print fractional part of an invalid NaN index.
Rik <rik@octave.org>
parents:
25806
diff
changeset
|
235 |
cb775c73866d
Don't print fractional part of an invalid NaN index.
Rik <rik@octave.org>
parents:
25806
diff
changeset
|
236 if (! std::isnan (n)) |
cb775c73866d
Don't print fractional part of an invalid NaN index.
Rik <rik@octave.org>
parents:
25806
diff
changeset
|
237 { |
cb775c73866d
Don't print fractional part of an invalid NaN index.
Rik <rik@octave.org>
parents:
25806
diff
changeset
|
238 // if n not an integer, but would be printed as one, show diff |
cb775c73866d
Don't print fractional part of an invalid NaN index.
Rik <rik@octave.org>
parents:
25806
diff
changeset
|
239 double nearest = std::floor (n + 1.5); |
cb775c73866d
Don't print fractional part of an invalid NaN index.
Rik <rik@octave.org>
parents:
25806
diff
changeset
|
240 if (n + 1 != nearest && (buf.str ().find ('.') == std::string::npos)) |
cb775c73866d
Don't print fractional part of an invalid NaN index.
Rik <rik@octave.org>
parents:
25806
diff
changeset
|
241 buf << std::showpos << (n + 1 - nearest); |
cb775c73866d
Don't print fractional part of an invalid NaN index.
Rik <rik@octave.org>
parents:
25806
diff
changeset
|
242 } |
25806
0360ed7c39a8
Always print non-integer part of non-integer indices in invalid index message (bug #46859).
Lachlan Andrew <lachlanbis@gmail.com>
parents:
25054
diff
changeset
|
243 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
244 err_invalid_index (buf.str (), nd, dim, var); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
245 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
246 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
247 // Complain for read access beyond the bounds of an array. |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
248 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
249 class out_of_range : public index_exception |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
250 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
251 public: |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
252 |
28004
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
253 out_of_range (const std::string& value, octave_idx_type nd, |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
254 octave_idx_type dim, octave_idx_type ext, |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
255 const dim_vector& size) |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
256 : index_exception (value, nd, dim), m_size (size), m_extent (ext) |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
257 { } |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
258 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
259 std::string details (void) const |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
260 { |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
261 std::string expl; |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
262 |
28004
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
263 return "out of bound " + std::to_string (m_extent) |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
264 + " (dimensions are " + m_size.str ('x') + ")"; |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
265 } |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
266 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
267 // ID of error to throw. |
23446
cd4e1ee28716
maint: Use convention 'void * fcn ()' for functions which return pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
268 const char * err_id (void) const |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
269 { |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
270 return error_id_index_out_of_bounds; |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
271 } |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
272 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
273 private: |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
274 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
275 // Dimension of object being accessed. |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
276 dim_vector m_size; |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
277 |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
278 // Length of dimension being accessed. |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
27101
diff
changeset
|
279 octave_idx_type m_extent; |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
280 }; |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
281 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
282 // Complain of an index that is out of range |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
283 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
284 err_index_out_of_range (int nd, int dim, octave_idx_type idx, |
28004
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
285 octave_idx_type ext, const dim_vector& dv) |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
286 { |
28004
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
287 throw out_of_range (std::to_string (idx), nd, dim, ext, dv); |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
288 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
289 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
290 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
291 err_invalid_resize (void) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
292 { |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
293 (*current_liboctave_error_with_id_handler) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
294 ("Octave:invalid-resize", |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
295 "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element"); |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
296 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
297 |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
298 void |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
299 warn_singular_matrix (double rcond) |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
300 { |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
301 if (rcond == 0.0) |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
302 { |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
303 (*current_liboctave_warning_with_id_handler) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
304 (warning_id_singular_matrix, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
305 "matrix singular to machine precision"); |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
306 } |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
307 else |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
308 { |
22327
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
309 (*current_liboctave_warning_with_id_handler) |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
310 (warning_id_nearly_singular_matrix, |
d0562b3159c7
move more classes inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
22022
diff
changeset
|
311 "matrix singular to machine precision, rcond = %g", rcond); |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
312 } |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
313 } |
28004
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
314 |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
315 // DEPRECATED in Octave 6. |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
316 |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
317 // Complain of an index that is out of range, but we don't know matrix size |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
318 void |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
319 err_index_out_of_range (int nd, int dim, octave_idx_type idx, |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
320 octave_idx_type ext) |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
321 { |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
322 // The dim_vector setting here doesn't really make sense. However, |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
323 // this function has been deprecated and will be removed in version |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
324 // 8, so there's no need to attempt to fix it. |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
325 |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
326 throw out_of_range (std::to_string (idx), nd, dim, ext, |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
327 dim_vector (1, 1, 1, 1, 1, 1, 1)); |
403df0b32204
update out_of_range error messages
John W. Eaton <jwe@octave.org>
parents:
28003
diff
changeset
|
328 } |
21100
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
329 } |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
330 |
e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents:
diff
changeset
|
331 /* Tests in test/index.tst */ |