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

annotate libinterp/octave-value/ov-class.cc @ 30888:32d2b6604a9f

doc: Ensure documentation lists output argument when it exists for functions in libinterp/ For new users of Octave it is best to show explicit calling forms in the documentation and to show a return argument when it exists. * __ftp__.cc, __magick_read__.cc, __pchip_deriv__.cc, bitfcns.cc, bsxfun.cc, call-stack.cc, cellfun.cc, chol.cc, conv2.cc, data.cc, debug.cc, defaults.cc, det.cc, dirfns.cc, display.cc, dot.cc, error.cc, event-manager.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, getgrent.cc, getpwent.cc, getrusage.cc, graphics.cc, hash.cc, help.cc, input.cc, interpreter.cc, kron.cc, load-path.cc, mappers.cc, max.cc, nproc.cc, oct-hist.cc, pager.cc, pinv.cc, psi.cc, rand.cc, settings.cc, sighandlers.cc, stream-euler.cc, strfns.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc, utils.cc, variables.cc, __fltk_uigetfile__.cc, audiodevinfo.cc, audioread.cc, fftw.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-fcn-handle.cc, ov-java.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc, octave.cc, profiler.cc: Add return arguments to @deftypefn macros where they were missing. Attempt to use standard naming convention for return variables. Occasionally improved the docstring itself by re-wording or adding code examples.

