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