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

annotate src/ov-class.cc @ 12127:b83162e8f402

fix nested indexed assignemnt in superclasses

author	Jaroslav Hajek <highegg@gmail.com>
date	Sat, 22 Jan 2011 13:48:11 +0100
parents	12df7854fa7c
children	d08901c05c1b

rev	line source
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1 /*
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 11474 diff changeset	3 Copyright (C) 2007-2011 John W. Eaton
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	4 Copyright (C) 2009 VZLU Prague
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	5
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	6 This file is part of Octave.
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	7
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	8 Octave is free software; you can redistribute it and/or modify it
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	9 under the terms of the GNU General Public License as published by the
7444 1e1e2608da7b [project @ 2008-02-04 07:40:55 by jwe] jwe parents: 7338 diff changeset	10 Free Software Foundation; either version 3 of the License, or (at your
1e1e2608da7b [project @ 2008-02-04 07:40:55 by jwe] jwe parents: 7338 diff changeset	11 option) any later version.
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	12
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	13 Octave is distributed in the hope that it will be useful, but WITHOUT
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	16 for more details.
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	17
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	18 You should have received a copy of the GNU General Public License
7444 1e1e2608da7b [project @ 2008-02-04 07:40:55 by jwe] jwe parents: 7338 diff changeset	19 along with Octave; see the file COPYING. If not, see
1e1e2608da7b [project @ 2008-02-04 07:40:55 by jwe] jwe parents: 7338 diff changeset	20 <http://www.gnu.org/licenses/>.
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	21
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	22 */
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	23
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	24 #ifdef HAVE_CONFIG_H
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	25 #include <config.h>
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	26 #endif
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	27
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	28 #include <iostream>
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	29
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	30 #include "Array-util.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	31 #include "byte-swap.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8219 diff changeset	32 #include "oct-locbuf.h"
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	33 #include "lo-mappers.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	34
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	35 #include "Cell.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	36 #include "defun.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	37 #include "error.h"
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	38 #include "file-ops.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	39 #include "gripes.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	40 #include "load-path.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	41 #include "ls-hdf5.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	42 #include "ls-oct-ascii.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	43 #include "ls-oct-binary.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	44 #include "ls-utils.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	45 #include "oct-lvalue.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	46 #include "ov-class.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	47 #include "ov-fcn.h"
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	48 #include "ov-usr-fcn.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	49 #include "pager.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	50 #include "parse.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	51 #include "pr-output.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	52 #include "toplev.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	53 #include "unwind-prot.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	54 #include "variables.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	55
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	56 DEFINE_OCTAVE_ALLOCATOR(octave_class);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	57
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	58 int octave_class::t_id (-1);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	59
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	60 const std::string octave_class::t_name ("class");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	61
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	62 void
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	63 octave_class::register_type (void)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	64 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	65 t_id = octave_value_typeinfo::register_type
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	66 (octave_class::t_name, "<unknown>", octave_value (new octave_class ()));
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	67 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	68
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	69 octave_class::octave_class (const octave_map& m, const std::string& id,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	70 const octave_value_list& parents)
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	71 : octave_base_value (), map (m), c_name (id), obsolete_copies (0)
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	72 {
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	73 octave_idx_type n = parents.length ();
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	74
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	75 for (octave_idx_type idx = 0; idx < n; idx++)
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	76 {
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	77 octave_value parent = parents(idx);
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	78
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	79 if (! parent.is_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	80 error ("parents must be objects");
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	81 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	82 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	83 std::string cnm = parent.class_name ();
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	84
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	85 if (find_parent_class (cnm))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	86 error ("duplicate class in parent tree");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	87 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	88 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	89 parent_list.push_back (cnm);
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	90
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	91 map.assign (cnm, parent);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	92 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	93 }
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	94 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	95
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	96 if (! error_state)
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9580 diff changeset	97 symbol_table::add_to_parent_map (id, parent_list);
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	98 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	99
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	100 octave_base_value *
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	101 octave_class::unique_clone (void)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	102 {
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	103 if (count == obsolete_copies)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	104 {
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	105 // All remaining copies are obsolete. We don't actually need to clone.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	106 count++;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	107 return this;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	108 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	109 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	110 {
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	111 // In theory, this shouldn't be happening, but it's here just in case.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	112 if (count < obsolete_copies)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	113 obsolete_copies = 0;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	114
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	115 return clone ();
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	116 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	117 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	118
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	119 std::string
f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	120 octave_class::get_current_method_class (void)
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	121 {
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	122 std::string retval = class_name ();
9156 b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	123
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	124 octave_function *fcn = octave_call_stack::current ();
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	125
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	126 // Here we are just looking to see if FCN is a method or constructor
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	127 // for any class, not specifically this one.
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9580 diff changeset	128 if (fcn->is_class_method () \|\| fcn->is_class_constructor ())
3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9580 diff changeset	129 retval = fcn->dispatch_class ();
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	130
9156 b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	131 return retval;
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	132 }
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	133
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	134 static void
10370 9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	135 gripe_invalid_index1 (void)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	136 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	137 error ("invalid index for class");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	138 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	139
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	140 static void
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	141 gripe_invalid_index_for_assignment (void)
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	142 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	143 error ("invalid index for class assignment");
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	144 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	145
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	146 static void
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	147 gripe_invalid_index_type (const std::string& nm, char t)
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	148 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	149 error ("%s cannot be indexed with %c", nm.c_str (), t);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	150 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	151
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	152 static void
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	153 gripe_failed_assignment (void)
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	154 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	155 error ("assignment to class element failed");
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	156 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	157
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	158 static inline octave_value_list
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	159 sanitize (const octave_value_list& ovl)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	160 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	161 octave_value_list retval = ovl;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	162
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	163 for (octave_idx_type i = 0; i < ovl.length (); i++)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	164 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	165 if (retval(i).is_magic_colon ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	166 retval(i) = ":";
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	167 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	168
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	169 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	170 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	171
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	172 static inline octave_value
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	173 make_idx_args (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	174 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	175 const std::string& who)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	176 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	177 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	178
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	179 size_t len = type.length ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	180
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	181 if (len == idx.size ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	182 {
9774 fbf15a0f30f0 Call user-defined subsref/subsasgn with 1xN structs instead of Nx1 David Grundberg <davidg@cs.umu.se> parents: 9767 diff changeset	183 Cell type_field (1, len);
fbf15a0f30f0 Call user-defined subsref/subsasgn with 1xN structs instead of Nx1 David Grundberg <davidg@cs.umu.se> parents: 9767 diff changeset	184 Cell subs_field (1, len);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	185
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	186 std::list<octave_value_list>::const_iterator p = idx.begin ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	187
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	188 for (size_t i = 0; i < len; i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	189 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	190 char t = type[i];
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	191
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	192 switch (t)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	193 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	194 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	195 type_field(i) = "()";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	196 subs_field(i) = Cell (sanitize (*p++));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	197 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	198
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	199 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	200 type_field(i) = "{}";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	201 subs_field(i) = Cell (sanitize (*p++));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	202 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	203
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	204 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	205 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	206 type_field(i) = ".";
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	207
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	208 octave_value_list vlist = *p++;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	209
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	210 if (vlist.length () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	211 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	212 octave_value val = vlist(0);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	213
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	214 if (val.is_string ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	215 subs_field(i) = val;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	216 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	217 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	218 error ("expecting character string argument for `.' index");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	219 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	220 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	221 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	222 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	223 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	224 error ("expecting single argument for `.' index");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	225 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	226 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	227 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	228 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	229
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	230 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	231 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	232 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	233 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	234 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	235
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	236 octave_map m;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	237
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	238 m.assign ("type", type_field);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	239 m.assign ("subs", subs_field);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	240
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	241 retval = m;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	242 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	243 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	244 error ("invalid index for %s", who.c_str ());
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	245
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	246 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	247 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	248
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	249 Cell
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	250 octave_class::dotref (const octave_value_list& idx)
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	251 {
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	252 Cell retval;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	253
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	254 assert (idx.length () == 1);
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	255
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	256 std::string method_class = get_current_method_class ();
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	257
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	258 // Find the class in which this method resides before attempting to access
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	259 // the requested field.
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	260
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	261 octave_base_value *obvp = find_parent_class (method_class);
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	262
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	263 if (obvp == 0)
f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	264 {
f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	265 error ("malformed class");
f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	266 return retval;
f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	267 }
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	268
10932 3a778233e4fb fix typo in 10926:f687bd17ce21 Jaroslav Hajek <highegg@gmail.com> parents: 10926 diff changeset	269 octave_map my_map = (obvp != this) ? obvp->map_value () : map;
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	270
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	271 std::string nm = idx(0).string_value ();
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	272
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	273 if (! error_state)
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	274 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	275 octave_map::const_iterator p = my_map.seek (nm);
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	276
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	277 if (p != my_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	278 retval = my_map.contents (p);
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	279 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	280 error ("class has no member `%s'", nm.c_str ());
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	281 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	282 else
10370 9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	283 gripe_invalid_index1 ();
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	284
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	285 return retval;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	286 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	287
9156 b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	288 static bool
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	289 called_from_builtin (void)
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	290 {
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	291 octave_function *fcn = octave_call_stack::caller ();
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	292
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	293 // FIXME -- we probably need a better check here, or some other
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	294 // mechanism to avoid overloaded functions when builtin is used.
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	295 // For example, what if someone overloads the builtin function?
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	296 // Also, are there other places where using builtin is not properly
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	297 // avoiding dispatch?
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	298
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	299 return (fcn && fcn->name () == "builtin");
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	300 }
b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	301
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	302 Matrix
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	303 octave_class::size (void)
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	304 {
9792 384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	305 if (in_class_method () \|\| called_from_builtin ())
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	306 return octave_base_value::size ();
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	307
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	308 Matrix retval (1, 2, 1.0);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	309 octave_value meth = symbol_table::find_method ("size", class_name ());
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	310
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	311 if (meth.is_defined ())
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	312 {
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	313 count++;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	314 octave_value_list args (1, octave_value (this));
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	315
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	316 octave_value_list lv = feval (meth.function_value (), args, 1);
9775 9d9f858849c7 Allow and ignore extra outargs from user-defined size methods David Grundberg <davidg@cs.umu.se> parents: 9774 diff changeset	317 if (lv.length () > 0 && lv(0).is_matrix_type () && lv(0).dims ().is_vector ())
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	318 retval = lv(0).matrix_value ();
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	319 else
9775 9d9f858849c7 Allow and ignore extra outargs from user-defined size methods David Grundberg <davidg@cs.umu.se> parents: 9774 diff changeset	320 error ("@%s/size: invalid return value", class_name ().c_str ());
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	321 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	322
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	323 return retval;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	324 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	325
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	326 octave_idx_type
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	327 octave_class::numel (const octave_value_list& idx)
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	328 {
9792 384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	329 if (in_class_method () \|\| called_from_builtin ())
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	330 return octave_base_value::numel (idx);
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	331
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	332 octave_idx_type retval = -1;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	333 const std::string cn = class_name ();
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	334
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	335 octave_value meth = symbol_table::find_method ("numel", cn);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	336
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	337 if (meth.is_defined ())
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	338 {
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	339 octave_value_list args (idx.length () + 1, octave_value ());
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	340
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	341 count++;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	342 args(0) = octave_value (this);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	343
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	344 for (octave_idx_type i = 0; i < idx.length (); i++)
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	345 args(i+1) = idx(i);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	346
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	347 octave_value_list lv = feval (meth.function_value (), args, 1);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	348 if (lv.length () == 1 && lv(0).is_scalar_type ())
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	349 retval = lv(0).idx_type_value (true);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	350 else
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	351 error ("@%s/numel: invalid return value", cn.c_str ());
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	352 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	353 else
10106 edbe47bc0f88 make numel query more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10066 diff changeset	354 retval = octave_base_value::numel (idx);
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	355
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	356 return retval;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	357 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	358
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	359 octave_value_list
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	360 octave_class::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	361 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	362 int nargout)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	363 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	364 octave_value_list retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	365
9156 b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	366 if (in_class_method () \|\| called_from_builtin ())
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	367 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	368 // FIXME -- this block of code is the same as the body of
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	369 // octave_struct::subsref. Maybe it could be shared instead of
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	370 // duplicated.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	371
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	372 int skip = 1;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	373
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	374 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	375 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	376 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	377 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	378 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	379 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	380 std::list<octave_value_list>::const_iterator p = idx.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	381 octave_value_list key_idx = *++p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	382
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	383 Cell tmp = dotref (key_idx);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	384
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	385 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	386 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	387 Cell t = tmp.index (idx.front ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	388
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	389 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	390
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	391 // We handled two index elements, so tell
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	392 // next_subsref to skip both of them.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	393
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	394 skip++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	395 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	396 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	397 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	398 retval(0) = octave_value (map.index (idx.front ()),
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	399 class_name ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	400 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	401 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	402
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	403 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	404 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	405 if (map.numel() > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	406 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	407 Cell t = dotref (idx.front ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	408
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	409 retval(0) = (t.length () == 1) ? t(0) : octave_value (t, true);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	410 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	411 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	412 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	413
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	414 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	415 gripe_invalid_index_type (type_name (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	416 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	417
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	418 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	419 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	420 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	421
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	422 // FIXME -- perhaps there should be an
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	423 // octave_value_list::next_subsref member function? See also
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	424 // octave_user_function::subsref.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	425
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	426 if (idx.size () > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	427 retval = retval(0).next_subsref (nargout, type, idx, skip);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	428 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	429 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	430 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	431 octave_value meth = symbol_table::find_method ("subsref", class_name ());
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	432
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	433 if (meth.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	434 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	435 octave_value_list args;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	436
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	437 args(1) = make_idx_args (type, idx, "subsref");
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	438
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	439 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	440 return octave_value_list ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	441
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	442 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	443 args(0) = octave_value (this);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	444
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	445 // FIXME: for Matlab compatibility, let us attempt to set up a proper
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	446 // value for nargout at least in the simple case where the
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	447 // cs-list-type expression - i.e., {} or ().x, is the leading one.
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	448 // Note that Octave does not actually need this, since it will
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	449 // be able to properly react to varargout a posteriori.
9331 a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	450 bool maybe_cs_list_query = (type[0] == '.' \|\| type[0] == '{'
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	451 \|\| (type.length () > 1 && type[0] == '('
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	452 && type[1] == '.'));
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	453
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	454 int true_nargout = nargout;
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	455
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	456 if (maybe_cs_list_query)
9331 a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	457 {
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	458 // Set up a proper nargout for the subsref call by calling numel.
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	459 octave_value_list tmp;
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	460 if (type[0] != '.') tmp = idx.front ();
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	461 true_nargout = numel (tmp);
9331 a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	462 }
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	463
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	464 retval = feval (meth.function_value (), args, true_nargout);
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	465
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	466 // Since we're handling subsref, return the list in the first value
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	467 // if it has more than one element, to be able to pass through
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	468 // rvalue1 calls.
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	469 if (retval.length () > 1)
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	470 retval = octave_value (retval, true);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	471 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	472 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	473 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	474 if (type.length () == 1 && type[0] == '(')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	475 retval(0) = octave_value (map.index (idx.front ()), class_name ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	476 else
10370 9c4daf174387 implement IDs for common liboctave exceptions Jaroslav Hajek <highegg@gmail.com> parents: 10315 diff changeset	477 gripe_invalid_index1 ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	478 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	479 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	480
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	481 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	482 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	483
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	484 octave_value
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	485 octave_class::numeric_conv (const Cell& val, const std::string& type)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	486 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	487 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	488
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	489 if (val.length () == 1)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	490 {
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	491 retval = val(0);
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	492
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	493 if (type.length () > 0 && type[0] == '.' && ! retval.is_map ())
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	494 retval = octave_map ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	495 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	496 else
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	497 gripe_invalid_index_for_assignment ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	498
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	499 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	500 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	501
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	502 octave_value
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	503 octave_class::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	504 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	505 const octave_value& rhs)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	506 {
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	507 octave_value retval;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	508
9156 b2b8ed43b922 ov-class.cc: don't dispatch subsref or subsasgn when called from builtin John W. Eaton <jwe@octave.org> parents: 9151 diff changeset	509 if (! (in_class_method () \|\| called_from_builtin ()))
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	510 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	511 octave_value meth = symbol_table::find_method ("subsasgn", class_name ());
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	512
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	513 if (meth.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	514 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	515 octave_value_list args;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	516
9333 3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	517 if (rhs.is_cs_list ())
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	518 {
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	519 octave_value_list lrhs = rhs.list_value ();
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	520 args.resize (2 + lrhs.length ());
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	521 for (octave_idx_type i = 0; i < lrhs.length (); i++)
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	522 args(2+i) = lrhs(i);
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	523 }
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	524 else
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	525 args(2) = rhs;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	526
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	527 args(1) = make_idx_args (type, idx, "subsasgn");
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	528
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	529 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	530 return octave_value_list ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	531
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	532 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	533 args(0) = octave_value (this);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	534
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	535 // Now comes the magic. Count copies with me:
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	536 // 1. myself (obsolete)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	537 // 2. the copy inside args (obsolete)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	538 // 3. the copy in method's symbol table (working)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	539 // ... possibly more (not obsolete).
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	540 //
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	541 // So we mark 2 copies as obsolete and hold our fingers crossed.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	542 // But prior to doing that, check whether the routine is amenable
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	543 // to the optimization.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	544 // It is essential that the handling function doesn't store extra
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	545 // copies anywhere. If it does, things will not break but the
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	546 // optimization won't work.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	547
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	548 octave_value_list tmp;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	549
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	550 if (obsolete_copies == 0 && meth.is_user_function ()
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	551 && meth.user_function_value ()->subsasgn_optimization_ok ())
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	552 {
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	553 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	554 frame.protect_var (obsolete_copies);
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	555 obsolete_copies = 2;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	556
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	557 tmp = feval (meth.function_value (), args);
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	558 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	559 else
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	560 tmp = feval (meth.function_value (), args);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	561
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	562 // FIXME -- should the subsasgn method be able to return
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	563 // more than one value?
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	564
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	565 if (tmp.length () > 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	566 error ("expecting single return value from @%s/subsasgn",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	567 class_name().c_str ());
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8782 diff changeset	568
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	569 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	570 retval = tmp(0);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	571
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	572 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	573 }
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8782 diff changeset	574 }
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8782 diff changeset	575
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	576 // Find the class in which this method resides before
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	577 // attempting to do the indexed assignment.
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	578
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	579 std::string method_class = get_current_method_class ();
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	580
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	581 octave_base_value *obvp = unique_parent_class (method_class);
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	582 if (obvp != this)
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	583 {
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	584
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	585 if (obvp)
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	586 {
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	587 obvp->subsasgn (type, idx, rhs);
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	588 if (! error_state)
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	589 {
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	590 count++;
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	591 retval = octave_value (this);
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	592 }
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	593 else
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	594 gripe_failed_assignment ();
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	595 }
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	596 else
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	597 error ("malformed class");
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	598
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	599 return retval;
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	600 }
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	601
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	602 // FIXME -- this block of code is the same as the body of
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	603 // octave_struct::subsasgn. Maybe it could be shared instead of
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	604 // duplicated.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	605
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	606 int n = type.length ();
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	607
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	608 octave_value t_rhs = rhs;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	609
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	610 if (n > 1 && ! (type.length () == 2 && type[0] == '(' && type[1] == '.'))
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	611 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	612 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	613 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	614 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	615 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	616 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	617 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	618 std::list<octave_value_list>::const_iterator p = idx.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	619 octave_value_list t_idx = *p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	620
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	621 octave_value_list key_idx = *++p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	622
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	623 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	624
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	625 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	626
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	627 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	628 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	629 octave_value u;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	630
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	631 if (! map.contains (key))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	632 u = octave_value::empty_conv (type.substr (2), rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	633 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	634 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	635 Cell map_val = map.contents (key);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	636
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	637 Cell map_elt = map_val.index (idx.front (), true);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	638
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	639 u = numeric_conv (map_elt, type.substr (2));
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	640 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	641
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	642 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	643 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	644 std::list<octave_value_list> next_idx (idx);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	645
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	646 // We handled two index elements, so subsasgn to
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	647 // needs to skip both of them.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	648
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	649 next_idx.erase (next_idx.begin ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	650 next_idx.erase (next_idx.begin ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	651
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	652 u.make_unique ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	653
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	654 t_rhs = u.subsasgn (type.substr (2), next_idx, rhs);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	655 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	656 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	657 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	658 gripe_invalid_index_for_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	659 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	660 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	661 gripe_invalid_index_for_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	662 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	663 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	664
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	665 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	666 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	667 octave_value_list key_idx = idx.front ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	668
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	669 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	670
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	671 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	672
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	673 std::list<octave_value_list> next_idx (idx);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	674
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	675 next_idx.erase (next_idx.begin ());
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	676
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	677 std::string next_type = type.substr (1);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	678
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	679 Cell tmpc (1, 1);
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	680 octave_map::iterator pkey = map.seek (key);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	681 if (pkey != map.end ())
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	682 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	683 map.contents (pkey).make_unique ();
8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	684 tmpc = map.contents (pkey);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	685 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	686
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	687 // FIXME: better code reuse?
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	688 if (! error_state)
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	689 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	690 if (tmpc.numel () == 1)
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	691 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	692 octave_value& tmp = tmpc(0);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	693
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	694 if (! tmp.is_defined () \|\| tmp.is_zero_by_zero ())
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	695 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	696 tmp = octave_value::empty_conv (next_type, rhs);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	697 tmp.make_unique (); // probably a no-op.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	698 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	699 else
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	700 // optimization: ignore the copy still stored inside our map.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	701 tmp.make_unique (1);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	702
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	703 if (! error_state)
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	704 t_rhs = tmp.subsasgn (next_type, next_idx, rhs);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	705 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	706 else
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	707 gripe_indexed_cs_list ();
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	708 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	709 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	710 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	711
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	712 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	713 gripe_invalid_index_type (type_name (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	714 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	715
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	716 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	717 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	718 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	719 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	720
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	721 if (! error_state)
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	722 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	723 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	724 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	725 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	726 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	727 if (n > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	728 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	729 std::list<octave_value_list>::const_iterator p = idx.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	730 octave_value_list key_idx = *++p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	731
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	732 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	733
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	734 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	735
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	736 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	737 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	738 map.assign (idx.front (), key, t_rhs);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	739
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	740 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	741 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	742 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	743 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	744 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	745 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	746 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	747 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	748 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	749 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	750 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	751 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	752 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	753 if (t_rhs.is_object () \|\| t_rhs.is_map ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	754 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	755 octave_map rhs_map = t_rhs.map_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	756
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	757 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	758 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	759 map.assign (idx.front (), rhs_map);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	760
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	761 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	762 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	763 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	764 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	765 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	766 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	767 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	768 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	769 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	770 error ("invalid class assignment");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	771 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	772 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	773 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	774 if (t_rhs.is_empty ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	775 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	776 map.delete_elements (idx.front());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	777
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	778 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	779 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	780 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	781 retval = octave_value (this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	782 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	783 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	784 gripe_failed_assignment ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	785 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	786 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	787 error ("invalid class assignment");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	788 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	789 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	790 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	791 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	792
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	793 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	794 {
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	795 octave_value_list key_idx = idx.front ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	796
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	797 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	798
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	799 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	800
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	801 if (t_rhs.is_cs_list ())
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	802 {
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	803 Cell tmp_cell = Cell (t_rhs.list_value ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	804
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	805 // The shape of the RHS is irrelevant, we just want
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	806 // the number of elements to agree and to preserve the
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	807 // shape of the left hand side of the assignment.
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	808
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	809 if (numel () == tmp_cell.numel ())
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	810 tmp_cell = tmp_cell.reshape (dims ());
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	811
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	812 map.setfield (key, tmp_cell);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	813 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	814 else
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	815 {
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	816 Cell tmp_cell(1, 1);
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	817 tmp_cell(0) = t_rhs.storable_value ();
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	818 map.setfield (key, tmp_cell);
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	819 }
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	820
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	821 if (! error_state)
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	822 {
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	823 count++;
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	824 retval = octave_value (this);
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	825 }
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	826 else
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	827 gripe_failed_assignment ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	828 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	829 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	830
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	831 case '{':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	832 gripe_invalid_index_type (type_name (), type[0]);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	833 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	834
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	835 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	836 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	837 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	838 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	839 else
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	840 gripe_failed_assignment ();
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	841
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	842 return retval;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	843 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	844
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	845 idx_vector
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	846 octave_class::index_vector (void) const
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	847 {
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	848 idx_vector retval;
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	849
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	850 octave_value meth = symbol_table::find_method ("subsindex", class_name ());
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	851
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	852 if (meth.is_defined ())
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	853 {
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	854 octave_value_list args;
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	855 args(0) = octave_value (new octave_class (map, c_name));
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	856
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	857 octave_value_list tmp = feval (meth.function_value (), args, 1);
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	858
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	859 if (!error_state && tmp.length () >= 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	860 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	861 if (tmp(0).is_object())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	862 error ("subsindex function must return a valid index vector");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	863 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	864 // Index vector returned by subsindex is zero based
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	865 // (why this inconsistency Mathworks?), and so we must
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	866 // add one to the value returned as the index_vector method
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	867 // expects it to be one based.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	868 retval = do_binary_op (octave_value::op_add, tmp (0),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	869 octave_value (1.0)).index_vector ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	870 }
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	871 }
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	872 else
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	873 error ("no subsindex method defined for class %s",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	874 class_name().c_str ());
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	875
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	876 return retval;
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	877 }
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	878
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	879 size_t
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	880 octave_class::byte_size (void) const
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	881 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	882 // Neglect the size of the fieldnames.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	883
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	884 size_t retval = 0;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	885
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	886 for (octave_map::const_iterator p = map.begin (); p != map.end (); p++)
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	887 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	888 std::string key = map.key (p);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	889
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	890 octave_value val = octave_value (map.contents (p));
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	891
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	892 retval += val.byte_size ();
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	893 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	894
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	895 return retval;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	896 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	897
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	898 string_vector
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	899 octave_class::map_keys (void) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	900 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	901 string_vector retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	902 gripe_wrong_type_arg ("octave_class::map_keys()", type_name ());
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	903 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	904 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	905
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	906 octave_base_value *
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	907 octave_class::find_parent_class (const std::string& parent_class_name)
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	908 {
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	909 octave_base_value* retval = 0;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	910
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	911 if (parent_class_name == class_name ())
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	912 retval = this;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	913 else
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	914 {
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	915 for (std::list<std::string>::iterator pit = parent_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	916 pit != parent_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	917 pit++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	918 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	919 octave_map::const_iterator smap = map.seek (*pit);
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	920
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	921 const Cell& tmp = map.contents (smap);
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	922
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	923 octave_value vtmp = tmp(0);
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	924
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	925 octave_base_value *obvp = vtmp.internal_rep ();
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	926
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	927 retval = obvp->find_parent_class (parent_class_name);
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	928
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	929 if (retval)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	930 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	931 }
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	932 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	933
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	934 return retval;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	935 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	936
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	937 octave_base_value *
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	938 octave_class::unique_parent_class (const std::string& parent_class_name)
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	939 {
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	940 octave_base_value* retval = 0;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	941
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	942 if (parent_class_name == class_name ())
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	943 retval = this;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	944 else
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	945 {
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	946 for (std::list<std::string>::iterator pit = parent_list.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	947 pit != parent_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	948 pit++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	949 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	950 octave_map::iterator smap = map.seek (*pit);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	951
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	952 Cell& tmp = map.contents (smap);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	953
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	954 octave_value& vtmp = tmp(0);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	955
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	956 octave_base_value *obvp = vtmp.internal_rep ();
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	957
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	958 // Use find_parent_class first to avoid uniquifying if not necessary.
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	959 retval = obvp->find_parent_class (parent_class_name);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	960
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	961 if (retval)
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	962 {
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	963 vtmp.make_unique ();
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	964 obvp = vtmp.internal_rep ();
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	965 retval = obvp->unique_parent_class (parent_class_name);
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	966
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	967 break;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	968 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	969 }
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	970 }
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	971
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	972 return retval;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	973 }
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	974
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	975 void
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	976 octave_class::print (std::ostream& os, bool) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	977 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	978 print_raw (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	979 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	980
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	981 void
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	982 octave_class::print_raw (std::ostream& os, bool) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	983 {
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	984 unwind_protect frame;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	985
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	986 indent (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	987 os << " <class " << class_name () << ">";
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	988 newline (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	989 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	990
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	991 bool
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	992 octave_class::print_name_tag (std::ostream& os, const std::string& name) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	993 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	994 bool retval = false;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	995
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	996 indent (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	997 os << name << " =";
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	998 newline (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	999 newline (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1000
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1001 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1002 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1003
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1004 void
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1005 octave_class::print_with_name (std::ostream& os, const std::string& name,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1006 bool)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1007 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1008 octave_value fcn = symbol_table::find_method ("display", class_name ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1009
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1010 if (fcn.is_defined ())
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1011 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1012 octave_value_list args;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1013
9521 e08d72bb988e simplify cloning Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	1014 count++;
e08d72bb988e simplify cloning Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	1015 args(0) = octave_value (this);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1016
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1017 string_vector arg_names (1);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1018
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1019 arg_names[0] = name;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1020
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1021 args.stash_name_tags (arg_names);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1022
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1023 feval (fcn.function_value (), args);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1024 }
10204 1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1025 else
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1026 {
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1027 indent (os);
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1028 os << name << " = <class " << class_name () << ">";
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1029 newline (os);
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1030 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1031 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1032
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1033 // Loading a class properly requires an exemplar map entry for success.
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1034 // If we don't have one, we attempt to create one by calling the constructor
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1035 // with no arguments.
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1036 bool
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1037 octave_class::reconstruct_exemplar (void)
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1038 {
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1039 bool retval = false;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1040
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1041 octave_class::exemplar_const_iterator it
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1042 = octave_class::exemplar_map.find (c_name);
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1043
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1044 if (it != octave_class::exemplar_map.end ())
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1045 retval = true;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1046 else
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1047 {
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1048 octave_value ctor = symbol_table::find_method (c_name, c_name);
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1049
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1050 if (ctor.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1051 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1052 octave_value_list result = feval (ctor, 1);
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1053
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1054 if (result.length () == 1)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1055 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1056 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1057 warning ("call to constructor for class %s failed", c_name.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1058 }
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1059 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1060 warning ("no constructor for class %s", c_name.c_str ());
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1061 }
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1062
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1063 return retval;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1064 }
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1065
9240 f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1066 void
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1067 octave_class::clear_exemplar_map (void)
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1068 {
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1069 exemplar_map.clear ();
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1070 }
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1071
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1072 // Load/save does not provide enough information to reconstruct the
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1073 // class inheritance structure. reconstruct_parents () attempts to
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1074 // do so. If successful, a "true" value is returned.
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1075 //
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1076 // Note that we don't check the loaded object structure against the
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1077 // class structure here so the user's loadobj method has a chance
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1078 // to do its magic.
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1079 bool
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1080 octave_class::reconstruct_parents (void)
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1081 {
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1082 bool retval = true, might_have_inheritance = false;
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1083 std::string dbgstr = "dork";
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1084
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1085 // First, check to see if there might be an issue with inheritance.
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1086 for (octave_map::const_iterator p = map.begin (); p != map.end (); p++)
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1087 {
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1088 std::string key = map.key (p);
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1089 Cell val = map.contents (p);
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1090 if ( val(0).is_object() )
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1091 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1092 dbgstr = "blork";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1093 if( key == val(0).class_name() )
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1094 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1095 might_have_inheritance = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1096 dbgstr = "cork";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1097 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1098 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1099 }
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1100 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1101
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1102 if (might_have_inheritance)
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1103 {
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1104 octave_class::exemplar_const_iterator it
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1105 = octave_class::exemplar_map.find (c_name);
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1106
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1107 if (it == octave_class::exemplar_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1108 retval = false;
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1109 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1110 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1111 octave_class::exemplar_info exmplr = it->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1112 parent_list = exmplr.parents ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1113 for (std::list<std::string>::iterator pit = parent_list.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1114 pit != parent_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1115 pit++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1116 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1117 dbgstr = *pit;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1118 bool dbgbool = map.contains (*pit);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1119 if (!dbgbool)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1120 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1121 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1122 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1123 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1124 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1125 }
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1126 }
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1127
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1128 return retval;
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1129 }
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1130
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1131 bool
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1132 octave_class::save_ascii (std::ostream& os)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1133 {
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1134 os << "# classname: " << class_name () << "\n";
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1135 octave_map m;
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1136 if (load_path::find_method (class_name (), "saveobj") != std::string ())
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1137 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1138 octave_value in = new octave_class (*this);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1139 octave_value_list tmp = feval ("saveobj", in, 1);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1140 if (! error_state)
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1141 m = tmp(0).map_value ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1142 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1143 return false;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1144 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1145 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1146 m = map_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1147
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1148 os << "# length: " << m.nfields () << "\n";
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1149
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1150 octave_map::iterator i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1151 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1152 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1153 octave_value val = map.contents (i);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1154
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1155 bool b = save_ascii_data (os, val, m.key (i), false, 0);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1156
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1157 if (! b)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1158 return os;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1159
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1160 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1161 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1162
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1163 return true;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1164 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1165
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1166 bool
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1167 octave_class::load_ascii (std::istream& is)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1168 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1169 octave_idx_type len = 0;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1170 std::string classname;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1171 bool success = true;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1172
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1173 if (extract_keyword (is, "classname", classname) && classname != "")
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1174 {
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1175 if (extract_keyword (is, "length", len) && len >= 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1176 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1177 if (len > 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1178 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1179 octave_map m (map);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1180
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1181 for (octave_idx_type j = 0; j < len; j++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1182 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1183 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1184 bool dummy;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1185
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1186 // recurse to read cell elements
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1187 std::string nm
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1188 = read_ascii_data (is, std::string (), dummy, t2, j);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1189
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1190 if (! is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1191 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1192
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1193 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1194
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1195 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1196 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1197 error ("load: internal error loading class elements");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1198 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1199 }
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1200
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1201 m.assign (nm, tcell);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1202 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1203
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1204 if (is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1205 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1206 c_name = classname;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1207 reconstruct_exemplar ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1208
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1209 map = m;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1210
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1211 if (! reconstruct_parents ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1212 warning ("load: unable to reconstruct object inheritance");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1213 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1214 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1215 if (load_path::find_method (classname, "loadobj")
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1216 != std::string ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1217 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1218 octave_value in = new octave_class (*this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1219 octave_value_list tmp = feval ("loadobj", in, 1);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1220
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1221 if (! error_state)
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1222 map = tmp(0).map_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1223 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1224 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1225 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1226 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1227 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1228 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1229 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1230 error ("load: failed to load class");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1231 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1232 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1233 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1234 else if (len == 0 )
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1235 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1236 map = octave_map (dim_vector (1, 1));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1237 c_name = classname;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1238 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1239 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1240 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1241 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1242 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1243 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1244 error ("load: failed to extract number of elements in class");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1245 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1246 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1247 }
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1248 else
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1249 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1250 error ("load: failed to extract name of class");
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1251 success = false;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1252 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1253
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1254 return success;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1255 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1256
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1257 bool
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1258 octave_class::save_binary (std::ostream& os, bool& save_as_floats)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1259 {
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1260 int32_t classname_len = class_name().length ();
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1261
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1262 os.write (reinterpret_cast<char *> (&classname_len), 4);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1263 os << class_name ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1264
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1265 octave_map m;
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1266 if (load_path::find_method (class_name (), "saveobj") != std::string ())
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1267 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1268 octave_value in = new octave_class (*this);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1269 octave_value_list tmp = feval ("saveobj", in, 1);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1270 if (! error_state)
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1271 m = tmp(0).map_value ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1272 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1273 return false;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1274 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1275 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1276 m = map_value ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1277
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1278 int32_t len = m.nfields();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1279 os.write (reinterpret_cast<char *> (&len), 4);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1280
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1281 octave_map::iterator i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1282 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1283 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1284 octave_value val = map.contents (i);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1285
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1286 bool b = save_binary_data (os, val, m.key (i), "", 0, save_as_floats);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1287
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1288 if (! b)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1289 return os;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1290
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1291 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1292 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1293
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1294 return true;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1295 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1296
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1297 bool
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1298 octave_class::load_binary (std::istream& is, bool swap,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1299 oct_mach_info::float_format fmt)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1300 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1301 bool success = true;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1302
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1303 int32_t classname_len;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1304
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1305 is.read (reinterpret_cast<char *> (&classname_len), 4);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1306 if (! is)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1307 return false;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1308 else if (swap)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1309 swap_bytes<4> (&classname_len);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1310
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1311 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1312 OCTAVE_LOCAL_BUFFER (char, classname, classname_len+1);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1313 classname[classname_len] = '\0';
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1314 if (! is.read (reinterpret_cast<char *> (classname), classname_len))
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1315 return false;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1316 c_name = classname;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1317 }
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1318 reconstruct_exemplar ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1319
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1320 int32_t len;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1321 if (! is.read (reinterpret_cast<char *> (&len), 4))
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1322 return false;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1323 if (swap)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1324 swap_bytes<4> (&len);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1325
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1326 if (len > 0)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1327 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1328 octave_map m (map);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1329
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1330 for (octave_idx_type j = 0; j < len; j++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1331 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1332 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1333 bool dummy;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1334 std::string doc;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1335
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1336 // recurse to read cell elements
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1337 std::string nm = read_binary_data (is, swap, fmt, std::string (),
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1338 dummy, t2, doc);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1339
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1340 if (! is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1341 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1342
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1343 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1344
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1345 if (error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1346 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1347 error ("load: internal error loading class elements");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1348 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1349 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1350
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1351 m.assign (nm, tcell);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1352 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1353
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1354 if (is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1355 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1356 map = m;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1357
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1358 if (! reconstruct_parents ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1359 warning ("load: unable to reconstruct object inheritance");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1360 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1361 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1362 if (load_path::find_method (c_name, "loadobj") != std::string ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1363 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1364 octave_value in = new octave_class (*this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1365 octave_value_list tmp = feval ("loadobj", in, 1);
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1366
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1367 if (! error_state)
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1368 map = tmp(0).map_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1369 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1370 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1371 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1372 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1373 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1374 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1375 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1376 warning ("load: failed to load class");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1377 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1378 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1379 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1380 else if (len == 0 )
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1381 map = octave_map (dim_vector (1, 1));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1382 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1383 panic_impossible ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1384
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1385 return success;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1386 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1387
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1388 #if defined (HAVE_HDF5)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1389
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1390 bool
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1391 octave_class::save_hdf5 (hid_t loc_id, const char *name, bool save_as_floats)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1392 {
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1393 hsize_t hdims[3];
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1394 hid_t group_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1395 hid_t type_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1396 hid_t space_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1397 hid_t class_hid = -1;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1398 hid_t data_hid = -1;
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1399 octave_map m;
8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1400 octave_map::iterator i;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1401
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1402 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1403 group_hid = H5Gcreate (loc_id, name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1404 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1405 group_hid = H5Gcreate (loc_id, name, 0);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1406 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1407 if (group_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1408 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1409
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1410 // Add the class name to the group
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1411 type_hid = H5Tcopy (H5T_C_S1); H5Tset_size (type_hid, c_name.length () + 1);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1412 if (type_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1413 goto error_cleanup;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1414
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1415 hdims[0] = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1416 space_hid = H5Screate_simple (0 , hdims, 0);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1417 if (space_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1418 goto error_cleanup;
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1419 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1420 class_hid = H5Dcreate (group_hid, "classname", type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1421 H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1422 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1423 class_hid = H5Dcreate (group_hid, "classname", type_hid, space_hid,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1424 H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1425 #endif
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1426 if (class_hid < 0 \|\| H5Dwrite (class_hid, type_hid, H5S_ALL, H5S_ALL,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1427 H5P_DEFAULT, c_name.c_str ()) < 0)
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1428 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1429
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1430 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1431 data_hid = H5Gcreate (group_hid, "value", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1432 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1433 data_hid = H5Gcreate (group_hid, "value", 0);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1434 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1435 if (data_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1436 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1437
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1438 if (load_path::find_method (class_name (), "saveobj") != std::string ())
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1439 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1440 octave_value in = new octave_class (*this);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1441 octave_value_list tmp = feval ("saveobj", in, 1);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1442 if (! error_state)
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1443 m = tmp(0).map_value ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1444 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1445 goto error_cleanup;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1446 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1447 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1448 m = map_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1449
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1450 // recursively add each element of the class to this group
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1451 i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1452 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1453 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1454 octave_value val = map.contents (i);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1455
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1456 bool retval2 = add_hdf5_data (data_hid, val, m.key (i), "", false,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1457 save_as_floats);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1458
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1459 if (! retval2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1460 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1461
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1462 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1463 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1464
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1465 error_cleanup:
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1466
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1467 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1468 H5Gclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1469
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1470 if (class_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1471 H5Dclose (class_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1472
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1473 if (space_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1474 H5Sclose (space_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1475
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1476 if (type_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1477 H5Tclose (type_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1478
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1479 if (group_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1480 H5Gclose (group_hid);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1481
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1482 return true;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1483 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1484
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1485 bool
9881 b3089dba88bf Remove HDF5 cruft for older versions of HDF5 Kacper Kowalik parents: 9792 diff changeset	1486 octave_class::load_hdf5 (hid_t loc_id, const char *name)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1487 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1488 bool retval = false;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1489
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1490 hid_t group_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1491 hid_t data_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1492 hid_t type_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1493 hid_t type_class_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1494 hid_t space_hid = -1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1495 hid_t subgroup_hid = -1;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1496 hid_t st_id = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1497
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1498 hdf5_callback_data dsub;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1499
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1500 herr_t retval2 = 0;
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1501 octave_map m (dim_vector (1, 1));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1502 int current_item = 0;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1503 hsize_t num_obj = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1504 int slen = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1505 hsize_t rank = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1506
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1507 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1508 group_hid = H5Gopen (loc_id, name, H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1509 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1510 group_hid = H5Gopen (loc_id, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1511 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1512 if (group_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1513 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1514
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1515 #if HAVE_HDF5_18
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1516 data_hid = H5Dopen (group_hid, "classname", H5P_DEFAULT);
ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1517 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1518 data_hid = H5Dopen (group_hid, "classname");
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1519 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1520
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1521 if (data_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1522 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1523
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1524 type_hid = H5Dget_type (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1525
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1526 type_class_hid = H5Tget_class (type_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1527
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1528 if (type_class_hid != H5T_STRING)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1529 goto error_cleanup;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1530
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1531 space_hid = H5Dget_space (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1532 rank = H5Sget_simple_extent_ndims (space_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1533
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1534 if (rank != 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1535 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1536
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1537 slen = H5Tget_size (type_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1538 if (slen < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1539 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1540
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1541 // do-while loop here to prevent goto crossing initialization of classname
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1542 do
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1543 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1544 OCTAVE_LOCAL_BUFFER (char, classname, slen);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1545
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1546 // create datatype for (null-terminated) string to read into:
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1547 st_id = H5Tcopy (H5T_C_S1);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1548 H5Tset_size (st_id, slen);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1549
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1550 if (H5Dread (data_hid, st_id, H5S_ALL, H5S_ALL, H5P_DEFAULT,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1551 classname) < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1552 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1553 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1554 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1555 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1556 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1557 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1558
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1559 H5Tclose (st_id);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1560 H5Dclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1561 data_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1562
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1563 c_name = classname;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1564 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1565 while (0);
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1566 reconstruct_exemplar ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1567
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1568 #if HAVE_HDF5_18
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1569 subgroup_hid = H5Gopen (group_hid, name, H5P_DEFAULT);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1570 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1571 subgroup_hid = H5Gopen (group_hid, name);
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1572 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1573 H5Gget_num_objs (subgroup_hid, &num_obj);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1574 H5Gclose (subgroup_hid);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1575
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1576 while (current_item < static_cast<int> (num_obj)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1577 && (retval2 = H5Giterate (group_hid, name, &current_item,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1578 hdf5_read_next_data, &dsub)) > 0)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1579 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1580 octave_value t2 = dsub.tc;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1581
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1582 Cell tcell = t2.is_cell () ? t2.cell_value () : Cell (t2);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1583
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1584 if (error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1585 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1586 error ("load: internal error loading class elements");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1587 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1588 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1589
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1590 m.assign (dsub.name, tcell);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1591
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1592 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1593
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1594 if (retval2 >= 0)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1595 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1596 map = m;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1597
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1598 if (!reconstruct_parents ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1599 warning ("load: unable to reconstruct object inheritance");
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1600 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1601 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1602 if (load_path::find_method (c_name, "loadobj") != std::string ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1603 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1604 octave_value in = new octave_class (*this);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1605 octave_value_list tmp = feval ("loadobj", in, 1);
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1606
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1607 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1608 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1609 map = tmp(0).map_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1610 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1611 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1612 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1613 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1614 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1615 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1616 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1617 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1618 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1619
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1620 error_cleanup:
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1621 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1622 H5Dclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1623
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1624 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1625 H5Gclose (group_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1626
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1627 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1628 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1629
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1630 #endif
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1631
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1632 mxArray *
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1633 octave_class::as_mxArray (void) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1634 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1635 gripe_wrong_type_arg ("octave_class::as_mxArray ()", type_name ());
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1636
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1637 return 0;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1638 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1639
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1640 bool
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9580 diff changeset	1641 octave_class::in_class_method (void)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1642 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1643 octave_function *fcn = octave_call_stack::current ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1644
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1645 return (fcn
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1646 && (fcn->is_class_method ()
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1647 \|\| fcn->is_class_constructor ()
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1648 \|\| fcn->is_private_function_of_class (class_name ()))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1649 && find_parent_class (fcn->dispatch_class ()));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1650 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1651
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1652 octave_class::exemplar_info::exemplar_info (const octave_value& obj)
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1653 : field_names (), parent_class_names ()
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1654 {
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1655 if (obj.is_object ())
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1656 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1657 octave_map m = obj.map_value ();
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1658 field_names = m.keys ();
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1659
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1660 parent_class_names = obj.parent_class_name_list ();
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1661 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1662 else
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1663 error ("invalid call to exmplar_info constructor");
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1664 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1665
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1666
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1667 // A map from class names to lists of fields.
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1668 std::map<std::string, octave_class::exemplar_info> octave_class::exemplar_map;
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1669
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1670 bool
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1671 octave_class::exemplar_info::compare (const octave_value& obj) const
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1672 {
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1673 bool retval = true;
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1674
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1675 if (obj.is_object ())
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1676 {
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1677 if (nfields () == obj.nfields ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1678 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1679 octave_map obj_map = obj.map_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1680 string_vector obj_fnames = obj_map.keys ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1681 string_vector fnames = fields ();
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1682
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1683 for (octave_idx_type i = 0; i < nfields (); i++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1684 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1685 if (obj_fnames[i] != fnames[i])
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1686 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1687 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1688 error ("mismatch in field names");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1689 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1690 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1691 }
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1692
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1693 if (nparents () == obj.nparents ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1694 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1695 std::list<std::string> obj_parents
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1696 = obj.parent_class_name_list ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1697 std::list<std::string> pnames = parents ();
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1698
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1699 std::list<std::string>::const_iterator p = obj_parents.begin ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1700 std::list<std::string>::const_iterator q = pnames.begin ();
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1701
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1702 while (p != obj_parents.end ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1703 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1704 if (p++ != q++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1705 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1706 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1707 error ("mismatch in parent classes");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1708 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1709 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1710 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1711 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1712 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1713 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1714 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1715 error ("mismatch in number of parent classes");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1716 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1717 }
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1718 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1719 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1720 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1721 error ("mismatch in number of fields");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1722 }
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1723 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1724 else
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1725 {
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1726 retval = false;
9206 5f36c6c9be13 Handle loading of objects with inheritance from MAT files. Robert T. Short <octave@phaselockedsystems.com> parents: 9190 diff changeset	1727 error ("invalid comparison of class exemplar to non-class object");
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1728 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1729
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1730 return retval;
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1731 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1732
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1733 DEFUN (class, args, ,
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1734 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10768 diff changeset	1735 @deftypefn {Built-in Function} {} class (@var{expr})\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1736 @deftypefnx {Built-in Function} {} class (@var{s}, @var{id})\n\
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1737 @deftypefnx {Built-in Function} {} class (@var{s}, @var{id}, @var{p}, @dots{})\n\
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1738 Return the class of the expression @var{expr} or create a class with\n\
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1739 fields from structure @var{s} and name (string) @var{id}. Additional\n\
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1740 arguments name a list of parent classes from which the new class is\n\
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1741 derived.\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1742 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1743 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1744 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1745
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1746 int nargin = args.length ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1747
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1748 if (nargin == 0)
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1749 print_usage ();
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1750 else if (nargin == 1)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1751 retval = args(0).class_name ();
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1752 else
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1753 {
10272 272179888089 Fclass: improve argument decoding John W. Eaton <jwe@octave.org> parents: 10204 diff changeset	1754 octave_function *fcn = octave_call_stack::caller ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1755
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1756 std::string id = args(1).string_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1757
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1758 if (! error_state)
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1759 {
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1760 if (fcn)
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1761 {
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1762 if (fcn->is_class_constructor (id) \|\| fcn->is_class_method (id))
10272 272179888089 Fclass: improve argument decoding John W. Eaton <jwe@octave.org> parents: 10204 diff changeset	1763 {
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1764 octave_map m = args(0).map_value ();
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1765
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1766 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1767 {
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1768 if (nargin == 2)
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1769 retval = octave_value (new octave_class (m, id));
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1770 else
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1771 {
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1772 octave_value_list parents = args.slice (2, nargin-2);
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1773
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1774 retval
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1775 = octave_value (new octave_class (m, id, parents));
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1776 }
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1777
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1778 if (! error_state)
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1779 {
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1780 octave_class::exemplar_const_iterator it
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1781 = octave_class::exemplar_map.find (id);
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1782
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1783 if (it == octave_class::exemplar_map.end ())
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1784 octave_class::exemplar_map[id]
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1785 = octave_class::exemplar_info (retval);
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1786 else if (! it->second.compare (retval))
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1787 error ("class: object of class `%s' does not match previously constructed objects",
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1788 id.c_str ());
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1789 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1790 }
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1791 else
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1792 error ("class: expecting structure as first argument");
10272 272179888089 Fclass: improve argument decoding John W. Eaton <jwe@octave.org> parents: 10204 diff changeset	1793 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1794 else
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1795 error ("class: `%s' is invalid as a class name in this context",
883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1796 id.c_str ());
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1797 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1798 else
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1799 error ("class: invalid call from outside class constructor or method");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1800 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1801 else
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1802 error ("class: expecting character string as second argument");
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1803 }
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1804
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1805 return retval;
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1806 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1807
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1808 DEFUN (__isa_parent__, args, ,
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1809 "-- texinfo --\n\
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1810 @deftypefn {Built-in Function} {} __isa_parent__ (@var{class}, @var{name})\n\
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1811 Undocumented internal function.\n\
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1812 @end deftypefn")
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1813 {
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1814 octave_value retval = false;
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1815
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1816 if (args.length () == 2)
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1817 {
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1818 octave_value cls = args(0);
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1819 octave_value nm = args(1);
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1820
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1821 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1822 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1823 if (cls.find_parent_class (nm.string_value ()))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1824 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1825 }
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1826 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1827 error ("__isa_parent__: expecting arguments to be character strings");
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1828 }
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1829 else
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1830 print_usage ();
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1831
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1832 return retval;
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1833 }
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1834
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1835 DEFUN (__parent_classes__, args, ,
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1836 "-- texinfo --\n\
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1837 @deftypefn {Built-in Function} {} __parent_classes__ (@var{x})\n\
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1838 Undocumented internal function.\n\
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1839 @end deftypefn")
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1840 {
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1841 octave_value retval = Cell ();
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1842
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1843 if (args.length () == 1)
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1844 {
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1845 octave_value arg = args(0);
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1846
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1847 if (arg.is_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1848 retval = Cell (arg.parent_class_names ());
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1849 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1850 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1851 print_usage ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1852
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1853 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1854 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1855
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1856 DEFUN (isobject, args, ,
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1857 "-- texinfo --\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1858 @deftypefn {Built-in Function} {} isobject (@var{x})\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1859 Return true if @var{x} is a class object.\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11220 diff changeset	1860 @seealso{class, typeinfo, isa, ismethod}\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1861 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1862 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1863 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1864
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1865 if (args.length () == 1)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1866 retval = args(0).is_object ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1867 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1868 print_usage ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1869
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1870 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1871 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1872
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1873 DEFUN (ismethod, args, ,
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1874 "-- texinfo --\n\
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1875 @deftypefn {Built-in Function} {} ismethod (@var{x}, @var{method})\n\
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1876 Return true if @var{x} is a class object and the string @var{method}\n\
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1877 is a method of this class.\n\
11431 0d9640d755b1 Improve docstrings for all isXXX functions. Rik <octave@nomad.inbox5.com> parents: 11220 diff changeset	1878 @seealso{isobject}\n\
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1879 @end deftypefn")
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1880 {
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1881 octave_value retval;
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1882
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1883 if (args.length () == 2)
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1884 {
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1885 octave_value arg = args(0);
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1886
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1887 std::string class_name;
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1888
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1889 if (arg.is_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1890 class_name = arg.class_name ();
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1891 else if (arg.is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1892 class_name = arg.string_value ();
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1893 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1894 error ("ismethod: expecting object or class name as first argument");
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1895
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1896 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1897 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1898 std::string method = args(1).string_value ();
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1899
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1900 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1901 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1902 if (load_path::find_method (class_name, method) != std::string ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1903 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1904 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1905 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1906 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1907 }
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1908 }
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1909 else
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1910 print_usage ();
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1911
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1912 return retval;
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1913 }
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1914
8746 5dd06f19e9be handle commands in the lexer John W. Eaton <jwe@octave.org> parents: 8658 diff changeset	1915 DEFUN (methods, args, nargout,
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1916 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10768 diff changeset	1917 @deftypefn {Built-in Function} {} methods (@var{x})\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1918 @deftypefnx {Built-in Function} {} methods (\"classname\")\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1919 Return a cell array containing the names of the methods for the\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1920 object @var{x} or the named class.\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1921 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1922 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1923 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1924
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1925 if (args.length () == 1)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1926 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1927 octave_value arg = args(0);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1928
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1929 std::string class_name;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1930
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1931 if (arg.is_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1932 class_name = arg.class_name ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1933 else if (arg.is_string ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1934 class_name = arg.string_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1935 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1936 error ("methods: expecting object or class name as argument");
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1937
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1938 if (! error_state)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1939 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1940 string_vector sv = load_path::methods (class_name);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1941
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1942 if (nargout == 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1943 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1944 octave_stdout << "Methods for class " << class_name << ":\n\n";
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1945
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1946 sv.list_in_columns (octave_stdout);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1947
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1948 octave_stdout << std::endl;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1949 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1950 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1951 retval = Cell (sv);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1952 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1953 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1954 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1955 print_usage ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1956
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1957 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1958 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1959
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1960 static bool
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1961 is_built_in_class (const std::string& cn)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1962 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1963 static std::set<std::string> built_in_class_names;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1964
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1965 if (built_in_class_names.empty ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1966 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1967 built_in_class_names.insert ("double");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1968 built_in_class_names.insert ("single");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1969 built_in_class_names.insert ("cell");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1970 built_in_class_names.insert ("struct");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1971 built_in_class_names.insert ("logical");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1972 built_in_class_names.insert ("char");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1973 built_in_class_names.insert ("function handle");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1974 built_in_class_names.insert ("int8");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1975 built_in_class_names.insert ("uint8");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1976 built_in_class_names.insert ("int16");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1977 built_in_class_names.insert ("uint16");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1978 built_in_class_names.insert ("int32");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1979 built_in_class_names.insert ("uint32");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1980 built_in_class_names.insert ("int64");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1981 built_in_class_names.insert ("uint64");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1982 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1983
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1984 return built_in_class_names.find (cn) != built_in_class_names.end ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1985 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1986
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1987 DEFUN (superiorto, args, ,
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1988 "-- texinfo --\n\
8219 f8a885ccd5b4 allow multiple args for inferiorto and superiorto David Bateman <dbateman@free.fr> parents: 8212 diff changeset	1989 @deftypefn {Built-in Function} {} superiorto (@var{class_name}, @dots{})\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1990 When called from a class constructor, mark the object currently\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1991 constructed as having a higher precedence than @var{class_name}.\n\
8219 f8a885ccd5b4 allow multiple args for inferiorto and superiorto David Bateman <dbateman@free.fr> parents: 8212 diff changeset	1992 More that one such class can be specified in a single call.\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1993 This function may only be called from a class constructor.\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1994 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1995 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1996 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1997
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1998 octave_function *fcn = octave_call_stack::caller ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1999
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2000 if (fcn && fcn->is_class_constructor ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2001 {
8219 f8a885ccd5b4 allow multiple args for inferiorto and superiorto David Bateman <dbateman@free.fr> parents: 8212 diff changeset	2002 for (int i = 0; i < args.length(); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2003 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2004 std::string class_name = args(i).string_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2005
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2006 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2007 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2008 if (! is_built_in_class (class_name))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2009 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2010 std::string this_class_name = fcn->name ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2011
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2012 if (! symbol_table::set_class_relationship (this_class_name,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2013 class_name))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2014 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2015 error ("superiorto: precedence already set for %s and %s",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2016 this_class_name.c_str (), class_name.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2017 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2018 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2019 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2020 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2021 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2022 // User defined classes always have higher precedence
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2023 // than built-in classes.
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2024 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2025 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2026 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2027 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2028 error ("superiorto: expecting argument to be class name");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2029 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2030 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2031 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2032 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2033 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2034 error ("superiorto: invalid call from outside class constructor");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2035
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2036 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2037 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2038
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2039 DEFUN (inferiorto, args, ,
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2040 "-- texinfo --\n\
8219 f8a885ccd5b4 allow multiple args for inferiorto and superiorto David Bateman <dbateman@free.fr> parents: 8212 diff changeset	2041 @deftypefn {Built-in Function} {} inferiorto (@var{class_name}, @dots{})\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2042 When called from a class constructor, mark the object currently\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2043 constructed as having a lower precedence than @var{class_name}.\n\
8219 f8a885ccd5b4 allow multiple args for inferiorto and superiorto David Bateman <dbateman@free.fr> parents: 8212 diff changeset	2044 More that one such class can be specified in a single call.\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2045 This function may only be called from a class constructor.\n\
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2046 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2047 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2048 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2049
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2050 octave_function *fcn = octave_call_stack::caller ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2051
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2052 if (fcn && fcn->is_class_constructor ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2053 {
8219 f8a885ccd5b4 allow multiple args for inferiorto and superiorto David Bateman <dbateman@free.fr> parents: 8212 diff changeset	2054 for (int i = 0; i < args.length(); i++)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2055 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2056 std::string class_name = args(i).string_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2057
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2058 if (! error_state)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2059 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2060 if (! is_built_in_class (class_name))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2061 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2062 std::string this_class_name = fcn->name ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2063
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2064 symbol_table::set_class_relationship (class_name,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2065 this_class_name);
7972 5bf4e2c13ed8 make superiorto and inferiorto work John W. Eaton <jwe@octave.org> parents: 7960 diff changeset	2066
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2067 if (! symbol_table::set_class_relationship (this_class_name,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2068 class_name))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2069 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2070 error ("inferiorto: precedence already set for %s and %s",
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2071 this_class_name.c_str (), class_name.c_str ());
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2072 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2073 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2074 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2075 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2076 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2077 error ("inferiorto: cannot give user-defined class lower precedence than built-in class");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2078 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2079 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2080 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2081 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2082 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2083 error ("inferiorto: expecting argument to be class name");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2084 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2085 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	2086 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2087 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2088 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2089 error ("inferiorto: invalid call from outside class constructor");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2090
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2091 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2092 }

Mercurial > octave-nkf

annotate src/ov-class.cc @ 12127:b83162e8f402