Mercurial > jwe > octave

comparison libinterp/octave-value/ov-struct.cc @ 30138:938794bc82b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: use "m_" prefix for member variables in class octave_base_value. * ov-base-diag.cc, ov-base.cc, ov-base.h, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-java.cc, ov-perm.cc, ov-re-diag.cc, ov-struct.cc, ov.cc, ov.h: Use "m_" prefix for member variables in class octave_base_value.
author Rik <rik@octave.org>
date Tue, 07 Sep 2021 15:26:47 -0700
parents b16e0d357437
children c789e728d57a
comparison
equal deleted inserted replaced
30137:72afd5cd4a0c 30138:938794bc82b7
463 if (didx.numel () == tmp_cell.numel ()) 463 if (didx.numel () == tmp_cell.numel ())
464 tmp_cell = tmp_cell.reshape (didx); 464 tmp_cell = tmp_cell.reshape (didx);
465 465
466 m_map.assign (idxf, key, tmp_cell); 466 m_map.assign (idxf, key, tmp_cell);
467 467
468 count++; 468 m_count++;
469 retval = octave_value (this); 469 retval = octave_value (this);
470 } 470 }
471 else 471 else
472 { 472 {
473 const octave_map& cmap = const_cast<const octave_map &> (m_map); 473 const octave_map& cmap = const_cast<const octave_map &> (m_map);
476 || cmap.contents (key).index (idxf, true).numel () == 1) 476 || cmap.contents (key).index (idxf, true).numel () == 1)
477 { 477 {
478 m_map.assign (idxf, 478 m_map.assign (idxf,
479 key, Cell (t_rhs.storable_value ())); 479 key, Cell (t_rhs.storable_value ()));
480 480
481 count++; 481 m_count++;
482 retval = octave_value (this); 482 retval = octave_value (this);
483 } 483 }
484 else 484 else
485 err_nonbraced_cs_list_assignment (); 485 err_nonbraced_cs_list_assignment ();
486 } 486 }
491 { 491 {
492 octave_map rhs_map = t_rhs.xmap_value ("invalid structure assignment"); 492 octave_map rhs_map = t_rhs.xmap_value ("invalid structure assignment");
493 493
494 m_map.assign (idx.front (), rhs_map); 494 m_map.assign (idx.front (), rhs_map);
495 495
496 count++; 496 m_count++;
497 retval = octave_value (this); 497 retval = octave_value (this);
498 } 498 }
499 else 499 else
500 { 500 {
501 if (! t_rhs.isnull ()) 501 if (! t_rhs.isnull ())
502 error ("invalid structure assignment"); 502 error ("invalid structure assignment");
503 503
504 m_map.delete_elements (idx.front ()); 504 m_map.delete_elements (idx.front ());
505 505
506 count++; 506 m_count++;
507 retval = octave_value (this); 507 retval = octave_value (this);
508 } 508 }
509 } 509 }
510 } 510 }
511 break; 511 break;
538 Cell tmp_cell(1, 1); 538 Cell tmp_cell(1, 1);
539 tmp_cell(0) = t_rhs.storable_value (); 539 tmp_cell(0) = t_rhs.storable_value ();
540 m_map.setfield (key, tmp_cell); 540 m_map.setfield (key, tmp_cell);
541 } 541 }
542 542
543 count++; 543 m_count++;
544 retval = octave_value (this); 544 retval = octave_value (this);
545 } 545 }
546 break; 546 break;
547 547
548 case '{': 548 case '{':
1266 : tmp.subsasgn (next_type, next_idx, rhs)); 1266 : tmp.subsasgn (next_type, next_idx, rhs));
1267 } 1267 }
1268 1268
1269 m_map.setfield (key, t_rhs.storable_value ()); 1269 m_map.setfield (key, t_rhs.storable_value ());
1270 1270
1271 count++; 1271 m_count++;
1272 retval = this; 1272 retval = this;
1273 } 1273 }
1274 else 1274 else
1275 { 1275 {
1276 // Forward this case to octave_struct. 1276 // Forward this case to octave_struct.