Mercurial > hg > octave-lojdl
view libinterp/octave-value/ov-cx-mat.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 Copyright (C) 2009-2010 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_complex_matrix_h) #define octave_complex_matrix_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "oct-alloc.h" #include "str-vec.h" #include "error.h" #include "oct-stream.h" #include "ov-base.h" #include "ov-base-mat.h" #include "ov-typeinfo.h" #include "MatrixType.h" class octave_value_list; class tree_walker; // Complex matrix values. class OCTINTERP_API octave_complex_matrix : public octave_base_matrix<ComplexNDArray> { public: octave_complex_matrix (void) : octave_base_matrix<ComplexNDArray> () { } octave_complex_matrix (const ComplexNDArray& m) : octave_base_matrix<ComplexNDArray> (m) { } octave_complex_matrix (const ComplexMatrix& m) : octave_base_matrix<ComplexNDArray> (m) { } octave_complex_matrix (const ComplexMatrix& m, const MatrixType& t) : octave_base_matrix<ComplexNDArray> (m, t) { } octave_complex_matrix (const Array<Complex>& m) : octave_base_matrix<ComplexNDArray> (ComplexNDArray (m)) { } octave_complex_matrix (const ComplexDiagMatrix& d) : octave_base_matrix<ComplexNDArray> (ComplexMatrix (d)) { } octave_complex_matrix (const ComplexRowVector& v) : octave_base_matrix<ComplexNDArray> (ComplexMatrix (v)) { } octave_complex_matrix (const ComplexColumnVector& v) : octave_base_matrix<ComplexNDArray> (ComplexMatrix (v)) { } octave_complex_matrix (const octave_complex_matrix& cm) : octave_base_matrix<ComplexNDArray> (cm) { } ~octave_complex_matrix (void) { } octave_base_value *clone (void) const { return new octave_complex_matrix (*this); } octave_base_value *empty_clone (void) const { return new octave_complex_matrix (); } type_conv_info numeric_demotion_function (void) const; octave_base_value *try_narrowing_conversion (void); builtin_type_t builtin_type (void) const { return btyp_complex; } bool is_complex_matrix (void) const { return true; } bool is_complex_type (void) const { return true; } bool is_double_type (void) const { return true; } bool is_float_type (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); } float float_scalar_value (bool frc_str_conv = false) const { return float_value (frc_str_conv); } 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 { return matrix; } FloatComplexNDArray float_complex_array_value (bool = false) const; boolNDArray bool_array_value (bool warn = false) const; charNDArray char_array_value (bool frc_str_conv = false) const; SparseMatrix sparse_matrix_value (bool = false) const; SparseComplexMatrix sparse_complex_matrix_value (bool = false) const; octave_value diag (octave_idx_type k = 0) const; octave_value diag (octave_idx_type m, octave_idx_type n) const; void increment (void) { matrix += Complex (1.0); } void decrement (void) { matrix -= Complex (1.0); } void changesign (void) { matrix.changesign (); } 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 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 { // Yes, for compatibility, we drop the imaginary part here. return os.write (matrix_value (true), block_size, output_type, skip, flt_fmt); } void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; mxArray *as_mxArray (void) const; octave_value map (unary_mapper_t umap) const; private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif