octave: libinterp/corefcn/stack-frame.cc annotate

annotate libinterp/corefcn/stack-frame.cc @ 31605:e88a07dec498 stable

maint: Use macros to begin/end C++ namespaces. * oct-conf-post-public.in.h: Define two macros (OCTAVE_BEGIN_NAMESPACE, OCTAVE_END_NAMESPACE) that can be used to start/end a namespace. * mk-opts.pl, build-env.h, build-env.in.cc, __betainc__.cc, __contourc__.cc, __dsearchn__.cc, __eigs__.cc, __expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc, __isprimelarge__.cc, __lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, auto-shlib.cc, auto-shlib.h, balance.cc, base-text-renderer.cc, base-text-renderer.h, besselj.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, ccolamd.cc, cellfun.cc, chol.cc, colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, data.h, debug.cc, defaults.cc, defaults.h, defun-int.h, defun.cc, det.cc, dirfns.cc, display.cc, display.h, dlmread.cc, dmperm.cc, dot.cc, dynamic-ld.cc, dynamic-ld.h, eig.cc, 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, fftn.cc, file-io.cc, filter.cc, find.cc, ft-text-renderer.cc, ft-text-renderer.h, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl-render.h, gl2ps-print.cc, gl2ps-print.h, graphics-toolkit.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gsvd.cc, gtk-manager.cc, gtk-manager.h, hash.cc, help.cc, help.h, hess.cc, hex2num.cc, 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, kron.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, lookup.cc, ls-ascii-helper.cc, ls-ascii-helper.h, ls-oct-text.cc, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, mappers.cc, matrix_type.cc, max.cc, mex-private.h, mex.cc, mgorth.cc, nproc.cc, oct-fstrm.cc, oct-fstrm.h, oct-hdf5-types.cc, oct-hdf5-types.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.cc, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, oct-tex-parser.yy, ordqz.cc, ordschur.cc, pager.cc, pager.h, pinv.cc, pow2.cc, pr-flt-fmt.cc, pr-output.cc, procstream.cc, procstream.h, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, settings.cc, settings.h, sighandlers.cc, sighandlers.h, sparse-xdiv.cc, sparse-xdiv.h, sparse-xpow.cc, sparse-xpow.h, sparse.cc, spparms.cc, sqrtm.cc, stack-frame.cc, stack-frame.h, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symbfact.cc, syminfo.cc, syminfo.h, symrcm.cc, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, syscalls.cc, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, url-handle-manager.cc, url-handle-manager.h, urlwrite.cc, utils.cc, utils.h, variables.cc, variables.h, xdiv.cc, xdiv.h, xnorm.cc, xnorm.h, xpow.cc, xpow.h, __delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc, audioread.cc, convhulln.cc, fftw.cc, gzip.cc, mk-build-env-features.sh, mk-builtins.pl, 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.cc, ov-base.h, ov-bool-mat.cc, ov-builtin.h, ov-cell.cc, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-complex.cc, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.h, ov-java.cc, ov-java.h, ov-mex-fcn.h, ov-null-mat.cc, ov-oncleanup.cc, ov-struct.cc, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, octave.cc, octave.h, mk-ops.sh, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-fcdm-fcdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-mi.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.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, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, 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-vm-eval.cc, 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 : Use new macros to begin/end C++ namespaces.

