Mercurial > octave
view libinterp/corefcn/interpreter-private.cc @ 31105:670a0d878af1
eliminate WHO arguments from interpreter-private functions
* interpreter-private.h, inpterpreter-private.cc (__get_interpreter__,
__get_dynamic_loader__, __get_error_system__, __get_gh_manager__,
__get_help_system__, __get_input_system__, __get_load_path__,
__get_load_save_system__, __get_event_manager__,
__get_output_system__, __get_type_info__, __get_symbol_table__,
__get_current_scope__, __require_current_scope__, __get_evaluator__,
__get_bp_table__, __get_child_list__, __get_cdef_manager__,
__get_display_info__, __get_gtk_manager__): Eliminate WHO argument.
Previously, it was never displayed by __get_interpreter__. And, as
pointed out by Petter Tomner in patch #10216, passing a std::string
object could have performance issues.
(__get_interpreter__): Eliminate useless call to error. Display
message to std::cerr then abort.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 22 Jun 2022 12:48:59 -0400 |
parents | 796f54d4ddbf |
children | e88a07dec498 |
line wrap: on
line source
//////////////////////////////////////////////////////////////////////// // // Copyright (C) 2017-2022 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 <iostream> #include <list> #include <string> #include "bp-table.h" #include "cdef-manager.h" #include "child-list.h" #include "display.h" #include "error.h" #include "event-manager.h" #include "gtk-manager.h" #include "help.h" #include "input.h" #include "interpreter-private.h" #include "interpreter.h" #include "load-path.h" #include "load-save.h" #include "ov.h" #include "ovl.h" #include "pager.h" #include "symtab.h" namespace octave { interpreter& __get_interpreter__ (void) { interpreter *interp = interpreter::the_interpreter (); if (! interp) { std::cerr << "fatal error: octave interpreter context missing" << std::endl; abort (); } return *interp; } dynamic_loader& __get_dynamic_loader__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_dynamic_loader (); } error_system& __get_error_system__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_error_system (); } gh_manager& __get_gh_manager__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_gh_manager (); } help_system& __get_help_system__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_help_system (); } input_system& __get_input_system__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_input_system (); } output_system& __get_output_system__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_output_system (); } load_path& __get_load_path__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_load_path (); } load_save_system& __get_load_save_system__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_load_save_system (); } event_manager& __get_event_manager__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_event_manager (); } type_info& __get_type_info__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_type_info (); } symbol_table& __get_symbol_table__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_symbol_table (); } symbol_scope __get_current_scope__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_current_scope (); } symbol_scope __require_current_scope__ (void) { symbol_scope scope = __get_current_scope__ (); if (! scope) error ("__require_current_scope__: symbol table scope missing"); return scope; } tree_evaluator& __get_evaluator__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_evaluator (); } bp_table& __get_bp_table__ (void) { tree_evaluator& tw = __get_evaluator__ (); return tw.get_bp_table (); } child_list& __get_child_list__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_child_list (); } cdef_manager& __get_cdef_manager__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_cdef_manager (); } display_info& __get_display_info__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_display_info (); } gtk_manager& __get_gtk_manager__ (void) { interpreter& interp = __get_interpreter__ (); return interp.get_gtk_manager (); } octave_value get_function_handle (interpreter& interp, const octave_value& arg, const std::string& parameter_name) { std::list<std::string> parameter_names; parameter_names.push_back (parameter_name); return get_function_handle (interp, arg, parameter_names); } // May return a function handle object, inline function object, or // function object. octave_value get_function_handle (interpreter& interp, const octave_value& arg, const std::list<std::string>& parameter_names) { if (arg.is_function_handle () || arg.is_inline_function ()) return arg; else if (arg.is_string ()) { std::string fstr = arg.string_value (); if (fstr.empty ()) return octave_value (); symbol_table& symtab = interp.get_symbol_table (); octave_value fcn = symtab.find_function (fstr); if (fcn.is_defined ()) return fcn; // Possibly warn here that passing the function body in a // character string is discouraged. octave_value_list args (parameter_names.size () + 1); octave_idx_type i = 0; args(i++) = fstr; for (const auto& pname : parameter_names) args(i++) = pname; octave_value_list tmp = interp.feval ("inline", args, 1); if (tmp.length () > 0) return tmp(0); } return octave_value (); } }