octave-lyh: src/ov-struct.cc annotate

annotate src/ov-struct.cc @ 11474:8a40037533e2

struct printing changes

author	John W. Eaton <jwe@octave.org>
date	Mon, 10 Jan 2011 14:05:12 -0500
parents	0d9640d755b1
children	fd0a3ac60b0e

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
7017 a1dbe9d80eee [project @ 2007-10-12 21:27:11 by jwe] jwe parents: 7016 diff changeset	3 Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006,
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8907 diff changeset	4 2007, 2008, 2009 John W. Eaton
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	5
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	7
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	8 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	9 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	10 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	11 option) any later version.
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	12
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	13 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	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	15 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	16 for more details.
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	17
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	18 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	19 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	20 <http://www.gnu.org/licenses/>.
2376 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
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	25 #include <config.h>
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	26 #endif
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	27
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3219 diff changeset	28 #include <iostream>
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	29
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	30 #include "Cell.h"
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	31 #include "defun.h"
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	32 #include "error.h"
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	33 #include "gripes.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 ());
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	87 else
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	88 error ("structure has no member `%s'", nm.c_str ());
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	89
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	90 return retval;
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	91 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	92
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4499 diff changeset	93 #if 0
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	94 static void
10370 9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10350 diff changeset	95 gripe_invalid_index1 (void)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	96 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	97 error ("invalid index for structure array");
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	98 }
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4499 diff changeset	99 #endif
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	100
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	101 static void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	102 gripe_invalid_index_for_assignment (void)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	103 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	104 error ("invalid index for structure array assignment");
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	105 }
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 static void
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	108 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	109 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	110 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	111 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	112
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	113 static void
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	114 gripe_failed_assignment (void)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	115 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	116 error ("assignment to structure element failed");
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	117 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	118
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	119 octave_value_list
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	120 octave_struct::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	121 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	122 int nargout)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	123 {
7651 443a8f5a50fd require both subsref variants to be defined in octave_value subclasses John W. Eaton <jwe@octave.org> parents: 7622 diff changeset	124 octave_value_list retval;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	125
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	126 int skip = 1;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	127
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	128 switch (type[0])
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	129 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	130 case '(':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	131 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	132 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	133 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	134 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	135 octave_value_list key_idx = *++p;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	136
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	137 const Cell tmp = dotref (key_idx);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	138
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	139 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	140 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	141 const Cell t = tmp.index (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	142
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	143 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	144
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	145 // We handled two index elements, so tell
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	146 // next_subsref to skip both of them.
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	147
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	148 skip++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	149 }
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 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	152 retval(0) = do_index_op (idx.front ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	153 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	154 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	155
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	156 case '.':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	157 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	158 if (map.numel() > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	159 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	160 const Cell t = dotref (idx.front ());
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 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	163 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	164 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	165 break;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	166
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	167 case '{':
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	168 gripe_invalid_index_type (type_name (), type[0]);
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	169 break;
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 default:
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	172 panic_impossible ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	173 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	174
5775 ace8d8d26933 [project @ 2006-04-24 19:13:06 by jwe] jwe parents: 5760 diff changeset	175 // FIXME -- perhaps there should be an
4994 48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	176 // octave_value_list::next_subsref member function? See also
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	177 // octave_user_function::subsref.
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	178
48d0defe9445 [project @ 2004-09-15 20:31:31 by jwe] jwe parents: 4944 diff changeset	179 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	180 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	181
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	182 return retval;
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
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	185 octave_value
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	186 octave_struct::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	187 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	188 bool auto_add)
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	189 {
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	190 octave_value retval;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	191
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	192 int skip = 1;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	193
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	194 switch (type[0])
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	195 {
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	196 case '(':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	197 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	198 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	199 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	200 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	201 octave_value_list key_idx = *++p;
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	202
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	203 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	204
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	205 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	206 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	207 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	208
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	209 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	210
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	211 // We handled two index elements, so tell
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	212 // 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	213
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	214 skip++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	215 }
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 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	218 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	219 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	220 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	221
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	222 case '.':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	223 {
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	224 if (map.numel() > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	225 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	226 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	227
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	228 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	229 }
8551 906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	230 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	231 break;
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	232
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	233 case '{':
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	234 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	235 break;
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 default:
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	238 panic_impossible ();
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	239 }
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	240
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	241 // FIXME -- perhaps there should be an
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	242 // 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	243 // octave_user_function::subsref.
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	244
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	245 if (idx.size () > 1)
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	246 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	247
906f976d35a8 further improve struct&cell indexing & indexed assignment Jaroslav Hajek <highegg@gmail.com> parents: 8546 diff changeset	248 return retval;
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
8031 d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	251 /*
d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	252 %!test
d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	253 %! x(1).a.a = 1; x(2).a.a = 2;
d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	254 %! 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	255 %! 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	256 %! 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	257 */
d9987dbdf91b octave_struct::subsref: don't resize for simple x(idx) case John W. Eaton <jwe@octave.org> parents: 7651 diff changeset	258
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	259 octave_value
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	260 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	261 const std::string& type)
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	262 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	263 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	264
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	265 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	266 retval = octave_map ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	267 else
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	268 retval = val;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	269
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	270 return retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	271 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	272
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	273 octave_value
4247 fc9a075d10fb [project @ 2002-12-30 23:05:27 by jwe] jwe parents: 4219 diff changeset	274 octave_struct::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	275 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	276 const octave_value& rhs)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	277 {
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	278 octave_value retval;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	279
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	280 int n = type.length ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	281
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	282 octave_value t_rhs = rhs;
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	283
9286 c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	284 if (idx.front ().empty ())
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	285 {
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	286 error ("missing index in indexed assignment");
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	287 return retval;
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	288 }
c2248cc4821a don't crash on assignments like a() = 1 Jaroslav Hajek <highegg@gmail.com> parents: 9190 diff changeset	289
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	290 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	291 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	292 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	293 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	294 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	295 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	296 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	297 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	298 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	299 octave_value_list t_idx = *p;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	300
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	301 octave_value_list key_idx = *++p;
4513 508238e65af7 [project @ 2003-09-19 21:40:57 by jwe] jwe parents: 4499 diff changeset	302
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	303 assert (key_idx.length () == 1);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	304
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	305 std::string key = key_idx(0).string_value ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	306
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	307 std::list<octave_value_list> next_idx (idx);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	308
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	309 // We handled two index elements, so subsasgn to
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	310 // needs to skip both of them.
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	311
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	312 next_idx.erase (next_idx.begin ());
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	313 next_idx.erase (next_idx.begin ());
8456 c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	314
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	315 std::string next_type = type.substr (2);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	316
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	317 Cell tmpc (1, 1);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	318 octave_map::iterator pkey = map.seek (key);
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	319 if (pkey != map.end ())
961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	320 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	321 map.contents (pkey).make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	322 tmpc = map.contents (pkey).index (idx.front (), true);
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	323 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	324
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	325 // 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	326 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	327 {
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8564 diff changeset	328 if (tmpc.numel () == 1)
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	329 {
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	330 octave_value& tmp = tmpc(0);
8546 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 if (! tmp.is_defined () \|\| tmp.is_zero_by_zero ())
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	333 {
8564 b0f803b5ce41 more indexing fixes Jaroslav Hajek <highegg@gmail.com> parents: 8551 diff changeset	334 tmp = octave_value::empty_conv (next_type, rhs);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	335 tmp.make_unique (); // probably a no-op.
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	336 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	337 else
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	338 // optimization: ignore the copy still stored inside our map.
188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	339 tmp.make_unique (1);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	340
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	341 if (! error_state)
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	342 t_rhs = tmp.subsasgn (next_type, next_idx, rhs);
8456 c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	343 }
c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	344 else
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8564 diff changeset	345 gripe_indexed_cs_list ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	346 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	347 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	348 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	349 gripe_invalid_index_for_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	350 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	351 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	352
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	353 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	354 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	355 octave_value_list key_idx = idx.front ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	356
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	357 assert (key_idx.length () == 1);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	358
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	359 std::string key = key_idx(0).string_value ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	360
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	361 std::list<octave_value_list> next_idx (idx);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	362
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	363 next_idx.erase (next_idx.begin ());
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	364
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	365 std::string next_type = type.substr (1);
8456 c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	366
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	367 Cell tmpc (1, 1);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	368 octave_map::iterator pkey = map.seek (key);
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	369 if (pkey != map.end ())
961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	370 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	371 map.contents (pkey).make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	372 tmpc = map.contents (pkey);
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	373 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	374
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	375 // FIXME: better code reuse?
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	376 if (! error_state)
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	377 {
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8564 diff changeset	378 if (tmpc.numel () == 1)
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	379 {
9087 961410931a4f fix nested struct assignments Jaroslav Hajek <highegg@gmail.com> parents: 9036 diff changeset	380 octave_value& tmp = tmpc(0);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	381
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	382 if (! tmp.is_defined () \|\| tmp.is_zero_by_zero ())
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	383 {
8580 188d38a553c7 further indexing optimization touches Jaroslav Hajek <highegg@gmail.com> parents: 8579 diff changeset	384 tmp = octave_value::empty_conv (next_type, rhs);
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	385 tmp.make_unique (); // probably a no-op.
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	386 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	387 else
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	388 // optimization: ignore the copy still stored inside our map.
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	389 tmp.make_unique (1);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	390
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	391 if (! error_state)
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	392 t_rhs = tmp.subsasgn (next_type, next_idx, rhs);
8456 c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	393 }
c1709a45b45b optimize structure components access Jaroslav Hajek <highegg@gmail.com> parents: 8377 diff changeset	394 else
8579 7e0f36dfefbe implement octave_value_list using Array Jaroslav Hajek <highegg@gmail.com> parents: 8564 diff changeset	395 gripe_indexed_cs_list ();
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	396 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	397 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	398 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	399
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	400 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	401 gripe_invalid_index_type (type_name (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	402 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	403
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	404 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	405 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	406 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	407 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	408
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	409 if (! error_state)
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	410 {
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	411 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	412 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	413 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	414 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	415 if (n > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	416 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	417 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	418 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	419 octave_value_list idxf = idx.front ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	420
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	421 assert (key_idx.length () == 1);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	422
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	423 std::string key = key_idx(0).string_value ();
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	424
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	425 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	426 {
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	427 if (t_rhs.is_cs_list ())
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	428 {
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	429 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	430
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	431 // 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	432
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	433 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	434 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	435 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	436
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	437 if (didx.numel () == tmp_cell.numel ())
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	438 tmp_cell = tmp_cell.reshape (didx);
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	439
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	440
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	441 map.assign (idxf, key, tmp_cell);
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	442
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	443 if (! error_state)
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	444 {
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	445 count++;
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	446 retval = octave_value (this);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	447 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	448 else
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	449 gripe_failed_assignment ();
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	450 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	451 else
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	452 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	453 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	454 // cast map to const reference to avoid forced key insertion.
8587 35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	455 if (idxf.all_scalars ()
35656d6ad061 properly reshape cs-lists assigned to struct & cells Jaroslav Hajek <highegg@gmail.com> parents: 8580 diff changeset	456 \|\| cmap.contents (key).index (idxf, true).numel () == 1)
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	457 {
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	458 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	459 if (! error_state)
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	460 {
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	461 count++;
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	462 retval = octave_value (this);
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	463 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	464 else
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	465 gripe_failed_assignment ();
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	466 }
3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	467 else if (! error_state)
10030 83bb2a78c07d improve simple assignments error checks and messages Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	468 gripe_nonbraced_cs_list_assignment ();
8546 3d8a914c580e improve parser indexed assigment code Jaroslav Hajek <highegg@gmail.com> parents: 8523 diff changeset	469 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	470 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	471 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	472 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	473 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	474 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	475 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	476 if (t_rhs.is_map())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	477 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	478 octave_map rhs_map = t_rhs.map_value ();
4197 40f76ce7a051 [project @ 2002-11-21 18:56:25 by jwe] jwe parents: 4192 diff changeset	479
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	480 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	481 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	482 map.assign (idx.front (), rhs_map);
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5582 diff changeset	483
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	484 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	485 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	486 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	487 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	488 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	489 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	490 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	491 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	492 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	493 error ("invalid structure assignment");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	494 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	495 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	496 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	497 if (t_rhs.is_null_value())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	498 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	499 map.delete_elements (idx.front());
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5582 diff changeset	500
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	501 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	502 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	503 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	504 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	505 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	506 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	507 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	508 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	509 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	510 error ("invalid structure assignment");
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 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	513 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	514 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	515
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	516 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	517 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	518 octave_value_list key_idx = idx.front ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	519
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	520 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	521
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	522 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	523
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	524 if (t_rhs.is_cs_list ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	525 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	526 Cell tmp_cell = Cell (t_rhs.list_value ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	527
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	528 // 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	529 // 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	530 // shape of the left hand side of the assignment.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	531
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	532 if (numel () == tmp_cell.numel ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	533 tmp_cell = tmp_cell.reshape (dims ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	534
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	535 map.setfield (key, tmp_cell);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	536 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	537 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	538 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	539 Cell tmp_cell(1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	540 tmp_cell(0) = t_rhs.storable_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	541 map.setfield (key, tmp_cell);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	542 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	543
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	544 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	545 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	546 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	547 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	548 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	549 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	550 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	551 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	552 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	553
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	554 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	555 gripe_invalid_index_type (type_name (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	556 break;
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	557
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	558 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	559 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	560 }
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	561 }
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	562 else
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	563 gripe_failed_assignment ();
f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	564
10754 92eb5fb58ebc fix resize with structs Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	565 retval.maybe_mutate ();
92eb5fb58ebc fix resize with structs Jaroslav Hajek <highegg@gmail.com> parents: 10753 diff changeset	566
3933 f9ea3dcf58ee [project @ 2002-05-15 03:21:00 by jwe] jwe parents: 3932 diff changeset	567 return retval;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	568 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	569
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	570 octave_value
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	571 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	572 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	573 // octave_map handles indexing itself.
8679 280fae940bb0 optimize scalar indexing Jaroslav Hajek <highegg@gmail.com> parents: 8587 diff changeset	574 return map.index (idx, resize_ok);
7046 fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	575 }
fbf8576cf399 [project @ 2007-10-22 12:12:20 by dbateman] dbateman parents: 7040 diff changeset	576
4791 62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	577 size_t
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	578 octave_struct::byte_size (void) const
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	579 {
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	580 // Neglect the size of the fieldnames.
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	581
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	582 size_t retval = 0;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	583
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	584 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	585 {
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	586 std::string key = map.key (p);
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	587
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	588 octave_value val = octave_value (map.contents (p));
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	589
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	590 retval += val.byte_size ();
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	591 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	592
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	593 return retval;
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	594 }
62f2fb593455 [project @ 2004-02-20 18:02:59 by jwe] jwe parents: 4780 diff changeset	595
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	596 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	597 octave_struct::print (std::ostream& os, bool) const
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	598 {
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	599 print_raw (os);
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	600 }
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	601
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	602 void
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	603 octave_struct::print_raw (std::ostream& os, bool) const
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	604 {
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	605 unwind_protect frame;
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	606
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 10030 diff changeset	607 frame.protect_var (Vstruct_levels_to_print);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	608
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	609 if (Vstruct_levels_to_print >= 0)
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	610 {
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	611 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	612
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	613 bool print_fieldnames_only
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	614 = (max_depth_reached \|\| ! Vprint_struct_array_contents);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	615
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	616 increment_indent_level ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	617
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	618 newline (os);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	619 indent (os);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	620 dim_vector dv = dims ();
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	621 os << dv.str () << " struct array containing the fields:";
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	622 newline (os);
3932 2e2e32198722 [project @ 2002-05-07 18:10:44 by jwe] jwe parents: 3548 diff changeset	623
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	624 increment_indent_level ();
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4561 diff changeset	625
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	626 string_vector key_list = map.fieldnames ();
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5828 diff changeset	627
84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5828 diff changeset	628 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	629 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	630 std::string key = key_list[i];
5880 84ca47e311b3 [project @ 2006-07-06 22:34:48 by jwe] jwe parents: 5828 diff changeset	631
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	632 Cell val = map.contents (key);
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	633
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	634 newline (os);
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	635
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	636 if (print_fieldnames_only)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	637 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	638 indent (os);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	639 os << key;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	640 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	641 else
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	642 {
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	643 octave_value tmp (val);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	644 tmp.print_with_name (os, key);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	645 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	646 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	647
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	648 if (print_fieldnames_only)
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	649 newline (os);
4604 cba347c642e2 [project @ 2003-11-13 04:38:05 by jwe] jwe parents: 4561 diff changeset	650
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	651 decrement_indent_level ();
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	652 decrement_indent_level ();
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	653 }
2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	654 else
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	655 {
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	656 indent (os);
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	657 os << "<structure>";
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	658 newline (os);
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	659 }
2376 2142216bf85a [project @ 1996-10-12 01:39:07 by jwe] jwe parents: diff changeset	660 }
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 bool
3523 b80bbb43a1a9 [project @ 2000-02-02 10:25:52 by jwe] jwe parents: 3503 diff changeset	663 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	664 {
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	665 bool retval = false;
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	666
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	667 indent (os);
3961 635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	668
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	669 if (Vstruct_levels_to_print < 0)
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	670 os << name << " = ";
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	671 else
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	672 {
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	673 os << name << " =";
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	674 newline (os);
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	675 retval = true;
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	676 }
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	677
635209a37bf4 [project @ 2002-06-03 18:15:47 by jwe] jwe parents: 3933 diff changeset	678 return retval;
2901 e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	679 }
e6d25bc478dd [project @ 1997-04-30 03:41:26 by jwe] jwe parents: 2847 diff changeset	680
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	681 static bool
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	682 scalar (const dim_vector& dims)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	683 {
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	684 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	685 }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	686
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	687 /*
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	688 %!shared x
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	689 %! x(1).a=1; x(2).a=2; x(1).b=3; x(2).b=3;
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	690 %!assert(struct('a',1,'b',3),x(1))
5592 61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5582 diff changeset	691 %!assert(isempty(x([])))
61d6cebd243b [project @ 2006-01-12 17:55:22 by dbateman] dbateman parents: 5582 diff changeset	692 %!assert(isempty(struct('a',{},'b',{})))
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	693 %!assert(struct('a',{1,2},'b',{3,3}),x)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	694 %!assert(struct('a',{1,2},'b',3),x)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	695 %!assert(struct('a',{1,2},'b',{3}),x)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	696 %!assert(struct('b',3,'a',{1,2}),x)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	697 %!assert(struct('b',{3},'a',{1,2}),x)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	698 %!test x=struct([]);
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	699 %!assert(size(x),[0,0]);
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	700 %!assert(isstruct(x));
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	701 %!assert(isempty(fieldnames(x)));
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	702 %!fail("struct('a',{1,2},'b',{1,2,3})","dimensions of parameter 2 do not match those of parameter 4")
5582 6bf56668b01a [project @ 2005-12-15 01:08:20 by jwe] jwe parents: 5444 diff changeset	703 %!fail("struct(1,2,3,4)","struct expects alternating \"field\", VALUE pairs");
6bf56668b01a [project @ 2005-12-15 01:08:20 by jwe] jwe parents: 5444 diff changeset	704 %!fail("struct('1',2,'3')","struct expects alternating \"field\", VALUE pairs");
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	705 */
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	706
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	707 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	708 octave_struct::save_ascii (std::ostream& os)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	709 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	710 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	711
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	712 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	713
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	714 const dim_vector dv = dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	715
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	716 os << "# ndims: " << dv.length () << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	717
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	718 for (int i = 0; i < dv.length (); i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	719 os << " " << dv (i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	720 os << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	721
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	722 os << "# length: " << nf << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	723
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	724 // 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	725 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	726 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	727
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	728 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	729 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	730 std::string key = keys(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	731
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	732 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	733
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	734 bool b = save_ascii_data (os, val, key, false, 0);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	735
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	736 if (! b)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	737 return os;
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	740 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	741 }
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 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	744 octave_struct::load_ascii (std::istream& is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	745 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	746 octave_idx_type len = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	747 dim_vector dv (1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	748 bool success = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	749
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	750 // 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	751 // 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	752 // 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	753 string_vector keywords(2);
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 keywords[0] = "ndims";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	756 keywords[1] = "length";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	757
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	758 std::string kw;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	759
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	760 if (extract_keyword (is, keywords, kw, len, true))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	761 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	762 if (kw == keywords[0])
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	763 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	764 int mdims = std::max (static_cast<int> (len), 2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	765 dv.resize (mdims);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	766 for (int i = 0; i < mdims; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	767 is >> dv(i);
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 success = extract_keyword (is, keywords[1], len);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	770 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	771 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	772 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	773 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	774
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	775 if (success && len >= 0)
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 if (len > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	778 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	779 octave_map m (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	780
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	781 for (octave_idx_type j = 0; j < len; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	782 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	783 octave_value t2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	784 bool dummy;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	785
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	786 // recurse to read cell elements
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	787 std::string nm
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	788 = read_ascii_data (is, std::string (), dummy, t2, j);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	789
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	790 if (!is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	791 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	792
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	793 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	794
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	795 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	796 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	797 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	798 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	799 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	800
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	801 m.setfield (nm, tcell);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	802 }
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 (is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	805 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	806 else
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 error ("load: failed to load structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	809 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	810 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	811 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	812 else if (len == 0 )
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	813 map = octave_map (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	814 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	815 panic_impossible ();
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 else {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	818 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	819 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	820 }
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 return success;
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	825 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	826 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	827 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	828 octave_map m = map_value ();
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 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	831
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	832 dim_vector d = dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	833 if (d.length () < 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	834 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	835
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	836 // Use negative value for ndims
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	837 int32_t di = - d.length();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	838 os.write (reinterpret_cast<char *> (&di), 4);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	839 for (int i = 0; i < d.length (); i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	840 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	841 di = d(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	842 os.write (reinterpret_cast<char *> (&di), 4);
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	845 int32_t len = nf;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	846 os.write (reinterpret_cast<char *> (&len), 4);
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 // 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	849 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	850 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	851
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	852 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	853 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	854 std::string key = keys(i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	855
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	856 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	857
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	858 bool b = save_binary_data (os, val, key, "", 0, save_as_floats);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	859
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	860 if (! b)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	861 return os;
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	864 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	865 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	866
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	867 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	868 octave_struct::load_binary (std::istream& is, bool swap,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	869 oct_mach_info::float_format fmt)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	870 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	871 bool success = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	872 int32_t len;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	873 if (! is.read (reinterpret_cast<char *> (&len), 4))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	874 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	875 if (swap)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	876 swap_bytes<4> (&len);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	877
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	878 dim_vector dv (1, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	879
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	880 if (len < 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	881 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	882 // We have explicit dimensions.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	883 int mdims = -len;
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 int32_t di;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	886 dv.resize (mdims);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	887
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	888 for (int i = 0; i < mdims; i++)
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 if (! is.read (reinterpret_cast<char *> (&di), 4))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	891 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	892 if (swap)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	893 swap_bytes<4> (&di);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	894 dv(i) = di;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	895 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	896
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	897 if (! is.read (reinterpret_cast<char *> (&len), 4))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	898 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	899 if (swap)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	900 swap_bytes<4> (&len);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	901 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	902
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	903 if (len > 0)
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 octave_map m (dv);
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 for (octave_idx_type j = 0; j < len; j++)
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 octave_value t2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	910 bool dummy;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	911 std::string doc;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	912
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	913 // recurse to read cell elements
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	914 std::string nm = read_binary_data (is, swap, fmt, std::string (),
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	915 dummy, t2, doc);
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)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	918 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	919
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	920 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	921
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	922 if (error_state)
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 error ("load: internal error loading struct elements");
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 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	927
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	928 m.setfield (nm, tcell);
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	931 if (is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	932 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	933 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	934 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	935 error ("load: failed to load structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	936 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	937 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	938 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	939 else if (len == 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	940 map = octave_map (dv);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	941 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	942 success = false;
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 return success;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	945 }
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 #if defined (HAVE_HDF5)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	948
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	949 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	950 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	951 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	952 hid_t data_hid = -1;
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 #if HAVE_HDF5_18
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	955 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	956 #else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	957 data_hid = H5Gcreate (loc_id, name, 0);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	958 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	959 if (data_hid < 0) return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	960
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	961 // 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	962 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	963
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	964 octave_idx_type nf = m.nfields ();
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 // 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	967 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	968 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	969
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	970 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	971 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	972 std::string key = keys(i);
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 octave_value val = map.contents (key);
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 retval2 = add_hdf5_data (data_hid, val, key, "", false,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	977 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 if (! retval2)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	980 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	981 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	982
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	983 H5Gclose (data_hid);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	984
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	985 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	986 }
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 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	989 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	990 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	991 bool retval = false;
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 hdf5_callback_data dsub;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	994
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	995 herr_t retval2 = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	996 octave_map m (dim_vector (1, 1));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	997 int current_item = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	998 hsize_t num_obj = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	999 #if HAVE_HDF5_18
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1000 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	1001 #else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1002 hid_t group_id = H5Gopen (loc_id, name);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1003 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1004 H5Gget_num_objs (group_id, &num_obj);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1005 H5Gclose (group_id);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1006
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1007 // FIXME -- fields appear to be sorted alphabetically on loading.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1008 // Why is that happening?
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 while (current_item < static_cast<int> (num_obj)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1011 && (retval2 = H5Giterate (loc_id, name, &current_item,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1012 hdf5_read_next_data, &dsub)) > 0)
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 octave_value t2 = dsub.tc;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1015
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1016 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	1017
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1018 if (error_state)
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 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1021 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1022 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1023
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1024 m.setfield (dsub.name, tcell);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1025
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1026 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1027
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1028 if (retval2 >= 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1029 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1030 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1031 retval = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1032 }
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 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1035 }
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 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1038
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1039 mxArray *
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1040 octave_struct::as_mxArray (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1041 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1042 int nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1043 string_vector kv = map_keys ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1044
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1045 OCTAVE_LOCAL_BUFFER (const char *, f, nf);
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 for (int i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1048 f[i] = kv[i].c_str ();
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 mxArray *retval = new mxArray (dims (), nf, f);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1051
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1052 mxArray elts = static_cast<mxArray > (retval->get_data ());
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 mwSize nel = numel ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1055
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1056 mwSize ntot = nf * nel;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1057
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1058 for (int i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1059 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1060 Cell c = map.contents (kv[i]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1061
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1062 const octave_value *p = c.data ();
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 mwIndex k = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1065 for (mwIndex j = i; j < ntot; j += nf)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1066 elts[j] = new mxArray (p[k++]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1067 }
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 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1070 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1071
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1072 octave_value
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1073 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	1074 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1075 if (n < map.numel ())
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1076 return map.checkelem (n);
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1077 else
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1078 return octave_value ();
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1079 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1080
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1081 bool
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1082 octave_struct::fast_elem_insert (octave_idx_type n,
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1083 const octave_value& x)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1084 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1085 bool retval = false;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1086
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1087 if (n < map.numel ())
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1088 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1089 // 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	1090 // itself.
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1091 const octave_scalar_map *sm_ptr;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1092 void here = reinterpret_cast<void >(&sm_ptr);
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1093 return (x.get_rep().fast_elem_insert_self (here, btyp_struct)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1094 && map.fast_elem_insert (n, *sm_ptr));
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1095 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1096
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1097 return retval;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1098 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1099 DEFINE_OCTAVE_ALLOCATOR(octave_scalar_struct);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1100
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1101 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	1102
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1103 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1104 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	1105 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1106 assert (idx.length () == 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1107
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1108 std::string nm = idx(0).string_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1109
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1110 octave_value retval = map.getfield (nm);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1111
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1112 if (! auto_add && retval.is_undefined ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1113 error ("structure has no member `%s'", nm.c_str ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1114
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1115 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1116 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1117
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1118 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1119 octave_scalar_struct::subsref (const std::string& type,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1120 const std::list<octave_value_list>& idx)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1121 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1122 octave_value retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1123
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1124 if (type[0] == '.')
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1125 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1126 int skip = 1;
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 retval = dotref (idx.front ());
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 if (idx.size () > 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1131 retval = retval.next_subsref (type, idx, skip);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1132 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1133 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1134 retval = to_array ().subsref (type, idx);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1135
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1136 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1137 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1138
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1139 octave_value_list
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1140 octave_scalar_struct::subsref (const std::string& type,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1141 const std::list<octave_value_list>& idx,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1142 int nargout)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1143 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1144 octave_value_list retval;
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 (type[0] == '.')
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1147 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1148 int skip = 1;
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 retval(0) = dotref (idx.front ());
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 if (idx.size () > 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1153 retval = retval(0).next_subsref (nargout, type, idx, skip);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1154 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1155 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1156 retval = to_array ().subsref (type, idx, nargout);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1157
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1158 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1159 }
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 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1162 octave_scalar_struct::subsref (const std::string& type,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1163 const std::list<octave_value_list>& idx,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1164 bool auto_add)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1165 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1166 octave_value retval;
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 if (type[0] == '.')
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1169 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1170 int skip = 1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1171
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1172 retval = dotref (idx.front (), auto_add);
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 if (idx.size () > 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1175 retval = retval.next_subsref (auto_add, type, idx, skip);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1176 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1177 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1178 retval = to_array ().subsref (type, idx, auto_add);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1179
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1180 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1181 }
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 /*
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1184 %!test
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1185 %! x(1).a.a = 1; x(2).a.a = 2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1186 %! assert (size (x), [1, 2]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1187 %! assert (x(1).a.a, 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1188 %! assert (x(2).a.a, 2);
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1191 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1192 octave_scalar_struct::numeric_conv (const octave_value& val,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1193 const std::string& type)
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 octave_value retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1196
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1197 if (type.length () > 0 && type[0] == '.' && ! val.is_map ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1198 retval = octave_map ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1199 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1200 retval = val;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1201
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1202 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1203 }
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 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1206 octave_scalar_struct::subsasgn (const std::string& type,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1207 const std::list<octave_value_list>& idx,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1208 const octave_value& rhs)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1209 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1210 octave_value retval;
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 if (idx.front ().empty ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1213 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1214 error ("missing index in indexed assignment");
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 if (type[0] == '.')
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1219 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1220 int n = type.length ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1221
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1222 octave_value t_rhs = rhs;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1223
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1224 octave_value_list key_idx = idx.front ();
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 assert (key_idx.length () == 1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1227
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1228 std::string key = key_idx(0).string_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1229
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1230 if (n > 1)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1231 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1232 std::list<octave_value_list> next_idx (idx);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1233
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1234 next_idx.erase (next_idx.begin ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1235
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1236 std::string next_type = type.substr (1);
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 octave_value tmp;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1239 octave_map::iterator pkey = map.seek (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1240 if (pkey != map.end ())
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1241 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1242 map.contents (pkey).make_unique ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1243 tmp = map.contents (pkey);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1244 }
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 if (! error_state)
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 (! tmp.is_defined () \|\| tmp.is_zero_by_zero ())
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 tmp = octave_value::empty_conv (next_type, rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1251 tmp.make_unique (); // probably a no-op.
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 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1254 // optimization: ignore the copy still stored inside our map.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1255 tmp.make_unique (1);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1256
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1257 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1258 t_rhs = tmp.subsasgn (next_type, next_idx, 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 }
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 if (! error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1263 map.setfield (key, t_rhs.storable_value ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1264 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1265 gripe_failed_assignment ();
10749 df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	1266
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	1267 count++;
df1a3e0ebbff important fixes for struct rewrite(1) Jaroslav Hajek <highegg@gmail.com> parents: 10747 diff changeset	1268 retval = this;
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1269 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1270 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1271 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1272 // Forward this case to octave_struct.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1273 octave_value tmp (new octave_struct (octave_map (map)));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1274 retval = tmp.subsasgn (type, idx, rhs);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1275 }
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 return retval;
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1280 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1281 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	1282 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1283 // octave_map handles indexing itself.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1284 return octave_map (map).index (idx, resize_ok);
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 size_t
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1288 octave_scalar_struct::byte_size (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1289 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1290 // Neglect the size of the fieldnames.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1291
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1292 size_t retval = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1293
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1294 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	1295 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1296 std::string key = map.key (p);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1297
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1298 octave_value val = octave_value (map.contents (p));
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 retval += val.byte_size ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1301 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1302
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1303 return retval;
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 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1307 octave_scalar_struct::print (std::ostream& os, bool) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1308 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1309 print_raw (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1310 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1311
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1312 void
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1313 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	1314 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1315 unwind_protect frame;
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 frame.protect_var (Vstruct_levels_to_print);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1318
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1319 if (Vstruct_levels_to_print >= 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1320 {
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1321 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	1322
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1323 bool print_fieldnames_only = max_depth_reached;
10742 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 increment_indent_level ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1326
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1327 newline (os);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1328 indent (os);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1329 os << "scalar structure containing the fields:";
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1330 newline (os);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1331 newline (os);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1332
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1333 increment_indent_level ();
10742 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 string_vector key_list = map.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 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	1338 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1339 std::string key = key_list[i];
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 Cell val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1342
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1343 octave_value tmp = val(0);
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1344
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1345 if (print_fieldnames_only)
10742 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 indent (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1348 os << key;
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1349 dim_vector dv = tmp.dims ();
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1350 os << ": " << dv.str () << " " << tmp.type_name ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1351 newline (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1352 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1353 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1354 tmp.print_with_name (os, key);
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 decrement_indent_level ();
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	1358 decrement_indent_level ();
10742 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 else
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 indent (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1363 os << "<structure>";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1364 newline (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1365 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1366 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1367
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1368 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1369 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	1370 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1371 bool retval = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1372
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1373 indent (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1374
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1375 if (Vstruct_levels_to_print < 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1376 os << name << " = ";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1377 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1378 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1379 os << name << " =";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1380 newline (os);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1381 retval = true;
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1384 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1385 }
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 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1388 octave_scalar_struct::save_ascii (std::ostream& os)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1389 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1390 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1391
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1392 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1393
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1394 const dim_vector dv = dims ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1395
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1396 os << "# ndims: " << dv.length () << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1397
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1398 for (int i = 0; i < dv.length (); i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1399 os << " " << dv (i);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1400 os << "\n";
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 os << "# length: " << nf << "\n";
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1403
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1404 // 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	1405 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1406 string_vector keys = m.fieldnames ();
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 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1409 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1410 std::string key = keys(i);
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 octave_value val = map.contents (key);
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 b = save_ascii_data (os, val, key, false, 0);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1415
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1416 if (! b)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1417 return os;
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1420 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1421 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1422
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1423 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1424 octave_scalar_struct::load_ascii (std::istream& is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1425 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1426 bool success = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1427 octave_idx_type len = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1428
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	1429 if (extract_keyword (is, "length", len) && len >= 0)
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1430 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1431 if (len > 0)
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 octave_scalar_map m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1434
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1435 for (octave_idx_type j = 0; j < len; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1436 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1437 octave_value t2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1438 bool dummy;
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 // recurse to read cell elements
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1441 std::string nm
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1442 = read_ascii_data (is, std::string (), dummy, t2, j);
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 if (!is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1445 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1446
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1447 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1448 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1449 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1450 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1451 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1452
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1453 m.setfield (nm, t2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1454 }
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 if (is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1457 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1458 else
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 error ("load: failed to load structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1461 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1462 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1463 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1464 else if (len == 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1465 map = octave_scalar_map ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1466 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1467 panic_impossible ();
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 else {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1470 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	1471 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1472 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1473
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1474 return success;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1475 }
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 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1478 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	1479 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1480 octave_map m = map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1481
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1482 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1483
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1484 int32_t len = nf;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1485 os.write (reinterpret_cast<char *> (&len), 4);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1486
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1487 // 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	1488 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1489 string_vector keys = m.fieldnames ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1490
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1491 for (octave_idx_type i = 0; i < nf; i++)
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 std::string key = keys(i);
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 octave_value val = map.contents (key);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1496
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1497 bool b = save_binary_data (os, val, key, "", 0, save_as_floats);
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 if (! b)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1500 return os;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1501 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1502
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1503 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1504 }
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 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1507 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	1508 oct_mach_info::float_format fmt)
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 bool success = true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1511 int32_t len;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1512 if (! is.read (reinterpret_cast<char *> (&len), 4))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1513 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1514 if (swap)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1515 swap_bytes<4> (&len);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1516
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1517 dim_vector dv (1, 1);
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 if (len > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1520 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1521 octave_scalar_map m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1522
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1523 for (octave_idx_type j = 0; j < len; j++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1524 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1525 octave_value t2;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1526 bool dummy;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1527 std::string doc;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1528
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1529 // recurse to read cell elements
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1530 std::string nm = read_binary_data (is, swap, fmt, std::string (),
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1531 dummy, t2, doc);
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 if (!is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1534 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1535
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1536 if (error_state)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1537 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1538 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1539 return false;
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1542 m.setfield (nm, t2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1543 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1544
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1545 if (is)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1546 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1547 else
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 error ("load: failed to load structure");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1550 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1551 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1552 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1553 else if (len == 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1554 map = octave_scalar_map ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1555 else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1556 success = false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1557
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1558 return success;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1559 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1560
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1561 #if defined (HAVE_HDF5)
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 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1564 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	1565 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1566 hid_t data_hid = -1;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1567
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1568 #if HAVE_HDF5_18
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1569 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	1570 #else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1571 data_hid = H5Gcreate (loc_id, name, 0);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1572 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1573 if (data_hid < 0) return false;
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 // 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	1576 octave_scalar_map m = scalar_map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1577
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1578 octave_idx_type nf = m.nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1579
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1580 // 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	1581 // fields.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1582 string_vector keys = m.fieldnames ();
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 for (octave_idx_type i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1585 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1586 std::string key = keys(i);
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 octave_value val = map.contents (key);
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 bool retval2 = add_hdf5_data (data_hid, val, key, "", false,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1591 save_as_floats);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1592
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1593 if (! retval2)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1594 break;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1595 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1596
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1597 H5Gclose (data_hid);
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 return true;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1600 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1601
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1602 bool
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1603 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	1604 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1605 bool retval = false;
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 hdf5_callback_data dsub;
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 herr_t retval2 = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1610 octave_scalar_map m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1611 int current_item = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1612 hsize_t num_obj = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1613 #if HAVE_HDF5_18
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1614 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	1615 #else
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1616 hid_t group_id = H5Gopen (loc_id, name);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1617 #endif
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1618 H5Gget_num_objs (group_id, &num_obj);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1619 H5Gclose (group_id);
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 // FIXME -- fields appear to be sorted alphabetically on loading.
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1622 // Why is that happening?
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 while (current_item < static_cast<int> (num_obj)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1625 && (retval2 = H5Giterate (loc_id, name, &current_item,
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1626 hdf5_read_next_data, &dsub)) > 0)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1627 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1628 octave_value t2 = dsub.tc;
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 if (error_state)
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 error ("load: internal error loading struct elements");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1633 return false;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1634 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1635
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1636 m.setfield (dsub.name, t2);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1637
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1640 if (retval2 >= 0)
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 map = m;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1643 retval = true;
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
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1646 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1647 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1648
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1649 #endif
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 mxArray *
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1652 octave_scalar_struct::as_mxArray (void) const
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1653 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1654 int nf = nfields ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1655 string_vector kv = map_keys ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1656
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1657 OCTAVE_LOCAL_BUFFER (const char *, f, nf);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1658
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1659 for (int i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1660 f[i] = kv[i].c_str ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1661
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1662 mxArray *retval = new mxArray (dims (), nf, f);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1663
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1664 mxArray elts = static_cast<mxArray > (retval->get_data ());
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1665
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1666 mwSize nel = numel ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1667
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1668 mwSize ntot = nf * nel;
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 for (int i = 0; i < nf; i++)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1671 {
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1672 Cell c = map.contents (kv[i]);
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 const octave_value *p = c.data ();
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 mwIndex k = 0;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1677 for (mwIndex j = i; j < ntot; j += nf)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1678 elts[j] = new mxArray (p[k++]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1679 }
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 return retval;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1682 }
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 octave_value
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1686 octave_scalar_struct::to_array (void)
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 return new octave_struct (octave_map (map));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1689 }
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1690
10760 76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1691 bool
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1692 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	1693 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1694
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1695 if (btyp == btyp_struct)
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1696 {
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1697 (reinterpret_cast<const octave_scalar_map *>(where)) = &map;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1698 return true;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1699 }
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1700 else
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1701 return false;
76079e505f9d optimize cellfun with uniform struct output Jaroslav Hajek <highegg@gmail.com> parents: 10754 diff changeset	1702 }
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1703 /*
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1704 %!shared x
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1705 %! x(1).a=1; x(2).a=2; x(1).b=3; x(2).b=3;
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1706 %!assert(struct('a',1,'b',3),x(1))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1707 %!assert(isempty(x([])))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1708 %!assert(isempty(struct('a',{},'b',{})))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1709 %!assert(struct('a',{1,2},'b',{3,3}),x)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1710 %!assert(struct('a',{1,2},'b',3),x)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1711 %!assert(struct('a',{1,2},'b',{3}),x)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1712 %!assert(struct('b',3,'a',{1,2}),x)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1713 %!assert(struct('b',{3},'a',{1,2}),x)
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1714 %!test x=struct([]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1715 %!assert(size(x),[0,0]);
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1716 %!assert(isstruct(x));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1717 %!assert(isempty(fieldnames(x)));
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1718 %!fail("struct('a',{1,2},'b',{1,2,3})","dimensions of parameter 2 do not match those of parameter 4")
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1719 %!fail("struct(1,2,3,4)","struct expects alternating \"field\", VALUE pairs");
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1720 %!fail("struct('1',2,'3')","struct expects alternating \"field\", VALUE pairs");
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
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1723 DEFUN (struct, args, ,
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1724 "-- texinfo --\n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1725 @deftypefn {Built-in Function} {} struct (\"field\", @var{value}, \"field\", @var{value}, @dots{})\n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1726 \n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1727 Create a structure and initialize its value.\n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1728 \n\
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1729 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	1730 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	1731 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	1732 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	1733 array with the specified field names.\n\
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1734 \n\
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1735 If the argument is an object, return the underlying struct.\n\
4911 14027e0bafa4 [project @ 2004-07-22 19:58:06 by jwe] jwe parents: 4837 diff changeset	1736 @end deftypefn")
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1737 {
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1738 octave_value retval;
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1739
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1740 int nargin = args.length ();
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1741
5444 781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1742 // struct ([]) returns an empty struct.
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1743
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1744 // 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	1745 // dimensions as the empty matrix.
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1746
781c9e7dbb73 [project @ 2005-09-08 02:55:21 by jwe] jwe parents: 5433 diff changeset	1747 // 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	1748 // compatibility with Matlab.
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1749
10747 58c1b5402588 fix a showstopping bug in octave_fields reference counting Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1750 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	1751 return args(0);
58c1b5402588 fix a showstopping bug in octave_fields reference counting Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1752
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1753 if (nargin == 1 && args(0).is_object ())
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1754 {
10747 58c1b5402588 fix a showstopping bug in octave_fields reference counting Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1755 retval = args(0).map_value ();
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1756
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1757 return retval;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1758 }
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9087 diff changeset	1759
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1760 if ((nargin == 1 \|\| nargin == 2)
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1761 && args(0).is_empty () && args(0).is_real_matrix ())
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1762 {
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1763 Cell fields;
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1764
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1765 if (nargin == 2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1766 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1767 if (args(1).is_cellstr ())
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1768 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	1769 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1770 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	1771 }
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1772 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1773 retval = octave_map (args(0).dims ());
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1774
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1775 return retval;
10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1776 }
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1777
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1778 // Check for "field", VALUE pairs.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1779
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1780 for (int i = 0; i < nargin; i += 2)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1781 {
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1782 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	1783 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1784 error ("struct expects alternating \"field\", VALUE pairs");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1785 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1786 }
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1787 }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1788
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1789 // Check that the dimensions of the values correspond.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1790
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1791 dim_vector dims (1, 1);
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1792
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1793 int first_dimensioned_value = 0;
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1794
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1795 for (int i = 1; i < nargin; i += 2)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1796 {
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1797 if (args(i).is_cell ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1798 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1799 dim_vector argdims (args(i).dims ());
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1800
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1801 if (! scalar (argdims))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1802 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1803 if (! first_dimensioned_value)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1804 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1805 dims = argdims;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1806 first_dimensioned_value = i + 1;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1807 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1808 else if (dims != argdims)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1809 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1810 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	1811 first_dimensioned_value, i+1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1812 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1813 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1814 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1815 }
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1816 }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1817
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1818 // Create the return value.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1819
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1820 octave_map map (dims);
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1821
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1822 for (int i = 0; i < nargin; i+= 2)
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1823 {
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1824 // Get key.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1825
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1826 std::string key (args(i).string_value ());
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1827
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1828 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1829 return retval;
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1830
6811 3fe394f8502b [project @ 2007-08-10 19:07:34 by jwe] jwe parents: 6686 diff changeset	1831 if (! valid_identifier (key))
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1832 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1833 error ("struct: invalid structure field name `%s'", key.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1834 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1835 }
6811 3fe394f8502b [project @ 2007-08-10 19:07:34 by jwe] jwe parents: 6686 diff changeset	1836
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1837 // Value may be v, { v }, or { v1, v2, ... }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1838 // In the first two cases, we need to create a cell array of
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1839 // the appropriate dimensions filled with v. In the last case,
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1840 // 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	1841 // correct dimensions.
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1842
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1843 if (args(i+1).is_cell ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1844 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1845 const Cell c (args(i+1).cell_value ());
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1846
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1847 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1848 return retval;
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1849
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1850 if (scalar (c.dims ()))
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1851 map.setfield (key, Cell (dims, c(0)));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1852 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1853 map.setfield (key, c);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1854 }
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1855 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1856 map.setfield (key, Cell (dims, args(i+1)));
4744 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 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1859 return retval;
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1860 }
6946 10c7a803b409 [project @ 2007-10-03 14:38:48 by jwe] jwe parents: 6833 diff changeset	1861
4744 7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1862 return octave_value (map);
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1863 }
7dcb696159ac [project @ 2004-02-06 05:46:22 by jwe] jwe parents: 4696 diff changeset	1864
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1865 DEFUN (isstruct, args, ,
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1866 "-- texinfo --\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1867 @deftypefn {Built-in Function} {} isstruct (@var{x})\n\
0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1868 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	1869 @seealso{ismatrix, iscell, isa}\n\
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1870 @end deftypefn")
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1871 {
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1872 octave_value retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1873
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1874 if (args.length () == 1)
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1875 retval = args(0).is_map ();
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1876 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	1877 print_usage ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1878
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1879 return retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1880 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1881
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1882 DEFUN (fieldnames, args, ,
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1883 "-- texinfo --\n\
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1884 @deftypefn {Built-in Function} {} fieldnames (@var{struct})\n\
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1885 Return a cell array of strings naming the elements of the structure\n\
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1886 @var{struct}. It is an error to call @code{fieldnames} with an\n\
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1887 argument that is not a structure.\n\
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1888 @end deftypefn")
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1889 {
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1890 octave_value retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1891
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1892 int nargin = args.length ();
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1893
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1894 if (nargin == 1)
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1895 {
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7046 diff changeset	1896 octave_value arg = args(0);
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7046 diff changeset	1897
745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7046 diff changeset	1898 if (arg.is_map () \|\| arg.is_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1899 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1900 octave_map m = arg.map_value ();
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1901
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1902 string_vector keys = m.fieldnames ();
7336 745a8299c2b5 [project @ 2007-12-28 20:56:55 by jwe] jwe parents: 7046 diff changeset	1903
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1904 if (keys.length () == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1905 retval = Cell (0, 1);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1906 else
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1907 retval = Cell (keys);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1908 }
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1909 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1910 gripe_wrong_type_arg ("fieldnames", args(0));
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1911 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1912 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	1913 print_usage ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1914
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1915 return retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1916 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1917
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	1918 /*
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	1919 %!# test preservation of fieldname order
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	1920 %!test
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	1921 %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3;
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	1922 %! assert(fieldnames(x), {"d"; "a"; "b"; "c"});
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	1923 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	1924
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1925 DEFUN (isfield, args, ,
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1926 "-- texinfo --\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11359 diff changeset	1927 @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	1928 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	1929 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	1930 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	1931 @end deftypefn")
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1932 {
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1933 octave_value retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1934
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1935 int nargin = args.length ();
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1936
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1937 if (nargin == 2)
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1938 {
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1939 retval = false;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1940
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1941 if (args(0).is_map ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1942 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1943 octave_map m = args(0).map_value ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1944
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1945 // 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	1946 // structure reference operations?
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1947
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1948 if (args(1).is_string ())
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1949 {
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1950 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	1951
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1952 retval = m.isfield (key);
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1953 }
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1954 else if (args(1).is_cell ())
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1955 {
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1956 Cell c = args(1).cell_value ();
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1957 boolNDArray bm (c.dims ());
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1958 octave_idx_type n = bm.numel ();
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1959
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1960 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	1961 {
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1962 if (c(i).is_string ())
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1963 {
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1964 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	1965
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	1966 bm(i) = m.isfield (key);
10691 e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1967 }
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1968 else
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1969 bm(i) = false;
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1970 }
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1971
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1972 retval = bm;
e0ba186b242b Fisfield: Accept cell arrays as name argument. David Grundberg <davidg@cs.umu.se> parents: 10370 diff changeset	1973 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	1974 }
4358 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 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	1977 print_usage ();
4358 83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1978
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1979 return retval;
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1980 }
83d4452bc522 [project @ 2003-02-23 02:16:53 by jwe] jwe parents: 4247 diff changeset	1981
9784 f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1982 DEFUN (nfields, args, ,
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1983 "-- texinfo --\n\
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1984 @deftypefn {Built-in Function} {} nfields (@var{s})\n\
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1985 Return the number of fields of the structure @var{s}.\n\
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1986 @end deftypefn")
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1987 {
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1988 octave_value retval;
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1989
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1990 int nargin = args.length ();
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1991
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1992 if (nargin == 1 && args(0).is_map ())
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1993 {
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1994 retval = static_cast<double> (args(0).nfields ());
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1995 }
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1996 else
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1997 print_usage ();
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1998
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	1999 return retval;
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2000 }
f786dca09f79 implement nfields Jaroslav Hajek <highegg@gmail.com> parents: 9529 diff changeset	2001
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2002 /*
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2003 %!# test isfield
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2004 %!test
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2005 %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3;
11359 e4ba3cb2d27e isfield: Additional test for cellstring of field names Rik <octave@nomad.inbox5.com> parents: 10846 diff changeset	2006 %! assert (isfield (x, 'b'));
e4ba3cb2d27e isfield: Additional test for cellstring of field names Rik <octave@nomad.inbox5.com> parents: 10846 diff changeset	2007 %!assert (isfield (struct('a', '1'), 'a'));
e4ba3cb2d27e isfield: Additional test for cellstring of field names Rik <octave@nomad.inbox5.com> parents: 10846 diff changeset	2008 %!assert (isfield ({1}, 'c'), false);
e4ba3cb2d27e isfield: Additional test for cellstring of field names Rik <octave@nomad.inbox5.com> parents: 10846 diff changeset	2009 %!assert (isfield (struct('a', '1'), 10), false);
e4ba3cb2d27e isfield: Additional test for cellstring of field names Rik <octave@nomad.inbox5.com> parents: 10846 diff changeset	2010 %!assert (isfield (struct('a', 'b'), "a "), false);
e4ba3cb2d27e isfield: Additional test for cellstring of field names Rik <octave@nomad.inbox5.com> parents: 10846 diff changeset	2011 %!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	2012 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2013
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2014 DEFUN (cell2struct, args, ,
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2015 "-- texinfo --\n\
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2016 @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	2017 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	2018 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	2019 that is @code{numel (@var{fields}) == size (@var{cell}, @var{dim})}.\n\
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2020 \n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2021 @example\n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2022 @group\n\
7031 120f3135952f [project @ 2007-10-15 15:30:03 by jwe] jwe parents: 7017 diff changeset	2023 A = cell2struct (@{'Peter', 'Hannah', 'Robert';\n\
120f3135952f [project @ 2007-10-15 15:30:03 by jwe] jwe parents: 7017 diff changeset	2024 185, 170, 168@},\n\
6519 edadfd12ce53 [project @ 2007-04-11 21:26:13 by jwe] jwe parents: 6293 diff changeset	2025 @{'Name','Height'@}, 1);\n\
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2026 A(1)\n\
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2027 @result{} ans =\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2028 @{\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2029 Name = Peter\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2030 Height = 185\n\
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2031 @}\n\
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2032 \n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2033 @end group\n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2034 @end example\n\
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2035 @end deftypefn")
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2036 {
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2037 octave_value retval;
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2038
4751 7cb3b220d0f8 [project @ 2004-02-07 22:42:04 by jwe] jwe parents: 4750 diff changeset	2039 if (args.length () == 3)
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2040 {
10751 717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2041 if (! args(0).is_cell ())
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2042 error ("cell2struct: first argument must be a cell");
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2043 else if (! (args(1).is_cellstr () \|\| args(1).is_char_matrix ()))
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2044 error ("cell2struct: second argument must be a cell array of strings or a character matrix");
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2045 else if (! args(2).is_real_scalar ())
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2046 error ("cell2struct: third argument must be a real scalar");
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2047 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2048 {
10751 717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2049 const Cell vals = args(0).cell_value ();
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2050 const Array<std::string> fields = args(1).cellstr_value ();
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2051 int dim = args(2).int_value () - 1;
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2052 octave_idx_type ext = 0;
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2053
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2054 if (dim < 0)
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2055 error ("cell2struct: dim must be a valid dimension");
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2056 else
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2057 {
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2058 ext = vals.ndims () > dim ? vals.dims ()(dim) : 1;
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2059 if (ext != fields.numel ())
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2060 error ("cell2struct: number of fields doesn't match dimension");
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2061 }
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2062
4751 7cb3b220d0f8 [project @ 2004-02-07 22:42:04 by jwe] jwe parents: 4750 diff changeset	2063
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2064 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2065 {
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2066 int nd = std::max (dim+1, vals.ndims ());
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2067 // result dimensions.
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2068 dim_vector rdv = vals.dims ().redim (nd);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2069
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2070 assert (ext == rdv(dim));
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2071 if (nd == 2)
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2072 {
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2073 rdv(0) = rdv(1-dim);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2074 rdv(1) = 1;
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2075 }
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2076 else
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2077 {
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2078 for (int i = dim + 1; i < nd; i++)
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2079 rdv(i-1) = rdv(i);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2080
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2081 rdv.resize (nd-1);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2082 }
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2083
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2084 octave_map map (rdv);
bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2085 Array<idx_vector> ia (nd, 1, idx_vector::colon);
4751 7cb3b220d0f8 [project @ 2004-02-07 22:42:04 by jwe] jwe parents: 4750 diff changeset	2086
10751 717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2087 for (octave_idx_type i = 0; i < ext; i++)
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2088 {
717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2089 ia(dim) = i;
10753 bee1b1a2e29a yield compatible dims from cell2struct + more fixes. build & tests OK Jaroslav Hajek <highegg@gmail.com> parents: 10751 diff changeset	2090 map.setfield (fields(i), vals.index (ia).reshape (rdv));
10751 717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2091 }
4751 7cb3b220d0f8 [project @ 2004-02-07 22:42:04 by jwe] jwe parents: 4750 diff changeset	2092
10751 717ba2c3eef1 rewrite cell2struct, 1 failing test Jaroslav Hajek <highegg@gmail.com> parents: 10749 diff changeset	2093 retval = map;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2094 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2095 }
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2096 }
4751 7cb3b220d0f8 [project @ 2004-02-07 22:42:04 by jwe] jwe parents: 4750 diff changeset	2097 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	2098 print_usage ();
4750 95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2099
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2100 return retval;
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2101 }
95661d5713ce [project @ 2004-02-07 22:30:03 by jwe] jwe parents: 4744 diff changeset	2102
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2103 /*
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2104 %!# test cell2struct versus struct2cell
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2105 %!test
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2106 %! keys = cellstr (char (floor (rand (100,10)*24+65)))';
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2107 %! vals = mat2cell(rand (100,1), ones (100,1), 1)';
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2108 %! s = struct ([keys; vals]{:});
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2109 %! t = cell2struct (vals, keys, 2);
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2110 %! assert (s, t);
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2111 %! assert (struct2cell (s), vals');
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2112 %! assert (fieldnames (s), keys');
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2113 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2114
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2115
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2116 // So we can call Fcellstr directly.
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2117 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	2118
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2119 DEFUN (rmfield, args, ,
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2120 "-- texinfo --\n\
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2121 @deftypefn {Built-in Function} {} rmfield (@var{s}, @var{f})\n\
10846 a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	2122 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	2123 removed. If @var{f} is a cell array of strings or a character array, remove\n\
a4f482e66b65 Grammarcheck more of the documentation. Rik <octave@nomad.inbox5.com> parents: 10840 diff changeset	2124 the named fields.\n\
5642 2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5598 diff changeset	2125 @seealso{cellstr, iscellstr, setfield}\n\
2618a0750ae6 [project @ 2006-03-06 21:26:48 by jwe] jwe parents: 5598 diff changeset	2126 @end deftypefn")
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2127 {
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2128 octave_value retval;
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2129
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2130 int nargin = args.length ();
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2131
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2132 if (nargin == 2)
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2133 {
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2134 octave_map m = args(0).map_value ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2135
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2136 octave_value_list fval = Fcellstr (args(1), 1);
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2137
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2138 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2139 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2140 Cell fcell = fval(0).cell_value ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2141
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2142 for (int i = 0; i < fcell.numel (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2143 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2144 std::string key = fcell(i).string_value ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2145
10742 604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2146 if (m.isfield (key))
604e13a89c7f initial code for structs rewrite Jaroslav Hajek <highegg@gmail.com> parents: 10691 diff changeset	2147 m.rmfield (key);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2148 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2149 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2150 error ("rmfield: structure does not contain field %s",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2151 key.c_str ());
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2152
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2153 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2154 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2155 }
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2156
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2157 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2158 retval = m;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10258 diff changeset	2159 }
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2160 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2161 else
5823 080c08b192d8 [project @ 2006-05-19 05:32:17 by jwe] jwe parents: 5775 diff changeset	2162 print_usage ();
4817 6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2163
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2164 return retval;
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2165 }
6430596f2238 [project @ 2004-03-04 21:13:33 by jwe] jwe parents: 4792 diff changeset	2166
10122 9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2167 /*
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2168 %!# test rmfield
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2169 %!test
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2170 %! x(3).d=1; x(2).a=2; x(1).b=3; x(2).c=3; x(6).f="abc123";
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2171 %! y = rmfield (x, {"a", "f"});
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2172 %! assert (fieldnames (y), {"d"; "b"; "c"});
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2173 %! assert (size (y), [1, 6]);
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2174 */
9d1a14e12431 Update docs and add tests for container functions Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10066 diff changeset	2175
11474 8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2176 DEFUN (struct_levels_to_print, args, nargout,
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2177 "-- texinfo --\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2178 @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	2179 @deftypefnx {Built-in Function} {@var{old_val} =} struct_levels_to_print (@var{new_val})\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2180 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	2181 structure levels to display.\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2182 @end deftypefn")
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2183 {
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2184 return SET_INTERNAL_VARIABLE_WITH_LIMITS (struct_levels_to_print,
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2185 -1, INT_MAX);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2186 }
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2187
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2188 DEFUN (print_struct_array_contents, args, nargout,
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2189 "-- texinfo --\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2190 @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	2191 @deftypefnx {Built-in Function} {@var{old_val} =} print_struct_array_contents (@var{new_val})\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2192 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	2193 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	2194 This variable does not affect scalar structures. Their elements\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2195 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	2196 the number of levels specified by @var{struct_levels_to_print}.\n\
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2197 @end deftypefn")
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2198 {
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2199 return SET_INTERNAL_VARIABLE (print_struct_array_contents);
8a40037533e2 struct printing changes John W. Eaton <jwe@octave.org> parents: 11431 diff changeset	2200 }

Mercurial > hg > octave-lyh

annotate src/ov-struct.cc @ 11474:8a40037533e2