octave: libinterp/corefcn/interpreter-private.cc annotate

annotate libinterp/corefcn/interpreter-private.cc @ 25360:bc5f225bc578

eliminate some global accesses to the breakpoint table * pt-eval.h, pt-eval.cc (tree_evaluator::m_bp_table): Store breakpoint table in evaluator, not interpreter. Change all uses. (tree_evaluator::get_user_code): Move here from interpreter. (tree_evaluator::m_dbstep_flag, tree_evaluator::m_in_loop_command): Now a member variables instead of static. Change all uses. (tree_evaluator::reset_debug_state): Now a member function instead of static. Change all uses. New overload that accepts mode directly. (tree_evaluator::final_index_error): Now a member function instead of static. Change all uses. * bp-table.h, bp-table.cc (bp_table::m_evaluator): Store reference to the evaluator in bp_table instead of a reference to the interpreter. Change all uses. * debug.cc (Fdbstep, Fdbcont, Fdbquit): Define with DEFMETHOD. * octave-cmd.h, octave-cmd.cc (octave_cmd_exec::execute, octave_cmd_eval::execute, octave_cmd_debug::execute): Accept reference to interpreter as argument. (octave_command_queue::execute_command_callback): Pass interpreter to execute functions.

author	John W. Eaton <jwe@octave.org>
date	Tue, 08 May 2018 11:53:34 -0400
parents	6652d3823428
children	ab10403a0b50

rev	line source
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	2
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24738 diff changeset	3 Copyright (C) 2017-2018 John W. Eaton
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	4
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	5 This file is part of Octave.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24361 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24361 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	10 (at your option) any later version.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	11
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	15 GNU General Public License for more details.
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	16
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24361 diff changeset	19 <https://www.gnu.org/licenses/>.
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	20
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	22
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	23 #if defined (HAVE_CONFIG_H)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	24 # include "config.h"
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	26
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	27 #include <string>
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	28
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	29 #include "bp-table.h"
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	30 #include "call-stack.h"
24734 5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	31 #include "child-list.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include "error.h"
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	33 #include "gtk-manager.h"
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	34 #include "help.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include "interpreter-private.h"
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	36 #include "interpreter.h"
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	37 #include "load-path.h"
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	38 #include "ov-classdef.h"
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	39 #include "symtab.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	40
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	41 namespace octave
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	42 {
23517 1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	43 interpreter& __get_interpreter__ (const std::string& who)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	44 {
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	45 interpreter *interp = interpreter::the_interpreter ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	46
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	47 if (! interp)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	48 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	49 abort ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	50 error ("%s: interpreter context missing", who.c_str ());
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	51 }
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	52
23517 1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	53 return *interp;
1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	54 }
1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	55
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	56 dynamic_loader& __get_dynamic_loader__ (const std::string& who)
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	57 {
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	58 interpreter& interp = __get_interpreter__ (who);
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	59
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	60 return interp.get_dynamic_loader ();
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	61 }
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	62
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	63 help_system& __get_help_system__ (const std::string& who)
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	64 {
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	65 interpreter& interp = __get_interpreter__ (who);
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	66
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	67 return interp.get_help_system ();
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	68 }
b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	69
23517 1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	70 load_path& __get_load_path__ (const std::string& who)
1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	71 {
1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	72 interpreter& interp = __get_interpreter__ (who);
1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	73
1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	74 return interp.get_load_path ();
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	75 }
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	76
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	77 type_info& __get_type_info__ (const std::string& who)
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	78 {
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	79 interpreter& interp = __get_interpreter__ (who);
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	80
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	81 return interp.get_type_info ();
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	82 }
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	83
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	84 symbol_table& __get_symbol_table__ (const std::string& who)
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	85 {
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	86 interpreter& interp = __get_interpreter__ (who);
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	87
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	88 return interp.get_symbol_table ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	89 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	90
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	91 symbol_scope __get_current_scope__ (const std::string& who)
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	92 {
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	93 interpreter& interp = __get_interpreter__ (who);
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	94
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	95 return interp.get_current_scope ();
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	96 }
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	97
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	98 symbol_scope __require_current_scope__ (const std::string& who)
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	99 {
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	100 symbol_scope scope = __get_current_scope__ (who);
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	101
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	102 if (! scope)
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	103 error ("%s: symbol table scope missing", who.c_str ());
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	104
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23602 diff changeset	105 return scope;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	106 }
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	107
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	108 tree_evaluator& __get_evaluator__ (const std::string& who)
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	109 {
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	110 interpreter& interp = __get_interpreter__ (who);
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	111
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	112 return interp.get_evaluator ();
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	113 }
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	114
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	115 bp_table& __get_bp_table__ (const std::string& who)
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	116 {
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	117 tree_evaluator& tw = __get_evaluator__ (who);
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	118
25360 bc5f225bc578 eliminate some global accesses to the breakpoint table John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	119 return tw.get_bp_table ();
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	120 }
3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	121
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	122 call_stack& __get_call_stack__ (const std::string& who)
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	123 {
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	124 interpreter& interp = __get_interpreter__ (who);
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	125
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	126 return interp.get_call_stack ();
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	127 }
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	128
24734 5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	129 child_list& __get_child_list__ (const std::string& who)
5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	130 {
5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	131 interpreter& interp = __get_interpreter__ (who);
5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	132
5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	133 return interp.get_child_list ();
5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	134 }
5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	135
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	136 cdef_manager& __get_cdef_manager__ (const std::string& who)
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	137 {
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	138 interpreter& interp = __get_interpreter__ (who);
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	139
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	140 return interp.get_cdef_manager ();
5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	141 }
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	142
41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	143 gtk_manager& __get_gtk_manager__ (const std::string& who)
41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	144 {
41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	145 interpreter& interp = __get_interpreter__ (who);
41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	146
41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	147 return interp.get_gtk_manager ();
41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	148 }
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	149 }

Mercurial > octave

annotate libinterp/corefcn/interpreter-private.cc @ 25360:bc5f225bc578