Mercurial > octave
diff liboctave/util/quit.h @ 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 | d9970470108a |
line wrap: on
line diff
--- a/liboctave/util/quit.h Thu Dec 01 14:23:45 2022 -0800 +++ b/liboctave/util/quit.h Thu Dec 01 18:02:15 2022 -0800 @@ -44,162 +44,162 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class frame_info - { - public: +class frame_info +{ +public: + + frame_info (void) = default; - frame_info (void) = default; + frame_info (const std::string& file_name, const std::string& fcn_name, + int line, int column) + : m_file_name (file_name), m_fcn_name (fcn_name), m_line (line), + m_column (column) + { } + + frame_info (const frame_info&) = default; + + frame_info& operator = (const frame_info&) = default; - frame_info (const std::string& file_name, const std::string& fcn_name, - int line, int column) - : m_file_name (file_name), m_fcn_name (fcn_name), m_line (line), - m_column (column) - { } + ~frame_info (void) = default; + + std::string file_name (void) const { return m_file_name; } - frame_info (const frame_info&) = default; + std::string fcn_name (void) const { return m_fcn_name; } + + int line (void) const { return m_line; } - frame_info& operator = (const frame_info&) = default; + int column (void) const { return m_column; } - ~frame_info (void) = default; +private: - std::string file_name (void) const { return m_file_name; } + std::string m_file_name; - std::string fcn_name (void) const { return m_fcn_name; } + std::string m_fcn_name; + + int m_line; - int line (void) const { return m_line; } - - int column (void) const { return m_column; } + int m_column; +}; - private: +inline bool operator == (const frame_info& a, const frame_info& b) +{ + return (a.file_name () == b.file_name () + && a.fcn_name () == b.fcn_name () + && a.line () == b.line () + && a.column () == b.column ()); +} - std::string m_file_name; +class OCTAVE_EXCEPTION_API execution_exception : public std::runtime_error +{ +public: - std::string m_fcn_name; + typedef std::list<frame_info> stack_info_type; - int m_line; - - int m_column; - }; + execution_exception (const std::string& err_type = "error", + const std::string& id = "", + const std::string& message = "unspecified error", + const stack_info_type& stack_info = stack_info_type ()) + : runtime_error (message), m_err_type (err_type), m_id (id), + m_message (message), m_stack_info (stack_info) + { } - inline bool operator == (const frame_info& a, const frame_info& b) + execution_exception (const execution_exception&) = default; + + execution_exception& operator = (const execution_exception&) = default; + + ~execution_exception (void) = default; + + void set_err_type (const std::string& et) { - return (a.file_name () == b.file_name () - && a.fcn_name () == b.fcn_name () - && a.line () == b.line () - && a.column () == b.column ()); + m_err_type = et; } - class OCTAVE_EXCEPTION_API execution_exception : public std::runtime_error + std::string err_type (void) const { return m_err_type; } + + virtual std::string stack_trace (void) const; + + void set_identifier (const std::string& id) { - public: - - typedef std::list<frame_info> stack_info_type; + m_id = id; + } - execution_exception (const std::string& err_type = "error", - const std::string& id = "", - const std::string& message = "unspecified error", - const stack_info_type& stack_info = stack_info_type ()) - : runtime_error (message), m_err_type (err_type), m_id (id), - m_message (message), m_stack_info (stack_info) - { } - - execution_exception (const execution_exception&) = default; + virtual std::string identifier (void) const { return m_id; } - execution_exception& operator = (const execution_exception&) = default; - - ~execution_exception (void) = default; + void set_message (const std::string& msg) + { + m_message = msg; + } - void set_err_type (const std::string& et) - { - m_err_type = et; - } - - std::string err_type (void) const { return m_err_type; } + std::string message (void) const { return m_message; } - virtual std::string stack_trace (void) const; - - void set_identifier (const std::string& id) - { - m_id = id; - } + // Provided for std::exception interface. + const char * what (void) const noexcept { return m_message.c_str (); } - virtual std::string identifier (void) const { return m_id; } - - void set_message (const std::string& msg) - { - m_message = msg; - } + virtual stack_info_type stack_info (void) const + { + return m_stack_info; + } - std::string message (void) const { return m_message; } + void set_stack_info (const stack_info_type& stack_info) + { + m_stack_info = stack_info; + } - // Provided for std::exception interface. - const char * what (void) const noexcept { return m_message.c_str (); } + virtual void display (std::ostream& os) const; - virtual stack_info_type stack_info (void) const - { - return m_stack_info; - } +private: + + std::string m_err_type; - void set_stack_info (const stack_info_type& stack_info) - { - m_stack_info = stack_info; - } + std::string m_id; + + std::string m_message; - virtual void display (std::ostream& os) const; - - private: - - std::string m_err_type; + stack_info_type m_stack_info; +}; - std::string m_id; - - std::string m_message; - - stack_info_type m_stack_info; - }; +class OCTAVE_EXCEPTION_API exit_exception : public std::exception +{ +public: - class OCTAVE_EXCEPTION_API exit_exception : public std::exception - { - public: + exit_exception (int exit_status = 0, bool safe_to_return = false) + : std::exception (), m_exit_status (exit_status), + m_safe_to_return (safe_to_return) + { } + + exit_exception (const exit_exception&) = default; - exit_exception (int exit_status = 0, bool safe_to_return = false) - : std::exception (), m_exit_status (exit_status), - m_safe_to_return (safe_to_return) - { } + exit_exception& operator = (exit_exception&) = default; + + ~exit_exception (void) = default; - exit_exception (const exit_exception&) = default; + const char * what (void) const noexcept { return "exit exception"; } - exit_exception& operator = (exit_exception&) = default; - - ~exit_exception (void) = default; + int exit_status (void) const { return m_exit_status; } - const char * what (void) const noexcept { return "exit exception"; } + bool safe_to_return (void) const { return m_safe_to_return; } - int exit_status (void) const { return m_exit_status; } - - bool safe_to_return (void) const { return m_safe_to_return; } +private: - private: + int m_exit_status; - int m_exit_status; - - bool m_safe_to_return; - }; + bool m_safe_to_return; +}; - class interrupt_exception : public std::exception - { - public: +class interrupt_exception : public std::exception +{ +public: - interrupt_exception (void) = default; + interrupt_exception (void) = default; - interrupt_exception (const interrupt_exception&) = default; + interrupt_exception (const interrupt_exception&) = default; - interrupt_exception& operator = (const interrupt_exception&) = default; + interrupt_exception& operator = (const interrupt_exception&) = default; - ~interrupt_exception (void) = default; + ~interrupt_exception (void) = default; - const char * what (void) const noexcept { return "interrupt exception"; } - }; + const char * what (void) const noexcept { return "interrupt exception"; } +}; OCTAVE_END_NAMESPACE(octave)