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

annotate src/ov-class.cc @ 10742:604e13a89c7f

initial code for structs rewrite

author	Jaroslav Hajek <highegg@gmail.com>
date	Tue, 22 Jun 2010 15:22:36 +0200
parents	9c4daf174387
children	8a868004a437

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

Mercurial > hg > octave-lyh

annotate src/ov-class.cc @ 10742:604e13a89c7f