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