Mercurial > hg > octave-lyh
annotate src/oct-obj.h @ 11581:6006ca07410d
another data member initialization fix
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 20 Jan 2011 05:39:43 -0500 |
parents | a83bad07f7e3 |
children | 12df7854fa7c |
rev | line source |
---|---|
498 | 1 /* |
2 | |
11523 | 3 Copyright (C) 1994-2011 John W. Eaton |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
4 Copyright (C) 2009 VZLU Prague |
498 | 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. | |
498 | 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/>. | |
498 | 21 |
22 */ | |
23 | |
504 | 24 #if !defined (octave_oct_obj_h) |
25 #define octave_oct_obj_h 1 | |
26 | |
1968 | 27 #include <string> |
4591 | 28 #include <vector> |
1968 | 29 |
2970 | 30 #include "oct-alloc.h" |
2943 | 31 #include "str-vec.h" |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
32 #include "Array.h" |
498 | 33 |
2369 | 34 #include "ov.h" |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
35 #include "Cell.h" |
498 | 36 |
737 | 37 class |
6109 | 38 OCTINTERP_API |
2872 | 39 octave_value_list |
508 | 40 { |
41 public: | |
42 | |
2086 | 43 octave_value_list (void) |
11581
6006ca07410d
another data member initialization fix
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
44 : data (), names () { } |
1968 | 45 |
9545
8670e55078fd
allow constructing octave_value_list from size
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
46 explicit octave_value_list (octave_idx_type n) |
11581
6006ca07410d
another data member initialization fix
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
47 : data (dim_vector (1, n)), names () { } |
9545
8670e55078fd
allow constructing octave_value_list from size
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
48 |
5275 | 49 octave_value_list (octave_idx_type n, const octave_value& val) |
11581
6006ca07410d
another data member initialization fix
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
50 : data (dim_vector (1, n), val), names () { } |
511 | 51 |
2086 | 52 octave_value_list (const octave_value& tc) |
11581
6006ca07410d
another data member initialization fix
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
53 : data (dim_vector (1, 1), tc), names () { } |
1968 | 54 |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
55 octave_value_list (const Array<octave_value>& d) |
11581
6006ca07410d
another data member initialization fix
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
56 : data (d.as_row ()), names () { } |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
57 |
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
58 octave_value_list (const Cell& tc) |
11581
6006ca07410d
another data member initialization fix
John W. Eaton <jwe@octave.org>
parents:
11574
diff
changeset
|
59 : data (tc.as_row ()), names () { } |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
60 |
2086 | 61 octave_value_list (const octave_value_list& obj) |
4150 | 62 : data (obj.data), names (obj.names) { } |
508 | 63 |
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
64 // Concatenation constructor. |
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
65 octave_value_list (const std::list<octave_value_list>&); |
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
66 |
4189 | 67 ~octave_value_list (void) { } |
68 | |
2970 | 69 void *operator new (size_t size) |
70 { return allocator.alloc (size); } | |
71 | |
4280 | 72 void operator delete (void *p, size_t size) |
73 { allocator.free (p, size); } | |
74 | |
5775 | 75 // FIXME -- without this, I have errors with the stack of |
4214 | 76 // octave_value_list objects in ov-usr-fcn.h. Why? |
77 void *operator new (size_t size, void *p) | |
78 { return ::operator new (size, p); } | |
79 | |
4280 | 80 void operator delete (void *p, void *) |
4352 | 81 { |
82 #if defined (HAVE_PLACEMENT_DELETE) | |
83 ::operator delete (p, static_cast<void *> (0)); | |
84 #else | |
85 ::operator delete (p); | |
86 #endif | |
87 } | |
2970 | 88 |
2086 | 89 octave_value_list& operator = (const octave_value_list& obj) |
508 | 90 { |
1968 | 91 if (this != &obj) |
10313 | 92 { |
93 data = obj.data; | |
94 names = obj.names; | |
95 } | |
1968 | 96 |
508 | 97 return *this; |
98 } | |
99 | |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
100 Array<octave_value> array_value (void) const { return data; } |
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
101 |
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
102 Cell cell_value (void) const { return array_value (); } |
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
103 |
2872 | 104 // Assignment will resize on range errors. |
508 | 105 |
5275 | 106 octave_value& operator () (octave_idx_type n) { return elem (n); } |
1968 | 107 |
10075
84b0725f4b09
return class types by reference in const Array element access functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9545
diff
changeset
|
108 const octave_value& operator () (octave_idx_type n) const { return elem (n); } |
526 | 109 |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
110 octave_idx_type length (void) const { return data.length (); } |
2872 | 111 |
2951 | 112 bool empty (void) const { return length () == 0; } |
113 | |
10350
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
114 void resize (octave_idx_type n, const octave_value& rfv |
12884915a8e4
merge MArray classes & improve Array interface
Jaroslav Hajek <highegg@gmail.com>
parents:
10313
diff
changeset
|
115 = Array<octave_value>::resize_fill_value ()) |
11574
a83bad07f7e3
attempt better backward compatibility for Array resize functions
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
116 { |
a83bad07f7e3
attempt better backward compatibility for Array resize functions
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
117 data.resize (dim_vector (1, n), rfv); |
a83bad07f7e3
attempt better backward compatibility for Array resize functions
John W. Eaton <jwe@octave.org>
parents:
11570
diff
changeset
|
118 } |
2872 | 119 |
120 octave_value_list& prepend (const octave_value& val); | |
121 | |
122 octave_value_list& append (const octave_value& val); | |
123 | |
124 octave_value_list& append (const octave_value_list& lst); | |
125 | |
126 octave_value_list& reverse (void); | |
127 | |
6335 | 128 octave_value_list |
10659
8baff2aceabc
fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents:
10350
diff
changeset
|
129 slice (octave_idx_type offset, octave_idx_type len, bool tags = false) const |
8baff2aceabc
fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents:
10350
diff
changeset
|
130 { |
8baff2aceabc
fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents:
10350
diff
changeset
|
131 octave_value_list retval (data.linear_slice (offset, offset + len)); |
8baff2aceabc
fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents:
10350
diff
changeset
|
132 if (tags && len > 0 && names.length () > 0) |
8baff2aceabc
fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents:
10350
diff
changeset
|
133 retval.names = names.linear_slice (offset, std::min (len, names.length ())); |
8baff2aceabc
fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents:
10350
diff
changeset
|
134 |
8baff2aceabc
fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents:
10350
diff
changeset
|
135 return retval; |
8baff2aceabc
fix slicing value lists with name tags (bug #29960)
Jaroslav Hajek <highegg@gmail.com>
parents:
10350
diff
changeset
|
136 } |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
137 |
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
138 octave_value_list |
6335 | 139 splice (octave_idx_type offset, octave_idx_type len, |
10313 | 140 const octave_value_list& lst = octave_value_list ()) const; |
3195 | 141 |
2872 | 142 bool all_strings_p (void) const; |
1968 | 143 |
8455
fd11a08a9b31
disallow invalid {}-indexed assigments
Jaroslav Hajek <highegg@gmail.com>
parents:
8437
diff
changeset
|
144 bool all_scalars (void) const; |
fd11a08a9b31
disallow invalid {}-indexed assigments
Jaroslav Hajek <highegg@gmail.com>
parents:
8437
diff
changeset
|
145 |
10086
76df75b10c80
allow more cells in strfind/strrep + supply a general mechanism
Jaroslav Hajek <highegg@gmail.com>
parents:
10075
diff
changeset
|
146 bool any_cell (void) const; |
76df75b10c80
allow more cells in strfind/strrep + supply a general mechanism
Jaroslav Hajek <highegg@gmail.com>
parents:
10075
diff
changeset
|
147 |
5846 | 148 bool has_magic_colon (void) const; |
149 | |
8034
f61bd8e0d682
fix default_save_options parsing and allow mixing options with other arguments.
Jaroslav Hajek <highegg@gmail.com>
parents:
7017
diff
changeset
|
150 string_vector make_argv (const std::string& = std::string()) const; |
526 | 151 |
2943 | 152 void stash_name_tags (const string_vector& nm) { names = nm; } |
153 | |
154 string_vector name_tags (void) const { return names; } | |
155 | |
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8455
diff
changeset
|
156 void make_storable_values (void); |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8034
diff
changeset
|
157 |
10181
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
158 octave_value& xelem (octave_idx_type i) |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
159 { |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
160 return data.xelem (i); |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
161 } |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
162 |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
163 void clear (void) |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
164 { |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
165 data.clear (); |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
166 } |
a668fbd32e34
improve cellfun & avoid undefined values from builtins
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
167 |
526 | 168 private: |
508 | 169 |
2970 | 170 static octave_allocator allocator; |
171 | |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
172 Array<octave_value> data; |
2872 | 173 |
2943 | 174 // This list of strings can be used to tag each element of data with |
175 // a name. By default, it is empty. | |
176 string_vector names; | |
177 | |
5275 | 178 octave_value& elem (octave_idx_type n) |
1968 | 179 { |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
180 if (n >= length ()) |
10313 | 181 resize (n + 1); |
4591 | 182 |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
183 return data(n); |
1968 | 184 } |
185 | |
10075
84b0725f4b09
return class types by reference in const Array element access functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9545
diff
changeset
|
186 const octave_value& elem (octave_idx_type n) const |
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
187 { return data(n); } |
508 | 188 }; |
498 | 189 |
504 | 190 #endif |