Mercurial > octave
comparison libinterp/parse-tree/pt-anon-scopes.cc @ 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 |
comparison
equal
deleted
inserted
replaced
| 31605:e88a07dec498 | 31607:aac27ad79be6 |
|---|---|
| 33 | 33 |
| 34 // TODO: make sure that if(f->scope()) is checked if necessary | 34 // TODO: make sure that if(f->scope()) is checked if necessary |
| 35 | 35 |
| 36 OCTAVE_BEGIN_NAMESPACE(octave) | 36 OCTAVE_BEGIN_NAMESPACE(octave) |
| 37 | 37 |
| 38 tree_anon_scopes::tree_anon_scopes (tree_anon_fcn_handle& anon_fh) | 38 tree_anon_scopes::tree_anon_scopes (tree_anon_fcn_handle& anon_fh) |
| 39 : tree_walker (), m_params (), m_vars () | 39 : tree_walker (), m_params (), m_vars () |
| 40 { | 40 { |
| 41 visit_anon_fcn_handle (anon_fh); | 41 visit_anon_fcn_handle (anon_fh); |
| 42 } | 42 } |
| 43 | 43 |
| 44 void | 44 void |
| 45 tree_anon_scopes::visit_anon_fcn_handle (tree_anon_fcn_handle& afh) | 45 tree_anon_scopes::visit_anon_fcn_handle (tree_anon_fcn_handle& afh) |
| 46 { | 46 { |
| 47 tree_parameter_list *param_list = afh.parameter_list (); | 47 tree_parameter_list *param_list = afh.parameter_list (); |
| 48 tree_expression *expr = afh.expression (); | 48 tree_expression *expr = afh.expression (); |
| 49 | 49 |
| 50 // Collect names of parameters. | 50 // Collect names of parameters. |
| 51 | 51 |
| 52 if (param_list) | 52 if (param_list) |
| 53 { | 53 { |
| 54 std::list<std::string> pnames = param_list->variable_names (); | 54 std::list<std::string> pnames = param_list->variable_names (); |
| 55 | 55 |
| 56 for (const auto& nm : pnames) | 56 for (const auto& nm : pnames) |
| 57 m_params.insert (nm); | 57 m_params.insert (nm); |
| 58 | 58 |
| 59 // Hmm, should this be included in the list returned from | 59 // Hmm, should this be included in the list returned from |
| 60 // tree_parameter_list::variable_names? | 60 // tree_parameter_list::variable_names? |
| 61 if (param_list->takes_varargs ()) | 61 if (param_list->takes_varargs ()) |
| 62 m_params.insert ("varargin"); | 62 m_params.insert ("varargin"); |
| 63 } | 63 } |
| 64 | 64 |
| 65 // Further walk the tree to find free variables in this expression | 65 // Further walk the tree to find free variables in this expression |
| 66 // and any nested definitions of additional anonymous functions. | 66 // and any nested definitions of additional anonymous functions. |
| 67 | 67 |
| 68 if (expr) | 68 if (expr) |
| 69 expr->accept (*this); | 69 expr->accept (*this); |
| 70 } | 70 } |
| 71 | 71 |
| 72 // The rest of visit_... methods is only for walking the tree. Many of | 72 // The rest of visit_... methods is only for walking the tree. Many of |
| 73 // them, in particular all methods for commands, are not applicable to | 73 // them, in particular all methods for commands, are not applicable to |
| 74 // anonymous functions. Only parts of the tree are walked which could | 74 // anonymous functions. Only parts of the tree are walked which could |
| 75 // contain further (nested) anonymous function definitions (so | 75 // contain further (nested) anonymous function definitions (so |
| 76 // e.g. identifiers and left hand sides of assignments are ignored). | 76 // e.g. identifiers and left hand sides of assignments are ignored). |
| 77 | 77 |
| 78 void | 78 void |
| 79 tree_anon_scopes::visit_identifier (tree_identifier& id) | 79 tree_anon_scopes::visit_identifier (tree_identifier& id) |
| 80 { | 80 { |
| 81 std::string nm = id.name (); | 81 std::string nm = id.name (); |
| 82 | 82 |
| 83 if (m_params.find (nm) == m_params.end ()) | 83 if (m_params.find (nm) == m_params.end ()) |
| 84 m_vars.insert (nm); | 84 m_vars.insert (nm); |
| 85 } | 85 } |
| 86 | 86 |
| 87 void | 87 void |
| 88 tree_anon_scopes::visit_parameter_list (tree_parameter_list&) | 88 tree_anon_scopes::visit_parameter_list (tree_parameter_list&) |
| 89 { | 89 { |
| 90 // In visit_anon_fcn_handle we only accept/visit the body of | 90 // In visit_anon_fcn_handle we only accept/visit the body of |
| 91 // anonymous function definitions, not the parameter list. | 91 // anonymous function definitions, not the parameter list. |
| 92 | 92 |
| 93 panic_impossible (); | |
| 94 } | |
| 95 | |
| 96 void | |
| 97 tree_anon_scopes::visit_statement (tree_statement& stmt) | |
| 98 { | |
| 99 tree_command *cmd = stmt.command (); | |
| 100 | |
| 101 if (cmd) | |
| 93 panic_impossible (); | 102 panic_impossible (); |
| 94 } | 103 else |
| 104 { | |
| 105 tree_expression *expr = stmt.expression (); | |
| 95 | 106 |
| 96 void | 107 if (expr) |
| 97 tree_anon_scopes::visit_statement (tree_statement& stmt) | 108 expr->accept (*this); |
| 98 { | 109 } |
| 99 tree_command *cmd = stmt.command (); | 110 } |
| 100 | 111 |
| 101 if (cmd) | 112 void |
| 102 panic_impossible (); | 113 tree_anon_scopes::visit_statement_list (tree_statement_list& lst) |
| 103 else | 114 { |
| 104 { | 115 for (auto& p : lst) |
| 105 tree_expression *expr = stmt.expression (); | 116 { |
| 117 tree_statement *elt = p; | |
| 106 | 118 |
| 107 if (expr) | 119 if (elt) |
| 108 expr->accept (*this); | 120 elt->accept (*this); |
| 109 } | 121 } |
| 110 } | 122 } |
| 111 | |
| 112 void | |
| 113 tree_anon_scopes::visit_statement_list (tree_statement_list& lst) | |
| 114 { | |
| 115 for (auto& p : lst) | |
| 116 { | |
| 117 tree_statement *elt = p; | |
| 118 | |
| 119 if (elt) | |
| 120 elt->accept (*this); | |
| 121 } | |
| 122 } | |
| 123 | 123 |
| 124 OCTAVE_END_NAMESPACE(octave) | 124 OCTAVE_END_NAMESPACE(octave) |
| 125 | 125 |