Mercurial > octave-nkf
annotate libinterp/octave-value/ov-cell.h @ 17870:1d2e709bbbda
rework short_disp methods
* ov.h (octave_value::short_disp): Pass std::ostream as
argument instead of returning std::string. Change all uses.
* ov-base.h (octave_base_value::short_disp): Likewise. Change all
derived classes.
* ov-base-scalar.cc (octave_base_scalar<ST>::short_disp): Strip
leading whitepace from number.
* ov-base-mat.cc (octave_base_matrix<MT>::short_disp): Strip
leading whitepace from numbers.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 07 Nov 2013 00:52:48 -0500 |
parents | ea0ecbe2eaf5 |
children | bcd71a2531d3 |
rev | line source |
---|---|
3353 | 1 /* |
2 | |
17744
d63878346099
maint: Update copyright notices for release.
John W. Eaton <jwe@octave.org>
parents:
16091
diff
changeset
|
3 Copyright (C) 1999-2013 John W. Eaton |
11523 | 4 Copyright (C) 2009-2010 VZLU Prague |
3353 | 5 |
6 This file is part of Octave. | |
7 | |
8 Octave is free software; you can redistribute it and/or modify it | |
9 under the terms of the GNU General Public License as published by the | |
7016 | 10 Free Software Foundation; either version 3 of the License, or (at your |
11 option) any later version. | |
3353 | 12 |
13 Octave is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 You should have received a copy of the GNU General Public License | |
7016 | 19 along with Octave; see the file COPYING. If not, see |
20 <http://www.gnu.org/licenses/>. | |
3353 | 21 |
22 */ | |
23 | |
17822
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
24 #if !defined (octave_ov_cell_h) |
ebb3ef964372
maint: Use common #define syntax "octave_filename_h" in h_files.
Rik <rik@octave.org>
parents:
17787
diff
changeset
|
25 #define octave_ov_cell_h 1 |
3353 | 26 |
27 #include <cstdlib> | |
28 | |
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
29 #include <iosfwd> |
3353 | 30 #include <string> |
10065
64a06079cae4
improve cellstr cache implementation
Jaroslav Hajek <highegg@gmail.com>
parents:
9881
diff
changeset
|
31 #include <memory> |
3353 | 32 |
33 #include "mx-base.h" | |
34 #include "oct-alloc.h" | |
35 #include "str-vec.h" | |
36 | |
37 #include "Cell.h" | |
38 #include "error.h" | |
3928 | 39 #include "ov-base-mat.h" |
3353 | 40 #include "ov-typeinfo.h" |
41 | |
42 class octave_value_list; | |
43 | |
44 class tree_walker; | |
45 | |
46 // Cells. | |
47 | |
48 class | |
3928 | 49 octave_cell : public octave_base_matrix<Cell> |
3353 | 50 { |
51 public: | |
52 | |
53 octave_cell (void) | |
11584
cda4aa780d58
Another round of initialising members in the constructor initialisation list
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11523
diff
changeset
|
54 : octave_base_matrix<Cell> (), cellstr_cache () { } |
3353 | 55 |
56 octave_cell (const Cell& c) | |
11584
cda4aa780d58
Another round of initialising members in the constructor initialisation list
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11523
diff
changeset
|
57 : octave_base_matrix<Cell> (c), cellstr_cache () { } |
3353 | 58 |
8825
c3445f1c8cb4
reuse cellstr cache in strcmp
Jaroslav Hajek <highegg@gmail.com>
parents:
8823
diff
changeset
|
59 octave_cell (const Array<std::string>& str) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
60 : octave_base_matrix<Cell> (Cell (str)), |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
61 cellstr_cache (new Array<std::string> (str)) { } |
8825
c3445f1c8cb4
reuse cellstr cache in strcmp
Jaroslav Hajek <highegg@gmail.com>
parents:
8823
diff
changeset
|
62 |
3353 | 63 octave_cell (const octave_cell& c) |
11584
cda4aa780d58
Another round of initialising members in the constructor initialisation list
Pascal Dupuis <Pascal.Dupuis@uclouvain.be>
parents:
11523
diff
changeset
|
64 : octave_base_matrix<Cell> (c), cellstr_cache () { } |
3353 | 65 |
66 ~octave_cell (void) { } | |
67 | |
5759 | 68 octave_base_value *clone (void) const { return new octave_cell (*this); } |
69 octave_base_value *empty_clone (void) const { return new octave_cell (); } | |
3353 | 70 |
3928 | 71 #if 0 |
5759 | 72 octave_base_value *try_narrowing_conversion (void); |
3928 | 73 #endif |
74 | |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
75 octave_value subsref (const std::string& type, |
10313 | 76 const std::list<octave_value_list>& idx) |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
77 { |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
78 octave_value_list tmp = subsref (type, idx, 1); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
79 return tmp.length () > 0 ? tmp(0) : octave_value (); |
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
80 } |
7622
c195bd0a5c64
treat structs and cells as "constants"
John W. Eaton <jwe@octave.org>
parents:
7530
diff
changeset
|
81 |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
82 octave_value_list subsref (const std::string& type, |
16091
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
83 const std::list<octave_value_list>& idx, |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
84 int nargout) |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
85 { |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
86 return subsref (type, idx, nargout, 0); |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
87 } |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
88 |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
89 octave_value_list subsref (const std::string& type, |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
90 const std::list<octave_value_list>& idx, |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
91 int nargout, |
1785493171ac
pass lvalue_list to more subsref calls (bug #38374)
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
92 const std::list<octave_lvalue> *lvalue_list); |
4271 | 93 |
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
7651
diff
changeset
|
94 octave_value subsref (const std::string& type, |
10313 | 95 const std::list<octave_value_list>& idx, |
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
7651
diff
changeset
|
96 bool auto_add); |
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
7651
diff
changeset
|
97 |
4247 | 98 octave_value subsasgn (const std::string& type, |
10313 | 99 const std::list<octave_value_list>& idx, |
100 const octave_value& rhs); | |
3933 | 101 |
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
102 void assign (const octave_value_list& idx, const Cell& rhs); |
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
103 |
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
104 void assign (const octave_value_list& idx, const octave_value& rhs); |
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
105 |
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
106 void delete_elements (const octave_value_list& idx); |
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
107 |
4791 | 108 size_t byte_size (void) const; |
109 | |
8732 | 110 octave_value sort (octave_idx_type dim = 0, sortmode mode = ASCENDING) const; |
111 | |
112 octave_value sort (Array<octave_idx_type> &sidx, octave_idx_type dim = 0, | |
10313 | 113 sortmode mode = ASCENDING) const; |
8732 | 114 |
8823
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
115 sortmode is_sorted (sortmode mode = UNSORTED) const; |
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
116 |
8733
3ef774603887
rename all uses of sortrows_idx to sort_rows_idx
John W. Eaton <jwe@octave.org>
parents:
8732
diff
changeset
|
117 Array<octave_idx_type> sort_rows_idx (sortmode mode = ASCENDING) const; |
8732 | 118 |
8823
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
119 sortmode is_sorted_rows (sortmode mode = UNSORTED) const; |
3efa512a0957
make issorted work for cells
Jaroslav Hajek <highegg@gmail.com>
parents:
8815
diff
changeset
|
120 |
4645 | 121 bool is_matrix_type (void) const { return false; } |
122 | |
4370 | 123 bool is_numeric_type (void) const { return false; } |
124 | |
3928 | 125 bool is_defined (void) const { return true; } |
3353 | 126 |
7622
c195bd0a5c64
treat structs and cells as "constants"
John W. Eaton <jwe@octave.org>
parents:
7530
diff
changeset
|
127 bool is_constant (void) const { return true; } |
4994 | 128 |
3724 | 129 bool is_cell (void) const { return true; } |
130 | |
10087
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10065
diff
changeset
|
131 builtin_type_t builtin_type (void) const { return btyp_cell; } |
090173f2db40
improve overload dispatching of built-in classes
Jaroslav Hajek <highegg@gmail.com>
parents:
10065
diff
changeset
|
132 |
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
133 bool is_cellstr (void) const; |
6116 | 134 |
8626
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8551
diff
changeset
|
135 bool is_true (void) const; |
1dce30ab0e72
don't convert NaN to logical in bool expressions
John W. Eaton <jwe@octave.org>
parents:
8551
diff
changeset
|
136 |
3928 | 137 Cell cell_value (void) const { return matrix; } |
3353 | 138 |
3933 | 139 octave_value_list list_value (void) const; |
140 | |
5715 | 141 octave_value convert_to_str_internal (bool pad, bool, char type) const |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
142 { return octave_value (all_strings (pad), type); } |
4358 | 143 |
5715 | 144 string_vector all_strings (bool pad = false) const; |
4243 | 145 |
8732 | 146 Array<std::string> cellstr_value (void) const; |
147 | |
4604 | 148 bool print_as_scalar (void) const; |
149 | |
3933 | 150 void print (std::ostream& os, bool pr_as_read_syntax = false) const; |
151 | |
152 void print_raw (std::ostream& os, bool pr_as_read_syntax = false) const; | |
153 | |
17870 | 154 void short_disp (std::ostream& os) const; |
4687 | 155 |
6974 | 156 bool save_ascii (std::ostream& os); |
4687 | 157 |
158 bool load_ascii (std::istream& is); | |
159 | |
160 bool save_binary (std::ostream& os, bool& save_as_floats); | |
161 | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
162 bool load_binary (std::istream& is, bool swap, |
10313 | 163 oct_mach_info::float_format fmt); |
4687 | 164 |
165 #if defined (HAVE_HDF5) | |
166 bool save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats); | |
167 | |
9881
b3089dba88bf
Remove HDF5 cruft for older versions of HDF5
Kacper Kowalik
parents:
9813
diff
changeset
|
168 bool load_hdf5 (hid_t loc_id, const char *name); |
4687 | 169 #endif |
170 | |
9813
8fa32b527d9a
improve & partially revert previous change
Jaroslav Hajek <highegg@gmail.com>
parents:
9812
diff
changeset
|
171 octave_value map (unary_mapper_t umap) const; |
7530
bb0f2353cff5
new cell array ctype mappers
John W. Eaton <jwe@octave.org>
parents:
7017
diff
changeset
|
172 |
5900 | 173 mxArray *as_mxArray (void) const; |
174 | |
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
175 // Unsafe. This function exists to support the MEX interface. |
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
176 // You should not use it anywhere else. |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11584
diff
changeset
|
177 void *mex_get_data (void) const; |
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
178 |
3353 | 179 private: |
4612 | 180 |
10065
64a06079cae4
improve cellstr cache implementation
Jaroslav Hajek <highegg@gmail.com>
parents:
9881
diff
changeset
|
181 void clear_cellstr_cache (void) const |
17787
175b392e91fe
Use GNU style coding conventions for code in libinterp/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
182 { cellstr_cache.reset (); } |
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
183 |
10065
64a06079cae4
improve cellstr cache implementation
Jaroslav Hajek <highegg@gmail.com>
parents:
9881
diff
changeset
|
184 mutable std::auto_ptr<Array<std::string> > cellstr_cache; |
8815
af907aeedbf4
cache cellstr_value in ov-cell
Jaroslav Hajek <highegg@gmail.com>
parents:
8733
diff
changeset
|
185 |
3353 | 186 DECLARE_OCTAVE_ALLOCATOR |
187 | |
188 DECLARE_OV_TYPEID_FUNCTIONS_AND_DATA | |
189 }; | |
190 | |
191 #endif |