Mercurial > hg > octave-nkf
annotate src/pt-idx.cc @ 10035:66d56fb7cbb8
wrapper for gl2ps.c so config.h is included before oter headers
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sun, 27 Dec 2009 21:39:44 -0500 |
| parents | 126b49caba0d |
| children | cd96d29c5efa |
| rev | line source |
|---|---|
| 2980 | 1 /* |
| 2 | |
| 7017 | 3 Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, |
| 8920 | 4 2007, 2008, 2009 John W. Eaton |
| 2980 | 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. | |
| 2980 | 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/>. | |
| 2980 | 21 |
| 22 */ | |
| 23 | |
| 24 #ifdef HAVE_CONFIG_H | |
| 25 #include <config.h> | |
| 26 #endif | |
| 27 | |
| 3933 | 28 #include "Cell.h" |
| 2980 | 29 #include "error.h" |
| 3930 | 30 #include "oct-map.h" |
| 2980 | 31 #include "oct-obj.h" |
| 32 #include "oct-lvalue.h" | |
| 33 #include "ov.h" | |
| 3930 | 34 #include "pager.h" |
| 2982 | 35 #include "pt-arg-list.h" |
| 3930 | 36 #include "pt-bp.h" |
| 7336 | 37 #include "pt-id.h" |
| 2980 | 38 #include "pt-idx.h" |
| 39 #include "pt-walk.h" | |
| 3930 | 40 #include "utils.h" |
| 41 #include "variables.h" | |
|
8579
7e0f36dfefbe
implement octave_value_list using Array
Jaroslav Hajek <highegg@gmail.com>
parents:
8564
diff
changeset
|
42 #include "gripes.h" |
| 2980 | 43 |
| 44 // Index expressions. | |
| 45 | |
| 5861 | 46 tree_index_expression::tree_index_expression (int l, int c) |
|
7791
975e9540be2c
pt-idx.cc: initialize fields in constructors
John W. Eaton <jwe@octave.org>
parents:
7790
diff
changeset
|
47 : tree_expression (l, c), expr (0), args (0), type (), |
| 5861 | 48 arg_nm (), dyn_field () { } |
| 49 | |
| 3546 | 50 tree_index_expression::tree_index_expression (tree_expression *e, |
| 51 tree_argument_list *lst, | |
| 3933 | 52 int l, int c, char t) |
|
7791
975e9540be2c
pt-idx.cc: initialize fields in constructors
John W. Eaton <jwe@octave.org>
parents:
7790
diff
changeset
|
53 : tree_expression (l, c), expr (e), args (0), type (), |
| 4131 | 54 arg_nm (), dyn_field () |
| 3933 | 55 { |
| 56 append (lst, t); | |
| 57 } | |
| 3215 | 58 |
| 3930 | 59 tree_index_expression::tree_index_expression (tree_expression *e, |
| 60 const std::string& n, | |
| 3944 | 61 int l, int c) |
|
7791
975e9540be2c
pt-idx.cc: initialize fields in constructors
John W. Eaton <jwe@octave.org>
parents:
7790
diff
changeset
|
62 : tree_expression (l, c), expr (e), args (0), type (), |
| 4131 | 63 arg_nm (), dyn_field () |
| 3933 | 64 { |
| 65 append (n); | |
| 66 } | |
| 67 | |
| 4131 | 68 tree_index_expression::tree_index_expression (tree_expression *e, |
| 69 tree_expression *df, | |
| 70 int l, int c) | |
|
7791
975e9540be2c
pt-idx.cc: initialize fields in constructors
John W. Eaton <jwe@octave.org>
parents:
7790
diff
changeset
|
71 : tree_expression (l, c), expr (e), args (0), type (), |
| 4131 | 72 arg_nm (), dyn_field () |
| 73 { | |
| 74 append (df); | |
| 75 } | |
| 76 | |
| 3933 | 77 void |
| 78 tree_index_expression::append (tree_argument_list *lst, char t) | |
| 79 { | |
| 4219 | 80 args.push_back (lst); |
| 3933 | 81 type.append (1, t); |
| 4219 | 82 arg_nm.push_back (lst ? lst->get_arg_names () : string_vector ()); |
| 83 dyn_field.push_back (static_cast<tree_expression *> (0)); | |
| 3933 | 84 } |
| 85 | |
| 86 void | |
| 87 tree_index_expression::append (const std::string& n) | |
| 88 { | |
| 4219 | 89 args.push_back (static_cast<tree_argument_list *> (0)); |
| 3933 | 90 type.append ("."); |
| 4219 | 91 arg_nm.push_back (n); |
| 92 dyn_field.push_back (static_cast<tree_expression *> (0)); | |
| 4131 | 93 } |
| 94 | |
| 95 void | |
| 96 tree_index_expression::append (tree_expression *df) | |
| 97 { | |
| 4219 | 98 args.push_back (static_cast<tree_argument_list *> (0)); |
| 4131 | 99 type.append ("."); |
| 4219 | 100 arg_nm.push_back (""); |
| 101 dyn_field.push_back (df); | |
| 3933 | 102 } |
| 3930 | 103 |
| 2980 | 104 tree_index_expression::~tree_index_expression (void) |
| 105 { | |
| 106 delete expr; | |
| 3933 | 107 |
| 108 while (! args.empty ()) | |
| 109 { | |
| 4219 | 110 std::list<tree_argument_list *>::iterator p = args.begin (); |
| 111 delete *p; | |
| 112 args.erase (p); | |
| 3933 | 113 } |
| 2980 | 114 } |
| 115 | |
| 5099 | 116 bool |
| 117 tree_index_expression::has_magic_end (void) const | |
| 118 { | |
| 119 for (std::list<tree_argument_list *>::const_iterator p = args.begin (); | |
| 120 p != args.end (); | |
| 121 p++) | |
| 122 { | |
| 123 tree_argument_list *elt = *p; | |
| 124 | |
| 125 if (elt && elt->has_magic_end ()) | |
| 126 return true; | |
| 127 } | |
| 128 | |
| 129 return false; | |
| 130 } | |
| 131 | |
| 2991 | 132 // This is useful for printing the name of the variable in an indexed |
| 133 // assignment. | |
| 134 | |
| 3536 | 135 std::string |
| 2991 | 136 tree_index_expression::name (void) const |
| 137 { | |
| 4131 | 138 return expr->name (); |
| 3933 | 139 } |
| 140 | |
| 141 static Cell | |
| 142 make_subs_cell (tree_argument_list *args, const string_vector& arg_nm) | |
| 143 { | |
| 144 Cell retval; | |
| 145 | |
| 146 octave_value_list arg_values; | |
| 147 | |
| 148 if (args) | |
| 149 arg_values = args->convert_to_const_vector (); | |
| 150 | |
| 151 if (! error_state) | |
| 152 { | |
| 153 int n = arg_values.length (); | |
| 154 | |
| 155 if (n > 0) | |
| 156 { | |
| 157 arg_values.stash_name_tags (arg_nm); | |
| 158 | |
| 4548 | 159 retval.resize (dim_vector (1, n)); |
| 3933 | 160 |
| 161 for (int i = 0; i < n; i++) | |
| 162 retval(0,i) = arg_values(i); | |
| 163 } | |
| 164 } | |
| 165 | |
| 166 return retval; | |
| 167 } | |
| 168 | |
| 169 static inline octave_value_list | |
| 4234 | 170 make_value_list (tree_argument_list *args, const string_vector& arg_nm, |
| 171 const octave_value *object) | |
| 3933 | 172 { |
| 173 octave_value_list retval; | |
| 174 | |
| 175 if (args) | |
|
9125
8ab1e6f63cdc
gripe on magic end query for undefined variable
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
176 { |
|
8ab1e6f63cdc
gripe on magic end query for undefined variable
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
177 if (object && args->has_magic_end () && object->is_undefined ()) |
|
8ab1e6f63cdc
gripe on magic end query for undefined variable
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
178 gripe_invalid_inquiry_subscript (); |
|
8ab1e6f63cdc
gripe on magic end query for undefined variable
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
179 else |
|
8ab1e6f63cdc
gripe on magic end query for undefined variable
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
180 retval = args->convert_to_const_vector (object); |
|
8ab1e6f63cdc
gripe on magic end query for undefined variable
Jaroslav Hajek <highegg@gmail.com>
parents:
8920
diff
changeset
|
181 } |
| 3933 | 182 |
| 183 if (! error_state) | |
| 184 { | |
| 185 int n = retval.length (); | |
| 186 | |
| 187 if (n > 0) | |
| 188 retval.stash_name_tags (arg_nm); | |
| 189 } | |
| 190 | |
| 191 return retval; | |
| 192 } | |
| 193 | |
| 4131 | 194 std::string |
| 4219 | 195 tree_index_expression::get_struct_index |
| 196 (std::list<string_vector>::const_iterator p_arg_nm, | |
| 197 std::list<tree_expression *>::const_iterator p_dyn_field) const | |
| 4131 | 198 { |
| 4219 | 199 std::string fn = (*p_arg_nm)(0); |
| 4131 | 200 |
| 201 if (fn.empty ()) | |
| 202 { | |
| 4219 | 203 tree_expression *df = *p_dyn_field; |
| 4131 | 204 |
| 205 if (df) | |
| 206 { | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
207 octave_value t = df->rvalue1 (); |
| 4131 | 208 |
| 209 if (! error_state) | |
| 4143 | 210 { |
| 211 fn = t.string_value (); | |
| 212 | |
| 213 if (! valid_identifier (fn)) | |
| 6811 | 214 ::error ("invalid structure field name `%s'", fn.c_str ()); |
| 4143 | 215 } |
| 4131 | 216 } |
| 217 else | |
| 218 panic_impossible (); | |
| 219 } | |
| 220 | |
| 221 return fn; | |
| 222 } | |
| 223 | |
| 3933 | 224 Octave_map |
| 225 tree_index_expression::make_arg_struct (void) const | |
| 226 { | |
| 4219 | 227 int n = args.size (); |
| 3933 | 228 |
| 7336 | 229 Cell type_field (n, 1); |
| 230 Cell subs_field (n, 1); | |
| 3933 | 231 |
| 4219 | 232 std::list<tree_argument_list *>::const_iterator p_args = args.begin (); |
| 233 std::list<string_vector>::const_iterator p_arg_nm = arg_nm.begin (); | |
| 234 std::list<tree_expression *>::const_iterator p_dyn_field = dyn_field.begin (); | |
| 3933 | 235 |
| 236 Octave_map m; | |
| 237 | |
| 238 for (int i = 0; i < n; i++) | |
| 239 { | |
| 240 switch (type[i]) | |
| 241 { | |
| 242 case '(': | |
| 7336 | 243 subs_field(i) = make_subs_cell (*p_args, *p_arg_nm); |
| 3933 | 244 break; |
| 245 | |
| 246 case '{': | |
| 7336 | 247 subs_field(i) = make_subs_cell (*p_args, *p_arg_nm); |
| 3933 | 248 break; |
| 249 | |
| 250 case '.': | |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7791
diff
changeset
|
251 subs_field(i) = get_struct_index (p_arg_nm, p_dyn_field); |
| 3933 | 252 break; |
| 253 | |
| 254 default: | |
| 255 panic_impossible (); | |
| 256 } | |
| 257 | |
| 258 if (error_state) | |
| 259 return m; | |
| 260 | |
| 4219 | 261 p_args++; |
| 262 p_arg_nm++; | |
| 263 p_dyn_field++; | |
| 3933 | 264 } |
| 265 | |
| 7336 | 266 m.assign ("type", type_field); |
| 267 m.assign ("subs", subs_field); | |
| 3933 | 268 |
| 269 return m; | |
| 2991 | 270 } |
| 271 | |
| 2980 | 272 octave_value_list |
| 273 tree_index_expression::rvalue (int nargout) | |
| 274 { | |
| 275 octave_value_list retval; | |
| 276 | |
| 277 if (error_state) | |
| 278 return retval; | |
| 279 | |
| 7336 | 280 octave_value first_expr_val; |
| 281 | |
| 282 octave_value_list first_args; | |
| 283 | |
| 284 bool have_args = false; | |
| 285 | |
| 286 if (expr->is_identifier () && type[0] == '(') | |
| 287 { | |
| 288 tree_identifier *id = dynamic_cast<tree_identifier *> (expr); | |
| 289 | |
| 290 if (! (id->is_variable () || args.empty ())) | |
| 291 { | |
| 292 tree_argument_list *al = *(args.begin ()); | |
| 293 | |
| 294 size_t n = al ? al->length () : 0; | |
| 295 | |
| 296 if (n > 0) | |
| 297 { | |
| 298 string_vector anm = *(arg_nm.begin ()); | |
|
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
299 have_args = true; |
|
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
300 first_args = al -> convert_to_const_vector (); |
|
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
301 first_args.stash_name_tags (anm); |
| 7336 | 302 |
|
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
303 if (! error_state) |
|
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
9329
diff
changeset
|
304 first_expr_val = id->do_lookup (first_args); |
| 7336 | 305 } |
| 306 } | |
| 307 } | |
| 2980 | 308 |
| 309 if (! error_state) | |
| 310 { | |
| 7336 | 311 if (first_expr_val.is_undefined ()) |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
312 first_expr_val = expr->rvalue1 (); |
| 7336 | 313 |
| 314 octave_value tmp = first_expr_val; | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
315 octave_idx_type tmpi = 0; |
| 7336 | 316 |
| 4219 | 317 std::list<octave_value_list> idx; |
| 3930 | 318 |
| 4219 | 319 int n = args.size (); |
| 3933 | 320 |
| 4219 | 321 std::list<tree_argument_list *>::iterator p_args = args.begin (); |
| 322 std::list<string_vector>::iterator p_arg_nm = arg_nm.begin (); | |
| 323 std::list<tree_expression *>::iterator p_dyn_field = dyn_field.begin (); | |
| 3930 | 324 |
| 3933 | 325 for (int i = 0; i < n; i++) |
| 326 { | |
| 4432 | 327 if (i > 0) |
| 328 { | |
| 329 tree_argument_list *al = *p_args; | |
| 330 | |
|
9692
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
331 // In Matlab, () can only be followed by . In Octave, we do not |
|
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
332 // enforce this for rvalue expressions, but we'll split the |
|
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
333 // evaluation at this point. This will, hopefully, allow Octave's |
|
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
334 // looser rules apply smoothly for Matlab overloaded subsref |
|
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
335 // codes. |
|
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
336 bool force_split = type[i-1] == '(' && type[i] != '.'; |
|
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
337 |
|
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
338 if (force_split || (al && al->has_magic_end ())) |
| 4432 | 339 { |
| 340 // We have an expression like | |
| 341 // | |
| 342 // x{end}.a(end) | |
| 343 // | |
| 344 // and we are looking at the argument list that | |
| 345 // contains the second (or third, etc.) "end" token, | |
| 346 // so we must evaluate everything up to the point of | |
| 7336 | 347 // that argument list so we can pass the appropriate |
| 4432 | 348 // value to the built-in __end__ function. |
| 349 | |
|
8580
188d38a553c7
further indexing optimization touches
Jaroslav Hajek <highegg@gmail.com>
parents:
8579
diff
changeset
|
350 const octave_value_list tmp_list |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
351 = tmp.subsref (type.substr (tmpi, i - tmpi), idx, nargout); |
| 4432 | 352 |
|
9692
126b49caba0d
smart splitting of index chains
Jaroslav Hajek <highegg@gmail.com>
parents:
9445
diff
changeset
|
353 tmp = tmp_list.length () ? tmp_list(0) : octave_value (); |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
354 tmpi = i; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
355 idx.clear (); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
356 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
357 if (tmp.is_cs_list ()) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
358 gripe_indexed_cs_list (); |
| 4432 | 359 |
| 360 if (error_state) | |
| 361 break; | |
| 362 } | |
| 363 } | |
| 364 | |
| 3933 | 365 switch (type[i]) |
| 366 { | |
| 367 case '(': | |
| 7336 | 368 if (have_args) |
| 369 { | |
| 370 idx.push_back (first_args); | |
| 371 have_args = false; | |
| 372 } | |
| 373 else | |
| 374 idx.push_back (make_value_list (*p_args, *p_arg_nm, &tmp)); | |
| 3933 | 375 break; |
| 3930 | 376 |
| 3933 | 377 case '{': |
| 4234 | 378 idx.push_back (make_value_list (*p_args, *p_arg_nm, &tmp)); |
| 3933 | 379 break; |
| 2980 | 380 |
| 3933 | 381 case '.': |
|
8011
3100283874d7
improve backtrace error messages
John W. Eaton <jwe@octave.org>
parents:
7791
diff
changeset
|
382 idx.push_back (octave_value (get_struct_index (p_arg_nm, p_dyn_field))); |
| 3933 | 383 break; |
| 3930 | 384 |
| 3933 | 385 default: |
| 386 panic_impossible (); | |
| 387 } | |
| 3930 | 388 |
| 3933 | 389 if (error_state) |
| 390 break; | |
| 391 | |
| 4219 | 392 p_args++; |
| 393 p_arg_nm++; | |
| 394 p_dyn_field++; | |
| 2980 | 395 } |
| 3933 | 396 |
| 397 if (! error_state) | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
398 retval = tmp.subsref (type.substr (tmpi, n - tmpi), idx, nargout); |
| 2980 | 399 } |
| 400 | |
| 401 return retval; | |
| 402 } | |
| 403 | |
| 404 octave_value | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
405 tree_index_expression::rvalue1 (int nargout) |
| 2980 | 406 { |
| 407 octave_value retval; | |
| 408 | |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
8580
diff
changeset
|
409 const octave_value_list tmp = rvalue (nargout); |
| 2980 | 410 |
| 411 if (! tmp.empty ()) | |
| 412 retval = tmp(0); | |
| 413 | |
| 414 return retval; | |
| 415 } | |
| 416 | |
| 417 octave_lvalue | |
| 418 tree_index_expression::lvalue (void) | |
| 419 { | |
| 420 octave_lvalue retval; | |
| 421 | |
| 4219 | 422 std::list<octave_value_list> idx; |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
423 std::string tmp_type; |
| 3933 | 424 |
| 4219 | 425 int n = args.size (); |
| 3933 | 426 |
| 4219 | 427 std::list<tree_argument_list *>::iterator p_args = args.begin (); |
| 428 std::list<string_vector>::iterator p_arg_nm = arg_nm.begin (); | |
| 429 std::list<tree_expression *>::iterator p_dyn_field = dyn_field.begin (); | |
| 3933 | 430 |
| 4234 | 431 retval = expr->lvalue (); |
| 3933 | 432 |
| 2980 | 433 if (! error_state) |
| 434 { | |
| 4432 | 435 const octave_value *tro = retval.object (); |
| 436 | |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
437 octave_value tmp; |
| 4432 | 438 |
| 439 if (tro) | |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
440 tmp = *tro; |
| 4432 | 441 |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
442 octave_idx_type tmpi = 0; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
443 std::list<octave_value_list> tmpidx; |
| 4234 | 444 |
| 445 for (int i = 0; i < n; i++) | |
| 446 { | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
447 if (retval.numel () != 1) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
448 gripe_indexed_cs_list (); |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
449 else if (tmpi < i) |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
450 { |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
451 tmp = tmp.subsref (type.substr (tmpi, i - tmpi), tmpidx, true); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
452 tmpidx.clear (); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
453 } |
| 4432 | 454 |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
455 if (error_state) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
456 break; |
| 4432 | 457 |
| 4234 | 458 switch (type[i]) |
| 459 { | |
| 460 case '(': | |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
461 { |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
462 octave_value_list tidx |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
463 = make_value_list (*p_args, *p_arg_nm, &tmp); |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
464 |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
465 idx.push_back (tidx); |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
466 |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
467 if (i < n - 1) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
468 { |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
469 if (type[i+1] == '.') |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
470 { |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
471 tmpidx.push_back (tidx); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
472 tmpi = i+1; |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
473 } |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
474 else |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
475 error ("() must be followed by . or close the index chain"); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
476 } |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
477 } |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
478 break; |
| 4234 | 479 |
| 480 case '{': | |
| 5846 | 481 { |
| 482 octave_value_list tidx | |
| 483 = make_value_list (*p_args, *p_arg_nm, &tmp); | |
| 484 | |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
485 if (tmp.is_undefined ()) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
486 { |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
487 if (tidx.has_magic_colon ()) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
488 gripe_invalid_inquiry_subscript (); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
489 else |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
490 tmp = Cell (); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
491 } |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
492 else if (tmp.is_zero_by_zero () |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
493 && (tmp.is_matrix_type () || tmp.is_string ())) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
494 { |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
495 tmp = Cell (); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
496 } |
| 5846 | 497 |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
498 retval.numel (tmp.numel (tidx)); |
| 5846 | 499 |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
500 if (error_state) |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
501 break; |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
502 |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
503 idx.push_back (tidx); |
|
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
504 tmpidx.push_back (tidx); |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
505 tmpi = i; |
| 5846 | 506 } |
| 4234 | 507 break; |
| 508 | |
| 509 case '.': | |
| 510 { | |
| 6833 | 511 octave_value tidx = get_struct_index (p_arg_nm, p_dyn_field); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
512 if (error_state) |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
513 break; |
| 6833 | 514 |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
515 bool autoconv = (tmp.is_zero_by_zero () |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
516 && (tmp.is_matrix_type () || tmp.is_string () |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
517 || tmp.is_cell ())); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
518 |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
519 if (i > 0 && type [i-1] == '(') |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
520 { |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
521 octave_value_list pidx = idx.back (); |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
522 |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
523 if (tmp.is_undefined ()) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
524 { |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
525 if (pidx.has_magic_colon ()) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
526 gripe_invalid_inquiry_subscript (); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
527 else |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
528 tmp = Octave_map (); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
529 } |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
530 else if (autoconv) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
531 tmp = Octave_map (); |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
532 |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
533 retval.numel (tmp.numel (pidx)); |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
534 |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
535 tmpi = i-1; |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
536 tmpidx.push_back (tidx); |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
537 } |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
538 else |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
539 { |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
540 if (tmp.is_undefined () || autoconv) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
541 { |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
542 tmpi = i+1; |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
543 tmp = octave_value (); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
544 } |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
545 else |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
546 { |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
547 retval.numel (tmp.numel (octave_value_list ())); |
| 7099 | 548 |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
549 tmpi = i; |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
550 tmpidx.push_back (tidx); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
551 } |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
552 } |
| 7057 | 553 |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
554 if (error_state) |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
555 break; |
|
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
556 |
|
8551
906f976d35a8
further improve struct&cell indexing & indexed assignment
Jaroslav Hajek <highegg@gmail.com>
parents:
8546
diff
changeset
|
557 idx.push_back (tidx); |
| 4234 | 558 } |
| 559 break; | |
| 560 | |
| 561 default: | |
| 562 panic_impossible (); | |
| 563 } | |
| 564 | |
|
9329
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
565 if (idx.back ().empty ()) |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
566 error ("invalid empty index list"); |
|
67fc970dad7d
improve indexed assignment using indexed numel
Jaroslav Hajek <highegg@gmail.com>
parents:
9125
diff
changeset
|
567 |
| 4234 | 568 if (error_state) |
| 569 break; | |
| 570 | |
| 571 p_args++; | |
| 572 p_arg_nm++; | |
| 573 p_dyn_field++; | |
| 574 } | |
| 3930 | 575 |
| 3933 | 576 if (! error_state) |
| 577 retval.set_index (type, idx); | |
|
8546
3d8a914c580e
improve parser indexed assigment code
Jaroslav Hajek <highegg@gmail.com>
parents:
8011
diff
changeset
|
578 |
| 2980 | 579 } |
| 580 | |
| 581 return retval; | |
| 582 } | |
| 583 | |
| 7099 | 584 /* |
| 585 %!test | |
| 586 %! x = {1, 2, 3}; | |
| 587 %! [x{:}] = deal (4, 5, 6); | |
| 588 %! assert (x, {4, 5, 6}); | |
| 589 | |
| 590 %!test | |
| 591 %! [x.a, x.b.c] = deal (1, 2); | |
| 592 %! assert (x.a == 1 && x.b.c == 2); | |
| 593 | |
| 594 %!test | |
| 595 %! [x.a, x(2).b] = deal (1, 2); | |
| 596 %! assert (x(1).a == 1 && isempty (x(2).a) && isempty (x(1).b) && x(2).b == 2); | |
| 597 | |
| 598 %!test | |
| 599 %! x = struct (zeros (0, 1), {"a", "b"}); | |
| 600 %! x(2).b = 1; | |
| 601 %! assert (x(2).b == 1); | |
| 602 | |
| 603 %!test | |
| 604 %! x = struct (zeros (0, 1), {"a", "b"}); | |
| 605 %! x(2).b = 1; | |
| 606 %! assert (x(2).b == 1); | |
| 607 */ | |
| 608 | |
| 5861 | 609 tree_index_expression * |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
610 tree_index_expression::dup (symbol_table::scope_id scope, |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
611 symbol_table::context_id context) const |
| 5861 | 612 { |
| 613 tree_index_expression *new_idx_expr | |
| 614 = new tree_index_expression (line (), column ()); | |
| 615 | |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
616 new_idx_expr->expr = expr ? expr->dup (scope, context) : 0; |
| 5861 | 617 |
| 618 std::list<tree_argument_list *> new_args; | |
| 619 | |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
620 for (std::list<tree_argument_list *>::const_iterator p = args.begin (); |
| 5861 | 621 p != args.end (); |
| 622 p++) | |
| 623 { | |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
624 const tree_argument_list *elt = *p; |
| 5861 | 625 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
626 new_args.push_back (elt ? elt->dup (scope, context) : 0); |
| 5861 | 627 } |
| 628 | |
| 629 new_idx_expr->args = new_args; | |
| 630 | |
| 631 new_idx_expr->type = type; | |
| 632 | |
| 633 new_idx_expr->arg_nm = arg_nm; | |
| 634 | |
| 635 std::list<tree_expression *> new_dyn_field; | |
| 636 | |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
637 for (std::list<tree_expression *>::const_iterator p = dyn_field.begin (); |
| 5861 | 638 p != dyn_field.end (); |
| 639 p++) | |
| 640 { | |
|
8913
35cd375d4bb3
make tree::dup functions const
John W. Eaton <jwe@octave.org>
parents:
8658
diff
changeset
|
641 const tree_expression *elt = *p; |
| 5861 | 642 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
643 new_dyn_field.push_back (elt ? elt->dup (scope, context) : 0); |
| 5861 | 644 } |
| 645 | |
| 646 new_idx_expr->dyn_field = new_dyn_field; | |
| 647 | |
| 648 new_idx_expr->copy_base (*this); | |
| 649 | |
| 650 return new_idx_expr; | |
| 651 } | |
| 652 | |
| 2980 | 653 void |
| 654 tree_index_expression::accept (tree_walker& tw) | |
| 655 { | |
| 656 tw.visit_index_expression (*this); | |
| 657 } | |
| 658 | |
| 659 /* | |
| 660 ;;; Local Variables: *** | |
| 661 ;;; mode: C++ *** | |
| 662 ;;; End: *** | |
| 663 */ |