Mercurial > octave
diff libinterp/corefcn/utils.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/utils.h Thu Dec 01 14:23:45 2022 -0800 +++ b/libinterp/corefcn/utils.h Thu Dec 01 18:02:15 2022 -0800 @@ -43,152 +43,152 @@ OCTAVE_BEGIN_NAMESPACE(octave) - extern OCTINTERP_API bool valid_identifier (const char *s); - extern OCTINTERP_API bool valid_identifier (const std::string& s); +extern OCTINTERP_API bool valid_identifier (const char *s); +extern OCTINTERP_API bool valid_identifier (const std::string& s); - //! Helper class for `make_valid_name` function calls. - //! - //! Extracting options separately for multiple (e.g. 1000+) function calls - //! avoids expensive repetitive parsing of the very same options. +//! Helper class for `make_valid_name` function calls. +//! +//! Extracting options separately for multiple (e.g. 1000+) function calls +//! avoids expensive repetitive parsing of the very same options. - class - OCTINTERP_API - make_valid_name_options - { - public: +class +OCTINTERP_API +make_valid_name_options +{ +public: - //! Default options for `make_valid_name` function calls. - //! - //! Calling the constructor without arguments is equivalent to: - //! - //! @code{.cc} - //! make_valid_name_options (ovl ("ReplacementStyle", "underscore", - //! "Prefix", "x")); - //! @endcode + //! Default options for `make_valid_name` function calls. + //! + //! Calling the constructor without arguments is equivalent to: + //! + //! @code{.cc} + //! make_valid_name_options (ovl ("ReplacementStyle", "underscore", + //! "Prefix", "x")); + //! @endcode - make_valid_name_options () = default; + make_valid_name_options () = default; - //! Extract attribute-value-pairs from an octave_value_list of strings. - //! - //! If attributes occur multiple times, the rightmost pair is chosen. - //! - //! @code{.cc} - //! make_valid_name_options (ovl ("ReplacementStyle", "hex", ...)); - //! @endcode + //! Extract attribute-value-pairs from an octave_value_list of strings. + //! + //! If attributes occur multiple times, the rightmost pair is chosen. + //! + //! @code{.cc} + //! make_valid_name_options (ovl ("ReplacementStyle", "hex", ...)); + //! @endcode - make_valid_name_options (const octave_value_list& args); + make_valid_name_options (const octave_value_list& args); - //! @return ReplacementStyle, see `help matlab.lang.makeValidName`. + //! @return ReplacementStyle, see `help matlab.lang.makeValidName`. - const std::string& - get_replacement_style () const { return m_replacement_style; } + const std::string& + get_replacement_style () const { return m_replacement_style; } - //! @return Prefix, see `help matlab.lang.makeValidName`. + //! @return Prefix, see `help matlab.lang.makeValidName`. - const std::string& get_prefix () const { return m_prefix; } + const std::string& get_prefix () const { return m_prefix; } - private: +private: - std::string m_replacement_style{"underscore"}; - std::string m_prefix{"x"}; - }; + std::string m_replacement_style{"underscore"}; + std::string m_prefix{"x"}; +}; - //! Modify @p str to be a valid variable name. - //! - //! @param str input string - //! @param options see also `help matlab.lang.makeValidName`. - //! - //! @return true, if @p str was modified. +//! Modify @p str to be a valid variable name. +//! +//! @param str input string +//! @param options see also `help matlab.lang.makeValidName`. +//! +//! @return true, if @p str was modified. - extern OCTINTERP_API bool - make_valid_name (std::string& str, const make_valid_name_options& options); +extern OCTINTERP_API bool +make_valid_name (std::string& str, const make_valid_name_options& options); - extern OCTINTERP_API bool - same_file (const std::string& f, const std::string& g); +extern OCTINTERP_API bool +same_file (const std::string& f, const std::string& g); - extern OCTINTERP_API int almost_match (const std::string& std, - const std::string& s, - int min_match_len = 1, - int case_sens = 1); +extern OCTINTERP_API int almost_match (const std::string& std, + const std::string& s, + int min_match_len = 1, + int case_sens = 1); - extern OCTINTERP_API int - keyword_almost_match (const char * const *std, int *min_len, - const std::string& s, int min_toks_to_match, - int max_toks); +extern OCTINTERP_API int +keyword_almost_match (const char *const *std, int *min_len, + const std::string& s, int min_toks_to_match, + int max_toks); - extern OCTINTERP_API std::string - search_path_for_file (const std::string&, const string_vector&); +extern OCTINTERP_API std::string +search_path_for_file (const std::string&, const string_vector&); - extern OCTINTERP_API string_vector - search_path_for_all_files (const std::string&, const string_vector&); +extern OCTINTERP_API string_vector +search_path_for_all_files (const std::string&, const string_vector&); - extern OCTINTERP_API std::string - file_in_path (const std::string&, const std::string&); +extern OCTINTERP_API std::string +file_in_path (const std::string&, const std::string&); - extern OCTINTERP_API std::string - find_data_file_in_load_path (const std::string& fcn, - const std::string& file, - bool require_regular_file = false); +extern OCTINTERP_API std::string +find_data_file_in_load_path (const std::string& fcn, + const std::string& file, + bool require_regular_file = false); - extern OCTINTERP_API std::string contents_file_in_path (const std::string&); +extern OCTINTERP_API std::string contents_file_in_path (const std::string&); - extern OCTINTERP_API std::string fcn_file_in_path (const std::string&); +extern OCTINTERP_API std::string fcn_file_in_path (const std::string&); - extern OCTINTERP_API std::string do_string_escapes (const std::string& s); +extern OCTINTERP_API std::string do_string_escapes (const std::string& s); - extern OCTINTERP_API const char * undo_string_escape (char c); +extern OCTINTERP_API const char * undo_string_escape (char c); - extern OCTINTERP_API std::string undo_string_escapes (const std::string& s); +extern OCTINTERP_API std::string undo_string_escapes (const std::string& s); - extern OCTINTERP_API void - check_dimensions (dim_vector& dim, const char *warnfor); +extern OCTINTERP_API void +check_dimensions (dim_vector& dim, const char *warnfor); - extern OCTINTERP_API void - get_dimensions (const octave_value& a, const char *warn_for, - dim_vector& dim); +extern OCTINTERP_API void +get_dimensions (const octave_value& a, const char *warn_for, + dim_vector& dim); - extern OCTINTERP_API void - get_dimensions (const octave_value& a, const octave_value& b, - const char *warn_for, octave_idx_type& nr, - octave_idx_type& nc); +extern OCTINTERP_API void +get_dimensions (const octave_value& a, const octave_value& b, + const char *warn_for, octave_idx_type& nr, + octave_idx_type& nc); - extern OCTINTERP_API void - get_dimensions (const octave_value& a, const char *warn_for, - octave_idx_type& nr, octave_idx_type& nc); +extern OCTINTERP_API void +get_dimensions (const octave_value& a, const char *warn_for, + octave_idx_type& nr, octave_idx_type& nc); - extern OCTINTERP_API octave_idx_type - dims_to_numel (const dim_vector& dims, const octave_value_list& idx); +extern OCTINTERP_API octave_idx_type +dims_to_numel (const dim_vector& dims, const octave_value_list& idx); - extern OCTINTERP_API Matrix - identity_matrix (octave_idx_type nr, octave_idx_type nc); +extern OCTINTERP_API Matrix +identity_matrix (octave_idx_type nr, octave_idx_type nc); - extern OCTINTERP_API FloatMatrix - float_identity_matrix (octave_idx_type nr, octave_idx_type nc); +extern OCTINTERP_API FloatMatrix +float_identity_matrix (octave_idx_type nr, octave_idx_type nc); - extern OCTINTERP_API std::size_t - format (std::ostream& os, const char *fmt, ...); +extern OCTINTERP_API std::size_t +format (std::ostream& os, const char *fmt, ...); - extern OCTINTERP_API std::size_t - vformat (std::ostream& os, const char *fmt, va_list args); +extern OCTINTERP_API std::size_t +vformat (std::ostream& os, const char *fmt, va_list args); - extern OCTINTERP_API std::string - vasprintf (const char *fmt, va_list args); +extern OCTINTERP_API std::string +vasprintf (const char *fmt, va_list args); - extern OCTINTERP_API std::string asprintf (const char *fmt, ...); +extern OCTINTERP_API std::string asprintf (const char *fmt, ...); - extern OCTINTERP_API void sleep (double seconds, - bool do_graphics_events = false); +extern OCTINTERP_API void sleep (double seconds, + bool do_graphics_events = false); - extern OCTINTERP_API - octave_value_list - do_simple_cellfun (octave_value_list (*fcn) (const octave_value_list&, int), - const char *fcn_name, const octave_value_list& args, - int nargout); +extern OCTINTERP_API +octave_value_list +do_simple_cellfun (octave_value_list (*fcn) (const octave_value_list&, int), + const char *fcn_name, const octave_value_list& args, + int nargout); - extern OCTINTERP_API - octave_value - do_simple_cellfun (octave_value_list (*fcn) (const octave_value_list&, int), - const char *fcn_name, const octave_value_list& args); +extern OCTINTERP_API +octave_value +do_simple_cellfun (octave_value_list (*fcn) (const octave_value_list&, int), + const char *fcn_name, const octave_value_list& args); OCTAVE_END_NAMESPACE(octave)