Mercurial > hg > octave-lojdl
view libinterp/octave-value/ov-mex-fcn.h @ 16442:302157614308
deprecate symbol_table::varref functions
* ov-usr-fcn.h (octave_user_function::argn_varref,
octave_user_function::nargin_varref,
octave_user_function::nargout_varref,
octave_user_function::varargin_varref): Delete unused variables.
* symtab.h (symbol_table::symbol_record::symbol_record_ref::assign,
symbol_table::symbol_record::symbol_record_ref::do_non_const_unary_op,
symbol_table::symbol_record::do_non_const_unary_op,
(symbol_table::symbol_record::is_undefined,
symbol_table::symbol_record::assign, symbol_table::assign,
symbol_table::force_assign, symbol_table::global_assign,
symbol_table::persistent_assign, symbol_table::top_level_assign,
symbol_table::do_assign, symbol_table::do_persistent_assign):
New functions.
(symbol_table::symbol_record::symbol_record_ref::varref):
Avoid calls to deprecated functions.
(symbol_table::varref, symbol_table::force_varref,
symbol_table::global_varref, symbol_table::persistent_varref,
symbol_table::top_level_varref, symbol_table::do_varref,
symbol_table::do_persistent_varref): Deprecate.
(symbol_table::symbol_reference::is_black_hole): New function.
* oct-lvalue.h, oct-lvalue.cc: Store symbol_reference instead of
pointer to octave_value object.
(octave_lvalue::value): Now const.
(octave_lvalue::object): Delete.
* pt-id.cc (tree_identifier::lvalue): Construct octave_lvalue from
sym, not sym->varref.
* ls-mat5.cc, oct-lvalue.cc, oct-lvalue.h, pt-jit.cc, error.cc,
load-save.cc, symtab.cc, symtab.h, variables.cc, ov-fcn-handle.cc,
ov-usr-fcn.cc, ov-usr-fcn.h, oct-parse.in.yy, pt-eval.cc, pt-id.h,
pt-idx.cc, mex.cc: Change all uses of varref functions to use assign
instead. Use varval instead of varref where appropriate.
* load-save.cc (install_loaded_variable): Don't manipulate
symbol_record directly.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 06 Apr 2013 11:51:23 -0400 |
parents | 2fc554ffbc28 |
children |
line wrap: on
line source
/* Copyright (C) 1996-2012 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_mex_function_h) #define octave_mex_function_h 1 #include <string> #include "oct-shlib.h" #include "ov-fcn.h" #include "ov-builtin.h" #include "ov-typeinfo.h" class octave_shlib; class octave_value; class octave_value_list; // Dynamically-linked functions. class octave_mex_function : public octave_function { public: octave_mex_function (void) : mex_fcn_ptr (), exit_fcn_ptr (), have_fmex (), sh_lib (), t_checked (), system_fcn_file () { } octave_mex_function (void *fptr, bool fmex, const octave_shlib& shl, const std::string& nm = std::string ()); ~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_time& t) { t_checked = t; } std::string fcn_file_name (void) const; octave_time time_parsed (void) const; octave_time time_checked (void) const { return t_checked; } bool is_system_fcn_file (void) const { return system_fcn_file; } bool is_builtin_function (void) const { return false; } bool is_mex_function (void) const { return true; } octave_value_list do_multi_index_op (int nargout, const octave_value_list& args); void atexit (void (*fcn) (void)) { exit_fcn_ptr = fcn; } octave_shlib get_shlib (void) const { return sh_lib; } private: void *mex_fcn_ptr; void (*exit_fcn_ptr) (void); bool have_fmex; octave_shlib sh_lib; // The time the file was last checked to see if it needs to be // parsed again. mutable octave_time t_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 system_fcn_file; // No copying! octave_mex_function (const octave_mex_function& fn); octave_mex_function& operator = (const octave_mex_function& fn); DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif