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

annotate libinterp/octave-value/ov-class.cc @ 21200:fcac5dbbf9ed

maint: Indent #ifdef blocks in libinterp. * builtins.h, Cell.cc, __contourc__.cc, __dispatch__.cc, __dsearchn__.cc, __ichol__.cc, __ilu__.cc, __lin_interpn__.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, besselj.cc, betainc.cc, bitfcns.cc, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, cellfun.cc, colloc.cc, comment-list.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, defaults.in.h, defun-dld.h, defun.cc, defun.h, det.cc, dirfns.cc, display.cc, dlmread.cc, dot.cc, dynamic-ld.cc, eig.cc, ellipj.cc, error.cc, errwarn.cc, event-queue.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc, gl-render.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, gripes.cc, hash.cc, help.cc, hess.cc, hex2num.cc, input.cc, inv.cc, jit-ir.cc, jit-typeinfo.cc, jit-util.cc, jit-util.h, kron.cc, load-path.cc, load-save.cc, lookup.cc, ls-ascii-helper.cc, ls-hdf5.cc, ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc, ls-oct-text.h, ls-utils.cc, ls-utils.h, lsode.cc, lu.cc, luinc.cc, mappers.cc, matrix_type.cc, max.cc, mex.h, mexproto.h, mgorth.cc, nproc.cc, oct-errno.in.cc, oct-fstrm.cc, oct-hdf5-types.cc, oct-hdf5.h, oct-hist.cc, oct-iostrm.cc, oct-lvalue.cc, oct-map.cc, oct-prcstrm.cc, oct-procbuf.cc, oct-stream.cc, oct-strstrm.cc, octave-link.cc, ordschur.cc, pager.cc, pinv.cc, pr-output.cc, procstream.cc, profiler.cc, psi.cc, pt-jit.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc, spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc, syscalls.cc, sysdep.cc, sysdep.h, time.cc, toplev.cc, tril.cc, tsearch.cc, txt-eng-ft.cc, txt-eng.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc, xdiv.cc, xnorm.cc, xpow.cc, zfstream.cc, __delaunayn__.cc, __eigs__.cc, __fltk_uigetfile__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc, audiodevinfo.cc, audioread.cc, ccolamd.cc, chol.cc, colamd.cc, convhulln.cc, dmperm.cc, fftw.cc, oct-qhull.h, qr.cc, symbfact.cc, symrcm.cc, oct-conf.in.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc, ov-ch-mat.cc, ov-class.cc, ov-classdef.cc, ov-colon.cc, ov-complex.cc, ov-cs-list.cc, ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-dld-fcn.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-fcn.cc, ov-float.cc, ov-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-int16.cc, ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-java.cc, ov-lazy-idx.cc, ov-mex-fcn.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, ov-struct.cc, ov-typeinfo.cc, ov-uint16.cc, ov-uint32.cc, ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov.cc, ovl.cc, octave.cc, op-b-b.cc, op-b-bm.cc, op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc, op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc, op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc, op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc, op-dm-template.cc, op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc, op-fcdm-fdm.cc, op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc, op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc, op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc, op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int-conv.cc, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc, op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-pm-template.cc, op-range.cc, op-s-cm.cc, op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc, op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc, op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc, op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc, pt-arg-list.cc, pt-array-list.cc, pt-assign.cc, pt-binop.cc, pt-bp.cc, pt-cbinop.cc, pt-cell.cc, pt-check.cc, pt-classdef.cc, pt-cmd.cc, pt-colon.cc, pt-colon.h, pt-const.cc, pt-decl.cc, pt-eval.cc, pt-except.cc, pt-exp.cc, pt-fcn-handle.cc, pt-funcall.cc, pt-id.cc, pt-idx.cc, pt-jump.cc, pt-loop.cc, pt-mat.cc, pt-misc.cc, pt-pr-code.cc, pt-select.cc, pt-stmt.cc, pt-unop.cc, pt.cc, token.cc, Array-jit.cc, Array-os.cc, Array-sym.cc, Array-tc.cc, version.cc: Indent #ifdef blocks in libinterp.

