Mercurial > octave
view libinterp/octave-value/ov-mex-fcn.h @ 23502:c6714ae1c06c
eliminate remaining do_multi_index_op methods
For function (and function-like) objects, define a call meethod
instead of do_multi_index_op. For data value objects, remove
do_multi_index_op as it is no longer used for indexing operations.
* ov-fcn.h (octave_function::call): New pure virtual function.
* ov-builtin.cc, ov-builtin.h (octave_builtin::call):
Rename from do_multi_index_op. Change all uses.
* ov-mex-fcn.cc, ov-mex-fcn.h (octave_mex_function::call):
Rename from do_multi_index_op. Change all uses.
* ov-usr-fcn.cc, ov-usr-fcn.h (octave_user_script::call):
Rename from do_multi_index_op. Change all uses.
(octave_user_fcn::call): Likewise.
* ov-classdef.cc (octave_classdef_meta::call):
Rename from do_multi_index_op. Change all uses.
(octave_classdef_superclass_ref::call): Likewise.
* ov-fcn-handle.cc, ov-fcn-handle.h (octave_fcn_handle::call):
Rename from do_multi_index_op. Now a protected virtual function.
(octave_fcn_binder::call): Rename from do_multi_index_op. Now a
protected function.
* ov-class.h (octave_class::do_multi_index_op): Delete.
* ov-base-mat.h (octave_base_matrix::do_multi_index_op): Delete.
* ov-base-scalar.h (octave_base_scalar::do_multi_index_op): Delete.
* ov-base.cc, ov-base.h (octave_base_value::do_multi_index_op):
Delete.
* ov.cc, ov.h (octave_value::do_multi_index_op): Delete.
* oct-parse.in.yy (source_file): Use call instead of
do_multi_index_op.
(feval (const std::string&, const octave_value_list&, int)): Likewise.
(feval (octave_function *, const octave_value_list&, int)): Likewise.
(feval (octave_value&, const octave_value_list&, int)): Instead of
do_multi_index_op, use call for function objects and subsref for
function_handle objects. Also handle named functions.
(feval (const octave_value_list&, int)): Simply extract first argument
and forward to feval (octave_value&, const octave_value_list&, int).
* pt-eval.cc (tree_evaluator::visit_identifier,
tree_evaluator::visit_index_expression,
tree_evaluator::visit_funcall): Use call instead of do_multi_index_op.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 17 May 2017 14:34:05 -0400 |
parents | 7d89f815d78e |
children | 9f925aed7d1b |
line wrap: on
line source
/* Copyright (C) 1996-2017 John W. Eaton 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_ov_mex_fcn_h) #define octave_ov_mex_fcn_h 1 #include "octave-config.h" #include <string> #include "oct-shlib.h" #include "ov-fcn.h" #include "ov-builtin.h" #include "ov-typeinfo.h" class octave_value; class octave_value_list; // Dynamically-linked functions. class octave_mex_function : public octave_function { public: octave_mex_function (void) : m_mex_fcn_ptr (), m_exit_fcn_ptr (), m_is_fmex (), m_sh_lib (), m_time_checked (), m_is_system_fcn_file () { } octave_mex_function (void *fptr, bool fmex, const octave::dynamic_library& shl, const std::string& nm = ""); // No copying! octave_mex_function (const octave_mex_function& fn) = delete; octave_mex_function& operator = (const octave_mex_function& fn) = delete; ~octave_mex_function (void); 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_function * function_value (bool = false) { return this; } const octave_function * function_value (bool = false) const { return this; } void mark_fcn_file_up_to_date (const octave::sys::time& t) { m_time_checked = t; } std::string fcn_file_name (void) const; octave::sys::time time_parsed (void) const; octave::sys::time time_checked (void) const { return m_time_checked; } bool is_system_fcn_file (void) const { return m_is_system_fcn_file; } bool is_builtin_function (void) const { return false; } bool is_mex_function (void) const { return true; } octave_value_list call (int nargout, const octave_value_list& args); void atexit (void (*fcn) (void)) { m_exit_fcn_ptr = fcn; } octave::dynamic_library get_shlib (void) const { return m_sh_lib; } void *mex_fcn_ptr (void) const { return m_mex_fcn_ptr; } bool is_fmex (void) const { return m_is_fmex; } private: void *m_mex_fcn_ptr; void (*m_exit_fcn_ptr) (void); bool m_is_fmex; octave::dynamic_library m_sh_lib; // The time the file was last checked to see if it needs to be // parsed again. mutable octave::sys::time m_time_checked; // True if this function came from a file that is considered to be a // system function. This affects whether we check the time stamp // on the file to see if it has changed. bool m_is_system_fcn_file; DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif