Mercurial > octave
comparison liboctave/util/lo-array-errwarn.cc @ 31607:aac27ad79be6 stable
maint: Re-indent code after switch to using namespace macros.
* build-env.h, build-env.in.cc, Cell.h, __betainc__.cc, __eigs__.cc,
__ftp__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __magick_read__.cc,
__pchip_deriv__.cc, amd.cc, base-text-renderer.cc, base-text-renderer.h,
besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.h, call-stack.cc,
call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, dasrt.cc, data.cc,
debug.cc, defaults.cc, defaults.h, det.cc, display.cc, display.h, dlmread.cc,
dynamic-ld.cc, dynamic-ld.h, ellipj.cc, environment.cc, environment.h,
error.cc, error.h, errwarn.h, event-manager.cc, event-manager.h,
event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, fft.cc, fft2.cc,
file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h,
gcd.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h,
graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, gsvd.cc, gtk-manager.cc,
gtk-manager.h, help.cc, help.h, hook-fcn.cc, hook-fcn.h, input.cc, input.h,
interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h,
inv.cc, jsondecode.cc, jsonencode.cc, latex-text-renderer.cc,
latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h,
lookup.cc, ls-hdf5.cc, ls-mat4.cc, ls-mat5.cc, lsode.cc, lu.cc, mappers.cc,
matrix_type.cc, max.cc, mex.cc, mexproto.h, mxarray.h, mxtypes.in.h,
oct-errno.in.cc, oct-hdf5-types.cc, oct-hist.cc, oct-hist.h, oct-map.cc,
oct-map.h, oct-opengl.h, oct-prcstrm.h, oct-process.cc, oct-process.h,
oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h,
octave-default-image.h, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc,
pow2.cc, pr-output.cc, psi.cc, qr.cc, quadcc.cc, rand.cc, regexp.cc,
settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xpow.cc,
sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfns.cc, svd.cc,
syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h,
symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h,
text-renderer.cc, text-renderer.h, time.cc, toplev.cc, typecast.cc,
url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h,
variables.cc, variables.h, xdiv.cc, __delaunayn__.cc, __init_fltk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audioread.cc, convhulln.cc,
gzip.cc, cdef-class.cc, cdef-class.h, cdef-fwd.h, cdef-manager.cc,
cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h,
cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h,
cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc,
ov-base-mat.h, ov-base-scalar.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc,
ov-bool-mat.h, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.h, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h,
ov-complex.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc,
ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-float.cc,
ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc,
ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-lazy-idx.cc,
ov-legacy-range.cc, ov-magic-int.cc, ov-mex-fcn.cc, ov-mex-fcn.h,
ov-null-mat.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc,
ov-re-mat.h, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.h,
octave.cc, octave.h, op-b-sbm.cc, op-bm-sbm.cc, op-cs-scm.cc, op-fm-fcm.cc,
op-fs-fcm.cc, op-s-scm.cc, op-scm-cs.cc, op-scm-s.cc, op-sm-cs.cc, ops.h,
anon-fcn-validator.cc, anon-fcn-validator.h, bp-table.cc, bp-table.h,
comment-list.cc, comment-list.h, filepos.h, lex.h, oct-lvalue.cc, oct-lvalue.h,
parse.h, profiler.cc, profiler.h, pt-anon-scopes.cc, pt-anon-scopes.h,
pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h,
pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc,
pt-binop.h, pt-bp.cc, pt-bp.h, pt-cbinop.cc, pt-cbinop.h, pt-cell.cc,
pt-cell.h, pt-check.cc, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h,
pt-colon.cc, pt-colon.h, pt-const.cc, pt-const.h, pt-decl.cc, pt-decl.h,
pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h,
pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h,
pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.cc, pt-mat.h, pt-misc.cc, pt-misc.h,
pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h,
pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h,
pt-walk.cc, pt-walk.h, pt.cc, pt.h, token.cc, token.h, Range.cc, Range.h,
idx-vector.cc, idx-vector.h, range-fwd.h, CollocWt.cc, CollocWt.h,
aepbalance.cc, aepbalance.h, chol.cc, chol.h, gepbalance.cc, gepbalance.h,
gsvd.cc, gsvd.h, hess.cc, hess.h, lo-mappers.cc, lo-mappers.h, lo-specfun.cc,
lo-specfun.h, lu.cc, lu.h, oct-convn.cc, oct-convn.h, oct-fftw.cc, oct-fftw.h,
oct-norm.cc, oct-norm.h, oct-rand.cc, oct-rand.h, oct-spparms.cc,
oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randgamma.cc, randgamma.h,
randmtzig.cc, randmtzig.h, randpoisson.cc, randpoisson.h, schur.cc, schur.h,
sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc,
sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h,
file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h,
lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h,
oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc,
oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h,
action-container.cc, action-container.h, base-list.h, cmd-edit.cc, cmd-edit.h,
cmd-hist.cc, cmd-hist.h, f77-fcn.h, file-info.cc, file-info.h,
lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.h,
lo-regexp.cc, lo-regexp.h, lo-utils.cc, lo-utils.h, oct-base64.cc,
oct-base64.h, oct-glob.cc, oct-glob.h, oct-inttypes.h, oct-mutex.cc,
oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sparse.cc,
oct-sparse.h, oct-string.h, octave-preserve-stream-state.h, pathsearch.cc,
pathsearch.h, quit.cc, quit.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc,
url-transfer.h:
Re-indent code after switch to using namespace macros.
author | Rik <rik@octave.org> |
---|---|
date | Thu, 01 Dec 2022 18:02:15 -0800 |
parents | e88a07dec498 |
children | 597f3ee61a48 |
comparison
equal
deleted
inserted
replaced
31605:e88a07dec498 | 31607:aac27ad79be6 |
---|---|
36 #include "lo-array-errwarn.h" | 36 #include "lo-array-errwarn.h" |
37 #include "lo-error.h" | 37 #include "lo-error.h" |
38 | 38 |
39 OCTAVE_BEGIN_NAMESPACE(octave) | 39 OCTAVE_BEGIN_NAMESPACE(octave) |
40 | 40 |
41 // Text constants used to shorten code below. | 41 // Text constants used to shorten code below. |
42 | 42 |
43 static const char *error_id_nonconformant_args | 43 static const char *error_id_nonconformant_args |
44 = "Octave:nonconformant-args"; | 44 = "Octave:nonconformant-args"; |
45 | 45 |
46 static const char *error_id_index_out_of_bounds | 46 static const char *error_id_index_out_of_bounds |
47 = "Octave:index-out-of-bounds"; | 47 = "Octave:index-out-of-bounds"; |
48 | 48 |
49 static const char *error_id_invalid_index = "Octave:invalid-index"; | 49 static const char *error_id_invalid_index = "Octave:invalid-index"; |
50 | 50 |
51 static const char *warning_id_nearly_singular_matrix | 51 static const char *warning_id_nearly_singular_matrix |
52 = "Octave:nearly-singular-matrix"; | 52 = "Octave:nearly-singular-matrix"; |
53 | 53 |
54 static const char *warning_id_singular_matrix = "Octave:singular-matrix"; | 54 static const char *warning_id_singular_matrix = "Octave:singular-matrix"; |
55 | 55 |
56 void | 56 void |
57 err_nan_to_logical_conversion (void) | 57 err_nan_to_logical_conversion (void) |
58 { | 58 { |
59 (*current_liboctave_error_handler) | 59 (*current_liboctave_error_handler) |
60 ("invalid conversion from NaN to logical"); | 60 ("invalid conversion from NaN to logical"); |
61 } | 61 } |
62 | 62 |
63 void | 63 void |
64 err_nan_to_character_conversion (void) | 64 err_nan_to_character_conversion (void) |
65 { | 65 { |
66 (*current_liboctave_error_handler) | 66 (*current_liboctave_error_handler) |
67 ("invalid conversion from NaN to character"); | 67 ("invalid conversion from NaN to character"); |
68 } | 68 } |
69 | 69 |
70 void | 70 void |
71 err_nonconformant (const char *op, | 71 err_nonconformant (const char *op, |
72 octave_idx_type op1_len, octave_idx_type op2_len) | 72 octave_idx_type op1_len, octave_idx_type op2_len) |
73 { | 73 { |
74 const char *err_id = error_id_nonconformant_args; | 74 const char *err_id = error_id_nonconformant_args; |
75 | 75 |
76 (*current_liboctave_error_with_id_handler) | 76 (*current_liboctave_error_with_id_handler) |
77 (err_id, "%s: nonconformant arguments (op1 len: %" OCTAVE_IDX_TYPE_FORMAT | 77 (err_id, "%s: nonconformant arguments (op1 len: %" OCTAVE_IDX_TYPE_FORMAT |
78 ", op2 len: % " OCTAVE_IDX_TYPE_FORMAT ")", | 78 ", op2 len: % " OCTAVE_IDX_TYPE_FORMAT ")", |
79 op, op1_len, op2_len); | 79 op, op1_len, op2_len); |
80 } | 80 } |
81 | 81 |
82 void | 82 void |
83 err_nonconformant (const char *op, | 83 err_nonconformant (const char *op, |
84 octave_idx_type op1_nr, octave_idx_type op1_nc, | 84 octave_idx_type op1_nr, octave_idx_type op1_nc, |
85 octave_idx_type op2_nr, octave_idx_type op2_nc) | 85 octave_idx_type op2_nr, octave_idx_type op2_nc) |
86 { | 86 { |
87 const char *err_id = error_id_nonconformant_args; | 87 const char *err_id = error_id_nonconformant_args; |
88 | 88 |
89 (*current_liboctave_error_with_id_handler) | 89 (*current_liboctave_error_with_id_handler) |
90 (err_id, "%s: nonconformant arguments " | 90 (err_id, "%s: nonconformant arguments " |
91 "(op1 is %" OCTAVE_IDX_TYPE_FORMAT "x%" OCTAVE_IDX_TYPE_FORMAT ", " | 91 "(op1 is %" OCTAVE_IDX_TYPE_FORMAT "x%" OCTAVE_IDX_TYPE_FORMAT ", " |
92 "op2 is %" OCTAVE_IDX_TYPE_FORMAT"x%" OCTAVE_IDX_TYPE_FORMAT ")", | 92 "op2 is %" OCTAVE_IDX_TYPE_FORMAT"x%" OCTAVE_IDX_TYPE_FORMAT ")", |
93 op, op1_nr, op1_nc, op2_nr, op2_nc); | 93 op, op1_nr, op1_nc, op2_nr, op2_nc); |
94 } | 94 } |
95 | 95 |
96 void | 96 void |
97 err_nonconformant (const char *op, | 97 err_nonconformant (const char *op, |
98 const dim_vector& op1_dims, const dim_vector& op2_dims) | 98 const dim_vector& op1_dims, const dim_vector& op2_dims) |
99 { | 99 { |
100 const char *err_id = error_id_nonconformant_args; | 100 const char *err_id = error_id_nonconformant_args; |
101 | 101 |
102 std::string op1_dims_str = op1_dims.str (); | 102 std::string op1_dims_str = op1_dims.str (); |
103 std::string op2_dims_str = op2_dims.str (); | 103 std::string op2_dims_str = op2_dims.str (); |
104 | 104 |
105 (*current_liboctave_error_with_id_handler) | 105 (*current_liboctave_error_with_id_handler) |
106 (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)", | 106 (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)", |
107 op, op1_dims_str.c_str (), op2_dims_str.c_str ()); | 107 op, op1_dims_str.c_str (), op2_dims_str.c_str ()); |
108 } | 108 } |
109 | 109 |
110 void | 110 void |
111 err_del_index_out_of_range (bool is1d, octave_idx_type idx, | 111 err_del_index_out_of_range (bool is1d, octave_idx_type idx, |
112 octave_idx_type ext) | 112 octave_idx_type ext) |
113 { | 113 { |
114 const char *err_id = error_id_index_out_of_bounds; | 114 const char *err_id = error_id_index_out_of_bounds; |
115 | 115 |
116 (*current_liboctave_error_with_id_handler) | 116 (*current_liboctave_error_with_id_handler) |
117 (err_id, "A(%s) = []: index out of bounds: value %" OCTAVE_IDX_TYPE_FORMAT | 117 (err_id, "A(%s) = []: index out of bounds: value %" OCTAVE_IDX_TYPE_FORMAT |
118 " out of bound %" OCTAVE_IDX_TYPE_FORMAT, | 118 " out of bound %" OCTAVE_IDX_TYPE_FORMAT, |
119 is1d ? "I" : "..,I,..", idx, ext); | 119 is1d ? "I" : "..,I,..", idx, ext); |
120 } | 120 } |
121 | 121 |
122 // Show the expression that caused the error, e.g., "A(-1,_)", | 122 // Show the expression that caused the error, e.g., "A(-1,_)", |
123 // "A(0+1i)", "A(_,3)". Show how many indices come before/after the | 123 // "A(0+1i)", "A(_,3)". Show how many indices come before/after the |
124 // offending one, e.g., (<error>), (<error>,_), or (_,<error>,...[x5]...) | 124 // offending one, e.g., (<error>), (<error>,_), or (_,<error>,...[x5]...) |
125 | 125 |
126 std::string | 126 std::string |
127 index_exception::expression (void) const | 127 index_exception::expression (void) const |
128 { | 128 { |
129 std::ostringstream buf; | 129 std::ostringstream buf; |
130 | 130 |
131 if (m_var.empty () || m_var == "<unknown>") | 131 if (m_var.empty () || m_var == "<unknown>") |
132 buf << "index "; | 132 buf << "index "; |
133 else | 133 else |
134 buf << m_var; | 134 buf << m_var; |
135 | 135 |
136 bool show_parens = m_dim > 0; | 136 bool show_parens = m_dim > 0; |
137 | 137 |
138 if (show_parens) | 138 if (show_parens) |
139 { | 139 { |
140 if (m_dim < 5) | 140 if (m_dim < 5) |
141 { | 141 { |
142 buf << '('; | 142 buf << '('; |
143 | 143 |
144 for (octave_idx_type i = 1; i < m_dim; i++) | 144 for (octave_idx_type i = 1; i < m_dim; i++) |
145 buf << "_,"; | 145 buf << "_,"; |
146 } | 146 } |
147 else | 147 else |
148 buf << "(...[x" << m_dim - 1 << "]..."; | 148 buf << "(...[x" << m_dim - 1 << "]..."; |
149 } | 149 } |
150 | 150 |
151 buf << m_index; | 151 buf << m_index; |
152 | 152 |
153 if (show_parens) | 153 if (show_parens) |
154 { | 154 { |
155 if (m_nd - m_dim < 5) | 155 if (m_nd - m_dim < 5) |
156 { | 156 { |
157 for (octave_idx_type i = 0; i < m_nd - m_dim; i++) | 157 for (octave_idx_type i = 0; i < m_nd - m_dim; i++) |
158 buf << ",_"; | 158 buf << ",_"; |
159 | 159 |
160 if (m_nd >= m_dim) | 160 if (m_nd >= m_dim) |
161 buf << ')'; | 161 buf << ')'; |
162 } | 162 } |
163 else | 163 else |
164 buf << "...[x" << m_nd - m_dim << "]...)"; | 164 buf << "...[x" << m_nd - m_dim << "]...)"; |
165 } | 165 } |
166 | 166 |
167 return buf.str (); | 167 return buf.str (); |
168 } | 168 } |
169 | 169 |
170 class invalid_index : public index_exception | 170 class invalid_index : public index_exception |
171 { | 171 { |
172 public: | 172 public: |
173 | 173 |
174 invalid_index (const std::string& value, octave_idx_type ndim, | 174 invalid_index (const std::string& value, octave_idx_type ndim, |
175 octave_idx_type dimen) | 175 octave_idx_type dimen) |
176 : index_exception (value, ndim, dimen) | 176 : index_exception (value, ndim, dimen) |
177 { | 177 { |
178 // Virtual, but the one we want to call is defined in this class. | 178 // Virtual, but the one we want to call is defined in this class. |
179 update_message (); | 179 update_message (); |
180 } | 180 } |
181 | 181 |
182 void update_message (void) | 182 void update_message (void) |
183 { | 183 { |
184 static std::string exp | 184 static std::string exp |
185 = std::to_string (std::numeric_limits<octave_idx_type>::digits); | 185 = std::to_string (std::numeric_limits<octave_idx_type>::digits); |
186 | 186 |
187 set_message (expression () | 187 set_message (expression () |
188 + ": subscripts must be either integers 1 to (2^" + exp | 188 + ": subscripts must be either integers 1 to (2^" + exp |
189 + ")-1 or logicals"); | 189 + ")-1 or logicals"); |
190 } | 190 } |
191 | 191 |
192 // ID of error to throw | 192 // ID of error to throw |
193 const char * err_id (void) const | 193 const char * err_id (void) const |
194 { | 194 { |
195 return error_id_invalid_index; | 195 return error_id_invalid_index; |
196 } | 196 } |
197 }; | 197 }; |
198 | 198 |
199 // Complain if an index is negative, fractional, or too big. | 199 // Complain if an index is negative, fractional, or too big. |
200 | 200 |
201 void | 201 void |
202 err_invalid_index (const std::string& idx, octave_idx_type nd, | 202 err_invalid_index (const std::string& idx, octave_idx_type nd, |
203 octave_idx_type dim, const std::string&) | 203 octave_idx_type dim, const std::string&) |
204 { | 204 { |
205 invalid_index e (idx, nd, dim); | 205 invalid_index e (idx, nd, dim); |
206 | 206 |
207 throw e; | 207 throw e; |
208 } | 208 } |
209 | 209 |
210 void | 210 void |
211 err_invalid_index (octave_idx_type n, octave_idx_type nd, | 211 err_invalid_index (octave_idx_type n, octave_idx_type nd, |
212 octave_idx_type dim, const std::string& var) | 212 octave_idx_type dim, const std::string& var) |
213 { | 213 { |
214 err_invalid_index (std::to_string (n + 1), nd, dim, var); | 214 err_invalid_index (std::to_string (n + 1), nd, dim, var); |
215 } | 215 } |
216 | 216 |
217 void | 217 void |
218 err_invalid_index (double n, octave_idx_type nd, octave_idx_type dim, | 218 err_invalid_index (double n, octave_idx_type nd, octave_idx_type dim, |
219 const std::string& var) | 219 const std::string& var) |
220 { | 220 { |
221 std::ostringstream buf; | 221 std::ostringstream buf; |
222 buf << n + 1; | 222 buf << n + 1; |
223 | 223 |
224 if (! std::isnan (n)) | 224 if (! std::isnan (n)) |
225 { | 225 { |
226 // if n not an integer, but would be printed as one, show diff | 226 // if n not an integer, but would be printed as one, show diff |
227 double nearest = std::floor (n + 1.5); | 227 double nearest = std::floor (n + 1.5); |
228 if (n + 1 != nearest && (buf.str ().find ('.') == std::string::npos)) | 228 if (n + 1 != nearest && (buf.str ().find ('.') == std::string::npos)) |
229 buf << std::showpos << (n + 1 - nearest); | 229 buf << std::showpos << (n + 1 - nearest); |
230 } | 230 } |
231 | 231 |
232 err_invalid_index (buf.str (), nd, dim, var); | 232 err_invalid_index (buf.str (), nd, dim, var); |
233 } | 233 } |
234 | 234 |
235 // Complain for read access beyond the bounds of an array. | 235 // Complain for read access beyond the bounds of an array. |
236 | 236 |
237 class out_of_range : public index_exception | 237 class out_of_range : public index_exception |
238 { | 238 { |
239 public: | 239 public: |
240 | 240 |
241 out_of_range (const std::string& value, octave_idx_type nd, | 241 out_of_range (const std::string& value, octave_idx_type nd, |
242 octave_idx_type dim, octave_idx_type ext, | 242 octave_idx_type dim, octave_idx_type ext, |
243 const dim_vector& size) | 243 const dim_vector& size) |
244 : index_exception (value, nd, dim), m_size (size), m_extent (ext) | 244 : index_exception (value, nd, dim), m_size (size), m_extent (ext) |
245 { | 245 { |
246 // Virtual, but the one we want to call is defined in this class. | 246 // Virtual, but the one we want to call is defined in this class. |
247 update_message (); | 247 update_message (); |
248 } | 248 } |
249 | 249 |
250 void update_message (void) | 250 void update_message (void) |
251 { | 251 { |
252 set_message (expression () + ": out of bound " | 252 set_message (expression () + ": out of bound " |
253 + std::to_string (m_extent) | 253 + std::to_string (m_extent) |
254 + " (dimensions are " + m_size.str ('x') + ")"); | 254 + " (dimensions are " + m_size.str ('x') + ")"); |
255 } | 255 } |
256 | 256 |
257 // ID of error to throw. | 257 // ID of error to throw. |
258 const char * err_id (void) const | 258 const char * err_id (void) const |
259 { | 259 { |
260 return error_id_index_out_of_bounds; | 260 return error_id_index_out_of_bounds; |
261 } | 261 } |
262 | 262 |
263 private: | 263 private: |
264 | 264 |
265 // Dimension of object being accessed. | 265 // Dimension of object being accessed. |
266 dim_vector m_size; | 266 dim_vector m_size; |
267 | 267 |
268 // Length of dimension being accessed. | 268 // Length of dimension being accessed. |
269 octave_idx_type m_extent; | 269 octave_idx_type m_extent; |
270 }; | 270 }; |
271 | 271 |
272 // Complain of an index that is out of range | 272 // Complain of an index that is out of range |
273 void | 273 void |
274 err_index_out_of_range (int nd, int dim, octave_idx_type idx, | 274 err_index_out_of_range (int nd, int dim, octave_idx_type idx, |
275 octave_idx_type ext, const dim_vector& dv) | 275 octave_idx_type ext, const dim_vector& dv) |
276 { | 276 { |
277 throw out_of_range (std::to_string (idx), nd, dim, ext, dv); | 277 throw out_of_range (std::to_string (idx), nd, dim, ext, dv); |
278 } | 278 } |
279 | 279 |
280 void | 280 void |
281 err_invalid_resize (void) | 281 err_invalid_resize (void) |
282 { | 282 { |
283 (*current_liboctave_error_with_id_handler) | 283 (*current_liboctave_error_with_id_handler) |
284 ("Octave:invalid-resize", | 284 ("Octave:invalid-resize", |
285 "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element"); | 285 "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element"); |
286 } | 286 } |
287 | 287 |
288 void | 288 void |
289 warn_singular_matrix (double rcond) | 289 warn_singular_matrix (double rcond) |
290 { | 290 { |
291 if (rcond == 0.0) | 291 if (rcond == 0.0) |
292 { | 292 { |
293 (*current_liboctave_warning_with_id_handler) | 293 (*current_liboctave_warning_with_id_handler) |
294 (warning_id_singular_matrix, | 294 (warning_id_singular_matrix, |
295 "matrix singular to machine precision"); | 295 "matrix singular to machine precision"); |
296 } | 296 } |
297 else | 297 else |
298 { | 298 { |
299 (*current_liboctave_warning_with_id_handler) | 299 (*current_liboctave_warning_with_id_handler) |
300 (warning_id_nearly_singular_matrix, | 300 (warning_id_nearly_singular_matrix, |
301 "matrix singular to machine precision, rcond = %g", rcond); | 301 "matrix singular to machine precision, rcond = %g", rcond); |
302 } | 302 } |
303 } | 303 } |
304 | 304 |
305 OCTAVE_END_NAMESPACE(octave) | 305 OCTAVE_END_NAMESPACE(octave) |
306 | 306 |
307 /* Tests in test/index.tst */ | 307 /* Tests in test/index.tst */ |