Mercurial > octave
diff libinterp/corefcn/symrec.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/symrec.h Thu Dec 01 14:23:45 2022 -0800 +++ b/libinterp/corefcn/symrec.h Thu Dec 01 18:02:15 2022 -0800 @@ -40,204 +40,204 @@ OCTAVE_BEGIN_NAMESPACE(octave) - class symbol_scope_rep; +class symbol_scope_rep; + +class symbol_record +{ +public: + + typedef std::size_t context_id; - class symbol_record + enum symrec_t : unsigned char + { + // generic variable + LOCAL = 1, + // formal parameter + FORMAL = 2, + // this symbol may NOT become a variable. + // (symbol added to a static workspace) + ADDED_STATIC = 4, + // this symbol was recognized as a variable from syntax + VARIABLE = 8 + }; + +private: + + class symbol_record_rep { public: - typedef std::size_t context_id; + symbol_record_rep (const std::string& nm, symrec_t sc) + : m_frame_offset (0), m_data_offset (0), m_storage_class (sc), + m_name (nm) + { } + + symbol_record_rep (const symbol_record_rep&) = default; + + symbol_record_rep& operator = (const symbol_record_rep&) = default; + + ~symbol_record_rep (void) = default; + + // FIXME: use special storage class instead? + bool is_valid (void) const { return ! m_name.empty (); } + + void set_frame_offset (std::size_t offset) { m_frame_offset = offset; } + + std::size_t frame_offset (void) const { return m_frame_offset; } + + void set_data_offset (std::size_t offset) { m_data_offset = offset; } + + std::size_t data_offset (void) const { return m_data_offset; } - enum symrec_t : unsigned char + bool is_local (void) const + { + return m_storage_class & LOCAL; + } + + bool is_formal (void) const + { + return m_storage_class & FORMAL; + } + + bool is_added_static (void) const + { + return m_storage_class & ADDED_STATIC; + } + + bool is_variable (void) const + { + return m_storage_class & VARIABLE; + } + + void mark_local (void) { - // generic variable - LOCAL = 1, - // formal parameter - FORMAL = 2, - // this symbol may NOT become a variable. - // (symbol added to a static workspace) - ADDED_STATIC = 4, - // this symbol was recognized as a variable from syntax - VARIABLE = 8 - }; + m_storage_class = static_cast<symrec_t> (m_storage_class | LOCAL); + } + + void mark_formal (void) + { + // Formal parameters are also variables. + m_storage_class = static_cast<symrec_t> (m_storage_class + | FORMAL | VARIABLE); + } + + void mark_added_static (void) + { + m_storage_class = static_cast<symrec_t> (m_storage_class + | ADDED_STATIC); + } + + void mark_as_variable (void) + { + m_storage_class = static_cast<symrec_t> (m_storage_class | VARIABLE); + } + + void unmark_local (void) + { + m_storage_class = static_cast<symrec_t> (m_storage_class & ~LOCAL); + } + + void unmark_formal (void) + { + m_storage_class = static_cast<symrec_t> (m_storage_class & ~FORMAL); + } + + void unmark_added_static (void) + { + m_storage_class = static_cast<symrec_t> (m_storage_class + & ~ADDED_STATIC); + } + + void unmark_as_variable (void) + { + m_storage_class = static_cast<symrec_t> (m_storage_class & ~VARIABLE); + } + + unsigned int storage_class (void) const { return m_storage_class; } + + std::shared_ptr<symbol_record_rep> dup (void) const; + + octave_value dump (void) const; + + std::string name (void) const { return m_name; } + + void rename (const std::string& new_name) { m_name = new_name; } private: - class symbol_record_rep - { - public: - - symbol_record_rep (const std::string& nm, symrec_t sc) - : m_frame_offset (0), m_data_offset (0), m_storage_class (sc), - m_name (nm) - { } + std::size_t m_frame_offset; + std::size_t m_data_offset; - symbol_record_rep (const symbol_record_rep&) = default; - - symbol_record_rep& operator = (const symbol_record_rep&) = default; - - ~symbol_record_rep (void) = default; - - // FIXME: use special storage class instead? - bool is_valid (void) const { return ! m_name.empty (); } - - void set_frame_offset (std::size_t offset) { m_frame_offset = offset; } + symrec_t m_storage_class; - std::size_t frame_offset (void) const { return m_frame_offset; } - - void set_data_offset (std::size_t offset) { m_data_offset = offset; } - - std::size_t data_offset (void) const { return m_data_offset; } + std::string m_name; + }; - bool is_local (void) const - { - return m_storage_class & LOCAL; - } +public: - bool is_formal (void) const - { - return m_storage_class & FORMAL; - } - - bool is_added_static (void) const - { - return m_storage_class & ADDED_STATIC; - } + symbol_record (const std::string& nm = "", symrec_t sc = LOCAL) + : m_rep (new symbol_record_rep (nm, sc)) + { } - bool is_variable (void) const - { - return m_storage_class & VARIABLE; - } + symbol_record (const std::string& nm, const octave_value&, + symrec_t sc = LOCAL) + : m_rep (new symbol_record_rep (nm, sc)) + { } - void mark_local (void) - { - m_storage_class = static_cast<symrec_t> (m_storage_class | LOCAL); - } + symbol_record (const symbol_record&) = default; - void mark_formal (void) - { - // Formal parameters are also variables. - m_storage_class = static_cast<symrec_t> (m_storage_class - | FORMAL | VARIABLE); - } + symbol_record& operator = (const symbol_record&) = default; + + ~symbol_record (void) = default; - void mark_added_static (void) - { - m_storage_class = static_cast<symrec_t> (m_storage_class - | ADDED_STATIC); - } + bool is_valid (void) const { return m_rep->is_valid (); } - void mark_as_variable (void) - { - m_storage_class = static_cast<symrec_t> (m_storage_class | VARIABLE); - } + explicit operator bool () const { return is_valid (); } - void unmark_local (void) - { - m_storage_class = static_cast<symrec_t> (m_storage_class & ~LOCAL); - } + void set_frame_offset (std::size_t offset) + { m_rep->set_frame_offset (offset); } - void unmark_formal (void) - { - m_storage_class = static_cast<symrec_t> (m_storage_class & ~FORMAL); - } + std::size_t frame_offset (void) const { return m_rep->frame_offset (); } - void unmark_added_static (void) - { - m_storage_class = static_cast<symrec_t> (m_storage_class - & ~ADDED_STATIC); - } + void set_data_offset (std::size_t offset) + { m_rep->set_data_offset (offset); } - void unmark_as_variable (void) - { - m_storage_class = static_cast<symrec_t> (m_storage_class & ~VARIABLE); - } + std::size_t data_offset (void) const { return m_rep->data_offset (); } - unsigned int storage_class (void) const { return m_storage_class; } - - std::shared_ptr<symbol_record_rep> dup (void) const; - - octave_value dump (void) const; + symbol_record dup (void) const { return symbol_record (m_rep->dup ()); } - std::string name (void) const { return m_name; } - - void rename (const std::string& new_name) { m_name = new_name; } + std::string name (void) const { return m_rep->name (); } - private: - - std::size_t m_frame_offset; - std::size_t m_data_offset; - - symrec_t m_storage_class; + void rename (const std::string& new_name) { m_rep->rename (new_name); } - std::string m_name; - }; - - public: - - symbol_record (const std::string& nm = "", symrec_t sc = LOCAL) - : m_rep (new symbol_record_rep (nm, sc)) - { } + bool is_local (void) const { return m_rep->is_local (); } + bool is_formal (void) const { return m_rep->is_formal (); } + bool is_added_static (void) const { return m_rep->is_added_static (); } + bool is_variable (void) const { return m_rep->is_variable (); } - symbol_record (const std::string& nm, const octave_value&, - symrec_t sc = LOCAL) - : m_rep (new symbol_record_rep (nm, sc)) - { } - - symbol_record (const symbol_record&) = default; - - symbol_record& operator = (const symbol_record&) = default; - - ~symbol_record (void) = default; - - bool is_valid (void) const { return m_rep->is_valid (); } + void mark_local (void) { m_rep->mark_local (); } + void mark_formal (void) { m_rep->mark_formal (); } + void mark_added_static (void) { m_rep->mark_added_static (); } + void mark_as_variable (void) { m_rep->mark_as_variable (); } - explicit operator bool () const { return is_valid (); } - - void set_frame_offset (std::size_t offset) - { m_rep->set_frame_offset (offset); } - - std::size_t frame_offset (void) const { return m_rep->frame_offset (); } - - void set_data_offset (std::size_t offset) - { m_rep->set_data_offset (offset); } + void unmark_local (void) { m_rep->unmark_local (); } + void unmark_formal (void) { m_rep->unmark_formal (); } + void unmark_added_static (void) { m_rep->unmark_added_static (); } + void unmark_as_variable (void) { m_rep->unmark_as_variable (); } - std::size_t data_offset (void) const { return m_rep->data_offset (); } - - symbol_record dup (void) const { return symbol_record (m_rep->dup ()); } - - std::string name (void) const { return m_rep->name (); } + unsigned int storage_class (void) const { return m_rep->storage_class (); } - void rename (const std::string& new_name) { m_rep->rename (new_name); } - - bool is_local (void) const { return m_rep->is_local (); } - bool is_formal (void) const { return m_rep->is_formal (); } - bool is_added_static (void) const { return m_rep->is_added_static (); } - bool is_variable (void) const { return m_rep->is_variable (); } + octave_value dump (void) const { return m_rep->dump (); } - void mark_local (void) { m_rep->mark_local (); } - void mark_formal (void) { m_rep->mark_formal (); } - void mark_added_static (void) { m_rep->mark_added_static (); } - void mark_as_variable (void) { m_rep->mark_as_variable (); } +private: - void unmark_local (void) { m_rep->unmark_local (); } - void unmark_formal (void) { m_rep->unmark_formal (); } - void unmark_added_static (void) { m_rep->unmark_added_static (); } - void unmark_as_variable (void) { m_rep->unmark_as_variable (); } - - unsigned int storage_class (void) const { return m_rep->storage_class (); } + std::shared_ptr<symbol_record_rep> m_rep; - octave_value dump (void) const { return m_rep->dump (); } - - private: - - std::shared_ptr<symbol_record_rep> m_rep; - - // NEW_REP must be dynamically allocated or nullptr. - symbol_record (const std::shared_ptr<symbol_record_rep>& new_rep) - : m_rep (new_rep) - { } - }; + // NEW_REP must be dynamically allocated or nullptr. + symbol_record (const std::shared_ptr<symbol_record_rep>& new_rep) + : m_rep (new_rep) + { } +}; OCTAVE_END_NAMESPACE(octave)