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

annotate libinterp/octave-value/cdef-object.cc @ 27216:823b4bcf79fc

unless necessary for formatting or code, use ' instead of ` Files affected: doc/interpreter/TODO, etc/HACKING.md, examples/code/oregonator.cc, examples/code/oregonator.m, libgui/graphics/ObjectFactory.cc, libinterp/corefcn/defun-dld.h, libinterp/corefcn/defun.h, libinterp/corefcn/graphics.cc, libinterp/corefcn/ls-hdf5.cc, libinterp/corefcn/oct-stream.cc, libinterp/octave-value/cdef-class.cc, libinterp/octave-value/cdef-manager.cc, libinterp/octave-value/cdef-method.cc, libinterp/octave-value/cdef-object.cc, libinterp/octave-value/cdef-package.cc, libinterp/octave-value/cdef-property.cc, libinterp/octave-value/cdef-utils.cc, libinterp/octave-value/ov-classdef.cc, libinterp/octave-value/ov-java.cc, libinterp/octave-value/ov.h, libinterp/parse-tree/oct-parse.yy, liboctave/array/Array.h, liboctave/numeric/bsxfun.h, liboctave/util/oct-rl-hist.c, scripts/help/__unimplemented__.m, scripts/image/imformats.m, scripts/image/imwrite.m, scripts/image/private/__imread__.m, scripts/image/private/__imwrite__.m, scripts/java/org/octave/Matrix.java, scripts/linear-algebra/condeig.m, scripts/miscellaneous/inputParser.m, scripts/miscellaneous/publish.m, scripts/pkg/private/configure_make.m, scripts/special-matrix/gallery.m, scripts/web/weboptions.m, test/classdef/classdef.tst.

author	John W. Eaton <jwe@octave.org>
date	Wed, 26 Jun 2019 15:47:03 -0400
parents	6b0c61a5a0f0
children	db687716fed6

