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

annotate src/ov-struct.cc @ 11217:521373e25613

correctly parse {1 2 {3 4}}

author	John W. Eaton <jwe@octave.org>
date	Tue, 09 Nov 2010 18:12:17 -0500
parents	a4f482e66b65
children	e4ba3cb2d27e

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

Mercurial > hg > octave-nkf

annotate src/ov-struct.cc @ 11217:521373e25613