Mercurial > hg > octave-lyh
view libinterp/octave-value/ov-fcn-handle.h @ 16468:0f143f68078d
use signal/slot for updating workspace instead of using event listener
* main-window.h, main-window.cc: Clean up list of include files.
(main_window::prepare_to_exit): Rename from prepare_to_quit. Change
all uses.
(main_window::update_workspace): Delete.
(main_window::construct): Don't connect
_octave_qt_event_listener:update_workspace_signal to
main_window::update_workspace.
(main_window::construct_octave_qt_link):
Connect _octave_qt_link::set_workspace_signal to
_workspace_model::set_workspace.
Connect _octave_qt_link::clear_workspace_signal to
_workspace_model::clear_workspace.
* symbol-information.h, symbol-information.cc: Delete
* libgui/src/module.mk (noinst_HEADERS, src_libgui_src_la_SOURCES):
Remove them from the lists.
* octave-qt-link.h, octave-qt-link.cc: Don't use symbol_information to
store workspace info.
(octave_qt_link::do_update_workspace): Delete.
(octave_qt_link::do_set_workspace,
octave_qt_link::do_clear_workspace): New functions.
(octave_qt_link::do_pre_input_event): Don't call do_update_workspace.
(octave_qt_link::set_workspace_signal,
octave_qt_link::clear_workspace_signal): New signals.
* workspace-model.h, workspace-model.cc: Don't use symbol_information
to store workspace info. Accept workspace info through a signal/slot
combination, not by asking the symbol table.
(workspace_model::request_update_workspace,
(workspace_model::update_workspace_callback): Delete.
(workspace_model::set_workspace, workspace_model::clear_workspace,
workspace_model::clear_data, workspace_model::clear_tree,
workspace_model::update_tree, workspace_model::append_tree):
New functions.
* workspace-view.h, workspace-view.cc (workspace_view::model_changed):
Don't call update_workspace_callback. The model now signals the view
when it has changed.
* input.cc (octave_base_reader::octave_gets, get_debug_input):
Call octave_link::set_workspace just prior to prompting for input.
* workspace-element.h: New file.
* libinterp/interpfcn/module.mk (INTERPFCN_INC): Include it in the list.
* octave-link.cc: Don't include symtab.h.
* octave-link.h (octave_link::update_workspace): Delete.
(octave_link::set_workspace, octave_link::do_set_workspace,
* octave_link::clear_workspace, octave_link::do_clear_workspace):
New functions.
* symtab.h, symtab.cc (symbol_table::workspace_info,
symbol_table::do_workspace_info): New functions.
* ov.h (octave_value::short_disp): New function.
* ov-base.h, ov-base.cc (octave_base_value::short_disp): New function.
* ov-base-scalar.h, ov-base-scalar.cc
(octave_base_scalar<ST>::short_disp): New function.
* ov-range.h, ov-range.cc (octave_range::short_disp): New function.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 08 Apr 2013 12:01:24 -0400 |
parents | 2fc554ffbc28 |
children |
line wrap: on
line source
/* Copyright (C) 2003-2012 John W. Eaton Copyright (C) 2009 VZLU Prague 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 <http://www.gnu.org/licenses/>. */ #if !defined (octave_fcn_handle_h) #define octave_fcn_handle_h 1 #include <iosfwd> #include <string> #include <memory> #include "oct-alloc.h" #include "ov-base.h" #include "ov-base-mat.h" #include "ov-fcn.h" #include "ov-typeinfo.h" // Function handles. class OCTINTERP_API octave_fcn_handle : public octave_base_value { private: typedef std::map<std::string, octave_value> str_ov_map; public: static const std::string anonymous; octave_fcn_handle (void) : fcn (), nm (), has_overloads (false), overloads () { } octave_fcn_handle (const std::string& n) : fcn (), nm (n), has_overloads (false), overloads () { } octave_fcn_handle (const octave_value& f, const std::string& n = anonymous); octave_fcn_handle (const octave_fcn_handle& fh) : octave_base_value (fh), fcn (fh.fcn), nm (fh.nm), has_overloads (fh.has_overloads), overloads () { for (int i = 0; i < btyp_num_types; i++) builtin_overloads[i] = fh.builtin_overloads[i]; overloads = fh.overloads; } ~octave_fcn_handle (void) { } octave_base_value *clone (void) const { return new octave_fcn_handle (*this); } octave_base_value *empty_clone (void) const { return new octave_fcn_handle (); } octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx) { octave_value_list tmp = subsref (type, idx, 1); return tmp.length () > 0 ? tmp(0) : octave_value (); } octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout); octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int nargout, const std::list<octave_lvalue>* lvalue_list); octave_value_list do_multi_index_op (int nargout, const octave_value_list& args); octave_value_list do_multi_index_op (int nargout, const octave_value_list& args, const std::list<octave_lvalue>* lvalue_list); bool is_defined (void) const { return true; } bool is_function_handle (void) const { return true; } builtin_type_t builtin_type (void) const { return btyp_func_handle; } bool is_overloaded (void) const { return has_overloads; } dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; } octave_function *function_value (bool = false) { return fcn.function_value (); } octave_user_function *user_function_value (bool = false) { return fcn.user_function_value (); } octave_fcn_handle *fcn_handle_value (bool = false) { return this; } octave_value fcn_val (void) const { return fcn; } std::string fcn_name (void) const { return nm; } void set_overload (builtin_type_t btyp, const octave_value& ov_fcn) { if (btyp != btyp_unknown) { has_overloads = true; builtin_overloads[btyp] = ov_fcn; } } void set_overload (const std::string& dispatch_type, const octave_value& ov_fcn) { has_overloads = true; overloads[dispatch_type] = ov_fcn; } bool is_equal_to (const octave_fcn_handle&) const; bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); bool save_binary (std::ostream& os, bool& save_as_floats); bool load_binary (std::istream& is, bool swap, oct_mach_info::float_format fmt); #if defined (HAVE_HDF5) bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); bool load_hdf5 (hid_t loc_id, const char *name); #endif void print (std::ostream& os, bool pr_as_read_syntax = false) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; // Simple function handles are printed without a newline. bool print_as_scalar (void) const { return nm != anonymous; } private: bool set_fcn (const std::string &octaveroot, const std::string& fpath); DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA protected: // The function we are handling. octave_value fcn; // The name of the handle, including the "@". std::string nm; // Whether the function is overloaded at all. bool has_overloads; // Overloads for builtin types. We use array to make lookup faster. octave_value builtin_overloads[btyp_num_types]; // Overloads for other classes. str_ov_map overloads; friend octave_value make_fcn_handle (const std::string &, bool); }; extern octave_value make_fcn_handle (const std::string& nm, bool local_funcs = true); class OCTINTERP_API octave_fcn_binder : public octave_fcn_handle { private: // Private ctor. octave_fcn_binder (const octave_value& f, const octave_value& root, const octave_value_list& templ, const std::vector<int>& mask, int exp_nargin); public: // Factory method. static octave_fcn_handle *maybe_binder (const octave_value& f); octave_value_list do_multi_index_op (int nargout, const octave_value_list& args); octave_value_list do_multi_index_op (int nargout, const octave_value_list& args, const std::list<octave_lvalue>* lvalue_list); protected: octave_value root_handle; octave_value_list arg_template; std::vector<int> arg_mask; int expected_nargin; }; #endif