rev	line source
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	2
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	3 Copyright (C) 2012-2019 Michael Goffioul
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	4
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	5 This file is part of Octave.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	6
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	7 Octave is free software: you can redistribute it and/or modify it
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	8 under the terms of the GNU General Public License as published by
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	9 the Free Software Foundation, either version 3 of the License, or
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	10 (at your option) any later version.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	11
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	15 GNU General Public License for more details.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	16
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	19 <https://www.gnu.org/licenses/>.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	20
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	22
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	23 #if defined (HAVE_CONFIG_H)
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	24 # include "config.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	26
26772 d1419ac09564 split method, package, and property classes from cdef-class file John W. Eaton <jwe@octave.org> parents: 26771 diff changeset	27 #include "cdef-class.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	28 #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	29 #include "cdef-property.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include "cdef-utils.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	31 #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	32 #include "interpreter-private.h"
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "ov-classdef.h"
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	34
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	35 // Define to 1 to enable debugging statements.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	36 #define DEBUG_TRACE 0
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	37
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	38 namespace octave
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	39 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	40 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	41 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	42 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	43 // 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	44 // 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	45 // 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	46 // 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	47 // 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	48 // 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	49
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	50 if (m_count - 1 > static_count ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	51 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	52 --m_count;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	53 return;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	54 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	55
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	56 if (is_handle_object () && ! is_meta_object ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	57 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	58 unwind_protect frame;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	59
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	60 // Clear interrupts.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	61 frame.protect_var (octave_interrupt_state);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	62 octave_interrupt_state = 0;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	63
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	64 // Disallow quit().
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	65 frame.protect_var (quit_allowed);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	66 quit_allowed = false;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	67
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	68 interpreter_try (frame);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	69
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	70 try
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	71 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	72 // Call classdef "delete()" method on object
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	73 get_class ().delete_object (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	74 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	75 catch (const interrupt_exception&)
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 interpreter::recover_from_exception ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	78
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	79 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	80 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	81 catch (const execution_exception&)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	82 {
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27056 diff changeset	83 octave::error_system& es
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27056 diff changeset	84 = octave::__get_error_system__ ("cdef_object::release");
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27056 diff changeset	85
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27056 diff changeset	86 std::string msg = es.last_error_message ();
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27056 diff changeset	87
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	88 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	89 msg.c_str ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	90
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	91 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	92 catch (const exit_exception&)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	93 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	94 // 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	95 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	96 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	97 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	98 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	99 // This shouldn't happen, in theory.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	100 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	101 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	102 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	103
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	104 // 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	105 m_count--;
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 destroy ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	108 }
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 cdef_class
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	111 cdef_object_rep::get_class (void) const
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 err_invalid_object ("get_class");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	114 }
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 std::string
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	117 cdef_object_rep::class_name (void) const
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 return get_class ().get_name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	120 }
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 string_vector
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	123 cdef_object_rep::map_keys (void) const
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 cdef_class cls = get_class ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	126
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	127 if (cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	128 return cls.get_names ();
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 return string_vector ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	131 }
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 octave_map
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	134 cdef_object::map_value (void) const
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 retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	137
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	138 warning_with_id ("Octave:classdef-to-struct",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	139 "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	140 "overrides the access restrictions defined for properties. "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	141 "All properties are returned, including private and "
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	142 "protected ones.");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	143
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	144 cdef_class cls = get_class ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	145
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	146 if (cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	147 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	148 std::map<std::string, cdef_property> props;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	149
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	150 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	151
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	152 // FIXME: Why not const here?
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	153 for (auto& prop_val : props)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	154 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	155 if (is_array ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	156 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	157 Array<cdef_object> a_obj = array_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	158
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	159 Cell cvalue (a_obj.dims ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	160
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	161 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	162 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	163
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	164 retval.setfield (prop_val.first, cvalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	165 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	166 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	167 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	168 Cell cvalue (dim_vector (1, 1),
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	169 prop_val.second.get_value (*this, false));
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 retval.setfield (prop_val.first, cvalue);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	172 }
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 }
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 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	177 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	178
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	179 cdef_class
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	180 cdef_object::get_class (void) const
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	181 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	182 return rep->get_class ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	183 }
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 cdef_class
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	186 cdef_object_base::get_class (void) const
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 return cdef_class (klass);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	189 }
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 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	192 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	193 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	194 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	195 \|\| (klass.ok () && ! cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	196 \|\| (! klass.ok () && cls.ok ()))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	197 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	198 unregister_object ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	199 klass = cls;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	200 register_object ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	201 }
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 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	205 cdef_object_base::register_object (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	206 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	207 if (klass.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	208 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	209 cdef_class cls (get_class ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	210
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	211 if (cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	212 cls.register_object ();
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 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	215
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	216 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	217 cdef_object_base::unregister_object (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	218 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	219 if (klass.ok ())
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 cdef_class cls (get_class ());
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 if (cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	224 cls.unregister_object ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	225 }
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
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	228 cdef_object_rep*
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	229 cdef_object_base::make_array (void) const
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 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	232
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	233 r->set_class (get_class ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	234
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	235 return r;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	236 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	237
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	238 octave_value_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	239 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	240 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	241 int /* nargout */, size_t& skip,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	242 const cdef_class& /* context */, bool auto_add)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	243 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	244 octave_value_list retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	245
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	246 skip = 1;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	247
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	248 switch (type[0])
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	249 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	250 case '(':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	251 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	252 const octave_value_list& ival = idx.front ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	253
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	254 if (ival.empty ())
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	255 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	256 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	257 retval(0) = to_ov (cdef_object (this));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	258 break;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	259 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	260
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	261 bool is_scalar = true;
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	262 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	263
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	264 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	265 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	266 try
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	267 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	268 iv(i) = ival(i).index_vector ();
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	269 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	270 catch (index_exception& e)
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	271 {
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	272 // Rethrow to allow more info to be reported later.
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	273 e.set_pos_if_unset (ival.length (), i+1);
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	274 throw;
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
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	277 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	278 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	279
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	280 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	281
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	282 // 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	283 // 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	284 // invalid cdef_objects.
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	285
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	286 if (auto_add)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	287 fill_empty_values (ires);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	288
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	289 if (is_scalar)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	290 retval(0) = to_ov (ires(0));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	291 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	292 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	293 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	294
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	295 array_obj.set_class (get_class ());
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	296
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	297 retval(0) = to_ov (array_obj);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	298 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	299 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	300 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	301
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	302 case '.':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	303 if (type.size () == 1 && idx.size () == 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	304 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	305 Cell c (dims ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	306
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	307 octave_idx_type n = array.numel ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	308
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	309 // dummy variables
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	310 size_t dummy_skip;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	311 cdef_class dummy_cls;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	312
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	313 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	314 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	315 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	316 dummy_cls);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	317
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	318 if (r.length () > 0)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	319 c(i) = r(0);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	320 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	321
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	322 retval(0) = octave_value (c, true);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	323
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	324 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	325 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	326 OCTAVE_FALLTHROUGH;
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 default:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	329 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	330 class_name ().c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	331 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	332 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	333
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	334 return retval;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	335 }
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 octave_value
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	338 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	339 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	340 const octave_value& rhs)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	341 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	342 octave_value retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	343
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	344 switch (type[0])
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	345 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	346 case '(':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	347 if (type.length () == 1)
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 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	350
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	351 if (rhs_obj.get_class () != get_class ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	352 error ("can't assign %s object into array of %s objects.",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	353 rhs_obj.class_name ().c_str (),
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	354 class_name ().c_str ());
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 const octave_value_list& ival = idx.front ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	357 bool is_scalar = true;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	358 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	359
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	360 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	361 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	362 try
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 iv(i) = ival(i).index_vector ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	365 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	366 catch (index_exception& e)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	367 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	368 e.set_pos_if_unset (ival.length (), i+1);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	369 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	370 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	371
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	372 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	373 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	374
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	375 Array<cdef_object> rhs_mat;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	376
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	377 if (! rhs_obj.is_array ())
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	378 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	379 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	380 rhs_mat(0) = rhs_obj;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	381 }
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	382 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	383 rhs_mat = rhs_obj.array_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	384
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	385 octave_idx_type n = array.numel ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	386
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	387 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	388
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	389 if (array.numel () > n)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	390 fill_empty_values ();
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 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	393 retval = to_ov (cdef_object (this));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	394 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	395 else
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	396 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	397 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	398
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	399 // Fill in trailing singleton dimensions so that
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	400 // 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	401 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	402 const octave_value_list& ival = ivl.length () >= 2
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	403 ? ivl : ((array.dims ()(0) == 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	404 ? ovl (one, ivl(0))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	405 : ovl (ivl(0), one));
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	406
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	407 bool is_scalar = true;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	408
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	409 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	410
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	411 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	412 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	413 try
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	414 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	415 iv(i) = ival(i).index_vector ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	416 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	417 catch (index_exception& e)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	418 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	419 // Rethrow to allow more info to be reported later.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	420 e.set_pos_if_unset (ival.length (), i+1);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	421 throw;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	422 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	423
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	424 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	425
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	426 if (! is_scalar)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	427 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	428 ", 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	429 "array.");
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	430 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	431
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	432 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	433
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	434 if (a.numel () != 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	435 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	436
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	437 cdef_object obj = a(0);
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 int ignore_copies = 0;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	440
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	441 // 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	442 // 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	443
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	444 if (! obj.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	445 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	446 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	447 // 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	448 // that we can safely ignore:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	449 // - 1 in "array"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	450 // - 1 in "a"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	451 ignore_copies = 2;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	452
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	453 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	454
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	455 next_idx.erase (next_idx.begin ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	456
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	457 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	458 rhs, ignore_copies);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	459
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	460 cdef_object robj = to_cdef (tmp);
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 if (! robj.ok ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	463 \|\| robj.is_array ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	464 \|\| 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	465 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	466 class_name ().c_str ());
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 // Small optimization, when dealing with handle
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	469 // 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	470 // of subsasgn back into the array.
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	471
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	472 if (! robj.is (a(0)))
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	473 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	474 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	475 robj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	476
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	477 octave_idx_type n = array.numel ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	478
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	479 array.assign (iv, rhs_a);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	480
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	481 if (array.numel () > n)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	482 fill_empty_values ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	483 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	484
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	485 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	486
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	487 retval = to_ov (cdef_object (this));
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	488 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	489 break;
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	490
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	491 default:
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	492 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	493 class_name ().c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	494 break;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	495 }
2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	496
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	497 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	498 }
26769 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 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	501 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	502 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	503 cdef_class cls = get_class ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	504
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	505 cdef_object obj;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	506
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	507 int n = arr.numel ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	508
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	509 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	510 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	511 if (! arr.xelem (i).ok ())
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	512 {
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	513 if (! obj.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	514 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	515 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	516
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	517 arr.xelem (i) = obj;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	518 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	519 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	520 arr.xelem (i) = obj.copy ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	521 }
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 }
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 octave_value_list
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	526 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	527 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	528 int nargout, size_t& skip,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	529 const cdef_class& context, bool auto_add)
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 = 0;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	532
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	533 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	534
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	535 octave_value_list retval;
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 if (! cls.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	538 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	539
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	540 switch (type[0])
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 case '.':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	543 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	544 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	545
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	546 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	547
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	548 if (meth.ok ())
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 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	551
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	552 octave_value_list args;
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 skip = 1;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	555
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	556 if (type.length () > 1 && type[1] == '(')
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	557 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	558 auto it = idx.begin ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	559
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	560 args = *++it;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	561
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	562 skip++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	563 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	564
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	565 if (meth.is_static ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	566 retval = meth.execute (args, _nargout, true, "subsref");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	567 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	568 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	569 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	570 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	571 true, "subsref");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	572 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	573 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	574
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	575 if (skip == 0)
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 cdef_property prop = cls.find_property (name);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	578
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	579 if (! prop.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	580 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	581
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	582 if (prop.is_constant ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	583 retval(0) = prop.get_value (true, "subsref");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	584 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	585 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	586 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	587 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	588 true, "subsref");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	589 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	590
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	591 skip = 1;
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 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	594 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	595
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	596 case '(':
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 const octave_value_list& ival = idx.front ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	599
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	600 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	601 cdef_object this_obj (this);
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 if (ival.empty ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	604 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	605 skip++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	606 retval(0) = to_ov (this_obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	607 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	608 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	609 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	610 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	611
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	612 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	613
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	614 new_obj.set_class (get_class ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	615
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	616 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	617 }
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 break;
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 default:
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	622 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	623 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	624 }
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 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	627 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	628
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	629 octave_value
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	630 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	631 const std::list<octave_value_list>& idx,
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	632 const octave_value& rhs)
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 octave_value retval;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	635
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	636 cdef_class cls = get_class ();
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	637
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	638 switch (type[0])
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 case '.':
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	641 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	642 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	643
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	644 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	645
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	646 if (! prop.ok ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	647 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	648
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	649 if (prop.is_constant ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	650 error ("subsasgn: cannot assign constant property: %s",
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	651 name.c_str ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	652
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	653 m_count++;
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 cdef_object obj (this);
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 if (type.length () == 1)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	658 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	659 prop.set_value (obj, rhs, true, "subsasgn");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	660
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	661 retval = to_ov (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	662 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	663 else
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	664 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	665 octave_value val =
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	666 prop.get_value (obj, true, "subsasgn");
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 std::list<octave_value_list> args (idx);
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 args.erase (args.begin ());
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 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	673 type.substr (1), args, rhs);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	674
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	675 if (val.class_name () != "object"
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	676 \|\| ! to_cdef (val).is_handle_object ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	677 prop.set_value (obj, val, true, "subsasgn");
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	678
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	679 retval = to_ov (obj);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	680 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	681 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	682 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	683
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	684 case '(':
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 m_count++;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	687
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	688 cdef_object this_obj (this);
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	689
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	690 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	691
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	692 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	693
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	694 new_obj.set_class (get_class ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	695
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	696 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	697
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	698 retval = tmp;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	699 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	700 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	701
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	702 default:
27216 823b4bcf79fc unless necessary for formatting or code, use ' instead of ` John W. Eaton <jwe@octave.org> parents: 27160 diff changeset	703 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	704 break;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	705 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	706
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	707 return retval;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	708 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	709
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	710 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	711 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	712 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	713 std::string cls_name = cls.get_name ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	714
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	715 Cell supcls = cls.get ("SuperClasses").cell_value ();
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	716
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	717 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	718
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	719 ctor_list[cls] = supcls_list;
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
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	722 bool
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	723 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	724 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	725 return (is_constructed ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	726 \|\| ctor_list.find (cls) == ctor_list.end ());
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	727 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	728
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	729 bool
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	730 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	731 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	732 if (is_constructed ())
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	733 return true;
27056 64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	734
64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	735 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	736 = ctor_list.find (cls);
64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	737
64461ccf3039 allow inherited method calls during classdef construction (bug #52614) John W. Eaton <jwe@octave.org> parents: 26968 diff changeset	738 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	739 return true;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	740
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	741 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	742 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	743 return false;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	744
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	745 return true;
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	746 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	747
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	748 void
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	749 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	750 {
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	751 ctor_list.erase (cls);
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	752 }
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	753
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	754 handle_cdef_object::~handle_cdef_object (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	755 {
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	756 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	757 std::cerr << "deleting " << get_class ().get_name ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	758 << " object (handle)" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	759 #endif
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	760 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	761
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	762 value_cdef_object::~value_cdef_object (void)
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	763 {
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	764 #if DEBUG_TRACE
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	765 std::cerr << "deleting " << get_class ().get_name ()
568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	766 << " object (value)" << std::endl;
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	767 #endif
26774 568c2ab2782d move classdef classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 26772 diff changeset	768 }
26769 2f847e3e8d6b split classdef into multiple smaller source files John W. Eaton <jwe@octave.org> parents: diff changeset	769 }

Mercurial > octave

annotate libinterp/octave-value/cdef-object.cc @ 27216:823b4bcf79fc