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

annotate libinterp/corefcn/interpreter-private.h @ 27302:5f170ea12fa1

use Qt signals to pass interpreter callbacks to octave-qobject * interpreter-qobject.h, interpreter-qobject.cc (interpreter_qobject::m_interpreter): New data member. (interpreter_qobject::execute): Cache pointer to interpreter after it is created. Set it to nullptr before exiting to disable interpreter events. (interpreter_qobject::interpreter_event): New functions. * octave-qobject.h, octave-qobject.cc (octave_qapplication::interpreter_event): New signals. (base_qobject::interpreter_event): New slots. Forward action to m_interpreter object interpreter_event functions. (base_qobject::base_qobject): Connect interpreter_event signals for octave_qapplication to the base_qobject::interpreter_event slots. (octave_qapplication::notify): Emit interpreter_event signal instead of using event_manager::post_exception. * qt-interpreter-events.cc: Declare and register octave::fcn_callback and octave::meth_callback as Qt meta types. * event-manager.h, event-manager.cc (event_manager::m_interpreter): New data member. Update constructor, change all uses. (octave::fcn_callback, octave::meth_callback): New typedefs. (event_manager::post_event): Limit allowable callback function signatures. For meth_callback functions, arrange for a reference to the interpreter object to be passed as the first argument. (event_manager::post_exception): Delete. (event_manager::rethrow_exception_callback): Delete. * GLCanvas.cc (GLCanvas::do_print): Use event_manager::post_event instead of event_manager::post_exception. * file-editor-tab.h (file_eitor_tab::interpreter_event): New signals. * file-editor.cc (file_editor::add_file_editor_tab): Forward interpreter_event signal from newly constructed file_editor_tab object to the interpreter_event signal of the file_editor object. * main-window.h, main-window.cc (main_window::construct): Connect the interpreter_event signal from the main_window object to the parent octave_qobject object. (main_window::interpreter_event): New signals. * octave-dock-widget.h, octave-dock-widget.cc (octave_dock_widget::octave_dock_widget) Forward the interpreter_event signal from the octave_dock_widget object to the interpreter_event signal for parent main_window object. (octave_dock_widget::interpreter_event): New signals. * variable-editor-model.h, variable-editor-model.cc (variable_editor_model::init_from_oct, variable_editor_model::retrieve_variable): Accept reference to interpreter object as an argument. Change all uses. (variable_editor_model::interpreter_event): New signals. * variable-editor.cc (variable_editor::edit_variable): Forward interpreter_event signal from newly constructed variable_editor_model to interpreter_event signal fro variable_editor object. * files-dock-widget.cc, file-editor-tab.cc, main-window.cc, variable-editor-model.cc: In all functions that need to perform interpreter actions, emit an interpreter_event signal instead of accessing the interprter event_manager and calling post_interpreter_event directly.

author	John W. Eaton <jwe@octave.org>
date	Mon, 29 Jul 2019 10:43:04 -0400
parents	596312d4f25d
children	eddce82a57cc

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
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	3 Copyright (C) 2017-2019 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 (octave_interpreter_private_h)
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	24 #define octave_interpreter_private_h 1
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	25
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	26 #include "octave-config.h"
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	27
26863 c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	28 #include <list>
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	29 #include <string>
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	30
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	31 #include "symtab.h"
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	32
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	33 namespace octave
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	34 {
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	35 class bp_table;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	36 class cdef_manager;
24734 5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	37 class child_list;
27266 596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	38 class display_info;
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	39 class dynamic_loader;
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	40 class error_system;
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	41 class event_manager;
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	42 class gtk_manager;
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	43 class help_system;
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25993 diff changeset	44 class history_system;
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	45 class input_system;
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	46 class interpreter;
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	47 class load_path;
25993 f75bb9d659e0 eliminate global and file-scope static variables from load-save.cc (bug #54571) John W. Eaton <jwe@octave.org> parents: 25460 diff changeset	48 class load_save_system;
25435 a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25407 diff changeset	49 class output_system;
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	50 class tree_evaluator;
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	51 class type_info;
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 extern interpreter& __get_interpreter__ (const std::string& who);
1bc8f1f50b54 new function for accessing interpreter John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	54
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	55 extern 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	56
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	57 extern error_system& __get_error_system__ (const std::string& who);
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	58
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	59 extern 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	60
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25993 diff changeset	61 extern history_system& __get_history_system__ (const std::string& who);
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25993 diff changeset	62
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	63 extern input_system& __get_input_system__ (const std::string& who);
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	64
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	65 extern load_path& __get_load_path__ (const std::string& who);
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	66
25993 f75bb9d659e0 eliminate global and file-scope static variables from load-save.cc (bug #54571) John W. Eaton <jwe@octave.org> parents: 25460 diff changeset	67 extern load_save_system& __get_load_save_system__ (const std::string& who);
f75bb9d659e0 eliminate global and file-scope static variables from load-save.cc (bug #54571) John W. Eaton <jwe@octave.org> parents: 25460 diff changeset	68
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	69 extern event_manager& __get_event_manager__ (const std::string& who);
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27213 diff changeset	70
25435 a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25407 diff changeset	71 extern output_system& __get_output_system__ (const std::string& who);
a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25407 diff changeset	72
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	73 extern 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	74
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	75 extern 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	76
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	77 extern 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	78
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	79 extern 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	80
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23517 diff changeset	81 extern tree_evaluator& __get_evaluator__ (const std::string& who);
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23532 diff changeset	82
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	83 extern 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	84
24734 5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24540 diff changeset	85 extern 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	86
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	87 extern cdef_manager& __get_cdef_manager__ (const std::string& who);
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	88
27266 596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	89 extern display_info& __get_display_info__ (const std::string& who);
596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	90
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	91 extern gtk_manager& __get_gtk_manager__ (const std::string& who);
26863 c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	92
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	93 // Functions that could be methods in the interpreter class but maybe
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	94 // shouldn't be exposed as part of the public interface.
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	95
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	96 // Convert octave_value object ARG to be a function handle object. It
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	97 // may be a function handle, inline function, the name of a function,
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	98 // or the text of an inline function that has the given argument names
26864 041caa61ed34 use get_function_handle instead of extract_function John W. Eaton <jwe@octave.org> parents: 26863 diff changeset	99 // PARAMETER_NAMES. Use of the latter form is discouraged.
26863 c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	100
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	101 octave_value
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 26864 diff changeset	102 get_function_handle (interpreter& interp, const octave_value& arg,
26863 c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	103 const std::string& parameter_name);
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	104
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	105 octave_value
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 26864 diff changeset	106 get_function_handle (interpreter& interp, const octave_value& arg,
26863 c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	107 const std::list<std::string>& parameter_names
c589db954a4e new functions for getting a functicon from an octave_value object John W. Eaton <jwe@octave.org> parents: 26774 diff changeset	108 = std::list<std::string> ());
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	109 }
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	110
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: diff changeset	111 #endif

Mercurial > octave

annotate libinterp/corefcn/interpreter-private.h @ 27302:5f170ea12fa1