octave: libinterp/octave-value/cdef-object.cc annotate

annotate libinterp/octave-value/cdef-object.cc @ 29163:8f67ad8b3103

maint: Updating naming conventions for exceptions and use const where possible. * GLCanvas.cc, interpreter-qobject.cc, file-editor-tab.cc, octave-qscintilla.cc, octave-qobject.cc, Cell.cc, __eigs__.cc, __magick_read__.cc, __qp__.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, file-io.cc, graphics.cc, graphics.in.h, input.cc, interpreter.cc, ls-mat-ascii.cc, lsode.cc, oct-handle.h, oct-map.cc, quad.cc, rand.cc, sparse.cc, sub2ind.cc, toplev.cc, utils.cc, __init_gnuplot__.cc, __ode15__.cc, cdef-object.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-sparse.cc, ov-base.cc, ov-fcn-handle.cc, ov-java.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-str-mat.cc, ov.cc, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt-jit.cc, pt.cc, Array-util.cc, randmtzig.cc: Update naming conventions for exceptions to use initial letter of exception type. For example, "execution_exception" is named "ee", "index_exception" is "ie". Catch "const" exceptions where possible. * gzip.cc: Add block to catch and throw interrupt_exceptions before having a catch block "(...)" for everything else.

author	Rik <rik@octave.org>
date	Tue, 08 Dec 2020 13:25:03 -0800
parents	89a425f2c202
children	7854d5752dd2

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 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	3 // Copyright (C) 2012-2020 The Octave Project Developers
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 ////////////////////////////////////////////////////////////////////////
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	25
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	26 #if defined (HAVE_CONFIG_H)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	27 # include "config.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	29
26772 d1419ac09564 split method, package, and property classes from cdef-class file John W. Eaton <jwe@octave.org> parents: 26771 diff changeset	30 #include "cdef-class.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include "cdef-object.h"
26772 d1419ac09564 split method, package, and property classes from cdef-class file John W. Eaton <jwe@octave.org> parents: 26771 diff changeset	32 #include "cdef-property.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "cdef-utils.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include "interpreter.h"
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27056 diff changeset	35 #include "interpreter-private.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "ov-classdef.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	37
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	38 // Define to 1 to enable debugging statements.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	39 #define DEBUG_TRACE 0
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	40
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	41 namespace octave
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	42 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	43 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	44 cdef_object_rep::release (const cdef_object& obj)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	45 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	46 // We need to be careful to keep a reference to the object if we are
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	47 // calling the delete method. The object is passed to the delete
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	48 // method as an argument and if the count is already zero when we
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	49 // do that, then we will increment the count while creating the
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	50 // argument list for the delete method and then it will be decremented
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	51 // back to zero and we'll find ourselves in an infinite loop.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	52
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	53 if (m_count - 1 > static_count ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	54 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	55 --m_count;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	56 return;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	57 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	58
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	59 if (is_handle_object () && ! is_meta_object ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	60 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	61 unwind_protect frame;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	62
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	63 // Clear interrupts.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	64 frame.protect_var (octave_interrupt_state);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	65 octave_interrupt_state = 0;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	66
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	67 // Disallow quit().
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	68 frame.protect_var (quit_allowed);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	69 quit_allowed = false;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	70
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	71 interpreter& interp = __get_interpreter__ ("cdef_object_rep::release");
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	72
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	73 interpreter_try (frame);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	74
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	75 try
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	76 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	77 // Call classdef "delete()" method on object
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	78 get_class ().delete_object (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	79 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	80 catch (const interrupt_exception&)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	81 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	82 interp.recover_from_exception ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	83
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	84 warning ("interrupt occurred in handle class delete method");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	85 }
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27445 diff changeset	86 catch (const execution_exception& ee)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	87 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	88 interp.recover_from_exception ();
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27056 diff changeset	89
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27445 diff changeset	90 std::string msg = ee.message ();
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27056 diff changeset	91
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	92 warning ("error caught while executing handle class delete method:\n%s\n",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	93 msg.c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	94 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	95 catch (const exit_exception&)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	96 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	97 // This shouldn't happen since we disabled quit above.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	98 warning ("exit disabled while executing handle class delete method");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	99 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	100 catch (...) // Yes, the black hole. We're in a d-tor.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	101 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	102 // This shouldn't happen, in theory.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	103 warning ("internal error: unhandled exception in handle class delete method");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	104 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	105 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	106
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	107 // Now it is safe to set the count to zero.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	108 m_count--;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	109
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	110 destroy ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	111 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	112
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	113 cdef_class
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	114 cdef_object_rep::get_class (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	115 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	116 err_invalid_object ("get_class");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	117 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	118
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	119 std::string
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	120 cdef_object_rep::class_name (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	121 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	122 return get_class ().get_name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	123 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	124
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	125 string_vector
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	126 cdef_object_rep::map_keys (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	127 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	128 cdef_class cls = get_class ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	129
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	130 if (cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	131 return cls.get_names ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	132
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	133 return string_vector ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	134 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	135
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	136 octave_map
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	137 cdef_object::map_value (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	138 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	139 octave_map retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	140
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	141 warning_with_id ("Octave:classdef-to-struct",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	142 "struct: converting a classdef object into a struct "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	143 "overrides the access restrictions defined for properties. "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	144 "All properties are returned, including private and "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	145 "protected ones.");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	146
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	147 cdef_class cls = get_class ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	148
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	149 if (cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	150 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	151 std::map<std::string, cdef_property> props;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	152
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	153 props = cls.get_property_map (cdef_class::property_all);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	154
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	155 // FIXME: Why not const here?
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	156 for (auto& prop_val : props)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	157 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	158 if (is_array ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	159 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	160 Array<cdef_object> a_obj = array_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	161
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	162 Cell cvalue (a_obj.dims ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	163
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	164 for (octave_idx_type i = 0; i < a_obj.numel (); i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	165 cvalue (i) = prop_val.second.get_value (a_obj(i), false);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	166
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	167 retval.setfield (prop_val.first, cvalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	168 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	169 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	170 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	171 Cell cvalue (dim_vector (1, 1),
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	172 prop_val.second.get_value (*this, false));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	173
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	174 retval.setfield (prop_val.first, cvalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	175 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	176 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	177 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	178
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	179 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	180 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	181
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	182 cdef_class
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	183 cdef_object::get_class (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	184 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	185 return rep->get_class ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	186 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	187
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	188 cdef_class
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	189 cdef_object_base::get_class (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	190 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	191 return cdef_class (klass);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	192 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	193
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	194 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	195 cdef_object_base::set_class (const cdef_class& cls)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	196 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	197 if ((klass.ok () && cls.ok () && cls != get_class ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	198 \|\| (klass.ok () && ! cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	199 \|\| (! klass.ok () && cls.ok ()))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	200 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	201 klass = cls;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	202 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	203 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	204
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	205 cdef_object_rep*
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	206 cdef_object_base::make_array (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	207 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	208 cdef_object_rep *r = new cdef_object_array ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	209
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	210 r->set_class (get_class ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	211
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	212 return r;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	213 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	214
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	215 octave_value_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	216 cdef_object_array::subsref (const std::string& type,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	217 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	218 int /* nargout */, size_t& skip,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	219 const cdef_class& /* context */, bool auto_add)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	220 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	221 octave_value_list retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	222
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	223 skip = 1;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	224
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	225 switch (type[0])
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	226 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	227 case '(':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	228 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	229 const octave_value_list& ival = idx.front ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	230
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	231 if (ival.empty ())
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	232 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	233 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	234 retval(0) = to_ov (cdef_object (this));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	235 break;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	236 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	237
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	238 bool is_scalar = true;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	239 Array<idx_vector> iv (dim_vector (1, ival.length ()));
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	240
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	241 for (int i = 0; i < ival.length (); i++)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	242 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	243 try
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	244 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	245 iv(i) = ival(i).index_vector ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	246 }
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28905 diff changeset	247 catch (index_exception& ie)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	248 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	249 // Rethrow to allow more info to be reported later.
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28905 diff changeset	250 ie.set_pos_if_unset (ival.length (), i+1);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	251 throw;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	252 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	253
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	254 is_scalar = is_scalar && iv(i).is_scalar ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	255 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	256
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	257 Array<cdef_object> ires = array.index (iv, auto_add);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	258
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	259 // If resizing is enabled (auto_add = true), it's possible
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	260 // indexing was out-of-bound and the result array contains
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	261 // invalid cdef_objects.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	262
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	263 if (auto_add)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	264 fill_empty_values (ires);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	265
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	266 if (is_scalar)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	267 retval(0) = to_ov (ires(0));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	268 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	269 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	270 cdef_object array_obj (new cdef_object_array (ires));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	271
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	272 array_obj.set_class (get_class ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	273
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	274 retval(0) = to_ov (array_obj);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	275 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	276 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	277 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	278
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	279 case '.':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	280 if (type.size () == 1 && idx.size () == 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	281 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	282 Cell c (dims ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	283
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	284 octave_idx_type n = array.numel ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	285
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	286 // dummy variables
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	287 size_t dummy_skip;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	288 cdef_class dummy_cls;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	289
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	290 for (octave_idx_type i = 0; i < n; i++)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	291 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	292 octave_value_list r = array(i).subsref (type, idx, 1, dummy_skip,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	293 dummy_cls);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	294
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	295 if (r.length () > 0)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	296 c(i) = r(0);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	297 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	298
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	299 retval(0) = octave_value (c, true);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	300
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	301 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	302 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	303 OCTAVE_FALLTHROUGH;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	304
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	305 default:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	306 error ("can't perform indexing operation on array of %s objects",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	307 class_name ().c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	308 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	309 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	310
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	311 return retval;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	312 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	313
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	314 octave_value
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	315 cdef_object_array::subsasgn (const std::string& type,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	316 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	317 const octave_value& rhs)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	318 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	319 octave_value retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	320
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	321 switch (type[0])
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	322 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	323 case '(':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	324 if (type.length () == 1)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	325 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	326 cdef_object rhs_obj = to_cdef (rhs);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	327
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	328 if (rhs_obj.get_class () != get_class ())
28905 89a425f2c202 maint: Use Octave convention that error() messages don't end with a period. Rik <rik@octave.org> parents: 27932 diff changeset	329 error ("can't assign %s object into array of %s objects",
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	330 rhs_obj.class_name ().c_str (),
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	331 class_name ().c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	332
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	333 const octave_value_list& ival = idx.front ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	334 bool is_scalar = true;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	335 Array<idx_vector> iv (dim_vector (1, ival.length ()));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	336
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	337 for (int i = 0; i < ival.length (); i++)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	338 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	339 try
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	340 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	341 iv(i) = ival(i).index_vector ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	342 }
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28905 diff changeset	343 catch (index_exception& ie)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	344 {
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28905 diff changeset	345 ie.set_pos_if_unset (ival.length (), i+1);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	346 throw; // var name set in pt-idx.cc / pt-assign.cc
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	347 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	348
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	349 is_scalar = is_scalar && iv(i).is_scalar ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	350 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	351
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	352 Array<cdef_object> rhs_mat;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	353
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	354 if (! rhs_obj.is_array ())
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	355 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	356 rhs_mat = Array<cdef_object> (dim_vector (1, 1));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	357 rhs_mat(0) = rhs_obj;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	358 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	359 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	360 rhs_mat = rhs_obj.array_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	361
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	362 octave_idx_type n = array.numel ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	363
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	364 array.assign (iv, rhs_mat, cdef_object ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	365
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	366 if (array.numel () > n)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	367 fill_empty_values ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	368
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	369 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	370 retval = to_ov (cdef_object (this));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	371 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	372 else
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	373 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	374 const octave_value_list& ivl = idx.front ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	375
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	376 // Fill in trailing singleton dimensions so that
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	377 // array.index doesn't create a new blank entry (bug #46660).
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	378 const octave_idx_type one = static_cast<octave_idx_type> (1);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	379 const octave_value_list& ival = ivl.length () >= 2
27932 b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	380 ? ivl : ((array.dims ()(0) == 1)
b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	381 ? ovl (one, ivl(0))
b018f553fd85 maint: Use Octave coding conventions in libinterp/ Rik <rik@octave.org> parents: 27923 diff changeset	382 : ovl (ivl(0), one));
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	383
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	384 bool is_scalar = true;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	385
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	386 Array<idx_vector> iv (dim_vector (1, ival.length ()));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	387
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	388 for (int i = 0; i < ival.length (); i++)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	389 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	390 try
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	391 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	392 iv(i) = ival(i).index_vector ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	393 }
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28905 diff changeset	394 catch (index_exception& ie)
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	395 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	396 // Rethrow to allow more info to be reported later.
29163 8f67ad8b3103 maint: Updating naming conventions for exceptions and use const where possible. Rik <rik@octave.org> parents: 28905 diff changeset	397 ie.set_pos_if_unset (ival.length (), i+1);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	398 throw;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	399 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	400
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	401 is_scalar = is_scalar && iv(i).is_scalar ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	402
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	403 if (! is_scalar)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	404 error ("subsasgn: invalid indexing for object array assignment"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	405 ", the index must reference a single object in the "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	406 "array.");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	407 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	408
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	409 Array<cdef_object> a = array.index (iv, true);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	410
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	411 if (a.numel () != 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	412 error ("subsasgn: invalid indexing for object array assignment");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	413
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	414 cdef_object obj = a(0);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	415
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	416 int ignore_copies = 0;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	417
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	418 // If the object in 'a' is not valid, this means the index
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	419 // was out-of-bound and we need to create a new object.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	420
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	421 if (! obj.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	422 obj = get_class ().construct_object (octave_value_list ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	423 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	424 // Optimize the subsasgn call to come. There are 2 copies
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	425 // that we can safely ignore:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	426 // - 1 in "array"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	427 // - 1 in "a"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	428 ignore_copies = 2;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	429
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	430 std::list<octave_value_list> next_idx (idx);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	431
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	432 next_idx.erase (next_idx.begin ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	433
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	434 octave_value tmp = obj.subsasgn (type.substr (1), next_idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	435 rhs, ignore_copies);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	436
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	437 cdef_object robj = to_cdef (tmp);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	438
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	439 if (! robj.ok ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	440 \|\| robj.is_array ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	441 \|\| robj.get_class () != get_class ())
26968 342fc514de46 Fix typo in subsasgn error message (bug #55994). A.R. Burgers <arburgers@gmail.com> parents: 26774 diff changeset	442 error ("subsasgn: invalid assignment into array of %s objects",
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	443 class_name ().c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	444
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	445 // Small optimization, when dealing with handle
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	446 // objects, we don't need to re-assign the result
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	447 // of subsasgn back into the array.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	448
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	449 if (! robj.is (a(0)))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	450 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	451 Array<cdef_object> rhs_a (dim_vector (1, 1),
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	452 robj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	453
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	454 octave_idx_type n = array.numel ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	455
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	456 array.assign (iv, rhs_a);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	457
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	458 if (array.numel () > n)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	459 fill_empty_values ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	460 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	461
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	462 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	463
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	464 retval = to_ov (cdef_object (this));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	465 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	466 break;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	467
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	468 default:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	469 error ("can't perform indexing operation on array of %s objects",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	470 class_name ().c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	471 break;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	472 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	473
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	474 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	475 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	476
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	477 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	478 cdef_object_array::fill_empty_values (Array<cdef_object>& arr)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	479 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	480 cdef_class cls = get_class ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	481
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	482 cdef_object obj;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	483
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	484 int n = arr.numel ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	485
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	486 for (int i = 0; i < n; i++)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	487 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	488 if (! arr.xelem (i).ok ())
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	489 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	490 if (! obj.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	491 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	492 obj = cls.construct_object (octave_value_list ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	493
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	494 arr.xelem (i) = obj;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	495 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	496 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	497 arr.xelem (i) = obj.copy ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	498 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	499 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	500 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	501
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	502 octave_value_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	503 cdef_object_scalar::subsref (const std::string& type,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	504 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	505 int nargout, size_t& skip,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	506 const cdef_class& context, bool auto_add)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	507 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	508 skip = 0;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	509
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	510 cdef_class cls = (context.ok () ? context : get_class ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	511
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	512 octave_value_list retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	513
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	514 if (! cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	515 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	516
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	517 switch (type[0])
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	518 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	519 case '.':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	520 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	521 std::string name = (idx.front ())(0).string_value ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	522
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	523 cdef_method meth = cls.find_method (name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	524
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	525 if (meth.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	526 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	527 int _nargout = (type.length () > 2 ? 1 : nargout);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	528
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	529 octave_value_list args;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	530
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	531 skip = 1;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	532
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	533 if (type.length () > 1 && type[1] == '(')
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	534 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	535 auto it = idx.begin ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	536
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	537 args = *++it;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	538
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	539 skip++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	540 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	541
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	542 if (meth.is_static ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	543 retval = meth.execute (args, _nargout, true, "subsref");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	544 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	545 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	546 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	547 retval = meth.execute (cdef_object (this), args, _nargout,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	548 true, "subsref");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	549 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	550 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	551
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	552 if (skip == 0)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	553 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	554 cdef_property prop = cls.find_property (name);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	555
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	556 if (! prop.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	557 error ("subsref: unknown method or property: %s", name.c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	558
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	559 if (prop.is_constant ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	560 retval(0) = prop.get_value (true, "subsref");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	561 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	562 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	563 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	564 retval(0) = prop.get_value (cdef_object (this),
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	565 true, "subsref");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	566 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	567
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	568 skip = 1;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	569 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	570 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	571 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	572
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	573 case '(':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	574 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	575 const octave_value_list& ival = idx.front ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	576
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	577 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	578 cdef_object this_obj (this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	579
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	580 if (ival.empty ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	581 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	582 skip++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	583 retval(0) = to_ov (this_obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	584 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	585 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	586 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	587 Array<cdef_object> arr (dim_vector (1, 1), this_obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	588
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	589 cdef_object new_obj = cdef_object (new cdef_object_array (arr));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	590
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	591 new_obj.set_class (get_class ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	592
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	593 retval = new_obj.subsref (type, idx, nargout, skip, cls, auto_add);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	594 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	595 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	596 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	597
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	598 default:
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	599 error ("object cannot be indexed with '%c'", type[0]);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	600 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	601 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	602
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	603 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	604 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	605
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	606 octave_value
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	607 cdef_object_scalar::subsasgn (const std::string& type,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	608 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	609 const octave_value& rhs)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	610 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	611 octave_value retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	612
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	613 cdef_class cls = get_class ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	614
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	615 switch (type[0])
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	616 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	617 case '.':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	618 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	619 std::string name = (idx.front ())(0).string_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	620
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	621 cdef_property prop = cls.find_property (name);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	622
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	623 if (! prop.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	624 error ("subsasgn: unknown property: %s", name.c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	625
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	626 if (prop.is_constant ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	627 error ("subsasgn: cannot assign constant property: %s",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	628 name.c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	629
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	630 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	631
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	632 cdef_object obj (this);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	633
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	634 if (type.length () == 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	635 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	636 prop.set_value (obj, rhs, true, "subsasgn");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	637
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	638 retval = to_ov (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	639 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	640 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	641 {
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27216 diff changeset	642 octave_value val = prop.get_value (obj, true, "subsasgn");
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	643
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	644 std::list<octave_value_list> args (idx);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	645
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	646 args.erase (args.begin ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	647
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	648 val = val.assign (octave_value::op_asn_eq,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	649 type.substr (1), args, rhs);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	650
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	651 if (val.class_name () != "object"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	652 \|\| ! to_cdef (val).is_handle_object ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	653 prop.set_value (obj, val, true, "subsasgn");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	654
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	655 retval = to_ov (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	656 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	657 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	658 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	659
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	660 case '(':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	661 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	662 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	663
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	664 cdef_object this_obj (this);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	665
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	666 Array<cdef_object> arr (dim_vector (1, 1), this_obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	667
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	668 cdef_object new_obj = cdef_object (new cdef_object_array (arr));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	669
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	670 new_obj.set_class (get_class ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	671
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	672 octave_value tmp = new_obj.subsasgn (type, idx, rhs);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	673
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	674 retval = tmp;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	675 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	676 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	677
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	678 default:
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	679 error ("subsasgn: object cannot be index with '%c'", type[0]);
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	680 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	681 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	682
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	683 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	684 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	685
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	686 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	687 cdef_object_scalar::mark_for_construction (const cdef_class& cls)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	688 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	689 std::string cls_name = cls.get_name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	690
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	691 Cell supcls = cls.get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	692
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	693 std::list<cdef_class> supcls_list = lookup_classes (supcls);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	694
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	695 ctor_list[cls] = supcls_list;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	696 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	697
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	698 bool
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	699 cdef_object_scalar::is_constructed_for (const cdef_class& cls) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	700 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	701 return (is_constructed ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	702 \|\| ctor_list.find (cls) == ctor_list.end ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	703 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	704
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	705 bool
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	706 cdef_object_scalar::is_partially_constructed_for (const cdef_class& cls) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	707 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	708 if (is_constructed ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	709 return true;
27056 64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	710
64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	711 std::map<cdef_class, std::list<cdef_class>>::const_iterator it
64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	712 = ctor_list.find (cls);
64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	713
64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	714 if (it == ctor_list.end () \|\| it->second.empty ())
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	715 return true;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	716
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	717 for (const auto& cdef_cls : it->second)
27056 64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	718 if (! is_partially_constructed_for (cdef_cls))
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	719 return false;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	720
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	721 return true;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	722 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	723
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	724 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	725 cdef_object_scalar::mark_as_constructed (const cdef_class& cls)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	726 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	727 ctor_list.erase (cls);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	728 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	729
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	730 handle_cdef_object::~handle_cdef_object (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	731 {
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	732 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	733 std::cerr << "deleting " << get_class ().get_name ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	734 << " object (handle)" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	735 #endif
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	736 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	737
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	738 value_cdef_object::~value_cdef_object (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	739 {
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	740 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	741 std::cerr << "deleting " << get_class ().get_name ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	742 << " object (value)" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	743 #endif
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	744 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	745 }

Mercurial > octave

annotate libinterp/octave-value/cdef-object.cc @ 29163:8f67ad8b3103