Mercurial > octave-nkf
view libinterp/octave-value/ov-struct.h @ 18416:bcd71a2531d3
Support disp/display overloading in classdef
* ov-classdef.h (octave_classdef::print, octave_classdef::print_raw):
Move definition to C++ file.
(octave_classdef::print_as_scalar): Removed method.
(octave_classdef::print_name_tag, octave_classdef::print_with_name):
New methods.
* ov-classdef.cc (octave_classdef::print): Moved from header.
(octave_classdef::print_raw): Likewise. Call overloaded disp, if
defined and not called from builtin.
(octave_classdef::print_name_tag): New method.
(octave_classdef::print_with_name): New method, calls overloaded
"display" if defined.
* pr-output.cc (octave_print_internal(std::ostream, bool): Avoid
compilation warning.
(Frats, Fdisp, Ffdisp): Allow to call non-const octave_value::print.
* ov.h (octave_value::print): Make non-const.
* ov-base.h (octave_base_value::print): Likewise.
* ov-base.cc (octave_base_value::print): Likewise.
* ov-base-diag.h (octave_base_diag::print): Likewise.
* ov-base-diag.cc (octave_base_diag::print): Likewise.
* ov-base-mat.h (octave_base_matrix::print): Likewise.
* ov-base-mat.cc (octave_base_matrix::print): Likewise.
* ov-base-scalar.h (octave_base_scalar::print): Likewise.
* ov-base-scalar.cc (octave_base_scalar::print): Likewise.
* ov-base-sparse.h (octave_base_sparse::print): Likewise.
* ov-base-sparse.cc (octave_base_sparse::print): Likewise.
* ov-cell.h (octave_cell::print): Likewise.
* ov-cell.cc (octave_cell::print): Likewise.
* ov-class.h (octave_class::print): Likewise.
* ov-class.cc (octave_class::print): Likewise.
* ov-colon.h (octave_magic_colon::print): Likewise.
* ov-colon.cc (octave_magic_colon::print): Likewise.
* ov-fcn-handle.h (octave_fcn_handle::print): Likewise.
* ov-fcn-handle.cc (octave_fcn_handle::print): Likewise.
* ov-fcn-inline.h (octave_fcn_inline::print): Likewise.
* ov-fcn-inline.cc (octave_fcn_inline::print): Likewise.
* ov-java.h (octave_java::print): Likewise.
* ov-java.cc (octave_java::print): Likewise.
* ov-lazy-idx.h (octave_lazy_index::print): Likewise.
* ov-oncleanup.h (octave_oncleanup::print): Likewise.
* ov-oncleanup.cc (octave_oncleanup::print): Likewise.
* ov-perm.h (octave_perm_matrix::print): Likewise.
* ov-perm.cc (octave_perm_matrix::print): Likewise.
* ov-range.h (octave_range::print): Likewise.
* ov-range.cc (octave_range::print): Likewise.
* ov-struct.h (octave_struct::print, octave_scalar_struct): Likewise.
* ov-struct.cc (octave_struct::print, octave_scalar_struct): Likewise.
author | Michael Goffioul <michael.goffioul@gmail.com> |
---|---|
date | Fri, 31 Jan 2014 11:41:19 -0500 |
parents | ebb3ef964372 |
children | 76478d2da117 |
line wrap: on
line source
/* Copyright (C) 1996-2013 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_struct_h) #define octave_ov_struct_h 1 #include <cstdlib> #include <iosfwd> #include <string> #include "mx-base.h" #include "str-vec.h" #include "error.h" #include "oct-alloc.h" #include "oct-map.h" #include "ov-base.h" #include "ov-typeinfo.h" class octave_value_list; class tree_walker; // Data structures. class octave_struct : public octave_base_value { public: octave_struct (void) : octave_base_value (), map () { } octave_struct (const octave_map& m) : octave_base_value (), map (m) { } octave_struct (const octave_struct& s) : octave_base_value (), map (s.map) { } ~octave_struct (void) { } octave_base_value *clone (void) const { return new octave_struct (*this); } octave_base_value *empty_clone (void) const { return new octave_struct (); } octave_base_value *try_narrowing_conversion (void); Cell dotref (const octave_value_list& idx, bool auto_add = false); 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&, const std::list<octave_value_list>&, int); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx, bool auto_add); static octave_value numeric_conv (const octave_value& val, const std::string& type); octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); octave_value squeeze (void) const { return map.squeeze (); } octave_value permute (const Array<int>& vec, bool inv = false) const { return map.permute (vec, inv); } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); dim_vector dims (void) const { return map.dims (); } size_t byte_size (void) const; // This is the number of elements in each field. The total number // of elements is numel () * nfields (). octave_idx_type numel (void) const { return map.numel (); } octave_idx_type nfields (void) const { return map.nfields (); } octave_value reshape (const dim_vector& new_dims) const { return map.reshape (new_dims); } octave_value resize (const dim_vector& dv, bool fill = false) const { octave_map tmap = map; tmap.resize (dv, fill); return tmap; } bool is_defined (void) const { return true; } bool is_constant (void) const { return true; } bool is_map (void) const { return true; } builtin_type_t builtin_type (void) const { return btyp_struct; } octave_map map_value (void) const { return map; } string_vector map_keys (void) const { return map.fieldnames (); } void print (std::ostream& os, bool pr_as_read_syntax = false); void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; bool print_name_tag (std::ostream& os, const std::string& name) const; 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 mxArray *as_mxArray (void) const; octave_value fast_elem_extract (octave_idx_type n) const; bool fast_elem_insert (octave_idx_type n, const octave_value& x); protected: // The associative array used to manage the structure data. octave_map map; private: DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; class octave_scalar_struct : public octave_base_value { public: octave_scalar_struct (void) : octave_base_value (), map () { } octave_scalar_struct (const octave_scalar_map& m) : octave_base_value (), map (m) { } octave_scalar_struct (const octave_scalar_struct& s) : octave_base_value (), map (s.map) { } ~octave_scalar_struct (void) { } octave_base_value *clone (void) const { return new octave_scalar_struct (*this); } octave_base_value *empty_clone (void) const { return new octave_scalar_struct (); } octave_value dotref (const octave_value_list& idx, bool auto_add = false); 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); octave_value subsref (const std::string& type, const std::list<octave_value_list>& idx, bool auto_add); static octave_value numeric_conv (const octave_value& val, const std::string& type); octave_value subsasgn (const std::string& type, const std::list<octave_value_list>& idx, const octave_value& rhs); octave_value squeeze (void) const { return map; } octave_value permute (const Array<int>& vec, bool inv = false) const { return octave_map (map).permute (vec, inv); } octave_value do_index_op (const octave_value_list& idx, bool resize_ok = false); dim_vector dims (void) const { static dim_vector dv (1, 1); return dv; } size_t byte_size (void) const; // This is the number of elements in each field. The total number // of elements is numel () * nfields (). octave_idx_type numel (void) const { return 1; } octave_idx_type nfields (void) const { return map.nfields (); } octave_value reshape (const dim_vector& new_dims) const { return octave_map (map).reshape (new_dims); } octave_value resize (const dim_vector& dv, bool fill = false) const { octave_map tmap = map; tmap.resize (dv, fill); return tmap; } bool is_defined (void) const { return true; } bool is_constant (void) const { return true; } bool is_map (void) const { return true; } builtin_type_t builtin_type (void) const { return btyp_struct; } octave_map map_value (void) const { return map; } octave_scalar_map scalar_map_value (void) const { return map; } string_vector map_keys (void) const { return map.fieldnames (); } void print (std::ostream& os, bool pr_as_read_syntax = false); void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; bool print_name_tag (std::ostream& os, const std::string& name) const; 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 mxArray *as_mxArray (void) const; bool fast_elem_insert_self (void *where, builtin_type_t btyp) const; protected: // The associative array used to manage the structure data. octave_scalar_map map; private: octave_value to_array (void); DECLARE_OCTAVE_ALLOCATOR DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA }; #endif