Mercurial > octave
diff 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 |
line wrap: on
line diff
--- a/liboctave/util/lo-array-errwarn.cc Thu Dec 01 14:23:45 2022 -0800 +++ b/liboctave/util/lo-array-errwarn.cc Thu Dec 01 18:02:15 2022 -0800 @@ -38,269 +38,269 @@ OCTAVE_BEGIN_NAMESPACE(octave) - // Text constants used to shorten code below. +// Text constants used to shorten code below. - static const char *error_id_nonconformant_args - = "Octave:nonconformant-args"; +static const char *error_id_nonconformant_args + = "Octave:nonconformant-args"; - static const char *error_id_index_out_of_bounds - = "Octave:index-out-of-bounds"; +static const char *error_id_index_out_of_bounds + = "Octave:index-out-of-bounds"; - static const char *error_id_invalid_index = "Octave:invalid-index"; +static const char *error_id_invalid_index = "Octave:invalid-index"; - static const char *warning_id_nearly_singular_matrix - = "Octave:nearly-singular-matrix"; +static const char *warning_id_nearly_singular_matrix + = "Octave:nearly-singular-matrix"; - static const char *warning_id_singular_matrix = "Octave:singular-matrix"; +static const char *warning_id_singular_matrix = "Octave:singular-matrix"; - void - err_nan_to_logical_conversion (void) - { - (*current_liboctave_error_handler) - ("invalid conversion from NaN to logical"); - } +void +err_nan_to_logical_conversion (void) +{ + (*current_liboctave_error_handler) + ("invalid conversion from NaN to logical"); +} - void - err_nan_to_character_conversion (void) - { - (*current_liboctave_error_handler) - ("invalid conversion from NaN to character"); - } +void +err_nan_to_character_conversion (void) +{ + (*current_liboctave_error_handler) + ("invalid conversion from NaN to character"); +} - void - err_nonconformant (const char *op, - octave_idx_type op1_len, octave_idx_type op2_len) - { - const char *err_id = error_id_nonconformant_args; +void +err_nonconformant (const char *op, + octave_idx_type op1_len, octave_idx_type op2_len) +{ + const char *err_id = error_id_nonconformant_args; - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments (op1 len: %" OCTAVE_IDX_TYPE_FORMAT - ", op2 len: % " OCTAVE_IDX_TYPE_FORMAT ")", - op, op1_len, op2_len); - } + (*current_liboctave_error_with_id_handler) + (err_id, "%s: nonconformant arguments (op1 len: %" OCTAVE_IDX_TYPE_FORMAT + ", op2 len: % " OCTAVE_IDX_TYPE_FORMAT ")", + op, op1_len, op2_len); +} + +void +err_nonconformant (const char *op, + octave_idx_type op1_nr, octave_idx_type op1_nc, + octave_idx_type op2_nr, octave_idx_type op2_nc) +{ + const char *err_id = error_id_nonconformant_args; - void - err_nonconformant (const char *op, - octave_idx_type op1_nr, octave_idx_type op1_nc, - octave_idx_type op2_nr, octave_idx_type op2_nc) - { - const char *err_id = error_id_nonconformant_args; + (*current_liboctave_error_with_id_handler) + (err_id, "%s: nonconformant arguments " + "(op1 is %" OCTAVE_IDX_TYPE_FORMAT "x%" OCTAVE_IDX_TYPE_FORMAT ", " + "op2 is %" OCTAVE_IDX_TYPE_FORMAT"x%" OCTAVE_IDX_TYPE_FORMAT ")", + op, op1_nr, op1_nc, op2_nr, op2_nc); +} - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments " - "(op1 is %" OCTAVE_IDX_TYPE_FORMAT "x%" OCTAVE_IDX_TYPE_FORMAT ", " - "op2 is %" OCTAVE_IDX_TYPE_FORMAT"x%" OCTAVE_IDX_TYPE_FORMAT ")", - op, op1_nr, op1_nc, op2_nr, op2_nc); - } +void +err_nonconformant (const char *op, + const dim_vector& op1_dims, const dim_vector& op2_dims) +{ + const char *err_id = error_id_nonconformant_args; - void - err_nonconformant (const char *op, - const dim_vector& op1_dims, const dim_vector& op2_dims) - { - const char *err_id = error_id_nonconformant_args; + std::string op1_dims_str = op1_dims.str (); + std::string op2_dims_str = op2_dims.str (); - std::string op1_dims_str = op1_dims.str (); - std::string op2_dims_str = op2_dims.str (); + (*current_liboctave_error_with_id_handler) + (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)", + op, op1_dims_str.c_str (), op2_dims_str.c_str ()); +} - (*current_liboctave_error_with_id_handler) - (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)", - op, op1_dims_str.c_str (), op2_dims_str.c_str ()); - } +void +err_del_index_out_of_range (bool is1d, octave_idx_type idx, + octave_idx_type ext) +{ + const char *err_id = error_id_index_out_of_bounds; - void - err_del_index_out_of_range (bool is1d, octave_idx_type idx, - octave_idx_type ext) - { - const char *err_id = error_id_index_out_of_bounds; + (*current_liboctave_error_with_id_handler) + (err_id, "A(%s) = []: index out of bounds: value %" OCTAVE_IDX_TYPE_FORMAT + " out of bound %" OCTAVE_IDX_TYPE_FORMAT, + is1d ? "I" : "..,I,..", idx, ext); +} + +// Show the expression that caused the error, e.g., "A(-1,_)", +// "A(0+1i)", "A(_,3)". Show how many indices come before/after the +// offending one, e.g., (<error>), (<error>,_), or (_,<error>,...[x5]...) - (*current_liboctave_error_with_id_handler) - (err_id, "A(%s) = []: index out of bounds: value %" OCTAVE_IDX_TYPE_FORMAT - " out of bound %" OCTAVE_IDX_TYPE_FORMAT, - is1d ? "I" : "..,I,..", idx, ext); - } - - // Show the expression that caused the error, e.g., "A(-1,_)", - // "A(0+1i)", "A(_,3)". Show how many indices come before/after the - // offending one, e.g., (<error>), (<error>,_), or (_,<error>,...[x5]...) +std::string +index_exception::expression (void) const +{ + std::ostringstream buf; - std::string - index_exception::expression (void) const - { - std::ostringstream buf; + if (m_var.empty () || m_var == "<unknown>") + buf << "index "; + else + buf << m_var; - if (m_var.empty () || m_var == "<unknown>") - buf << "index "; - else - buf << m_var; + bool show_parens = m_dim > 0; + + if (show_parens) + { + if (m_dim < 5) + { + buf << '('; - bool show_parens = m_dim > 0; + for (octave_idx_type i = 1; i < m_dim; i++) + buf << "_,"; + } + else + buf << "(...[x" << m_dim - 1 << "]..."; + } - if (show_parens) - { - if (m_dim < 5) - { - buf << '('; + buf << m_index; - for (octave_idx_type i = 1; i < m_dim; i++) - buf << "_,"; - } - else - buf << "(...[x" << m_dim - 1 << "]..."; - } + if (show_parens) + { + if (m_nd - m_dim < 5) + { + for (octave_idx_type i = 0; i < m_nd - m_dim; i++) + buf << ",_"; - buf << m_index; + if (m_nd >= m_dim) + buf << ')'; + } + else + buf << "...[x" << m_nd - m_dim << "]...)"; + } - if (show_parens) - { - if (m_nd - m_dim < 5) - { - for (octave_idx_type i = 0; i < m_nd - m_dim; i++) - buf << ",_"; + return buf.str (); +} - if (m_nd >= m_dim) - buf << ')'; - } - else - buf << "...[x" << m_nd - m_dim << "]...)"; - } +class invalid_index : public index_exception +{ +public: - return buf.str (); + invalid_index (const std::string& value, octave_idx_type ndim, + octave_idx_type dimen) + : index_exception (value, ndim, dimen) + { + // Virtual, but the one we want to call is defined in this class. + update_message (); } - class invalid_index : public index_exception + void update_message (void) { - public: - - invalid_index (const std::string& value, octave_idx_type ndim, - octave_idx_type dimen) - : index_exception (value, ndim, dimen) - { - // Virtual, but the one we want to call is defined in this class. - update_message (); - } - - void update_message (void) - { - static std::string exp - = std::to_string (std::numeric_limits<octave_idx_type>::digits); - - set_message (expression () - + ": subscripts must be either integers 1 to (2^" + exp - + ")-1 or logicals"); - } - - // ID of error to throw - const char * err_id (void) const - { - return error_id_invalid_index; - } - }; - - // Complain if an index is negative, fractional, or too big. + static std::string exp + = std::to_string (std::numeric_limits<octave_idx_type>::digits); - void - err_invalid_index (const std::string& idx, octave_idx_type nd, - octave_idx_type dim, const std::string&) - { - invalid_index e (idx, nd, dim); - - throw e; - } - - void - err_invalid_index (octave_idx_type n, octave_idx_type nd, - octave_idx_type dim, const std::string& var) - { - err_invalid_index (std::to_string (n + 1), nd, dim, var); - } - - void - err_invalid_index (double n, octave_idx_type nd, octave_idx_type dim, - const std::string& var) - { - std::ostringstream buf; - buf << n + 1; - - if (! std::isnan (n)) - { - // if n not an integer, but would be printed as one, show diff - double nearest = std::floor (n + 1.5); - if (n + 1 != nearest && (buf.str ().find ('.') == std::string::npos)) - buf << std::showpos << (n + 1 - nearest); - } - - err_invalid_index (buf.str (), nd, dim, var); + set_message (expression () + + ": subscripts must be either integers 1 to (2^" + exp + + ")-1 or logicals"); } - // Complain for read access beyond the bounds of an array. - - class out_of_range : public index_exception + // ID of error to throw + const char * err_id (void) const { - public: + return error_id_invalid_index; + } +}; + +// Complain if an index is negative, fractional, or too big. + +void +err_invalid_index (const std::string& idx, octave_idx_type nd, + octave_idx_type dim, const std::string&) +{ + invalid_index e (idx, nd, dim); + + throw e; +} - out_of_range (const std::string& value, octave_idx_type nd, - octave_idx_type dim, octave_idx_type ext, - const dim_vector& size) - : index_exception (value, nd, dim), m_size (size), m_extent (ext) +void +err_invalid_index (octave_idx_type n, octave_idx_type nd, + octave_idx_type dim, const std::string& var) +{ + err_invalid_index (std::to_string (n + 1), nd, dim, var); +} + +void +err_invalid_index (double n, octave_idx_type nd, octave_idx_type dim, + const std::string& var) +{ + std::ostringstream buf; + buf << n + 1; + + if (! std::isnan (n)) { - // Virtual, but the one we want to call is defined in this class. - update_message (); - } - - void update_message (void) - { - set_message (expression () + ": out of bound " - + std::to_string (m_extent) - + " (dimensions are " + m_size.str ('x') + ")"); - } - - // ID of error to throw. - const char * err_id (void) const - { - return error_id_index_out_of_bounds; + // if n not an integer, but would be printed as one, show diff + double nearest = std::floor (n + 1.5); + if (n + 1 != nearest && (buf.str ().find ('.') == std::string::npos)) + buf << std::showpos << (n + 1 - nearest); } - private: + err_invalid_index (buf.str (), nd, dim, var); +} - // Dimension of object being accessed. - dim_vector m_size; +// Complain for read access beyond the bounds of an array. + +class out_of_range : public index_exception +{ +public: - // Length of dimension being accessed. - octave_idx_type m_extent; - }; + out_of_range (const std::string& value, octave_idx_type nd, + octave_idx_type dim, octave_idx_type ext, + const dim_vector& size) + : index_exception (value, nd, dim), m_size (size), m_extent (ext) + { + // Virtual, but the one we want to call is defined in this class. + update_message (); + } - // Complain of an index that is out of range - void - err_index_out_of_range (int nd, int dim, octave_idx_type idx, - octave_idx_type ext, const dim_vector& dv) + void update_message (void) { - throw out_of_range (std::to_string (idx), nd, dim, ext, dv); + set_message (expression () + ": out of bound " + + std::to_string (m_extent) + + " (dimensions are " + m_size.str ('x') + ")"); + } + + // ID of error to throw. + const char * err_id (void) const + { + return error_id_index_out_of_bounds; } - void - err_invalid_resize (void) - { - (*current_liboctave_error_with_id_handler) - ("Octave:invalid-resize", - "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element"); - } +private: + + // Dimension of object being accessed. + dim_vector m_size; + + // Length of dimension being accessed. + octave_idx_type m_extent; +}; + +// Complain of an index that is out of range +void +err_index_out_of_range (int nd, int dim, octave_idx_type idx, + octave_idx_type ext, const dim_vector& dv) +{ + throw out_of_range (std::to_string (idx), nd, dim, ext, dv); +} - void - warn_singular_matrix (double rcond) - { - if (rcond == 0.0) - { - (*current_liboctave_warning_with_id_handler) - (warning_id_singular_matrix, - "matrix singular to machine precision"); - } - else - { - (*current_liboctave_warning_with_id_handler) - (warning_id_nearly_singular_matrix, - "matrix singular to machine precision, rcond = %g", rcond); - } - } +void +err_invalid_resize (void) +{ + (*current_liboctave_error_with_id_handler) + ("Octave:invalid-resize", + "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element"); +} + +void +warn_singular_matrix (double rcond) +{ + if (rcond == 0.0) + { + (*current_liboctave_warning_with_id_handler) + (warning_id_singular_matrix, + "matrix singular to machine precision"); + } + else + { + (*current_liboctave_warning_with_id_handler) + (warning_id_nearly_singular_matrix, + "matrix singular to machine precision, rcond = %g", rcond); + } +} OCTAVE_END_NAMESPACE(octave)