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