octave-lyh: libinterp/octave-value/ov-struct.cc annotate

annotate libinterp/octave-value/ov-struct.cc @ 17482:997b700b6ad4

compass.m: Add %!error input validation tests. * scripts/plot/compass.m: Add %!error input validation tests.

author	Rik <rik@octave.org>
date	Tue, 24 Sep 2013 13:17:02 -0700
parents	bc924baa2c4e
children

rev	line source
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	1 /*
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	2
14138 72c96de7a403 maint: update copyright notices for 2012 John W. Eaton <jwe@octave.org> parents: 13951 diff changeset	3 Copyright (C) 1996-2012 John W. Eaton
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	4
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	6
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	8 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	10 option) any later version.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	11
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	15 for more details.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	16
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6974 diff changeset	19 <http://www.gnu.org/licenses/>.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	20
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	21 */
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	22
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	24 #include <config.h>
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	25 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	26
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3219 diff changeset	27 #include <iostream>
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	28
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	29 #include "Cell.h"
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	30 #include "defun.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	31 #include "error.h"
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	32 #include "gripes.h"
15149 62a35ae7d6a2 use forward decls for mxArray in ov.h and ov-base.h John W. Eaton <jwe@octave.org> parents: 15057 diff changeset	33 #include "mxarray.h"
2979 a3556d2adec9 [project @ 1997-05-15 22:35:37 by jwe] jwe parents: 2962 diff changeset	34 #include "oct-lvalue.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	35 #include "ov-struct.h"
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	36 #include "unwind-prot.h"
6811 3fe394f8502b [project @ 2007-08-10 19:07:34 by jwe] jwe parents: 6686 diff changeset	37 #include "utils.h"
2948 56be458e237f [project @ 1997-05-09 13:37:35 by jwe] jwe parents: 2916 diff changeset	38 #include "variables.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	39
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	40 #include "Array-util.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8150 diff changeset	41 #include "oct-locbuf.h"
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	42
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4675 diff changeset	43 #include "byte-swap.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4675 diff changeset	44 #include "ls-oct-ascii.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4675 diff changeset	45 #include "ls-oct-binary.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4675 diff changeset	46 #include "ls-hdf5.h"
e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4675 diff changeset	47 #include "ls-utils.h"
5759 ce79d238f142 [project @ 2006-04-13 13:04:32 by jwe] jwe parents: 5756 diff changeset	48 #include "pr-output.h"
4687 e95c86d48732 [project @ 2004-01-06 21:53:34 by jwe] jwe parents: 4675 diff changeset	49
3219 30770ba4457a [project @ 1998-11-13 03:44:31 by jwe] jwe parents: 2985 diff changeset	50 DEFINE_OCTAVE_ALLOCATOR(octave_struct);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	51
4612 d44675070f1a [project @ 2003-11-14 19:49:56 by jwe] jwe parents: 4604 diff changeset	52 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_struct, "struct", "struct");
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	53
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	54 // How many levels of structure elements should we print?
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	55 static int Vstruct_levels_to_print = 2;
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	56
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	57 // TRUE means print struct array contents, up to the number of levels
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	58 // specified by struct_levels_to_print.
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	59 static bool Vprint_struct_array_contents = false;
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	60
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	61 octave_base_value *
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	62 octave_struct::try_narrowing_conversion (void)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	63 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	64 octave_base_value *retval = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	65
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	66 if (numel () == 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	67 retval = new octave_scalar_struct (map.checkelem (0));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	68
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	69 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	70 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	71
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4499 diff changeset	72 Cell
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	73 octave_struct::dotref (const octave_value_list& idx, bool auto_add)
2962 5e0fe4c5d52f [project @ 1997-05-12 03:13:57 by jwe] jwe parents: 2954 diff changeset	74 {
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4499 diff changeset	75 Cell retval;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	76
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	77 assert (idx.length () == 1);
2962 5e0fe4c5d52f [project @ 1997-05-12 03:13:57 by jwe] jwe parents: 2954 diff changeset	78
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	79 std::string nm = idx(0).string_value ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	80
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	81 octave_map::const_iterator p = map.seek (nm);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	82
4219 23d06c9e1edd [project @ 2002-12-06 21:29:17 by jwe] jwe parents: 4197 diff changeset	83 if (p != map.end ())
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	84 retval = map.contents (p);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	85 else if (auto_add)
10350 12884915a8e4 merge MArray classes & improve Array interface Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	86 retval = (numel () == 0) ? Cell (dim_vector (1, 1)) : Cell (dims ());
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	87 else
15731 18f168880226 error_ids: Adding ids and documentation Juan Pablo Carbajal <ajuanpi+dev@gmail.com> parents: 15614 diff changeset	88 error_with_id ("Octave:invalid-indexing",
18f168880226 error_ids: Adding ids and documentation Juan Pablo Carbajal <ajuanpi+dev@gmail.com> parents: 15614 diff changeset	89 "structure has no member '%s'", nm.c_str ());
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	90
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	91 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	92 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	93
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4499 diff changeset	94 #if 0
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	95 static void
10370 9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	96 gripe_invalid_index1 (void)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	97 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	98 error ("invalid index for structure array");
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	99 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4499 diff changeset	100 #endif
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	101
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	102 static void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	103 gripe_invalid_index_for_assignment (void)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	104 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	105 error ("invalid index for structure array assignment");
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	106 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	107
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	108 static void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	109 gripe_invalid_index_type (const std::string& nm, char t)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	110 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	111 error ("%s cannot be indexed with %c", nm.c_str (), t);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	112 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	113
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	114 static void
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	115 gripe_failed_assignment (void)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	116 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	117 error ("assignment to structure element failed");
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	118 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	119
15614 f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	120 static void
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	121 maybe_warn_invalid_field_name (const std::string& key, const char *who)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	122 {
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	123 if (! valid_identifier (key))
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	124 {
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	125 if (who)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	126 warning_with_id ("Octave:matlab-incompatible",
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	127 "%s: invalid structure field name '%s'",
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	128 who, key.c_str ());
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	129 else
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	130 warning_with_id ("Octave:matlab-incompatible",
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	131 "invalid structure field name '%s'",
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	132 key.c_str ());
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	133 }
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	134 }
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	135
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	136 octave_value_list
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	137 octave_struct::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	138 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	139 int nargout)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	140 {
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	141 octave_value_list retval;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	142
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	143 int skip = 1;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	144
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	145 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	146 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	147 case '(':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	148 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	149 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	150 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	151 std::list<octave_value_list>::const_iterator p = idx.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	152 octave_value_list key_idx = *++p;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	153
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	154 const Cell tmp = dotref (key_idx);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	155
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	156 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	157 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	158 const Cell t = tmp.index (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	159
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	160 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	161
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	162 // We handled two index elements, so tell
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	163 // next_subsref to skip both of them.
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	164
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	165 skip++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	166 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	167 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	168 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	169 retval(0) = do_index_op (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	170 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	171 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	172
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	173 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	174 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14625 diff changeset	175 if (map.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	176 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	177 const Cell t = dotref (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	178
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	179 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	180 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	181 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	182 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	183
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	184 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	185 gripe_invalid_index_type (type_name (), type[0]);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	186 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	187
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	188 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	189 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	190 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	191
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5760 diff changeset	192 // FIXME -- perhaps there should be an
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	193 // octave_value_list::next_subsref member function? See also
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	194 // octave_user_function::subsref.
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	195
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	196 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	197 retval = retval(0).next_subsref (nargout, type, idx, skip);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	198
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	199 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	200 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	201
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	202 octave_value
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	203 octave_struct::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	204 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	205 bool auto_add)
8551 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 octave_value retval;
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 int skip = 1;
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 switch (type[0])
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 case '(':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	214 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	215 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	216 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	217 std::list<octave_value_list>::const_iterator p = idx.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	218 octave_value_list key_idx = *++p;
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	219
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	220 const Cell tmp = dotref (key_idx, auto_add);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	221
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	222 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	223 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	224 const Cell t = tmp.index (idx.front (), auto_add);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	225
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	226 retval = (t.length () == 1) ? t(0) : octave_value (t, true);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	227
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	228 // We handled two index elements, so tell
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	229 // next_subsref to skip both of them.
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	230
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	231 skip++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	232 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	233 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	234 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	235 retval = do_index_op (idx.front (), auto_add);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	236 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	237 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	238
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	239 case '.':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	240 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14625 diff changeset	241 if (map.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	242 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	243 const Cell t = dotref (idx.front (), auto_add);
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	244
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	245 retval = (t.length () == 1) ? t(0) : octave_value (t, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	246 }
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	247 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	248 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	249
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	250 case '{':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	251 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	252 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	253
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	254 default:
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	255 panic_impossible ();
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	256 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	257
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	258 // FIXME -- perhaps there should be an
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	259 // 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	260 // octave_user_function::subsref.
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	261
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	262 if (idx.size () > 1)
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	263 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	264
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	265 return retval;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	266 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	267
8031 d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	268 /*
d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	269 %!test
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	270 %! x(1).a.a = 1;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	271 %! x(2).a.a = 2;
8031 d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	272 %! 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	273 %! 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	274 %! 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	275 */
d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	276
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	277 octave_value
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	278 octave_struct::numeric_conv (const octave_value& val,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	279 const std::string& type)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	280 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	281 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	282
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	283 if (type.length () > 0 && type[0] == '.' && ! val.is_map ())
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	284 retval = octave_map ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	285 else
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	286 retval = val;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	287
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	288 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	289 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	290
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	291 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	292 octave_struct::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	293 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	294 const octave_value& rhs)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	295 {
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	296 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	297
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	298 int n = type.length ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	299
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	300 octave_value t_rhs = rhs;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	301
9286 c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	302 if (idx.front ().empty ())
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	303 {
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	304 error ("missing index in indexed assignment");
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	305 return retval;
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	306 }
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	307
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	308 if (n > 1 && ! (type.length () == 2 && type[0] == '(' && type[1] == '.'))
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	309 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	310 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	311 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	312 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	313 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	314 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	315 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	316 std::list<octave_value_list>::const_iterator p = idx.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	317 octave_value_list t_idx = *p;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	318
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	319 octave_value_list key_idx = *++p;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4499 diff changeset	320
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	321 assert (key_idx.length () == 1);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	322
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	323 std::string key = key_idx(0).string_value ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	324
15614 f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	325 maybe_warn_invalid_field_name (key, "subsasgn");
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	326
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	327 if (error_state)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	328 return retval;
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	329
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	330 std::list<octave_value_list> next_idx (idx);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	331
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	332 // We handled two index elements, so subsasgn to
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	333 // needs to skip both of them.
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	334
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	335 next_idx.erase (next_idx.begin ());
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	336 next_idx.erase (next_idx.begin ());
8456 c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	337
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	338 std::string next_type = type.substr (2);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	339
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	340 Cell tmpc (1, 1);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	341 octave_map::iterator pkey = map.seek (key);
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	342 if (pkey != map.end ())
961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	343 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	344 map.contents (pkey).make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	345 tmpc = map.contents (pkey).index (idx.front (), true);
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	346 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	347
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	348 // FIXME: better code reuse? cf. octave_cell::subsasgn and the case below.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	349 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	350 {
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8564 diff changeset	351 if (tmpc.numel () == 1)
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	352 {
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	353 octave_value& tmp = tmpc(0);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	354
12181 88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	355 bool orig_undefined = tmp.is_undefined ();
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	356
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	357 if (orig_undefined \|\| tmp.is_zero_by_zero ())
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	358 {
8564 b0f803b5ce41 more indexing fixes Jaroslav Hajek <highegg@gmail.com> parents: 8551 diff changeset	359 tmp = octave_value::empty_conv (next_type, rhs);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	360 tmp.make_unique (); // probably a no-op.
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	361 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	362 else
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	363 // optimization: ignore the copy still stored inside our map.
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	364 tmp.make_unique (1);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	365
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	366 if (! error_state)
12181 88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	367 t_rhs = (orig_undefined
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	368 ? tmp.undef_subsasgn (next_type, next_idx, rhs)
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	369 : tmp.subsasgn (next_type, next_idx, rhs));
8456 c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	370 }
c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	371 else
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8564 diff changeset	372 gripe_indexed_cs_list ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	373 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	374 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	375 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	376 gripe_invalid_index_for_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	377 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	378 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	379
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	380 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	381 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	382 octave_value_list key_idx = idx.front ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	383
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	384 assert (key_idx.length () == 1);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	385
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	386 std::string key = key_idx(0).string_value ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	387
15614 f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	388 maybe_warn_invalid_field_name (key, "subsasgn");
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	389
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	390 if (error_state)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	391 return retval;
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	392
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	393 std::list<octave_value_list> next_idx (idx);
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 next_idx.erase (next_idx.begin ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	396
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	397 std::string next_type = type.substr (1);
8456 c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	398
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	399 Cell tmpc (1, 1);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	400 octave_map::iterator pkey = map.seek (key);
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	401 if (pkey != map.end ())
961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	402 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	403 map.contents (pkey).make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	404 tmpc = map.contents (pkey);
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	405 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	406
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	407 // FIXME: better code reuse?
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	408 if (! error_state)
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	409 {
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8564 diff changeset	410 if (tmpc.numel () == 1)
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	411 {
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	412 octave_value& tmp = tmpc(0);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	413
12181 88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	414 bool orig_undefined = tmp.is_undefined ();
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	415
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	416 if (orig_undefined \|\| tmp.is_zero_by_zero ())
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	417 {
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	418 tmp = octave_value::empty_conv (next_type, rhs);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	419 tmp.make_unique (); // probably a no-op.
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	420 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	421 else
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	422 // optimization: ignore the copy still stored inside our map.
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	423 tmp.make_unique (1);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	424
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	425 if (! error_state)
12181 88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	426 t_rhs = (orig_undefined
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	427 ? tmp.undef_subsasgn (next_type, next_idx, rhs)
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	428 : tmp.subsasgn (next_type, next_idx, rhs));
8456 c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	429 }
c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	430 else
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8564 diff changeset	431 gripe_indexed_cs_list ();
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	432 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	433 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	434 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	435
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	436 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	437 gripe_invalid_index_type (type_name (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	438 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	439
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	440 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	441 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	442 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	443 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	444
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	445 if (! error_state)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	446 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	447 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	448 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	449 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	450 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	451 if (n > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	452 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	453 std::list<octave_value_list>::const_iterator p = idx.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	454 octave_value_list key_idx = *++p;
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	455 octave_value_list idxf = idx.front ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	456
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	457 assert (key_idx.length () == 1);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	458
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	459 std::string key = key_idx(0).string_value ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	460
15614 f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	461 maybe_warn_invalid_field_name (key, "subsasgn");
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	462
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	463 if (error_state)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	464 return retval;
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	465
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	466 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	467 {
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	468 if (t_rhs.is_cs_list ())
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	469 {
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	470 Cell tmp_cell = Cell (t_rhs.list_value ());
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	471
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	472 // Inquire the proper shape of the RHS.
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	473
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	474 dim_vector didx = dims ().redim (idxf.length ());
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	475 for (octave_idx_type k = 0; k < idxf.length (); k++)
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	476 if (! idxf(k).is_magic_colon ()) didx(k) = idxf(k).numel ();
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	477
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	478 if (didx.numel () == tmp_cell.numel ())
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	479 tmp_cell = tmp_cell.reshape (didx);
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	480
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	481
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	482 map.assign (idxf, key, tmp_cell);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	483
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	484 if (! error_state)
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	485 {
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	486 count++;
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	487 retval = octave_value (this);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	488 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	489 else
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	490 gripe_failed_assignment ();
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	491 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	492 else
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	493 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	494 const octave_map& cmap = const_cast<const octave_map &> (map);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	495 // cast map to const reference to avoid forced key insertion.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	496 if (idxf.all_scalars ()
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	497 \|\| cmap.contents (key).index (idxf, true).numel () == 1)
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	498 {
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	499 map.assign (idxf, key, Cell (t_rhs.storable_value ()));
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	500 if (! error_state)
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	501 {
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	502 count++;
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	503 retval = octave_value (this);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	504 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	505 else
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	506 gripe_failed_assignment ();
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	507 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	508 else if (! error_state)
10030 83bb2a78c07d improve simple assignments error checks and messages Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	509 gripe_nonbraced_cs_list_assignment ();
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	510 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	511 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	512 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	513 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	514 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	515 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	516 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14625 diff changeset	517 if (t_rhs.is_map () \|\| t_rhs.is_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	518 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	519 octave_map rhs_map = t_rhs.map_value ();
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	520
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	521 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	522 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	523 map.assign (idx.front (), rhs_map);
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5582 diff changeset	524
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	525 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	526 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	527 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	528 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	529 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	530 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	531 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	532 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	533 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	534 error ("invalid structure assignment");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	535 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	536 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	537 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14625 diff changeset	538 if (t_rhs.is_null_value ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	539 {
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14625 diff changeset	540 map.delete_elements (idx.front ());
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5582 diff changeset	541
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	542 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	543 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	544 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	545 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	546 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	547 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	548 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	549 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	550 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	551 error ("invalid structure assignment");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	552 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	553 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	554 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	555 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	556
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	557 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	558 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	559 octave_value_list key_idx = idx.front ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	560
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	561 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	562
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	563 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	564
15614 f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	565 maybe_warn_invalid_field_name (key, "subsasgn");
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	566
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	567 if (error_state)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	568 return retval;
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	569
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	570 if (t_rhs.is_cs_list ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	571 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	572 Cell tmp_cell = Cell (t_rhs.list_value ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	573
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	574 // The shape of the RHS is irrelevant, we just want
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	575 // the number of elements to agree and to preserve the
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	576 // shape of the left hand side of the assignment.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	577
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	578 if (numel () == tmp_cell.numel ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	579 tmp_cell = tmp_cell.reshape (dims ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	580
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	581 map.setfield (key, tmp_cell);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	582 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	583 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	584 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	585 Cell tmp_cell(1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	586 tmp_cell(0) = t_rhs.storable_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	587 map.setfield (key, tmp_cell);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	588 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	589
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	590 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	591 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	592 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	593 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	594 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	595 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	596 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	597 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	598 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	599
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	600 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	601 gripe_invalid_index_type (type_name (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	602 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	603
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	604 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	605 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	606 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	607 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	608 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	609 gripe_failed_assignment ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	610
10754 92eb5fb58ebc fix resize with structs Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	611 retval.maybe_mutate ();
92eb5fb58ebc fix resize with structs Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	612
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	613 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	614 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	615
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	616 octave_value
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	617 octave_struct::do_index_op (const octave_value_list& idx, bool resize_ok)
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	618 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	619 // octave_map handles indexing itself.
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8587 diff changeset	620 return map.index (idx, resize_ok);
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	621 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	622
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	623 size_t
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	624 octave_struct::byte_size (void) const
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	625 {
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	626 // Neglect the size of the fieldnames.
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	627
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	628 size_t retval = 0;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	629
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	630 for (octave_map::const_iterator p = map.begin (); p != map.end (); p++)
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	631 {
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	632 std::string key = map.key (p);
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	633
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	634 octave_value val = octave_value (map.contents (p));
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	635
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	636 retval += val.byte_size ();
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	637 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	638
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	639 return retval;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	640 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	641
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	642 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	643 octave_struct::print (std::ostream& os, bool) const
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	644 {
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	645 print_raw (os);
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	646 }
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	647
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	648 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	649 octave_struct::print_raw (std::ostream& os, bool) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	650 {
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	651 unwind_protect frame;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	652
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	653 frame.protect_var (Vstruct_levels_to_print);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	654
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	655 if (Vstruct_levels_to_print >= 0)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	656 {
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	657 bool max_depth_reached = Vstruct_levels_to_print-- == 0;
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	658
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	659 bool print_fieldnames_only
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	660 = (max_depth_reached \|\| ! Vprint_struct_array_contents);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	661
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	662 increment_indent_level ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	663
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	664 newline (os);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	665 indent (os);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	666 dim_vector dv = dims ();
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	667 os << dv.str () << " struct array containing the fields:";
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	668 newline (os);
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3548 diff changeset	669
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	670 increment_indent_level ();
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4561 diff changeset	671
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	672 string_vector key_list = map.fieldnames ();
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5828 diff changeset	673
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5828 diff changeset	674 for (octave_idx_type i = 0; i < key_list.length (); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	675 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	676 std::string key = key_list[i];
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5828 diff changeset	677
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	678 Cell val = map.contents (key);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	679
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	680 newline (os);
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	681
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	682 if (print_fieldnames_only)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	683 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	684 indent (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	685 os << key;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	686 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	687 else
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	688 {
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	689 octave_value tmp (val);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	690 tmp.print_with_name (os, key);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	691 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	692 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	693
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	694 if (print_fieldnames_only)
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	695 newline (os);
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4561 diff changeset	696
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	697 decrement_indent_level ();
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	698 decrement_indent_level ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	699 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	700 else
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	701 {
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	702 indent (os);
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	703 os << "<structure>";
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	704 newline (os);
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	705 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	706 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	707
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	708 bool
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	709 octave_struct::print_name_tag (std::ostream& os, const std::string& name) const
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	710 {
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	711 bool retval = false;
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	712
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	713 indent (os);
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	714
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	715 if (Vstruct_levels_to_print < 0)
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	716 os << name << " = ";
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	717 else
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	718 {
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	719 os << name << " =";
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	720 newline (os);
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	721 retval = true;
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	722 }
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	723
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	724 return retval;
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	725 }
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	726
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	727 static bool
12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	728 scalar (const dim_vector& dims)
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	729 {
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	730 return dims.length () == 2 && dims (0) == 1 && dims (1) == 1;
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	731 }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	732
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	733
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	734 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	735 octave_struct::save_ascii (std::ostream& os)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	736 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	737 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	738
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	739 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	740
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	741 const dim_vector dv = dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	742
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	743 os << "# ndims: " << dv.length () << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	744
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	745 for (int i = 0; i < dv.length (); i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	746 os << " " << dv (i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	747 os << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	748
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	749 os << "# length: " << nf << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	750
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	751 // Iterating over the list of keys will preserve the order of the
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	752 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	753 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	754
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	755 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	756 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	757 std::string key = keys(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	758
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	759 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	760
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	761 bool b = save_ascii_data (os, val, key, false, 0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	762
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	763 if (! b)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	764 return os;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	765 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	766
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	767 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	768 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	769
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	770 bool
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	771 octave_struct::load_ascii (std::istream& is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	772 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	773 octave_idx_type len = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	774 dim_vector dv (1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	775 bool success = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	776
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	777 // KLUGE: earlier Octave versions did not save extra dimensions with struct,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	778 // and as a result did not preserve dimensions for empty structs.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	779 // The default dimensions were 1x1, which we want to preserve.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	780 string_vector keywords(2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	781
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	782 keywords[0] = "ndims";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	783 keywords[1] = "length";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	784
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	785 std::string kw;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	786
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	787 if (extract_keyword (is, keywords, kw, len, true))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	788 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	789 if (kw == keywords[0])
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	790 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	791 int mdims = std::max (static_cast<int> (len), 2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	792 dv.resize (mdims);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	793 for (int i = 0; i < mdims; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	794 is >> dv(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	795
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	796 success = extract_keyword (is, keywords[1], len);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	797 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	798 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	799 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	800 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	801
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	802 if (success && len >= 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	803 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	804 if (len > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	805 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	806 octave_map m (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	807
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	808 for (octave_idx_type j = 0; j < len; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	809 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	810 octave_value t2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	811 bool dummy;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	812
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	813 // recurse to read cell elements
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	814 std::string nm
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	815 = read_ascii_data (is, std::string (), dummy, t2, j);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	816
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	817 if (!is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	818 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	819
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	820 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	821
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	822 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	823 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	824 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	825 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	826 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	827
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	828 m.setfield (nm, tcell);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	829 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	830
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	831 if (is)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	832 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	833 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	834 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	835 error ("load: failed to load structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	836 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	837 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	838 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	839 else if (len == 0 )
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	840 map = octave_map (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	841 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	842 panic_impossible ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	843 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	844 else {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	845 error ("load: failed to extract number of elements in structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	846 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	847 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	848
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	849 return success;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	850 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	851
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	852 bool
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	853 octave_struct::save_binary (std::ostream& os, bool& save_as_floats)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	854 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	855 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	856
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	857 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	858
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	859 dim_vector d = dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	860 if (d.length () < 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	861 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	862
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	863 // Use negative value for ndims
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14625 diff changeset	864 int32_t di = - d.length ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	865 os.write (reinterpret_cast<char *> (&di), 4);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	866 for (int i = 0; i < d.length (); i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	867 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	868 di = d(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	869 os.write (reinterpret_cast<char *> (&di), 4);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	870 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	871
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	872 int32_t len = nf;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	873 os.write (reinterpret_cast<char *> (&len), 4);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	874
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	875 // Iterating over the list of keys will preserve the order of the
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	876 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	877 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	878
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	879 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	880 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	881 std::string key = keys(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	882
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	883 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	884
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	885 bool b = save_binary_data (os, val, key, "", 0, save_as_floats);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	886
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	887 if (! b)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	888 return os;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	889 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	890
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	891 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	892 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	893
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	894 bool
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	895 octave_struct::load_binary (std::istream& is, bool swap,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	896 oct_mach_info::float_format fmt)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	897 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	898 bool success = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	899 int32_t len;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	900 if (! is.read (reinterpret_cast<char *> (&len), 4))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	901 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	902 if (swap)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	903 swap_bytes<4> (&len);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	904
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	905 dim_vector dv (1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	906
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	907 if (len < 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	908 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	909 // We have explicit dimensions.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	910 int mdims = -len;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	911
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	912 int32_t di;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	913 dv.resize (mdims);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	914
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	915 for (int i = 0; i < mdims; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	916 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	917 if (! is.read (reinterpret_cast<char *> (&di), 4))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	918 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	919 if (swap)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	920 swap_bytes<4> (&di);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	921 dv(i) = di;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	922 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	923
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	924 if (! is.read (reinterpret_cast<char *> (&len), 4))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	925 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	926 if (swap)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	927 swap_bytes<4> (&len);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	928 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	929
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	930 if (len > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	931 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	932 octave_map m (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	933
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	934 for (octave_idx_type j = 0; j < len; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	935 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	936 octave_value t2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	937 bool dummy;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	938 std::string doc;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	939
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	940 // recurse to read cell elements
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	941 std::string nm = read_binary_data (is, swap, fmt, std::string (),
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	942 dummy, t2, doc);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	943
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	944 if (!is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	945 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	946
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	947 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	948
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	949 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	950 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	951 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	952 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	953 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	954
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	955 m.setfield (nm, tcell);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	956 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	957
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	958 if (is)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	959 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	960 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	961 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	962 error ("load: failed to load structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	963 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	964 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	965 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	966 else if (len == 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	967 map = octave_map (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	968 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	969 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	970
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	971 return success;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	972 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	973
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	974 #if defined (HAVE_HDF5)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	975
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	976 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	977 octave_struct::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	978 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	979 hid_t data_hid = -1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	980
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	981 #if HAVE_HDF5_18
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	982 data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	983 #else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	984 data_hid = H5Gcreate (loc_id, name, 0);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	985 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	986 if (data_hid < 0) return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	987
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	988 // recursively add each element of the structure to this group
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	989 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	990
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	991 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	992
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	993 // Iterating over the list of keys will preserve the order of the
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	994 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	995 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	996
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	997 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	998 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	999 std::string key = keys(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1000
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1001 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1002
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1003 bool retval2 = add_hdf5_data (data_hid, val, key, "", false,
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1004 save_as_floats);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1005
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1006 if (! retval2)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1007 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1008 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1009
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1010 H5Gclose (data_hid);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1011
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1012 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1013 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1014
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1015 bool
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1016 octave_struct::load_hdf5 (hid_t loc_id, const char *name)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1017 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1018 bool retval = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1019
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1020 hdf5_callback_data dsub;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1021
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1022 herr_t retval2 = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1023 octave_map m (dim_vector (1, 1));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1024 int current_item = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1025 hsize_t num_obj = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1026 #if HAVE_HDF5_18
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1027 hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1028 #else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1029 hid_t group_id = H5Gopen (loc_id, name);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1030 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1031 H5Gget_num_objs (group_id, &num_obj);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1032 H5Gclose (group_id);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1033
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1034 // FIXME -- fields appear to be sorted alphabetically on loading.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1035 // Why is that happening?
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1036
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1037 while (current_item < static_cast<int> (num_obj)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1038 && (retval2 = H5Giterate (loc_id, name, &current_item,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1039 hdf5_read_next_data, &dsub)) > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1040 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1041 octave_value t2 = dsub.tc;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1042
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1043 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1044
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1045 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1046 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1047 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1048 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1049 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1050
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1051 m.setfield (dsub.name, tcell);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1052
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1053 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1054
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1055 if (retval2 >= 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1056 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1057 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1058 retval = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1059 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1060
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1061 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1062 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1063
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1064 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1065
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1066 mxArray *
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1067 octave_struct::as_mxArray (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1068 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1069 int nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1070 string_vector kv = map_keys ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1071
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1072 OCTAVE_LOCAL_BUFFER (const char *, f, nf);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1073
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1074 for (int i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1075 f[i] = kv[i].c_str ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1076
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1077 mxArray *retval = new mxArray (dims (), nf, f);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1078
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1079 mxArray elts = static_cast<mxArray > (retval->get_data ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1080
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1081 mwSize nel = numel ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1082
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1083 mwSize ntot = nf * nel;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1084
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1085 for (int i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1086 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1087 Cell c = map.contents (kv[i]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1088
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1089 const octave_value *p = c.data ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1090
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1091 mwIndex k = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1092 for (mwIndex j = i; j < ntot; j += nf)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1093 elts[j] = new mxArray (p[k++]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1094 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1095
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1096 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1097 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1098
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1099 octave_value
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1100 octave_struct::fast_elem_extract (octave_idx_type n) const
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1101 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1102 if (n < map.numel ())
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1103 return map.checkelem (n);
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1104 else
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1105 return octave_value ();
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1106 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1107
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1108 bool
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1109 octave_struct::fast_elem_insert (octave_idx_type n,
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1110 const octave_value& x)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1111 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1112 bool retval = false;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1113
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1114 if (n < map.numel ())
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1115 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1116 // To avoid copying the scalar struct, it just stores a pointer to
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1117 // itself.
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1118 const octave_scalar_map *sm_ptr;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1119 void here = reinterpret_cast<void >(&sm_ptr);
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14625 diff changeset	1120 return (x.get_rep ().fast_elem_insert_self (here, btyp_struct)
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1121 && map.fast_elem_insert (n, *sm_ptr));
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1122 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1123
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1124 return retval;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1125 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1126 DEFINE_OCTAVE_ALLOCATOR(octave_scalar_struct);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1127
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1128 DEFINE_OV_TYPEID_FUNCTIONS_AND_DATA(octave_scalar_struct, "scalar struct", "struct");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1129
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1130 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1131 octave_scalar_struct::dotref (const octave_value_list& idx, bool auto_add)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1132 {
15613 126285fce876 check for allowed struct field names in subsref and subsasgn Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15534 diff changeset	1133 octave_value retval;
126285fce876 check for allowed struct field names in subsref and subsasgn Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15534 diff changeset	1134
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1135 assert (idx.length () == 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1136
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1137 std::string nm = idx(0).string_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1138
15614 f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1139 maybe_warn_invalid_field_name (nm, "subsref");
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1140
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1141 if (error_state)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1142 return retval;
15613 126285fce876 check for allowed struct field names in subsref and subsasgn Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15534 diff changeset	1143
126285fce876 check for allowed struct field names in subsref and subsasgn Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15534 diff changeset	1144 retval = map.getfield (nm);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1145
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1146 if (! auto_add && retval.is_undefined ())
15731 18f168880226 error_ids: Adding ids and documentation Juan Pablo Carbajal <ajuanpi+dev@gmail.com> parents: 15614 diff changeset	1147 error_with_id ("Octave:invalid-indexing",
18f168880226 error_ids: Adding ids and documentation Juan Pablo Carbajal <ajuanpi+dev@gmail.com> parents: 15614 diff changeset	1148 "structure has no member '%s'", nm.c_str ());
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1149
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1150 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1151 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1152
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1153 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1154 octave_scalar_struct::subsref (const std::string& type,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1155 const std::list<octave_value_list>& idx)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1156 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1157 octave_value retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1158
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1159 if (type[0] == '.')
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1160 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1161 int skip = 1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1162
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1163 retval = dotref (idx.front ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1164
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1165 if (idx.size () > 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1166 retval = retval.next_subsref (type, idx, skip);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1167 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1168 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1169 retval = to_array ().subsref (type, idx);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1170
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1171 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1172 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1173
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1174 octave_value_list
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1175 octave_scalar_struct::subsref (const std::string& type,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1176 const std::list<octave_value_list>& idx,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1177 int nargout)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1178 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1179 octave_value_list retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1180
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1181 if (type[0] == '.')
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1182 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1183 int skip = 1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1184
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1185 retval(0) = dotref (idx.front ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1186
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1187 if (idx.size () > 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1188 retval = retval(0).next_subsref (nargout, type, idx, skip);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1189 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1190 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1191 retval = to_array ().subsref (type, idx, nargout);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1192
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1193 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1194 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1195
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1196 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1197 octave_scalar_struct::subsref (const std::string& type,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1198 const std::list<octave_value_list>& idx,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1199 bool auto_add)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1200 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1201 octave_value retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1202
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1203 if (type[0] == '.')
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1204 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1205 int skip = 1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1206
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1207 retval = dotref (idx.front (), auto_add);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1208
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1209 if (idx.size () > 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1210 retval = retval.next_subsref (auto_add, type, idx, skip);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1211 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1212 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1213 retval = to_array ().subsref (type, idx, auto_add);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1214
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1215 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1216 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1217
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1218 /*
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1219 %!test
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1220 %! x(1).a.a = 1;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1221 %! x(2).a.a = 2;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1222 %! assert (size (x), [1, 2]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1223 %! assert (x(1).a.a, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1224 %! assert (x(2).a.a, 2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1225 */
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1226
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1227 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1228 octave_scalar_struct::numeric_conv (const octave_value& val,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1229 const std::string& type)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1230 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1231 octave_value retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1232
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1233 if (type.length () > 0 && type[0] == '.' && ! val.is_map ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1234 retval = octave_map ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1235 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1236 retval = val;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1237
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1238 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1239 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1240
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1241 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1242 octave_scalar_struct::subsasgn (const std::string& type,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1243 const std::list<octave_value_list>& idx,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1244 const octave_value& rhs)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1245 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1246 octave_value retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1247
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1248 if (idx.front ().empty ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1249 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1250 error ("missing index in indexed assignment");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1251 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1252 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1253
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1254 if (type[0] == '.')
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1255 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1256 int n = type.length ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1257
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1258 octave_value t_rhs = rhs;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1259
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1260 octave_value_list key_idx = idx.front ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1261
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1262 assert (key_idx.length () == 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1263
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1264 std::string key = key_idx(0).string_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1265
15614 f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1266 maybe_warn_invalid_field_name (key, "subsasgn");
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1267
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1268 if (error_state)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1269 return retval;
15613 126285fce876 check for allowed struct field names in subsref and subsasgn Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15534 diff changeset	1270
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1271 if (n > 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1272 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1273 std::list<octave_value_list> next_idx (idx);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1274
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1275 next_idx.erase (next_idx.begin ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1276
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1277 std::string next_type = type.substr (1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1278
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1279 octave_value tmp;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1280 octave_map::iterator pkey = map.seek (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1281 if (pkey != map.end ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1282 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1283 map.contents (pkey).make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1284 tmp = map.contents (pkey);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1285 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1286
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1287 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1288 {
12181 88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	1289 bool orig_undefined = tmp.is_undefined ();
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	1290
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	1291 if (orig_undefined \|\| tmp.is_zero_by_zero ())
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1292 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1293 tmp = octave_value::empty_conv (next_type, rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1294 tmp.make_unique (); // probably a no-op.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1295 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1296 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1297 // optimization: ignore the copy still stored inside our map.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1298 tmp.make_unique (1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1299
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1300 if (! error_state)
12181 88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	1301 t_rhs = (orig_undefined
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	1302 ? tmp.undef_subsasgn (next_type, next_idx, rhs)
88ff30dcc048 fix another bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12143 diff changeset	1303 : tmp.subsasgn (next_type, next_idx, rhs));
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1304 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1305 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1306
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1307 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1308 map.setfield (key, t_rhs.storable_value ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1309 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1310 gripe_failed_assignment ();
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	1311
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	1312 count++;
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	1313 retval = this;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1314 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1315 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1316 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1317 // Forward this case to octave_struct.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1318 octave_value tmp (new octave_struct (octave_map (map)));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1319 retval = tmp.subsasgn (type, idx, rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1320 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1321
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1322 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1323 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1324
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1325 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1326 octave_scalar_struct::do_index_op (const octave_value_list& idx, bool resize_ok)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1327 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1328 // octave_map handles indexing itself.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1329 return octave_map (map).index (idx, resize_ok);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1330 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1331
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1332 size_t
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1333 octave_scalar_struct::byte_size (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1334 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1335 // Neglect the size of the fieldnames.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1336
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1337 size_t retval = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1338
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1339 for (octave_map::const_iterator p = map.begin (); p != map.end (); p++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1340 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1341 std::string key = map.key (p);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1342
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1343 octave_value val = octave_value (map.contents (p));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1344
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1345 retval += val.byte_size ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1346 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1347
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1348 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1349 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1350
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1351 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1352 octave_scalar_struct::print (std::ostream& os, bool) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1353 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1354 print_raw (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1355 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1356
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1357 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1358 octave_scalar_struct::print_raw (std::ostream& os, bool) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1359 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1360 unwind_protect frame;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1361
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1362 frame.protect_var (Vstruct_levels_to_print);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1363
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1364 if (Vstruct_levels_to_print >= 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1365 {
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1366 bool max_depth_reached = Vstruct_levels_to_print-- == 0;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1367
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1368 bool print_fieldnames_only = max_depth_reached;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1369
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1370 increment_indent_level ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1371
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	1372 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	1373 newline (os);
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	1374
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1375 indent (os);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1376 os << "scalar structure containing the fields:";
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1377 newline (os);
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	1378 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12483 diff changeset	1379 newline (os);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1380
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1381 increment_indent_level ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1382
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1383 string_vector key_list = map.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1384
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1385 for (octave_idx_type i = 0; i < key_list.length (); i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1386 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1387 std::string key = key_list[i];
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1388
12143 ed129a03f93c octave_scalar_struct::print_raw: avoid unnecessary conversion of map contents to Cell John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1389 octave_value val = map.contents (key);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1390
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1391 if (print_fieldnames_only)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1392 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1393 indent (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1394 os << key;
12143 ed129a03f93c octave_scalar_struct::print_raw: avoid unnecessary conversion of map contents to Cell John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1395 dim_vector dv = val.dims ();
ed129a03f93c octave_scalar_struct::print_raw: avoid unnecessary conversion of map contents to Cell John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1396 os << ": " << dv.str () << " " << val.type_name ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1397 newline (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1398 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1399 else
12143 ed129a03f93c octave_scalar_struct::print_raw: avoid unnecessary conversion of map contents to Cell John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	1400 val.print_with_name (os, key);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1401 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1402
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1403 decrement_indent_level ();
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1404 decrement_indent_level ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1405 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1406 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1407 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1408 indent (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1409 os << "<structure>";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1410 newline (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1411 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1412 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1413
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1414 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1415 octave_scalar_struct::print_name_tag (std::ostream& os, const std::string& name) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1416 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1417 bool retval = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1418
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1419 indent (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1420
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1421 if (Vstruct_levels_to_print < 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1422 os << name << " = ";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1423 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1424 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1425 os << name << " =";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1426 newline (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1427 retval = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1428 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1429
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1430 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1431 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1432
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1433 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1434 octave_scalar_struct::save_ascii (std::ostream& os)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1435 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1436 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1437
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1438 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1439
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1440 const dim_vector dv = dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1441
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1442 os << "# ndims: " << dv.length () << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1443
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1444 for (int i = 0; i < dv.length (); i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1445 os << " " << dv (i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1446 os << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1447
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1448 os << "# length: " << nf << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1449
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1450 // Iterating over the list of keys will preserve the order of the
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1451 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1452 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1453
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1454 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1455 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1456 std::string key = keys(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1457
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1458 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1459
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1460 bool b = save_ascii_data (os, val, key, false, 0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1461
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1462 if (! b)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1463 return os;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1464 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1465
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1466 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1467 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1468
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1469 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1470 octave_scalar_struct::load_ascii (std::istream& is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1471 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1472 bool success = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1473 octave_idx_type len = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1474
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	1475 if (extract_keyword (is, "length", len) && len >= 0)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1476 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1477 if (len > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1478 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1479 octave_scalar_map m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1480
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1481 for (octave_idx_type j = 0; j < len; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1482 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1483 octave_value t2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1484 bool dummy;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1485
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1486 // recurse to read cell elements
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1487 std::string nm
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1488 = read_ascii_data (is, std::string (), dummy, t2, j);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1489
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1490 if (!is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1491 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1492
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1493 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1494 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1495 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1496 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1497 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1498
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1499 m.setfield (nm, t2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1500 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1501
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1502 if (is)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1503 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1504 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1505 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1506 error ("load: failed to load structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1507 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1508 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1509 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1510 else if (len == 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1511 map = octave_scalar_map ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1512 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1513 panic_impossible ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1514 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1515 else {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1516 error ("load: failed to extract number of elements in structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1517 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1518 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1519
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1520 return success;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1521 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1522
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1523 bool
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1524 octave_scalar_struct::save_binary (std::ostream& os, bool& save_as_floats)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1525 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1526 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1527
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1528 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1529
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1530 int32_t len = nf;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1531 os.write (reinterpret_cast<char *> (&len), 4);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1532
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1533 // Iterating over the list of keys will preserve the order of the
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1534 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1535 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1536
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1537 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1538 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1539 std::string key = keys(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1540
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1541 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1542
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1543 bool b = save_binary_data (os, val, key, "", 0, save_as_floats);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1544
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1545 if (! b)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1546 return os;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1547 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1548
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1549 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1550 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1551
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1552 bool
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1553 octave_scalar_struct::load_binary (std::istream& is, bool swap,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1554 oct_mach_info::float_format fmt)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1555 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1556 bool success = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1557 int32_t len;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1558 if (! is.read (reinterpret_cast<char *> (&len), 4))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1559 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1560 if (swap)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1561 swap_bytes<4> (&len);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1562
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1563 dim_vector dv (1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1564
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1565 if (len > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1566 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1567 octave_scalar_map m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1568
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1569 for (octave_idx_type j = 0; j < len; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1570 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1571 octave_value t2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1572 bool dummy;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1573 std::string doc;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1574
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1575 // recurse to read cell elements
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1576 std::string nm = read_binary_data (is, swap, fmt, std::string (),
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1577 dummy, t2, doc);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1578
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1579 if (!is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1580 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1581
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1582 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1583 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1584 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1585 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1586 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1587
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1588 m.setfield (nm, t2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1589 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1590
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1591 if (is)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1592 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1593 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1594 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1595 error ("load: failed to load structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1596 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1597 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1598 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1599 else if (len == 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1600 map = octave_scalar_map ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1601 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1602 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1603
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1604 return success;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1605 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1606
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1607 #if defined (HAVE_HDF5)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1608
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1609 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1610 octave_scalar_struct::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1611 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1612 hid_t data_hid = -1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1613
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1614 #if HAVE_HDF5_18
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1615 data_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1616 #else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1617 data_hid = H5Gcreate (loc_id, name, 0);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1618 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1619 if (data_hid < 0) return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1620
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1621 // recursively add each element of the structure to this group
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1622 octave_scalar_map m = scalar_map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1623
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1624 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1625
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1626 // Iterating over the list of keys will preserve the order of the
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1627 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1628 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1629
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1630 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1631 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1632 std::string key = keys(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1633
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1634 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1635
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1636 bool retval2 = add_hdf5_data (data_hid, val, key, "", false,
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1637 save_as_floats);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1638
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1639 if (! retval2)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1640 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1641 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1642
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1643 H5Gclose (data_hid);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1644
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1645 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1646 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1647
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1648 bool
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1649 octave_scalar_struct::load_hdf5 (hid_t loc_id, const char *name)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1650 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1651 bool retval = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1652
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1653 hdf5_callback_data dsub;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1654
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1655 herr_t retval2 = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1656 octave_scalar_map m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1657 int current_item = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1658 hsize_t num_obj = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1659 #if HAVE_HDF5_18
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1660 hid_t group_id = H5Gopen (loc_id, name, H5P_DEFAULT);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1661 #else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1662 hid_t group_id = H5Gopen (loc_id, name);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1663 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1664 H5Gget_num_objs (group_id, &num_obj);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1665 H5Gclose (group_id);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1666
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1667 // FIXME -- fields appear to be sorted alphabetically on loading.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1668 // Why is that happening?
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1669
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1670 while (current_item < static_cast<int> (num_obj)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1671 && (retval2 = H5Giterate (loc_id, name, &current_item,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1672 hdf5_read_next_data, &dsub)) > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1673 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1674 octave_value t2 = dsub.tc;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1675
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1676 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1677 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1678 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1679 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1680 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1681
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1682 m.setfield (dsub.name, t2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1683
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1684 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1685
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1686 if (retval2 >= 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1687 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1688 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1689 retval = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1690 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1691
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1692 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1693 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1694
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1695 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1696
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1697 mxArray *
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1698 octave_scalar_struct::as_mxArray (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1699 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1700 int nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1701 string_vector kv = map_keys ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1702
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1703 OCTAVE_LOCAL_BUFFER (const char *, f, nf);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1704
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1705 for (int i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1706 f[i] = kv[i].c_str ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1707
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1708 mxArray *retval = new mxArray (dims (), nf, f);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1709
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1710 mxArray elts = static_cast<mxArray > (retval->get_data ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1711
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1712 mwSize nel = numel ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1713
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1714 mwSize ntot = nf * nel;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1715
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1716 for (int i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1717 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1718 Cell c = map.contents (kv[i]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1719
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1720 const octave_value *p = c.data ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1721
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1722 mwIndex k = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1723 for (mwIndex j = i; j < ntot; j += nf)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1724 elts[j] = new mxArray (p[k++]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1725 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1726
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1727 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1728 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1729
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1730
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1731 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1732 octave_scalar_struct::to_array (void)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1733 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1734 return new octave_struct (octave_map (map));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1735 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1736
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1737 bool
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1738 octave_scalar_struct::fast_elem_insert_self (void *where, builtin_type_t btyp) const
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1739 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1740
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1741 if (btyp == btyp_struct)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1742 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1743 (reinterpret_cast<const octave_scalar_map *>(where)) = &map;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1744 return true;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1745 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1746 else
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1747 return false;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1748 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1749
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1750 DEFUN (struct, args, ,
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1751 "-- texinfo --\n\
15782 10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1752 @deftypefn {Built-in Function} {} struct (@var{field1}, @var{value1}, @var{field2}, @var{value2}, @dots{})\n\
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1753 \n\
16816 12005245b645 doc: Periodic grammarcheck of documentation. Rik <rik@octave.org> parents: 15782 diff changeset	1754 Create a scalar or array structure and initialize its values. The\n\
15782 10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1755 @var{field1}, @var{field2}, @dots{} variables are strings giving the\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1756 names of the fields and the @var{value1}, @var{value2}, @dots{}\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1757 variables can be any type.\n\
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1758 \n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1759 If the values are cell arrays, create a structure array and initialize\n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1760 its values. The dimensions of each cell array of values must match.\n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1761 Singleton cells and non-cell values are repeated so that they fill\n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1762 the entire array. If the cells are empty, create an empty structure\n\
4911 14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4837 diff changeset	1763 array with the specified field names.\n\
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1764 \n\
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1765 If the argument is an object, return the underlying struct.\n\
15782 10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1766 \n\
16816 12005245b645 doc: Periodic grammarcheck of documentation. Rik <rik@octave.org> parents: 15782 diff changeset	1767 Observe that the syntax is optimized for struct @strong{arrays}. Consider\n\
12005245b645 doc: Periodic grammarcheck of documentation. Rik <rik@octave.org> parents: 15782 diff changeset	1768 the following examples:\n\
15782 10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1769 \n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1770 @example\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1771 @group\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1772 struct (\"foo\", 1)\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1773 @result{} scalar structure containing the fields:\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1774 foo = 1\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1775 \n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1776 struct (\"foo\", @{@})\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1777 @result{} 0x0 struct array containing the fields:\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1778 foo\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1779 \n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1780 struct (\"foo\", @{ @{@} @})\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1781 @result{} scalar structure containing the fields:\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1782 foo = @{@}(0x0)\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1783 \n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1784 struct (\"foo\", @{1, 2, 3@})\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1785 @result{} 1x3 struct array containing the fields:\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1786 foo\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1787 \n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1788 @end group\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1789 @end example\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1790 \n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1791 @noindent\n\
16816 12005245b645 doc: Periodic grammarcheck of documentation. Rik <rik@octave.org> parents: 15782 diff changeset	1792 The first case is an ordinary scalar struct, one field, one value. The\n\
15782 10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1793 second produces an empty struct array with one field and no values, since\n\
16816 12005245b645 doc: Periodic grammarcheck of documentation. Rik <rik@octave.org> parents: 15782 diff changeset	1794 s being passed an empty cell array of struct array values. When the value is\n\
15782 10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1795 a cell array containing a single entry, this becomes a scalar struct with\n\
16816 12005245b645 doc: Periodic grammarcheck of documentation. Rik <rik@octave.org> parents: 15782 diff changeset	1796 that single entry as the value of the field. That single entry happens\n\
15782 10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1797 to be an empty cell array.\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1798 \n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1799 Finally, if the value is a non-scalar cell array, then @code{struct}\n\
10ed43563df5 doc: overhaul struct docstring Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 15781 diff changeset	1800 produces a struct @strong{array}.\n\
4911 14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4837 diff changeset	1801 @end deftypefn")
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1802 {
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1803 octave_value retval;
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1804
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1805 int nargin = args.length ();
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1806
5444 781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1807 // struct ([]) returns an empty struct.
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1808
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1809 // struct (empty_matrix) returns an empty struct with the same
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1810 // dimensions as the empty matrix.
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1811
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1812 // Note that struct () creates a 1x1 struct with no fields for
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1813 // compatibility with Matlab.
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1814
10747 58c1b5402588 fix a showstopping bug in octave_fields reference counting Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1815 if (nargin == 1 && args(0).is_map ())
58c1b5402588 fix a showstopping bug in octave_fields reference counting Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1816 return args(0);
58c1b5402588 fix a showstopping bug in octave_fields reference counting Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1817
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1818 if (nargin == 1 && args(0).is_object ())
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1819 {
10747 58c1b5402588 fix a showstopping bug in octave_fields reference counting Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1820 retval = args(0).map_value ();
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1821
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1822 return retval;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1823 }
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1824
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1825 if ((nargin == 1 \|\| nargin == 2)
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1826 && args(0).is_empty () && args(0).is_real_matrix ())
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1827 {
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1828 Cell fields;
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1829
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1830 if (nargin == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1831 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1832 if (args(1).is_cellstr ())
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1833 retval = octave_map (args(0).dims (), args(1).cellstr_value ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1834 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1835 error ("struct: expecting cell array of field names as second argument");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1836 }
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1837 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1838 retval = octave_map (args(0).dims ());
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1839
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1840 return retval;
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1841 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1842
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1843 // Check for "field", VALUE pairs.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1844
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1845 for (int i = 0; i < nargin; i += 2)
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1846 {
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1847 if (! args(i).is_string () \|\| i + 1 >= nargin)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1848 {
12483 7a5aacf65f81 Rewrite error strings in src/ to use variables named in documentation. Rik <octave@nomad.inbox5.com> parents: 12181 diff changeset	1849 error ("struct: expecting alternating \"field\", VALUE pairs");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1850 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1851 }
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1852 }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1853
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1854 // Check that the dimensions of the values correspond.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1855
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1856 dim_vector dims (1, 1);
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1857
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1858 int first_dimensioned_value = 0;
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1859
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1860 for (int i = 1; i < nargin; i += 2)
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1861 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1862 if (args(i).is_cell ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1863 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1864 dim_vector argdims (args(i).dims ());
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1865
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1866 if (! scalar (argdims))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1867 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1868 if (! first_dimensioned_value)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1869 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1870 dims = argdims;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1871 first_dimensioned_value = i + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1872 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1873 else if (dims != argdims)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1874 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1875 error ("struct: dimensions of parameter %d do not match those of parameter %d",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1876 first_dimensioned_value, i+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1877 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1878 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1879 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1880 }
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1881 }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1882
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1883 // Create the return value.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1884
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1885 octave_map map (dims);
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1886
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1887 for (int i = 0; i < nargin; i+= 2)
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1888 {
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1889 // Get key.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1890
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1891 std::string key (args(i).string_value ());
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1892
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1893 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1894 return retval;
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1895
15614 f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1896 maybe_warn_invalid_field_name (key, "struct");
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1897
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1898 if (error_state)
f2b8f90052fd warn instead of throwing an error for invalid structure field names John W. Eaton <jwe@octave.org> parents: 15613 diff changeset	1899 return retval;
6811 3fe394f8502b [project @ 2007-08-10 19:07:34 by jwe] jwe parents: 6686 diff changeset	1900
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1901 // Value may be v, { v }, or { v1, v2, ... }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1902 // In the first two cases, we need to create a cell array of
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1903 // the appropriate dimensions filled with v. In the last case,
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1904 // the cell array has already been determined to be of the
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1905 // correct dimensions.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1906
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1907 if (args(i+1).is_cell ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1908 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1909 const Cell c (args(i+1).cell_value ());
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1910
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1911 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1912 return retval;
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1913
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1914 if (scalar (c.dims ()))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1915 map.setfield (key, Cell (dims, c(0)));
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1916 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1917 map.setfield (key, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1918 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	1919 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1920 map.setfield (key, Cell (dims, args(i+1)));
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1921
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1922 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1923 return retval;
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1924 }
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1925
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1926 return octave_value (map);
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1927 }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1928
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1929 /*
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1930 %!shared x
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1931 %! x(1).a=1; x(2).a=2; x(1).b=3; x(2).b=3;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1932 %!assert (struct ("a",1, "b",3), x(1))
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1933 %!assert (isempty (x([])))
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1934 %!assert (isempty (struct ("a",{}, "b",{})))
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1935 %!assert (struct ("a",{1,2}, "b",{3,3}), x)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1936 %!assert (struct ("a",{1,2}, "b",3), x)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1937 %!assert (struct ("a",{1,2}, "b",{3}), x)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1938 %!assert (struct ("b",3, "a",{1,2}), x)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1939 %!assert (struct ("b",{3}, "a",{1,2}), x)
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1940 %!test x = struct ([]);
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1941 %!assert (size (x), [0,0])
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1942 %!assert (isstruct (x))
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1943 %!assert (isempty (fieldnames (x)))
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1944 %!fail ('struct ("a",{1,2},"b",{1,2,3})', 'dimensions of parameter 2 do not match those of parameter 4')
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1945 %!fail ('struct (1,2,3,4)', 'struct: expecting alternating "field", VALUE pairs')
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1946 %!fail ('struct ("1",2,"3")', 'struct: expecting alternating "field", VALUE pairs')
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1947 */
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	1948
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1949 DEFUN (isstruct, args, ,
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1950 "-- texinfo --\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1951 @deftypefn {Built-in Function} {} isstruct (@var{x})\n\
0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1952 Return true if @var{x} is a structure or a structure array.\n\
0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1953 @seealso{ismatrix, iscell, isa}\n\
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1954 @end deftypefn")
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1955 {
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1956 octave_value retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1957
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1958 if (args.length () == 1)
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1959 retval = args(0).is_map ();
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1960 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	1961 print_usage ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1962
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1963 return retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1964 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1965
15781 c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1966 DEFUN (__fieldnames__, args, ,
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1967 "-- texinfo --\n\
15781 c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1968 @deftypefn {Built-in Function} {} __fieldnames__ (@var{struct})\n\
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1969 @deftypefnx {Built-in Function} {} __fieldnames__ (@var{obj})\n\
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1970 Internal function.\n\
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1971 \n\
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1972 Implements @code{fieldnames()} for structures and Octave objects.\n\
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1973 @seealso{fieldnames}\n\
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1974 @end deftypefn")
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1975 {
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1976 octave_value retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1977
15781 c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1978 // Input validation has already been done in fieldnames.m.
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1979 octave_value arg = args(0);
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1980
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1981 octave_map m = arg.map_value ();
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1982
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1983 string_vector keys = m.fieldnames ();
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1984
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1985 if (keys.length () == 0)
c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1986 retval = Cell (0, 1);
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1987 else
15781 c33594eefda7 Add fieldnames.m which extensds fieldnames() to work on Java objects. Rik <rik@octave.org> parents: 15731 diff changeset	1988 retval = Cell (keys);
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1989
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1990 return retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1991 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1992
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1993 DEFUN (isfield, args, ,
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1994 "-- texinfo --\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1995 @deftypefn {Built-in Function} {} isfield (@var{x}, @var{name})\n\
0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1996 Return true if the @var{x} is a structure and it\n\
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1997 includes an element named @var{name}. If @var{name} is a cell\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1998 array of strings then a logical array of equal dimension is returned.\n\
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1999 @end deftypefn")
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2000 {
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2001 octave_value retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2002
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2003 int nargin = args.length ();
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2004
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2005 if (nargin == 2)
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2006 {
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2007 retval = false;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2008
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2009 if (args(0).is_map ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2010 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2011 octave_map m = args(0).map_value ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2012
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2013 // FIXME -- should this work for all types that can do
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2014 // structure reference operations?
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2015
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2016 if (args(1).is_string ())
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2017 {
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2018 std::string key = args(1).string_value ();
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2019
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2020 retval = m.isfield (key);
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2021 }
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2022 else if (args(1).is_cell ())
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2023 {
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2024 Cell c = args(1).cell_value ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2025 boolNDArray bm (c.dims ());
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2026 octave_idx_type n = bm.numel ();
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2027
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2028 for (octave_idx_type i = 0; i < n; i++)
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2029 {
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2030 if (c(i).is_string ())
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2031 {
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2032 std::string key = c(i).string_value ();
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2033
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2034 bm(i) = m.isfield (key);
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2035 }
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2036 else
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2037 bm(i) = false;
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2038 }
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2039
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2040 retval = bm;
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	2041 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2042 }
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2043 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2044 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	2045 print_usage ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2046
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2047 return retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2048 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	2049
9784 f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2050 DEFUN (nfields, args, ,
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2051 "-- texinfo --\n\
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2052 @deftypefn {Built-in Function} {} nfields (@var{s})\n\
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2053 Return the number of fields of the structure @var{s}.\n\
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2054 @end deftypefn")
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2055 {
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2056 octave_value retval;
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2057
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2058 int nargin = args.length ();
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2059
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2060 if (nargin == 1 && args(0).is_map ())
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2061 {
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2062 retval = static_cast<double> (args(0).nfields ());
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2063 }
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2064 else
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2065 print_usage ();
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2066
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2067 return retval;
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2068 }
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2069
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2070 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2071 ## test isfield
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2072 %!test
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2073 %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3;
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2074 %! assert (isfield (x, "b"));
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2075 %!assert (isfield (struct ("a", "1"), "a"))
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2076 %!assert (isfield ({1}, "c"), false)
14861 f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2077 %!assert (isfield (struct ("a", "1"), 10), false)
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2078 %!assert (isfield (struct ("a", "b"), "a "), false)
f7afecdd87ef maint: Use Octave coding conventions for cuddling parentheses in src/ directory Rik <octave@nomad.inbox5.com> parents: 14846 diff changeset	2079 %!assert (isfield (struct ("a", 1, "b", 2), {"a", "c"}), [true, false])
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2080 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2081
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2082 DEFUN (cell2struct, args, ,
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2083 "-- texinfo --\n\
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2084 @deftypefn {Built-in Function} {} cell2struct (@var{cell}, @var{fields}, @var{dim})\n\
9036 58604c45ca74 Cleanup of data types related documentation Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	2085 Convert @var{cell} to a structure. The number of fields in @var{fields}\n\
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2086 must match the number of elements in @var{cell} along dimension @var{dim},\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2087 that is @code{numel (@var{fields}) == size (@var{cell}, @var{dim})}.\n\
13868 87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2088 If @var{dim} is omitted, a value of 1 is assumed.\n\
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2089 \n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2090 @example\n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2091 @group\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2092 A = cell2struct (@{\"Peter\", \"Hannah\", \"Robert\";\n\
7031 120f3135952f [project @ 2007-10-15 15:30:03 by jwe] jwe parents: 7017 diff changeset	2093 185, 170, 168@},\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2094 @{\"Name\",\"Height\"@}, 1);\n\
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2095 A(1)\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2096 @result{}\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2097 @{\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2098 Name = Peter\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2099 Height = 185\n\
97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	2100 @}\n\
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2101 \n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2102 @end group\n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2103 @end example\n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2104 @end deftypefn")
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2105 {
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2106 octave_value retval;
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2107
13868 87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2108 int nargin = args.length ();
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2109
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2110 if (nargin == 2 \|\| nargin == 3)
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2111 {
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11570 diff changeset	2112 if (! args(0).is_cell ())
13868 87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2113 {
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2114 error ("cell2struct: argument CELL must be of type cell");
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2115 return retval;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2116 }
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2117
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2118 if (! (args(1).is_cellstr () \|\| args(1).is_char_matrix ()))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2119 {
13868 87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2120 error ("cell2struct: FIELDS must be a cell array of strings or a character matrix");
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2121 return retval;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2122 }
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2123
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2124 const Cell vals = args(0).cell_value ();
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2125 const Array<std::string> fields = args(1).cellstr_value ();
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2126
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2127 octave_idx_type ext = 0;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2128
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2129 int dim = 0;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2130
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2131 if (nargin == 3)
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2132 {
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2133 if (args(2).is_real_scalar ())
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2134 {
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2135 dim = nargin == 2 ? 0 : args(2).int_value () - 1;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2136
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2137 if (error_state)
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2138 return retval;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2139 }
10751 717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2140 else
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2141 {
13868 87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2142 error ("cell2struct: DIM must be a real scalar");
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2143 return retval;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2144 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2145 }
13868 87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2146
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2147 if (dim < 0)
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2148 {
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2149 error ("cell2struct: DIM must be a valid dimension");
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2150 return retval;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2151 }
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2152
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2153 ext = vals.ndims () > dim ? vals.dims ()(dim) : 1;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2154
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2155 if (ext != fields.numel ())
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2156 {
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2157 error ("cell2struct: number of FIELDS does not match dimension");
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2158 return retval;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2159 }
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2160
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2161 int nd = std::max (dim+1, vals.ndims ());
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2162 // result dimensions.
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2163 dim_vector rdv = vals.dims ().redim (nd);
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2164
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2165 assert (ext == rdv(dim));
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2166 if (nd == 2)
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2167 {
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2168 rdv(0) = rdv(1-dim);
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2169 rdv(1) = 1;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2170 }
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2171 else
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2172 {
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2173 for (int i = dim + 1; i < nd; i++)
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2174 rdv(i-1) = rdv(i);
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2175
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2176 rdv.resize (nd-1);
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2177 }
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2178
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2179 octave_map map (rdv);
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2180 Array<idx_vector> ia (dim_vector (nd, 1), idx_vector::colon);
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2181
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2182 for (octave_idx_type i = 0; i < ext; i++)
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2183 {
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2184 ia(dim) = i;
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2185 map.setfield (fields(i), vals.index (ia).reshape (rdv));
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2186 }
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2187
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2188 retval = map;
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2189 }
4751 7cb3b220d0f8 [project @ 2004-02-07 22:42:04 by jwe] jwe parents: 4750 diff changeset	2190 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	2191 print_usage ();
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2192
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2193 return retval;
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2194 }
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2195
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2196 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2197 ## test cell2struct versus struct2cell
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2198 %!test
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2199 %! keys = cellstr (char (floor (rand (100,10)*24+65)))';
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2200 %! vals = mat2cell (rand (100,1), ones (100,1), 1)';
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2201 %! s = struct ([keys; vals]{:});
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2202 %! t = cell2struct (vals, keys, 2);
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2203 %! assert (s, t);
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2204 %! assert (struct2cell (s), vals');
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2205 %! assert (fieldnames (s), keys');
13868 87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2206
87f78c11d725 cell2struct: if DIM is omitted, use a default value of 1. John W. Eaton <jwe@octave.org> parents: 13706 diff changeset	2207 %!assert (cell2struct ({1; 2}, {"a"; "b"}), struct ("a", 1, "b", 2));
14624 edf9ca8a92a8 when redimensioning, always pad dim_vector objects with 1 (bug #33216) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	2208
edf9ca8a92a8 when redimensioning, always pad dim_vector objects with 1 (bug #33216) John W. Eaton <jwe@octave.org> parents: 14138 diff changeset	2209 %!assert (cell2struct ({}, {"f"}, 3), struct ("f", {}));
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2210 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2211
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2212
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2213 // So we can call Fcellstr directly.
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2214 extern octave_value_list Fcellstr (const octave_value_list& args, int);
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2215
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2216 DEFUN (rmfield, args, ,
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2217 "-- texinfo --\n\
15534 360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2218 @deftypefn {Built-in Function} {@var{s} =} rmfield (@var{s}, \"@var{f}\")\n\
360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2219 @deftypefnx {Built-in Function} {@var{s} =} rmfield (@var{s}, @var{f})\n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	2220 Return a copy of the structure (array) @var{s} with the field @var{f}\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	2221 removed. If @var{f} is a cell array of strings or a character array, remove\n\
15534 360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2222 each of the named fields.\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5598 diff changeset	2223 @seealso{cellstr, iscellstr, setfield}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5598 diff changeset	2224 @end deftypefn")
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2225 {
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2226 octave_value retval;
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2227
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2228 int nargin = args.length ();
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2229
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2230 if (nargin == 2)
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2231 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2232 octave_map m = args(0).map_value ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2233
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2234 octave_value_list fval = Fcellstr (args(1), 1);
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2235
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2236 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2237 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2238 Cell fcell = fval(0).cell_value ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2239
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2240 for (int i = 0; i < fcell.numel (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2241 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2242 std::string key = fcell(i).string_value ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2243
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2244 if (m.isfield (key))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2245 m.rmfield (key);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2246 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2247 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2248 error ("rmfield: structure does not contain field %s",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2249 key.c_str ());
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2250
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2251 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2252 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2253 }
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2254
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2255 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2256 retval = m;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2257 }
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2258 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2259 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	2260 print_usage ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2261
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2262 return retval;
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2263 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2264
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2265 /*
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2266 ## test rmfield
15534 360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2267 %!shared x
360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2268 %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3; x(6).f="abc123";
360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2269 %!
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2270 %!test
15534 360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2271 %! y = rmfield (x, "c");
360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2272 %! assert (fieldnames (y), {"d"; "a"; "b"; "f"});
360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2273 %! assert (size (y), [1, 6]);
360adb4a3136 doc: Update docstring form rmfield() and add another %!test. Rik <rik@octave.org> parents: 15467 diff changeset	2274 %!test
14429 eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2275 %! y = rmfield (x, {"a", "f"});
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2276 %! assert (fieldnames (y), {"d"; "b"; "c"});
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions. Rik <octave@nomad.inbox5.com> parents: 14360 diff changeset	2277 %! assert (size (y), [1, 6]);
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2278 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2279
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2280 DEFUN (struct_levels_to_print, args, nargout,
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2281 "-- texinfo --\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2282 @deftypefn {Built-in Function} {@var{val} =} struct_levels_to_print ()\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2283 @deftypefnx {Built-in Function} {@var{old_val} =} struct_levels_to_print (@var{new_val})\n\
13951 79aa00a94e9e doc: Document "local" option for configuration variables. Rik <octave@nomad.inbox5.com> parents: 13868 diff changeset	2284 @deftypefnx {Built-in Function} {} struct_levels_to_print (@var{new_val}, \"local\")\n\
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2285 Query or set the internal variable that specifies the number of\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2286 structure levels to display.\n\
13951 79aa00a94e9e doc: Document "local" option for configuration variables. Rik <octave@nomad.inbox5.com> parents: 13868 diff changeset	2287 \n\
17289 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 16816 diff changeset	2288 When called from inside a function with the @qcode{\"local\"} option, the\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 16816 diff changeset	2289 variable is changed locally for the function and any subroutines it calls. \n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 16816 diff changeset	2290 The original variable value is restored when exiting the function.\n\
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2291 @end deftypefn")
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2292 {
15215 9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	2293 return SET_INTERNAL_VARIABLE_WITH_LIMITS (struct_levels_to_print, -1,
9020dddc925a use std::numeric_limits for integer max and min values John W. Eaton <jwe@octave.org> parents: 15195 diff changeset	2294 std::numeric_limits<int>::max ());
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2295 }
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2296
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2297 DEFUN (print_struct_array_contents, args, nargout,
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2298 "-- texinfo --\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2299 @deftypefn {Built-in Function} {@var{val} =} print_struct_array_contents ()\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2300 @deftypefnx {Built-in Function} {@var{old_val} =} print_struct_array_contents (@var{new_val})\n\
13951 79aa00a94e9e doc: Document "local" option for configuration variables. Rik <octave@nomad.inbox5.com> parents: 13868 diff changeset	2301 @deftypefnx {Built-in Function} {} print_struct_array_contents (@var{new_val}, \"local\")\n\
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2302 Query or set the internal variable that specifies whether to print struct\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2303 array contents. If true, values of struct array elements are printed.\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2304 This variable does not affect scalar structures. Their elements\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2305 are always printed. In both cases, however, printing will be limited to\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2306 the number of levels specified by @var{struct_levels_to_print}.\n\
13951 79aa00a94e9e doc: Document "local" option for configuration variables. Rik <octave@nomad.inbox5.com> parents: 13868 diff changeset	2307 \n\
17289 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 16816 diff changeset	2308 When called from inside a function with the @qcode{\"local\"} option, the\n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 16816 diff changeset	2309 variable is changed locally for the function and any subroutines it calls. \n\
bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 16816 diff changeset	2310 The original variable value is restored when exiting the function.\n\
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2311 @end deftypefn")
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2312 {
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2313 return SET_INTERNAL_VARIABLE (print_struct_array_contents);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2314 }

Mercurial > hg > octave-lyh

annotate libinterp/octave-value/ov-struct.cc @ 17482:997b700b6ad4