Mercurial > octave
diff libinterp/corefcn/pager.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 | 597f3ee61a48 |
line wrap: on
line diff
--- a/libinterp/corefcn/pager.h Thu Dec 01 14:23:45 2022 -0800 +++ b/libinterp/corefcn/pager.h Thu Dec 01 18:02:15 2022 -0800 @@ -38,276 +38,276 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class interpreter; - class oprocstream; +class interpreter; +class oprocstream; - class - OCTINTERP_API - pager_buf : public std::stringbuf - { - public: +class +OCTINTERP_API +pager_buf : public std::stringbuf +{ +public: - pager_buf (void) : std::stringbuf (), m_diary_skip (0) { } + pager_buf (void) : std::stringbuf (), m_diary_skip (0) { } - void flush_current_contents_to_diary (void); + void flush_current_contents_to_diary (void); - void set_diary_skip (void); + void set_diary_skip (void); - protected: +protected: - int sync (void); + int sync (void); - private: +private: - std::size_t m_diary_skip; - }; + std::size_t m_diary_skip; +}; - class - OCTINTERP_API - pager_stream : public std::ostream - { - public: +class +OCTINTERP_API +pager_stream : public std::ostream +{ +public: - pager_stream (void); + pager_stream (void); - // No copying! + // No copying! - pager_stream (const pager_stream&) = delete; + pager_stream (const pager_stream&) = delete; - pager_stream& operator = (const pager_stream&) = delete; + pager_stream& operator = (const pager_stream&) = delete; - ~pager_stream (void); + ~pager_stream (void); - void flush_current_contents_to_diary (void); + void flush_current_contents_to_diary (void); - void set_diary_skip (void); + void set_diary_skip (void); - std::ostream& stream (void); + std::ostream& stream (void); - void reset (void); + void reset (void); - private: +private: - pager_buf *m_pb; - }; + pager_buf *m_pb; +}; - class - OCTINTERP_API - diary_buf : public std::stringbuf - { - public: +class +OCTINTERP_API +diary_buf : public std::stringbuf +{ +public: - diary_buf (void) : std::stringbuf () { } + diary_buf (void) : std::stringbuf () { } - protected: +protected: - int sync (void); - }; + int sync (void); +}; - class - OCTINTERP_API - diary_stream : public std::ostream - { - public: +class +OCTINTERP_API +diary_stream : public std::ostream +{ +public: - diary_stream (void); + diary_stream (void); - // No copying! + // No copying! - diary_stream (const diary_stream&) = delete; + diary_stream (const diary_stream&) = delete; - diary_stream& operator = (const diary_stream&) = delete; + diary_stream& operator = (const diary_stream&) = delete; - ~diary_stream (void); + ~diary_stream (void); - std::ostream& stream (void); + std::ostream& stream (void); - void reset (void); + void reset (void); - private: +private: - diary_buf *m_db; - }; + diary_buf *m_db; +}; - extern OCTINTERP_API void flush_stdout (void); +extern OCTINTERP_API void flush_stdout (void); - class output_system - { - public: +class output_system +{ +public: - output_system (interpreter& interp); + output_system (interpreter& interp); - output_system (const output_system&) = delete; + output_system (const output_system&) = delete; - output_system& operator = (const output_system&) = delete; + output_system& operator = (const output_system&) = delete; - ~output_system (void) = default; + ~output_system (void) = default; - pager_stream& pager (void) { return m_pager_stream; } + pager_stream& pager (void) { return m_pager_stream; } - diary_stream& diary (void) { return m_diary_stream; } + diary_stream& diary (void) { return m_diary_stream; } - std::string diary_file_name (void) const { return m_diary_file_name; } + std::string diary_file_name (void) const { return m_diary_file_name; } - std::string diary_file_name (const std::string& nm) - { - std::string val = m_diary_file_name; - m_diary_file_name = nm.empty () ? "diary" : nm; - return val; - } + std::string diary_file_name (const std::string& nm) + { + std::string val = m_diary_file_name; + m_diary_file_name = nm.empty () ? "diary" : nm; + return val; + } - octave_value PAGER (const octave_value_list& args, int nargout); + octave_value PAGER (const octave_value_list& args, int nargout); - std::string PAGER (void) const { return m_PAGER; } + std::string PAGER (void) const { return m_PAGER; } - std::string PAGER (const std::string& s) - { - std::string val = m_PAGER; - m_PAGER = s; - return val; - } + std::string PAGER (const std::string& s) + { + std::string val = m_PAGER; + m_PAGER = s; + return val; + } - octave_value PAGER_FLAGS (const octave_value_list& args, int nargout); + octave_value PAGER_FLAGS (const octave_value_list& args, int nargout); - std::string PAGER_FLAGS (void) const { return m_PAGER_FLAGS; } + std::string PAGER_FLAGS (void) const { return m_PAGER_FLAGS; } - std::string PAGER_FLAGS (const std::string& s) - { - std::string val = m_PAGER_FLAGS; - m_PAGER_FLAGS = s; - return val; - } + std::string PAGER_FLAGS (const std::string& s) + { + std::string val = m_PAGER_FLAGS; + m_PAGER_FLAGS = s; + return val; + } - octave_value page_output_immediately (const octave_value_list& args, - int nargout); + octave_value page_output_immediately (const octave_value_list& args, + int nargout); - bool page_output_immediately (void) const - { - return m_page_output_immediately; - } + bool page_output_immediately (void) const + { + return m_page_output_immediately; + } - bool page_output_immediately (bool flag) - { - bool val = m_page_output_immediately; - m_page_output_immediately = flag; - return val; - } + bool page_output_immediately (bool flag) + { + bool val = m_page_output_immediately; + m_page_output_immediately = flag; + return val; + } - octave_value page_screen_output (const octave_value_list& args, - int nargout); + octave_value page_screen_output (const octave_value_list& args, + int nargout); - bool page_screen_output (void) const { return m_page_screen_output; } + bool page_screen_output (void) const { return m_page_screen_output; } - bool page_screen_output (bool flag) - { - bool val = m_page_screen_output; - m_page_screen_output = flag; - return val; - } + bool page_screen_output (bool flag) + { + bool val = m_page_screen_output; + m_page_screen_output = flag; + return val; + } - bool write_to_diary_file (void) const - { - return m_write_to_diary_file; - } + bool write_to_diary_file (void) const + { + return m_write_to_diary_file; + } - bool write_to_diary_file (bool flag) - { - bool val = m_write_to_diary_file; - m_write_to_diary_file = flag; - return val; - } + bool write_to_diary_file (bool flag) + { + bool val = m_write_to_diary_file; + m_write_to_diary_file = flag; + return val; + } - bool really_flush_to_pager (void) const - { - return m_really_flush_to_pager; - } + bool really_flush_to_pager (void) const + { + return m_really_flush_to_pager; + } - bool really_flush_to_pager (bool flag) - { - bool val = m_really_flush_to_pager; - m_really_flush_to_pager = flag; - return val; - } + bool really_flush_to_pager (bool flag) + { + bool val = m_really_flush_to_pager; + m_really_flush_to_pager = flag; + return val; + } - bool flushing_output_to_pager (void) const - { - return m_flushing_output_to_pager; - } + bool flushing_output_to_pager (void) const + { + return m_flushing_output_to_pager; + } - bool flushing_output_to_pager (bool flag) - { - bool val = m_flushing_output_to_pager; - m_flushing_output_to_pager = flag; - return val; - } + bool flushing_output_to_pager (bool flag) + { + bool val = m_flushing_output_to_pager; + m_flushing_output_to_pager = flag; + return val; + } - std::string pager_command (void) const; + std::string pager_command (void) const; - std::ofstream& external_diary_file (void) { return m_external_diary_file; } + std::ofstream& external_diary_file (void) { return m_external_diary_file; } - void reset (void); + void reset (void); - void flush_stdout (void); + void flush_stdout (void); - bool sync (const char *msg, int len); + bool sync (const char *msg, int len); - void clear_external_pager (void); + void clear_external_pager (void); - void open_diary (void); + void open_diary (void); - void close_diary (void); + void close_diary (void); - std::ostream& __stdout__ (void) { return m_pager_stream.stream (); } + std::ostream& __stdout__ (void) { return m_pager_stream.stream (); } - std::ostream& __diary__ (void) { return m_diary_stream.stream (); } + std::ostream& __diary__ (void) { return m_diary_stream.stream (); } - private: +private: - interpreter& m_interpreter; + interpreter& m_interpreter; - pager_stream m_pager_stream; + pager_stream m_pager_stream; - diary_stream m_diary_stream; + diary_stream m_diary_stream; - // Our actual connection to the external pager. - oprocstream *m_external_pager = nullptr; + // Our actual connection to the external pager. + oprocstream *m_external_pager = nullptr; - // The diary file. - std::ofstream m_external_diary_file; + // The diary file. + std::ofstream m_external_diary_file; - // The name of the current diary file. - std::string m_diary_file_name; + // The name of the current diary file. + std::string m_diary_file_name; - // The shell command to run as the pager. - std::string m_PAGER; + // The shell command to run as the pager. + std::string m_PAGER; - // The options to pass to the pager. - std::string m_PAGER_FLAGS; + // The options to pass to the pager. + std::string m_PAGER_FLAGS; - // TRUE means that if output is going to the pager, it is sent as soon - // as it is available. Otherwise, it is buffered and only sent to the - // pager when it is time to print another prompt. - bool m_page_output_immediately; + // TRUE means that if output is going to the pager, it is sent as soon + // as it is available. Otherwise, it is buffered and only sent to the + // pager when it is time to print another prompt. + bool m_page_output_immediately; - // TRUE means all output intended for the screen should be passed - // through the pager. - bool m_page_screen_output; + // TRUE means all output intended for the screen should be passed + // through the pager. + bool m_page_screen_output; - // TRUE means we write to the diary file. - bool m_write_to_diary_file; + // TRUE means we write to the diary file. + bool m_write_to_diary_file; - bool m_really_flush_to_pager; + bool m_really_flush_to_pager; - bool m_flushing_output_to_pager; + bool m_flushing_output_to_pager; - void start_external_pager (void); + void start_external_pager (void); - void do_sync (const char *msg, int len, bool bypass_pager); - }; + void do_sync (const char *msg, int len, bool bypass_pager); +}; - extern OCTINTERP_API std::ostream& __stdout__ (void); +extern OCTINTERP_API std::ostream& __stdout__ (void); - extern OCTINTERP_API std::ostream& __diary__ (void); +extern OCTINTERP_API std::ostream& __diary__ (void); OCTAVE_END_NAMESPACE(octave)