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