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