author	Rik <rik@octave.org>
date	Thu, 01 Dec 2022 14:23:45 -0800
parents	08b08b7f05b2
children	aac27ad79be6

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30200 diff changeset	3 // Copyright (C) 1995-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	25
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	26 #if defined (HAVE_CONFIG_H)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	27 # include "config.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	29
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include "lo-regexp.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include "str-vec.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	32
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "defun.h"
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	34 #include "error.h"
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include "interpreter.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "interpreter-private.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "oct-map.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "ov.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "ov-fcn.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include "ov-fcn-handle.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "ov-usr-fcn.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "pager.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include "parse.h"
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	44 #include "pt-eval.h"
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include "stack-frame.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	46 #include "syminfo.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "symrec.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "symscope.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "variables.h"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	50
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30723 diff changeset	51 OCTAVE_BEGIN_NAMESPACE(octave)
e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30723 diff changeset	52
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	53 class compiled_fcn_stack_frame : public stack_frame
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	54 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	55 public:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	56
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	57 compiled_fcn_stack_frame (void) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	58
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	59 compiled_fcn_stack_frame (tree_evaluator& tw, octave_function *fcn,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	60 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	61 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	62 const std::shared_ptr<stack_frame>& static_link)
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	63 : stack_frame (tw, index, parent_link, static_link,
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	64 static_link->access_link ()),
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	65 m_fcn (fcn)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	66 { }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	67
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	68 compiled_fcn_stack_frame (const compiled_fcn_stack_frame& elt) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	69
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	70 compiled_fcn_stack_frame&
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	71 operator = (const compiled_fcn_stack_frame& elt) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	72
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	73 ~compiled_fcn_stack_frame (void) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	74
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	75 bool is_compiled_fcn_frame (void) const { return true; }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	76
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	77 symbol_scope get_scope (void) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	78 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	79 return m_static_link->get_scope ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	80 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	81
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	82 octave_function * function (void) const { return m_fcn; }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	83
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	84 symbol_record lookup_symbol (const std::string& name) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	85 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	86 return m_static_link->lookup_symbol (name);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	87 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	88
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	89 symbol_record insert_symbol (const std::string& name)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	90 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	91 return m_static_link->insert_symbol (name);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	92 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	93
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	94 stack_frame::scope_flags scope_flag (const symbol_record& sym) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	95 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	96 // Look in closest stack frame that contains values (either the
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	97 // top scope, or a user-defined function or script).
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	98
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	99 return m_static_link->scope_flag (sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	100 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	101
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	102 void set_auto_fcn_var (auto_var_type avt, const octave_value& val)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	103 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	104 m_static_link->set_auto_fcn_var (avt, val);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	105 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	106
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	107 octave_value get_auto_fcn_var (auto_var_type avt) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	108 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	109 return m_static_link->get_auto_fcn_var (avt);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	110 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	111
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	112 // We only need to override one of each of these functions. The
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	113 // using declaration will avoid warnings about partially-overloaded
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	114 // virtual functions.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	115 using stack_frame::varval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	116 using stack_frame::varref;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	117
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	118 octave_value varval (const symbol_record& sym) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	119 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	120 // Look in closest stack frame that contains values (either the
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	121 // top scope, or a user-defined function or script).
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	122
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	123 return m_static_link->varval (sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	124 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	125
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	126 octave_value& varref (const symbol_record& sym)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	127 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	128 // Look in closest stack frame that contains values (either the
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	129 // top scope, or a user-defined function or script).
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	130
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	131 return m_static_link->varref (sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	132 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	133
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	134 void mark_scope (const symbol_record& sym, scope_flags flag)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	135 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	136 // Look in closest stack frame that contains values (either the
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	137 // top scope, or a user-defined function or script).
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	138
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	139 m_static_link->mark_scope (sym, flag);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	140 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	141
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	142 void display (bool follow = true) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	143
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	144 void accept (stack_frame_walker& sfw);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	145
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	146 private:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	147
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	148 // Compiled function object associated with this stack frame.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	149 // Should always be a built-in, .oct or .mex file function and
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	150 // should always be valid.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	151 octave_function *m_fcn;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	152 };
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	153
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	154 // Scripts have a symbol_scope object to store the set of variables
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	155 // in the script, but values for those variables are stored in the
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	156 // stack frame corresponding to the nearest calling function or in
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	157 // the top-level scope (the evaluation stack frame).
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	158 //
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	159 // Accessing values in a scope requires a mapping from the index of
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	160 // the variable for the script scope to the list of values in the
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	161 // evaluation frame(s). The frame offset tells us how many access
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	162 // links we must follow to find the stack frame that holds the
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	163 // value. The value offset is the index into the vector of values
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	164 // in that stack frame that we should use to find the value.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	165 //
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	166 // Frame and value offsets are set in this stack frame when it is
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	167 // created using information from the script and enclosing scopes.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	168 //
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	169 // If a script is invoked in a nested function context, the frame
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	170 // offsets for individual values may be different. Some may be
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	171 // accessed from the invoking function and some may come from a
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	172 // parent function.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	173
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	174 class script_stack_frame : public stack_frame
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	175 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	176 public:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	177
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	178 script_stack_frame (void) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	179
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	180 script_stack_frame (tree_evaluator& tw, octave_user_script *script,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	181 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	182 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	183 const std::shared_ptr<stack_frame>& static_link);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	184
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	185 script_stack_frame (const script_stack_frame& elt) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	186
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	187 script_stack_frame& operator = (const script_stack_frame& elt) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	188
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	189 ~script_stack_frame (void)
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	190 {
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	191 delete m_unwind_protect_frame;
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	192 }
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	193
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	194 bool is_user_script_frame (void) const { return true; }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	195
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	196 static std::shared_ptr<stack_frame>
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	197 get_access_link (const std::shared_ptr<stack_frame>& static_link);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	198
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	199 static std::size_t get_num_symbols (octave_user_script *script);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	200
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	201 void set_script_offsets (void);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	202
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	203 void set_script_offsets_internal (const std::map<std::string,
30199 37ddca7ad9cb avoid internal error and segfault with eval and scripts (bug #61191) John W. Eaton <jwe@octave.org> parents: 29654 diff changeset	204 symbol_record>& symbols);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	205
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	206 void resize_and_update_script_offsets (const symbol_record& sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	207
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	208 symbol_scope get_scope (void) const { return m_script->scope (); }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	209
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	210 octave_function * function (void) const { return m_script; }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	211
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	212 unwind_protect * unwind_protect_frame (void);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	213
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	214 symbol_record lookup_symbol (const std::string& name) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	215
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	216 symbol_record insert_symbol (const std::string&);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	217
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	218 std::size_t size (void) const { return m_lexical_frame_offsets.size (); }
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	219
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	220 void resize (std::size_t size)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	221 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	222 m_lexical_frame_offsets.resize (size, 0);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	223 m_value_offsets.resize (size, 0);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	224 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	225
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	226 void get_val_offsets_with_insert (const symbol_record& sym,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	227 std::size_t& frame_offset,
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	228 std::size_t& data_offset);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	229
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	230 bool get_val_offsets_internal (const symbol_record& sym,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	231 std::size_t& frame_offset,
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	232 std::size_t& data_offset) const;
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	233
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	234 bool get_val_offsets (const symbol_record& sym, std::size_t& frame_offset,
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	235 std::size_t& data_offset) const;
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	236
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	237 scope_flags scope_flag (const symbol_record& sym) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	238
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	239 void set_auto_fcn_var (auto_var_type avt, const octave_value& val)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	240 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	241 m_access_link->set_auto_fcn_var (avt, val);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	242 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	243
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	244 octave_value get_auto_fcn_var (auto_var_type avt) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	245 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	246 return m_access_link->get_auto_fcn_var (avt);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	247 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	248
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	249 // We only need to override one of each of these functions. The
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	250 // using declaration will avoid warnings about partially-overloaded
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	251 // virtual functions.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	252 using stack_frame::varval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	253 using stack_frame::varref;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	254
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	255 octave_value varval (const symbol_record& sym) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	256
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	257 octave_value& varref (const symbol_record& sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	258
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	259 void mark_scope (const symbol_record& sym, scope_flags flag);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	260
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	261 void display (bool follow = true) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	262
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	263 void accept (stack_frame_walker& sfw);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	264
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	265 private:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	266
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	267 // Script object associated with this stack frame. Should always
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	268 // be valid.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	269 octave_user_script *m_script;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	270
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	271 // The nearest unwind protect frame that was active when this
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	272 // stack frame was created. Should always be valid.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	273 unwind_protect *m_unwind_protect_frame;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	274
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	275 // Mapping between the symbols in the symbol_scope object of the
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	276 // script to the stack frame in which the script is executed. The
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	277 // frame offsets may be greater than one if the script is executed
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	278 // in a nested function context.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	279
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	280 std::vector<std::size_t> m_lexical_frame_offsets;
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	281 std::vector<std::size_t> m_value_offsets;
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	282 };
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	283
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	284 // Base class for values and offsets shared by user_fcn and scope
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	285 // frames.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	286
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	287 class base_value_stack_frame : public stack_frame
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	288 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	289 public:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	290
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	291 base_value_stack_frame (void) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	292
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	293 base_value_stack_frame (tree_evaluator& tw, std::size_t num_symbols,
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	294 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	295 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	296 const std::shared_ptr<stack_frame>& static_link,
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	297 const std::shared_ptr<stack_frame>& access_link)
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	298 : stack_frame (tw, index, parent_link, static_link, access_link),
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	299 m_values (num_symbols, octave_value ()),
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	300 m_flags (num_symbols, LOCAL),
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	301 m_auto_vars (NUM_AUTO_VARS, octave_value ())
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	302 { }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	303
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	304 base_value_stack_frame (const base_value_stack_frame& elt) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	305
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	306 base_value_stack_frame&
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	307 operator = (const base_value_stack_frame& elt) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	308
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	309 ~base_value_stack_frame (void) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	310
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	311 std::size_t size (void) const
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	312 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	313 return m_values.size ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	314 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	315
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	316 void resize (std::size_t size)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	317 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	318 m_values.resize (size, octave_value ());
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	319 m_flags.resize (size, LOCAL);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	320 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	321
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	322 stack_frame::scope_flags get_scope_flag (std::size_t data_offset) const
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	323 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	324 return m_flags.at (data_offset);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	325 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	326
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	327 void set_scope_flag (std::size_t data_offset, scope_flags flag)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	328 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	329 m_flags.at (data_offset) = flag;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	330 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	331
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	332 octave_value get_auto_fcn_var (auto_var_type avt) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	333 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	334 return m_auto_vars.at (avt);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	335 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	336
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	337 void set_auto_fcn_var (auto_var_type avt, const octave_value& val)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	338 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	339 m_auto_vars.at (avt) = val;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	340 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	341
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	342 // We only need to override one of each of these functions. The
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	343 // using declaration will avoid warnings about partially-overloaded
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	344 // virtual functions.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	345 using stack_frame::varval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	346 using stack_frame::varref;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	347
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	348 octave_value varval (std::size_t data_offset) const
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	349 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	350 return m_values.at (data_offset);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	351 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	352
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	353 octave_value& varref (std::size_t data_offset)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	354 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	355 return m_values.at (data_offset);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	356 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	357
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	358 void display (bool follow = true) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	359
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	360 protected:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	361
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	362 // Variable values. This array is indexed by the data_offset
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	363 // value stored in the symbol_record objects of the scope
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	364 // associated with this stack frame.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	365 std::vector<octave_value> m_values;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	366
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	367 // The type of each variable (local, global, persistent) of each
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	368 // value. This array is indexed by the data_offset value stored
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	369 // in the symbol_record objects of the scope associated with this
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	370 // stack frame. Local values are found in the M_VALUES array.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	371 // Global values are stored in the tree_evaluator object that contains
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	372 // the stack frame. Persistent values are stored in the function
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	373 // scope corresponding to the stack frame.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	374 std::vector<scope_flags> m_flags;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	375
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	376 // A fixed list of Automatic variables created for this function.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	377 // The elements of this vector correspond to the auto_var_type
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	378 // enum.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	379 std::vector<octave_value> m_auto_vars;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	380 };
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	381
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	382 // User-defined functions have a symbol_scope object to store the set
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	383 // of variables in the function and values are stored in the stack
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	384 // frame corresponding to the invocation of the function or one of
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	385 // its parents. The frame offset tells us how many access links we
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	386 // must follow to find the stack frame that holds the value. The
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	387 // value offset is the index into the vector of values in that stack
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	388 // frame that we should use to find the value.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	389 //
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	390 // Frame and value offsets are determined when the corresponding
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	391 // function is parsed.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	392
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	393 class user_fcn_stack_frame : public base_value_stack_frame
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	394 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	395 public:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	396
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	397 user_fcn_stack_frame (void) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	398
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	399 user_fcn_stack_frame (tree_evaluator& tw, octave_user_function *fcn,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	400 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	401 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	402 const std::shared_ptr<stack_frame>& static_link,
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	403 const std::shared_ptr<stack_frame>& access_link = std::shared_ptr<stack_frame> ())
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	404 : base_value_stack_frame (tw, get_num_symbols (fcn), index,
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	405 parent_link, static_link,
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	406 (access_link
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	407 ? access_link
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	408 : get_access_link (fcn, static_link))),
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	409 m_fcn (fcn), m_unwind_protect_frame (nullptr)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	410 { }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	411
28430 5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	412 user_fcn_stack_frame (tree_evaluator& tw, octave_user_function *fcn,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	413 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	414 const std::shared_ptr<stack_frame>& parent_link,
28430 5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	415 const std::shared_ptr<stack_frame>& static_link,
29477 34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	416 const local_vars_map& local_vars,
34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	417 const std::shared_ptr<stack_frame>& access_link = std::shared_ptr<stack_frame> ())
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	418 : base_value_stack_frame (tw, get_num_symbols (fcn), index,
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	419 parent_link, static_link,
29477 34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	420 (access_link
34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	421 ? access_link
34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	422 : get_access_link (fcn, static_link))),
28430 5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	423 m_fcn (fcn), m_unwind_protect_frame (nullptr)
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	424 {
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	425 // Initialize local variable values.
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	426
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	427 for (const auto& nm_ov : local_vars)
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	428 assign (nm_ov.first, nm_ov.second);
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	429 }
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	430
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	431 user_fcn_stack_frame (const user_fcn_stack_frame& elt) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	432
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	433 user_fcn_stack_frame&
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	434 operator = (const user_fcn_stack_frame& elt) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	435
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	436 ~user_fcn_stack_frame (void)
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	437 {
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	438 delete m_unwind_protect_frame;
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	439 }
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	440
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	441 bool is_user_fcn_frame (void) const { return true; }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	442
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	443 static std::shared_ptr<stack_frame>
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	444 get_access_link (octave_user_function *fcn,
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	445 const std::shared_ptr<stack_frame>& static_link);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	446
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	447 static std::size_t get_num_symbols (octave_user_function *fcn)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	448 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	449 symbol_scope fcn_scope = fcn->scope ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	450
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	451 return fcn_scope.num_symbols ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	452 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	453
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	454 void clear_values (void);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	455
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	456 symbol_scope get_scope (void) const { return m_fcn->scope (); }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	457
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	458 octave_function * function (void) const { return m_fcn; }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	459
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	460 unwind_protect * unwind_protect_frame (void);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	461
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	462 symbol_record lookup_symbol (const std::string& name) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	463
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	464 symbol_record insert_symbol (const std::string&);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	465
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	466 scope_flags scope_flag (const symbol_record& sym) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	467
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	468 // We only need to override one of each of these functions. The
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	469 // using declaration will avoid warnings about partially-overloaded
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	470 // virtual functions.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	471 using base_value_stack_frame::varval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	472 using base_value_stack_frame::varref;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	473
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	474 octave_value varval (const symbol_record& sym) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	475
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	476 octave_value& varref (const symbol_record& sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	477
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	478 void mark_scope (const symbol_record& sym, scope_flags flag);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	479
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	480 void display (bool follow = true) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	481
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	482 void accept (stack_frame_walker& sfw);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	483
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	484 void break_closure_cycles (const std::shared_ptr<stack_frame>& frame);
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	485
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	486 private:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	487
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	488 // User-defined object associated with this stack frame. Should
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	489 // always be valid.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	490 octave_user_function *m_fcn;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	491
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	492 // The nearest unwind protect frame that was active when this
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	493 // stack frame was created. Should always be valid.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	494 unwind_protect *m_unwind_protect_frame;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	495 };
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	496
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	497 // Pure scope stack frames (primarily the top-level workspace) have
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	498 // a set of variables and values are stored in the stack frame. All
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	499 // variable accesses are direct as there are no parent stack frames.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	500 //
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	501 // Value offsets are determined when the corresponding variable is
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	502 // entered into the symbol_scope object corresponding to the frame.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	503
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	504 class scope_stack_frame : public base_value_stack_frame
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	505 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	506 public:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	507
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	508 scope_stack_frame (void) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	509
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	510 scope_stack_frame (tree_evaluator& tw, const symbol_scope& scope,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	511 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	512 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	513 const std::shared_ptr<stack_frame>& static_link)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	514 : base_value_stack_frame (tw, scope.num_symbols (), index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	515 parent_link, static_link, nullptr),
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	516 m_scope (scope)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	517 { }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	518
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	519 scope_stack_frame (const scope_stack_frame& elt) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	520
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	521 scope_stack_frame& operator = (const scope_stack_frame& elt) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	522
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	523 ~scope_stack_frame (void) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	524
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	525 bool is_scope_frame (void) const { return true; }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	526
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	527 symbol_scope get_scope (void) const { return m_scope; }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	528
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	529 symbol_record lookup_symbol (const std::string& name) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	530 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	531 return m_scope.lookup_symbol (name);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	532 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	533
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	534 symbol_record insert_symbol (const std::string&);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	535
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	536 scope_flags scope_flag (const symbol_record& sym) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	537
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	538 // We only need to override one of each of these functions. The
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	539 // using declaration will avoid warnings about partially-overloaded
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	540 // virtual functions.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	541 using base_value_stack_frame::varval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	542 using base_value_stack_frame::varref;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	543
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	544 octave_value varval (const symbol_record& sym) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	545
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	546 octave_value& varref (const symbol_record& sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	547
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	548 void mark_scope (const symbol_record& sym, scope_flags flag);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	549
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	550 void display (bool follow = true) const;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	551
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	552 void accept (stack_frame_walker& sfw);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	553
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	554 private:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	555
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	556 // The scope object associated with this stack frame.
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	557 symbol_scope m_scope;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	558 };
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	559
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	560 // FIXME: There should probably be a display method for the script,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	561 // fcn, and scope objects and the script and function objects should
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	562 // be responsible for displaying the scopes they contain.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	563
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	564 static void display_scope (std::ostream& os, const symbol_scope& scope)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	565 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	566 if (scope)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	567 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	568 os << "scope: " << scope.name () << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	569
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	570 if (scope.num_symbols () > 0)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	571 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	572 os << "name (frame offset, data offset, storage class):"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	573 << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	574
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	575 std::list<symbol_record> symbols = scope.symbol_list ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	576
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	577 for (auto& sym : symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	578 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	579 os << " " << sym.name () << " (" << sym.frame_offset ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	580 << ", " << sym.data_offset () << ", " << sym.storage_class ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	581 << ")" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	582 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	583 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	584 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	585 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	586
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	587 class stack_frame_walker
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	588 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	589 protected:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	590
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	591 stack_frame_walker (void) { }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	592
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	593 virtual ~stack_frame_walker (void) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	594
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	595 public:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	596
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	597 // No copying!
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	598
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	599 stack_frame_walker (const stack_frame_walker&) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	600
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	601 stack_frame_walker& operator = (const stack_frame_walker&) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	602
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	603 virtual void
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	604 visit_compiled_fcn_stack_frame (compiled_fcn_stack_frame&) = 0;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	605
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	606 virtual void
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	607 visit_script_stack_frame (script_stack_frame&) = 0;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	608
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	609 virtual void
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	610 visit_user_fcn_stack_frame (user_fcn_stack_frame&) = 0;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	611
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	612 virtual void
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	613 visit_scope_stack_frame (scope_stack_frame&) = 0;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	614 };
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	615
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	616 class symbol_cleaner : public stack_frame_walker
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	617 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	618 public:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	619
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	620 symbol_cleaner (const std::string& pattern, bool have_regexp = false)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	621 : stack_frame_walker (), m_patterns (pattern),
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	622 m_clear_all_names (false), m_clear_objects (false),
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	623 m_have_regexp (have_regexp), m_cleared_names ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	624 { }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	625
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	626 symbol_cleaner (const string_vector& patterns, bool have_regexp = false)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	627 : stack_frame_walker (), m_patterns (patterns),
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	628 m_clear_all_names (false), m_clear_objects (false),
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	629 m_have_regexp (have_regexp), m_cleared_names ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	630 { }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	631
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	632 symbol_cleaner (bool clear_all_names = true, bool clear_objects = false)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	633 : stack_frame_walker (), m_patterns (),
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	634 m_clear_all_names (clear_all_names), m_clear_objects (clear_objects),
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	635 m_have_regexp (false), m_cleared_names ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	636 { }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	637
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	638 symbol_cleaner (const symbol_cleaner&) = delete;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	639
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	640 symbol_cleaner& operator = (const symbol_cleaner&) = delete;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	641
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	642 ~symbol_cleaner (void) = default;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	643
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	644 void visit_compiled_fcn_stack_frame (compiled_fcn_stack_frame& frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	645 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	646 // This one follows static link always. Hmm, should the access
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	647 // link for a compiled_fcn_stack_frame be the same as the static
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	648 // link?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	649
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	650 std::shared_ptr<stack_frame> slink = frame.static_link ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	651
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	652 if (slink)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	653 slink->accept (*this);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	654 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	655
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	656 void visit_script_stack_frame (script_stack_frame& frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	657 {
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	658 std::shared_ptr<stack_frame> alink = frame.access_link ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	659
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	660 if (alink)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	661 alink->accept (*this);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	662 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	663
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	664 void visit_user_fcn_stack_frame (user_fcn_stack_frame& frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	665 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	666 clean_frame (frame);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	667
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	668 std::shared_ptr<stack_frame> alink = frame.access_link ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	669
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	670 if (alink)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	671 alink->accept (*this);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	672 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	673
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	674 void visit_scope_stack_frame (scope_stack_frame& frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	675 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	676 clean_frame (frame);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	677
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	678 std::shared_ptr<stack_frame> alink = frame.access_link ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	679
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	680 if (alink)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	681 alink->accept (*this);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	682 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	683
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	684 private:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	685
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	686 void maybe_clear_symbol (stack_frame& frame, const symbol_record& sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	687 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	688 std::string name = sym.name ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	689
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	690 if (m_cleared_names.find (name) == m_cleared_names.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	691 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	692 // FIXME: Should we check that the name is defined and skip if
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	693 // it is not? Is it possible for another symbol with the same
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	694 // name to appear in a later stack frame?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	695
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	696 // FIXME: If we are clearing objects and a symbol is found,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	697 // should we add it to the list of cleared names (since
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	698 // we did find a symbol) but skip clearing the object?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	699
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	700 if (m_clear_objects && ! frame.is_object (sym))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	701 return;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	702
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	703 m_cleared_names.insert (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	704
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	705 frame.clear (sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	706 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	707 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	708
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	709 // FIXME: It would be nice to avoid the duplication in the following
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	710 // function.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	711
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	712 void clear_symbols (stack_frame& frame,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	713 const std::list<symbol_record>& symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	714 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	715 if (m_clear_all_names)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	716 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	717 for (const auto& sym : symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	718 maybe_clear_symbol (frame, sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	719 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	720 else if (m_have_regexp)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	721 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	722 octave_idx_type npatterns = m_patterns.numel ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	723
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	724 for (octave_idx_type j = 0; j < npatterns; j++)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	725 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	726 std::string pattern = m_patterns[j];
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	727
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	728 regexp pat (pattern);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	729
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	730 for (const auto& sym : symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	731 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	732 if (pat.is_match (sym.name ()))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	733 maybe_clear_symbol (frame, sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	734 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	735 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	736 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	737 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	738 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	739 octave_idx_type npatterns = m_patterns.numel ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	740
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	741 for (octave_idx_type j = 0; j < npatterns; j++)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	742 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	743 std::string pattern = m_patterns[j];
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	744
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	745 glob_match pat (pattern);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	746
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	747 for (const auto& sym : symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	748 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	749 if (pat.match (sym.name ()))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	750 maybe_clear_symbol (frame, sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	751 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	752 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	753 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	754 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	755
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	756 void clean_frame (stack_frame& frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	757 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	758 symbol_scope scope = frame.get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	759
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	760 std::list<symbol_record> symbols = scope.symbol_list ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	761
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	762 if (m_clear_all_names \|\| ! m_patterns.empty ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	763 clear_symbols (frame, symbols);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	764 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	765
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	766 string_vector m_patterns;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	767
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	768 bool m_clear_all_names;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	769 bool m_clear_objects;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	770 bool m_have_regexp;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	771
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	772 std::set<std::string> m_cleared_names;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	773 };
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	774
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	775 class symbol_info_accumulator : public stack_frame_walker
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	776 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	777 public:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	778
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	779 symbol_info_accumulator (const std::string& pattern,
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	780 bool have_regexp = false)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	781 : stack_frame_walker (), m_patterns (pattern), m_match_all (false),
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	782 m_first_only (false), m_have_regexp (have_regexp), m_sym_inf_list (),
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	783 m_found_names ()
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	784 { }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	785
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	786 symbol_info_accumulator (const string_vector& patterns,
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	787 bool have_regexp = false)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	788 : stack_frame_walker (), m_patterns (patterns), m_match_all (false),
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	789 m_first_only (false), m_have_regexp (have_regexp), m_sym_inf_list (),
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	790 m_found_names ()
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	791 { }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	792
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	793 symbol_info_accumulator (bool match_all = true, bool first_only = true)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	794 : stack_frame_walker (), m_patterns (), m_match_all (match_all),
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	795 m_first_only (first_only), m_have_regexp (false),
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	796 m_sym_inf_list (), m_found_names ()
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	797 { }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	798
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	799 symbol_info_accumulator (const symbol_info_accumulator&) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	800
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	801 symbol_info_accumulator& operator = (const symbol_info_accumulator&) = delete;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	802
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	803 ~symbol_info_accumulator (void) = default;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	804
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	805 bool is_empty (void) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	806 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	807 for (const auto& nm_sil : m_sym_inf_list)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	808 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	809 const symbol_info_list& lst = nm_sil.second;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	810
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	811 if (! lst.empty ())
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	812 return false;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	813 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	814
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	815 return true;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	816 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	817
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	818 std::list<std::string> names (void) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	819 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	820 std::list<std::string> retval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	821
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	822 for (const auto& nm_sil : m_sym_inf_list)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	823 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	824 const symbol_info_list& lst = nm_sil.second;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	825
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	826 std::list<std::string> nm_list = lst.names ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	827
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	828 for (const auto& nm : nm_list)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	829 retval.push_back (nm);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	830 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	831
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	832 return retval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	833 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	834
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	835 symbol_info_list symbol_info (void) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	836 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	837 symbol_info_list retval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	838
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	839 for (const auto& nm_sil : m_sym_inf_list)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	840 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	841 const symbol_info_list& lst = nm_sil.second;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	842
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	843 for (const auto& syminf : lst)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	844 retval.push_back (syminf);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	845 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	846
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	847 return retval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	848 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	849
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	850 octave_map map_value (void) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	851 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	852 octave_map retval;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	853
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	854 // FIXME: is there a better way to concatenate structures?
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	855
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	856 std::size_t n_frames = m_sym_inf_list.size ();
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	857
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	858 OCTAVE_LOCAL_BUFFER (octave_map, map_list, n_frames);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	859
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	860 std::size_t j = 0;
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	861 for (const auto& nm_sil : m_sym_inf_list)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	862 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	863 std::string scope_name = nm_sil.first;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	864 const symbol_info_list& lst = nm_sil.second;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	865
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	866 map_list[j] = lst.map_value (scope_name, n_frames-j);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	867
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	868 j++;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	869 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	870
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	871 return octave_map::cat (-1, n_frames, map_list);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	872 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	873
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	874 void display (std::ostream& os, const std::string& format) const
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	875 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	876 for (const auto& nm_sil : m_sym_inf_list)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	877 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	878 os << "\nvariables in scope: " << nm_sil.first << "\n\n";
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	879
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	880 const symbol_info_list& lst = nm_sil.second;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	881
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	882 lst.display (os, format);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	883 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	884 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	885
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	886 void visit_compiled_fcn_stack_frame (compiled_fcn_stack_frame& frame)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	887 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	888 // This one follows static link always. Hmm, should the access
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	889 // link for a compiled_fcn_stack_frame be the same as the static
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	890 // link?
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	891
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	892 std::shared_ptr<stack_frame> slink = frame.static_link ();
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	893
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	894 if (slink)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	895 slink->accept (*this);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	896 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	897
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	898 void visit_script_stack_frame (script_stack_frame& frame)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	899 {
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	900 std::shared_ptr<stack_frame> alink = frame.access_link ();
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	901
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	902 if (alink)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	903 alink->accept (*this);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	904 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	905
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	906 void visit_user_fcn_stack_frame (user_fcn_stack_frame& frame)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	907 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	908 append_list (frame);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	909
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	910 std::shared_ptr<stack_frame> alink = frame.access_link ();
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	911
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	912 if (alink)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	913 alink->accept (*this);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	914 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	915
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	916 void visit_scope_stack_frame (scope_stack_frame& frame)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	917 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	918 append_list (frame);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	919
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	920 std::shared_ptr<stack_frame> alink = frame.access_link ();
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	921
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	922 if (alink)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	923 alink->accept (*this);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	924 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	925
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	926 private:
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	927
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	928 typedef std::pair<std::string, symbol_info_list> syminf_list_elt;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	929
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	930 // FIXME: the following is too complex and duplicates too much
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	931 // code. Maybe it should be split up so we have separate classes
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	932 // that do each job that is needed?
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	933
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	934 std::list<symbol_record>
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	935 filter (stack_frame& frame, const std::list<symbol_record>& symbols)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	936 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	937 std::list<symbol_record> new_symbols;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	938
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	939 if (m_match_all)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	940 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	941 for (const auto& sym : symbols)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	942 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	943 if (frame.is_defined (sym))
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	944 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	945 std::string name = sym.name ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	946
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	947 if (m_first_only
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	948 && m_found_names.find (name) != m_found_names.end ())
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	949 continue;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	950
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	951 m_found_names.insert (name);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	952
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	953 new_symbols.push_back (sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	954 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	955 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	956 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	957 else if (m_have_regexp)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	958 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	959 octave_idx_type npatterns = m_patterns.numel ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	960
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	961 for (octave_idx_type j = 0; j < npatterns; j++)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	962 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	963 std::string pattern = m_patterns[j];
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	964
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	965 regexp pat (pattern);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	966
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	967 for (const auto& sym : symbols)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	968 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	969 std::string name = sym.name ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	970
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	971 if (pat.is_match (name) && frame.is_defined (sym))
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	972 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	973 if (m_first_only
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	974 && m_found_names.find (name) != m_found_names.end ())
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	975 continue;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	976
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	977 m_found_names.insert (name);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	978
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	979 new_symbols.push_back (sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	980 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	981 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	982 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	983 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	984 else
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	985 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	986 octave_idx_type npatterns = m_patterns.numel ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	987
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	988 for (octave_idx_type j = 0; j < npatterns; j++)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	989 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	990 std::string pattern = m_patterns[j];
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	991
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	992 glob_match pat (pattern);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	993
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	994 for (const auto& sym : symbols)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	995 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	996 std::string name = sym.name ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	997
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	998 if (pat.match (name) && frame.is_defined (sym))
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	999 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1000 if (m_first_only
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1001 && m_found_names.find (name) == m_found_names.end ())
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1002 continue;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1003
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1004 m_found_names.insert (name);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1005
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1006 new_symbols.push_back (sym);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1007 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1008 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1009 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1010 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1011
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1012 return new_symbols;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1013 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1014
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1015 void append_list (stack_frame& frame)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1016 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1017 symbol_scope scope = frame.get_scope ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1018
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1019 std::list<symbol_record> symbols = scope.symbol_list ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1020
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1021 if (m_match_all \|\| ! m_patterns.empty ())
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1022 symbols = filter (frame, symbols);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1023
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1024 symbol_info_list syminf_list = frame.make_symbol_info_list (symbols);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1025
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1026 m_sym_inf_list.push_back (syminf_list_elt (scope.name (), syminf_list));
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1027 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1028
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1029 string_vector m_patterns;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1030
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1031 bool m_match_all;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1032 bool m_first_only;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1033 bool m_have_regexp;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1034
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1035 std::list<std::pair<std::string, symbol_info_list>> m_sym_inf_list;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1036
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1037 std::set<std::string> m_found_names;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1038 };
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1039
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1040 stack_frame * stack_frame::create (tree_evaluator& tw, octave_function *fcn,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1041 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1042 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1043 const std::shared_ptr<stack_frame>& static_link)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1044 {
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30200 diff changeset	1045 return new compiled_fcn_stack_frame (tw, fcn, index,
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30200 diff changeset	1046 parent_link, static_link);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1047 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1048
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1049 stack_frame * stack_frame::create (tree_evaluator& tw,
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1050 octave_user_script *script,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1051 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1052 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1053 const std::shared_ptr<stack_frame>& static_link)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1054 {
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1055 return new script_stack_frame (tw, script, index, parent_link, static_link);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1056 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1057
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1058 stack_frame * stack_frame::create (tree_evaluator& tw,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1059 octave_user_function *fcn, std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1060 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1061 const std::shared_ptr<stack_frame>& static_link,
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1062 const std::shared_ptr<stack_frame>& access_link)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1063 {
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30200 diff changeset	1064 return new user_fcn_stack_frame (tw, fcn, index,
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30200 diff changeset	1065 parent_link, static_link, access_link);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1066 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1067
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1068 stack_frame * stack_frame::create (tree_evaluator& tw,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1069 octave_user_function *fcn, std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1070 const std::shared_ptr<stack_frame>& parent_link,
28430 5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	1071 const std::shared_ptr<stack_frame>& static_link,
29477 34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	1072 const local_vars_map& local_vars,
34d06c73b48d hold references to closure frames in anon functions if needed (bug #60237) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	1073 const std::shared_ptr<stack_frame>& access_link)
28430 5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	1074 {
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30200 diff changeset	1075 return new user_fcn_stack_frame (tw, fcn, index,
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30200 diff changeset	1076 parent_link, static_link, local_vars,
91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30200 diff changeset	1077 access_link);
28430 5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	1078 }
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	1079
5bfa8e018704 store local init vars for anonymous functions in handle, not function object John W. Eaton <jwe@octave.org> parents: 28429 diff changeset	1080 stack_frame * stack_frame::create (tree_evaluator& tw,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1081 const symbol_scope& scope, std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1082 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1083 const std::shared_ptr<stack_frame>& static_link)
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1084 {
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1085 return new scope_stack_frame (tw, scope, index, parent_link, static_link);
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1086 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1087
29064 336356206de7 don't clear stack frame values indirectly through call stack (bug #59432) John W. Eaton <jwe@octave.org> parents: 28793 diff changeset	1088 // This function is only implemented and should only be called for
336356206de7 don't clear stack frame values indirectly through call stack (bug #59432) John W. Eaton <jwe@octave.org> parents: 28793 diff changeset	1089 // user_fcn stack frames. Anything else indicates an error in the
336356206de7 don't clear stack frame values indirectly through call stack (bug #59432) John W. Eaton <jwe@octave.org> parents: 28793 diff changeset	1090 // implementation, but we'll simply warn if that happens.
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1091
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1092 void stack_frame::clear_values (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1093 {
29064 336356206de7 don't clear stack frame values indirectly through call stack (bug #59432) John W. Eaton <jwe@octave.org> parents: 28793 diff changeset	1094 warning ("invalid call to stack_frame::clear_values; please report");
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1095 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1096
28329 6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1097 symbol_info_list
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1098 stack_frame::make_symbol_info_list (const std::list<symbol_record>& symrec_list) const
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1099 {
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1100 symbol_info_list symbol_stats;
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1101
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1102 for (const auto& sym : symrec_list)
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1103 {
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1104 octave_value value = varval (sym);
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1105
29854 2bb72743d3eb who() should not display duplicate named variables from different scopes (bug #60845). John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1106 if (! value.is_defined ()
2bb72743d3eb who() should not display duplicate named variables from different scopes (bug #60845). John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1107 \|\| (is_user_fcn_frame () && sym.frame_offset () > 0))
2bb72743d3eb who() should not display duplicate named variables from different scopes (bug #60845). John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1108 continue;
2bb72743d3eb who() should not display duplicate named variables from different scopes (bug #60845). John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1109
2bb72743d3eb who() should not display duplicate named variables from different scopes (bug #60845). John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1110 symbol_info syminf (sym.name (), value, sym.is_formal (),
2bb72743d3eb who() should not display duplicate named variables from different scopes (bug #60845). John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1111 is_global (sym), is_persistent (sym));
2bb72743d3eb who() should not display duplicate named variables from different scopes (bug #60845). John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1112
2bb72743d3eb who() should not display duplicate named variables from different scopes (bug #60845). John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1113 symbol_stats.append (syminf);
28329 6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1114 }
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1115
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1116 return symbol_stats;
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1117 }
6349915869f2 move function definition from header to source file John W. Eaton <jwe@octave.org> parents: 28328 diff changeset	1118
28425 a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1119 octave_value stack_frame::who (const string_vector& patterns,
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1120 bool have_regexp, bool return_list,
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1121 bool verbose, const std::string& whos_line_fmt,
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1122 const std::string& msg)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1123 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1124 symbol_info_accumulator sym_inf_accum (patterns, have_regexp);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1125
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1126 accept (sym_inf_accum);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1127
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1128 if (return_list)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1129 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1130 if (verbose)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1131 return sym_inf_accum.map_value ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1132 else
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1133 return Cell (string_vector (sym_inf_accum.names ()));
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1134 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1135 else if (! sym_inf_accum.is_empty ())
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1136 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1137
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1138 if (msg.empty ())
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1139 octave_stdout << "Variables visible from the current scope:\n";
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1140 else
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1141 octave_stdout << msg;
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1142
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1143 if (verbose)
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1144 sym_inf_accum.display (octave_stdout, whos_line_fmt);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1145 else
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1146 {
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1147 octave_stdout << "\n";
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1148 string_vector names (sym_inf_accum.names ());
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1149 names.list_in_columns (octave_stdout);
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1150 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1151
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1152 octave_stdout << "\n";
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1153 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1154
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1155 return octave_value ();
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1156 }
a5be4fc661d6 hide specific stack frame and stack frame walker classes John W. Eaton <jwe@octave.org> parents: 28329 diff changeset	1157
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1158 // Return first occurrence of variables in current stack frame and any
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1159 // parent frames reachable through access links.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1160
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1161 symbol_info_list stack_frame::all_variables (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1162 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1163 symbol_info_accumulator sia (true, true);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1164
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1165 accept (sia);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1166
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1167 return sia.symbol_info ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1168 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1169
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1170 octave_value stack_frame::workspace (void)
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1171 {
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1172 std::list<octave_scalar_map> ws_list;
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1173
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1174 stack_frame *frame = this;
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1175
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1176 while (frame)
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1177 {
28857 43ad651cf5a0 eliminate unnecessary uses of octave:: namespace qualifier John W. Eaton <jwe@octave.org> parents: 28793 diff changeset	1178 symbol_info_list symbols = frame->all_variables ();
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1179
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1180 octave_scalar_map ws;
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1181
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1182 for (const auto& sym_name : symbols.names ())
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1183 {
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1184 octave_value val = symbols.varval (sym_name);
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1185
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1186 if (val.is_defined ())
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1187 ws.assign (sym_name, val);
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1188 }
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1189
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1190 ws_list.push_back (ws);
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1191
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1192 std::shared_ptr<stack_frame> nxt = frame->access_link ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1193 frame = nxt.get ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1194 }
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1195
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1196 Cell ws_frames (ws_list.size (), 1);
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1197
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1198 octave_idx_type i = 0;
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1199 for (const auto& elt : ws_list)
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1200 ws_frames(i++) = elt;
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1201
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1202 return ws_frames;
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1203 }
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1204
28327 8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1205 // FIXME: Should this function also find any variables in parent
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1206 // scopes accessible through access_links?
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1207
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1208 std::list<std::string> stack_frame::variable_names (void) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1209 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1210 std::list<std::string> retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1211
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1212 symbol_scope scope = get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1213
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1214 const std::map<std::string, symbol_record>& symbols = scope.symbols ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1215
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1216 for (const auto& nm_sr : symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1217 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1218 if (is_variable (nm_sr.second))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1219 retval.push_back (nm_sr.first);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1220 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1221
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1222 retval.sort ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1223
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1224 return retval;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1225 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1226
28327 8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1227 symbol_info_list stack_frame::glob_symbol_info (const std::string& pattern)
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1228 {
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1229 symbol_info_accumulator sia (pattern, false);
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1230
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1231 accept (sia);
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1232
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1233 return sia.symbol_info ();
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1234 }
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1235
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1236 symbol_info_list stack_frame::regexp_symbol_info (const std::string& pattern)
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1237 {
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1238 symbol_info_accumulator sia (pattern, true);
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1239
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1240 accept (sia);
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1241
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1242 return sia.symbol_info ();
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1243 }
8db2d4c9a64f correctly find all symbols in script when saving values (bug #58382) John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1244
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1245 std::size_t stack_frame::size (void) const
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1246 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1247 // This function should only be called for user_fcn_stack_frame or
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1248 // scope_stack_frame objects. Anything else indicates an error in
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1249 // the implementation.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1250
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1251 panic_impossible ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1252 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1253
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1254 void stack_frame::resize (std::size_t)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1255 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1256 // This function should only be called for user_fcn_stack_frame or
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1257 // scope_stack_frame objects. Anything else indicates an error in
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1258 // the implementation.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1259
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1260 panic_impossible ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1261 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1262
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1263 stack_frame::scope_flags stack_frame::get_scope_flag (std::size_t) const
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1264 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1265 // This function should only be called for user_fcn_stack_frame or
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1266 // scope_stack_frame objects. Anything else indicates an error in
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1267 // the implementation.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1268
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1269 panic_impossible ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1270 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1271
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1272 void stack_frame::set_scope_flag (std::size_t, scope_flags)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1273 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1274 // This function should only be called for user_fcn_stack_frame or
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1275 // scope_stack_frame objects. Anything else indicates an error in
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1276 // the implementation.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1277
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1278 panic_impossible ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1279 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1280
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1281 void stack_frame::install_variable (const symbol_record& sym,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1282 const octave_value& value, bool global)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1283 {
26673 4271b53b24a6 when installing global variable don't warn if it is already global John W. Eaton <jwe@octave.org> parents: 26663 diff changeset	1284 if (global && ! is_global (sym))
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1285 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1286 octave_value val = varval (sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1287
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1288 if (val.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1289 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1290 std::string nm = sym.name ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1291
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1292 warning_with_id ("Octave:global-local-conflict",
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1293 "global: '%s' is defined in the current scope.\n",
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1294 nm.c_str ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1295 warning_with_id ("Octave:global-local-conflict",
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1296 "global: in a future version, global variables must be declared before use.\n");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1297
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1298 // If the symbol is defined in the local but not the
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1299 // global scope, then use the local value as the
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1300 // initial value. This value will also override any
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1301 // initializer in the global statement.
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	1302 octave_value global_val = m_evaluator.global_varval (nm);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1303
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1304 if (global_val.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1305 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1306 warning_with_id ("Octave:global-local-conflict",
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1307 "global: global value overrides existing local value");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1308
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1309 clear (sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1310 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1311 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1312 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1313 warning_with_id ("Octave:global-local-conflict",
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1314 "global: existing local value used to initialize global variable");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1315
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	1316 m_evaluator.global_varref (nm) = val;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1317 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1318 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1319
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1320 mark_global (sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1321 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1322
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1323 if (value.is_defined ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1324 assign (sym, value);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1325 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1326
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1327 octave_value stack_frame::varval (std::size_t) const
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1328 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1329 // This function should only be called for user_fcn_stack_frame or
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1330 // scope_stack_frame objects. Anything else indicates an error in
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1331 // the implementation.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1332
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1333 panic_impossible ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1334 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1335
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1336 octave_value& stack_frame::varref (std::size_t)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1337 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1338 // This function should only be called for user_fcn_stack_frame or
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1339 // scope_stack_frame objects. Anything else indicates an error in
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1340 // the implementation.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1341
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1342 panic_impossible ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1343 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1344
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1345 void stack_frame::clear_objects (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1346 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1347 symbol_cleaner sc (true, true);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1348
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1349 accept (sc);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1350 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1351
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1352 void stack_frame::clear_variable (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1353 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1354 symbol_cleaner sc (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1355
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1356 accept (sc);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1357 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1358
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1359 void stack_frame::clear_variable_pattern (const std::string& pattern)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1360 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1361 symbol_cleaner sc (pattern);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1362
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1363 accept (sc);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1364 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1365
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1366 void stack_frame::clear_variable_pattern (const string_vector& patterns)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1367 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1368 symbol_cleaner sc (patterns);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1369
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1370 accept (sc);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1371 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1372
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1373 void stack_frame::clear_variable_regexp (const std::string& pattern)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1374 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1375 symbol_cleaner sc (pattern, true);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1376
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1377 accept (sc);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1378 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1379
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1380 void stack_frame::clear_variable_regexp (const string_vector& patterns)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1381 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1382 symbol_cleaner sc (patterns, true);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1383
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1384 accept (sc);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1385 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1386
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1387 void stack_frame::clear_variables (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1388 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1389 symbol_cleaner sc;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1390
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1391 accept (sc);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1392 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1393
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1394 void stack_frame::display_stopped_in_message (std::ostream& os) const
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1395 {
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1396 if (index () == 0)
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1397 os << "at top level" << std::endl;
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1398 else
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1399 {
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1400 os << "stopped in " << fcn_name ();
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1401
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1402 int l = line ();
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1403 if (l > 0)
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1404 os << " at line " << line ();
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1405
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1406 os << " [" << fcn_file_name () << "] " << std::endl;
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1407 }
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1408 }
8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1409
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1410 void stack_frame::display (bool follow) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1411 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1412 std::ostream& os = octave_stdout;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1413
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1414 os << "-- [stack_frame] (" << this << ") --" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1415
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1416 os << "parent link: ";
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1417 if (m_parent_link)
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1418 os << m_parent_link.get ();
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1419 else
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1420 os << "NULL";
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1421 os << std::endl;
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1422
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1423 os << "static link: ";
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1424 if (m_static_link)
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1425 os << m_static_link.get ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1426 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1427 os << "NULL";
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1428 os << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1429
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1430 os << "access link: ";
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1431 if (m_access_link)
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1432 os << m_access_link.get ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1433 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1434 os << "NULL";
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1435 os << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1436
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1437 os << "line: " << m_line << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1438 os << "column: " << m_column << std::endl;
27037 8408acb7ca4f make dbup/dbdown work again (bug #56020) John W. Eaton <jwe@octave.org> parents: 26824 diff changeset	1439 os << "index: " << m_index << std::endl;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1440
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1441 os << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1442
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1443 if (! follow)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1444 return;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1445
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1446 os << "FOLLOWING ACCESS LINKS:" << std::endl;
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1447 std::shared_ptr<stack_frame> frm = access_link ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1448 while (frm)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1449 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1450 frm->display (false);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1451 os << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1452
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1453 frm = frm->access_link ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1454 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1455 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1456
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1457 void compiled_fcn_stack_frame::display (bool follow) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1458 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1459 std::ostream& os = octave_stdout;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1460
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1461 os << "-- [compiled_fcn_stack_frame] (" << this << ") --" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1462 stack_frame::display (follow);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1463
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1464 os << "fcn: " << m_fcn->name ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1465 << " (" << m_fcn->type_name () << ")" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1466 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1467
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1468 void compiled_fcn_stack_frame::accept (stack_frame_walker& sfw)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1469 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1470 sfw.visit_compiled_fcn_stack_frame (*this);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1471 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1472
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	1473 script_stack_frame::script_stack_frame (tree_evaluator& tw,
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1474 octave_user_script *script,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1475 std::size_t index,
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1476 const std::shared_ptr<stack_frame>& parent_link,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1477 const std::shared_ptr<stack_frame>& static_link)
28793 c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1478 : stack_frame (tw, index, parent_link, static_link,
c5953e65c6aa track direct caller in stack frames John W. Eaton <jwe@octave.org> parents: 28538 diff changeset	1479 get_access_link (static_link)),
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1480 m_script (script), m_unwind_protect_frame (nullptr),
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1481 m_lexical_frame_offsets (get_num_symbols (script), 1),
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1482 m_value_offsets (get_num_symbols (script), 0)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1483 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1484 set_script_offsets ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1485 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1486
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1487 std::size_t script_stack_frame::get_num_symbols (octave_user_script *script)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1488 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1489 symbol_scope script_scope = script->scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1490
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1491 return script_scope.num_symbols ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1492 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1493
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1494 void script_stack_frame::set_script_offsets (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1495 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1496 // Set frame and data offsets inside stack frame based on enclosing
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1497 // scope(s).
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1498
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1499 symbol_scope script_scope = m_script->scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1500
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1501 std::size_t num_script_symbols = script_scope.num_symbols ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1502
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1503 resize (num_script_symbols);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1504
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1505 const std::map<std::string, symbol_record>& script_symbols
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1506 = script_scope.symbols ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1507
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1508 set_script_offsets_internal (script_symbols);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1509 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1510
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1511 void script_stack_frame::set_script_offsets_internal
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1512 (const std::map<std::string, symbol_record>& script_symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1513 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1514 // This scope will be used to evaluate the script. Find (or
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1515 // possibly insert) symbols from the dummy script scope here.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1516
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1517 symbol_scope eval_scope = m_access_link->get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1518
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1519 if (eval_scope.is_nested ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1520 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1521 bool found = false;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1522
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1523 for (const auto& nm_sr : script_symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1524 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1525 std::string name = nm_sr.first;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1526 symbol_record script_sr = nm_sr.second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1527
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1528 symbol_scope parent_scope = eval_scope;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1529
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1530 std::size_t count = 1;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1531
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1532 while (parent_scope)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1533 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1534 const std::map<std::string, symbol_record>& parent_scope_symbols
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1535 = parent_scope.symbols ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1536
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1537 auto p = parent_scope_symbols.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1538
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1539 if (p != parent_scope_symbols.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1540 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1541 found = true;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1542 symbol_record parent_scope_sr = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1543
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1544 std::size_t script_sr_data_offset = script_sr.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1545
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1546 m_lexical_frame_offsets.at (script_sr_data_offset)
28538 c09bc9e108b5 fix lookup of variables in scripts called inside nested functions (bug #58691) John W. Eaton <jwe@octave.org> parents: 28439 diff changeset	1547 = parent_scope_sr.frame_offset () + count;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1548
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1549 m_value_offsets.at (script_sr_data_offset)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1550 = parent_scope_sr.data_offset ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1551
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1552 break;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1553 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1554 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1555 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1556 count++;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1557 parent_scope = parent_scope.parent_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1558 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1559 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1560
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1561 if (! found)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1562 error ("symbol '%s' cannot be added to static scope",
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1563 name.c_str ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1564 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1565 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1566 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1567 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1568 const std::map<std::string, symbol_record>& eval_scope_symbols
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1569 = eval_scope.symbols ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1570
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1571 for (const auto& nm_sr : script_symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1572 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1573 std::string name = nm_sr.first;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1574 symbol_record script_sr = nm_sr.second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1575
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1576 auto p = eval_scope_symbols.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1577
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1578 symbol_record eval_scope_sr;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1579
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1580 if (p == eval_scope_symbols.end ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1581 eval_scope_sr = eval_scope.insert (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1582 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1583 eval_scope_sr = p->second;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1584
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1585 std::size_t script_sr_data_offset = script_sr.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1586
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1587 // The +1 is for going from the script frame to the eval
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1588 // frame. Only one access_link should need to be followed.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1589
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1590 m_lexical_frame_offsets.at (script_sr_data_offset)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1591 = eval_scope_sr.frame_offset () + 1;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1592
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1593 m_value_offsets.at (script_sr_data_offset)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1594 = eval_scope_sr.data_offset ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1595 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1596 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1597 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1598
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1599 void script_stack_frame::resize_and_update_script_offsets (const symbol_record& sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1600 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1601 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1602
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1603 // This function is called when adding new symbols to a script
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1604 // scope. If the symbol wasn't present before, it should be outside
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1605 // the range so we need to resize then update offsets.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1606
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	1607 panic_unless (data_offset >= size ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1608
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1609 resize (data_offset+1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1610
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1611 // FIXME: We should be able to avoid creating the map object and the
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1612 // looping in the set_scripts_offsets_internal function. Can we do
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1613 // that without (or with minimal) code duplication?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1614
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1615 std::map<std::string, symbol_record> tmp_symbols;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1616 tmp_symbols[sym.name ()] = sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1617 set_script_offsets_internal (tmp_symbols);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1618 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1619
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1620 // If this is a nested scope, set access_link to nearest parent
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1621 // stack frame that corresponds to the lexical parent of this scope.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1622
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1623 std::shared_ptr<stack_frame>
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1624 script_stack_frame::get_access_link (const std::shared_ptr<stack_frame>& static_link)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1625 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1626 // If this script is called from another script, set access
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1627 // link to ultimate parent stack frame.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1628
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1629 std::shared_ptr<stack_frame> alink = static_link;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1630
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1631 while (alink->is_user_script_frame ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1632 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1633 if (alink->access_link ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1634 alink = alink->access_link ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1635 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1636 break;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1637 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1638
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1639 return alink;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1640 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1641
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1642 unwind_protect * script_stack_frame::unwind_protect_frame (void)
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1643 {
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1644 if (! m_unwind_protect_frame)
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1645 m_unwind_protect_frame = new unwind_protect ();
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1646
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1647 return m_unwind_protect_frame;
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1648 }
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	1649
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1650 symbol_record script_stack_frame::lookup_symbol (const std::string& name) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1651 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1652 symbol_scope scope = get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1653
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1654 symbol_record sym = scope.lookup_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1655
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1656 if (sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1657 {
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	1658 panic_unless (sym.frame_offset () == 0);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1659
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1660 return sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1661 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1662
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1663 sym = m_access_link->lookup_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1664
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1665 // Return symbol record with adjusted frame offset.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1666 symbol_record new_sym = sym.dup ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1667
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1668 new_sym.set_frame_offset (sym.frame_offset () + 1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1669
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1670 return new_sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1671 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1672
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1673 symbol_record script_stack_frame::insert_symbol (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1674 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1675 // If the symbols is already in the immediate scope, there is
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1676 // nothing more to do.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1677
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1678 symbol_scope scope = get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1679
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1680 symbol_record sym = scope.lookup_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1681
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1682 if (sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1683 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1684 // All symbol records in a script scope should have zero offset,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1685 // which means we redirect our lookup using
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1686 // lexical_frame_offsets and values_offets.
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	1687 panic_unless (sym.frame_offset () == 0);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1688
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1689 return sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1690 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1691
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1692 // Insert the symbol in the current scope then resize and update
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1693 // offsets. This operation should never fail.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1694
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1695 sym = scope.find_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1696
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	1697 panic_unless (sym.is_valid ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1698
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1699 resize_and_update_script_offsets (sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1700
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1701 return sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1702 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1703
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1704 // Similar to set_script_offsets_internal except that we only return
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1705 // frame and data offsets for symbols found by name in parent scopes
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1706 // instead of updating the offsets stored in the script frame itself.
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1707
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1708 bool
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1709 script_stack_frame::get_val_offsets_internal (const symbol_record& script_sr,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1710 std::size_t& frame_offset,
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1711 std::size_t& data_offset) const
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1712 {
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1713 bool found = false;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1714
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1715 // This scope will be used to evaluate the script. Find symbols
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1716 // here by name.
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1717
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1718 symbol_scope eval_scope = m_access_link->get_scope ();
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1719
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1720 if (eval_scope.is_nested ())
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1721 {
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1722 std::string name = script_sr.name ();
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1723
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1724 symbol_scope parent_scope = eval_scope;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1725
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1726 std::size_t count = 1;
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1727
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1728 while (parent_scope)
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1729 {
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1730 const std::map<std::string, symbol_record>& parent_scope_symbols
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1731 = parent_scope.symbols ();
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1732
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1733 auto p = parent_scope_symbols.find (name);
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1734
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1735 if (p != parent_scope_symbols.end ())
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1736 {
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1737 found = true;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1738 symbol_record parent_scope_sr = p->second;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1739
28538 c09bc9e108b5 fix lookup of variables in scripts called inside nested functions (bug #58691) John W. Eaton <jwe@octave.org> parents: 28439 diff changeset	1740 frame_offset = parent_scope_sr.frame_offset () + count;
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1741
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1742 data_offset = parent_scope_sr.data_offset ();
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1743
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1744 break;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1745 }
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1746 else
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1747 {
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1748 count++;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1749 parent_scope = parent_scope.parent_scope ();
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1750 }
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1751 }
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1752 }
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1753 else
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1754 {
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1755 const std::map<std::string, symbol_record>& eval_scope_symbols
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1756 = eval_scope.symbols ();
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1757
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1758 std::string name = script_sr.name ();
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1759
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1760 auto p = eval_scope_symbols.find (name);
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1761
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1762 symbol_record eval_scope_sr;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1763
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1764 if (p != eval_scope_symbols.end ())
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1765 {
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1766 found = true;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1767 eval_scope_sr = p->second;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1768
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1769 // The +1 is for going from the script frame to the eval
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1770 // frame. Only one access_link should need to be followed.
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1771
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1772 frame_offset = eval_scope_sr.frame_offset () + 1;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1773
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1774 data_offset = eval_scope_sr.data_offset ();
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1775 }
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1776 }
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1777
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1778 return found;
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1779 }
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1780
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1781 bool script_stack_frame::get_val_offsets (const symbol_record& sym,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1782 std::size_t& frame_offset,
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1783 std::size_t& data_offset) const
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1784 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1785 data_offset = sym.data_offset ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1786 frame_offset = sym.frame_offset ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1787
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1788 if (frame_offset == 0)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1789 {
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1790 // An out of range data_offset value here means that we have a
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1791 // symbol that was not originally in the script. But this
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1792 // function is called in places where we can't insert a new
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1793 // symbol, so we fail and it is up to the caller to decide what
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1794 // to do.
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1795
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1796 if (data_offset >= size ())
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1797 return get_val_offsets_internal (sym, frame_offset, data_offset);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1798
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1799 // Use frame and value offsets stored in this stack frame,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1800 // indexed by data_offset from the symbol_record to find the
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1801 // values. These offsets were determined by
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1802 // script_stack_frame::set_script_offsets when this script was
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1803 // invoked.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1804
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1805 frame_offset = m_lexical_frame_offsets.at (data_offset);
27149 61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1806
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1807 if (frame_offset == 0)
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1808 {
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1809 // If the frame offset stored in m_lexical_frame_offsets is
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1810 // zero, then the data offset in the evaluation scope has
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1811 // not been determined so try to do that now. The symbol
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1812 // may have been added by eval and without calling
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1813 // resize_and_update_script_offsets.
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1814
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1815 return get_val_offsets_internal (sym, frame_offset, data_offset);
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1816 }
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1817
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1818 data_offset = m_value_offsets.at (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1819 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1820 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1821 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1822 // If frame_offset is not zero, then then we must have a symbol
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1823 // that was not originally in the script. The values should
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1824 // have been determined by the script_stack_frame::lookup function.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1825 }
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1826
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1827 return true;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1828 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1829
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1830 void script_stack_frame::get_val_offsets_with_insert (const symbol_record& sym,
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1831 std::size_t& frame_offset,
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1832 std::size_t& data_offset)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1833 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1834 data_offset = sym.data_offset ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1835 frame_offset = sym.frame_offset ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1836
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1837 if (frame_offset == 0)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1838 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1839 if (data_offset >= size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1840 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1841 // If the data_offset is out of range, then we must have a
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1842 // symbol that was not originally in the script. Resize and
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1843 // update the offsets.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1844
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1845 resize_and_update_script_offsets (sym);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1846 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1847
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1848 // Use frame and value offsets stored in this stack frame,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1849 // indexed by data_offset from the symbol_record to find the
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1850 // values. These offsets were determined by
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1851 // script_stack_frame::set_script_offsets when this script was
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1852 // invoked.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1853
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1854 frame_offset = m_lexical_frame_offsets.at (data_offset);
27149 61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1855
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1856 if (frame_offset == 0)
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1857 {
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1858 // If the frame offset stored in m_lexical_frame_offsets is
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1859 // zero, then the data offset in the evaluation scope has
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1860 // not been determined so try to do that now. The symbol
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1861 // may have been added by eval and without calling
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1862 // resize_and_update_script_offsets.
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1863
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1864 // We don't need to resize here. That case is handled above.
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1865
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1866 // FIXME: We should be able to avoid creating the map object
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1867 // and the looping in the set_scripts_offsets_internal
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1868 // function. Can we do that without (or with minimal) code
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1869 // duplication?
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1870
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1871 std::map<std::string, symbol_record> tmp_symbols;
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1872 tmp_symbols[sym.name ()] = sym;
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1873 set_script_offsets_internal (tmp_symbols);
30199 37ddca7ad9cb avoid internal error and segfault with eval and scripts (bug #61191) John W. Eaton <jwe@octave.org> parents: 29654 diff changeset	1874
37ddca7ad9cb avoid internal error and segfault with eval and scripts (bug #61191) John W. Eaton <jwe@octave.org> parents: 29654 diff changeset	1875 // set_script_offsets_internal may have modified
37ddca7ad9cb avoid internal error and segfault with eval and scripts (bug #61191) John W. Eaton <jwe@octave.org> parents: 29654 diff changeset	1876 // m_lexical_frame_offsets and m_value_offsets.
37ddca7ad9cb avoid internal error and segfault with eval and scripts (bug #61191) John W. Eaton <jwe@octave.org> parents: 29654 diff changeset	1877
37ddca7ad9cb avoid internal error and segfault with eval and scripts (bug #61191) John W. Eaton <jwe@octave.org> parents: 29654 diff changeset	1878 frame_offset = m_lexical_frame_offsets.at (data_offset);
27149 61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1879 }
61226b7bd6b9 fix calculation of value offsets for variables added to script scopes John W. Eaton <jwe@octave.org> parents: 27037 diff changeset	1880
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1881 data_offset = m_value_offsets.at (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1882 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1883 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1884 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1885 // If frame_offset is not zero, then then we must have a symbol
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1886 // that was not originally in the script. The values were
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1887 // determined by the script_stack_frame::lookup function.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1888 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1889 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1890
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1891 stack_frame::scope_flags
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1892 script_stack_frame::scope_flag (const symbol_record& sym) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1893 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1894 std::size_t frame_offset;
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1895 std::size_t data_offset;
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1896
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1897 bool found = get_val_offsets (sym, frame_offset, data_offset);
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1898
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1899 // It can't be global or persistent, so call it local.
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1900 if (! found)
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1901 return LOCAL;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1902
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1903 // Follow frame_offset access links to stack frame that holds
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1904 // the value.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1905
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1906 const stack_frame *frame = this;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1907
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1908 for (std::size_t i = 0; i < frame_offset; i++)
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1909 {
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1910 std::shared_ptr<stack_frame> nxt = frame->access_link ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1911 frame = nxt.get ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1912 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1913
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1914 if (! frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1915 error ("internal error: invalid access link in function call stack");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1916
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1917 if (data_offset >= frame->size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1918 return LOCAL;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1919
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1920 return frame->get_scope_flag (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1921 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1922
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1923 octave_value script_stack_frame::varval (const symbol_record& sym) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1924 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1925 std::size_t frame_offset;
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1926 std::size_t data_offset;
26663 fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1927
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1928 bool found = get_val_offsets (sym, frame_offset, data_offset);
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1929
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1930 if (! found)
fad3f19de1be don't fail if symbol in script can't be found (bug #55626) John W. Eaton <jwe@octave.org> parents: 26661 diff changeset	1931 return octave_value ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1932
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1933 // Follow frame_offset access links to stack frame that holds
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1934 // the value.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1935
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1936 const stack_frame *frame = this;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1937
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1938 for (std::size_t i = 0; i < frame_offset; i++)
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1939 {
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1940 std::shared_ptr<stack_frame> nxt = frame->access_link ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1941 frame = nxt.get ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1942 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1943
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1944 if (! frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1945 error ("internal error: invalid access link in function call stack");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1946
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1947 if (data_offset >= frame->size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1948 return octave_value ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1949
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1950 switch (frame->get_scope_flag (data_offset))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1951 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1952 case LOCAL:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1953 return frame->varval (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1954
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1955 case PERSISTENT:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1956 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1957 symbol_scope scope = frame->get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1958
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1959 return scope.persistent_varval (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1960 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1961
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1962 case GLOBAL:
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	1963 return m_evaluator.global_varval (sym.name ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1964 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1965
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1966 error ("internal error: invalid switch case");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1967 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1968
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1969 octave_value& script_stack_frame::varref (const symbol_record& sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1970 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1971 std::size_t frame_offset;
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1972 std::size_t data_offset;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1973 get_val_offsets_with_insert (sym, frame_offset, data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1974
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1975 // Follow frame_offset access links to stack frame that holds
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1976 // the value.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1977
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1978 stack_frame *frame = this;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1979
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	1980 for (std::size_t i = 0; i < frame_offset; i++)
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1981 {
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1982 std::shared_ptr<stack_frame> nxt = frame->access_link ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1983 frame = nxt.get ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	1984 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1985
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1986 if (data_offset >= frame->size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1987 frame->resize (data_offset+1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1988
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1989 switch (frame->get_scope_flag (data_offset))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1990 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1991 case LOCAL:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1992 return frame->varref (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1993
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1994 case PERSISTENT:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1995 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1996 symbol_scope scope = frame->get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1997
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1998 return scope.persistent_varref (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	1999 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2000
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2001 case GLOBAL:
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	2002 return m_evaluator.global_varref (sym.name ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2003 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2004
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2005 error ("internal error: invalid switch case");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2006 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2007
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2008 void script_stack_frame::mark_scope (const symbol_record& sym,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2009 scope_flags flag)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2010 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2011 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2012
29324 1a20cb5be8da avoid crash when evaling global variables into existence in script (bug #59937) John W. Eaton <jwe@octave.org> parents: 29064 diff changeset	2013 if (data_offset >= size ())
1a20cb5be8da avoid crash when evaling global variables into existence in script (bug #59937) John W. Eaton <jwe@octave.org> parents: 29064 diff changeset	2014 resize_and_update_script_offsets (sym);
1a20cb5be8da avoid crash when evaling global variables into existence in script (bug #59937) John W. Eaton <jwe@octave.org> parents: 29064 diff changeset	2015
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2016 // Redirection to evaluation context for the script.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2017
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2018 std::size_t frame_offset = m_lexical_frame_offsets.at (data_offset);
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2019 data_offset = m_value_offsets.at (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2020
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2021 if (frame_offset > 1)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2022 error ("variables must be made PERSISTENT or GLOBAL in the first scope in which they are used");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2023
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2024 std::shared_ptr<stack_frame> frame = access_link ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2025
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2026 if (data_offset >= frame->size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2027 frame->resize (data_offset+1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2028
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2029 frame->set_scope_flag (data_offset, flag);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2030 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2031
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2032 void script_stack_frame::display (bool follow) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2033 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2034 std::ostream& os = octave_stdout;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2035
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2036 os << "-- [script_stack_frame] (" << this << ") --" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2037 stack_frame::display (follow);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2038
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2039 os << "script: " << m_script->name ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2040 << " (" << m_script->type_name () << ")" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2041
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2042 os << "lexical_offsets: " << m_lexical_frame_offsets.size ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2043 << " elements:";
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2044
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2045 for (std::size_t i = 0; i < m_lexical_frame_offsets.size (); i++)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2046 os << " " << m_lexical_frame_offsets.at (i);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2047 os << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2048
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2049 os << "value_offsets: " << m_value_offsets.size () << " elements:";
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2050 for (std::size_t i = 0; i < m_value_offsets.size (); i++)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2051 os << " " << m_value_offsets.at (i);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2052 os << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2053
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2054 display_scope (os, get_scope ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2055 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2056
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2057 void script_stack_frame::accept (stack_frame_walker& sfw)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2058 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2059 sfw.visit_script_stack_frame (*this);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2060 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2061
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2062 void base_value_stack_frame::display (bool follow) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2063 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2064 std::ostream& os = octave_stdout;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2065
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2066 os << "-- [base_value_stack_frame] (" << this << ") --" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2067 stack_frame::display (follow);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2068
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2069 os << "values: " << m_values.size ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2070 << " elements (idx, scope flag, type):" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2071
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2072 for (std::size_t i = 0; i < m_values.size (); i++)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2073 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2074 os << " (" << i << ", " << m_flags.at (i) << ", ";
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2075
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2076 octave_value val = varval (i);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2077
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2078 os << (val.is_defined () ? val.type_name () : " UNDEFINED") << ")"
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2079 << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2080 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2081 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2082
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2083 // If this is a nested scope, set access_link to nearest parent
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2084 // stack frame that corresponds to the lexical parent of this scope.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2085
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2086 std::shared_ptr<stack_frame>
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2087 user_fcn_stack_frame::get_access_link (octave_user_function *fcn,
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2088 const std::shared_ptr<stack_frame>& static_link)
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2089 {
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2090 std::shared_ptr<stack_frame> alink;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2091
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2092 symbol_scope fcn_scope = fcn->scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2093
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2094 if (fcn_scope.is_nested ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2095 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2096 if (! static_link)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2097 error ("internal call stack error (invalid static link)");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2098
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2099 symbol_scope caller_scope = static_link->get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2100
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2101 int nesting_depth = fcn_scope.nesting_depth ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2102 int caller_nesting_depth = caller_scope.nesting_depth ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2103
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2104 if (caller_nesting_depth < nesting_depth)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2105 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2106 // FIXME: do we need to ensure that the called
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2107 // function is a child of the caller? Does it hurt
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	2108 // to panic_unless this condition, at least for now?
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2109
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2110 alink = static_link;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2111 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2112 else
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2113 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2114 // FIXME: do we need to check that the parent of the
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2115 // called function is also a parent of the caller?
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	2116 // Does it hurt to panic_unless this condition, at least
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2117 // for now?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2118
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2119 int links_to_follow = caller_nesting_depth - nesting_depth + 1;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2120
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2121 alink = static_link;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2122
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2123 while (alink && --links_to_follow >= 0)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2124 alink = alink->access_link ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2125
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2126 if (! alink)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2127 error ("internal function nesting error (invalid access link)");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2128 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2129 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2130
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2131 return alink;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2132 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2133
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2134 void user_fcn_stack_frame::clear_values (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2135 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2136 symbol_scope fcn_scope = m_fcn->scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2137
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2138 const std::list<symbol_record>& symbols = fcn_scope.symbol_list ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2139
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2140 if (size () == 0)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2141 return;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2142
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2143 for (const auto& sym : symbols)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2144 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2145 std::size_t frame_offset = sym.frame_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2146
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2147 if (frame_offset > 0)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2148 continue;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2149
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2150 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2151
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2152 if (data_offset >= size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2153 continue;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2154
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2155 if (get_scope_flag (data_offset) == LOCAL)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2156 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2157 octave_value& ref = m_values.at (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2158
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2159 if (ref.get_count () == 1)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2160 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2161 ref.call_object_destructor ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2162 ref = octave_value ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2163 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2164 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2165 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2166 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2167
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	2168 unwind_protect * user_fcn_stack_frame::unwind_protect_frame (void)
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	2169 {
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	2170 if (! m_unwind_protect_frame)
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	2171 m_unwind_protect_frame = new unwind_protect ();
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	2172
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	2173 return m_unwind_protect_frame;
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	2174 }
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28426 diff changeset	2175
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2176 symbol_record user_fcn_stack_frame::lookup_symbol (const std::string& name) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2177 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2178 const stack_frame *frame = this;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2179
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2180 while (frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2181 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2182 symbol_scope scope = frame->get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2183
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2184 symbol_record sym = scope.lookup_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2185
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2186 if (sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2187 return sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2188
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2189 std::shared_ptr<stack_frame> nxt = frame->access_link ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2190 frame = nxt.get ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2191 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2192
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2193 return symbol_record ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2194 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2195
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2196 symbol_record user_fcn_stack_frame::insert_symbol (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2197 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2198 // If the symbols is already in the immediate scope, there is
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2199 // nothing more to do.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2200
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2201 symbol_scope scope = get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2202
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2203 symbol_record sym = scope.lookup_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2204
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2205 if (sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2206 return sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2207
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2208 // FIXME: This needs some thought... We may need to add a symbol to
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2209 // a static workspace, but the symbol can never be defined as a
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2210 // variable. This currently works by tagging the added symbol as
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2211 // "added_static". Aside from the bad name, this doesn't seem like
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2212 // the best solution. Maybe scopes should have a separate set of
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2213 // symbols that may only be defined as functions?
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2214
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2215 // Insert the symbol in the current scope. This is not possible for
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2216 // anonymous functions, nested functions, or functions that contain
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2217 // nested functions (their scopes will all be marked static).
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2218
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2219 // if (scope.is_static ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2220 // error ("can not add variable '%s' to a static workspace",
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2221 // name.c_str ());
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2222
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2223 // At this point, non-local references are not possible so we only
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2224 // need to look in the current scope and insert there. This
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2225 // operation should never fail.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2226
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2227 sym = scope.find_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2228
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	2229 panic_unless (sym.is_valid ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2230
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2231 return sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2232 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2233
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2234 stack_frame::scope_flags
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2235 user_fcn_stack_frame::scope_flag (const symbol_record& sym) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2236 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2237 std::size_t frame_offset = sym.frame_offset ();
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2238 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2239
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2240 // Follow frame_offset access links to stack frame that holds
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2241 // the value.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2242
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2243 const stack_frame *frame = this;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2244
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2245 for (std::size_t i = 0; i < frame_offset; i++)
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2246 {
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2247 std::shared_ptr<stack_frame> nxt = frame->access_link ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2248 frame = nxt.get ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2249 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2250
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2251 if (! frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2252 error ("internal error: invalid access link in function call stack");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2253
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2254 if (data_offset >= frame->size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2255 return LOCAL;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2256
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2257 return frame->get_scope_flag (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2258 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2259
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2260 octave_value user_fcn_stack_frame::varval (const symbol_record& sym) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2261 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2262 std::size_t frame_offset = sym.frame_offset ();
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2263 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2264
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2265 // Follow frame_offset access links to stack frame that holds
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2266 // the value.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2267
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2268 const stack_frame *frame = this;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2269
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2270 for (std::size_t i = 0; i < frame_offset; i++)
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2271 {
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2272 std::shared_ptr<stack_frame> nxt = frame->access_link ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2273 frame = nxt.get ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2274 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2275
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2276 if (! frame)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2277 error ("internal error: invalid access link in function call stack");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2278
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2279 if (data_offset >= frame->size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2280 return octave_value ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2281
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2282 switch (frame->get_scope_flag (data_offset))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2283 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2284 case LOCAL:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2285 return frame->varval (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2286
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2287 case PERSISTENT:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2288 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2289 symbol_scope scope = frame->get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2290
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2291 return scope.persistent_varval (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2292 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2293
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2294 case GLOBAL:
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	2295 return m_evaluator.global_varval (sym.name ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2296 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2297
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2298 error ("internal error: invalid switch case");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2299 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2300
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2301 octave_value& user_fcn_stack_frame::varref (const symbol_record& sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2302 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2303 std::size_t frame_offset = sym.frame_offset ();
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2304 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2305
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2306 // Follow frame_offset access links to stack frame that holds
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2307 // the value.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2308
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2309 stack_frame *frame = this;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2310
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2311 for (std::size_t i = 0; i < frame_offset; i++)
28426 9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2312 {
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2313 std::shared_ptr<stack_frame> nxt = frame->access_link ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2314 frame = nxt.get ();
9a3deb17b4ea use shared_ptr for stack frames in call stack and for accesss and static links John W. Eaton <jwe@octave.org> parents: 28425 diff changeset	2315 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2316
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2317 if (data_offset >= frame->size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2318 frame->resize (data_offset+1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2319
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2320 switch (frame->get_scope_flag (data_offset))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2321 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2322 case LOCAL:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2323 return frame->varref (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2324
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2325 case PERSISTENT:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2326 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2327 symbol_scope scope = frame->get_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2328
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2329 return scope.persistent_varref (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2330 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2331
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2332 case GLOBAL:
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	2333 return m_evaluator.global_varref (sym.name ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2334 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2335
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2336 error ("internal error: invalid switch case");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2337 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2338
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2339 void user_fcn_stack_frame::mark_scope (const symbol_record& sym, scope_flags flag)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2340 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2341 std::size_t frame_offset = sym.frame_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2342
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2343 if (frame_offset > 0 && (flag == PERSISTENT \|\| flag == GLOBAL))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2344 error ("variables must be made PERSISTENT or GLOBAL in the first scope in which they are used");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2345
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2346 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2347
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2348 if (data_offset >= size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2349 resize (data_offset+1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2350
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2351 set_scope_flag (data_offset, flag);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2352 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2353
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2354 void user_fcn_stack_frame::display (bool follow) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2355 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2356 std::ostream& os = octave_stdout;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2357
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2358 os << "-- [user_fcn_stack_frame] (" << this << ") --" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2359 base_value_stack_frame::display (follow);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2360
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2361 os << "fcn: " << m_fcn->name ()
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2362 << " (" << m_fcn->type_name () << ")" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2363
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2364 display_scope (os, get_scope ());
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	2365 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2366
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2367 void user_fcn_stack_frame::accept (stack_frame_walker& sfw)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2368 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2369 sfw.visit_user_fcn_stack_frame (*this);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2370 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2371
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2372 void user_fcn_stack_frame::break_closure_cycles (const std::shared_ptr<stack_frame>& frame)
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2373 {
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2374 for (auto& val : m_values)
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2375 val.break_closure_cycles (frame);
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2376
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2377 if (m_access_link)
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2378 m_access_link->break_closure_cycles (frame);
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2379 }
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	2380
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2381 symbol_record scope_stack_frame::insert_symbol (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2382 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2383 // There is no access link for scope frames, so there is no other
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2384 // frame to search in and the offset must be zero.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2385
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2386 symbol_record sym = m_scope.lookup_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2387
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2388 if (sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2389 return sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2390
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2391 // If the symbol is not found, insert it. We only need to search in
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2392 // the local scope object. This operation should never fail.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2393
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2394 sym = m_scope.find_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2395
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	2396 panic_unless (sym.is_valid ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2397
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2398 return sym;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2399 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2400
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2401 stack_frame::scope_flags
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2402 scope_stack_frame::scope_flag (const symbol_record& sym) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2403 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2404 // There is no access link for scope frames, so the frame
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2405 // offset must be zero.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2406
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2407 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2408
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2409 if (data_offset >= size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2410 return LOCAL;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2411
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2412 return get_scope_flag (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2413 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2414
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2415 octave_value scope_stack_frame::varval (const symbol_record& sym) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2416 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2417 // There is no access link for scope frames, so the frame
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2418 // offset must be zero.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2419
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2420 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2421
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2422 if (data_offset >= size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2423 return octave_value ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2424
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2425 switch (get_scope_flag (data_offset))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2426 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2427 case LOCAL:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2428 return m_values.at (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2429
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2430 case PERSISTENT:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2431 return m_scope.persistent_varval (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2432
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2433 case GLOBAL:
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	2434 return m_evaluator.global_varval (sym.name ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2435 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2436
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2437 error ("internal error: invalid switch case");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2438 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2439
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2440 octave_value& scope_stack_frame::varref (const symbol_record& sym)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2441 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2442 // There is no access link for scope frames, so the frame
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2443 // offset must be zero.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2444
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2445 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2446
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2447 if (data_offset >= size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2448 resize (data_offset+1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2449
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2450 switch (get_scope_flag (data_offset))
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2451 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2452 case LOCAL:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2453 return m_values.at (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2454
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2455 case PERSISTENT:
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2456 return m_scope.persistent_varref (data_offset);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2457
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2458 case GLOBAL:
27211 8c27802a76c4 store reference to evaluator instead of call stack in stack frame John W. Eaton <jwe@octave.org> parents: 27149 diff changeset	2459 return m_evaluator.global_varref (sym.name ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2460 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2461
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2462 error ("internal error: invalid switch case");
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2463 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2464
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2465 void scope_stack_frame::mark_scope (const symbol_record& sym,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2466 scope_flags flag)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2467 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2468 // There is no access link for scope frames, so the frame
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2469 // offset must be zero.
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2470
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29477 diff changeset	2471 std::size_t data_offset = sym.data_offset ();
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2472
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2473 if (data_offset >= size ())
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2474 resize (data_offset+1);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2475
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2476 set_scope_flag (data_offset, flag);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2477 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2478
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2479 void scope_stack_frame::display (bool follow) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2480 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2481 std::ostream& os = octave_stdout;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2482
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2483 os << "-- [scope_stack_frame] (" << this << ") --" << std::endl;
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2484 base_value_stack_frame::display (follow);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2485
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2486 display_scope (os, m_scope);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2487 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2488
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2489 void scope_stack_frame::accept (stack_frame_walker& sfw)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2490 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2491 sfw.visit_scope_stack_frame (*this);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: diff changeset	2492 }
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30723 diff changeset	2493
e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 30723 diff changeset	2494 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libinterp/corefcn/stack-frame.cc @ 31605:e88a07dec498 stable