author	Rik <rik@octave.org>
date	Mon, 04 Apr 2022 10:31:48 -0700
parents	08b08b7f05b2
children	670a0d878af1

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
30564 796f54d4ddbf update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 30346 diff changeset	3 // Copyright (C) 2007-2022 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21691 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21211 diff changeset	27 # include "config.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	28 #endif
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	29
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	30 #include <istream>
28427 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	31 #include <memory>
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25343 diff changeset	32 #include <ostream>
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	33
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	34 #include "Array-util.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	35 #include "byte-swap.h"
8377 25bc2d31e1bf improve OCTAVE_LOCAL_BUFFER Jaroslav Hajek <highegg@gmail.com> parents: 8219 diff changeset	36 #include "oct-locbuf.h"
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	37 #include "lo-mappers.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	38
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	39 #include "Cell.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	40 #include "defun.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	41 #include "error.h"
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	42 #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	43 #include "errwarn.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	44 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22091 diff changeset	45 #include "interpreter.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	46 #include "load-path.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	47 #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	48 #include "ls-oct-text.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	49 #include "ls-oct-binary.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	50 #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	51 #include "mxarray.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	52 #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	53 #include "oct-hdf5.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	54 #include "ov-class.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	55 #include "ov-fcn.h"
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	56 #include "ov-typeinfo.h"
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	57 #include "ov-usr-fcn.h"
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	58 #include "pager.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	59 #include "parse.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	60 #include "pr-output.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	61 #include "unwind-prot.h"
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	62 #include "variables.h"
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
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	65 int octave_class::t_id (-1);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	66
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	67 const std::string octave_class::t_name ("class");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	68
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	69 void
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	70 octave_class::register_type (octave::type_info& ti)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	71 {
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	72 t_id = ti.register_type (octave_class::t_name, "<unknown>",
46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	73 octave_value (new octave_class ()));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	74 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	75
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	76 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	77 const octave_value_list& parents)
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	78 : octave_base_value (), m_map (m), c_name (id), m_obsolete_copies (0)
9010 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 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	81
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	82 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	83 {
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	84 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	85
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23586 diff changeset	86 if (! parent.isobject ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	87 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	88
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	89 std::string pcnm = parent.class_name ();
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	90
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	91 if (find_parent_class (pcnm))
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	92 error ("duplicate class in parent tree");
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	93
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	94 m_parent_list.push_back (pcnm);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	95
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	96 octave_idx_type nel = m_map.numel ();
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	97 octave_idx_type p_nel = parent.numel ();
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	98
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	99 if (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 if (p_nel == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	102 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	103 // 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	104 // so just add the field name.
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	105
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	106 m_map.assign (pcnm, Cell (m_map.dims ()));
20979 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 else if (p_nel == 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	109 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	110 if (m_map.nfields () == 0)
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	111 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	112 // 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	113 // parent is class object with one element.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	114 // 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	115 // make the parent a field in MAP.
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	116
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	117 m_map.resize (parent.dims ());
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	118
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	119 m_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	120 }
c7fac37a2afc class: correctly handle parents when structure array has more than one element John W. Eaton <jwe@octave.org> parents: 13695 diff changeset	121 else
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	122 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	123 // 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	124 // 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	125 // field name.
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	126
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	127 m_map.assign (pcnm, Cell (m_map.dims ()));
13781 1cb3ae93578d correctly distribute parent classes John W. Eaton <jwe@octave.org> parents: 13711 diff changeset	128 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	129 }
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	130 else if (m_map.nfields () == 0)
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	131 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	132 // 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	133 // 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	134 // resize MAP to match parent dimsenions, then
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	135 // 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	136 // the elements of MAP.
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 dim_vector parent_dims = parent.dims ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	139
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	140 m_map.resize (parent_dims);
20979 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 Cell c (parent_dims);
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 octave_map pmap = parent.map_value ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	145
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	146 std::list<std::string> plist
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	147 = parent.parent_class_name_list ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	148
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	149 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	150 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	151
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	152 m_map.assign (pcnm, c);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	153 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	154 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	155 error ("class: parent class dimension mismatch");
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 else if (nel == 1 && p_nel == 1)
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 // Simple assignment.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	160
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	161 m_map.assign (pcnm, parent);
20979 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 else
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 if (p_nel == 1)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	166 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	167 // Broadcast the scalar parent class object to
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	168 // each element of MAP.
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	169
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	170 Cell pcell (m_map.dims (), parent);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	171
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	172 m_map.assign (pcnm, pcell);
20979 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 else if (nel == p_nel)
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 // 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	177
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	178 // 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	179 // 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	180 // new object, so distribute those elements to
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	181 // 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	182 // splitting the elements of the parent class
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	183 // 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	184 // 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	185
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	186 Cell c (parent.dims ());
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 octave_map pmap = parent.map_value ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	189
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	190 std::list<std::string> plist
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	191 = parent.parent_class_name_list ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	192
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	193 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	194 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	195
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	196 m_map.assign (pcnm, c);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	197 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	198 else
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	199 error ("class: parent class dimension mismatch");
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	200 }
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	201 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	202
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	203 octave::symbol_table& symtab = octave::__get_symbol_table__ ("octave_class");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	204
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	205 symtab.add_to_parent_map (id, m_parent_list);
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	206 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	207
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	208 octave_base_value *
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	209 octave_class::unique_clone (void)
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	210 {
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	211 if (count == m_obsolete_copies)
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	212 {
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21743 diff changeset	213 // All remaining copies are obsolete. We don't actually need to clone.
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	214 count++;
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	215 return this;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	216 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	217 else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	218 {
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	219 // In theory, this shouldn't be happening, but it's here just in case.
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	220 if (count < m_obsolete_copies)
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	221 m_obsolete_copies = 0;
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	222
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	223 return clone ();
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	224 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	225 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	226
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	227 std::string
f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	228 octave_class::get_current_method_class (void)
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	229 {
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	230 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	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 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	233 {
27210 bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	234 octave::tree_evaluator& tw
bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	235 = octave::__get_evaluator__ ("octave_class::get_current_method_class");
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	236
27210 bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	237 octave_function *fcn = tw.current_function ();
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	238
12620 6f3f18957851 ov-class.cc: Fix segfault when assigning class to struct object (bug #33014) David Bateman <dbateman@free.fr> parents: 12483 diff changeset	239 // 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	240 // 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	241 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	242 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	243 }
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	244
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	245 return retval;
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	246 }
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 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_index1 (void)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	251 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	252 error ("invalid index for class");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	253 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: 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_for_assignment (void)
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 ("invalid index for class assignment");
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
21040 3e7cfee5f786 maint: Rename attributes GCC_ATTR_XXX to OCTAVE_XXX. Rik <rik@octave.org> parents: 21029 diff changeset	262 OCTAVE_NORETURN static
21029 e3b3bb522d62 maint: Move GCC_ attributes to start of declaration for future compatibility. Rik <rik@octave.org> parents: 21024 diff changeset	263 void
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	264 err_invalid_index_type (const std::string& nm, char t)
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	265 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	266 error ("%s cannot be indexed with %c", nm.c_str (), t);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	267 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	268
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	269 void
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	270 octave_class::break_closure_cycles (const std::shared_ptr<octave::stack_frame>& frame)
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	271 {
29478 e88444be8468 maint: merge stable to default. John W. Eaton <jwe@octave.org> parents: 29466 29476 diff changeset	272 for (octave_idx_type j = 0; j < m_map.nfields (); j++)
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	273 {
29478 e88444be8468 maint: merge stable to default. John W. Eaton <jwe@octave.org> parents: 29466 29476 diff changeset	274 Cell& c = m_map.contents (j);
29476 c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	275
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	276 for (octave_idx_type i = 0; i < c.numel (); i++)
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	277 c(i).break_closure_cycles (frame);
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	278 }
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	279 }
c74ff452e2bb avoid memory leaks when returning handles to nested functions John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	280
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	281 Cell
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	282 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	283 {
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	284 panic_if (idx.length () != 1);
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	285
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	286 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	287
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	288 // 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	289 // 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	290
10926 f687bd17ce21 fix field assignment from private class methods Jaroslav Hajek <highegg@gmail.com> parents: 10840 diff changeset	291 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	292
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23693 diff changeset	293 if (obvp == nullptr)
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	294 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	295
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	296 octave_map my_map = (obvp != this) ? obvp->map_value () : m_map;
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	297
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	298 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	299
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	300 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	301
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	302 if (p == my_map.end ())
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	303 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	304
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	305 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	306 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	307
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	308 Matrix
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	309 octave_class::size (void)
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	310 {
26525 0d3eca5955dc Backed out changeset 920a4ad8043b (bug #54995) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	311 if (in_class_method () \|\| called_from_builtin ())
9792 384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	312 return octave_base_value::size ();
384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	313
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	314 Matrix retval (1, 2, 1.0);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	315
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	316 octave::symbol_table& symtab
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	317 = octave::__get_symbol_table__ ("octave_class::size");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	318
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	319 octave_value meth = symtab.find_method ("size", class_name ());
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	320
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	321 if (meth.is_defined ())
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	322 {
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	323 count++;
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	324 octave_value_list args (1, octave_value (this));
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	325
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	326 octave_value_list lv = octave::feval (meth.function_value (), args, 1);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	327 if (lv.length () <= 0
23592 80e3bfb7bd5a maint: Deprecate is_vector and replace with isvector. Rik <rik@octave.org> parents: 23587 diff changeset	328 \|\| ! lv(0).is_matrix_type () \|\| ! lv(0).dims ().isvector ())
9775 9d9f858849c7 Allow and ignore extra outargs from user-defined size methods David Grundberg <davidg@cs.umu.se> parents: 9774 diff changeset	329 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	330
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	331 retval = lv(0).matrix_value ();
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	332 }
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	333 else
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	334 {
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	335 dim_vector dv = dims ();
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	336
21660 53728df3e4c9 maint: for clarity, call ndims() rather than length() on dimension vectors. Rik <rik@octave.org> parents: 21580 diff changeset	337 int nd = dv.ndims ();
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	338
13784 0bbe319bf26b octave_class::size: return matrix with correct dimensions John W. Eaton <jwe@octave.org> parents: 13781 diff changeset	339 retval.resize (1, nd);
13695 348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	340
13784 0bbe319bf26b octave_class::size: return matrix with correct dimensions John W. Eaton <jwe@octave.org> parents: 13781 diff changeset	341 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	342 retval(i) = dv(i);
348857854c52 correctly handle multidimensional objects in num2cell John W. Eaton <jwe@octave.org> parents: 13694 diff changeset	343 }
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	344
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	345 return retval;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	346 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	347
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	348 octave_idx_type
26922 072d0610cc56 avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26745 diff changeset	349 octave_class::xnumel (const octave_value_list& idx)
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	350 {
26525 0d3eca5955dc Backed out changeset 920a4ad8043b (bug #54995) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	351 if (in_class_method () \|\| called_from_builtin ())
26922 072d0610cc56 avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26745 diff changeset	352 return octave_base_value::xnumel (idx);
9792 384616240a8f fix internal numel on classes Jaroslav Hajek <highegg@gmail.com> parents: 9775 diff changeset	353
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	354 octave_idx_type retval = -1;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	355 const std::string cn = class_name ();
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	356
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	357 octave::symbol_table& symtab
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	358 = octave::__get_symbol_table__ ("octave_class::numel");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	359
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	360 octave_value meth = symtab.find_method ("numel", cn);
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	361
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	362 if (meth.is_defined ())
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	363 {
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	364 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	365
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	366 count++;
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	367 args(0) = octave_value (this);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	368
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	369 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	370 args(i+1) = idx(i);
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	371
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	372 octave_value_list lv = octave::feval (meth.function_value (), args, 1);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	373 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	374 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	375
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	376 retval = lv(0).idx_type_value (true);
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	377 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	378 else
26922 072d0610cc56 avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26745 diff changeset	379 retval = octave_base_value::xnumel (idx);
9329 67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	380
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	381 return retval;
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	382 }
67fc970dad7d improve indexed assignment using indexed numel Jaroslav Hajek <highegg@gmail.com> parents: 9240 diff changeset	383
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	384 octave_value_list
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	385 octave_class::subsref (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	386 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	387 int nargout)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	388 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	389 octave_value_list retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	390
26525 0d3eca5955dc Backed out changeset 920a4ad8043b (bug #54995) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	391 if (in_class_method () \|\| called_from_builtin ())
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	392 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	393 // 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	394 // octave_struct::subsref. Maybe it could be shared instead of
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	395 // duplicated.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	396
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	397 int skip = 1;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	398
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	399 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	400 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	401 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	402 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	403 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	404 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	405 auto p = idx.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	406 octave_value_list key_idx = *++p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	407
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	408 Cell tmp = dotref (key_idx);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	409
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	410 Cell t = tmp.index (idx.front ());
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	411
23450 855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	412 retval(0) = (t.numel () == 1 ? t(0)
855122b993da maint: Wrap tertiary operator in parentheses "(COND ? x : y)". Rik <rik@octave.org> parents: 23449 diff changeset	413 : octave_value (t, true));
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	414
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	415 // 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	416 // next_subsref to skip both of them.
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	417 skip++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	418 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	419 else
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	420 retval(0) = octave_value (m_map.index (idx.front ()),
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	421 c_name, m_parent_list);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	422 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	423 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	424
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	425 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	426 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	427 if (m_map.numel () > 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	428 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	429 Cell t = dotref (idx.front ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	430
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20163 diff changeset	431 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	432 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	433 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	434 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	435
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	436 case '{':
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	437 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	438 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	439
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	440 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	441 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	442 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	443
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	444 // FIXME: perhaps there should be an
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	445 // octave_value_list::next_subsref member function? See also
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	446 // octave_user_function::subsref.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	447
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	448 if (idx.size () > 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	449 retval = retval(0).next_subsref (nargout, type, idx, skip);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	450 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	451 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	452 {
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	453 octave::symbol_table& symtab
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	454 = octave::__get_symbol_table__ ("octave_class::subsref");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	455
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	456 octave_value meth = symtab.find_method ("subsref", class_name ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	457
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	458 if (meth.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	459 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	460 octave_value_list args;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	461
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	462 args(1) = make_idx_args (type, idx, "subsref");
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	463
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	464 count++;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	465 args(0) = octave_value (this);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	466
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	467 // 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	468 // 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	469 // 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	470 // 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	471 // 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	472 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	473 \|\| (type.length () > 1 && type[0] == '('
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	474 && type[1] == '.'));
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	475
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	476 int true_nargout = nargout;
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	477
318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	478 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	479 {
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	480 // 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	481 octave_value_list tmp;
a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	482 if (type[0] != '.') tmp = idx.front ();
26922 072d0610cc56 avoid some overloaded virtual warnings (bug #55741) John W. Eaton <jwe@octave.org> parents: 26745 diff changeset	483 true_nargout = xnumel (tmp);
9331 a76f391a3d02 set up proper nargout for call to subsref method Jaroslav Hajek <highegg@gmail.com> parents: 9329 diff changeset	484 }
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	485
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	486 retval = octave::feval (meth.function_value (), args, true_nargout);
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	487
23352 778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23351 diff changeset	488 // Since we're handling subsref, if the list has more than one
778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23351 diff changeset	489 // element, return it as a comma-separated list so that we can
23435 c452180ab672 begin refactoring parse tree evaluator John W. Eaton <jwe@octave.org> parents: 23405 diff changeset	490 // pass it to the evaluator
9691 318e0cdd31bd improve OOP subsref handling Jaroslav Hajek <highegg@gmail.com> parents: 9581 diff changeset	491 if (retval.length () > 1)
23352 778fdffc09df deprecate "octave_value (octave_value_list, bool)" constructor John W. Eaton <jwe@octave.org> parents: 23351 diff changeset	492 retval = octave_value (retval);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	493 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	494 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	495 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	496 if (type.length () == 1 && type[0] == '(')
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	497 retval(0) = octave_value (m_map.index (idx.front ()), c_name,
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	498 m_parent_list);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	499 else
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	500 err_invalid_index1 ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	501 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	502 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	503
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	504 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	505 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	506
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	507 octave_value
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	508 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	509 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	510 octave_value retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	511
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	512 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	513 err_invalid_index_for_assignment ();
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	514
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	515 retval = val(0);
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	516
23584 7ed6b258db91 maint: Deprecate is_map and replace with isstruct. Rik <rik@octave.org> parents: 23580 diff changeset	517 if (type.length () > 0 && type[0] == '.' && ! retval.isstruct ())
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	518 retval = octave_map ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	519
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	520 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	521 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	522
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	523 octave_value
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	524 octave_class::subsasgn (const std::string& type,
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	525 const std::list<octave_value_list>& idx,
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	526 const octave_value& rhs)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	527 {
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	528 count++;
12171 d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	529 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	530 }
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	531
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	532 octave_value
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	533 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	534 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	535 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	536 {
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	537 // 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	538 // 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	539 // undefined.
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	540
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	541 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	542 }
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	543
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	544 octave_value
d08901c05c1b fix bug in class assignment to undefined object with index John W. Eaton <jwe@octave.org> parents: 12127 diff changeset	545 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	546 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	547 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	548 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	549 {
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	550 octave_value retval;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	551
26525 0d3eca5955dc Backed out changeset 920a4ad8043b (bug #54995) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	552 if (! (in_class_method () \|\| called_from_builtin ()))
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	553 {
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	554 octave::symbol_table& symtab
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	555 = octave::__get_symbol_table__ ("octave_class::subsasgn_common");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	556
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	557 octave_value meth = symtab.find_method ("subsasgn", class_name ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	558
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	559 if (meth.is_defined ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	560 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	561 octave_value_list args;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	562
9333 3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	563 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	564 {
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	565 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	566 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	567 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	568 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	569 }
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	570 else
3930f8ce6430 Unpack cs-list and setup nargin for call to subsasgn method Jaroslav Hajek <highegg@gmail.com> parents: 9331 diff changeset	571 args(2) = rhs;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	572
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	573 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	574 args(0) = obj;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	575
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21743 diff changeset	576 // Now comes the magic. Count copies with me:
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	577 // 1. myself (obsolete)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	578 // 2. the copy inside args (obsolete)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	579 // 3. the copy in method's symbol table (working)
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	580 // ... possibly more (not obsolete).
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	581 //
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	582 // 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	583 // 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	584 // to the optimization.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	585 // It is essential that the handling function doesn't store extra
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21743 diff changeset	586 // copies anywhere. If it does, things will not break but the
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	587 // optimization won't work.
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	588
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	589 octave_value_list tmp;
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	590
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	591 if (m_obsolete_copies == 0 && meth.is_user_function ()
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	592 && meth.user_function_value ()->subsasgn_optimization_ok ())
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	593 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	594 octave::unwind_protect_var<int> restore_var (m_obsolete_copies);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	595 m_obsolete_copies = 2;
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	596
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	597 tmp = octave::feval (meth.function_value (), args);
9522 e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	598 }
e79470be3ecb implement subsasgn this-arg optimization Jaroslav Hajek <highegg@gmail.com> parents: 9521 diff changeset	599 else
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	600 tmp = octave::feval (meth.function_value (), args);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	601
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	602 // 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	603 // more than one value?
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	604
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	605 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	606 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	607 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	608
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	609 else
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	610 retval = tmp(0);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	611
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	612 return retval;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	613 }
8785 70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8782 diff changeset	614 }
70f5a0375afd oct-map.h: fix think-o in previous change John W. Eaton <jwe@octave.org> parents: 8782 diff changeset	615
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	616 // 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	617 // attempting to do the indexed assignment.
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	618
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	619 std::string method_class = get_current_method_class ();
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	620
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	621 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	622 if (obvp != this)
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	623 {
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	624
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	625 if (! obvp)
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	626 error ("malformed class");
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	627
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	628 obvp->subsasgn (type, idx, rhs);
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	629
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	630 count++;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	631 retval = octave_value (this);
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	632
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	633 return retval;
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	634 }
b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	635
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	636 // 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	637 // octave_struct::subsasgn. Maybe it could be shared instead of
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	638 // duplicated.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	639
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	640 int n = type.length ();
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	641
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	642 octave_value t_rhs = rhs;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	643
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	644 if (n > 1 && ! (type.length () == 2 && type[0] == '(' && type[1] == '.'))
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	645 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	646 switch (type[0])
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	647 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	648 case '(':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	649 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	650 if (type.length () > 1 && type[1] == '.')
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	651 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	652 auto p = idx.begin ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	653 octave_value_list t_idx = *p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	654
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	655 octave_value_list key_idx = *++p;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	656
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	657 panic_if (key_idx.length () != 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	658
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	659 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	660
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	661 octave_value u;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	662
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	663 if (! m_map.contains (key))
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	664 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	665 else
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	666 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	667 Cell map_val = m_map.contents (key);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	668
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	669 Cell map_elt = map_val.index (idx.front (), true);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	670
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	671 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	672 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	673
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	674 std::list<octave_value_list> next_idx (idx);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	675
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	676 // 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	677 // needs to skip both of them.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	678
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	679 next_idx.erase (next_idx.begin ());
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	680 next_idx.erase (next_idx.begin ());
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	681
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	682 u.make_unique ();
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	683
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	684 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	685 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	686 else
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	687 err_invalid_index_for_assignment ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	688 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	689 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	690
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	691 case '.':
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	692 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	693 octave_value_list key_idx = idx.front ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	694
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	695 panic_if (key_idx.length () != 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	696
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	697 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	698
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	699 std::list<octave_value_list> next_idx (idx);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	700
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	701 next_idx.erase (next_idx.begin ());
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	702
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	703 std::string next_type = type.substr (1);
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	704
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	705 Cell tmpc (1, 1);
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	706 auto pkey = m_map.seek (key);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	707 if (pkey != m_map.end ())
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	708 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	709 m_map.contents (pkey).make_unique ();
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	710 tmpc = m_map.contents (pkey);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	711 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	712
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	713 // 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	714 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	715 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	716
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	717 octave_value& tmp = tmpc(0);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	718
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	719 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	720 {
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	721 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	722 tmp.make_unique (); // probably a no-op.
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	723 }
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	724 else
21118 3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	725 // 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	726 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	727
3ac9f47fb04b Invert pattern if/code/else/err_XXX to if !/err_XXX/code. Rik <rik@octave.org> parents: 21102 diff changeset	728 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	729 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	730 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	731
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	732 case '{':
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	733 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	734 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	735
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	736 default:
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	737 panic_impossible ();
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	738 }
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	739 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	740
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	741 switch (type[0])
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	742 {
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	743 case '(':
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	744 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	745 if (n > 1 && type[1] == '.')
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	746 {
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	747 auto p = idx.begin ();
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	748 octave_value_list key_idx = *++p;
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	749
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	750 panic_if (key_idx.length () != 1);
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 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	753
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	754 m_map.assign (idx.front (), key, t_rhs);
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	755
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	756 count++;
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	757 retval = octave_value (this);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	758 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	759 else
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	760 {
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23586 diff changeset	761 if (t_rhs.isobject () \|\| t_rhs.isstruct ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	762 {
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	763 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	764
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	765 m_map.assign (idx.front (), rhs_map);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	766
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	767 count++;
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	768 retval = octave_value (this);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	769 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	770 else
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	771 {
23577 80c42f4cca13 maint: Deprecate is_empty and replace with isempty. Rik <rik@octave.org> parents: 23576 diff changeset	772 if (! t_rhs.isempty ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	773 error ("invalid class assignment");
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20584 diff changeset	774
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	775 m_map.delete_elements (idx.front ());
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	776
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	777 count++;
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	778 retval = octave_value (this);
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	779 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	780 }
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	781 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	782 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	783
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	784 case '.':
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	785 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	786 octave_value_list key_idx = idx.front ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	787
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	788 panic_if (key_idx.length () != 1);
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	789
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	790 std::string key = key_idx(0).string_value ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	791
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	792 if (t_rhs.is_cs_list ())
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	793 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	794 Cell tmp_cell = Cell (t_rhs.list_value ());
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	795
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	796 // 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	797 // 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	798 // 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	799
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	800 if (numel () == tmp_cell.numel ())
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	801 tmp_cell = tmp_cell.reshape (dims ());
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	802
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	803 m_map.setfield (key, tmp_cell);
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	804 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	805 else
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	806 {
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	807 Cell tmp_cell(1, 1);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	808 tmp_cell(0) = t_rhs.storable_value ();
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	809 m_map.setfield (key, tmp_cell);
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	810 }
12127 b83162e8f402 fix nested indexed assignemnt in superclasses Jaroslav Hajek <highegg@gmail.com> parents: 11586 diff changeset	811
30139 c789e728d57a Backed out changeset 938794bc82b7 John W. Eaton <jwe@octave.org> parents: 30133 diff changeset	812 count++;
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	813 retval = octave_value (this);
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	814 }
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	815 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	816
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	817 case '{':
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	818 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	819 break;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	820
20743 b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	821 default:
b6408331bfa2 eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20711 diff changeset	822 panic_impossible ();
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	823 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	824
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	825 return retval;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	826 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	827
29569 29a1f8fd8ee6 move idx_vector classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 29478 diff changeset	828 octave::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	829 octave_class::index_vector (bool require_integers) const
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	830 {
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	831 octave::symbol_table& symtab
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	832 = octave::__get_symbol_table__ ("octave_class::index_vector");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	833
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	834 octave_value meth = symtab.find_method ("subsindex", class_name ());
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	835
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	836 if (! meth.is_defined ())
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	837 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	838 class_name ().c_str ());
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	839
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	840 octave_value_list args;
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	841 args(0) = octave_value (new octave_class (m_map, c_name, m_parent_list));
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	842
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	843 octave_value_list tmp = octave::feval (meth.function_value (), args, 1);
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	844
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23586 diff changeset	845 if (tmp(0).isobject ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	846 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	847
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	848 // 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	849 // (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	850 // 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	851 // expects it to be one based.
28631 70cdf8de553d move non-member octave_value operator functions to octave namespace John W. Eaton <jwe@octave.org> parents: 28444 diff changeset	852 return octave::binary_op (octave_value::op_add, tmp (0),
30346 91c6288781ba maint: Shorten some long lines in libinterp to <= 80 characters (bug #57599) Rik <rik@octave.org> parents: 30139 diff changeset	853 octave_value (1.0)).index_vector (require_integers);
8154 265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	854 }
265a821f6555 Add subsindex and ismethod functions David Bateman <dbateman@free.fr> parents: 7972 diff changeset	855
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	856 std::size_t
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	857 octave_class::byte_size (void) const
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	858 {
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	859 // Neglect the size of the fieldnames.
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	860
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29476 diff changeset	861 std::size_t retval = 0;
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	862
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	863 for (auto it = m_map.cbegin (); it != m_map.cend (); it++)
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	864 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	865 std::string key = m_map.key (it);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	866
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	867 octave_value val = octave_value (m_map.contents (it));
9529 8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	868
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	869 retval += val.byte_size ();
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	870 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	871
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	872 return retval;
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	873 }
8e5009334661 partially revert e79470be3ecb Jaroslav Hajek <highegg@gmail.com> parents: 9522 diff changeset	874
21725 78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	875 bool
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	876 octave_class::is_true (void) const
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	877 {
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	878 bool retval = false;
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	879
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	880 octave::symbol_table& symtab
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27210 diff changeset	881 = octave::__get_symbol_table__ ("octave_class::is_true");
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	882
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	883 octave_value meth = symtab.find_method ("logical", class_name ());
21725 78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	884
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	885 if (meth.is_defined ())
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	886 {
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	887 octave_value in = new octave_class (*this);
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	888
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	889 octave_value_list tmp = octave::feval (meth.function_value (), in, 1);
21725 78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	890 retval = tmp(0).is_true ();
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	891 }
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	892
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	893 return retval;
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	894 }
78e0b187904b Call @class/logical method for objects in conditional expressions (bug #43097) Mike Miller <mtmiller@octave.org> parents: 21724 diff changeset	895
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	896 string_vector
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	897 octave_class::map_keys (void) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	898 {
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	899 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	900 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	901
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	902 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	903 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	904 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	905 octave_base_value *retval = nullptr;
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	906
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	907 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	908 retval = this;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	909 else
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	910 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	911 for (auto& par : m_parent_list)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	912 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	913 octave_map::const_iterator smap = m_map.seek (par);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	914
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	915 const Cell& tmp = m_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	916
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	917 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	918
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	919 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	920
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	921 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	922
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	923 if (retval)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	924 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	925 }
9148 69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	926 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	927
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	928 return retval;
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	929 }
69e6bbfef8c2 ov-class.cc: protect against possiblly invalid octave_value -> string conversions John W. Eaton <jwe@octave.org> parents: 9147 diff changeset	930
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	931 octave_base_value *
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	932 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	933 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23450 diff changeset	934 octave_base_value *retval = nullptr;
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	935
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	936 if (parent_class_name == class_name ())
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	937 retval = this;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	938 else
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	939 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	940 for (auto& par : m_parent_list)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	941 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	942 auto smap = m_map.seek (par);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	943
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	944 Cell& tmp = m_map.contents (smap);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	945
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	946 octave_value& vtmp = tmp(0);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	947
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	948 octave_base_value *obvp = vtmp.internal_rep ();
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	949
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	950 // 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	951 retval = obvp->find_parent_class (parent_class_name);
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	952
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	953 if (retval)
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	954 {
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	955 vtmp.make_unique ();
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	956 obvp = vtmp.internal_rep ();
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	957 retval = obvp->unique_parent_class (parent_class_name);
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	958
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	959 break;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	960 }
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	961 }
9767 0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	962 }
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	963
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	964 return retval;
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	965 }
0df32e0b2074 fix base class field assignment Jaroslav Hajek <highegg@gmail.com> parents: 9691 diff changeset	966
19103 56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	967 bool
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	968 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	969 {
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	970 bool retval = false;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	971
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	972 if (cls_name == class_name ())
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	973 retval = true;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	974 else
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	975 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	976 for (auto& par : m_parent_list)
19103 56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	977 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	978 octave_map::const_iterator smap = m_map.seek (par);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	979
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	980 const Cell& tmp = m_map.contents (smap);
19103 56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	981
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	982 const octave_value& vtmp = tmp(0);
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	983
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	984 retval = vtmp.is_instance_of (cls_name);
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	985
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	986 if (retval)
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	987 break;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	988 }
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	989 }
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	990
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	991 return retval;
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	992 }
56bc1464ec59 Implement "isa" for classdef objects. Michael Goffioul <michael.goffioul@gmail.com> parents: 18881 diff changeset	993
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	994 string_vector
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20979 diff changeset	995 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	996 {
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	997 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	998
23693 b9378eff6d13 move symbol_table class inside octave namespace John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	999 octave::symbol_table& symtab
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	1000 = octave::__get_symbol_table__ ("octave_class::string_vector_value");
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	1001
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	1002 octave_value meth = symtab.find_method ("char", class_name ());
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	1003
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1004 if (! meth.is_defined ())
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1005 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	1006
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1007 octave_value_list args;
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1008 args(0) = octave_value (new octave_class (m_map, c_name, m_parent_list));
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1009
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1010 octave_value_list tmp = octave::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	1011
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1012 if (tmp.length () >= 1)
3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1013 {
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1014 if (! tmp(0).is_string ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1015 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	1016
20990 fc9cca99b2de Deprecate all_strings, replace with string_vector_value. Rik <rik@octave.org> parents: 20979 diff changeset	1017 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	1018 }
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	1019
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	1020 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	1021 }
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	1022
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1023 void
18416 bcd71a2531d3 Support disp/display overloading in classdef Michael Goffioul <michael.goffioul@gmail.com> parents: 18409 diff changeset	1024 octave_class::print (std::ostream& os, bool)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1025 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1026 print_raw (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1027 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1028
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1029 void
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1030 octave_class::print_raw (std::ostream& os, bool) const
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1031 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1032 indent (os);
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23795 diff changeset	1033 os << " <class " << class_name () << '>';
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1034 newline (os);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1035 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1036
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1037 // 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	1038 // 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	1039 // with no arguments.
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1040 bool
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1041 octave_class::reconstruct_exemplar (void)
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 bool retval = false;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1044
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	1045 octave_class::exemplar_const_iterator it
416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	1046 = octave_class::exemplar_map.find (c_name);
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1047
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1048 if (it != octave_class::exemplar_map.end ())
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1049 retval = true;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1050 else
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1051 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1052 octave::interpreter& interp
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1053 = octave::__get_interpreter__ ("octave_class::reconstruct_exemplar");
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1054
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1055 octave::symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	1056
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	1057 octave_value ctor = symtab.find_method (c_name, c_name);
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1058
12178 a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1059 bool have_ctor = false;
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1060
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1061 if (ctor.is_defined () && ctor.is_function ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1062 {
12178 a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1063 octave_function *fcn = ctor.function_value ();
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1064
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1065 if (fcn && fcn->is_class_constructor (c_name))
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1066 have_ctor = true;
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1067
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1068 // Something has gone terribly wrong if
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1069 // 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	1070 // a class constructor for the class c_name...
30723 08b08b7f05b2 Replace direct calls to C library assert() with Octave specialty functions in libinterp/ (bug #61753) Arun Giridhar <arungiridhar@gmail.com> and Rik <rik@octave.org> parents: 30565 diff changeset	1071 panic_unless (have_ctor);
12178 a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1072 }
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1073
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1074 if (have_ctor)
a71c1aa9823e fix construction of class exemplars John W. Eaton <jwe@octave.org> parents: 12171 diff changeset	1075 {
21743 f4d7d0eb5b0c use namespace for unwind_protect class John W. Eaton <jwe@octave.org> parents: 21739 diff changeset	1076 octave::unwind_protect frame;
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1077
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1078 // 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	1079
29956 a956ca6698d2 move some error handling functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29655 diff changeset	1080 octave::interpreter_try (frame);
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1081
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1082 bool execution_error = false;
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1083
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1084 octave_value_list result;
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1085
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1086 try
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1087 {
23501 1ee4b394a687 use feval instead of do_multi_index_op John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	1088 result = octave::feval (ctor, ovl (), 1);
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1089 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	1090 catch (const octave::execution_exception&)
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1091 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1092 interp.recover_from_exception ();
20756 200ae1d650b7 propagate octave_execution_exception objects through try/catch blocks John W. Eaton <jwe@octave.org> parents: 20747 diff changeset	1093
20535 b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1094 execution_error = true;
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1095 }
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1096
b70cc4bd8109 begin removal of global error_state variable John W. Eaton <jwe@octave.org> parents: 20495 diff changeset	1097 if (! execution_error && result.length () == 1)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1098 retval = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1099 }
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1100 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1101 warning ("no constructor for class %s", c_name.c_str ());
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1102 }
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1103
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1104 return retval;
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1105 }
7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1106
9240 f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1107 void
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1108 octave_class::clear_exemplar_map (void)
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1109 {
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1110 exemplar_map.clear ();
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1111 }
f27a8c07f0b2 clear -classes and support. Robert T. Short <octave@phaselockedsystems.com> parents: 9206 diff changeset	1112
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1113 // 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	1114 // class inheritance structure. reconstruct_parents () attempts to
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1115 // 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	1116 //
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1117 // 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	1118 // 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	1119 // to do its magic.
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1120 bool
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1121 octave_class::reconstruct_parents (void)
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1122 {
18100 6a71e5030df5 Follow coding convention of defining and initializing only 1 variable per line in liboctinterp. Rik <rik@octave.org> parents: 18033 diff changeset	1123 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	1124 bool might_have_inheritance = false;
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1125 std::string dbgstr = "dork";
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1126
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1127 // First, check to see if there might be an issue with inheritance.
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1128 for (auto it = m_map.cbegin (); it != m_map.cend (); it++)
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1129 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1130 std::string key = m_map.key (it);
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1131 Cell val = m_map.contents (it);
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23586 diff changeset	1132 if (val(0).isobject ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1133 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1134 dbgstr = "blork";
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18637 diff changeset	1135 if (key == val(0).class_name ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1136 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1137 might_have_inheritance = true;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1138 dbgstr = "cork";
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1139 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1140 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1141 }
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1142 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1143
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1144 if (might_have_inheritance)
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1145 {
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	1146 octave_class::exemplar_const_iterator it
416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	1147 = 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	1148
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1149 if (it == octave_class::exemplar_map.end ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1150 retval = false;
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1151 else
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 octave_class::exemplar_info exmplr = it->second;
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1154 m_parent_list = exmplr.parents ();
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1155 for (auto& par : m_parent_list)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1156 {
22871 50495eeb5df1 maint: Use C++ range feature to simplify some for loops in libinterp/octave-value. Rik <rik@octave.org> parents: 22755 diff changeset	1157 dbgstr = par;
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1158 bool dbgbool = m_map.contains (par);
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20939 diff changeset	1159 if (! dbgbool)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1160 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1161 retval = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1162 break;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1163 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1164 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1165 }
9182 23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1166 }
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1167
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1168 return retval;
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1169 }
23af5910e5f5 make load work for derived classses Robert T. Short <octave@phaselockedsystems.com> parents: 9156 diff changeset	1170
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1171 bool
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1172 octave_class::save_ascii (std::ostream& os)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1173 {
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1174 os << "# classname: " << class_name () << "\n";
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1175 octave_map m;
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1176
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1177 octave::load_path& lp = octave::__get_load_path__ ("octave_class::save_ascii");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1178
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1179 if (lp.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	1180 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1181 octave_value in = new octave_class (*this);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1182 octave_value_list tmp = octave::feval ("saveobj", in, 1);
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1183
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1184 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	1185 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1186 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1187 m = map_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1188
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1189 os << "# length: " << m.nfields () << "\n";
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1190
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	1191 auto i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1192 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1193 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1194 octave_value val = m_map.contents (i);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1195
20447 c6224b4e7774 maint: Rename instances of LS_ASCII to LS_TEXT for clarity. Rik <rik@octave.org> parents: 20232 diff changeset	1196 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	1197
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1198 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	1199 return ! os.fail ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1200
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1201 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1202 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1203
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1204 return true;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1205 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1206
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1207 bool
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1208 octave_class::load_ascii (std::istream& is)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1209 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1210 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	1211 std::string classname;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1212
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1213 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	1214 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	1215
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1216 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	1217 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	1218
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1219 if (len > 0)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1220 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1221 octave_map m (m_map);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1222
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1223 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	1224 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1225 octave_value t2;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1226 bool dummy;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1227
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1228 // recurse to read cell elements
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1229 std::string nm
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1230 = 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	1231
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1232 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1233 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1234
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23553 diff changeset	1235 Cell tcell = (t2.iscell () ? 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	1236
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1237 m.assign (nm, tcell);
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1238 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1239
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1240 if (! is)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1241 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	1242
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1243 c_name = classname;
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1244 reconstruct_exemplar ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1245
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1246 m_map = m;
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1247
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1248 if (! reconstruct_parents ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1249 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	1250
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1251 octave::load_path& lp = octave::__get_load_path__ ("octave_class::load_ascii");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1252
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1253 if (lp.find_method (classname, "loadobj") != "")
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1254 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1255 octave_value in = new octave_class (*this);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1256 octave_value_list tmp = octave::feval ("loadobj", in, 1);
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1257
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1258 m_map = tmp(0).map_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1259 }
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1260 }
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1261 else if (len == 0)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1262 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1263 m_map = octave_map (dim_vector (1, 1));
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1264 c_name = classname;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1265 }
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1266 else
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1267 panic_impossible ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1268
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	1269 return true;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1270 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1271
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1272 bool
26399 586413770c7f pass save_as_floats by value in octave_value save_binary functions John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1273 octave_class::save_binary (std::ostream& os, bool save_as_floats)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1274 {
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	1275 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	1276
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1277 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	1278 os << class_name ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1279
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1280 octave_map m;
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1281
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1282 octave::load_path& lp = octave::__get_load_path__ ("octave_class::save_binary");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1283
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1284 if (lp.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	1285 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1286 octave_value in = new octave_class (*this);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1287 octave_value_list tmp = octave::feval ("saveobj", in, 1);
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1288
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1289 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	1290 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1291 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1292 m = map_value ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1293
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	1294 int32_t len = m.nfields ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1295 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	1296
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	1297 auto i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1298 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1299 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1300 octave_value val = m_map.contents (i);
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 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	1303
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1304 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	1305 return ! os.fail ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1306
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1307 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1308 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1309
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1310 return true;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1311 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1312
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1313 bool
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1314 octave_class::load_binary (std::istream& is, bool swap,
21739 c4ab2e54f100 use namespace for oct_mach_info class John W. Eaton <jwe@octave.org> parents: 21725 diff changeset	1315 octave::mach_info::float_format fmt)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1316 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1317 bool success = true;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1318
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1319 int32_t classname_len;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1320
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1321 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	1322 if (! is)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1323 return false;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1324 else if (swap)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1325 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	1326
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1327 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1328 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	1329 classname[classname_len] = '\0';
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1330 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	1331 return false;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1332 c_name = classname;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1333 }
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1334 reconstruct_exemplar ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1335
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1336 int32_t len;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1337 if (! is.read (reinterpret_cast<char *> (&len), 4))
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1338 return false;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1339 if (swap)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1340 swap_bytes<4> (&len);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1341
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1342 if (len > 0)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1343 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1344 octave_map m (m_map);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1345
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1346 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	1347 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1348 octave_value t2;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1349 bool dummy;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1350 std::string doc;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1351
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1352 // recurse to read cell elements
21017 93748bcaec17 maint: Replace emtpy 'std::string ()' calls with "". Rik <rik@octave.org> parents: 20990 diff changeset	1353 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	1354 dummy, t2, doc);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1355
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1356 if (! is)
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1357 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1358
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23553 diff changeset	1359 Cell tcell = (t2.iscell () ? 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	1360
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1361 m.assign (nm, tcell);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1362 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1363
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1364 if (is)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1365 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1366 m_map = m;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1367
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1368 if (! reconstruct_parents ())
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1369 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	1370
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1371 octave::load_path& lp = octave::__get_load_path__ ("octave_class::load_binary");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1372
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1373 if (lp.find_method (c_name, "loadobj") != "")
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1374 {
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1375 octave_value in = new octave_class (*this);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1376 octave_value_list tmp = octave::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	1377
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1378 m_map = tmp(0).map_value ();
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1379 }
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1380 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1381 else
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1382 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1383 warning ("load: failed to load class");
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1384 success = false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1385 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1386 }
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18637 diff changeset	1387 else if (len == 0)
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1388 m_map = octave_map (dim_vector (1, 1));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1389 else
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1390 panic_impossible ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1391
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1392 return success;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1393 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1394
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	1395 bool
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1396 octave_class::save_hdf5 (octave_hdf5_id loc_id, const char *name,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1397 bool save_as_floats)
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	1398 {
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1399 #if defined (HAVE_HDF5)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1400
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1401 hsize_t hdims[3];
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1402 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	1403 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	1404 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	1405 hid_t class_hid = -1;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1406 hid_t data_hid = -1;
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1407 octave_map m;
8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1408 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	1409
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1410 octave::load_path& lp = octave::__get_load_path__ ("octave_class::save_hdf5");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1411
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1412 #if defined (HAVE_HDF5_18)
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1413 group_hid = H5Gcreate (loc_id, name, octave_H5P_DEFAULT, octave_H5P_DEFAULT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 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 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1416 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	1417 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1418 if (group_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1419 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1420
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1421 // 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	1422 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	1423 if (type_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1424 goto error_cleanup;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1425
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1426 hdims[0] = 0;
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	1427 space_hid = H5Screate_simple (0, hdims, nullptr);
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1428 if (space_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1429 goto error_cleanup;
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1430 #if defined (HAVE_HDF5_18)
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	1431 class_hid = H5Dcreate (group_hid, "classname", type_hid, space_hid,
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1432 octave_H5P_DEFAULT, octave_H5P_DEFAULT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1433 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	1434 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1435 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	1436 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	1437 #endif
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1438 if (class_hid < 0 \|\| H5Dwrite (class_hid, type_hid, octave_H5S_ALL,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1439 octave_H5S_ALL, octave_H5P_DEFAULT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1440 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	1441 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1442
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1443 #if defined (HAVE_HDF5_18)
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1444 data_hid = H5Gcreate (group_hid, "value", octave_H5P_DEFAULT,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1445 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	1446 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1447 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	1448 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1449 if (data_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1450 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1451
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1452 if (lp.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	1453 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1454 octave_value in = new octave_class (*this);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1455 octave_value_list tmp = octave::feval ("saveobj", in, 1);
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1456
c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1457 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	1458 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1459 else
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1460 m = map_value ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1461
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1462 // 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	1463 i = m.begin ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1464 while (i != m.end ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1465 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1466 octave_value val = m_map.contents (i);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1467
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1468 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	1469 save_as_floats);
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 if (! retval2)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1472 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1473
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1474 i++;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1475 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1476
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1477 error_cleanup:
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1478
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1479 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1480 H5Gclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1481
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1482 if (class_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1483 H5Dclose (class_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1484
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1485 if (space_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1486 H5Sclose (space_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1487
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1488 if (type_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1489 H5Tclose (type_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1490
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1491 if (group_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1492 H5Gclose (group_hid);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1493
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1494 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	1495
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	1496 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1497 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1498 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1499 octave_unused_parameter (save_as_floats);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1500
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	1501 warn_save ("hdf5");
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1502
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	1503 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	1504 #endif
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1505 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1506
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1507 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	1508 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	1509 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1510 bool retval = false;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1511
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	1512 #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	1513
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1514 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	1515 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	1516 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	1517 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	1518 hid_t space_hid = -1;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1519 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	1520 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	1521
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1522 hdf5_callback_data dsub;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1523
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1524 herr_t retval2 = 0;
10768 8a868004a437 use octave_map for octave_class Jaroslav Hajek <highegg@gmail.com> parents: 10742 diff changeset	1525 octave_map m (dim_vector (1, 1));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1526 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	1527 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	1528 int slen = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1529 hsize_t rank = 0;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1530
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1531 #if defined (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	1532 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	1533 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1534 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	1535 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1536 if (group_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1537 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1538
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1539 #if defined (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	1540 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	1541 #else
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1542 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	1543 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1544
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1545 if (data_hid < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1546 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1547
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1548 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	1549
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1550 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	1551
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1552 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	1553 goto error_cleanup;
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 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	1556 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	1557
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1558 if (rank != 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1559 goto error_cleanup;
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 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	1562 if (slen < 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1563 goto error_cleanup;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1564
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1565 // 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	1566 do
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1567 {
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1568 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	1569
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1570 // 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	1571 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	1572 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	1573
22407 34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1574 if (H5Dread (data_hid, st_id, octave_H5S_ALL, octave_H5S_ALL,
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1575 octave_H5P_DEFAULT, classname)
34ce5be04942 maint: Style check C++ code in libinterp/. Rik <rik@octave.org> parents: 22327 diff changeset	1576 < 0)
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1577 {
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1578 H5Tclose (st_id);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1579 H5Dclose (data_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1580 H5Gclose (group_hid);
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1581 return false;
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1582 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1583
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1584 H5Tclose (st_id);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1585 H5Dclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1586 data_hid = -1;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1587
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1588 c_name = classname;
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1589 }
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1590 while (0);
9190 7a10410db2c6 [mq]: x Robert T. Short <rtshort@ieee.org> parents: 9182 diff changeset	1591 reconstruct_exemplar ();
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1592
21211 2cf8bc5c7017 use "#if defined (HAVE_FOO)" instead of "#if HAVE_FOO" for feature tests John W. Eaton <jwe@octave.org> parents: 21200 diff changeset	1593 #if defined (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	1594 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	1595 #else
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1596 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	1597 #endif
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1598 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	1599 H5Gclose (subgroup_hid);
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1600
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1601 while (current_item < static_cast<int> (num_obj)
22028 5c949eecb6dd use int64_t for octave_hdf5_id (bug #47858) Stefan Miereis <stefan.miereis@gmx.de> parents: 22022 diff changeset	1602 && (retval2 = hdf5_h5g_iterate (group_hid, name, &current_item,
5c949eecb6dd use int64_t for octave_hdf5_id (bug #47858) Stefan Miereis <stefan.miereis@gmx.de> parents: 22022 diff changeset	1603 &dsub)) > 0)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1604 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1605 octave_value t2 = dsub.tc;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1606
23576 00e518162fda maint: Deprecate is_cell and replace with iscell. Rik <rik@octave.org> parents: 23553 diff changeset	1607 Cell tcell = (t2.iscell () ? 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	1608
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1609 m.assign (dsub.name, tcell);
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1610
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1611 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1612
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1613 if (retval2 >= 0)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1614 {
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1615 m_map = m;
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1616
20955 77f5591878bf maint: Use '! expr' rather than '!expr' to conform to coding guidelines. Rik <rik@octave.org> parents: 20939 diff changeset	1617 if (! reconstruct_parents ())
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1618 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	1619
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	1620 octave::load_path& lp = octave::__get_load_path__ ("octave_class::load_hdf5");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1621
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	1622 if (lp.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	1623 {
9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1624 octave_value in = new octave_class (*this);
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23052 diff changeset	1625 octave_value_list tmp = octave::feval ("loadobj", in, 1);
17473 9849075a5da6 allow objects to load if constructor fails but loadobj method succeeds John W. Eaton <jwe@octave.org> parents: 16071 diff changeset	1626
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1627 m_map = tmp(0).map_value ();
20561 c41595061186 eliminate more simple uses of error_state John W. Eaton <jwe@octave.org> parents: 20535 diff changeset	1628 retval = true;
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1629 }
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1630 }
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	1631
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1632 error_cleanup:
8212 ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1633 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1634 H5Dclose (data_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1635
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1636 if (data_hid > 0)
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1637 H5Gclose (group_hid);
ebf6f6a0f9a7 Allow saving/loading of classes. Add saveobj and loadobj methods David Bateman <dbateman@free.fr> parents: 8154 diff changeset	1638
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	1639 #else
21691 263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1640 octave_unused_parameter (loc_id);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1641 octave_unused_parameter (name);
263d18409fdf Eliminate unused variable warnings for conditionally compiled code. John W. Eaton <jwe@octave.org> parents: 21660 diff changeset	1642
21102 dfcb9d74b253 Rename local gripe_XXX functions to err_XXX or warn_XXX. Rik <rik@octave.org> parents: 21100 diff changeset	1643 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	1644 #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	1645
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1646 return retval;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1647 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1648
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1649 mxArray *
28126 4c21f99b4ad5 handle interleaved complex data and new typed data access functions for mex John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	1650 octave_class::as_mxArray (bool) const
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1651 {
21100 e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme. Rik <rik@octave.org> parents: 21072 diff changeset	1652 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	1653 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1654
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1655 bool
9581 3d0d2bda3a0f fix previous change, avoid duplicate loads of methods in descendant classes Jaroslav Hajek <highegg@gmail.com> parents: 9580 diff changeset	1656 octave_class::in_class_method (void)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1657 {
27210 bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	1658 octave::tree_evaluator& tw
bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	1659 = octave::__get_evaluator__ ("octave_class::in_class_method");
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	1660
27210 bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	1661 octave_function *fcn = tw.current_function ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1662
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1663 return (fcn
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1664 && (fcn->is_class_method ()
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1665 \|\| fcn->is_class_constructor ()
13241 2a8dcb5b3a00 improve default indexing for objects John W. Eaton <jwe@octave.org> parents: 13112 diff changeset	1666 \|\| fcn->is_anonymous_function_of_class ()
10315 57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1667 \|\| fcn->is_private_function_of_class (class_name ()))
57a59eae83cc untabify src C++ source files John W. Eaton <jwe@octave.org> parents: 10272 diff changeset	1668 && find_parent_class (fcn->dispatch_class ()));
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1669 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1670
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1671 octave_class::exemplar_info::exemplar_info (const octave_value& obj)
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1672 : m_field_names (), m_parent_class_names ()
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1673 {
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23586 diff changeset	1674 if (! obj.isobject ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1675 error ("invalid call to exemplar_info constructor");
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1676
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1677 octave_map m = obj.map_value ();
29466 7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1678 m_field_names = m.keys ();
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1679
7c8a70e4daad use "m_" prefix for class members in a few more classes John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1680 m_parent_class_names = obj.parent_class_name_list ();
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1681 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1682
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1683 // A map from class names to lists of fields.
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1684 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	1685
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1686 bool
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1687 octave_class::exemplar_info::compare (const octave_value& obj) const
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1688 {
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1689
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23586 diff changeset	1690 if (! obj.isobject ())
20962 3aa293be0e8d maint: Invert simple conditionals in if/else/error paradigm. Rik <rik@octave.org> parents: 20955 diff changeset	1691 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	1692
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1693 if (nfields () != obj.nfields ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1694 error ("mismatch in number of fields");
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1695
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1696 octave_map obj_map = obj.map_value ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1697 string_vector obj_fnames = obj_map.keys ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1698 string_vector fnames = fields ();
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1699
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1700 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	1701 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1702 if (obj_fnames[i] != fnames[i])
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1703 error ("mismatch in field names");
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1704 }
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1705
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1706 if (nparents () != obj.nparents ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1707 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	1708
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	1709 const std::list<std::string> obj_parents
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1710 = obj.parent_class_name_list ();
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	1711 const 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	1712
25337 3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	1713 auto p = obj_parents.begin ();
3ff9192b676e use auto keyword to declare iterator variables where possible John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	1714 auto q = pnames.begin ();
20979 0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1715
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1716 while (p != obj_parents.end ())
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1717 {
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1718 if (p++ != q++)
0963ed389012 maint: invert if/else/error instances. John W. Eaton <jwe@octave.org> parents: 20962 diff changeset	1719 error ("mismatch in parent classes");
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1720 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1721
20879 5357423bca0a Code Sprint 2015: remove return/break/goto after error Andreas Weber <andy.weber.aw@gmail.com> parents: 20853 diff changeset	1722 return true;
9151 d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1723 }
d8f9588c6ba1 object exemplars John W. Eaton <jwe@octave.org> parents: 9148 diff changeset	1724
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29956 diff changeset	1725 OCTAVE_NAMESPACE_BEGIN
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29956 diff changeset	1726
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	1727 DEFMETHOD (class, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	1728 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1729 @deftypefn {} {@var{classname} =} class (@var{obj})
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	1730 @deftypefnx {} {@var{cls} =} class (@var{s}, @var{classname})
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	1731 @deftypefnx {} {@var{cls} =} class (@var{s}, @var{classname}, @var{parent1}, @dots{})
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	1732 Return the class of the object @var{obj}, or create a class with fields from
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	1733 structure @var{s} and name (string) @var{classname}.
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	1734
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	1735 Additional arguments name a list of parent classes from which the new class is
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	1736 derived.
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1737 @seealso{typeinfo, isa}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1738 @end deftypefn */)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1739 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1740 int nargin = args.length ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1741
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1742 if (nargin == 0)
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1743 print_usage ();
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1744
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1745 octave_value retval;
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1746
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1747 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	1748 // 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	1749 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	1750 else
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1751 {
15811 317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1752 // 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	1753 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	1754
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	1755 tree_evaluator& tw = interp.get_evaluator ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	1756
27210 bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	1757 octave_function *fcn = tw.caller_function ();
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1758
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1759 if (! fcn)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1760 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	1761
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1762 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	1763 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	1764 id.c_str ());
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1765
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1766 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	1767
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1768 if (nargin == 2)
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1769 retval
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1770 = 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	1771 else
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1772 {
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1773 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	1774
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1775 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	1776 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1777
25342 416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	1778 octave_class::exemplar_const_iterator it
416856765a55 be more careful with using auto in place of explicit const iterator decls John W. Eaton <jwe@octave.org> parents: 25337 diff changeset	1779 = octave_class::exemplar_map.find (id);
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1780
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1781 if (it == octave_class::exemplar_map.end ())
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1782 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	1783 else if (! it->second.compare (retval))
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1784 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	1785 id.c_str ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1786 }
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1787
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1788 return retval;
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1789 }
f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1790
15811 317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1791 /*
21317 a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	1792 %!assert (class (1.1), "double")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	1793 %!assert (class (single (1.1)), "single")
a4faec57f4c8 maint: remove semicolon after %!assert tests to follow Octave conventions. Rik <rik@octave.org> parents: 21301 diff changeset	1794 %!assert (class (uint8 (1)), "uint8")
23405 32ec90068be5 use %!testif runtime tests to properly skip java tests John W. Eaton <jwe@octave.org> parents: 23352 diff changeset	1795 %!testif HAVE_JAVA; usejava ("jvm")
15811 317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1796 %! 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	1797 %! 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	1798
22737 7abc25e6206a maint: Clean up code base to follow Octave coding conventions. Rik <rik@octave.org> parents: 22497 diff changeset	1799 ## Test Input Validation
15811 317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1800 %!error class ()
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1801 */
317f4857c1e1 Modify class() to return Java class name, not type name "octave_java". Rik <rik@octave.org> parents: 15785 diff changeset	1802
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1803 DEFUN (isa, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1804 doc: /* -- texinfo --
30559 841a10208c38 doc: Use TF for output variable in documentation for isXXX functions in libinterp/ directory. Rik <rik@octave.org> parents: 30346 diff changeset	1805 @deftypefn {} {@var{tf} =} isa (@var{obj}, @var{classname})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1806 Return true if @var{obj} is an object from the class @var{classname}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1807
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1808 @var{classname} may also be one of the following class categories:
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1809
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1810 @table @asis
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1811 @item @qcode{"float"}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1812 Floating point value comprising classes @qcode{"double"} and
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1813 @qcode{"single"}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1814
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1815 @item @qcode{"integer"}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1816 Integer value comprising classes (u)int8, (u)int16, (u)int32, (u)int64.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1817
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1818 @item @qcode{"numeric"}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1819 Numeric value comprising either a floating point or integer value.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1820 @end table
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1821
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1822 If @var{classname} is a cell array of string, a logical array of the same
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1823 size is returned, containing true for each class to which @var{obj}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1824 belongs to.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1825
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1826 @seealso{class, typeinfo}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1827 @end deftypefn */)
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1828 {
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1829 if (args.length () != 2)
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1830 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	1831
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1832 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	1833 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	1834 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	1835
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1836 boolNDArray matches (clsnames.dims (), false);
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1837
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1838 for (octave_idx_type idx = 0; idx < clsnames.numel (); idx++)
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1839 {
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1840 std::string cls = clsnames(idx);
bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1841 if (obj_cls == cls
23585 570170b6eb09 maint: Deprecate is_float_type and replace with isfloat. Rik <rik@octave.org> parents: 23584 diff changeset	1842 \|\| (cls == "float" && obj.isfloat ())
23580 2230f9e10fb3 maint: Deprecate is_integer_type and replace with isinteger. Rik <rik@octave.org> parents: 23577 diff changeset	1843 \|\| (cls == "integer" && obj.isinteger ())
23586 f6c5db0a02e7 maint: Deprecate is_numeric_type and replace with isnumeric. Rik <rik@octave.org> parents: 23585 diff changeset	1844 \|\| (cls == "numeric" && obj.isnumeric ())
20495 bf6c4433ed5f Clean up isa() function. Rik <rik@octave.org> parents: 20447 diff changeset	1845 \|\| 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	1846 matches(idx) = true;
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1847 }
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1848
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1849 return ovl (matches);
9147 5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1850 }
5579998f8acf Update to OOP facilities. rtshort@bristlecone.phaselocked.com parents: 9010 diff changeset	1851
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1852 /*
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 ("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	1854 %!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	1855 %!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	1856 %!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	1857 %!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	1858 %!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	1859 %!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	1860 %!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	1861 %!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	1862 %!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	1863 %!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	1864 %!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	1865 %!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	1866 %!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	1867 %!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	1868 %!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	1869 %!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	1870 %!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	1871 %!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	1872 %!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	1873 %!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	1874 %!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	1875 %!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	1876 %!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	1877 %!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	1878 %!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	1879 %!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	1880 %!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	1881
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1882 %!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	1883 %!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	1884 %!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	1885 %!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	1886 %!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	1887 %!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	1888 %!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	1889 %!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	1890 %!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	1891 %!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	1892 %!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	1893 %!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	1894 %!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	1895 %!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	1896 %!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	1897
23405 32ec90068be5 use %!testif runtime tests to properly skip java tests John W. Eaton <jwe@octave.org> parents: 23352 diff changeset	1898 %!testif HAVE_JAVA; usejava ("jvm")
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1899 %! ## 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	1900 %! ## 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	1901 %! ## 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	1902 %! ## will fail). So we test this too.
21580 ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21562 diff changeset	1903 %! assert (isa (javaObject ("java.lang.Double", 10), "java.lang.Number"));
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21562 diff changeset	1904 %! assert (isa (javaObject ("java.lang.Double", 10), "not_a_class"), false);
ecce63c99c3f maint: Add semicolons to terminate code in %! blocks. Rik <rik@octave.org> parents: 21562 diff changeset	1905 %! assert (isa (javaObject ("java.lang.Double", 10), "java.lang.Number"));
20028 107130a0490c isa: check parent class of java objects (bug #42702) Carnë Draug <carandraug@octave.org> parents: 19864 diff changeset	1906
18033 2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1907 %!test
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1908 %! 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	1909 %! 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	1910 */
2627aeca5032 isa: allow cell array of class names as input, plus remove __isa_parent__(). Carnë Draug <carandraug@octave.org> parents: 17787 diff changeset	1911
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1912 DEFUN (__parent_classes__, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1913 doc: /* -- texinfo --
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	1914 @deftypefn {} {@var{Ccls} =} __parent_classes__ (@var{x})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1915 Undocumented internal function.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1916 @end deftypefn */)
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 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 (args.length () != 1)
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1919 print_usage ();
9010 f914834836e7 Partial implementation of derived classes using the old form with "@" files. rtshort@smoketree.phaselocked.com parents: 8920 diff changeset	1920
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1921 octave_value arg = args(0);
492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1922
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23586 diff changeset	1923 if (arg.isobject ())
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1924 return ovl (Cell (arg.parent_class_names ()));
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1925 else
b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1926 return ovl (Cell ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1927 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1928
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1929 DEFUN (isobject, args, ,
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1930 doc: /* -- texinfo --
30559 841a10208c38 doc: Use TF for output variable in documentation for isXXX functions in libinterp/ directory. Rik <rik@octave.org> parents: 30346 diff changeset	1931 @deftypefn {} {@var{tf} =} isobject (@var{x})
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1932 Return true if @var{x} is a class object.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1933 @seealso{class, typeinfo, isa, ismethod, isprop}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1934 @end deftypefn */)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1935 {
20797 492738d32c60 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20756 diff changeset	1936 if (args.length () != 1)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1937 print_usage ();
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1938
23587 0c468af9dc00 maint: Deprecate is_object and replace with isobject. Rik <rik@octave.org> parents: 23586 diff changeset	1939 return ovl (args(0).isobject ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1940 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1941
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1942 static bool
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1943 is_built_in_class (const std::string& cn)
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1944 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1945 static std::set<std::string> built_in_class_names;
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1946
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1947 if (built_in_class_names.empty ())
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1948 {
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1949 built_in_class_names.insert ("double");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1950 built_in_class_names.insert ("single");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1951 built_in_class_names.insert ("cell");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1952 built_in_class_names.insert ("struct");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1953 built_in_class_names.insert ("logical");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1954 built_in_class_names.insert ("char");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1955 built_in_class_names.insert ("function handle");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1956 built_in_class_names.insert ("int8");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1957 built_in_class_names.insert ("uint8");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1958 built_in_class_names.insert ("int16");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1959 built_in_class_names.insert ("uint16");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1960 built_in_class_names.insert ("int32");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1961 built_in_class_names.insert ("uint32");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1962 built_in_class_names.insert ("int64");
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1963 built_in_class_names.insert ("uint64");
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
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1966 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	1967 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1968
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	1969 DEFMETHOD (superiorto, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	1970 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1971 @deftypefn {} {} superiorto (@var{class_name}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1972 When called from a class constructor, mark the object currently constructed
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1973 as having a higher precedence than @var{class_name}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1974
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1975 More that one such class can be specified in a single call. This function
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1976 may @emph{only} be called from a class constructor.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1977 @seealso{inferiorto}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	1978 @end deftypefn */)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1979 {
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	1980 tree_evaluator& tw = interp.get_evaluator ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	1981
27210 bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	1982 octave_function *fcn = tw.caller_function ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	1983
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	1984 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	1985 error ("superiorto: invalid call from outside class constructor");
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1986
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	1987 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	1988 {
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	1989 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	1990
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	1991 // 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	1992 // 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	1993 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	1994 break;
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	1995
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	1996 symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	1997
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	1998 std::string sup_class = fcn->name ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	1999 if (! symtab.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	2000 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	2001 sup_class.c_str (), inf_class.c_str ());
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2002 }
94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2003
21125 8f76684324b5 maint: change "return octave_value ()" to "return ovl ()". Rik <rik@octave.org> parents: 21118 diff changeset	2004 return ovl ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2005 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2006
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	2007 DEFMETHOD (inferiorto, interp, args, ,
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	2008 doc: /* -- texinfo --
21966 112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	2009 @deftypefn {} {} inferiorto (@var{class_name}, @dots{})
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	2010 When called from a class constructor, mark the object currently constructed
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	2011 as having a lower precedence than @var{class_name}.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	2012
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	2013 More that one such class can be specified in a single call. This function
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	2014 may @emph{only} be called from a class constructor.
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	2015 @seealso{superiorto}
112b20240c87 move docstrings in C++ files out of C strings and into comments John W. Eaton <jwe@octave.org> parents: 21751 diff changeset	2016 @end deftypefn */)
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2017 {
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2018 tree_evaluator& tw = interp.get_evaluator ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	2019
27210 bd684aad1821 eliminate some direct access to call stack in legacy class and function objects John W. Eaton <jwe@octave.org> parents: 26922 diff changeset	2020 octave_function *fcn = tw.caller_function ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23519 diff changeset	2021
20939 b17fda023ca6 maint: Use new C++ archetype in more files. Rik <rik@octave.org> parents: 20879 diff changeset	2022 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	2023 error ("inferiorto: invalid call from outside class constructor");
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2024
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2025 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	2026 {
20711 7b608fadc663 Make error messages more specific about the variable and problem encountered. Rik <rik@octave.org> parents: 20700 diff changeset	2027 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	2028
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2029 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	2030 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	2031 "precedence than built-in class");
16071 94e95309710c Whitespace cleanup Jordi Gutiérrez Hermoso <jordigh@octave.org> parents: 16070 diff changeset	2032
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2033 symbol_table& symtab = interp.get_symbol_table ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	2034
16070 e603ce23f20c Fix and improve functions related to class precedence (bug #38290) Julien Bect <julien.bect@supelec.fr> parents: 15813 diff changeset	2035 std::string inf_class = fcn->name ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23592 diff changeset	2036 if (! symtab.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	2037 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	2038 inf_class.c_str (), sup_class.c_str ());
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2039 }
5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2040
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	2041 return ovl ();
7338 5215422865e0 [project @ 2007-12-28 22:31:35 by jwe] jwe parents: diff changeset	2042 }
28427 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2043
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2044 // The following classes allow us to define "inline" function objects as
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2045 // legacy @class objects (as they appear to be in Matlab) while
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2046 // preserving the is_inline_function and function_value methods that
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2047 // were previously available in the octave_fcn_inline class. However,
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2048 // inline function objects no longer behave as octave_fcn_handle objects
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2049 // so calling is_function_handle for them no longer returns true. I see
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2050 // no reasonable way to preserve that behavior. The goal here is to
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2051 // allow most code that used the old octave_inline_fcn object to
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2052 // continue to work while eliminating the octave_inline_fcn class that
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2053 // was derived from the octave_fcn_handle class. Making that change
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2054 // appears to be necessary to properly fix function handle behavior and
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2055 // improve Matlab compatibility. It's unfortunate if this change causes
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2056 // trouble, but I see no better fix. Ultimately, we should replace all
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2057 // uses of "inline" function objects with anonymous functions.
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2058
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2059 class octave_inline;
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2060
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2061 // The following class can be removed once the
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2062 // octave_value::function_value method is removed.
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2063
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2064 class
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2065 octave_inline_fcn : public octave_function
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2066 {
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2067 public:
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2068
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2069 octave_inline_fcn (octave_inline *obj) : m_inline_obj (obj) { }
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2070
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2071 // No copying!
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2072
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2073 octave_inline_fcn (const octave_inline_fcn& ob) = delete;
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2074
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2075 octave_inline_fcn& operator = (const octave_inline_fcn& ob) = delete;
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2076
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2077 ~octave_inline_fcn (void) = default;
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2078
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2079 // Override default call method because we ultimately use feval to
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2080 // execute the inline function and that will push a stack frame.
28427 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2081
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2082 octave_value_list
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2083 call (tree_evaluator& tw, int nargout = 0,
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2084 const octave_value_list& args = octave_value_list ())
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2085 {
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2086 return execute (tw, nargout, args);
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2087 }
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2088
8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2089 octave_value_list
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2090 execute (tree_evaluator& tw, int nargout = 0,
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2091 const octave_value_list& args = octave_value_list ());
28427 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2092
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2093 private:
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2094
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2095 octave_inline *m_inline_obj;
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2096 };
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2097
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2098 // Once the octave_inline_fcn class is removed, we should also be able
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2099 // to eliminate the octave_inline class below and replace the
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2100 // octave_value::is_inline_function method with
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2101 //
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2102 // bool octave_value::is_inline_function (void) const
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2103 // {
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2104 // return class_name () == "inline";
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2105 // }
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2106
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2107 class
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2108 octave_inline : public octave_class
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2109 {
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2110 public:
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2111
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2112 octave_inline (const octave_map& m)
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2113 : octave_class (m, "inline"), m_fcn_obj (new octave_inline_fcn (this))
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2114 { }
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2115
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2116 octave_inline (const octave_inline&) = default;
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2117
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2118 ~octave_inline (void) = default;
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2119
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2120 octave_base_value * clone (void) const { return new octave_inline (*this); }
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2121
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2122 octave_base_value * empty_clone (void) const
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2123 {
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2124 return new octave_inline (octave_map (map_keys ()));
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2125 }
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2126
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2127 bool is_inline_function (void) const { return true; }
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2128
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2129 octave_function * function_value (bool)
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2130 {
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2131 return m_fcn_obj.get ();
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2132 }
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2133
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2134 private:
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2135
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2136 std::shared_ptr<octave_inline_fcn> m_fcn_obj;
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2137 };
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2138
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2139 octave_value_list
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2140 octave_inline_fcn::execute (tree_evaluator& tw, int nargout,
28429 8eb8ba8aff9a refactor octave_function call method John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	2141 const octave_value_list& args)
28427 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2142 {
29961 7d6709900da7 eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2143 interpreter& interp = tw.get_interpreter ();
28427 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2144
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2145 return interp.feval (octave_value (m_inline_obj, true), args, nargout);
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2146 }
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2147
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2148
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2149 DEFUN (__inline_ctor__, args, ,
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2150 doc: /* -- texinfo --
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30723 diff changeset	2151 @deftypefn {} {@var{inline_obj} =} __inline_ctor__ (@var{prop_struct})
28427 7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2152 Implements final construction for inline objects.
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2153 @end deftypefn */)
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2154 {
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2155 // Input validation has already been done in input.m.
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2156 return octave_value (new octave_inline (args(0).map_value ()));
7a8c69c4eb55 convert obsolete octave_fcn_inline object to @inline class John W. Eaton <jwe@octave.org> parents: 27932 diff changeset	2157 }
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29956 diff changeset	2158
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29956 diff changeset	2159 OCTAVE_NAMESPACE_END

Mercurial > octave

annotate libinterp/octave-value/ov-class.cc @ 30888:32d2b6604a9f