Mercurial > octave
diff libinterp/corefcn/symtab.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/symtab.h Thu Dec 01 14:23:45 2022 -0800 +++ b/libinterp/corefcn/symtab.h Thu Dec 01 18:02:15 2022 -0800 @@ -48,185 +48,185 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class interpreter; +class interpreter; - class OCTINTERP_API symbol_table - { - public: +class OCTINTERP_API symbol_table +{ +public: - // Make symbol_table::scope and symbol_table::fcn_info valid type names. - typedef octave::symbol_scope scope; - typedef octave::fcn_info fcn_info; + // Make symbol_table::scope and symbol_table::fcn_info valid type names. + typedef octave::symbol_scope scope; + typedef octave::fcn_info fcn_info; - symbol_table (interpreter& interp); + symbol_table (interpreter& interp); - // No copying! + // No copying! + + symbol_table (const symbol_table&) = delete; - symbol_table (const symbol_table&) = delete; + symbol_table& operator = (const symbol_table&) = delete; - symbol_table& operator = (const symbol_table&) = delete; + ~symbol_table (void) = default; - ~symbol_table (void) = default; + symbol_scope current_scope (void) const; - symbol_scope current_scope (void) const; - - bool is_built_in_function_name (const std::string& name); + bool is_built_in_function_name (const std::string& name); - octave_value find_scoped_function (const std::string& name, - const symbol_scope& search_scope); + octave_value find_scoped_function (const std::string& name, + const symbol_scope& search_scope); - octave_value find_private_function (const std::string& dir_name, - const std::string& name); + octave_value find_private_function (const std::string& dir_name, + const std::string& name); - // FIXME: this function only finds legacy class methods, not - // classdef methods. - octave_value find_method (const std::string& name, - const std::string& dispatch_type); + // FIXME: this function only finds legacy class methods, not + // classdef methods. + octave_value find_method (const std::string& name, + const std::string& dispatch_type); + + octave_value find_built_in_function (const std::string& name); - octave_value find_built_in_function (const std::string& name); + octave_value find_autoload (const std::string& name); - octave_value find_autoload (const std::string& name); + octave_value + builtin_find (const std::string& name, + const symbol_scope& search_scope = symbol_scope ()); - octave_value - builtin_find (const std::string& name, + octave_value + fcn_table_find (const std::string& name, + const octave_value_list& args = ovl (), const symbol_scope& search_scope = symbol_scope ()); - octave_value - fcn_table_find (const std::string& name, - const octave_value_list& args = ovl (), - const symbol_scope& search_scope = symbol_scope ()); + // If NAME is of the form @CLASS/FUNCTION, call + // + // find_method (FUNCTION, CLASS) + // + // otherwise call + // + // find_function (NAME, ovl ()) - // If NAME is of the form @CLASS/FUNCTION, call - // - // find_method (FUNCTION, CLASS) - // - // otherwise call - // - // find_function (NAME, ovl ()) + octave_value + find_function (const std::string& name, + const symbol_scope& search_scope = symbol_scope ()); - octave_value - find_function (const std::string& name, - const symbol_scope& search_scope = symbol_scope ()); - - // NAME should just be function name; dispatch type determined - // from types of ARGS. + // NAME should just be function name; dispatch type determined + // from types of ARGS. - octave_value - find_function (const std::string& name, - const octave_value_list& args, - const symbol_scope& search_scope = symbol_scope ()); + octave_value + find_function (const std::string& name, + const octave_value_list& args, + const symbol_scope& search_scope = symbol_scope ()); - octave_value find_user_function (const std::string& name); + octave_value find_user_function (const std::string& name); - octave_value find_cmdline_function (const std::string& name); + octave_value find_cmdline_function (const std::string& name); + + void install_cmdline_function (const std::string& name, + const octave_value& fcn); - void install_cmdline_function (const std::string& name, - const octave_value& fcn); - - // Install local function FCN named NAME. FILE_NAME is the name of - // the file containing the local function. + // Install local function FCN named NAME. FILE_NAME is the name of + // the file containing the local function. - void install_local_function (const std::string& name, - const octave_value& fcn, - const std::string& file_name); + void install_local_function (const std::string& name, + const octave_value& fcn, + const std::string& file_name); - void install_user_function (const std::string& name, - const octave_value& fcn); + void install_user_function (const std::string& name, + const octave_value& fcn); - // FIXME: should we ensure that FCN really is a built-in function - // object? - void install_built_in_function (const std::string& name, - const octave_value& fcn); + // FIXME: should we ensure that FCN really is a built-in function + // object? + void install_built_in_function (const std::string& name, + const octave_value& fcn); - // This is written as two separate functions instead of a single - // function with default values so that it will work properly with - // unwind_protect. + // This is written as two separate functions instead of a single + // function with default values so that it will work properly with + // unwind_protect. - void clear_functions (bool force = false); + void clear_functions (bool force = false); - void clear_function (const std::string& name); + void clear_function (const std::string& name); - void clear_function_pattern (const std::string& pat); + void clear_function_pattern (const std::string& pat); - void clear_function_regexp (const std::string& pat); + void clear_function_regexp (const std::string& pat); - void clear_user_function (const std::string& name); + void clear_user_function (const std::string& name); - // This clears oct and mex files, including autoloads. - void clear_dld_function (const std::string& name); + // This clears oct and mex files, including autoloads. + void clear_dld_function (const std::string& name); - void clear_mex_functions (void); + void clear_mex_functions (void); - bool set_class_relationship (const std::string& sup_class, - const std::string& inf_class); + bool set_class_relationship (const std::string& sup_class, + const std::string& inf_class); - bool is_superiorto (const std::string& a, const std::string& b); + bool is_superiorto (const std::string& a, const std::string& b); - void alias_built_in_function (const std::string& alias, - const std::string& name); + void alias_built_in_function (const std::string& alias, + const std::string& name); - void install_built_in_dispatch (const std::string& name, - const std::string& klass); + void install_built_in_dispatch (const std::string& name, + const std::string& klass); - std::list<std::string> user_function_names (void); + std::list<std::string> user_function_names (void); - std::list<std::string> built_in_function_names (void); + std::list<std::string> built_in_function_names (void); - std::list<std::string> cmdline_function_names (void); + std::list<std::string> cmdline_function_names (void); - octave_value dump (void) const; + octave_value dump (void) const; - void add_to_parent_map (const std::string& classname, - const std::list<std::string>& parent_list); + void add_to_parent_map (const std::string& classname, + const std::list<std::string>& parent_list); - std::list<std::string> parent_classes (const std::string& dispatch_type); + std::list<std::string> parent_classes (const std::string& dispatch_type); - void cleanup (void); + void cleanup (void); - fcn_info * get_fcn_info (const std::string& name); + fcn_info * get_fcn_info (const std::string& name); - private: +private: - interpreter& m_interpreter; + interpreter& m_interpreter; - typedef std::map<std::string, octave_value>::const_iterator - global_symbols_const_iterator; - typedef std::map<std::string, octave_value>::iterator - global_symbols_iterator; + typedef std::map<std::string, octave_value>::const_iterator + global_symbols_const_iterator; + typedef std::map<std::string, octave_value>::iterator + global_symbols_iterator; - typedef std::map<std::string, fcn_info>::const_iterator - fcn_table_const_iterator; - typedef std::map<std::string, fcn_info>::iterator - fcn_table_iterator; + typedef std::map<std::string, fcn_info>::const_iterator + fcn_table_const_iterator; + typedef std::map<std::string, fcn_info>::iterator + fcn_table_iterator; - // Map from function names to function info (private - // functions, class constructors, class methods, etc.) - // Note that subfunctions are defined in the scope that contains - // them. - std::map<std::string, fcn_info> m_fcn_table; + // Map from function names to function info (private + // functions, class constructors, class methods, etc.) + // Note that subfunctions are defined in the scope that contains + // them. + std::map<std::string, fcn_info> m_fcn_table; - // Map from class names to set of classes that have lower - // precedence. - std::map<std::string, std::set<std::string>> m_class_precedence_table; + // Map from class names to set of classes that have lower + // precedence. + std::map<std::string, std::set<std::string>> m_class_precedence_table; - typedef std::map<std::string, std::set<std::string>>::const_iterator + typedef std::map<std::string, std::set<std::string>>::const_iterator class_precedence_table_const_iterator; - typedef std::map<std::string, std::set<std::string>>::iterator + typedef std::map<std::string, std::set<std::string>>::iterator class_precedence_table_iterator; - // Map from class names to parent class names. - std::map<std::string, std::list<std::string>> m_parent_map; + // Map from class names to parent class names. + std::map<std::string, std::list<std::string>> m_parent_map; - typedef std::map<std::string, std::list<std::string>>::const_iterator + typedef std::map<std::string, std::list<std::string>>::const_iterator const_parent_map_iterator; - typedef std::map<std::string, std::list<std::string>>::iterator + typedef std::map<std::string, std::list<std::string>>::iterator parent_map_iterator; - octave_value dump_fcn_table_map (void) const; + octave_value dump_fcn_table_map (void) const; - // This function is generated automatically by mk-builtins.pl. - void install_builtins (void); - }; + // This function is generated automatically by mk-builtins.pl. + void install_builtins (void); +}; OCTAVE_END_NAMESPACE(octave)