octave-nkf: libinterp/octave-value/ov-class.cc annotate

annotate libinterp/octave-value/ov-class.cc @ 15467:049e8bbff782

maint: periodic merge of stable to default

author	John W. Eaton <jwe@octave.org>
date	Mon, 01 Oct 2012 18:30:44 -0400
parents	src/ov-class.cc@d174210ce1ec src/ov-class.cc@2fc554ffbc28
children	42cff4396de4

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

Mercurial > hg > octave-nkf

annotate libinterp/octave-value/ov-class.cc @ 15467:049e8bbff782