Mercurial > hg > octave-nkf

comparison libinterp/octave-value/ov-struct.h @ 18484:bcd71a2531d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
18482:68fc31c69fcb 18484:bcd71a2531d3
124 124
125 octave_map map_value (void) const { return map; } 125 octave_map map_value (void) const { return map; }
126 126
127 string_vector map_keys (void) const { return map.fieldnames (); } 127 string_vector map_keys (void) const { return map.fieldnames (); }
128 128
129 void print (std::ostream& os, bool pr_as_read_syntax = false) const; 129 void print (std::ostream& os, bool pr_as_read_syntax = false);
130 130
131 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; 131 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
132 132
133 bool print_name_tag (std::ostream& os, const std::string& name) const; 133 bool print_name_tag (std::ostream& os, const std::string& name) const;
134 134
247 247
248 octave_scalar_map scalar_map_value (void) const { return map; } 248 octave_scalar_map scalar_map_value (void) const { return map; }
249 249
250 string_vector map_keys (void) const { return map.fieldnames (); } 250 string_vector map_keys (void) const { return map.fieldnames (); }
251 251
252 void print (std::ostream& os, bool pr_as_read_syntax = false) const; 252 void print (std::ostream& os, bool pr_as_read_syntax = false);
253 253
254 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; 254 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const;
255 255
256 bool print_name_tag (std::ostream& os, const std::string& name) const; 256 bool print_name_tag (std::ostream& os, const std::string& name) const;
257 257