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