Mercurial > octave
changeset 27444:160930a3e5ee
eliminate some calls to global __get_SUBSYSTEM__ functions
* cdef-manager.cc, debug.cc, event-manager.cc, input.cc, pager.cc:
Where possible, use interpreter object to directly access interpreter
subsystem objects instead of using global __get_SUBSYSTEM__ functions
from interpreter-private.h.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 25 Sep 2019 13:49:37 -0400 |
| parents | 075602880383 |
| children | c98953e85220 |
| files | libinterp/corefcn/debug.cc libinterp/corefcn/event-manager.cc libinterp/corefcn/input.cc libinterp/corefcn/pager.cc libinterp/octave-value/cdef-manager.cc |
| diffstat | 5 files changed, 9 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/debug.cc Wed Sep 25 13:44:06 2019 -0400 +++ b/libinterp/corefcn/debug.cc Wed Sep 25 13:49:37 2019 -0400 @@ -1184,8 +1184,8 @@ return ovl (); } -DEFUN (isdebugmode, args, , - doc: /* -*- texinfo -*- +DEFMETHOD (isdebugmode, interp, args, , + doc: /* -*- texinfo -*- @deftypefn {} {} isdebugmode () Return true if in debugging mode, otherwise false. @seealso{dbwhere, dbstack, dbstatus} @@ -1194,7 +1194,7 @@ if (args.length () != 0) print_usage (); - octave::tree_evaluator& tw = octave::__get_evaluator__ ("Fisdebugmode"); + octave::tree_evaluator& tw = interp.get_evaluator (); return ovl (tw.in_debug_repl ()); }
--- a/libinterp/corefcn/event-manager.cc Wed Sep 25 13:44:06 2019 -0400 +++ b/libinterp/corefcn/event-manager.cc Wed Sep 25 13:49:37 2019 -0400 @@ -120,8 +120,7 @@ { if (enabled ()) { - tree_evaluator& tw - = __get_evaluator__ ("event_manager::set_workspace"); + tree_evaluator& tw = m_interpreter.get_evaluator (); instance->set_workspace (tw.at_top_level (), debugging, tw.get_symbol_info (), true);
--- a/libinterp/corefcn/input.cc Wed Sep 25 13:44:06 2019 -0400 +++ b/libinterp/corefcn/input.cc Wed Sep 25 13:49:37 2019 -0400 @@ -592,7 +592,7 @@ std::string prompt = args(0).xstring_value ("input: unrecognized argument"); - output_system& output_sys = __get_output_system__ ("do_sync"); + output_system& output_sys = m_interpreter.get_output_system (); output_sys.reset ();
--- a/libinterp/corefcn/pager.cc Wed Sep 25 13:44:06 2019 -0400 +++ b/libinterp/corefcn/pager.cc Wed Sep 25 13:49:37 2019 -0400 @@ -490,8 +490,8 @@ } } -DEFUN (diary, args, nargout, - doc: /* -*- texinfo -*- +DEFMETHOD (diary, interp, args, nargout, + doc: /* -*- texinfo -*- @deftypefn {} {} diary @deftypefnx {} {} diary on @deftypefnx {} {} diary off @@ -529,7 +529,7 @@ if (nargin > 1) print_usage (); - octave::output_system& output_sys = octave::__get_output_system__ ("Fdiary"); + octave::output_system& output_sys = interp.get_output_system (); if (nargout > 0) {
--- a/libinterp/octave-value/cdef-manager.cc Wed Sep 25 13:44:06 2019 -0400 +++ b/libinterp/octave-value/cdef-manager.cc Wed Sep 25 13:49:37 2019 -0400 @@ -27,7 +27,6 @@ #include "cdef-manager.h" #include "cdef-utils.h" #include "interpreter.h" -#include "interpreter-private.h" #include "ov-classdef.h" namespace octave @@ -289,7 +288,7 @@ std::list<std::string> names = lp.get_all_package_names (); - cdef_manager& cdm = __get_cdef_manager__ ("package_getAllPackages"); + cdef_manager& cdm = interp.get_cdef_manager (); toplevel_packages["meta"] = cdm.find_package ("meta", false, false);