Mercurial > octave
view libinterp/corefcn/hook-fcn.cc @ 31730:610a85b0ff62
use interpreter::feval instead of global feval function
* __eigs__.cc, bsxfun.cc, call-stack.cc, cellfun.cc, daspk.cc,
dasrt.cc, dassl.cc, data.cc, defun.cc, gh-manager.cc, graphics.cc,
gtk-manager.cc, gtk-manager.h, hook-fcn.cc, input.cc, interpreter.cc,
ls-mat5.cc, lsode.cc, mex.cc, pr-output.cc, quad.cc, quadcc.cc,
variables.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc,
audiodevinfo.cc, cdef-method.cc, cdef-package.cc, cdef-property.cc,
ov-class.cc, ov-java.cc, ov-oncleanup.cc, op-class.cc, pt-assign.cc,
pt-eval.cc, pt-id.cc:
Change all uses of global feval function to use interpreter::feval
instead. If necessary, use __get_interpreter__ to access global
interpreter object.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 12 Jan 2023 10:22:04 -0500 |
parents | 597f3ee61a48 |
children | 05b4479c29d8 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2013-2023 The Octave Project Developers // // See the file COPYRIGHT.md in the top-level directory of this // distribution or <https://octave.org/copyright/>. // // This file is part of Octave. // // Octave is free software: you can redistribute it and/or modify it // under the terms of the GNU General Public License as published by // the Free Software Foundation, either version 3 of the License, or // (at your option) any later version. // // Octave is distributed in the hope that it will be useful, but // WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // GNU General Public License for more details. // // You should have received a copy of the GNU General Public License // along with Octave; see the file COPYING. If not, see // <https://www.gnu.org/licenses/>. // //////////////////////////////////////////////////////////////////////// #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include "hook-fcn.h" #include "interpreter-private.h" #include "interpreter.h" OCTAVE_BEGIN_NAMESPACE(octave) hook_function::hook_function (const octave_value& f, const octave_value& d) { if (f.is_string ()) { std::string name = f.string_value (); m_rep = std::shared_ptr<base_hook_function> (new named_hook_function (name, d)); } else if (f.is_function_handle ()) { m_rep = std::shared_ptr<base_hook_function> (new fcn_handle_hook_function (f, d)); } else error ("invalid hook function"); } void named_hook_function::eval (const octave_value_list& initial_args) { octave_value_list args = initial_args; if (m_data.is_defined ()) args.append (m_data); interpreter& interp = __get_interpreter__ (); interp.feval (m_name, args, 0); } void fcn_handle_hook_function::eval (const octave_value_list& initial_args) { octave_value_list args = initial_args; if (m_data.is_defined ()) args.append (m_data); interpreter& interp = __get_interpreter__ (); interp.feval (m_fcn_handle, args, 0); } OCTAVE_END_NAMESPACE(octave)