Mercurial > hg > octave-lojdl
view libinterp/octave-value/ov-base-diag.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 | 4db96357fec9 |
children |
line wrap: on
line source
/* Copyright (C) 2008-2012 Jaroslav Hajek 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_base_diag_h) #define octave_base_diag_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "str-vec.h" #include "oct-obj.h" #include "ov-base.h" #include "ov-typeinfo.h" class tree_walker; // Real matrix values. template <class DMT, class MT> class octave_base_diag : public octave_base_value { public: octave_base_diag (void) : octave_base_value (), matrix (), dense_cache () { } octave_base_diag (const DMT& m) : octave_base_value (), matrix (m), dense_cache () { } octave_base_diag (const octave_base_diag& m) : octave_base_value (), matrix (m.matrix), dense_cache () { } ~octave_base_diag (void) { } size_t byte_size (void) const { return matrix.byte_size (); } octave_value squeeze (void) const { return matrix; } octave_value full_value (void) const { return to_dense (); } octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx); octave_value_list subsref (const std::string& type, const std::list<octave_value_list>& idx, int) { return subsref (type, idx); } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); dim_vector dims (void) const { return matrix.dims (); } octave_idx_type nnz (void) const { return to_dense ().nnz (); } octave_value reshape (const dim_vector& new_dims) const { return to_dense ().reshape (new_dims); } octave_value permute (const Array<int>& vec, bool inv = false) const { return to_dense ().permute (vec, inv); } octave_value resize (const dim_vector& dv, bool fill = false) const; octave_value all (int dim = 0) const { return MT (matrix).all (dim); } octave_value any (int dim = 0) const { return MT (matrix).any (dim); } MatrixType matrix_type (void) const { return MatrixType::Diagonal; } MatrixType matrix_type (const MatrixType&) const { return matrix_type (); } octave_value diag (octave_idx_type k = 0) const; octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const { return to_dense ().sort (dim, mode); } octave_value sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0, sortmode mode = ASCENDING) const { return to_dense ().sort (sidx, dim, mode); } sortmode is_sorted (sortmode mode = UNSORTED) const { return to_dense ().is_sorted (mode); } Array<octave_idx_type> sort_rows_idx (sortmode mode = ASCENDING) const { return to_dense ().sort_rows_idx (mode); } sortmode is_sorted_rows (sortmode mode = UNSORTED) const { return to_dense ().is_sorted_rows (mode); } bool is_matrix_type (void) const { return true; } bool is_numeric_type (void) const { return true; } bool is_defined (void) const { return true; } bool is_constant (void) const { return true; } bool is_true (void) const; bool is_diag_matrix (void) const { return true; } double double_value (bool = false) const; float float_value (bool = false) const; double scalar_value (bool frc_str_conv = false) const { return double_value (frc_str_conv); } idx_vector index_vector (void) const; Matrix matrix_value (bool = false) const; FloatMatrix float_matrix_value (bool = false) const; Complex complex_value (bool = false) const; FloatComplex float_complex_value (bool = false) const; ComplexMatrix complex_matrix_value (bool = false) const; FloatComplexMatrix float_complex_matrix_value (bool = false) const; ComplexNDArray complex_array_value (bool = false) const; FloatComplexNDArray float_complex_array_value (bool = false) const; boolNDArray bool_array_value (bool warn = false) const; charNDArray char_array_value (bool = false) const; NDArray array_value (bool = false) const; FloatNDArray float_array_value (bool = false) const; SparseMatrix sparse_matrix_value (bool = false) const; SparseComplexMatrix sparse_complex_matrix_value (bool = false) const; int8NDArray int8_array_value (void) const { return to_dense ().int8_array_value (); } int16NDArray int16_array_value (void) const { return to_dense ().int16_array_value (); } int32NDArray int32_array_value (void) const { return to_dense ().int32_array_value (); } int64NDArray int64_array_value (void) const { return to_dense ().int64_array_value (); } uint8NDArray uint8_array_value (void) const { return to_dense ().uint8_array_value (); } uint16NDArray uint16_array_value (void) const { return to_dense ().uint16_array_value (); } uint32NDArray uint32_array_value (void) const { return to_dense ().uint32_array_value (); } uint64NDArray uint64_array_value (void) const { return to_dense ().uint64_array_value (); } octave_value convert_to_str_internal (bool pad, bool force, char type) const; void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; bool save_ascii (std::ostream& os); bool load_ascii (std::istream& is); int write (octave_stream& os, int block_size, oct_data_conv::data_type output_type, int skip, oct_mach_info::float_format flt_fmt) const; mxArray *as_mxArray (void) const; bool print_as_scalar (void) const; void print (std::ostream& os, bool pr_as_read_syntax = false) const; void print_info (std::ostream& os, const std::string& prefix) const; protected: DMT matrix; octave_value to_dense (void) const; virtual bool chk_valid_scalar (const octave_value&, typename DMT::element_type&) const = 0; private: mutable octave_value dense_cache; }; #endif