Mercurial > octave
diff libinterp/corefcn/call-stack.cc @ 28430:5bfa8e018704 stable
store local init vars for anonymous functions in handle, not function object
This change is step toward revamping function handles by storing
variable init values for anonymous functions in function handle
objects instead of in the corresponding functions.
* call-stack.h, call-stack.cc (call_stack::push): New overload that
accepts local variable map in addition to function object.
* stack-frame.h (user_fcn_stack_frame::user_fcn_stack_frame):
New constructor that accepts local variable map in addition to
function object.
(stack_frame::local_vars_map): New typedef.
* ov-fcn-handle.h, ov-fcn-handle.cc (octave_fcn_handle::m_local_vars):
New data member.
(octave_fcn_handle::octave_fcn_handle): Update existing constructors
and provide new one to construct handle from function object and local
variable map.
(octave_fcn_handle::call): If m_local_vars is defined, push stack
frame with that info and execute function here.
(octave_fcn_handle::workspace): Create workspace struct from
m_local_vars instead of getting that info from the function object.
(octave_fcn_handle::parse_anon_fcn_handle): Copy m_local_vars from new
function handle object.
(octave_fcn_handle::save_ascii, octave_fcn_handle::save_binary,
octave_fcn_handle::save_hdf5): Use m_local_vars instead of getting
info from function object.
* ov-usr-fcn.h, ov-usr-fcn.cc (octave_user_function::local_vars_map):
Delete typedef.
(octave_user_function::m_local_var_init_vals): Delete data member and
all uses.
(octave_user_function::local_var_init_vals): Delete.
* pt-eval.h, pt-eval.cc (tree_evaluator::push_stack_frame):
New overload that accepts local variable map and user function.
(tree_evaluator::init_local_fcn_vars): Delete function and all uses.
* pt-fcn-handle.cc (tree_anon_fcn_handle::evaluate): Store local
variables in function handle object instead of function object.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 30 Mar 2020 15:14:10 -0400 |
parents | 8eb8ba8aff9a |
children | 2893db10b8d2 |
line wrap: on
line diff
--- a/libinterp/corefcn/call-stack.cc Mon Mar 30 10:43:47 2020 -0400 +++ b/libinterp/corefcn/call-stack.cc Mon Mar 30 15:14:10 2020 -0400 @@ -401,6 +401,25 @@ m_cs.push_back (new_frame); } + void call_stack::push (octave_user_function *fcn, + const stack_frame::local_vars_map& local_vars) + { + size_t prev_frame = m_curr_frame; + m_curr_frame = m_cs.size (); + + // m_max_stack_depth should never be less than zero. + if (m_curr_frame > static_cast<size_t> (m_max_stack_depth)) + error ("max_stack_depth exceeded"); + + std::shared_ptr<stack_frame> slink = get_static_link (prev_frame); + + std::shared_ptr<stack_frame> + new_frame (stack_frame::create (m_evaluator, fcn, m_curr_frame, slink, + local_vars)); + + m_cs.push_back (new_frame); + } + void call_stack::push (octave_user_script *script) { size_t prev_frame = m_curr_frame;