|
2376
|
1 /* |
|
|
2 |
|
2847
|
3 Copyright (C) 1996, 1997 John W. Eaton |
|
2376
|
4 |
|
|
5 This file is part of Octave. |
|
|
6 |
|
|
7 Octave is free software; you can redistribute it and/or modify it |
|
|
8 under the terms of the GNU General Public License as published by the |
|
|
9 Free Software Foundation; either version 2, or (at your option) any |
|
|
10 later version. |
|
|
11 |
|
|
12 Octave is distributed in the hope that it will be useful, but WITHOUT |
|
|
13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
|
14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
|
15 for more details. |
|
|
16 |
|
|
17 You should have received a copy of the GNU General Public License |
|
|
18 along with Octave; see the file COPYING. If not, write to the Free |
|
5307
|
19 Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA |
|
|
20 02110-1301, USA. |
|
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" |
|
2948
|
38 #include "variables.h" |
|
2376
|
39 |
|
4750
|
40 #include "Array-util.h" |
|
|
41 |
|
4687
|
42 #include "byte-swap.h" |
|
|
43 #include "ls-oct-ascii.h" |
|
|
44 #include "ls-oct-binary.h" |
|
|
45 #include "ls-hdf5.h" |
|
|
46 #include "ls-utils.h" |
|
|
47 |
|
3219
|
48 DEFINE_OCTAVE_ALLOCATOR(octave_struct); |
|
2376
|
49 |
|
4612
|
50 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_struct, "struct", "struct"); |
|
2376
|
51 |
|
4513
|
52 Cell |
|
3933
|
53 octave_struct::dotref (const octave_value_list& idx) |
|
2962
|
54 { |
|
4513
|
55 Cell retval; |
|
3933
|
56 |
|
|
57 assert (idx.length () == 1); |
|
2962
|
58 |
|
3933
|
59 std::string nm = idx(0).string_value (); |
|
|
60 |
|
4219
|
61 Octave_map::const_iterator p = map.seek (nm); |
|
2376
|
62 |
|
4219
|
63 if (p != map.end ()) |
|
3933
|
64 retval = map.contents (p); |
|
|
65 else |
|
2376
|
66 error ("structure has no member `%s'", nm.c_str ()); |
|
|
67 |
|
|
68 return retval; |
|
|
69 } |
|
|
70 |
|
4513
|
71 #if 0 |
|
3933
|
72 static void |
|
|
73 gripe_invalid_index (void) |
|
|
74 { |
|
|
75 error ("invalid index for structure array"); |
|
|
76 } |
|
4513
|
77 #endif |
|
3933
|
78 |
|
|
79 static void |
|
|
80 gripe_invalid_index_for_assignment (void) |
|
|
81 { |
|
|
82 error ("invalid index for structure array assignment"); |
|
|
83 } |
|
|
84 |
|
|
85 static void |
|
|
86 gripe_invalid_index_type (const std::string& nm, char t) |
|
|
87 { |
|
|
88 error ("%s cannot be indexed with %c", nm.c_str (), t); |
|
|
89 } |
|
|
90 |
|
|
91 static void |
|
|
92 gripe_failed_assignment (void) |
|
|
93 { |
|
|
94 error ("assignment to structure element failed"); |
|
|
95 } |
|
|
96 |
|
4994
|
97 octave_value_list |
|
4247
|
98 octave_struct::subsref (const std::string& type, |
|
4994
|
99 const std::list<octave_value_list>& idx, |
|
|
100 int nargout) |
|
3933
|
101 { |
|
4994
|
102 octave_value_list retval; |
|
3933
|
103 |
|
|
104 int skip = 1; |
|
|
105 |
|
|
106 switch (type[0]) |
|
|
107 { |
|
|
108 case '(': |
|
|
109 { |
|
|
110 if (type.length () > 1 && type[1] == '.') |
|
|
111 { |
|
4219
|
112 std::list<octave_value_list>::const_iterator p = idx.begin (); |
|
|
113 octave_value_list key_idx = *++p; |
|
3933
|
114 |
|
4513
|
115 Cell tmp = dotref (key_idx); |
|
3933
|
116 |
|
|
117 if (! error_state) |
|
|
118 { |
|
4513
|
119 Cell t = tmp.index (idx.front ()); |
|
3933
|
120 |
|
4994
|
121 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); |
|
3933
|
122 |
|
4513
|
123 // We handled two index elements, so tell |
|
|
124 // next_subsref to skip both of them. |
|
3933
|
125 |
|
4513
|
126 skip++; |
|
3933
|
127 } |
|
|
128 } |
|
|
129 else |
|
4994
|
130 retval(0) = map.index (idx.front ()); |
|
3933
|
131 } |
|
|
132 break; |
|
|
133 |
|
|
134 case '.': |
|
|
135 { |
|
5592
|
136 if (map.numel() > 0) |
|
|
137 { |
|
|
138 Cell t = dotref (idx.front ()); |
|
3933
|
139 |
|
5592
|
140 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true); |
|
|
141 } |
|
3933
|
142 } |
|
|
143 break; |
|
|
144 |
|
|
145 case '{': |
|
|
146 gripe_invalid_index_type (type_name (), type[0]); |
|
|
147 break; |
|
|
148 |
|
|
149 default: |
|
|
150 panic_impossible (); |
|
|
151 } |
|
|
152 |
|
4994
|
153 // XXX FIXME XXX -- perhaps there should be an |
|
|
154 // octave_value_list::next_subsref member function? See also |
|
|
155 // octave_user_function::subsref. |
|
|
156 |
|
|
157 if (idx.size () > 1) |
|
5028
|
158 retval = retval(0).next_subsref (nargout, type, idx, skip); |
|
3933
|
159 |
|
|
160 return retval; |
|
|
161 } |
|
|
162 |
|
|
163 octave_value |
|
4513
|
164 octave_struct::numeric_conv (const Cell& val, |
|
3933
|
165 const std::string& type) |
|
|
166 { |
|
|
167 octave_value retval; |
|
|
168 |
|
|
169 if (val.length () == 1) |
|
|
170 { |
|
|
171 retval = val(0); |
|
|
172 |
|
|
173 if (type.length () > 0 && type[0] == '.' && ! retval.is_map ()) |
|
|
174 retval = Octave_map (); |
|
|
175 } |
|
|
176 else |
|
|
177 gripe_invalid_index_for_assignment (); |
|
|
178 |
|
|
179 return retval; |
|
|
180 } |
|
|
181 |
|
|
182 octave_value |
|
4247
|
183 octave_struct::subsasgn (const std::string& type, |
|
4219
|
184 const std::list<octave_value_list>& idx, |
|
3933
|
185 const octave_value& rhs) |
|
2376
|
186 { |
|
3933
|
187 octave_value retval; |
|
|
188 |
|
|
189 int n = type.length (); |
|
|
190 |
|
|
191 octave_value t_rhs = rhs; |
|
|
192 |
|
|
193 if (n > 1 && ! (type.length () == 2 && type[0] == '(' && type[1] == '.')) |
|
|
194 { |
|
|
195 switch (type[0]) |
|
|
196 { |
|
|
197 case '(': |
|
|
198 { |
|
|
199 if (type.length () > 1 && type[1] == '.') |
|
|
200 { |
|
4219
|
201 std::list<octave_value_list>::const_iterator p = idx.begin (); |
|
|
202 octave_value_list t_idx = *p; |
|
3933
|
203 |
|
4513
|
204 octave_value_list key_idx = *++p; |
|
|
205 |
|
|
206 assert (key_idx.length () == 1); |
|
3933
|
207 |
|
4513
|
208 std::string key = key_idx(0).string_value (); |
|
3933
|
209 |
|
4513
|
210 octave_value u; |
|
3933
|
211 |
|
4513
|
212 if (! map.contains (key)) |
|
|
213 u = octave_value::empty_conv (type.substr (2), rhs); |
|
|
214 else |
|
|
215 { |
|
4675
|
216 Cell map_val = map.contents (key); |
|
3933
|
217 |
|
4513
|
218 Cell map_elt = map_val.index (idx.front (), true); |
|
3933
|
219 |
|
4513
|
220 u = numeric_conv (map_elt, type.substr (2)); |
|
|
221 } |
|
3933
|
222 |
|
4513
|
223 if (! error_state) |
|
|
224 { |
|
|
225 std::list<octave_value_list> next_idx (idx); |
|
3933
|
226 |
|
4513
|
227 // We handled two index elements, so subsasgn to |
|
|
228 // needs to skip both of them. |
|
3933
|
229 |
|
4513
|
230 next_idx.erase (next_idx.begin ()); |
|
|
231 next_idx.erase (next_idx.begin ()); |
|
4059
|
232 |
|
4513
|
233 u.make_unique (); |
|
|
234 |
|
|
235 t_rhs = u.subsasgn (type.substr (2), next_idx, rhs); |
|
3933
|
236 } |
|
|
237 } |
|
|
238 else |
|
|
239 gripe_invalid_index_for_assignment (); |
|
|
240 } |
|
|
241 break; |
|
|
242 |
|
|
243 case '.': |
|
|
244 { |
|
|
245 octave_value_list key_idx = idx.front (); |
|
|
246 |
|
|
247 assert (key_idx.length () == 1); |
|
|
248 |
|
|
249 std::string key = key_idx(0).string_value (); |
|
|
250 |
|
|
251 octave_value u; |
|
|
252 |
|
|
253 if (! map.contains (key)) |
|
|
254 u = octave_value::empty_conv (type.substr (1), rhs); |
|
|
255 else |
|
|
256 { |
|
4675
|
257 Cell map_val = map.contents (key); |
|
3933
|
258 |
|
|
259 u = numeric_conv (map_val, type.substr (1)); |
|
|
260 } |
|
|
261 |
|
|
262 if (! error_state) |
|
|
263 { |
|
4219
|
264 std::list<octave_value_list> next_idx (idx); |
|
3933
|
265 |
|
4219
|
266 next_idx.erase (next_idx.begin ()); |
|
3933
|
267 |
|
4059
|
268 u.make_unique (); |
|
|
269 |
|
3933
|
270 t_rhs = u.subsasgn (type.substr (1), next_idx, rhs); |
|
|
271 } |
|
|
272 } |
|
|
273 break; |
|
|
274 |
|
|
275 case '{': |
|
|
276 gripe_invalid_index_type (type_name (), type[0]); |
|
|
277 break; |
|
|
278 |
|
|
279 default: |
|
|
280 panic_impossible (); |
|
|
281 } |
|
|
282 } |
|
|
283 |
|
|
284 if (! error_state) |
|
|
285 { |
|
|
286 switch (type[0]) |
|
|
287 { |
|
|
288 case '(': |
|
|
289 { |
|
|
290 if (n > 1 && type[1] == '.') |
|
|
291 { |
|
4219
|
292 std::list<octave_value_list>::const_iterator p = idx.begin (); |
|
|
293 octave_value_list key_idx = *++p; |
|
3933
|
294 |
|
|
295 assert (key_idx.length () == 1); |
|
|
296 |
|
|
297 std::string key = key_idx(0).string_value (); |
|
|
298 |
|
|
299 if (! error_state) |
|
|
300 { |
|
4513
|
301 map.assign (idx.front (), key, t_rhs); |
|
3933
|
302 |
|
4513
|
303 if (! error_state) |
|
|
304 retval = octave_value (this, count + 1); |
|
3933
|
305 else |
|
4513
|
306 gripe_failed_assignment (); |
|
3933
|
307 } |
|
|
308 else |
|
|
309 gripe_failed_assignment (); |
|
|
310 } |
|
|
311 else |
|
4197
|
312 { |
|
5592
|
313 if (t_rhs.is_map()) |
|
4197
|
314 { |
|
5592
|
315 Octave_map rhs_map = t_rhs.map_value (); |
|
4197
|
316 |
|
|
317 if (! error_state) |
|
5592
|
318 { |
|
|
319 map.assign (idx.front (), rhs_map); |
|
|
320 |
|
|
321 if (! error_state) |
|
|
322 retval = octave_value (this, count + 1); |
|
|
323 else |
|
|
324 gripe_failed_assignment (); |
|
|
325 } |
|
4197
|
326 else |
|
5592
|
327 error ("invalid structure assignment"); |
|
4197
|
328 } |
|
4513
|
329 else |
|
5592
|
330 { |
|
|
331 if (t_rhs.is_empty()) |
|
|
332 { |
|
|
333 map.maybe_delete_elements (idx.front()); |
|
|
334 |
|
|
335 if (! error_state) |
|
|
336 retval = octave_value (this, count + 1); |
|
|
337 else |
|
|
338 gripe_failed_assignment (); |
|
|
339 } |
|
|
340 else |
|
|
341 error ("invalid structure assignment"); |
|
|
342 } |
|
4197
|
343 } |
|
3933
|
344 } |
|
|
345 break; |
|
|
346 |
|
|
347 case '.': |
|
|
348 { |
|
|
349 octave_value_list key_idx = idx.front (); |
|
|
350 |
|
|
351 assert (key_idx.length () == 1); |
|
|
352 |
|
|
353 std::string key = key_idx(0).string_value (); |
|
|
354 |
|
|
355 map.assign (key, t_rhs); |
|
|
356 |
|
|
357 if (! error_state) |
|
|
358 retval = octave_value (this, count + 1); |
|
|
359 else |
|
|
360 gripe_failed_assignment (); |
|
|
361 } |
|
|
362 break; |
|
|
363 |
|
|
364 case '{': |
|
|
365 gripe_invalid_index_type (type_name (), type[0]); |
|
|
366 break; |
|
|
367 |
|
|
368 default: |
|
|
369 panic_impossible (); |
|
|
370 } |
|
|
371 } |
|
|
372 else |
|
|
373 gripe_failed_assignment (); |
|
|
374 |
|
|
375 return retval; |
|
2376
|
376 } |
|
|
377 |
|
4791
|
378 size_t |
|
|
379 octave_struct::byte_size (void) const |
|
|
380 { |
|
|
381 // Neglect the size of the fieldnames. |
|
|
382 |
|
|
383 size_t retval = 0; |
|
|
384 |
|
|
385 for (Octave_map::const_iterator p = map.begin (); p != map.end (); p++) |
|
|
386 { |
|
|
387 std::string key = map.key (p); |
|
|
388 |
|
|
389 octave_value val = octave_value (map.contents (p)); |
|
|
390 |
|
|
391 retval += val.byte_size (); |
|
|
392 } |
|
|
393 |
|
|
394 return retval; |
|
|
395 } |
|
|
396 |
|
2376
|
397 void |
|
3523
|
398 octave_struct::print (std::ostream& os, bool) const |
|
2901
|
399 { |
|
|
400 print_raw (os); |
|
|
401 } |
|
|
402 |
|
|
403 void |
|
3523
|
404 octave_struct::print_raw (std::ostream& os, bool) const |
|
2376
|
405 { |
|
|
406 // XXX FIXME XXX -- would be nice to print the output in some |
|
|
407 // standard order. Maybe all substructures first, maybe |
|
|
408 // alphabetize entries, etc. |
|
|
409 |
|
2985
|
410 unwind_protect::begin_frame ("octave_struct_print"); |
|
2376
|
411 |
|
|
412 unwind_protect_int (Vstruct_levels_to_print); |
|
|
413 |
|
3961
|
414 if (Vstruct_levels_to_print >= 0) |
|
2376
|
415 { |
|
5598
|
416 bool print_keys_only = (Vstruct_levels_to_print == 0 |
|
|
417 || map.numel () == 0); |
|
3961
|
418 |
|
|
419 Vstruct_levels_to_print--; |
|
|
420 |
|
2901
|
421 indent (os); |
|
|
422 os << "{"; |
|
|
423 newline (os); |
|
2376
|
424 |
|
2901
|
425 increment_indent_level (); |
|
2376
|
426 |
|
5598
|
427 octave_idx_type n = map.numel (); |
|
3932
|
428 |
|
5598
|
429 if (n == 0 || (n > 1 && print_keys_only)) |
|
4604
|
430 { |
|
|
431 indent (os); |
|
|
432 dim_vector dv = dims (); |
|
|
433 os << dv.str () << " struct array containing the fields:"; |
|
|
434 newline (os); |
|
|
435 newline (os); |
|
|
436 |
|
|
437 increment_indent_level (); |
|
|
438 } |
|
|
439 |
|
4219
|
440 for (Octave_map::const_iterator p = map.begin (); p != map.end (); p++) |
|
2376
|
441 { |
|
3523
|
442 std::string key = map.key (p); |
|
4513
|
443 Cell val = map.contents (p); |
|
2376
|
444 |
|
4499
|
445 octave_value tmp = (n == 1) ? val(0) : octave_value (val, true); |
|
3961
|
446 |
|
|
447 if (print_keys_only) |
|
3932
|
448 { |
|
3961
|
449 indent (os); |
|
4604
|
450 os << key; |
|
|
451 if (n == 1) |
|
|
452 { |
|
|
453 dim_vector dv = tmp.dims (); |
|
|
454 os << ": " << dv.str () << " " << tmp.type_name (); |
|
|
455 } |
|
3961
|
456 newline (os); |
|
3932
|
457 } |
|
3961
|
458 else |
|
4121
|
459 tmp.print_with_name (os, key); |
|
2376
|
460 } |
|
|
461 |
|
5598
|
462 if (n == 0 || (n > 1 && print_keys_only)) |
|
4604
|
463 decrement_indent_level (); |
|
|
464 |
|
2901
|
465 decrement_indent_level (); |
|
2376
|
466 |
|
2901
|
467 indent (os); |
|
|
468 os << "}"; |
|
|
469 newline (os); |
|
2376
|
470 } |
|
|
471 else |
|
2901
|
472 { |
|
3961
|
473 indent (os); |
|
|
474 os << "<structure>"; |
|
2901
|
475 newline (os); |
|
|
476 } |
|
2376
|
477 |
|
2985
|
478 unwind_protect::run_frame ("octave_struct_print"); |
|
2376
|
479 } |
|
|
480 |
|
2901
|
481 bool |
|
3523
|
482 octave_struct::print_name_tag (std::ostream& os, const std::string& name) const |
|
2901
|
483 { |
|
3961
|
484 bool retval = false; |
|
|
485 |
|
2901
|
486 indent (os); |
|
3961
|
487 |
|
|
488 if (Vstruct_levels_to_print < 0) |
|
|
489 os << name << " = "; |
|
|
490 else |
|
|
491 { |
|
|
492 os << name << " ="; |
|
|
493 newline (os); |
|
|
494 retval = true; |
|
|
495 } |
|
|
496 |
|
|
497 return retval; |
|
2901
|
498 } |
|
|
499 |
|
4744
|
500 static bool |
|
|
501 scalar (const dim_vector& dims) |
|
|
502 { |
|
|
503 return dims.length () == 2 && dims (0) == 1 && dims (1) == 1; |
|
|
504 } |
|
|
505 |
|
|
506 /* |
|
|
507 %!shared x |
|
|
508 %! x(1).a=1; x(2).a=2; x(1).b=3; x(2).b=3; |
|
|
509 %!assert(struct('a',1,'b',3),x(1)) |
|
5592
|
510 %!assert(isempty(x([]))) |
|
|
511 %!assert(isempty(struct('a',{},'b',{}))) |
|
4744
|
512 %!assert(struct('a',{1,2},'b',{3,3}),x) |
|
|
513 %!assert(struct('a',{1,2},'b',3),x) |
|
|
514 %!assert(struct('a',{1,2},'b',{3}),x) |
|
|
515 %!assert(struct('b',3,'a',{1,2}),x) |
|
|
516 %!assert(struct('b',{3},'a',{1,2}),x) |
|
|
517 %!test x=struct([]); |
|
|
518 %!assert(size(x),[0,0]); |
|
|
519 %!assert(isstruct(x)); |
|
|
520 %!assert(isempty(fieldnames(x))); |
|
|
521 %!fail("struct('a',{1,2},'b',{1,2,3})","dimensions of parameter 2 do not match those of parameter 4") |
|
5582
|
522 %!fail("struct(1,2,3,4)","struct expects alternating \"field\", VALUE pairs"); |
|
|
523 %!fail("struct('1',2,'3')","struct expects alternating \"field\", VALUE pairs"); |
|
4744
|
524 */ |
|
|
525 |
|
|
526 DEFUN (struct, args, , |
|
|
527 "-*- texinfo -*-\n\ |
|
|
528 @deftypefn {Built-in Function} {} struct (\"field\", @var{value}, \"field\", @var{value}, @dots{})\n\ |
|
|
529 \n\ |
|
|
530 Create a structure and initialize its value.\n\ |
|
|
531 \n\ |
|
|
532 If the values are cell arrays, create a structure array and initialize\n\ |
|
|
533 its values. The dimensions of each cell array of values must match.\n\ |
|
|
534 Singleton cells and non-cell values are repeated so that they fill\n\ |
|
|
535 the entire array. If the cells are empty, create an empty structure\n\ |
|
4911
|
536 array with the specified field names.\n\ |
|
|
537 @end deftypefn") |
|
4744
|
538 { |
|
|
539 octave_value_list retval; |
|
|
540 |
|
|
541 int nargin = args.length (); |
|
|
542 |
|
5444
|
543 // struct ([]) returns an empty struct. |
|
|
544 |
|
|
545 // struct (empty_matrix) returns an empty struct with the same |
|
|
546 // dimensions as the empty matrix. |
|
|
547 |
|
|
548 // Note that struct () creates a 1x1 struct with no fields for |
|
|
549 // compatibility with Matlab. |
|
4744
|
550 |
|
|
551 if (nargin == 1 && args(0).is_empty () && args(0).is_real_matrix ()) |
|
5444
|
552 return octave_value (Octave_map (args(0).dims ())); |
|
4744
|
553 |
|
|
554 // Check for "field", VALUE pairs. |
|
|
555 |
|
|
556 for (int i = 0; i < nargin; i += 2) |
|
|
557 { |
|
|
558 if (! args(i).is_string () || i + 1 >= nargin) |
|
|
559 { |
|
|
560 error ("struct expects alternating \"field\", VALUE pairs"); |
|
|
561 return retval; |
|
|
562 } |
|
|
563 } |
|
|
564 |
|
|
565 // Check that the dimensions of the values correspond. |
|
|
566 |
|
|
567 dim_vector dims (1, 1); |
|
|
568 |
|
|
569 int first_dimensioned_value = 0; |
|
|
570 |
|
|
571 for (int i = 1; i < nargin; i += 2) |
|
|
572 { |
|
|
573 if (args(i).is_cell ()) |
|
|
574 { |
|
|
575 dim_vector argdims (args(i).dims ()); |
|
|
576 |
|
|
577 if (! scalar (argdims)) |
|
|
578 { |
|
|
579 if (! first_dimensioned_value) |
|
|
580 { |
|
|
581 dims = argdims; |
|
|
582 first_dimensioned_value = i + 1; |
|
|
583 } |
|
|
584 else if (dims != argdims) |
|
|
585 { |
|
|
586 error ("struct: dimensions of parameter %d do not match those of parameter %d", |
|
|
587 first_dimensioned_value, i+1); |
|
|
588 return retval; |
|
|
589 } |
|
|
590 } |
|
|
591 } |
|
|
592 } |
|
|
593 |
|
|
594 // Create the return value. |
|
|
595 |
|
|
596 Octave_map map (dims); |
|
|
597 |
|
|
598 for (int i = 0; i < nargin; i+= 2) |
|
|
599 { |
|
|
600 // Get key. |
|
|
601 |
|
|
602 std::string key (args(i).string_value ()); |
|
|
603 |
|
|
604 if (error_state) |
|
|
605 return retval; |
|
|
606 |
|
|
607 // Value may be v, { v }, or { v1, v2, ... } |
|
|
608 // In the first two cases, we need to create a cell array of |
|
|
609 // the appropriate dimensions filled with v. In the last case, |
|
|
610 // the cell array has already been determined to be of the |
|
|
611 // correct dimensions. |
|
|
612 |
|
|
613 if (args(i+1).is_cell ()) |
|
|
614 { |
|
|
615 const Cell c (args(i+1).cell_value ()); |
|
|
616 |
|
|
617 if (error_state) |
|
|
618 return retval; |
|
|
619 |
|
|
620 if (scalar (c.dims ())) |
|
|
621 map.assign (key, Cell (dims, c(0))); |
|
|
622 else |
|
|
623 map.assign (key, c); |
|
|
624 } |
|
|
625 else |
|
|
626 map.assign (key, Cell (dims, args(i+1))); |
|
|
627 |
|
|
628 if (error_state) |
|
|
629 return retval; |
|
|
630 } |
|
|
631 |
|
|
632 return octave_value (map); |
|
|
633 } |
|
|
634 |
|
4358
|
635 DEFUN (isstruct, args, , |
|
|
636 "-*- texinfo -*-\n\ |
|
|
637 @deftypefn {Built-in Function} {} isstruct (@var{expr})\n\ |
|
|
638 Return 1 if the value of the expression @var{expr} is a structure.\n\ |
|
|
639 @end deftypefn") |
|
|
640 { |
|
|
641 octave_value retval; |
|
|
642 |
|
|
643 if (args.length () == 1) |
|
|
644 retval = args(0).is_map (); |
|
|
645 else |
|
|
646 print_usage ("isstruct"); |
|
|
647 |
|
|
648 return retval; |
|
|
649 } |
|
|
650 |
|
|
651 DEFUN (fieldnames, args, , |
|
|
652 "-*- texinfo -*-\n\ |
|
|
653 @deftypefn {Built-in Function} {} fieldnames (@var{struct})\n\ |
|
|
654 Return a cell array of strings naming the elements of the structure\n\ |
|
|
655 @var{struct}. It is an error to call @code{fieldnames} with an\n\ |
|
|
656 argument that is not a structure.\n\ |
|
|
657 @end deftypefn") |
|
|
658 { |
|
|
659 octave_value retval; |
|
|
660 |
|
|
661 int nargin = args.length (); |
|
|
662 |
|
|
663 if (nargin == 1) |
|
|
664 { |
|
|
665 if (args(0).is_map ()) |
|
|
666 { |
|
|
667 Octave_map m = args(0).map_value (); |
|
4744
|
668 string_vector keys = m.keys (); |
|
|
669 if (keys.length () == 0) |
|
|
670 retval = Cell (0, 1); |
|
|
671 else |
|
|
672 retval = Cell (m.keys ()); |
|
4358
|
673 } |
|
|
674 else |
|
|
675 gripe_wrong_type_arg ("fieldnames", args(0)); |
|
|
676 } |
|
|
677 else |
|
|
678 print_usage ("fieldnames"); |
|
|
679 |
|
|
680 return retval; |
|
|
681 } |
|
|
682 |
|
|
683 DEFUN (isfield, args, , |
|
|
684 "-*- texinfo -*-\n\ |
|
|
685 @deftypefn {Built-in Function} {} isfield (@var{expr}, @var{name})\n\ |
|
|
686 Return true if the expression @var{expr} is a structure and it includes an\n\ |
|
|
687 element named @var{name}. The first argument must be a structure and\n\ |
|
|
688 the second must be a string.\n\ |
|
|
689 @end deftypefn") |
|
|
690 { |
|
|
691 octave_value retval; |
|
|
692 |
|
|
693 int nargin = args.length (); |
|
|
694 |
|
|
695 if (nargin == 2) |
|
|
696 { |
|
|
697 retval = false; |
|
|
698 |
|
|
699 // XXX FIXME XXX -- should this work for all types that can do |
|
|
700 // structure reference operations? |
|
|
701 |
|
|
702 if (args(0).is_map () && args(1).is_string ()) |
|
|
703 { |
|
|
704 std::string key = args(1).string_value (); |
|
|
705 |
|
|
706 Octave_map m = args(0).map_value (); |
|
|
707 |
|
|
708 retval = m.contains (key) != 0; |
|
|
709 } |
|
|
710 } |
|
|
711 else |
|
|
712 print_usage ("isfield"); |
|
|
713 |
|
|
714 return retval; |
|
|
715 } |
|
|
716 |
|
4750
|
717 // Check that the dimensions of the input arguments are correct. |
|
|
718 |
|
|
719 static bool |
|
|
720 cell2struct_check_args (const dim_vector& c_dv, const dim_vector& f_dv, |
|
|
721 bool is_cell, int dim) |
|
|
722 { |
|
4751
|
723 bool retval = true; |
|
4750
|
724 |
|
|
725 if (dim >= 0 && dim < c_dv.length ()) |
|
|
726 { |
|
|
727 if (is_cell) |
|
|
728 { |
|
4752
|
729 if (f_dv.numel () != c_dv(dim)) |
|
4750
|
730 { |
|
4751
|
731 error ("cell2struct: numel (FIELD) != size (CELL, DIM)"); |
|
4750
|
732 |
|
|
733 retval = false; |
|
|
734 } |
|
|
735 } |
|
|
736 else |
|
|
737 { |
|
|
738 if (f_dv.length () > 2) |
|
|
739 { |
|
4751
|
740 error ("cell2struct: field array must be a 2-d matrix"); |
|
4750
|
741 |
|
|
742 retval = false; |
|
|
743 } |
|
|
744 else if (f_dv(0) != c_dv(dim)) |
|
|
745 { |
|
4751
|
746 error ("cell2struct: size (FIELD, 1) != length (C, DIM)"); |
|
4750
|
747 |
|
|
748 retval = false; |
|
|
749 } |
|
|
750 } |
|
|
751 } |
|
|
752 else |
|
|
753 { |
|
|
754 error ("cell2struct: DIM out of range"); |
|
|
755 |
|
|
756 retval = false; |
|
|
757 } |
|
|
758 |
|
|
759 return retval; |
|
|
760 } |
|
|
761 |
|
|
762 static void |
|
5275
|
763 cell2struct_construct_idx (Array<octave_idx_type>& ra_idx1, |
|
|
764 const Array<octave_idx_type>& ra_idx2, |
|
|
765 octave_idx_type dim, octave_idx_type fill_value) |
|
4750
|
766 { |
|
5275
|
767 octave_idx_type iidx = 0; |
|
4750
|
768 |
|
5275
|
769 for (octave_idx_type idx = 0; idx < ra_idx1.length (); idx++) |
|
4750
|
770 { |
|
|
771 if (idx == dim) |
|
|
772 ra_idx1.elem (idx) = fill_value; |
|
|
773 else |
|
|
774 ra_idx1.elem (idx) = ra_idx2(iidx++); |
|
|
775 } |
|
|
776 } |
|
|
777 |
|
|
778 DEFUN (cell2struct, args, , |
|
|
779 "-*- texinfo -*-\n\ |
|
4817
|
780 @deftypefn {Built-in Function} {} cell2struct (@var{cell}, @var{fields}, @var{dim})\n\ |
|
|
781 Convert @var{cell} to a structure. The number of fields in @var{fields}\n\ |
|
|
782 must match the number of elements in @var{cell} along dimension @var{dim},\n\ |
|
|
783 that is @code{numel (@var{fields}) == size (@var{cell}, @var{dim})}.\n\ |
|
4750
|
784 \n\ |
|
|
785 @example\n\ |
|
|
786 @group\n\ |
|
|
787 A = cell2struct(@{'Peter', 'Hannah', 'Robert'; 185, 170, 168@}, @{'Name','Height'@}, 1);\n\ |
|
|
788 A(1)\n\ |
|
|
789 @result{} ans =\n\ |
|
4780
|
790 @{\n\ |
|
|
791 Height = 185\n\ |
|
|
792 Name = Peter\n\ |
|
|
793 @}\n\ |
|
4750
|
794 \n\ |
|
|
795 @end group\n\ |
|
|
796 @end example\n\ |
|
|
797 @end deftypefn") |
|
|
798 { |
|
|
799 octave_value retval; |
|
|
800 |
|
4751
|
801 if (args.length () == 3) |
|
4750
|
802 { |
|
4751
|
803 Cell c = args(0).cell_value (); |
|
4750
|
804 |
|
4751
|
805 if (! error_state) |
|
4750
|
806 { |
|
4751
|
807 octave_value field = args(1); |
|
4750
|
808 |
|
4751
|
809 // Field is either cell or character matrix. |
|
4750
|
810 |
|
4752
|
811 // XXX FIXME XX -- this could be simplified if we had |
|
|
812 // cellstr and iscellstr functions available. |
|
|
813 |
|
4751
|
814 bool field_is_cell = field.is_cell (); |
|
4750
|
815 |
|
4751
|
816 Cell field_cell; |
|
|
817 charMatrix field_char; |
|
4750
|
818 |
|
|
819 if (field_is_cell) |
|
4751
|
820 field_cell = field.cell_value (); |
|
|
821 else |
|
|
822 field_char = field.char_matrix_value (); |
|
|
823 |
|
|
824 if (! error_state) |
|
4750
|
825 { |
|
4751
|
826 // Retrieve the dimension value. |
|
|
827 |
|
|
828 // XXX FIX ME XXX -- int_value () should print out the |
|
|
829 // conversions it does to be Matlab compatible. |
|
|
830 |
|
5275
|
831 octave_idx_type dim = args(2).int_value () - 1; |
|
4751
|
832 |
|
|
833 if (! error_state) |
|
|
834 { |
|
|
835 dim_vector c_dv = c.dims (); |
|
|
836 dim_vector field_dv = field.dims (); |
|
|
837 |
|
|
838 if (cell2struct_check_args (c_dv, field_dv, field_is_cell, |
|
|
839 dim)) |
|
|
840 { |
|
5275
|
841 octave_idx_type c_dv_length = c_dv.length (); |
|
4751
|
842 |
|
|
843 // Dimension vector for the Cell arrays to be |
|
|
844 // put into the structure. |
|
|
845 |
|
|
846 dim_vector value_dv; |
|
|
847 |
|
|
848 // Initialize c_value_dv. |
|
4750
|
849 |
|
4751
|
850 if (c_dv_length == 2) |
|
|
851 value_dv = dim_vector (1, 1); |
|
|
852 else |
|
|
853 value_dv.resize (c_dv_length - 1); |
|
|
854 |
|
5275
|
855 octave_idx_type idx_tmp = 0; |
|
4751
|
856 |
|
5275
|
857 for (octave_idx_type i = 0; i < c_dv_length; i++) |
|
4751
|
858 { |
|
|
859 if (i != dim) |
|
|
860 value_dv.elem (idx_tmp++) = c_dv.elem (i); |
|
|
861 } |
|
|
862 |
|
|
863 // All initializing is done, we can start moving |
|
|
864 // values. |
|
|
865 |
|
|
866 Octave_map map; |
|
|
867 |
|
|
868 // If field is a cell array then we use all |
|
|
869 // elements in array, on the other hand when |
|
|
870 // field is a character array the number of |
|
|
871 // elements is equals the number of rows. |
|
|
872 |
|
5275
|
873 octave_idx_type field_numel |
|
4751
|
874 = field_is_cell ? field_dv.numel (): field_dv(0); |
|
|
875 |
|
|
876 // For matlab compatibility. |
|
|
877 |
|
|
878 if (field_numel == 0) |
|
|
879 map.reshape (dim_vector (0, 1)); |
|
4750
|
880 |
|
5275
|
881 for (octave_idx_type i = 0; i < field_numel; i++) |
|
4751
|
882 { |
|
|
883 // Construct cell array which goes into the |
|
|
884 // structure together with the appropriate |
|
|
885 // field name. |
|
|
886 |
|
|
887 Cell c_value (value_dv); |
|
|
888 |
|
5275
|
889 Array<octave_idx_type> value_idx (value_dv.length (), 0); |
|
|
890 Array<octave_idx_type> c_idx (c_dv_length, 0); |
|
4751
|
891 |
|
5275
|
892 for (octave_idx_type j = 0; j < value_dv.numel (); j++) |
|
4751
|
893 { |
|
|
894 // Need to do this to construct the |
|
|
895 // appropriate idx for getting elements |
|
|
896 // from the original cell array. |
|
|
897 |
|
|
898 cell2struct_construct_idx (c_idx, value_idx, |
|
|
899 dim, i); |
|
|
900 |
|
|
901 c_value.elem (value_idx) = c.elem (c_idx); |
|
|
902 |
|
|
903 increment_index (value_idx, value_dv); |
|
|
904 } |
|
|
905 |
|
|
906 std::string field_str; |
|
4750
|
907 |
|
4751
|
908 if (field_is_cell) |
|
|
909 { |
|
|
910 // Matlab retrieves the field values |
|
|
911 // column by column. |
|
|
912 |
|
|
913 octave_value field_tmp = field_cell.elem (i); |
|
|
914 |
|
|
915 field_str = field_tmp.string_value (); |
|
|
916 |
|
|
917 if (error_state) |
|
|
918 { |
|
|
919 error ("cell2struct: fields have to be of type string"); |
|
|
920 break; |
|
|
921 } |
|
|
922 } |
|
|
923 else |
|
|
924 { |
|
|
925 field_str = field_char.row_as_string (i); |
|
|
926 |
|
|
927 if (error_state) |
|
|
928 return retval; |
|
|
929 } |
|
|
930 |
|
|
931 map.reshape (value_dv); |
|
|
932 |
|
|
933 map.assign (field_str, c_value); |
|
|
934 } |
|
|
935 |
|
|
936 if (! error_state) |
|
|
937 retval = map; |
|
|
938 } |
|
4750
|
939 } |
|
4751
|
940 else |
|
|
941 error ("cell2struct: expecting third argument to be an integer"); |
|
4750
|
942 } |
|
|
943 else |
|
4751
|
944 error ("cell2struct: expecting second argument to be a cell or character array"); |
|
4750
|
945 } |
|
4751
|
946 else |
|
|
947 error ("cell2struct: expecting first argument to be a cell array"); |
|
4750
|
948 } |
|
4751
|
949 else |
|
|
950 print_usage ("cell2struct"); |
|
4750
|
951 |
|
|
952 return retval; |
|
|
953 } |
|
|
954 |
|
4817
|
955 // So we can call Fcellstr directly. |
|
|
956 extern octave_value_list Fcellstr (const octave_value_list& args, int); |
|
|
957 |
|
|
958 DEFUN (rmfield, args, , |
|
|
959 "-*- texinfo -*-\n\ |
|
|
960 @deftypefn {Built-in Function} {} rmfield (@var{s}, @var{f})\n\ |
|
|
961 Remove field @var{f} from the structure @var{s}. If @var{f} is a\n\ |
|
|
962 cell array of character strings or a character array, remove the\n\ |
|
|
963 named fields.\n\ |
|
|
964 @end deftypefn\n\ |
|
|
965 @seealso{cellstr, iscellstr, and setfield") |
|
|
966 { |
|
|
967 octave_value retval; |
|
|
968 |
|
|
969 int nargin = args.length (); |
|
|
970 |
|
|
971 if (nargin == 2) |
|
|
972 { |
|
|
973 Octave_map m = args(0).map_value (); |
|
|
974 |
|
|
975 octave_value_list fval = Fcellstr (args(1), 1); |
|
|
976 |
|
|
977 if (! error_state) |
|
|
978 { |
|
|
979 Cell fcell = fval(0).cell_value (); |
|
|
980 |
|
|
981 for (int i = 0; i < fcell.numel (); i++) |
|
|
982 { |
|
|
983 std::string key = fcell(i).string_value (); |
|
|
984 |
|
|
985 if (m.contains (key)) |
|
|
986 m.del (key); |
|
|
987 else |
|
|
988 { |
|
|
989 error ("rmfield: structure does not contain field %s", |
|
|
990 key.c_str ()); |
|
|
991 |
|
|
992 break; |
|
|
993 } |
|
|
994 } |
|
|
995 |
|
|
996 if (! error_state) |
|
|
997 retval = m; |
|
|
998 } |
|
|
999 } |
|
|
1000 else |
|
|
1001 print_usage ("rmfield"); |
|
|
1002 |
|
|
1003 return retval; |
|
|
1004 } |
|
|
1005 |
|
|
1006 bool |
|
|
1007 octave_struct::save_ascii (std::ostream& os, bool& infnan_warned, |
|
|
1008 bool strip_nan_and_inf) |
|
|
1009 { |
|
|
1010 Octave_map m = map_value (); |
|
|
1011 os << "# length: " << m.length () << "\n"; |
|
|
1012 |
|
|
1013 Octave_map::iterator i = m.begin (); |
|
|
1014 while (i != m.end ()) |
|
|
1015 { |
|
5341
|
1016 octave_value val = map.contents (i); |
|
4817
|
1017 |
|
5341
|
1018 bool b = save_ascii_data (os, val, m.key (i), infnan_warned, |
|
4817
|
1019 strip_nan_and_inf, 0, 0); |
|
|
1020 |
|
|
1021 if (! b) |
|
|
1022 return os; |
|
|
1023 |
|
|
1024 i++; |
|
|
1025 } |
|
|
1026 |
|
|
1027 return true; |
|
|
1028 } |
|
|
1029 |
|
|
1030 bool |
|
|
1031 octave_struct::load_ascii (std::istream& is) |
|
|
1032 { |
|
5275
|
1033 octave_idx_type len = 0; |
|
4817
|
1034 bool success = true; |
|
|
1035 |
|
|
1036 if (extract_keyword (is, "length", len) && len >= 0) |
|
|
1037 { |
|
|
1038 if (len > 0) |
|
|
1039 { |
|
|
1040 Octave_map m (map); |
|
|
1041 |
|
5275
|
1042 for (octave_idx_type j = 0; j < len; j++) |
|
4817
|
1043 { |
|
|
1044 octave_value t2; |
|
|
1045 bool dummy; |
|
|
1046 |
|
|
1047 // recurse to read cell elements |
|
|
1048 std::string nm |
|
|
1049 = read_ascii_data (is, std::string (), dummy, t2, count); |
|
|
1050 |
|
|
1051 if (!is) |
|
|
1052 break; |
|
|
1053 |
|
5342
|
1054 // Try for some backward compatibility... |
|
5433
|
1055 if (t2.is_cell () && t2.length() > 1) |
|
|
1056 m.assign (nm, t2); |
|
|
1057 else |
|
5336
|
1058 { |
|
5433
|
1059 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
|
|
1060 |
|
|
1061 if (error_state) |
|
|
1062 { |
|
|
1063 error ("load: internal error loading struct elements"); |
|
|
1064 return false; |
|
|
1065 } |
|
|
1066 |
|
|
1067 m.assign (nm, tcell); |
|
5336
|
1068 } |
|
4817
|
1069 } |
|
|
1070 |
|
|
1071 if (is) |
|
|
1072 map = m; |
|
|
1073 else |
|
|
1074 { |
|
|
1075 error ("load: failed to load structure"); |
|
|
1076 success = false; |
|
|
1077 } |
|
|
1078 } |
|
|
1079 else if (len == 0 ) |
|
|
1080 map = Octave_map (); |
|
|
1081 else |
|
|
1082 panic_impossible (); |
|
|
1083 } |
|
|
1084 else { |
|
|
1085 error ("load: failed to extract number of elements in structure"); |
|
|
1086 success = false; |
|
|
1087 } |
|
|
1088 |
|
|
1089 return success; |
|
|
1090 } |
|
|
1091 |
|
|
1092 bool |
|
|
1093 octave_struct::save_binary (std::ostream& os, bool& save_as_floats) |
|
|
1094 { |
|
|
1095 Octave_map m = map_value (); |
|
|
1096 |
|
|
1097 FOUR_BYTE_INT len = m.length(); |
|
|
1098 os.write (X_CAST (char *, &len), 4); |
|
|
1099 |
|
|
1100 Octave_map::iterator i = m.begin (); |
|
|
1101 while (i != m.end ()) |
|
|
1102 { |
|
5341
|
1103 octave_value val = map.contents (i); |
|
4817
|
1104 |
|
5341
|
1105 bool b = save_binary_data (os, val, m.key (i), "", 0, save_as_floats); |
|
4817
|
1106 |
|
|
1107 if (! b) |
|
|
1108 return os; |
|
|
1109 |
|
|
1110 i++; |
|
|
1111 } |
|
|
1112 |
|
|
1113 return true; |
|
|
1114 } |
|
|
1115 |
|
|
1116 bool |
|
|
1117 octave_struct::load_binary (std::istream& is, bool swap, |
|
|
1118 oct_mach_info::float_format fmt) |
|
|
1119 { |
|
|
1120 bool success = true; |
|
|
1121 FOUR_BYTE_INT len; |
|
|
1122 if (! is.read (X_CAST (char *, &len), 4)) |
|
|
1123 return false; |
|
|
1124 if (swap) |
|
4944
|
1125 swap_bytes<4> (&len); |
|
4817
|
1126 |
|
|
1127 if (len > 0) |
|
|
1128 { |
|
|
1129 Octave_map m (map); |
|
|
1130 |
|
5275
|
1131 for (octave_idx_type j = 0; j < len; j++) |
|
4817
|
1132 { |
|
|
1133 octave_value t2; |
|
|
1134 bool dummy; |
|
|
1135 std::string doc; |
|
|
1136 |
|
|
1137 // recurse to read cell elements |
|
|
1138 std::string nm = read_binary_data (is, swap, fmt, std::string (), |
|
|
1139 dummy, t2, doc); |
|
|
1140 |
|
|
1141 if (!is) |
|
|
1142 break; |
|
|
1143 |
|
5342
|
1144 // Try for some backward compatibility... |
|
5433
|
1145 if (t2.is_cell () && t2.length() > 1) |
|
|
1146 m.assign (nm, t2); |
|
|
1147 else |
|
5336
|
1148 { |
|
5433
|
1149 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
|
|
1150 |
|
|
1151 if (error_state) |
|
|
1152 { |
|
|
1153 error ("load: internal error loading struct elements"); |
|
|
1154 return false; |
|
|
1155 } |
|
|
1156 |
|
|
1157 m.assign (nm, tcell); |
|
5336
|
1158 } |
|
4817
|
1159 } |
|
|
1160 |
|
|
1161 if (is) |
|
|
1162 map = m; |
|
|
1163 else |
|
|
1164 { |
|
|
1165 error ("load: failed to load structure"); |
|
|
1166 success = false; |
|
|
1167 } |
|
|
1168 } |
|
|
1169 else if (len == 0 ) |
|
|
1170 map = Octave_map (); |
|
|
1171 else |
|
|
1172 panic_impossible (); |
|
|
1173 |
|
|
1174 return success; |
|
|
1175 } |
|
|
1176 |
|
|
1177 #if defined (HAVE_HDF5) |
|
|
1178 |
|
|
1179 bool |
|
|
1180 octave_struct::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats) |
|
|
1181 { |
|
|
1182 hid_t data_hid = -1; |
|
|
1183 |
|
|
1184 data_hid = H5Gcreate (loc_id, name, 0); |
|
|
1185 if (data_hid < 0) return false; |
|
|
1186 |
|
|
1187 // recursively add each element of the structure to this group |
|
|
1188 Octave_map m = map_value (); |
|
|
1189 Octave_map::iterator i = m.begin (); |
|
|
1190 while (i != m.end ()) |
|
|
1191 { |
|
5341
|
1192 octave_value val = map.contents (i); |
|
4817
|
1193 |
|
5341
|
1194 bool retval2 = add_hdf5_data (data_hid, val, m.key (i), "", false, |
|
4817
|
1195 save_as_floats); |
|
|
1196 |
|
|
1197 if (! retval2) |
|
|
1198 break; |
|
|
1199 |
|
|
1200 i++; |
|
|
1201 } |
|
|
1202 |
|
|
1203 H5Gclose (data_hid); |
|
4837
|
1204 |
|
4817
|
1205 return true; |
|
|
1206 } |
|
|
1207 |
|
|
1208 bool |
|
|
1209 octave_struct::load_hdf5 (hid_t loc_id, const char *name, |
|
|
1210 bool have_h5giterate_bug) |
|
|
1211 { |
|
|
1212 bool retval = false; |
|
|
1213 |
|
|
1214 hdf5_callback_data dsub; |
|
|
1215 |
|
|
1216 herr_t retval2 = 0; |
|
|
1217 Octave_map m; |
|
|
1218 int current_item = 0; |
|
|
1219 #ifdef HAVE_H5GGET_NUM_OBJS |
|
|
1220 hsize_t num_obj = 0; |
|
5060
|
1221 hid_t group_id = H5Gopen (loc_id, name); |
|
|
1222 H5Gget_num_objs (group_id, &num_obj); |
|
|
1223 H5Gclose (group_id); |
|
4817
|
1224 |
|
|
1225 while (current_item < static_cast<int> (num_obj) |
|
|
1226 && (retval2 = H5Giterate (loc_id, name, ¤t_item, |
|
|
1227 hdf5_read_next_data, &dsub)) > 0) |
|
|
1228 #else |
|
|
1229 while ((retval2 = H5Giterate (loc_id, name, ¤t_item, |
|
|
1230 hdf5_read_next_data, &dsub)) > 0) |
|
|
1231 #endif |
|
|
1232 { |
|
5342
|
1233 octave_value t2 = dsub.tc; |
|
|
1234 |
|
|
1235 // Try for some backward compatibility... |
|
5433
|
1236 if (t2.is_cell () && t2.length() > 1) |
|
|
1237 m.assign (dsub.name, t2); |
|
|
1238 else |
|
5336
|
1239 { |
|
5433
|
1240 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2); |
|
|
1241 |
|
|
1242 if (error_state) |
|
|
1243 { |
|
|
1244 error ("load: internal error loading struct elements"); |
|
|
1245 return false; |
|
|
1246 } |
|
|
1247 |
|
|
1248 m.assign (dsub.name, tcell); |
|
5336
|
1249 } |
|
|
1250 |
|
4817
|
1251 if (have_h5giterate_bug) |
|
|
1252 current_item++; // H5Giterate returned the last index processed |
|
|
1253 } |
|
|
1254 |
|
|
1255 if (retval2 >= 0) |
|
|
1256 { |
|
|
1257 map = m; |
|
|
1258 retval = true; |
|
|
1259 } |
|
|
1260 |
|
|
1261 return retval; |
|
|
1262 } |
|
|
1263 |
|
4687
|
1264 #endif |
|
|
1265 |
|
2376
|
1266 /* |
|
|
1267 ;;; Local Variables: *** |
|
|
1268 ;;; mode: C++ *** |
|
|
1269 ;;; End: *** |
|
|
1270 */ |
