Mercurial > octave
annotate src/ov-struct.cc @ 8546:3d8a914c580e
improve parser indexed assigment code
author | Jaroslav Hajek <highegg@gmail.com> |
---|---|
date | Tue, 20 Jan 2009 21:15:17 +0100 |
parents | ad3afaaa19c1 |
children | 906f976d35a8 |
rev | line source |
---|---|
2376 | 1 /* |
2 | |
7017 | 3 Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, |
4 2007 John W. Eaton | |
2376 | 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. | |
2376 | 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/>. | |
2376 | 21 |
22 */ | |
23 | |
24 #ifdef HAVE_CONFIG_H | |
25 #include <config.h> | |
26 #endif | |
27 | |
3503 | 28 #include <iostream> |
2376 | 29 |
3933 | 30 #include "Cell.h" |
4358 | 31 #include "defun.h" |
2376 | 32 #include "error.h" |
4358 | 33 #include "gripes.h" |
2979 | 34 #include "oct-lvalue.h" |
3932 | 35 #include "ov-list.h" |
2376 | 36 #include "ov-struct.h" |
37 #include "unwind-prot.h" | |
6811 | 38 #include "utils.h" |
2948 | 39 #include "variables.h" |
2376 | 40 |
4750 | 41 #include "Array-util.h" |
8377
25bc2d31e1bf
improve OCTAVE_LOCAL_BUFFER
Jaroslav Hajek <highegg@gmail.com>
parents:
8150
diff
changeset
|
42 #include "oct-locbuf.h" |
4750 | 43 |
4687 | 44 #include "byte-swap.h" |
45 #include "ls-oct-ascii.h" | |
46 #include "ls-oct-binary.h" | |
47 #include "ls-hdf5.h" | |
48 #include "ls-utils.h" | |
5759 | 49 #include "pr-output.h" |
4687 | 50 |
3219 | 51 DEFINE_OCTAVE_ALLOCATOR(octave_struct); |
2376 | 52 |
4612 | 53 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_struct, "struct", "struct"); |
2376 | 54 |
4513 | 55 Cell |
3933 | 56 octave_struct::dotref (const octave_value_list& idx) |
2962 | 57 { |
4513 | 58 Cell retval; |
3933 | 59 |
60 assert (idx.length () == 1); | |
2962 | 61 |
3933 | 62 std::string nm = idx(0).string_value (); |
63 | |
4219 | 64 Octave_map::const_iterator p = map.seek (nm); |
2376 | 65 |
4219 | 66 if (p != map.end ()) |
3933 | 67 retval = map.contents (p); |
68 else | |
2376 | 69 error ("structure has no member `%s'", nm.c_str ()); |
70 | |
71 return retval; | |
72 } | |
73 | |
4513 | 74 #if 0 |
3933 | 75 static void |
76 gripe_invalid_index (void) | |
77 { | |
78 error ("invalid index for structure array"); | |
79 } | |
4513 | 80 #endif |
3933 | 81 |
82 static void | |
83 gripe_invalid_index_for_assignment (void) | |
84 { | |
85 error ("invalid index for structure array assignment"); | |
86 } | |
87 | |
88 static void | |
89 gripe_invalid_index_type (const std::string& nm, char t) | |
90 { | |
91 error ("%s cannot be indexed with %c", nm.c_str (), t); | |
92 } | |
93 | |
94 static void | |
95 gripe_failed_assignment (void) | |
96 { | |
97 error ("assignment to structure element failed"); | |
98 } | |
99 | |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
100 octave_value_list |
4247 | 101 octave_struct::subsref (const std::string& type, |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
102 const std::list<octave_value_list>& idx, |
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
103 int nargout) |
3933 | 104 { |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
105 octave_value_list retval; |
3933 | 106 |
107 int skip = 1; | |
108 | |
109 switch (type[0]) | |
110 { | |
111 case '(': | |
112 { | |
113 if (type.length () > 1 && type[1] == '.') | |
114 { | |
4219 | 115 std::list<octave_value_list>::const_iterator p = idx.begin (); |
116 octave_value_list key_idx = *++p; | |
3933 | 117 |
4513 | 118 Cell tmp = dotref (key_idx); |
3933 | 119 |
120 if (! error_state) | |
121 { | |
7460 | 122 Cell t = tmp.index (idx.front (), true); |
3933 | 123 |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
124 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); |
3933 | 125 |
4513 | 126 // We handled two index elements, so tell |
127 // next_subsref to skip both of them. | |
3933 | 128 |
4513 | 129 skip++; |
3933 | 130 } |
131 } | |
132 else | |
8031
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
133 retval(0) = map.index (idx.front (), false); |
3933 | 134 } |
135 break; | |
136 | |
137 case '.': | |
138 { | |
5592 | 139 if (map.numel() > 0) |
140 { | |
141 Cell t = dotref (idx.front ()); | |
3933 | 142 |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
143 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); |
5592 | 144 } |
3933 | 145 } |
146 break; | |
147 | |
148 case '{': | |
149 gripe_invalid_index_type (type_name (), type[0]); | |
150 break; | |
151 | |
152 default: | |
153 panic_impossible (); | |
154 } | |
155 | |
5775 | 156 // FIXME -- perhaps there should be an |
4994 | 157 // octave_value_list::next_subsref member function? See also |
158 // octave_user_function::subsref. | |
159 | |
160 if (idx.size () > 1) | |
7651
443a8f5a50fd
require both subsref variants to be defined in octave_value subclasses
John W. Eaton <jwe@octave.org>
parents:
7622
diff
changeset
|
161 retval = retval(0).next_subsref (nargout, type, idx, skip); |
3933 | 162 |
163 return retval; | |
164 } | |
165 | |
8031
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
166 /* |
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
167 %!test |
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
168 %! x(1).a.a = 1; x(2).a.a = 2; |
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
169 %! assert (size (x), [1, 2]); |
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
170 %! assert (x(1).a.a, 1); |
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
171 %! assert (x(2).a.a, 2); |
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
172 */ |
d9987dbdf91b
octave_struct::subsref: don't resize for simple x(idx) case
John W. Eaton <jwe@octave.org>
parents:
7651
diff
changeset
|
173 |
3933 | 174 octave_value |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
175 octave_struct::numeric_conv (const octave_value& val, |
3933 | 176 const std::string& type) |
177 { | |
178 octave_value retval; | |
179 | |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
180 if (type.length () > 0 && type[0] == '.' && ! val.is_map ()) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
181 retval = Octave_map (); |
3933 | 182 else |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
183 retval = val; |
3933 | 184 |
185 return retval; | |
186 } | |
187 | |
188 octave_value | |
4247 | 189 octave_struct::subsasgn (const std::string& type, |
4219 | 190 const std::list<octave_value_list>& idx, |
3933 | 191 const octave_value& rhs) |
2376 | 192 { |
3933 | 193 octave_value retval; |
194 | |
195 int n = type.length (); | |
196 | |
197 octave_value t_rhs = rhs; | |
198 | |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
199 // This is handy for calling const methods of map. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
200 const Octave_map& cmap = const_cast<const Octave_map &> (map); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
201 |
3933 | 202 if (n > 1 && ! (type.length () == 2 && type[0] == '(' && type[1] == '.')) |
203 { | |
204 switch (type[0]) | |
205 { | |
206 case '(': | |
207 { | |
208 if (type.length () > 1 && type[1] == '.') | |
209 { | |
4219 | 210 std::list<octave_value_list>::const_iterator p = idx.begin (); |
211 octave_value_list t_idx = *p; | |
3933 | 212 |
4513 | 213 octave_value_list key_idx = *++p; |
214 | |
215 assert (key_idx.length () == 1); | |
3933 | 216 |
4513 | 217 std::string key = key_idx(0).string_value (); |
3933 | 218 |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
219 std::list<octave_value_list> next_idx (idx); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
220 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
221 // We handled two index elements, so subsasgn to |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
222 // needs to skip both of them. |
3933 | 223 |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
224 next_idx.erase (next_idx.begin ()); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
225 next_idx.erase (next_idx.begin ()); |
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
226 |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
227 std::string next_type = type.substr (2); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
228 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
229 // cast map to const reference to avoid forced key insertion. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
230 Cell tmpc = cmap.contents (key).index (idx.front (), true); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
231 tmpc.make_unique (); |
3933 | 232 |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
233 // FIXME: better code reuse? cf. octave_cell::subsasgn and the case below. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
234 if (! error_state) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
235 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
236 if (rhs.is_cs_list ()) |
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
237 { |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
238 octave_value_list rhsl = rhs.list_value (); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
239 if (tmpc.numel () == rhsl.length ()) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
240 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
241 for (octave_idx_type k = 0; k < tmpc.numel () && ! error_state; k++) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
242 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
243 octave_value tmp = tmpc (k); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
244 if (! tmp.is_defined () || tmp.is_zero_by_zero ()) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
245 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
246 tmp = octave_value::empty_conv (next_type, rhs); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
247 tmp.make_unique (); // probably a no-op. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
248 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
249 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
250 // optimization: ignore the copy still stored inside our map and in tmpc. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
251 tmp.make_unique (2); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
252 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
253 tmpc(k) = tmp.subsasgn (next_type, next_idx, rhsl(k)); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
254 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
255 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
256 t_rhs = octave_value (octave_value_list (tmpc), true); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
257 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
258 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
259 error ("invalid cs-list length in assignment"); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
260 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
261 else if (tmpc.numel () == 1) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
262 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
263 octave_value tmp = tmpc(0); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
264 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
265 if (! tmp.is_defined () || tmp.is_zero_by_zero ()) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
266 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
267 tmp = octave_value::empty_conv (type.substr (1), rhs); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
268 tmp.make_unique (); // probably a no-op. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
269 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
270 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
271 // optimization: ignore the copy still stored inside our map and in tmpc. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
272 tmp.make_unique (2); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
273 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
274 if (! error_state) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
275 t_rhs = tmp.subsasgn (next_type, next_idx, rhs); |
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
276 } |
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
277 else |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
278 error ("invalid assignment to cs-list outside multiple assignment."); |
3933 | 279 } |
280 } | |
281 else | |
282 gripe_invalid_index_for_assignment (); | |
283 } | |
284 break; | |
285 | |
286 case '.': | |
287 { | |
288 octave_value_list key_idx = idx.front (); | |
289 | |
290 assert (key_idx.length () == 1); | |
291 | |
292 std::string key = key_idx(0).string_value (); | |
293 | |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
294 std::list<octave_value_list> next_idx (idx); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
295 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
296 next_idx.erase (next_idx.begin ()); |
3933 | 297 |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
298 std::string next_type = type.substr (1); |
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
299 |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
300 Cell tmpc1 = octave_value (); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
301 Cell& tmpc = (map.contains (key)) ? map.contents (key) : tmpc1; |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
302 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
303 tmpc.make_unique (); |
3933 | 304 |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
305 // FIXME: better code reuse? |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
306 if (! error_state) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
307 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
308 if (rhs.is_cs_list ()) |
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
309 { |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
310 octave_value_list rhsl = rhs.list_value (); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
311 if (tmpc.numel () == rhsl.length ()) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
312 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
313 for (octave_idx_type k = 0; k < tmpc.numel () && ! error_state; k++) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
314 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
315 octave_value tmp = tmpc (k); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
316 if (! tmp.is_defined () || tmp.is_zero_by_zero ()) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
317 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
318 tmp = octave_value::empty_conv (next_type, rhs); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
319 tmp.make_unique (); // probably a no-op. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
320 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
321 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
322 // optimization: ignore the copy still stored inside our map. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
323 tmp.make_unique (1); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
324 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
325 tmpc(k) = tmp.subsasgn (next_type, next_idx, rhsl(k)); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
326 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
327 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
328 t_rhs = octave_value (octave_value_list (tmpc), true); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
329 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
330 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
331 error ("invalid cs-list length in assignment"); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
332 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
333 else if (tmpc.numel () == 1) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
334 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
335 octave_value tmp = tmpc(0); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
336 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
337 if (! tmp.is_defined () || tmp.is_zero_by_zero ()) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
338 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
339 tmp = octave_value::empty_conv (type.substr (1), rhs); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
340 tmp.make_unique (); // probably a no-op. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
341 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
342 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
343 // optimization: ignore the copy still stored inside our map. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
344 tmp.make_unique (1); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
345 |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
346 if (! error_state) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
347 t_rhs = tmp.subsasgn (next_type, next_idx, rhs); |
8456
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
348 } |
c1709a45b45b
optimize structure components access
Jaroslav Hajek <highegg@gmail.com>
parents:
8377
diff
changeset
|
349 else |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
350 error ("invalid assignment to cs-list outside multiple assignment."); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
351 } |
3933 | 352 } |
353 break; | |
354 | |
355 case '{': | |
356 gripe_invalid_index_type (type_name (), type[0]); | |
357 break; | |
358 | |
359 default: | |
360 panic_impossible (); | |
361 } | |
362 } | |
363 | |
364 if (! error_state) | |
365 { | |
366 switch (type[0]) | |
367 { | |
368 case '(': | |
369 { | |
370 if (n > 1 && type[1] == '.') | |
371 { | |
4219 | 372 std::list<octave_value_list>::const_iterator p = idx.begin (); |
373 octave_value_list key_idx = *++p; | |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
374 octave_value_list idx_front = idx.front (); |
3933 | 375 |
376 assert (key_idx.length () == 1); | |
377 | |
378 std::string key = key_idx(0).string_value (); | |
379 | |
380 if (! error_state) | |
381 { | |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
382 if (t_rhs.is_cs_list ()) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
383 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
384 map.assign (idx.front (), key, Cell (t_rhs.list_value ())); |
3933 | 385 |
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
386 if (! error_state) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
387 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
388 count++; |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
389 retval = octave_value (this); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
390 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
391 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
392 gripe_failed_assignment (); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
393 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
394 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
395 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
396 // cast map to const reference to avoid forced key insertion. |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
397 if (idx_front.all_scalars () |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
398 || cmap.contents (key).index (idx_front, true).numel () == 1) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
399 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
400 map.assign (idx_front, key, t_rhs.storable_value ()); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
401 if (! error_state) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
402 { |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
403 count++; |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
404 retval = octave_value (this); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
405 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
406 else |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
407 gripe_failed_assignment (); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
408 } |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
409 else if (! error_state) |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
410 error ("invalid assignment to cs-list outside multiple assignment."); |
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8523
diff
changeset
|
411 } |
3933 | 412 } |
413 else | |
414 gripe_failed_assignment (); | |
415 } | |
416 else | |
4197 | 417 { |
5592 | 418 if (t_rhs.is_map()) |
4197 | 419 { |
5592 | 420 Octave_map rhs_map = t_rhs.map_value (); |
4197 | 421 |
422 if (! error_state) | |
5592 | 423 { |
424 map.assign (idx.front (), rhs_map); | |
425 | |
426 if (! error_state) | |
5759 | 427 { |
428 count++; | |
429 retval = octave_value (this); | |
430 } | |
5592 | 431 else |
432 gripe_failed_assignment (); | |
433 } | |
4197 | 434 else |
5592 | 435 error ("invalid structure assignment"); |
4197 | 436 } |
4513 | 437 else |
5592 | 438 { |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8031
diff
changeset
|
439 if (t_rhs.is_null_value()) |
5592 | 440 { |
441 map.maybe_delete_elements (idx.front()); | |
442 | |
443 if (! error_state) | |
5759 | 444 { |
445 count++; | |
446 retval = octave_value (this); | |
447 } | |
5592 | 448 else |
449 gripe_failed_assignment (); | |
450 } | |
451 else | |
452 error ("invalid structure assignment"); | |
453 } | |
4197 | 454 } |
3933 | 455 } |
456 break; | |
457 | |
458 case '.': | |
459 { | |
460 octave_value_list key_idx = idx.front (); | |
461 | |
462 assert (key_idx.length () == 1); | |
463 | |
464 std::string key = key_idx(0).string_value (); | |
465 | |
6833 | 466 if (t_rhs.is_cs_list ()) |
467 { | |
468 Cell tmp_cell = Cell (t_rhs.list_value ()); | |
469 | |
7040 | 470 // The shape of the RHS is irrelevant, we just want |
471 // the number of elements to agree and to preserve the | |
472 // shape of the left hand side of the assignment. | |
473 | |
474 if (numel () == tmp_cell.numel ()) | |
475 tmp_cell = tmp_cell.reshape (dims ()); | |
6833 | 476 |
477 map.assign (key, tmp_cell); | |
478 } | |
479 else | |
8150
283989f2da9b
make null assignment matlab compatible
Jaroslav Hajek <highegg@gmail.com>
parents:
8031
diff
changeset
|
480 // Regularize a null matrix if stored into a struct component. |
8523
ad3afaaa19c1
implement non-copying contiguous range indexing
Jaroslav Hajek <highegg@gmail.com>
parents:
8456
diff
changeset
|
481 map.assign (key, t_rhs.storable_value ()); |
3933 | 482 |
483 if (! error_state) | |
5759 | 484 { |
485 count++; | |
486 retval = octave_value (this); | |
487 } | |
3933 | 488 else |
489 gripe_failed_assignment (); | |
490 } | |
491 break; | |
492 | |
493 case '{': | |
494 gripe_invalid_index_type (type_name (), type[0]); | |
495 break; | |
496 | |
497 default: | |
498 panic_impossible (); | |
499 } | |
500 } | |
501 else | |
502 gripe_failed_assignment (); | |
503 | |
504 return retval; | |
2376 | 505 } |
506 | |
7046 | 507 octave_value |
508 octave_struct::do_index_op (const octave_value_list& idx, bool resize_ok) | |
509 { | |
510 octave_value retval; | |
511 | |
512 octave_idx_type n_idx = idx.length (); | |
513 | |
514 int nd = map.ndims (); | |
515 | |
516 switch (n_idx) | |
517 { | |
518 case 0: | |
519 retval = map; | |
520 break; | |
521 | |
522 case 1: | |
523 { | |
524 idx_vector i = idx (0).index_vector (); | |
525 | |
526 if (! error_state) | |
527 retval = map.index (i, resize_ok, Cell::resize_fill_value ()); | |
528 } | |
529 break; | |
530 | |
531 default: | |
532 { | |
533 if (n_idx == 2 && nd == 2) | |
534 { | |
535 idx_vector i = idx (0).index_vector (); | |
536 | |
537 if (! error_state) | |
538 { | |
539 idx_vector j = idx (1).index_vector (); | |
540 | |
541 if (! error_state) | |
542 retval = map.index (i, j, resize_ok, | |
543 Cell::resize_fill_value ()); | |
544 } | |
545 } | |
546 else | |
547 { | |
548 Array<idx_vector> idx_vec (n_idx); | |
549 | |
550 for (octave_idx_type i = 0; i < n_idx; i++) | |
551 { | |
552 idx_vec(i) = idx(i).index_vector (); | |
553 | |
554 if (error_state) | |
555 break; | |
556 } | |
557 | |
558 if (! error_state) | |
559 retval = map.index (idx_vec, resize_ok, | |
560 Cell::resize_fill_value ()); | |
561 } | |
562 } | |
563 break; | |
564 } | |
565 | |
566 return retval; | |
567 } | |
568 | |
4791 | 569 size_t |
570 octave_struct::byte_size (void) const | |
571 { | |
572 // Neglect the size of the fieldnames. | |
573 | |
574 size_t retval = 0; | |
575 | |
576 for (Octave_map::const_iterator p = map.begin (); p != map.end (); p++) | |
577 { | |
578 std::string key = map.key (p); | |
579 | |
580 octave_value val = octave_value (map.contents (p)); | |
581 | |
582 retval += val.byte_size (); | |
583 } | |
584 | |
585 return retval; | |
586 } | |
587 | |
2376 | 588 void |
3523 | 589 octave_struct::print (std::ostream& os, bool) const |
2901 | 590 { |
591 print_raw (os); | |
592 } | |
593 | |
594 void | |
3523 | 595 octave_struct::print_raw (std::ostream& os, bool) const |
2376 | 596 { |
2985 | 597 unwind_protect::begin_frame ("octave_struct_print"); |
2376 | 598 |
599 unwind_protect_int (Vstruct_levels_to_print); | |
600 | |
3961 | 601 if (Vstruct_levels_to_print >= 0) |
2376 | 602 { |
7571
c01ff6818f4c
simplify struct array printing
John W. Eaton <jwe@octave.org>
parents:
7460
diff
changeset
|
603 bool print_keys_only = Vstruct_levels_to_print-- == 0; |
3961 | 604 |
2901 | 605 indent (os); |
606 os << "{"; | |
607 newline (os); | |
2376 | 608 |
2901 | 609 increment_indent_level (); |
2376 | 610 |
5598 | 611 octave_idx_type n = map.numel (); |
3932 | 612 |
7571
c01ff6818f4c
simplify struct array printing
John W. Eaton <jwe@octave.org>
parents:
7460
diff
changeset
|
613 if (n != 1 || print_keys_only) |
4604 | 614 { |
615 indent (os); | |
616 dim_vector dv = dims (); | |
617 os << dv.str () << " struct array containing the fields:"; | |
618 newline (os); | |
619 newline (os); | |
620 | |
621 increment_indent_level (); | |
622 } | |
623 | |
5880 | 624 string_vector key_list = map.keys (); |
625 | |
626 for (octave_idx_type i = 0; i < key_list.length (); i++) | |
2376 | 627 { |
5880 | 628 std::string key = key_list[i]; |
629 | |
630 Cell val = map.contents (key); | |
2376 | 631 |
4499 | 632 octave_value tmp = (n == 1) ? val(0) : octave_value (val, true); |
3961 | 633 |
7571
c01ff6818f4c
simplify struct array printing
John W. Eaton <jwe@octave.org>
parents:
7460
diff
changeset
|
634 if (n != 1 || print_keys_only) |
3932 | 635 { |
3961 | 636 indent (os); |
4604 | 637 os << key; |
638 if (n == 1) | |
639 { | |
640 dim_vector dv = tmp.dims (); | |
641 os << ": " << dv.str () << " " << tmp.type_name (); | |
642 } | |
3961 | 643 newline (os); |
3932 | 644 } |
3961 | 645 else |
4121 | 646 tmp.print_with_name (os, key); |
2376 | 647 } |
648 | |
7571
c01ff6818f4c
simplify struct array printing
John W. Eaton <jwe@octave.org>
parents:
7460
diff
changeset
|
649 if (n != 1 || print_keys_only) |
4604 | 650 decrement_indent_level (); |
651 | |
2901 | 652 decrement_indent_level (); |
2376 | 653 |
2901 | 654 indent (os); |
655 os << "}"; | |
656 newline (os); | |
2376 | 657 } |
658 else | |
2901 | 659 { |
3961 | 660 indent (os); |
661 os << "<structure>"; | |
2901 | 662 newline (os); |
663 } | |
2376 | 664 |
2985 | 665 unwind_protect::run_frame ("octave_struct_print"); |
2376 | 666 } |
667 | |
2901 | 668 bool |
3523 | 669 octave_struct::print_name_tag (std::ostream& os, const std::string& name) const |
2901 | 670 { |
3961 | 671 bool retval = false; |
672 | |
2901 | 673 indent (os); |
3961 | 674 |
675 if (Vstruct_levels_to_print < 0) | |
676 os << name << " = "; | |
677 else | |
678 { | |
679 os << name << " ="; | |
680 newline (os); | |
681 retval = true; | |
682 } | |
683 | |
684 return retval; | |
2901 | 685 } |
686 | |
4744 | 687 static bool |
688 scalar (const dim_vector& dims) | |
689 { | |
690 return dims.length () == 2 && dims (0) == 1 && dims (1) == 1; | |
691 } | |
692 | |
693 /* | |
694 %!shared x | |
695 %! x(1).a=1; x(2).a=2; x(1).b=3; x(2).b=3; | |
696 %!assert(struct('a',1,'b',3),x(1)) | |
5592 | 697 %!assert(isempty(x([]))) |
698 %!assert(isempty(struct('a',{},'b',{}))) | |
4744 | 699 %!assert(struct('a',{1,2},'b',{3,3}),x) |
700 %!assert(struct('a',{1,2},'b',3),x) | |
701 %!assert(struct('a',{1,2},'b',{3}),x) | |
702 %!assert(struct('b',3,'a',{1,2}),x) | |
703 %!assert(struct('b',{3},'a',{1,2}),x) | |
704 %!test x=struct([]); | |
705 %!assert(size(x),[0,0]); | |
706 %!assert(isstruct(x)); | |
707 %!assert(isempty(fieldnames(x))); | |
708 %!fail("struct('a',{1,2},'b',{1,2,3})","dimensions of parameter 2 do not match those of parameter 4") | |
5582 | 709 %!fail("struct(1,2,3,4)","struct expects alternating \"field\", VALUE pairs"); |
710 %!fail("struct('1',2,'3')","struct expects alternating \"field\", VALUE pairs"); | |
4744 | 711 */ |
712 | |
713 DEFUN (struct, args, , | |
714 "-*- texinfo -*-\n\ | |
715 @deftypefn {Built-in Function} {} struct (\"field\", @var{value}, \"field\", @var{value}, @dots{})\n\ | |
716 \n\ | |
717 Create a structure and initialize its value.\n\ | |
718 \n\ | |
719 If the values are cell arrays, create a structure array and initialize\n\ | |
720 its values. The dimensions of each cell array of values must match.\n\ | |
721 Singleton cells and non-cell values are repeated so that they fill\n\ | |
722 the entire array. If the cells are empty, create an empty structure\n\ | |
4911 | 723 array with the specified field names.\n\ |
724 @end deftypefn") | |
4744 | 725 { |
6946 | 726 octave_value retval; |
4744 | 727 |
728 int nargin = args.length (); | |
729 | |
5444 | 730 // struct ([]) returns an empty struct. |
731 | |
732 // struct (empty_matrix) returns an empty struct with the same | |
733 // dimensions as the empty matrix. | |
734 | |
735 // Note that struct () creates a 1x1 struct with no fields for | |
736 // compatibility with Matlab. | |
4744 | 737 |
6946 | 738 if ((nargin == 1 || nargin == 2) |
739 && args(0).is_empty () && args(0).is_real_matrix ()) | |
740 { | |
741 Cell fields; | |
742 | |
743 if (nargin == 2) | |
744 { | |
745 if (args(1).is_cellstr ()) | |
746 retval = Octave_map (args(0).dims (), args(1).cell_value ()); | |
747 else | |
748 error ("struct: expecting cell array of field names as second argument"); | |
749 } | |
750 else | |
751 retval = Octave_map (args(0).dims ()); | |
752 | |
753 return retval; | |
754 } | |
4744 | 755 |
756 // Check for "field", VALUE pairs. | |
757 | |
758 for (int i = 0; i < nargin; i += 2) | |
759 { | |
760 if (! args(i).is_string () || i + 1 >= nargin) | |
761 { | |
762 error ("struct expects alternating \"field\", VALUE pairs"); | |
763 return retval; | |
764 } | |
765 } | |
766 | |
767 // Check that the dimensions of the values correspond. | |
768 | |
769 dim_vector dims (1, 1); | |
770 | |
771 int first_dimensioned_value = 0; | |
772 | |
773 for (int i = 1; i < nargin; i += 2) | |
774 { | |
775 if (args(i).is_cell ()) | |
776 { | |
777 dim_vector argdims (args(i).dims ()); | |
778 | |
779 if (! scalar (argdims)) | |
780 { | |
781 if (! first_dimensioned_value) | |
782 { | |
783 dims = argdims; | |
784 first_dimensioned_value = i + 1; | |
785 } | |
786 else if (dims != argdims) | |
787 { | |
788 error ("struct: dimensions of parameter %d do not match those of parameter %d", | |
789 first_dimensioned_value, i+1); | |
790 return retval; | |
791 } | |
792 } | |
793 } | |
794 } | |
795 | |
796 // Create the return value. | |
797 | |
798 Octave_map map (dims); | |
799 | |
800 for (int i = 0; i < nargin; i+= 2) | |
801 { | |
802 // Get key. | |
803 | |
804 std::string key (args(i).string_value ()); | |
805 | |
806 if (error_state) | |
807 return retval; | |
808 | |
6811 | 809 if (! valid_identifier (key)) |
810 { | |
811 error ("struct: invalid structure field name `%s'", key.c_str ()); | |
812 return retval; | |
813 } | |
814 | |
4744 | 815 // Value may be v, { v }, or { v1, v2, ... } |
816 // In the first two cases, we need to create a cell array of | |
817 // the appropriate dimensions filled with v. In the last case, | |
818 // the cell array has already been determined to be of the | |
819 // correct dimensions. | |
820 | |
821 if (args(i+1).is_cell ()) | |
822 { | |
823 const Cell c (args(i+1).cell_value ()); | |
824 | |
825 if (error_state) | |
826 return retval; | |
827 | |
828 if (scalar (c.dims ())) | |
829 map.assign (key, Cell (dims, c(0))); | |
830 else | |
831 map.assign (key, c); | |
832 } | |
833 else | |
834 map.assign (key, Cell (dims, args(i+1))); | |
835 | |
836 if (error_state) | |
837 return retval; | |
838 } | |
6946 | 839 |
4744 | 840 return octave_value (map); |
841 } | |
842 | |
4358 | 843 DEFUN (isstruct, args, , |
844 "-*- texinfo -*-\n\ | |
845 @deftypefn {Built-in Function} {} isstruct (@var{expr})\n\ | |
846 Return 1 if the value of the expression @var{expr} is a structure.\n\ | |
847 @end deftypefn") | |
848 { | |
849 octave_value retval; | |
850 | |
851 if (args.length () == 1) | |
852 retval = args(0).is_map (); | |
853 else | |
5823 | 854 print_usage (); |
4358 | 855 |
856 return retval; | |
857 } | |
858 | |
859 DEFUN (fieldnames, args, , | |
860 "-*- texinfo -*-\n\ | |
861 @deftypefn {Built-in Function} {} fieldnames (@var{struct})\n\ | |
862 Return a cell array of strings naming the elements of the structure\n\ | |
863 @var{struct}. It is an error to call @code{fieldnames} with an\n\ | |
864 argument that is not a structure.\n\ | |
865 @end deftypefn") | |
866 { | |
867 octave_value retval; | |
868 | |
869 int nargin = args.length (); | |
870 | |
871 if (nargin == 1) | |
872 { | |
7336 | 873 octave_value arg = args(0); |
874 | |
875 if (arg.is_map () || arg.is_object ()) | |
4358 | 876 { |
7336 | 877 Octave_map m = arg.map_value (); |
878 | |
4744 | 879 string_vector keys = m.keys (); |
7336 | 880 |
4744 | 881 if (keys.length () == 0) |
882 retval = Cell (0, 1); | |
883 else | |
884 retval = Cell (m.keys ()); | |
4358 | 885 } |
886 else | |
887 gripe_wrong_type_arg ("fieldnames", args(0)); | |
888 } | |
889 else | |
5823 | 890 print_usage (); |
4358 | 891 |
892 return retval; | |
893 } | |
894 | |
895 DEFUN (isfield, args, , | |
896 "-*- texinfo -*-\n\ | |
897 @deftypefn {Built-in Function} {} isfield (@var{expr}, @var{name})\n\ | |
898 Return true if the expression @var{expr} is a structure and it includes an\n\ | |
899 element named @var{name}. The first argument must be a structure and\n\ | |
900 the second must be a string.\n\ | |
901 @end deftypefn") | |
902 { | |
903 octave_value retval; | |
904 | |
905 int nargin = args.length (); | |
906 | |
907 if (nargin == 2) | |
908 { | |
909 retval = false; | |
910 | |
5775 | 911 // FIXME -- should this work for all types that can do |
4358 | 912 // structure reference operations? |
913 | |
914 if (args(0).is_map () && args(1).is_string ()) | |
915 { | |
916 std::string key = args(1).string_value (); | |
917 | |
918 Octave_map m = args(0).map_value (); | |
919 | |
920 retval = m.contains (key) != 0; | |
921 } | |
922 } | |
923 else | |
5823 | 924 print_usage (); |
4358 | 925 |
926 return retval; | |
927 } | |
928 | |
4750 | 929 // Check that the dimensions of the input arguments are correct. |
930 | |
931 static bool | |
932 cell2struct_check_args (const dim_vector& c_dv, const dim_vector& f_dv, | |
933 bool is_cell, int dim) | |
934 { | |
4751 | 935 bool retval = true; |
4750 | 936 |
937 if (dim >= 0 && dim < c_dv.length ()) | |
938 { | |
939 if (is_cell) | |
940 { | |
4752 | 941 if (f_dv.numel () != c_dv(dim)) |
4750 | 942 { |
4751 | 943 error ("cell2struct: numel (FIELD) != size (CELL, DIM)"); |
4750 | 944 |
945 retval = false; | |
946 } | |
947 } | |
948 else | |
949 { | |
950 if (f_dv.length () > 2) | |
951 { | |
4751 | 952 error ("cell2struct: field array must be a 2-d matrix"); |
4750 | 953 |
954 retval = false; | |
955 } | |
956 else if (f_dv(0) != c_dv(dim)) | |
957 { | |
4751 | 958 error ("cell2struct: size (FIELD, 1) != length (C, DIM)"); |
4750 | 959 |
960 retval = false; | |
961 } | |
962 } | |
963 } | |
964 else | |
965 { | |
966 error ("cell2struct: DIM out of range"); | |
967 | |
968 retval = false; | |
969 } | |
970 | |
971 return retval; | |
972 } | |
973 | |
974 static void | |
5275 | 975 cell2struct_construct_idx (Array<octave_idx_type>& ra_idx1, |
976 const Array<octave_idx_type>& ra_idx2, | |
977 octave_idx_type dim, octave_idx_type fill_value) | |
4750 | 978 { |
5275 | 979 octave_idx_type iidx = 0; |
4750 | 980 |
5275 | 981 for (octave_idx_type idx = 0; idx < ra_idx1.length (); idx++) |
4750 | 982 { |
983 if (idx == dim) | |
984 ra_idx1.elem (idx) = fill_value; | |
985 else | |
986 ra_idx1.elem (idx) = ra_idx2(iidx++); | |
987 } | |
988 } | |
989 | |
990 DEFUN (cell2struct, args, , | |
991 "-*- texinfo -*-\n\ | |
4817 | 992 @deftypefn {Built-in Function} {} cell2struct (@var{cell}, @var{fields}, @var{dim})\n\ |
993 Convert @var{cell} to a structure. The number of fields in @var{fields}\n\ | |
994 must match the number of elements in @var{cell} along dimension @var{dim},\n\ | |
995 that is @code{numel (@var{fields}) == size (@var{cell}, @var{dim})}.\n\ | |
4750 | 996 \n\ |
997 @example\n\ | |
998 @group\n\ | |
7031 | 999 A = cell2struct (@{'Peter', 'Hannah', 'Robert';\n\ |
1000 185, 170, 168@},\n\ | |
6519 | 1001 @{'Name','Height'@}, 1);\n\ |
4750 | 1002 A(1)\n\ |
1003 @result{} ans =\n\ | |
4780 | 1004 @{\n\ |
1005 Height = 185\n\ | |
1006 Name = Peter\n\ | |
1007 @}\n\ | |
4750 | 1008 \n\ |
1009 @end group\n\ | |
1010 @end example\n\ | |
1011 @end deftypefn") | |
1012 { | |
1013 octave_value retval; | |
1014 | |
4751 | 1015 if (args.length () == 3) |
4750 | 1016 { |
4751 | 1017 Cell c = args(0).cell_value (); |
4750 | 1018 |
4751 | 1019 if (! error_state) |
4750 | 1020 { |
4751 | 1021 octave_value field = args(1); |
4750 | 1022 |
4751 | 1023 // Field is either cell or character matrix. |
4750 | 1024 |
5775 | 1025 // FIXME -- this could be simplified if we had |
4752 | 1026 // cellstr and iscellstr functions available. |
1027 | |
4751 | 1028 bool field_is_cell = field.is_cell (); |
4750 | 1029 |
4751 | 1030 Cell field_cell; |
1031 charMatrix field_char; | |
4750 | 1032 |
1033 if (field_is_cell) | |
4751 | 1034 field_cell = field.cell_value (); |
1035 else | |
1036 field_char = field.char_matrix_value (); | |
1037 | |
1038 if (! error_state) | |
4750 | 1039 { |
4751 | 1040 // Retrieve the dimension value. |
1041 | |
5775 | 1042 // FIXME -- int_value () should print out the |
4751 | 1043 // conversions it does to be Matlab compatible. |
1044 | |
5275 | 1045 octave_idx_type dim = args(2).int_value () - 1; |
4751 | 1046 |
1047 if (! error_state) | |
1048 { | |
1049 dim_vector c_dv = c.dims (); | |
1050 dim_vector field_dv = field.dims (); | |
1051 | |
1052 if (cell2struct_check_args (c_dv, field_dv, field_is_cell, | |
1053 dim)) | |
1054 { | |
5275 | 1055 octave_idx_type c_dv_length = c_dv.length (); |
4751 | 1056 |
1057 // Dimension vector for the Cell arrays to be | |
1058 // put into the structure. | |
1059 | |
1060 dim_vector value_dv; | |
1061 | |
1062 // Initialize c_value_dv. | |
4750 | 1063 |
4751 | 1064 if (c_dv_length == 2) |
1065 value_dv = dim_vector (1, 1); | |
1066 else | |
1067 value_dv.resize (c_dv_length - 1); | |
1068 | |
5275 | 1069 octave_idx_type idx_tmp = 0; |
4751 | 1070 |
5275 | 1071 for (octave_idx_type i = 0; i < c_dv_length; i++) |
4751 | 1072 { |
1073 if (i != dim) | |
1074 value_dv.elem (idx_tmp++) = c_dv.elem (i); | |
1075 } | |
1076 | |
1077 // All initializing is done, we can start moving | |
1078 // values. | |
1079 | |
1080 Octave_map map; | |
1081 | |
1082 // If field is a cell array then we use all | |
1083 // elements in array, on the other hand when | |
1084 // field is a character array the number of | |
1085 // elements is equals the number of rows. | |
1086 | |
5275 | 1087 octave_idx_type field_numel |
4751 | 1088 = field_is_cell ? field_dv.numel (): field_dv(0); |
1089 | |
1090 // For matlab compatibility. | |
1091 | |
1092 if (field_numel == 0) | |
1093 map.reshape (dim_vector (0, 1)); | |
4750 | 1094 |
5275 | 1095 for (octave_idx_type i = 0; i < field_numel; i++) |
4751 | 1096 { |
1097 // Construct cell array which goes into the | |
1098 // structure together with the appropriate | |
1099 // field name. | |
1100 | |
1101 Cell c_value (value_dv); | |
1102 | |
5275 | 1103 Array<octave_idx_type> value_idx (value_dv.length (), 0); |
1104 Array<octave_idx_type> c_idx (c_dv_length, 0); | |
4751 | 1105 |
5275 | 1106 for (octave_idx_type j = 0; j < value_dv.numel (); j++) |
4751 | 1107 { |
1108 // Need to do this to construct the | |
1109 // appropriate idx for getting elements | |
1110 // from the original cell array. | |
1111 | |
1112 cell2struct_construct_idx (c_idx, value_idx, | |
1113 dim, i); | |
1114 | |
1115 c_value.elem (value_idx) = c.elem (c_idx); | |
1116 | |
1117 increment_index (value_idx, value_dv); | |
1118 } | |
1119 | |
1120 std::string field_str; | |
4750 | 1121 |
4751 | 1122 if (field_is_cell) |
1123 { | |
1124 // Matlab retrieves the field values | |
1125 // column by column. | |
1126 | |
1127 octave_value field_tmp = field_cell.elem (i); | |
1128 | |
1129 field_str = field_tmp.string_value (); | |
1130 | |
1131 if (error_state) | |
1132 { | |
1133 error ("cell2struct: fields have to be of type string"); | |
1134 break; | |
1135 } | |
1136 } | |
1137 else | |
1138 { | |
1139 field_str = field_char.row_as_string (i); | |
1140 | |
1141 if (error_state) | |
1142 return retval; | |
1143 } | |
1144 | |
6811 | 1145 if (! valid_identifier (field_str)) |
1146 { | |
1147 error ("cell2struct: invalid field name `%s'", | |
1148 field_str.c_str ()); | |
1149 break; | |
1150 } | |
1151 | |
4751 | 1152 map.reshape (value_dv); |
1153 | |
1154 map.assign (field_str, c_value); | |
1155 } | |
1156 | |
1157 if (! error_state) | |
1158 retval = map; | |
1159 } | |
4750 | 1160 } |
4751 | 1161 else |
1162 error ("cell2struct: expecting third argument to be an integer"); | |
4750 | 1163 } |
1164 else | |
4751 | 1165 error ("cell2struct: expecting second argument to be a cell or character array"); |
4750 | 1166 } |
4751 | 1167 else |
1168 error ("cell2struct: expecting first argument to be a cell array"); | |
4750 | 1169 } |
4751 | 1170 else |
5823 | 1171 print_usage (); |
4750 | 1172 |
1173 return retval; | |
1174 } | |
1175 | |
4817 | 1176 // So we can call Fcellstr directly. |
1177 extern octave_value_list Fcellstr (const octave_value_list& args, int); | |
1178 | |
1179 DEFUN (rmfield, args, , | |
1180 "-*- texinfo -*-\n\ | |
1181 @deftypefn {Built-in Function} {} rmfield (@var{s}, @var{f})\n\ | |
1182 Remove field @var{f} from the structure @var{s}. If @var{f} is a\n\ | |
1183 cell array of character strings or a character array, remove the\n\ | |
1184 named fields.\n\ | |
5642 | 1185 @seealso{cellstr, iscellstr, setfield}\n\ |
1186 @end deftypefn") | |
4817 | 1187 { |
1188 octave_value retval; | |
1189 | |
1190 int nargin = args.length (); | |
1191 | |
1192 if (nargin == 2) | |
1193 { | |
1194 Octave_map m = args(0).map_value (); | |
1195 | |
1196 octave_value_list fval = Fcellstr (args(1), 1); | |
1197 | |
1198 if (! error_state) | |
1199 { | |
1200 Cell fcell = fval(0).cell_value (); | |
1201 | |
1202 for (int i = 0; i < fcell.numel (); i++) | |
1203 { | |
1204 std::string key = fcell(i).string_value (); | |
1205 | |
1206 if (m.contains (key)) | |
1207 m.del (key); | |
1208 else | |
1209 { | |
1210 error ("rmfield: structure does not contain field %s", | |
1211 key.c_str ()); | |
1212 | |
1213 break; | |
1214 } | |
1215 } | |
1216 | |
1217 if (! error_state) | |
1218 retval = m; | |
1219 } | |
1220 } | |
1221 else | |
5823 | 1222 print_usage (); |
4817 | 1223 |
1224 return retval; | |
1225 } | |
1226 | |
1227 bool | |
6974 | 1228 octave_struct::save_ascii (std::ostream& os) |
4817 | 1229 { |
1230 Octave_map m = map_value (); | |
6639 | 1231 os << "# length: " << m.nfields () << "\n"; |
4817 | 1232 |
1233 Octave_map::iterator i = m.begin (); | |
1234 while (i != m.end ()) | |
1235 { | |
5341 | 1236 octave_value val = map.contents (i); |
4817 | 1237 |
6974 | 1238 bool b = save_ascii_data (os, val, m.key (i), false, 0); |
4817 | 1239 |
1240 if (! b) | |
1241 return os; | |
1242 | |
1243 i++; | |
1244 } | |
1245 | |
1246 return true; | |
1247 } | |
1248 | |
1249 bool | |
1250 octave_struct::load_ascii (std::istream& is) | |
1251 { | |
5275 | 1252 octave_idx_type len = 0; |
4817 | 1253 bool success = true; |
1254 | |
1255 if (extract_keyword (is, "length", len) && len >= 0) | |
1256 { | |
1257 if (len > 0) | |
1258 { | |
1259 Octave_map m (map); | |
1260 | |
5275 | 1261 for (octave_idx_type j = 0; j < len; j++) |
4817 | 1262 { |
1263 octave_value t2; | |
1264 bool dummy; | |
1265 | |
1266 // recurse to read cell elements | |
1267 std::string nm | |
5756 | 1268 = read_ascii_data (is, std::string (), dummy, t2, j); |
4817 | 1269 |
1270 if (!is) | |
1271 break; | |
1272 | |
6293 | 1273 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
5433 | 1274 |
6293 | 1275 if (error_state) |
1276 { | |
1277 error ("load: internal error loading struct elements"); | |
1278 return false; | |
1279 } | |
5433 | 1280 |
6293 | 1281 m.assign (nm, tcell); |
4817 | 1282 } |
1283 | |
1284 if (is) | |
1285 map = m; | |
1286 else | |
1287 { | |
1288 error ("load: failed to load structure"); | |
1289 success = false; | |
1290 } | |
1291 } | |
1292 else if (len == 0 ) | |
6292 | 1293 map = Octave_map (dim_vector (1, 1)); |
4817 | 1294 else |
1295 panic_impossible (); | |
1296 } | |
1297 else { | |
1298 error ("load: failed to extract number of elements in structure"); | |
1299 success = false; | |
1300 } | |
1301 | |
1302 return success; | |
1303 } | |
1304 | |
1305 bool | |
1306 octave_struct::save_binary (std::ostream& os, bool& save_as_floats) | |
1307 { | |
1308 Octave_map m = map_value (); | |
1309 | |
6639 | 1310 int32_t len = m.nfields (); |
5760 | 1311 os.write (reinterpret_cast<char *> (&len), 4); |
4817 | 1312 |
1313 Octave_map::iterator i = m.begin (); | |
1314 while (i != m.end ()) | |
1315 { | |
5341 | 1316 octave_value val = map.contents (i); |
4817 | 1317 |
5341 | 1318 bool b = save_binary_data (os, val, m.key (i), "", 0, save_as_floats); |
4817 | 1319 |
1320 if (! b) | |
1321 return os; | |
1322 | |
1323 i++; | |
1324 } | |
1325 | |
1326 return true; | |
1327 } | |
1328 | |
1329 bool | |
1330 octave_struct::load_binary (std::istream& is, bool swap, | |
5760 | 1331 oct_mach_info::float_format fmt) |
4817 | 1332 { |
1333 bool success = true; | |
5828 | 1334 int32_t len; |
5760 | 1335 if (! is.read (reinterpret_cast<char *> (&len), 4)) |
4817 | 1336 return false; |
1337 if (swap) | |
4944 | 1338 swap_bytes<4> (&len); |
4817 | 1339 |
1340 if (len > 0) | |
1341 { | |
1342 Octave_map m (map); | |
1343 | |
5275 | 1344 for (octave_idx_type j = 0; j < len; j++) |
4817 | 1345 { |
1346 octave_value t2; | |
1347 bool dummy; | |
1348 std::string doc; | |
1349 | |
1350 // recurse to read cell elements | |
1351 std::string nm = read_binary_data (is, swap, fmt, std::string (), | |
1352 dummy, t2, doc); | |
1353 | |
1354 if (!is) | |
1355 break; | |
1356 | |
6293 | 1357 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
5433 | 1358 |
6293 | 1359 if (error_state) |
1360 { | |
1361 error ("load: internal error loading struct elements"); | |
1362 return false; | |
1363 } | |
5433 | 1364 |
6293 | 1365 m.assign (nm, tcell); |
4817 | 1366 } |
1367 | |
1368 if (is) | |
1369 map = m; | |
1370 else | |
1371 { | |
1372 error ("load: failed to load structure"); | |
1373 success = false; | |
1374 } | |
1375 } | |
1376 else if (len == 0 ) | |
6292 | 1377 map = Octave_map (dim_vector (1, 1)); |
4817 | 1378 else |
1379 panic_impossible (); | |
1380 | |
1381 return success; | |
1382 } | |
1383 | |
1384 #if defined (HAVE_HDF5) | |
1385 | |
1386 bool | |
1387 octave_struct::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) | |
1388 { | |
1389 hid_t data_hid = -1; | |
1390 | |
1391 data_hid = H5Gcreate (loc_id, name, 0); | |
1392 if (data_hid < 0) return false; | |
1393 | |
1394 // recursively add each element of the structure to this group | |
1395 Octave_map m = map_value (); | |
1396 Octave_map::iterator i = m.begin (); | |
1397 while (i != m.end ()) | |
1398 { | |
5341 | 1399 octave_value val = map.contents (i); |
4817 | 1400 |
5341 | 1401 bool retval2 = add_hdf5_data (data_hid, val, m.key (i), "", false, |
4817 | 1402 save_as_floats); |
1403 | |
1404 if (! retval2) | |
1405 break; | |
1406 | |
1407 i++; | |
1408 } | |
1409 | |
1410 H5Gclose (data_hid); | |
4837 | 1411 |
4817 | 1412 return true; |
1413 } | |
1414 | |
1415 bool | |
1416 octave_struct::load_hdf5 (hid_t loc_id, const char *name, | |
1417 bool have_h5giterate_bug) | |
1418 { | |
1419 bool retval = false; | |
1420 | |
1421 hdf5_callback_data dsub; | |
1422 | |
1423 herr_t retval2 = 0; | |
6292 | 1424 Octave_map m (dim_vector (1, 1)); |
4817 | 1425 int current_item = 0; |
1426 #ifdef HAVE_H5GGET_NUM_OBJS | |
1427 hsize_t num_obj = 0; | |
5060 | 1428 hid_t group_id = H5Gopen (loc_id, name); |
1429 H5Gget_num_objs (group_id, &num_obj); | |
1430 H5Gclose (group_id); | |
4817 | 1431 |
1432 while (current_item < static_cast<int> (num_obj) | |
1433 && (retval2 = H5Giterate (loc_id, name, ¤t_item, | |
1434 hdf5_read_next_data, &dsub)) > 0) | |
1435 #else | |
1436 while ((retval2 = H5Giterate (loc_id, name, ¤t_item, | |
1437 hdf5_read_next_data, &dsub)) > 0) | |
1438 #endif | |
1439 { | |
5342 | 1440 octave_value t2 = dsub.tc; |
1441 | |
6293 | 1442 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
5433 | 1443 |
6293 | 1444 if (error_state) |
1445 { | |
1446 error ("load: internal error loading struct elements"); | |
1447 return false; | |
1448 } | |
5433 | 1449 |
6293 | 1450 m.assign (dsub.name, tcell); |
5336 | 1451 |
4817 | 1452 if (have_h5giterate_bug) |
1453 current_item++; // H5Giterate returned the last index processed | |
1454 } | |
1455 | |
1456 if (retval2 >= 0) | |
1457 { | |
1458 map = m; | |
1459 retval = true; | |
1460 } | |
1461 | |
1462 return retval; | |
1463 } | |
1464 | |
4687 | 1465 #endif |
1466 | |
5900 | 1467 mxArray * |
1468 octave_struct::as_mxArray (void) const | |
1469 { | |
1470 int nf = nfields (); | |
1471 string_vector kv = map_keys (); | |
6065 | 1472 |
1473 OCTAVE_LOCAL_BUFFER (const char *, f, nf); | |
1474 | |
5900 | 1475 for (int i = 0; i < nf; i++) |
6065 | 1476 f[i] = kv[i].c_str (); |
5900 | 1477 |
1478 mxArray *retval = new mxArray (dims (), nf, f); | |
1479 | |
1480 mxArray **elts = static_cast<mxArray **> (retval->get_data ()); | |
1481 | |
6686 | 1482 mwSize nel = numel (); |
5900 | 1483 |
6686 | 1484 mwSize ntot = nf * nel; |
5900 | 1485 |
1486 for (int i = 0; i < nf; i++) | |
1487 { | |
1488 Cell c = map.contents (kv[i]); | |
1489 | |
1490 const octave_value *p = c.data (); | |
1491 | |
6686 | 1492 mwIndex k = 0; |
1493 for (mwIndex j = i; j < ntot; j += nf) | |
5900 | 1494 elts[j] = new mxArray (p[k++]); |
1495 } | |
1496 | |
1497 return retval; | |
1498 } | |
1499 | |
2376 | 1500 /* |
1501 ;;; Local Variables: *** | |
1502 ;;; mode: C++ *** | |
1503 ;;; End: *** | |
1504 */ |