author	Rik <rik@octave.org>
date	Fri, 05 Feb 2016 16:29:08 -0800
parents	228b65504557
children	2cf8bc5c7017

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
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19598 diff changeset	3 Copyright (C) 2007-2015 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
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21129 diff changeset	25 # include <config.h>
7338 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"
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	39 #include "errwarn.h"
7338 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"
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	42 #include "ls-oct-text.h"
7338 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"
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	47 #include "oct-hdf5.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	48 #include "ov-class.h"
15812 83bf6fd9e46d ov-class.cc: Fix compilation when HAVE_JAVA is false. Rik <rik@octave.org> parents: 15811 diff changeset	49 #ifdef HAVE_JAVA
21200 fcac5dbbf9ed maint: Indent #ifdef blocks in libinterp. Rik <rik@octave.org> parents: 21129 diff changeset	50 # include "ov-java.h"
15812 83bf6fd9e46d ov-class.cc: Fix compilation when HAVE_JAVA is false. Rik <rik@octave.org> parents: 15811 diff changeset	51 #endif
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	52 #include "ov-fcn.h"
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	53 #include "ov-usr-fcn.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	54 #include "pager.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	55 #include "parse.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	56 #include "pr-output.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	57 #include "toplev.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	58 #include "unwind-prot.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	59 #include "variables.h"
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
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	62 int octave_class::t_id (-1);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	63
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	64 const std::string octave_class::t_name ("class");
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 void
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	67 octave_class::register_type (void)
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 t_id = octave_value_typeinfo::register_type
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	70 (octave_class::t_name, "<unknown>",
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	71 octave_value (new octave_class ()));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	72 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	73
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	74 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	75 const octave_value_list& parents)
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	76 : 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	77 {
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	78 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	79
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	80 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	81 {
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	82 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	83
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	84 if (! parent.is_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	85 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	86
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	87 std::string pcnm = parent.class_name ();
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	88
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	89 if (find_parent_class (pcnm))
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	90 error ("duplicate class in parent tree");
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	91
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	92 parent_list.push_back (pcnm);
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	93
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	94 octave_idx_type nel = map.numel ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	95 octave_idx_type p_nel = parent.numel ();
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	96
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	97 if (nel == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	98 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	99 if (p_nel == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	100 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	101 // No elements in MAP or the parent class object,
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	102 // so just add the field name.
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	103
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	104 map.assign (pcnm, Cell (map.dims ()));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	105 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	106 else if (p_nel == 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	107 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	108 if (map.nfields () == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	109 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	110 // No elements or fields in MAP, but the
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	111 // parent is class object with one element.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	112 // Resize to match size of parent class and
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	113 // make the parent a field in MAP.
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	114
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	115 map.resize (parent.dims ());
13781 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 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	118 }
c7fac37a2afc class: correctly handle parents when structure array has more than one element John W. Eaton <jwe@octave.org> parents: 13695 diff changeset	119 else
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	120 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	121 // No elements in MAP, but we have at least
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	122 // one field. So don't resize, just add the
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	123 // field name.
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	124
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	125 map.assign (pcnm, Cell (map.dims ()));
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	126 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	127 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	128 else if (map.nfields () == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	129 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	130 // No elements or fields in MAP and more than one
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	131 // element in the parent class object, so we can
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	132 // resize MAP to match parent dimsenions, then
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	133 // distribute the elements of the parent object to
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	134 // the elements of MAP.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	135
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	136 dim_vector parent_dims = parent.dims ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	137
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	138 map.resize (parent_dims);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	139
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	140 Cell c (parent_dims);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	141
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	142 octave_map pmap = parent.map_value ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	143
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	144 std::list<std::string> plist
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	145 = parent.parent_class_name_list ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	146
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	147 for (octave_idx_type i = 0; i < p_nel; i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	148 c(i) = octave_value (pmap.index (i), pcnm, plist);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	149
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	150 map.assign (pcnm, c);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	151 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	152 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	153 error ("class: parent class dimension mismatch");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	154 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	155 else if (nel == 1 && p_nel == 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	156 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	157 // Simple assignment.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	158
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	159 map.assign (pcnm, parent);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	160 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	161 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	162 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	163 if (p_nel == 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	164 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	165 // Broadcast the scalar parent class object to
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	166 // each element of MAP.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	167
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	168 Cell pcell (map.dims (), parent);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	169
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	170 map.assign (pcnm, pcell);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	171 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	172 else if (nel == p_nel)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	173 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	174 // FIXME: is there a better way to do this?
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	175
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	176 // The parent class object has the same number of
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	177 // elements as the map we are using to create the
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	178 // new object, so distribute those elements to
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	179 // each element of the new object by first
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	180 // splitting the elements of the parent class
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	181 // object into a cell array with one element per
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	182 // cell. Then do the assignment all at once.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	183
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	184 Cell c (parent.dims ());
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	185
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	186 octave_map pmap = parent.map_value ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	187
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	188 std::list<std::string> plist
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	189 = parent.parent_class_name_list ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	190
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	191 for (octave_idx_type i = 0; i < p_nel; i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	192 c(i) = octave_value (pmap.index (i), pcnm, plist);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	193
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	194 map.assign (pcnm, c);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	195 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	196 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	197 error ("class: parent class dimension mismatch");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	198 }
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	199 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	200
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	201 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	202 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	203
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	204 octave_base_value *
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	205 octave_class::unique_clone (void)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	206 {
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	207 if (count == obsolete_copies)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	208 {
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	209 // 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	210 count++;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	211 return this;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	212 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	213 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	214 {
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	215 // 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	216 if (count < obsolete_copies)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	217 obsolete_copies = 0;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	218
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	219 return clone ();
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	220 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	221 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	222
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	223 std::string
f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	224 octave_class::get_current_method_class (void)
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	225 {
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	226 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	227
12620 6f3f18957851 ov-class.cc: Fix segfault when assigning class to struct object (bug #33014) David Bateman <dbateman@free.fr> parents: 12483 diff changeset	228 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	229 {
6f3f18957851 ov-class.cc: Fix segfault when assigning class to struct object (bug #33014) David Bateman <dbateman@free.fr> parents: 12483 diff changeset	230 octave_function *fcn = octave_call_stack::current ();
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	231
12620 6f3f18957851 ov-class.cc: Fix segfault when assigning class to struct object (bug #33014) David Bateman <dbateman@free.fr> parents: 12483 diff changeset	232 // 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	233 // 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	234 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	235 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	236 }
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	237
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	238 return retval;
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	239 }
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	240
21040 3e7cfee5f786 maint: Rename attributes GCC_ATTR_XXX to OCTAVE_XXX. Rik <rik@octave.org> parents: 21029 diff changeset	241 OCTAVE_NORETURN static
21029 e3b3bb522d62 maint: Move GCC_ attributes to start of declaration for future compatibility. Rik <rik@octave.org> parents: 21024 diff changeset	242 void
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	243 err_invalid_index1 (void)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	244 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	245 error ("invalid index for class");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	246 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	247
21040 3e7cfee5f786 maint: Rename attributes GCC_ATTR_XXX to OCTAVE_XXX. Rik <rik@octave.org> parents: 21029 diff changeset	248 OCTAVE_NORETURN static
21029 e3b3bb522d62 maint: Move GCC_ attributes to start of declaration for future compatibility. Rik <rik@octave.org> parents: 21024 diff changeset	249 void
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	250 err_invalid_index_for_assignment (void)
9529 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
21040 3e7cfee5f786 maint: Rename attributes GCC_ATTR_XXX to OCTAVE_XXX. Rik <rik@octave.org> parents: 21029 diff changeset	255 OCTAVE_NORETURN static
21029 e3b3bb522d62 maint: Move GCC_ attributes to start of declaration for future compatibility. Rik <rik@octave.org> parents: 21024 diff changeset	256 void
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	257 err_invalid_index_type (const std::string& nm, char t)
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	258 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	259 error ("%s cannot be indexed with %c", nm.c_str (), t);
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
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	262 Cell
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	263 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	264 {
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	265 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	266
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	267 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	268
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	269 // 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	270 // 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	271
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	272 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	273
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	274 if (obvp == 0)
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	275 error ("malformed class");
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	276
10932 3a778233e4fb fix typo in 10926:f687bd17ce21 Jaroslav Hajek <highegg@gmail.com> parents: 10926 diff changeset	277 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	278
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	279 std::string nm = idx(0).xstring_value ("invalid index for class");
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	280
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	281 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	282
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	283 if (p == my_map.end ())
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	284 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	285
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	286 return 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	287 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	288
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	289 Matrix
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	290 octave_class::size (void)
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	291 {
9792 384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	292 if (in_class_method () \|\| called_from_builtin ())
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	293 return octave_base_value::size ();
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	294
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	295 Matrix retval (1, 2, 1.0);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	296 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	297
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	298 if (meth.is_defined ())
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	299 {
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	300 count++;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	301 octave_value_list args (1, octave_value (this));
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	302
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	303 octave_value_list lv = feval (meth.function_value (), args, 1);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	304 if (lv.length () <= 0
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	305 \|\| ! lv(0).is_matrix_type () \|\| ! lv(0).dims ().is_vector ())
9775 9d9f858849c7 Allow and ignore extra outargs from user-defined size methods David Grundberg <davidg@cs.umu.se> parents: 9774 diff changeset	306 error ("@%s/size: invalid return value", class_name ().c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	307
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	308 retval = lv(0).matrix_value ();
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	309 }
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	310 else
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	311 {
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	312 dim_vector dv = dims ();
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	313
13784 0bbe319bf26b octave_class::size: return matrix with correct dimensions John W. Eaton <jwe@octave.org> parents: 13781 diff changeset	314 int nd = dv.length ();
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	315
13784 0bbe319bf26b octave_class::size: return matrix with correct dimensions John W. Eaton <jwe@octave.org> parents: 13781 diff changeset	316 retval.resize (1, nd);
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	317
13784 0bbe319bf26b octave_class::size: return matrix with correct dimensions John W. Eaton <jwe@octave.org> parents: 13781 diff changeset	318 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	319 retval(i) = dv(i);
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	320 }
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	321
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	322 return retval;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	323 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	324
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	325 octave_idx_type
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	326 octave_class::numel (const octave_value_list& idx)
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	327 {
9792 384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	328 if (in_class_method () \|\| called_from_builtin ())
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	329 return octave_base_value::numel (idx);
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	330
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	331 octave_idx_type retval = -1;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	332 const std::string cn = class_name ();
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	333
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	334 octave_value meth = symbol_table::find_method ("numel", cn);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	335
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	336 if (meth.is_defined ())
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	337 {
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	338 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	339
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	340 count++;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	341 args(0) = octave_value (this);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	342
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	343 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	344 args(i+1) = idx(i);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	345
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	346 octave_value_list lv = feval (meth.function_value (), args, 1);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	347 if (lv.length () != 1 \|\| ! lv(0).is_scalar_type ())
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	348 error ("@%s/numel: invalid return value", cn.c_str ());
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	349
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	350 retval = lv(0).idx_type_value (true);
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	351 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	352 else
10106 edbe47bc0f88 make numel query more matlab compatible Jaroslav Hajek <highegg@gmail.com> parents: 10066 diff changeset	353 retval = octave_base_value::numel (idx);
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	354
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	355 return retval;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	356 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	357
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	358 octave_value_list
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	359 octave_class::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	360 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	361 int nargout)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	362 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	363 octave_value_list retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	364
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	365 if (in_class_method () \|\| called_from_builtin ())
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	366 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	367 // FIXME: this block of code is the same as the body of
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	368 // octave_struct::subsref. Maybe it could be shared instead of
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	369 // duplicated.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	370
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	371 int skip = 1;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	372
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	373 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	374 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	375 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	376 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	377 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	378 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	379 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	380 octave_value_list key_idx = *++p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	381
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	382 Cell tmp = dotref (key_idx);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	383
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	384 Cell t = tmp.index (idx.front ());
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	385
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	386 retval(0) = (t.numel () == 1) ? t(0)
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	387 : octave_value (t, true);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	388
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	389 // We handled two index elements, so tell
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	390 // next_subsref to skip both of them.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	391
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	392 skip++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	393 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	394 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	395 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	396 c_name, parent_list);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	397 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	398 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	399
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	400 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	401 {
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	402 if (map.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	403 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	404 Cell t = dotref (idx.front ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	405
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	406 retval(0) = (t.numel () == 1) ? t(0) : octave_value (t, true);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	407 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	408 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	409 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	410
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	411 case '{':
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	412 err_invalid_index_type (type_name (), type[0]);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	413 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	414
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	415 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	416 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	417 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	418
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	419 // FIXME: perhaps there should be an
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	420 // octave_value_list::next_subsref member function? See also
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	421 // octave_user_function::subsref.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	422
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	423 if (idx.size () > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	424 retval = retval(0).next_subsref (nargout, type, idx, skip);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	425 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	426 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	427 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	428 octave_value meth = symbol_table::find_method ("subsref", class_name ());
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	429
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	430 if (meth.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	431 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	432 octave_value_list args;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	433
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	434 args(1) = make_idx_args (type, idx, "subsref");
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	435
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	436 count++;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	437 args(0) = octave_value (this);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	438
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	439 // 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	440 // 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	441 // 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	442 // 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	443 // 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	444 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	445 \|\| (type.length () > 1 && type[0] == '('
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	446 && type[1] == '.'));
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	447
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	448 int true_nargout = nargout;
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	449
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	450 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	451 {
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	452 // 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	453 octave_value_list tmp;
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	454 if (type[0] != '.') tmp = idx.front ();
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	455 true_nargout = numel (tmp);
9331 a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	456 }
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	457
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	458 retval = feval (meth.function_value (), args, true_nargout);
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	459
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	460 // 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	461 // 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	462 // rvalue1 calls.
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	463 if (retval.length () > 1)
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	464 retval = octave_value (retval, true);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	465 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	466 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	467 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	468 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	469 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	470 parent_list);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	471 else
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	472 err_invalid_index1 ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	473 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	474 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	475
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	476 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	477 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	478
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	479 octave_value
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	480 octave_class::numeric_conv (const Cell& val, const std::string& type)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	481 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	482 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	483
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	484 if (val.numel () != 1)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	485 err_invalid_index_for_assignment ();
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	486
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	487 retval = val(0);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	488
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	489 if (type.length () > 0 && type[0] == '.' && ! retval.is_map ())
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	490 retval = octave_map ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	491
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	492 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	493 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	494
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	495 octave_value
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	496 octave_class::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	497 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	498 const octave_value& rhs)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	499 {
12171 d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	500 count++;
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	501 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	502 }
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	503
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	504 octave_value
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	505 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	506 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	507 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	508 {
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	509 // 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	510 // 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	511 // undefined.
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	512
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	513 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	514 }
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	515
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	516 octave_value
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	517 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	518 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	519 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	520 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	521 {
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	522 octave_value retval;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	523
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	524 if (! (in_class_method () \|\| called_from_builtin ()))
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	525 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	526 octave_value meth = symbol_table::find_method ("subsasgn", class_name ());
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	527
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	528 if (meth.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	529 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	530 octave_value_list args;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	531
9333 3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	532 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	533 {
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	534 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	535 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	536 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	537 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	538 }
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	539 else
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	540 args(2) = rhs;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	541
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	542 args(1) = make_idx_args (type, idx, "subsasgn");
12171 d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	543 args(0) = obj;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	544
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	545 // Now comes the magic. Count copies with me:
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	546 // 1. myself (obsolete)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	547 // 2. the copy inside args (obsolete)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	548 // 3. the copy in method's symbol table (working)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	549 // ... possibly more (not obsolete).
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	550 //
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	551 // 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	552 // 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	553 // to the optimization.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	554 // 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	555 // 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	556 // optimization won't work.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	557
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	558 octave_value_list tmp;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	559
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	560 if (obsolete_copies == 0 && meth.is_user_function ()
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	561 && meth.user_function_value ()->subsasgn_optimization_ok ())
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	562 {
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	563 unwind_protect frame;
2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	564 frame.protect_var (obsolete_copies);
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	565 obsolete_copies = 2;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	566
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	567 tmp = feval (meth.function_value (), args);
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	568 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	569 else
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	570 tmp = feval (meth.function_value (), args);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	571
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	572 // FIXME: Should the subsasgn method be able to return
7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	573 // more than one value?
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	574
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	575 if (tmp.length () > 1)
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	576 error ("@%s/subsasgn returned more than one value",
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	577 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	578
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	579 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	580 retval = tmp(0);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	581
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	582 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	583 }
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8782 diff changeset	584 }
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8782 diff changeset	585
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	586 // 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	587 // attempting to do the indexed assignment.
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	588
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	589 std::string method_class = get_current_method_class ();
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	590
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	591 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	592 if (obvp != this)
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	593 {
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	594
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	595 if (! obvp)
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	596 error ("malformed class");
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	597
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	598 obvp->subsasgn (type, idx, rhs);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	599
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	600 count++;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	601 retval = octave_value (this);
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	602
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	603 return retval;
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	604 }
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	605
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	606 // FIXME: this block of code is the same as the body of
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	607 // octave_struct::subsasgn. Maybe it could be shared instead of
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	608 // duplicated.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	609
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	610 int n = type.length ();
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	611
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	612 octave_value t_rhs = rhs;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	613
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	614 if (n > 1 && ! (type.length () == 2 && type[0] == '(' && type[1] == '.'))
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	615 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	616 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	617 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	618 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	619 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	620 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	621 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	622 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	623 octave_value_list t_idx = *p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	624
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	625 octave_value_list key_idx = *++p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	626
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	627 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	628
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	629 std::string key = key_idx(0).xstring_value ("invalid index for class assignment");
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	630
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	631 octave_value u;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	632
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	633 if (! map.contains (key))
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	634 u = octave_value::empty_conv (type.substr (2), rhs);
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	635 else
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	636 {
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	637 Cell map_val = map.contents (key);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	638
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	639 Cell map_elt = map_val.index (idx.front (), true);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	640
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	641 u = numeric_conv (map_elt, type.substr (2));
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	642 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	643
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	644 std::list<octave_value_list> next_idx (idx);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	645
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	646 // We handled two index elements, so subsasgn to
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	647 // needs to skip both of them.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	648
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	649 next_idx.erase (next_idx.begin ());
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	650 next_idx.erase (next_idx.begin ());
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	651
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	652 u.make_unique ();
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	653
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	654 t_rhs = u.subsasgn (type.substr (2), next_idx, rhs);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	655 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	656 else
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	657 err_invalid_index_for_assignment ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	658 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	659 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	660
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	661 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	662 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	663 octave_value_list key_idx = idx.front ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	664
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	665 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	666
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	667 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	668
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	669 std::list<octave_value_list> next_idx (idx);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	670
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	671 next_idx.erase (next_idx.begin ());
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	672
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	673 std::string next_type = type.substr (1);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	674
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	675 Cell tmpc (1, 1);
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	676 octave_map::iterator pkey = map.seek (key);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	677 if (pkey != map.end ())
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	678 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	679 map.contents (pkey).make_unique ();
8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	680 tmpc = map.contents (pkey);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	681 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	682
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	683 // FIXME: better code reuse?
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	684 if (tmpc.numel () != 1)
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	685 err_indexed_cs_list ();
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	686
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	687 octave_value& tmp = tmpc(0);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	688
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	689 if (! tmp.is_defined () \|\| tmp.is_zero_by_zero ())
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	690 {
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	691 tmp = octave_value::empty_conv (next_type, rhs);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	692 tmp.make_unique (); // probably a no-op.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	693 }
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	694 else
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	695 // optimization: ignore copy still stored inside our map.
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	696 tmp.make_unique (1);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	697
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	698 t_rhs = tmp.subsasgn (next_type, next_idx, rhs);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	699 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	700 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	701
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	702 case '{':
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	703 err_invalid_index_type (type_name (), type[0]);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	704 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	705
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	706 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	707 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	708 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	709 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	710
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	711 switch (type[0])
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	712 {
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	713 case '(':
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	714 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	715 if (n > 1 && type[1] == '.')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	716 {
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	717 std::list<octave_value_list>::const_iterator p = idx.begin ();
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	718 octave_value_list key_idx = *++p;
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	719
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	720 assert (key_idx.length () == 1);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	721
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	722 std::string key = key_idx(0).xstring_value ("assignment to class element failed");
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	723
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	724 map.assign (idx.front (), key, t_rhs);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	725
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	726 count++;
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	727 retval = octave_value (this);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	728 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	729 else
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	730 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	731 if (t_rhs.is_object () \|\| t_rhs.is_map ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	732 {
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	733 octave_map rhs_map = t_rhs.xmap_value ("invalid class assignment");
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	734
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	735 map.assign (idx.front (), rhs_map);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	736
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	737 count++;
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	738 retval = octave_value (this);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	739 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	740 else
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	741 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	742 if (! t_rhs.is_empty ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	743 error ("invalid class assignment");
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	744
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	745 map.delete_elements (idx.front ());
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	746
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	747 count++;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	748 retval = octave_value (this);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	749 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	750 }
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	751 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	752 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	753
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	754 case '.':
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	755 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	756 octave_value_list key_idx = idx.front ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	757
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	758 assert (key_idx.length () == 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	759
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	760 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	761
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	762 if (t_rhs.is_cs_list ())
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	763 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	764 Cell tmp_cell = Cell (t_rhs.list_value ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	765
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	766 // The shape of the RHS is irrelevant, we just want
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	767 // the number of elements to agree and to preserve the
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	768 // shape of the left hand side of the assignment.
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	769
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	770 if (numel () == tmp_cell.numel ())
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	771 tmp_cell = tmp_cell.reshape (dims ());
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	772
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	773 map.setfield (key, tmp_cell);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	774 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	775 else
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	776 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	777 Cell tmp_cell(1, 1);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	778 tmp_cell(0) = t_rhs.storable_value ();
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	779 map.setfield (key, tmp_cell);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	780 }
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	781
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	782 count++;
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	783 retval = octave_value (this);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	784 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	785 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	786
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	787 case '{':
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	788 err_invalid_index_type (type_name (), type[0]);
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	789 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	790
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	791 default:
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	792 panic_impossible ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	793 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	794
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	795 return retval;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	796 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	797
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	798 idx_vector
18130 e473c4853afc enable non-integer ranges as indices by default and deprecate preference John W. Eaton <jwe@octave.org> parents: 18033 diff changeset	799 octave_class::index_vector (bool require_integers) const
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	800 {
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	801 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	802
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	803 if (! meth.is_defined ())
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	804 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	805 class_name ().c_str ());
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	806
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	807 octave_value_list args;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	808 args(0) = octave_value (new octave_class (map, c_name, parent_list));
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	809
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	810 octave_value_list tmp = feval (meth.function_value (), args, 1);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	811
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	812 if (tmp(0).is_object ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	813 error ("subsindex function must return a valid index vector");
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	814
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	815 // Index vector returned by subsindex is zero based
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	816 // (why this inconsistency Mathworks?), and so we must
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	817 // add one to the value returned as the index_vector method
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	818 // expects it to be one based.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	819 return do_binary_op (octave_value::op_add, tmp (0),
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	820 octave_value (1.0)).index_vector (require_integers);
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	821 }
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	822
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	823 size_t
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	824 octave_class::byte_size (void) const
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	825 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	826 // Neglect the size of the fieldnames.
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 size_t retval = 0;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	829
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	830 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	831 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	832 std::string key = map.key (p);
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 val = octave_value (map.contents (p));
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 retval += val.byte_size ();
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
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	839 return retval;
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
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	842 string_vector
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	843 octave_class::map_keys (void) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	844 {
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	845 err_wrong_type_arg ("octave_class::map_keys()", type_name ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	846 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	847
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	848 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	849 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	850 {
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	851 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	852
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	853 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	854 retval = this;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	855 else
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	856 {
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	857 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	858 pit != parent_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	859 pit++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	860 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	861 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	862
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	863 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	864
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	865 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	866
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	867 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	868
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	869 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	870
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	871 if (retval)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	872 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	873 }
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	874 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	875
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	876 return retval;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	877 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	878
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	879 octave_base_value *
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	880 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	881 {
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	882 octave_base_value* retval = 0;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	883
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	884 if (parent_class_name == class_name ())
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	885 retval = this;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	886 else
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	887 {
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	888 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	889 pit != parent_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	890 pit++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	891 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	892 octave_map::iterator smap = map.seek (*pit);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	893
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	894 Cell& tmp = map.contents (smap);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	895
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	896 octave_value& vtmp = tmp(0);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	897
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	898 octave_base_value *obvp = vtmp.internal_rep ();
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	899
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	900 // 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	901 retval = obvp->find_parent_class (parent_class_name);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	902
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	903 if (retval)
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	904 {
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	905 vtmp.make_unique ();
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	906 obvp = vtmp.internal_rep ();
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	907 retval = obvp->unique_parent_class (parent_class_name);
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	908
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	909 break;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	910 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	911 }
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	912 }
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	913
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	914 return retval;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	915 }
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	916
19103 56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	917 bool
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	918 octave_class::is_instance_of (const std::string& cls_name) const
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	919 {
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	920 bool retval = false;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	921
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	922 if (cls_name == class_name ())
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	923 retval = true;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	924 else
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	925 {
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	926 for (std::list<std::string>::const_iterator pit = parent_list.begin ();
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	927 pit != parent_list.end ();
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	928 pit++)
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	929 {
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	930 octave_map::const_iterator smap = map.seek (*pit);
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	931
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	932 const Cell& tmp = map.contents (smap);
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	933
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	934 const octave_value& vtmp = tmp(0);
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	935
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	936 retval = vtmp.is_instance_of (cls_name);
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	937
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	938 if (retval)
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	939 break;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	940 }
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	941 }
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	942
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	943 return retval;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	944 }
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	945
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	946 string_vector
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20979 diff changeset	947 octave_class::string_vector_value (bool pad) const
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	948 {
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	949 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	950
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	951 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	952
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	953 if (! meth.is_defined ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	954 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	955
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	956 octave_value_list args;
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	957 args(0) = octave_value (new octave_class (map, c_name, parent_list));
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	958
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	959 octave_value_list tmp = feval (meth.function_value (), args, 1);
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	960
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	961 if (tmp.length () >= 1)
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	962 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	963 if (! tmp(0).is_string ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	964 error ("cname/char method did not return a string");
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	965
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20979 diff changeset	966 retval = tmp(0).string_vector_value (pad);
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	967 }
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	968
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	969 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	970 }
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	971
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	972
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	973 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18409 diff changeset	974 octave_class::print (std::ostream& os, bool)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	975 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	976 print_raw (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	977 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	978
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	979 void
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	980 octave_class::print_raw (std::ostream& os, bool) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	981 {
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9892 diff changeset	982 unwind_protect frame;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	983
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	984 indent (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	985 os << " <class " << class_name () << ">";
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	986 newline (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	987 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	988
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	989 bool
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	990 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	991 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	992 bool retval = false;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	993
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	994 indent (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	995 os << name << " =";
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	996 newline (os);
13112 969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12620 diff changeset	997 if (! Vcompact_format)
969ed305dde5 Remove all blank lines with "format compact" Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 12620 diff changeset	998 newline (os);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	999
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1000 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1001 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1002
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1003 void
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1004 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	1005 bool)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1006 {
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1007 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	1008
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1009 if (fcn.is_defined ())
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1010 {
73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1011 octave_value_list args;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1012
9521 e08d72bb988e simplify cloning Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	1013 count++;
e08d72bb988e simplify cloning Jaroslav Hajek <highegg@gmail.com> parents: 9377 diff changeset	1014 args(0) = octave_value (this);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1015
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1016 string_vector arg_names (1);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1017
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1018 arg_names[0] = name;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1019
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1020 args.stash_name_tags (arg_names);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1021
8658 73c4516fae10 New evaluator and debugger derived from tree-walker class John W. Eaton <jwe@octave.org> parents: 8377 diff changeset	1022 feval (fcn.function_value (), args);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1023 }
10204 1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1024 else
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1025 {
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1026 indent (os);
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1027 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	1028 newline (os);
1d430a849f3c print class name for classes that don't define a display method jstorrs@gmail.com parents: 10160 diff changeset	1029 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1030 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1031
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1032 // 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	1033 // 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	1034 // with no arguments.
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1035 bool
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1036 octave_class::reconstruct_exemplar (void)
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1037 {
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1038 bool retval = false;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1039
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1040 octave_class::exemplar_const_iterator it
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1041 = octave_class::exemplar_map.find (c_name);
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1042
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1043 if (it != octave_class::exemplar_map.end ())
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1044 retval = true;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1045 else
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1046 {
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1047 octave_value ctor = symbol_table::find_method (c_name, c_name);
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1048
12178 a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1049 bool have_ctor = false;
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1050
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1051 if (ctor.is_defined () && ctor.is_function ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1052 {
12178 a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1053 octave_function *fcn = ctor.function_value ();
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1054
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1055 if (fcn && fcn->is_class_constructor (c_name))
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1056 have_ctor = true;
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1057
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1058 // Something has gone terribly wrong if
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1059 // 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	1060 // a class constructor for the class c_name...
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1061 assert (have_ctor);
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1062 }
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1063
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1064 if (have_ctor)
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1065 {
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1066 unwind_protect frame;
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1067
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1068 // Simulate try/catch.
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1069
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1070 interpreter_try (frame);
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1071
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1072 bool execution_error = false;
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1073
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1074 octave_value_list result;
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1075
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1076 try
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1077 {
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1078 result = ctor.do_multi_index_op (1, octave_value_list ());
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1079 }
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1080 catch (const octave_execution_exception&)
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1081 {
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20747 diff changeset	1082 recover_from_exception ();
200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20747 diff changeset	1083
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1084 execution_error = true;
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1085 }
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1086
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1087 if (! execution_error && result.length () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1088 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1089 }
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1090 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1091 warning ("no constructor for class %s", c_name.c_str ());
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1092 }
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1093
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1094 return retval;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1095 }
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1096
9240 f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1097 void
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1098 octave_class::clear_exemplar_map (void)
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1099 {
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1100 exemplar_map.clear ();
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1101 }
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1102
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1103 // 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	1104 // class inheritance structure. reconstruct_parents () attempts to
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1105 // 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	1106 //
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1107 // 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	1108 // 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	1109 // to do its magic.
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1110 bool
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1111 octave_class::reconstruct_parents (void)
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1112 {
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 18033 diff changeset	1113 bool retval = true;
6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 18033 diff changeset	1114 bool might_have_inheritance = false;
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1115 std::string dbgstr = "dork";
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1116
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1117 // 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	1118 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	1119 {
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1120 std::string key = map.key (p);
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1121 Cell val = map.contents (p);
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18637 diff changeset	1122 if (val(0).is_object ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1123 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1124 dbgstr = "blork";
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18637 diff changeset	1125 if (key == val(0).class_name ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1126 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1127 might_have_inheritance = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1128 dbgstr = "cork";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1129 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1130 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1131 }
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1132 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1133
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1134 if (might_have_inheritance)
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1135 {
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1136 octave_class::exemplar_const_iterator it
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1137 = 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	1138
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1139 if (it == octave_class::exemplar_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1140 retval = false;
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1141 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1142 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1143 octave_class::exemplar_info exmplr = it->second;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1144 parent_list = exmplr.parents ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1145 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	1146 pit != parent_list.end ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1147 pit++)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1148 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1149 dbgstr = *pit;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1150 bool dbgbool = map.contains (*pit);
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20939 diff changeset	1151 if (! dbgbool)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1152 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1153 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1154 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1155 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1156 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1157 }
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1158 }
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1159
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1160 return retval;
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1161 }
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1162
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1163 bool
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1164 octave_class::save_ascii (std::ostream& os)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1165 {
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1166 os << "# classname: " << class_name () << "\n";
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1167 octave_map m;
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1168 if (load_path::find_method (class_name (), "saveobj") != "")
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1169 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1170 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	1171 octave_value_list tmp = feval ("saveobj", in, 1);
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1172
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1173 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	1174 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1175 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1176 m = map_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1177
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1178 os << "# length: " << m.nfields () << "\n";
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1179
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1180 octave_map::iterator i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1181 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1182 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1183 octave_value val = map.contents (i);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1184
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	1185 bool b = save_text_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	1186
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1187 if (! b)
18384 bd9d34f28b0f Use std::ostream::fail instead of unsafe implicit bool conversion (bug #41335) Mike Miller <mtmiller@ieee.org> parents: 17787 diff changeset	1188 return ! os.fail ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1189
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1190 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1191 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1192
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1193 return true;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1194 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1195
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1196 bool
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1197 octave_class::load_ascii (std::istream& is)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1198 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1199 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	1200 std::string classname;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1201
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1202 if (! extract_keyword (is, "classname", classname) \|\| classname.empty ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1203 error ("load: failed to extract name of class");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1204
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1205 if (! extract_keyword (is, "length", len) \|\| len < 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1206 error ("load: failed to extract number of elements in class");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1207
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1208 if (len > 0)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1209 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1210 octave_map m (map);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1211
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1212 for (octave_idx_type j = 0; j < len; j++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1213 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1214 octave_value t2;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1215 bool dummy;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1216
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1217 // recurse to read cell elements
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1218 std::string nm
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1219 = read_text_data (is, "", dummy, t2, j);
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1220
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1221 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1222 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1223
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1224 Cell tcell = t2.is_cell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2);
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1225
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1226 m.assign (nm, tcell);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1227 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1228
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1229 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1230 error ("load: failed to load class");
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1231
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1232 c_name = classname;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1233 reconstruct_exemplar ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1234
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1235 map = m;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1236
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1237 if (! reconstruct_parents ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1238 warning ("load: unable to reconstruct object inheritance");
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1239
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1240 if (load_path::find_method (classname, "loadobj")
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1241 != "")
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1242 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1243 octave_value in = new octave_class (*this);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1244 octave_value_list tmp = feval ("loadobj", in, 1);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1245
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1246 map = tmp(0).map_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1247 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1248 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1249 else if (len == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1250 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1251 map = octave_map (dim_vector (1, 1));
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1252 c_name = classname;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1253 }
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1254 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1255 panic_impossible ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1256
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	1257 return true;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1258 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1259
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1260 bool
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1261 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	1262 {
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	1263 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	1264
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1265 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	1266 os << class_name ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1267
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1268 octave_map m;
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1269 if (load_path::find_method (class_name (), "saveobj") != "")
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1270 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1271 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	1272 octave_value_list tmp = feval ("saveobj", in, 1);
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1273
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1274 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	1275 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1276 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1277 m = map_value ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1278
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	1279 int32_t len = m.nfields ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1280 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	1281
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1282 octave_map::iterator i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1283 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1284 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1285 octave_value val = map.contents (i);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1286
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1287 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	1288
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1289 if (! b)
18384 bd9d34f28b0f Use std::ostream::fail instead of unsafe implicit bool conversion (bug #41335) Mike Miller <mtmiller@ieee.org> parents: 17787 diff changeset	1290 return ! os.fail ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1291
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1292 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1293 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1294
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1295 return true;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1296 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1297
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1298 bool
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1299 octave_class::load_binary (std::istream& is, bool swap,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1300 oct_mach_info::float_format fmt)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1301 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1302 bool success = true;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1303
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1304 int32_t classname_len;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1305
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1306 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	1307 if (! is)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1308 return false;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1309 else if (swap)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1310 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	1311
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1312 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1313 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	1314 classname[classname_len] = '\0';
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1315 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	1316 return false;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1317 c_name = classname;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1318 }
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1319 reconstruct_exemplar ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1320
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1321 int32_t len;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1322 if (! is.read (reinterpret_cast<char *> (&len), 4))
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1323 return false;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1324 if (swap)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1325 swap_bytes<4> (&len);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1326
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1327 if (len > 0)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1328 {
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1329 octave_map m (map);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1330
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1331 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	1332 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1333 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1334 bool dummy;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1335 std::string doc;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1336
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1337 // recurse to read cell elements
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1338 std::string nm = read_binary_data (is, swap, fmt, "",
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1339 dummy, t2, doc);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1340
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1341 if (! is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1342 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1343
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	1344 Cell tcell = t2.is_cell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1345
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1346 m.assign (nm, tcell);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1347 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1348
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1349 if (is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1350 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1351 map = m;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1352
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1353 if (! reconstruct_parents ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1354 warning ("load: unable to reconstruct object inheritance");
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1355
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1356 if (load_path::find_method (c_name, "loadobj") != "")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1357 {
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1358 octave_value in = new octave_class (*this);
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1359 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	1360
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1361 map = tmp(0).map_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1362 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1363 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1364 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1365 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1366 warning ("load: failed to load class");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1367 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1368 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1369 }
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18637 diff changeset	1370 else if (len == 0)
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1371 map = octave_map (dim_vector (1, 1));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1372 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1373 panic_impossible ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1374
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1375 return success;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1376 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1377
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1378 bool
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1379 octave_class::save_hdf5 (octave_hdf5_id loc_id, const char *name, bool save_as_floats)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1380 {
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1381 #if defined (HAVE_HDF5)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1382
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1383 hsize_t hdims[3];
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1384 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	1385 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	1386 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	1387 hid_t class_hid = -1;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1388 hid_t data_hid = -1;
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1389 octave_map m;
8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1390 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	1391
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1392 #if HAVE_HDF5_18
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1393 group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_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	1394 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1395 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	1396 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1397 if (group_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1398 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1399
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1400 // 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	1401 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	1402 if (type_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1403 goto error_cleanup;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1404
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1405 hdims[0] = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1406 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	1407 if (space_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1408 goto error_cleanup;
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	1409 #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	1410 class_hid = H5Dcreate (group_hid, "classname", type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1411 octave_H5P_DEFAULT, octave_H5P_DEFAULT, octave_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	1412 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1413 class_hid = H5Dcreate (group_hid, "classname", type_hid, space_hid,
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1414 octave_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	1415 #endif
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1416 if (class_hid < 0 \|\| H5Dwrite (class_hid, type_hid, octave_H5S_ALL, octave_H5S_ALL,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1417 octave_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	1418 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1419
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	1420 #if HAVE_HDF5_18
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1421 data_hid = H5Gcreate (group_hid, "value", octave_H5P_DEFAULT, octave_H5P_DEFAULT,
ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1422 octave_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	1423 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1424 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	1425 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1426 if (data_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1427 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1428
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1429 if (load_path::find_method (class_name (), "saveobj") != "")
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1430 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1431 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	1432 octave_value_list tmp = feval ("saveobj", in, 1);
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1433
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1434 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	1435 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1436 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1437 m = map_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1438
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1439 // 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	1440 i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1441 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1442 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1443 octave_value val = map.contents (i);
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 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	1446 save_as_floats);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1447
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1448 if (! retval2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1449 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1450
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1451 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1452 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1453
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1454 error_cleanup:
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 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1457 H5Gclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1458
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1459 if (class_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1460 H5Dclose (class_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1461
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1462 if (space_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1463 H5Sclose (space_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1464
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1465 if (type_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1466 H5Tclose (type_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1467
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1468 if (group_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1469 H5Gclose (group_hid);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1470
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1471 return true;
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1472
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1473 #else
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	1474 warn_save ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1475 return false;
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1476 #endif
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1477 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1478
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1479 bool
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1480 octave_class::load_hdf5 (octave_hdf5_id loc_id, const char *name)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1481 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1482 bool retval = false;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1483
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1484 #if defined (HAVE_HDF5)
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1485
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1486 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	1487 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	1488 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	1489 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	1490 hid_t space_hid = -1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1491 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	1492 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	1493
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1494 hdf5_callback_data dsub;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1495
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1496 herr_t retval2 = 0;
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1497 octave_map m (dim_vector (1, 1));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1498 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	1499 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	1500 int slen = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1501 hsize_t rank = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1502
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	1503 #if HAVE_HDF5_18
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1504 group_hid = H5Gopen (loc_id, name, octave_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	1505 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1506 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	1507 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1508 if (group_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1509 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1510
9892 ac69e6f4b33d Add HDF5-1.8 compatibility while maintaining compatibility with HDF5-1.6 versions Kacper Kowalik <xarthisius.kk@gmail.com> parents: 9881 diff changeset	1511 #if HAVE_HDF5_18
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1512 data_hid = H5Dopen (group_hid, "classname", octave_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	1513 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1514 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	1515 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1516
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1517 if (data_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1518 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1519
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1520 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	1521
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1522 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	1523
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1524 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	1525 goto error_cleanup;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1526
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1527 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	1528 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	1529
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1530 if (rank != 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1531 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1532
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1533 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	1534 if (slen < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1535 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1536
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1537 // 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	1538 do
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1539 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1540 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	1541
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1542 // 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	1543 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	1544 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	1545
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1546 if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL, octave_H5P_DEFAULT,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1547 classname) < 0)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1548 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1549 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1550 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1551 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1552 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1553 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1554
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1555 H5Tclose (st_id);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1556 H5Dclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1557 data_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1558
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1559 c_name = classname;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1560 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1561 while (0);
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1562 reconstruct_exemplar ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1563
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	1564 #if HAVE_HDF5_18
21022 ebc439187d29 avoid old-style cast warnings from HDF5 macros used in C++ sources John W. Eaton <jwe@octave.org> parents: 21017 diff changeset	1565 subgroup_hid = H5Gopen (group_hid, name, octave_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	1566 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1567 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	1568 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1569 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	1570 H5Gclose (subgroup_hid);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1571
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1572 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	1573 && (retval2 = H5Giterate (group_hid, name, &current_item,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1574 hdf5_read_next_data, &dsub)) > 0)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1575 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1576 octave_value t2 = dsub.tc;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1577
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	1578 Cell tcell = t2.is_cell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1579
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1580 m.assign (dsub.name, tcell);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1581
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1582 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1583
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1584 if (retval2 >= 0)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1585 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1586 map = m;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1587
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20939 diff changeset	1588 if (! reconstruct_parents ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1589 warning ("load: unable to reconstruct object inheritance");
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1590
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1591 if (load_path::find_method (c_name, "loadobj") != "")
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1592 {
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1593 octave_value in = new octave_class (*this);
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1594 octave_value_list tmp = feval ("loadobj", in, 1);
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1595
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1596 map = tmp(0).map_value ();
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1597 retval = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1598 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1599 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1600
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1601 error_cleanup:
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1602 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1603 H5Dclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1604
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1605 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1606 H5Gclose (group_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1607
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1608 #else
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	1609 warn_load ("hdf5");
19863 09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1610 #endif
09ed6f7538dd avoid needing to include hdf5 in public header files (bug #44370, #43180) John W. Eaton <jwe@octave.org> and Mike Miller <mtmiller@ieee.org> parents: 19697 diff changeset	1611
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1612 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1613 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1614
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1615 mxArray *
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1616 octave_class::as_mxArray (void) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1617 {
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	1618 err_wrong_type_arg ("octave_class::as_mxArray ()", type_name ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1619 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1620
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1621 bool
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9580 diff changeset	1622 octave_class::in_class_method (void)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1623 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1624 octave_function *fcn = octave_call_stack::current ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1625
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1626 return (fcn
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1627 && (fcn->is_class_method ()
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1628 \|\| fcn->is_class_constructor ()
13241 2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	1629 \|\| fcn->is_anonymous_function_of_class ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1630 \|\| fcn->is_private_function_of_class (class_name ()))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1631 && find_parent_class (fcn->dispatch_class ()));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1632 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1633
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1634 octave_class::exemplar_info::exemplar_info (const octave_value& obj)
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1635 : field_names (), parent_class_names ()
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1636 {
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1637 if (! obj.is_object ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1638 error ("invalid call to exemplar_info constructor");
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1639
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1640 octave_map m = obj.map_value ();
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1641 field_names = m.keys ();
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1642
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1643 parent_class_names = obj.parent_class_name_list ();
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1644 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1645
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1646
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1647 // A map from class names to lists of fields.
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1648 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	1649
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1650 bool
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1651 octave_class::exemplar_info::compare (const octave_value& obj) const
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1652 {
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1653
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1654 if (! obj.is_object ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1655 error ("invalid comparison of class exemplar to non-class object");
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1656
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1657 if (nfields () != obj.nfields ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1658 error ("mismatch in number of fields");
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1659
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1660 octave_map obj_map = obj.map_value ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1661 string_vector obj_fnames = obj_map.keys ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1662 string_vector fnames = fields ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1663
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1664 for (octave_idx_type i = 0; i < nfields (); i++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1665 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1666 if (obj_fnames[i] != fnames[i])
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1667 error ("mismatch in field names");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1668 }
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1669
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1670 if (nparents () != obj.nparents ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1671 error ("mismatch in number of parent classes");
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1672
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1673 std::list<std::string> obj_parents
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1674 = obj.parent_class_name_list ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1675 std::list<std::string> pnames = parents ();
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1676
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1677 std::list<std::string>::const_iterator p = obj_parents.begin ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1678 std::list<std::string>::const_iterator q = pnames.begin ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1679
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1680 while (p != obj_parents.end ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1681 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1682 if (p++ != q++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1683 error ("mismatch in parent classes");
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1684 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1685
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	1686 return true;
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1687 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1688
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1689 DEFUN (class, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1690 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1691 @deftypefn {} {@var{classname} =} class (@var{obj})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1692 @deftypefnx {} {} class (@var{s}, @var{id})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1693 @deftypefnx {} {} class (@var{s}, @var{id}, @var{p}, @dots{})\n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 20028 diff changeset	1694 Return the class of the object @var{obj}, or create a class with\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 20028 diff changeset	1695 fields from structure @var{s} and name (string) @var{id}.\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 20028 diff changeset	1696 \n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 20028 diff changeset	1697 Additional arguments name a list of parent classes from which the new class\n\
075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 20028 diff changeset	1698 is derived.\n\
15811 317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1699 @seealso{typeinfo, isa}\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1700 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1701 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1702 int nargin = args.length ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1703
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1704 if (nargin == 0)
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1705 print_usage ();
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1706
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1707 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1708
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1709 if (nargin == 1)
15811 317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1710 // Called for class of object
15813 10d6ab9b1b4f Implement octave_value function class_name() for class "octave_java" Rik <rik@octave.org> parents: 15812 diff changeset	1711 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	1712 else
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1713 {
15811 317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1714 // Called as class constructor
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	1715 std::string id = args(1).xstring_value ("class: ID (class name) must be a string");
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20561 diff changeset	1716
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1717 octave_function *fcn = octave_call_stack::caller ();
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1718
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1719 if (! fcn)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1720 error ("class: invalid call from outside class constructor or method");
20580 729a85dafba8 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20561 diff changeset	1721
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1722 if (! fcn->is_class_constructor (id) && ! fcn->is_class_method (id))
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1723 error ("class: '%s' is invalid as a class name in this context",
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1724 id.c_str ());
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1725
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1726 octave_map m = args(0).xmap_value ("class: S must be a valid structure");
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1727
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1728 if (nargin == 2)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1729 retval
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1730 = octave_value (new octave_class (m, id, std::list<std::string> ()));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1731 else
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1732 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1733 octave_value_list parents = args.slice (2, nargin-2);
11220 883b9308353c allow class function to be called from methods as well as constructors John W. Eaton <jwe@octave.org> parents: 10932 diff changeset	1734
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1735 retval = octave_value (new octave_class (m, id, parents));
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1736 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1737
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1738 octave_class::exemplar_const_iterator it
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1739 = octave_class::exemplar_map.find (id);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1740
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1741 if (it == octave_class::exemplar_map.end ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1742 octave_class::exemplar_map[id] = octave_class::exemplar_info (retval);
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1743 else if (! it->second.compare (retval))
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1744 error ("class: object of class '%s' does not match previously constructed objects",
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1745 id.c_str ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1746 }
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1747
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1748 return retval;
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1749 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1750
15811 317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1751 /*
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1752 %!assert (class (1.1), "double");
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1753 %!assert (class (single (1.1)), "single");
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1754 %!assert (class (uint8 (1)), "uint8");
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1755 %!testif HAVE_JAVA
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1756 %! jobj = javaObject ("java.lang.StringBuffer");
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1757 %! assert (class (jobj), "java.lang.StringBuffer");
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1758
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1759 %% Test Input Validation
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1760 %!error class ()
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1761 */
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1762
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1763 DEFUN (isa, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1764 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1765 @deftypefn {} {} isa (@var{obj}, @var{classname})\n\
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1766 Return true if @var{obj} is an object from the class @var{classname}.\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1767 \n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1768 @var{classname} may also be one of the following class categories:\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1769 \n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1770 @table @asis\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1771 @item @qcode{\"float\"}\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1772 Floating point value comprising classes @qcode{\"double\"} and\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1773 @qcode{\"single\"}.\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1774 \n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1775 @item @qcode{\"integer\"}\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1776 Integer value comprising classes (u)int8, (u)int16, (u)int32, (u)int64.\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1777 \n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1778 @item @qcode{\"numeric\"}\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1779 Numeric value comprising either a floating point or integer value.\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1780 @end table\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1781 \n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1782 If @var{classname} is a cell array of string, a logical array of the same\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1783 size is returned, containing true for each class to which @var{obj}\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1784 belongs to.\n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1785 \n\
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1786 @seealso{class, typeinfo}\n\
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1787 @end deftypefn")
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1788 {
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1789 if (args.length () != 2)
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1790 print_usage ();
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1791
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1792 octave_value obj = args(0); // not const because of find_parent_class ()
bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1793 std::string obj_cls = obj.class_name ();
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	1794 Array<std::string> clsnames = args(1).xcellstr_value ("isa: CLASSNAME must be a string or cell array of strings");
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1795
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1796 boolNDArray matches (clsnames.dims (), false);
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1797
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1798 for (octave_idx_type idx = 0; idx < clsnames.numel (); idx++)
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1799 {
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1800 std::string cls = clsnames(idx);
bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1801 if (obj_cls == cls
bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1802 \|\| (cls == "float" && obj.is_float_type ())
bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1803 \|\| (cls == "integer" && obj.is_integer_type ())
bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1804 \|\| (cls == "numeric" && obj.is_numeric_type ())
bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1805 \|\| obj.is_instance_of (cls))
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1806 matches(idx) = true;
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1807 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1808
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1809 return ovl (matches);
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1810 }
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1811
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1812 /*
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1813 %!assert (isa ("char", "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1814 %!assert (isa (logical (1), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1815 %!assert (isa (double (13), "float"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1816 %!assert (isa (single (13), "float"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1817 %!assert (isa (int8 (13), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1818 %!assert (isa (int16 (13), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1819 %!assert (isa (int32 (13), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1820 %!assert (isa (int64 (13), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1821 %!assert (isa (uint8 (13), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1822 %!assert (isa (uint16 (13), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1823 %!assert (isa (uint32 (13), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1824 %!assert (isa (uint64 (13), "float"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1825 %!assert (isa ("char", "numeric"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1826 %!assert (isa (logical (1), "numeric"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1827 %!assert (isa (double (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1828 %!assert (isa (single (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1829 %!assert (isa (int8 (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1830 %!assert (isa (int16 (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1831 %!assert (isa (int32 (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1832 %!assert (isa (int64 (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1833 %!assert (isa (uint8 (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1834 %!assert (isa (uint16 (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1835 %!assert (isa (uint32 (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1836 %!assert (isa (uint64 (13), "numeric"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1837 %!assert (isa (uint8 (13), "integer"), true)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1838 %!assert (isa (double (13), "integer"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1839 %!assert (isa (single (13), "integer"), false)
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1840 %!assert (isa (single (13), {"integer", "float", "single"}), [false true true])
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1841
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1842 %!assert (isa (double (13), "double"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1843 %!assert (isa (single (13), "single"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1844 %!assert (isa (int8 (13), "int8"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1845 %!assert (isa (int16 (13), "int16"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1846 %!assert (isa (int32 (13), "int32"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1847 %!assert (isa (int64 (13), "int64"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1848 %!assert (isa (uint8 (13), "uint8"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1849 %!assert (isa (uint16 (13), "uint16"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1850 %!assert (isa (uint32 (13), "uint32"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1851 %!assert (isa (uint64 (13), "uint64"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1852 %!assert (isa ("string", "char"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1853 %!assert (isa (true, "logical"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1854 %!assert (isa (false, "logical"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1855 %!assert (isa ({1, 2}, "cell"))
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1856 %!assert (isa ({1, 2}, {"numeric", "integer", "cell"}), [false false true])
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1857
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1858 %!testif HAVE_JAVA
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1859 %! ## The first and last assert() are equal on purpose. The assert() in
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1860 %! ## the middle with an invalid class name will cause the java code to
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1861 %! ## throw exceptions which we then must clear properly (or all other calls
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1862 %! ## will fail). So we test this too.
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1863 %! assert (isa (javaObject ("java.lang.Double", 10), "java.lang.Number"))
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1864 %! assert (isa (javaObject ("java.lang.Double", 10), "not_a_class"), false)
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1865 %! assert (isa (javaObject ("java.lang.Double", 10), "java.lang.Number"))
107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1866
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1867 %!test
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1868 %! a.b = 1;
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1869 %! assert (isa (a, "struct"));
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1870 */
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1871
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1872 DEFUN (__parent_classes__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1873 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1874 @deftypefn {} {} __parent_classes__ (@var{x})\n\
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1875 Undocumented internal function.\n\
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1876 @end deftypefn")
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1877 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1878 if (args.length () != 1)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1879 print_usage ();
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1880
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1881 octave_value arg = args(0);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1882
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1883 if (arg.is_object ())
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1884 return ovl (Cell (arg.parent_class_names ()));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1885 else
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1886 return ovl (Cell ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1887 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1888
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1889 DEFUN (isobject, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1890 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1891 @deftypefn {} {} isobject (@var{x})\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1892 Return true if @var{x} is a class object.\n\
18637 2631484789cf doc: Improve docstrings for isobject, ismethod, isprop. Rik <rik@octave.org> parents: 18537 diff changeset	1893 @seealso{class, typeinfo, isa, ismethod, isprop}\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1894 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1895 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1896 if (args.length () != 1)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1897 print_usage ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1898
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1899 return ovl (args(0).is_object ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1900 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1901
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1902 DEFUN (ismethod, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1903 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1904 @deftypefn {} {} ismethod (@var{obj}, @var{method})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1905 @deftypefnx {} {} ismethod (@var{clsname}, @var{method})\n\
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	1906 Return true if the string @var{method} is a valid method of the object\n\
7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	1907 @var{obj} or of the class @var{clsname}.\n\
18533 ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 18384 diff changeset	1908 @seealso{isprop, isobject}\n\
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1909 @end deftypefn")
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1910 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1911 if (args.length () != 2)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1912 print_usage ();
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1913
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1914 octave_value arg = args(0);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1915
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1916 std::string class_name;
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1917
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1918 if (arg.is_object ())
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1919 class_name = arg.class_name ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1920 else if (arg.is_string ())
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1921 class_name = arg.string_value ();
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1922 else
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1923 error ("ismethod: first argument must be object or class name");
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1924
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1925 std::string method = args(1).string_value ();
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1926
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1927 if (load_path::find_method (class_name, method) != "")
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1928 return ovl (true);
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1929 else
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1930 return ovl (false);
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1931 }
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	1932
15785 42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1933 DEFUN (__methods__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1934 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1935 @deftypefn {} {} __methods__ (@var{x})\n\
1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1936 @deftypefnx {} {} __methods__ (\"classname\")\n\
15785 42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1937 Internal function.\n\
42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1938 \n\
42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1939 Implements @code{methods} for Octave class objects and classnames.\n\
42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1940 @seealso{methods}\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1941 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1942 {
15785 42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1943 // Input validation has already been done in methods.m.
42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1944 octave_value arg = args(0);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1945
15785 42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1946 std::string class_name;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1947
15785 42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1948 if (arg.is_object ())
42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1949 class_name = arg.class_name ();
42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1950 else if (arg.is_string ())
42cff4396de4 Add methods.m which extends methods() to work on Java objects. Rik <rik@octave.org> parents: 15467 diff changeset	1951 class_name = arg.string_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1952
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1953 string_vector sv = load_path::methods (class_name);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1954
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1955 return ovl (Cell (sv));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1956 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1957
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1958 static bool
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1959 is_built_in_class (const std::string& cn)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1960 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1961 static std::set<std::string> built_in_class_names;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1962
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1963 if (built_in_class_names.empty ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1964 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1965 built_in_class_names.insert ("double");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1966 built_in_class_names.insert ("single");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1967 built_in_class_names.insert ("cell");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1968 built_in_class_names.insert ("struct");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1969 built_in_class_names.insert ("logical");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1970 built_in_class_names.insert ("char");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1971 built_in_class_names.insert ("function handle");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1972 built_in_class_names.insert ("int8");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1973 built_in_class_names.insert ("uint8");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1974 built_in_class_names.insert ("int16");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1975 built_in_class_names.insert ("uint16");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1976 built_in_class_names.insert ("int32");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1977 built_in_class_names.insert ("uint32");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1978 built_in_class_names.insert ("int64");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1979 built_in_class_names.insert ("uint64");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1980 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1981
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1982 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	1983 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1984
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1985 DEFUN (superiorto, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1986 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	1987 @deftypefn {} {} superiorto (@var{class_name}, @dots{})\n\
21072 a9ed4104ecfd doc: Rewrite documentation for Object Oriented Programming. Rik <rik@octave.org> parents: 21040 diff changeset	1988 When called from a class constructor, mark the object currently constructed\n\
a9ed4104ecfd doc: Rewrite documentation for Object Oriented Programming. Rik <rik@octave.org> parents: 21040 diff changeset	1989 as having a higher precedence than @var{class_name}.\n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 20028 diff changeset	1990 \n\
21072 a9ed4104ecfd doc: Rewrite documentation for Object Oriented Programming. Rik <rik@octave.org> parents: 21040 diff changeset	1991 More that one such class can be specified in a single call. This function\n\
a9ed4104ecfd doc: Rewrite documentation for Object Oriented Programming. Rik <rik@octave.org> parents: 21040 diff changeset	1992 may @emph{only} be called from a class constructor.\n\
18533 ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 18384 diff changeset	1993 @seealso{inferiorto}\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1994 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1995 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1996 octave_function *fcn = octave_call_stack::caller ();
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1997 if (! fcn \|\| ! fcn->is_class_constructor ())
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	1998 error ("superiorto: invalid call from outside class constructor");
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1999
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2000 for (int i = 0; i < args.length (); i++)
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2001 {
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	2002 std::string inf_class = args(i).xstring_value ("superiorto: CLASS_NAME must be a string");
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2003
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2004 // User defined classes always have higher precedence
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2005 // than built-in classes
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2006 if (is_built_in_class (inf_class))
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2007 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2008
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2009 std::string sup_class = fcn->name ();
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2010 if (! symbol_table::set_class_relationship (sup_class, inf_class))
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	2011 error ("superiorto: opposite precedence already set for %s and %s",
5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	2012 sup_class.c_str (), inf_class.c_str ());
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2013 }
94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2014
21125 8f76684324b5 maint: change "return octave_value ()" to "return ovl ()". Rik <rik@octave.org> parents: 21118 diff changeset	2015 return ovl ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2016 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2017
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2018 DEFUN (inferiorto, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	2019 "-- texinfo --\n\
20853 1142cf6abc0d 2015 Code Sprint: remove class of function from docstring for all C++ files. Rik <rik@octave.org> parents: 20797 diff changeset	2020 @deftypefn {} {} inferiorto (@var{class_name}, @dots{})\n\
21072 a9ed4104ecfd doc: Rewrite documentation for Object Oriented Programming. Rik <rik@octave.org> parents: 21040 diff changeset	2021 When called from a class constructor, mark the object currently constructed\n\
a9ed4104ecfd doc: Rewrite documentation for Object Oriented Programming. Rik <rik@octave.org> parents: 21040 diff changeset	2022 as having a lower precedence than @var{class_name}.\n\
20163 075a5e2e1ba5 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 20028 diff changeset	2023 \n\
21072 a9ed4104ecfd doc: Rewrite documentation for Object Oriented Programming. Rik <rik@octave.org> parents: 21040 diff changeset	2024 More that one such class can be specified in a single call. This function\n\
a9ed4104ecfd doc: Rewrite documentation for Object Oriented Programming. Rik <rik@octave.org> parents: 21040 diff changeset	2025 may @emph{only} be called from a class constructor.\n\
18533 ea0d4dea1a17 doc: Update documentation for functions in octave-value dir. Rik <rik@octave.org> parents: 18384 diff changeset	2026 @seealso{superiorto}\n\
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2027 @end deftypefn")
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2028 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2029 octave_function *fcn = octave_call_stack::caller ();
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	2030 if (! fcn \|\| ! fcn->is_class_constructor ())
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	2031 error ("inferiorto: invalid call from outside class constructor");
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2032
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2033 for (int i = 0; i < args.length (); i++)
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2034 {
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	2035 std::string sup_class = args(i).xstring_value ("inferiorto: CLASS_NAME must be a string");
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2036
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2037 if (is_built_in_class (sup_class))
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	2038 error ("inferiorto: cannot give user-defined class lower "
5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	2039 "precedence than built-in class");
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2040
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2041 std::string inf_class = fcn->name ();
e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2042 if (! symbol_table::set_class_relationship (sup_class, inf_class))
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	2043 error ("inferiorto: opposite precedence already set for %s and %s",
5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	2044 inf_class.c_str (), sup_class.c_str ());
7338 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
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	2047 return octave_value();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2048 }

Mercurial > octave

annotate libinterp/octave-value/ov-class.cc @ 21200:fcac5dbbf9ed