Mercurial > hg > octave-lojdl
view libinterp/octave-value/ov-type-conv.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) 2004-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_ov_type_conv_h) #define octave_ov_type_conv_h 1 static octave_value octave_type_conv_body (const octave_value &arg, const std::string& name, int t_result) { int t_arg = arg.type_id (); octave_value retval; if (t_arg == t_result || arg.class_name () == name) { retval = arg; } else { octave_base_value::type_conv_fcn cf1 = octave_value_typeinfo::lookup_type_conv_op (t_arg, t_result); if (cf1) { octave_base_value *tmp (cf1 (*(arg.internal_rep ()))); if (tmp) { retval = octave_value (tmp); retval.maybe_mutate (); } } else { octave_base_value::type_conv_fcn cf2 = arg.numeric_conversion_function (); if (cf2) { octave_base_value *tmp (cf2 (*(arg.internal_rep ()))); if (tmp) { octave_value xarg (tmp); retval = octave_type_conv_body (xarg, name, t_result); } } } } return retval; } #define OCTAVE_TYPE_CONV_BODY3(NAME, MATRIX_RESULT_T, SCALAR_RESULT_T) \ \ octave_value retval; \ \ int nargin = args.length (); \ \ if (nargin == 1) \ { \ const octave_value arg = args(0); \ \ int t_result = MATRIX_RESULT_T::static_type_id (); \ \ retval = octave_type_conv_body (arg, #NAME, t_result); \ if (retval.is_undefined ()) \ { \ std::string arg_tname = arg.type_name (); \ \ std::string result_tname = arg.numel () == 1 \ ? SCALAR_RESULT_T::static_type_name () \ : MATRIX_RESULT_T::static_type_name (); \ \ gripe_invalid_conversion (arg_tname, result_tname); \ } \ } \ else \ print_usage (); \ \ return retval #define OCTAVE_TYPE_CONV_BODY(NAME) \ OCTAVE_TYPE_CONV_BODY3 (NAME, octave_ ## NAME ## _matrix, \ octave_ ## NAME ## _scalar) #endif